--- gdm2/ChangeLog.org	2006-12-16 20:25:19.000000000 +0000
+++ gdm2/ChangeLog	2006-12-16 20:25:41.000000000 +0000
@@ -0,0 +1,5 @@
+2006-12-16  Lukasz Zalewski  <lukas@dcs.qmul.ac.uk>
+	
+	* gui/gdmsetup.c, gui/gdmsetup.glade: More fixes/changes for
+	  bug/feature request #334186.
+	
--- gdm2/gui/gdmsetup.c.org	2006-12-16 20:11:43.000000000 +0000
+++ gdm2/gui/gdmsetup.c	2006-12-16 20:19:12.000000000 +0000
@@ -3769,11 +3769,12 @@
 #endif
 
 static void
-apply_command_changes (GObject *object, gint arg1, gpointer command_data)
+apply_command_changes (GObject *object, gint response, gpointer command_data)
 {
 	GtkWidget *dialog = command_data;
 	
-	if (g_hash_table_size (GdmCommandChangesUnsaved) != 0) {
+	if (g_hash_table_size (GdmCommandChangesUnsaved) != 0 && 
+	    response != GTK_RESPONSE_HELP) {
 
 		GtkWidget *prompt;
 		gint response;
--- gdm2/gui/gdmsetup.glade.org	2006-12-16 18:44:41.000000000 +0000
+++ gdm2/gui/gdmsetup.glade	2006-12-16 20:24:39.000000000 +0000
@@ -858,7 +858,7 @@
 					  <property name="visible">True</property>
 					  <property name="tooltip" translatable="yes">Shake the display when an incorrect username/password is entered.</property>
 					  <property name="can_focus">True</property>
-					  <property name="label" translatable="yes">_Quiver when incorrect username/password entered</property>
+					  <property name="label" translatable="yes">Qui_ver when incorrect username/password entered</property>
 					  <property name="use_underline">True</property>
 					  <property name="relief">GTK_RELIEF_NORMAL</property>
 					  <property name="focus_on_click">True</property>
@@ -916,7 +916,7 @@
 					  <property name="visible">True</property>
 					  <property name="tooltip" translatable="yes">Display the title bar in the greeter.</property>
 					  <property name="can_focus">True</property>
-					  <property name="label" translatable="yes">S_how title bar</property>
+					  <property name="label" translatable="yes">Sh_ow title bar</property>
 					  <property name="use_underline">True</property>
 					  <property name="relief">GTK_RELIEF_NORMAL</property>
 					  <property name="focus_on_click">True</property>
@@ -974,7 +974,7 @@
 					  <property name="visible">True</property>
 					  <property name="tooltip" translatable="yes">The position of the login window cannot be changed.</property>
 					  <property name="can_focus">True</property>
-					  <property name="label" translatable="yes">L_ock position of the window</property>
+					  <property name="label" translatable="yes">Loc_k position of the window</property>
 					  <property name="use_underline">True</property>
 					  <property name="relief">GTK_RELIEF_NORMAL</property>
 					  <property name="focus_on_click">True</property>
@@ -2744,7 +2744,7 @@
 					  <property name="visible">True</property>
 					  <property name="tooltip" translatable="yes">Shake the display when an incorrect username/password is entered.</property>
 					  <property name="can_focus">True</property>
-					  <property name="label" translatable="yes">_Quiver when incorrect username/password entered</property>
+					  <property name="label" translatable="yes">Qui_ver when incorrect username/password entered</property>
 					  <property name="use_underline">True</property>
 					  <property name="relief">GTK_RELIEF_NORMAL</property>
 					  <property name="focus_on_click">True</property>
@@ -2802,7 +2802,7 @@
 					  <property name="visible">True</property>
 					  <property name="tooltip" translatable="yes">Display the title bar in the greeter.</property>
 					  <property name="can_focus">True</property>
-					  <property name="label" translatable="yes">S_how title bar</property>
+					  <property name="label" translatable="yes">Sh_ow title bar</property>
 					  <property name="use_underline">True</property>
 					  <property name="relief">GTK_RELIEF_NORMAL</property>
 					  <property name="focus_on_click">True</property>
@@ -2860,7 +2860,7 @@
 					  <property name="visible">True</property>
 					  <property name="tooltip" translatable="yes">The position of the login window cannot be changed.</property>
 					  <property name="can_focus">True</property>
-					  <property name="label" translatable="yes">L_ock position of the window</property>
+					  <property name="label" translatable="yes">Loc_k position of the window</property>
 					  <property name="use_underline">True</property>
 					  <property name="relief">GTK_RELIEF_NORMAL</property>
 					  <property name="focus_on_click">True</property>
@@ -4946,7 +4946,7 @@
 				      <child>
 					<widget class="GtkLabel" id="label351">
 					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">L_ogin retry delay:</property>
+					  <property name="label" translatable="yes">Login _retry delay:</property>
 					  <property name="use_underline">True</property>
 					  <property name="use_markup">False</property>
 					  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -4956,7 +4956,7 @@
 					  <property name="yalign">0.5</property>
 					  <property name="xpad">0</property>
 					  <property name="ypad">0</property>
-					  <property name="mnemonic_widget">gg_mode_combobox</property>
+					  <property name="mnemonic_widget">retry_delay</property>
 					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 					  <property name="width_chars">-1</property>
 					  <property name="single_line_mode">False</property>
@@ -5123,8 +5123,9 @@
 				  <child>
 				    <widget class="GtkCheckButton" id="enable_debug">
 				      <property name="visible">True</property>
+				      <property name="tooltip" translatable="yes">Sends debug ouput to the syslog.  This can be useful for tracking down problems with GDM.  This output tends to be verbose so should not be turned on for general use.</property>
 				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">E_nable debug messages to system log</property>
+				      <property name="label" translatable="yes">Ena_ble debug messages to system log</property>
 				      <property name="use_underline">True</property>
 				      <property name="relief">GTK_RELIEF_NORMAL</property>
 				      <property name="focus_on_click">True</property>
@@ -5222,7 +5223,7 @@
 				      <property name="visible">True</property>
 				      <property name="tooltip" translatable="yes">Checks the ownership of the home directories before writing to them. This prevents security issues in case of bad setup.</property>
 				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">Only allow login if use_r owns their home directory</property>
+				      <property name="label" translatable="yes">Only allow login i_f user owns their home directory</property>
 				      <property name="use_underline">True</property>
 				      <property name="relief">GTK_RELIEF_NORMAL</property>
 				      <property name="focus_on_click">True</property>
@@ -5311,7 +5312,7 @@
 						  <property name="visible">True</property>
 						  <property name="tooltip" translatable="yes">Paranoia option. Only accepts user owned files and directories.</property>
 						  <property name="can_focus">True</property>
-						  <property name="label" translatable="yes">Only allow login if user's home directory permissions are secure</property>
+						  <property name="label" translatable="yes">_Only allow login if user's home directory permissions are secure</property>
 						  <property name="use_underline">True</property>
 						  <property name="relief">GTK_RELIEF_NORMAL</property>
 						  <property name="focus_on_click">True</property>
@@ -5331,7 +5332,7 @@
 						  <property name="visible">True</property>
 						  <property name="tooltip" translatable="yes">Allow group writable files and directories.</property>
 						  <property name="can_focus">True</property>
-						  <property name="label" translatable="yes">Allow login if group write permissions on user's home directory</property>
+						  <property name="label" translatable="yes">Allow logi_n if group write permissions on user's home directory</property>
 						  <property name="use_underline">True</property>
 						  <property name="relief">GTK_RELIEF_NORMAL</property>
 						  <property name="focus_on_click">True</property>
@@ -5352,7 +5353,7 @@
 						  <property name="visible">True</property>
 						  <property name="tooltip" translatable="yes">Allow world writable files and directories.</property>
 						  <property name="can_focus">True</property>
-						  <property name="label" translatable="yes">Allow login if all write permissions on user's home directory</property>
+						  <property name="label" translatable="yes">Allow login _if all write permissions on user's home directory</property>
 						  <property name="use_underline">True</property>
 						  <property name="relief">GTK_RELIEF_NORMAL</property>
 						  <property name="focus_on_click">True</property>
@@ -6428,7 +6429,7 @@
 	  <child>
 	    <widget class="GtkLabel" id="label217">
 	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Maximum _pending requests:</property>
+	      <property name="label" translatable="yes">_Maximum pending requests:</property>
 	      <property name="use_underline">True</property>
 	      <property name="use_markup">False</property>
 	      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -6602,7 +6603,7 @@
 	  <child>
 	    <widget class="GtkLabel" id="label223">
 	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Pin_g interval:</property>
+	      <property name="label" translatable="yes">_Ping interval:</property>
 	      <property name="use_underline">True</property>
 	      <property name="use_markup">False</property>
 	      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -8555,7 +8556,7 @@
 		  <child>
 		    <widget class="GtkLabel" id="label473">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_Command type:</property>
+		      <property name="label" translatable="yes">Comma_nd type:</property>
 		      <property name="use_underline">True</property>
 		      <property name="use_markup">False</property>
 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -9202,7 +9203,7 @@
 			  <property name="visible">True</property>
 			  <property name="tooltip" translatable="yes">Specifies if Custom Command will appear outside the login manager, for example on the desktop through the Log Out/Shut Down widgets.</property>
 			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">Pe_rsistent</property>
+			  <property name="label" translatable="yes">Per_sistent</property>
 			  <property name="use_underline">True</property>
 			  <property name="relief">GTK_RELIEF_NORMAL</property>
 			  <property name="focus_on_click">True</property>
@@ -9260,7 +9261,7 @@
 			  <property name="visible">True</property>
 			  <property name="tooltip" translatable="yes">Specifies if gdm will be stopped/restarted once Custom Command has been executed.</property>
 			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">_No restart required</property>
+			  <property name="label" translatable="yes">No _restart required</property>
 			  <property name="use_underline">True</property>
 			  <property name="relief">GTK_RELIEF_NORMAL</property>
 			  <property name="focus_on_click">True</property>
@@ -9348,7 +9349,7 @@
 			  <child>
 			    <widget class="GtkLabel" id="label485">
 			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">_Apply Command Changes</property>
+			      <property name="label" translatable="yes">Apply Co_mmand Changes</property>
 			      <property name="use_underline">True</property>
 			      <property name="use_markup">False</property>
 			      <property name="justify">GTK_JUSTIFY_LEFT</property>
