gnome-control-center r9246 - trunk/capplets/keyboard

[svu svn gnome org]

Author: svu
Date: Sat Feb  7 13:10:46 2009
New Revision: 9246
URL: http://svn.gnome.org/viewvc/gnome-control-center?rev=9246&view=rev

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

Modified:
   trunk/capplets/keyboard/ChangeLog
   trunk/capplets/keyboard/gnome-keyboard-properties-xkbot.c
   trunk/capplets/keyboard/gnome-keyboard-properties.glade

Modified: trunk/capplets/keyboard/gnome-keyboard-properties-xkbot.c
==============================================================================
--- trunk/capplets/keyboard/gnome-keyboard-properties-xkbot.c	(original)
+++ trunk/capplets/keyboard/gnome-keyboard-properties-xkbot.c	Sat Feb  7 13:10:46 2009
@@ -416,16 +416,24 @@
 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);
+	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;
+			gtk_widget_destroy (GTK_WIDGET (dialog));
+			chooser_dialog = NULL;
+		}
+		break;
 	}
 }
 

Modified: trunk/capplets/keyboard/gnome-keyboard-properties.glade
==============================================================================
--- trunk/capplets/keyboard/gnome-keyboard-properties.glade	(original)
+++ trunk/capplets/keyboard/gnome-keyboard-properties.glade	Sat Feb  7 13:10:46 2009
@@ -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>