applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

restored Help button in options, b.g.o#556952

Browse source 
svn path=/trunk/; revision=9246
This commit is contained in:
Sergey V. Udaltsov 2009-02-07 13:10:46 +00:00
parent 4acded1a0b
commit 8786acaa3a
3 changed files with 24 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
capplets/keyboard/ChangeLog
View file

@ -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 ==================== ==================== 2.25.90 ====================
2009-01-30 Jens Granseuer <jensgr@gmx.net> 2009-01-30 Jens Granseuer <jensgr@gmx.net>

26
capplets/keyboard/gnome-keyboard-properties-xkbot.c
View file

@ -416,16 +416,24 @@ xkb_options_load_options (GladeXML * dialog)
static void static void
chooser_response_cb (GtkDialog * dialog, gint response, gpointer data) chooser_response_cb (GtkDialog * dialog, gint response, gpointer data)
{ {
if (response == GTK_RESPONSE_CLOSE) { switch (response) {
/* just cleanup */ case GTK_RESPONSE_HELP:
GSList *expanders_list = capplet_help (GTK_WINDOW (dialog),
g_object_get_data (G_OBJECT (dialog), EXPANDERS_PROP); "prefs-keyboard-layoutoptions");
g_object_set_data (G_OBJECT (dialog), EXPANDERS_PROP, break;
NULL); case GTK_RESPONSE_CLOSE:{
g_slist_free (expanders_list); /* 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)); gtk_widget_destroy (GTK_WIDGET (dialog));
chooser_dialog = NULL; chooser_dialog = NULL;
}
break;
} }
} }

1
capplets/keyboard/gnome-keyboard-properties.glade
View file

@ -2037,6 +2037,7 @@
<property name="layout_style">GTK_BUTTONBOX_END</property> <property name="layout_style">GTK_BUTTONBOX_END</property>
<child> <child>
<widget class="GtkButton" id="button3"> <widget class="GtkButton" id="button3">
<property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">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> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>