diff options
| author | Sergey V. Udaltsov <svu@src.gnome.org> | 2009-02-07 13:10:46 +0000 |
|---|---|---|
| committer | Sergey V. Udaltsov <svu@src.gnome.org> | 2009-02-07 13:10:46 +0000 |
| commit | 8786acaa3a027ae82ba4410c91c1a29ed68d12f3 (patch) | |
| tree | dd3e33b2eaf56c9c10cfd8d35eb8c053664e3072 /capplets/keyboard | |
| parent | 4acded1a0be01b87acf77b0aa5ef79c445dc6331 (diff) | |
| download | gnome-control-center-8786acaa3a027ae82ba4410c91c1a29ed68d12f3.tar.gz | |
restored Help button in options, b.g.o#556952
svn path=/trunk/; revision=9246
Diffstat (limited to 'capplets/keyboard')
| -rw-r--r-- | capplets/keyboard/ChangeLog | 6 | ||||
| -rw-r--r-- | capplets/keyboard/gnome-keyboard-properties-xkbot.c | 28 | ||||
| -rw-r--r-- | capplets/keyboard/gnome-keyboard-properties.glade | 1 |
3 files changed, 25 insertions, 10 deletions
diff --git a/capplets/keyboard/ChangeLog b/capplets/keyboard/ChangeLog index 70e8b5977..5d532450f 100644 --- a/capplets/keyboard/ChangeLog +++ b/capplets/keyboard/ChangeLog @@ -1,3 +1,9 @@ +2009-02-07 Sergey Udaltsov <svu@gnome.org> + + * gnome-keyboard-properties-xkbot.c, gnome-keyboard-properties.glade: + restored (now functioning) help button in Options, + http://bugzilla.gnome.org/show_bug.cgi?id=556952 + ==================== 2.25.90 ==================== 2009-01-30 Jens Granseuer <jensgr@gmx.net> diff --git a/capplets/keyboard/gnome-keyboard-properties-xkbot.c b/capplets/keyboard/gnome-keyboard-properties-xkbot.c index e9e15c62a..781ae83ee 100644 --- a/capplets/keyboard/gnome-keyboard-properties-xkbot.c +++ b/capplets/keyboard/gnome-keyboard-properties-xkbot.c @@ -416,16 +416,24 @@ xkb_options_load_options (GladeXML * dialog) static void chooser_response_cb (GtkDialog * dialog, gint response, gpointer data) { - if (response == GTK_RESPONSE_CLOSE) { - /* just cleanup */ - GSList *expanders_list = - g_object_get_data (G_OBJECT (dialog), EXPANDERS_PROP); - g_object_set_data (G_OBJECT (dialog), EXPANDERS_PROP, - NULL); - g_slist_free (expanders_list); - - gtk_widget_destroy (GTK_WIDGET (dialog)); - chooser_dialog = NULL; + switch (response) { + case GTK_RESPONSE_HELP: + capplet_help (GTK_WINDOW (dialog), + "prefs-keyboard-layoutoptions"); + break; + case GTK_RESPONSE_CLOSE:{ + /* just cleanup */ + GSList *expanders_list = + g_object_get_data (G_OBJECT (dialog), + EXPANDERS_PROP); + g_object_set_data (G_OBJECT (dialog), + EXPANDERS_PROP, NULL); + g_slist_free (expanders_list); + + gtk_widget_destroy (GTK_WIDGET (dialog)); + chooser_dialog = NULL; + } + break; } } diff --git a/capplets/keyboard/gnome-keyboard-properties.glade b/capplets/keyboard/gnome-keyboard-properties.glade index 9bf373cab..4e71774c1 100644 --- a/capplets/keyboard/gnome-keyboard-properties.glade +++ b/capplets/keyboard/gnome-keyboard-properties.glade @@ -2037,6 +2037,7 @@ <property name="layout_style">GTK_BUTTONBOX_END</property> <child> <widget class="GtkButton" id="button3"> + <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> |