This change was approved by the release team since it affects UI after the

2005-08-08  Brian Cameron  <brian.cameron@sun.com>

        This change was approved by the release team since it
        affects UI after the UI freeze.
        * daemon/gdm.[ch], gui/gdmsetup.c : Change GDM_KEY_SERVERS
          to GDM_KEY_SECTION_SERVER and added GDM_KEY_SECTION_GREETER.
          There already is a GDM_KEY_GREETER, so for section
          #defines it's better to include "SECTION" in it.
        * gui/gdmsetup.c, gui/gdmsetup.glade:  Made a number of UI
          improvements.  Calum Benson is doing a UI review of
          gdmsetup and I made the following fixes based on his
          recommendations.  No longer have mnemonics on the tabs
          since this is against HIG rules, changes "Face Browser"
          tab to "Users" since the Include/Exclude list really
          also affects Automatic/Timed login and not just the
          Face Browser.  Added label to the Users tab to explain
          what the tab does, since it wasn't too clear before.
          Improved description of "Disallow TCP connections" on
          the security tab so it is more clear what this does
          (and highlight it doesn't affect XDMCP).  I also fixed
          the sensitivities when "Include All Users" is checked.
          Previously it was making both the Include and Exclude
          list insensitive - it really should just make the
          Include list and buttons to move between Incude/Exclude
          insensitive.  This is now working.

5 files changed, 448 insertions, 30 deletions

diff --git a/ChangeLog b/ChangeLog
index 8a3cfb8a..65a82ac7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,29 @@
+2005-08-08  Brian Cameron  <brian.cameron@sun.com>
+
+	This change was approved by the release team since it
+	affects UI after the UI freeze.
+        * daemon/gdm.[ch], gui/gdmsetup.c : Change GDM_KEY_SERVERS
+          to GDM_KEY_SECTION_SERVER and added GDM_KEY_SECTION_GREETER.
+          There already is a GDM_KEY_GREETER, so for section
+          #defines it's better to include "SECTION" in it.
+        * gui/gdmsetup.c, gui/gdmsetup.glade:  Made a number of UI
+          improvements.  Calum Benson is doing a UI review of
+          gdmsetup and I made the following fixes based on his
+          recommendations.  No longer have mnemonics on the tabs
+          since this is against HIG rules, changes "Face Browser"
+          tab to "Users" since the Include/Exclude list really
+          also affects Automatic/Timed login and not just the
+          Face Browser.  Added label to the Users tab to explain
+          what the tab does, since it wasn't too clear before.
+          Improved description of "Disallow TCP connections" on
+          the security tab so it is more clear what this does
+          (and highlight it doesn't affect XDMCP).  I also fixed
+          the sensitivities when "Include All Users" is checked.
+          Previously it was making both the Include and Exclude
+          list insensitive - it really should just make the
+          Include list and buttons to move between Incude/Exclude
+          insensitive.  This is now working.
+
 2005-08-04  Brian Cameron  <brian.cameron@sun.com>
 
 	* daemon/server.c: Fix malformed string.
diff --git a/daemon/gdm.c b/daemon/gdm.c
index 456fad6f..cba4e774 100644
--- a/daemon/gdm.c
+++ b/daemon/gdm.c
@@ -652,7 +652,7 @@ gdm_config_parse (void)
     }
 
     /* Find static X server definitions */
-    list = ve_config_get_keys (cfg, GDM_KEY_SERVERS);
+    list = ve_config_get_keys (cfg, GDM_KEY_SECTION_SERVERS);
     /* only read the list if no_console is FALSE
        at this stage */
     for (li = list; ! no_console && li != NULL; li = li->next) {
@@ -672,7 +672,7 @@ gdm_config_parse (void)
 				       "gdm_config_parse", atoi (key), disp_num);
 		    }
 
-		    full = g_strdup_printf ("%s/%s", GDM_KEY_SERVERS, key);
+		    full = g_strdup_printf ("%s/%s", GDM_KEY_SECTION_SERVERS, key);
 		    val = ve_config_get_string (cfg, full);
 		    g_free (full);
 
diff --git a/daemon/gdm.h b/daemon/gdm.h
index 62509c12..02b4354f 100644
--- a/daemon/gdm.h
+++ b/daemon/gdm.h
@@ -345,7 +345,7 @@ enum {
 
 #define GDM_KEY_DEBUG "debug/Enable=false"
 
-#define GDM_KEY_SERVERS "servers"
+#define GDM_KEY_SECTION_SERVERS "servers"
 
 #define GDM_KEY_SHOW_GNOME_FAILSAFE "greeter/ShowGnomeFailsafeSession=true"
 #define GDM_KEY_SHOW_XTERM_FAILSAFE "greeter/ShowXtermFailsafeSession=true"
diff --git a/gui/gdmsetup.c b/gui/gdmsetup.c
index 42bd35f2..3af3ac56 100644
--- a/gui/gdmsetup.c
+++ b/gui/gdmsetup.c
@@ -330,13 +330,13 @@ xservers_get_servers (GtkListStore *store)
 	gchar *server, *options, *cpy;
 	
 	/* Fill list with all the active servers */
-    list = ve_config_get_keys (cfg, GDM_KEY_SERVERS);
+	list = ve_config_get_keys (cfg, GDM_KEY_SECTION_SERVERS);
 
 	for (li = list; li != NULL; li = li->next) {
 		GtkTreeIter iter;
 		char *key = li->data;
 		int vt = atoi(key);
-		key = g_strconcat(GDM_KEY_SERVERS, "/", key, NULL);
+		key = g_strconcat(GDM_KEY_SECTION_SERVERS, "/", key, NULL);
 		cpy = ve_config_get_string (cfg, key);
 		server = ve_first_word (cpy);
 		options = ve_rest (cpy);
@@ -600,7 +600,7 @@ combobox_timeout (GtkWidget *combo_box)
 
 
 	/* Add/Modify Server to Start combobox */
-	} else if (strcmp (key, GDM_KEY_SERVERS) == 0 ) { 
+	} else if (strcmp (key, GDM_KEY_SECTION_SERVERS) == 0 ) { 
 		GtkWidget *add_button = glade_helper_get (xml, "xserver_add_button",
 		                                          GTK_TYPE_BUTTON);
 		gtk_widget_set_sensitive(add_button, TRUE);
@@ -715,7 +715,6 @@ sensitive_entry_toggled (GtkWidget *toggle, gpointer data)
 
 	if (val == FALSE) {
 		gtk_widget_set_sensitive (widget, TRUE);
-
 	} else {
 		gtk_widget_set_sensitive (widget, FALSE);
 	}
@@ -1028,6 +1027,7 @@ typedef struct _FaceCommon {
 	GtkWidget *to_exclude_button;
 	GtkWidget *include_entry;
 	GtkWidget *exclude_entry;
+	GtkWidget *allusers;
 } FaceCommon;
 
 typedef struct _FaceData {
@@ -1319,7 +1319,6 @@ static void
 setup_face (void)
 {
 	GtkWidget *fb_browser = glade_helper_get (xml, "fb_browser", GTK_TYPE_WIDGET);
-	GtkWidget *face_label = glade_helper_get (xml, "Face_label", GTK_TYPE_WIDGET);
 	GtkWidget *face_frame = glade_helper_get (xml, "face_frame", GTK_TYPE_WIDGET);
 	static FaceCommon fc;
 	static FaceData fd_include;
@@ -1352,6 +1351,8 @@ setup_face (void)
 	                                         GTK_TYPE_TREE_VIEW);
 	fc.exclude_treeview  = glade_helper_get (xml, "fb_exclude_treeview",
 	                                         GTK_TYPE_TREE_VIEW);
+	fc.allusers          = glade_helper_get (xml, "fb_allusers",
+	                                         GTK_TYPE_TOGGLE_BUTTON);
 
 	fc.include_store = setup_include_exclude (fc.include_treeview,
 	                                          GDM_KEY_INCLUDE);
@@ -1417,12 +1418,6 @@ setup_face (void)
 
 	g_signal_connect (fc.apply, "clicked",
 	                  G_CALLBACK (browser_apply), &fc);
-
-        g_signal_connect (G_OBJECT (fb_browser), "toggled", 
-			 G_CALLBACK (sensitivity_toggled), face_frame);
-        g_signal_connect (G_OBJECT (fb_browser), "toggled", 
-			 G_CALLBACK (sensitivity_toggled), face_label);
-
 }
 
 static gboolean
@@ -1482,6 +1477,21 @@ setup_greeter_toggle (const char *name,
 
 		g_signal_connect (G_OBJECT (toggle), "toggled",	
 			G_CALLBACK (sensitive_entry_toggled), remotewelcome);
+	} else if (strcmp ("fb_allusers", name) == 0) {
+		GtkWidget *fb_includebox = glade_helper_get (xml,
+			"fb_includebox", GTK_TYPE_VBOX);
+		GtkWidget *fb_buttonbox = glade_helper_get (xml,
+			"fb_buttonbox", GTK_TYPE_VBOX);
+
+		if (val == TRUE) {
+			gtk_widget_set_sensitive (fb_includebox, FALSE);
+			gtk_widget_set_sensitive (fb_buttonbox, FALSE);
+		}
+
+		g_signal_connect (G_OBJECT (toggle), "toggled",	
+			G_CALLBACK (sensitive_entry_toggled), fb_includebox);
+		g_signal_connect (G_OBJECT (toggle), "toggled",	
+			G_CALLBACK (sensitive_entry_toggled), fb_buttonbox);
 	}
 
 	g_signal_connect (G_OBJECT (toggle), "toggled",
@@ -3970,7 +3980,7 @@ setup_xserver_support (void)
 	                        g_strdup (GDM_KEY_SERVER_PREFIX),
 	                        (GDestroyNotify) g_free);
 	g_object_set_data_full (G_OBJECT (server_combobox), "key",
-	                        g_strdup (GDM_KEY_SERVERS),
+	                        g_strdup (GDM_KEY_SECTION_SERVERS),
 	                        (GDestroyNotify) g_free);
 	g_object_set_data_full (G_OBJECT (name_entry), "key",
 	                        g_strdup (GDM_KEY_SERVER_NAME),
diff --git a/gui/gdmsetup.glade b/gui/gdmsetup.glade
index 4f41359e..4a471a96 100644
--- a/gui/gdmsetup.glade
+++ b/gui/gdmsetup.glade
@@ -17,6 +17,7 @@
   <property name="skip_pager_hint">False</property>
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="focus_on_map">True</property>
   <property name="has_separator">False</property>
 
   <child internal-child="vbox">
@@ -100,6 +101,10 @@
 		      <property name="yalign">0.5</property>
 		      <property name="xpad">0</property>
 		      <property name="ypad">0</property>
+		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		      <property name="width_chars">-1</property>
+		      <property name="single_line_mode">False</property>
+		      <property name="angle">0</property>
 		    </widget>
 		    <packing>
 		      <property name="padding">0</property>
@@ -127,6 +132,10 @@
 			  <property name="yalign">0.5</property>
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="padding">0</property>
@@ -157,6 +166,10 @@
 			      <property name="yalign">0.5</property>
 			      <property name="xpad">0</property>
 			      <property name="ypad">0</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
 			    </widget>
 			    <packing>
 			      <property name="left_attach">0</property>
@@ -181,6 +194,10 @@
 			      <property name="yalign">0.5</property>
 			      <property name="xpad">0</property>
 			      <property name="ypad">0</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
 			    </widget>
 			    <packing>
 			      <property name="left_attach">0</property>
@@ -206,6 +223,10 @@
 			      <property name="xpad">0</property>
 			      <property name="ypad">0</property>
 			      <property name="mnemonic_widget">welcome</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
 			      <accessibility>
 				<atkrelation target="welcome" type="label-for"/>
 			      </accessibility>
@@ -234,6 +255,10 @@
 			      <property name="xpad">0</property>
 			      <property name="ypad">0</property>
 			      <property name="mnemonic_widget">remote_welcome</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
 			      <accessibility>
 				<atkrelation target="remote_welcome" type="label-for"/>
 			      </accessibility>
@@ -305,6 +330,8 @@
 			      <property name="visible">True</property>
 			      <property name="items" translatable="yes">GTK+ Greeter
 Themed Greeter</property>
+			      <property name="add_tearoffs">False</property>
+			      <property name="focus_on_click">True</property>
 			    </widget>
 			    <packing>
 			      <property name="left_attach">1</property>
@@ -320,6 +347,8 @@ Themed Greeter</property>
 			      <property name="items" translatable="yes">GTK+ Greeter
 Themed Greeter
 Disabled</property>
+			      <property name="add_tearoffs">False</property>
+			      <property name="focus_on_click">True</property>
 			    </widget>
 			    <packing>
 			      <property name="left_attach">1</property>
@@ -388,6 +417,10 @@ Disabled</property>
 			      <property name="yalign">0.5</property>
 			      <property name="xpad">0</property>
 			      <property name="ypad">0</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
 			    </widget>
 			    <packing>
 			      <property name="left_attach">1</property>
@@ -412,6 +445,10 @@ Disabled</property>
 			      <property name="yalign">0.5</property>
 			      <property name="xpad">0</property>
 			      <property name="ypad">0</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
 			    </widget>
 			    <packing>
 			      <property name="left_attach">1</property>
@@ -463,6 +500,10 @@ Disabled</property>
 		      <property name="yalign">0.5</property>
 		      <property name="xpad">0</property>
 		      <property name="ypad">0</property>
+		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		      <property name="width_chars">-1</property>
+		      <property name="single_line_mode">False</property>
+		      <property name="angle">0</property>
 		    </widget>
 		    <packing>
 		      <property name="padding">0</property>
@@ -490,6 +531,10 @@ Disabled</property>
 			  <property name="yalign">0.5</property>
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="padding">0</property>
@@ -520,6 +565,10 @@ Disabled</property>
 			      <property name="yalign">0.5</property>
 			      <property name="xpad">0</property>
 			      <property name="ypad">0</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
 			    </widget>
 			    <packing>
 			      <property name="left_attach">0</property>
@@ -557,6 +606,9 @@ Disabled</property>
 			    <widget class="GtkComboBoxEntry" id="autologin_combo">
 			      <property name="visible">True</property>
 			      <property name="items" translatable="yes">dummy</property>
+			      <property name="add_tearoffs">False</property>
+			      <property name="has_frame">True</property>
+			      <property name="focus_on_click">True</property>
 			    </widget>
 			    <packing>
 			      <property name="left_attach">1</property>
@@ -608,6 +660,10 @@ Disabled</property>
 		      <property name="yalign">0.5</property>
 		      <property name="xpad">0</property>
 		      <property name="ypad">0</property>
+		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		      <property name="width_chars">-1</property>
+		      <property name="single_line_mode">False</property>
+		      <property name="angle">0</property>
 		    </widget>
 		    <packing>
 		      <property name="padding">0</property>
@@ -635,6 +691,10 @@ Disabled</property>
 			  <property name="yalign">0.5</property>
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="padding">0</property>
@@ -665,6 +725,10 @@ Disabled</property>
 			      <property name="yalign">0.5</property>
 			      <property name="xpad">0</property>
 			      <property name="ypad">0</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
 			    </widget>
 			    <packing>
 			      <property name="left_attach">0</property>
@@ -690,6 +754,10 @@ Disabled</property>
 			      <property name="xpad">0</property>
 			      <property name="ypad">0</property>
 			      <property name="mnemonic_widget">timedlogin_seconds</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
 			      <accessibility>
 				<atkrelation target="timedlogin_seconds" type="label-for"/>
 			      </accessibility>
@@ -755,6 +823,9 @@ Disabled</property>
 			    <widget class="GtkComboBoxEntry" id="timedlogin_combo">
 			      <property name="visible">True</property>
 			      <property name="items" translatable="yes">dummy</property>
+			      <property name="add_tearoffs">False</property>
+			      <property name="has_frame">True</property>
+			      <property name="focus_on_click">True</property>
 			    </widget>
 			    <packing>
 			      <property name="left_attach">1</property>
@@ -796,7 +867,7 @@ Disabled</property>
 	  <child>
 	    <widget class="GtkLabel" id="label1">
 	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_1 General</property>
+	      <property name="label" translatable="yes">General</property>
 	      <property name="use_underline">True</property>
 	      <property name="use_markup">False</property>
 	      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -806,6 +877,10 @@ Disabled</property>
 	      <property name="yalign">0.5</property>
 	      <property name="xpad">0</property>
 	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
 	    </widget>
 	    <packing>
 	      <property name="type">tab</property>
@@ -844,6 +919,10 @@ Disabled</property>
 			  <property name="yalign">0.5</property>
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="padding">0</property>
@@ -871,6 +950,10 @@ Disabled</property>
 			      <property name="yalign">0.5</property>
 			      <property name="xpad">0</property>
 			      <property name="ypad">0</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
 			    </widget>
 			    <packing>
 			      <property name="padding">0</property>
@@ -1017,6 +1100,10 @@ Disabled</property>
 			  <property name="yalign">0.5</property>
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="padding">0</property>
@@ -1044,6 +1131,10 @@ Disabled</property>
 			      <property name="yalign">0.5</property>
 			      <property name="xpad">0</property>
 			      <property name="ypad">0</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
 			    </widget>
 			    <packing>
 			      <property name="padding">0</property>
@@ -1250,6 +1341,10 @@ Disabled</property>
 				      <property name="xpad">0</property>
 				      <property name="ypad">0</property>
 				      <property name="mnemonic_widget">sg_backcolor</property>
+				      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				      <property name="width_chars">-1</property>
+				      <property name="single_line_mode">False</property>
+				      <property name="angle">0</property>
 				      <accessibility>
 					<atkrelation target="sg_backcolor" type="label-for"/>
 				      </accessibility>
@@ -1324,7 +1419,7 @@ Disabled</property>
 	  <child>
 	    <widget class="GtkLabel" id="label2">
 	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_2 GTK+ Greeter</property>
+	      <property name="label" translatable="yes">GTK+ Greeter</property>
 	      <property name="use_underline">True</property>
 	      <property name="use_markup">False</property>
 	      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1334,6 +1429,10 @@ Disabled</property>
 	      <property name="yalign">0.5</property>
 	      <property name="xpad">0</property>
 	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
 	    </widget>
 	    <packing>
 	      <property name="type">tab</property>
@@ -1372,6 +1471,10 @@ Disabled</property>
 			  <property name="yalign">0.5</property>
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="padding">0</property>
@@ -1385,6 +1488,8 @@ Disabled</property>
 			  <property name="visible">True</property>
 			  <property name="items" translatable="yes">Only One Theme
 Random Theme</property>
+			  <property name="add_tearoffs">False</property>
+			  <property name="focus_on_click">True</property>
 			</widget>
 			<packing>
 			  <property name="padding">0</property>
@@ -1417,6 +1522,9 @@ Random Theme</property>
 			  <property name="rules_hint">False</property>
 			  <property name="reorderable">False</property>
 			  <property name="enable_search">False</property>
+			  <property name="fixed_height_mode">False</property>
+			  <property name="hover_selection">False</property>
+			  <property name="hover_expand">False</property>
 			</widget>
 		      </child>
 		    </widget>
@@ -1481,6 +1589,10 @@ Random Theme</property>
 				      <property name="yalign">0.5</property>
 				      <property name="xpad">0</property>
 				      <property name="ypad">0</property>
+				      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				      <property name="width_chars">-1</property>
+				      <property name="single_line_mode">False</property>
+				      <property name="angle">0</property>
 				    </widget>
 				    <packing>
 				      <property name="padding">0</property>
@@ -1521,6 +1633,10 @@ Random Theme</property>
 				      <property name="yalign">0.5</property>
 				      <property name="xpad">0</property>
 				      <property name="ypad">0</property>
+				      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				      <property name="width_chars">-1</property>
+				      <property name="single_line_mode">False</property>
+				      <property name="angle">0</property>
 				    </widget>
 				    <packing>
 				      <property name="padding">0</property>
@@ -1552,6 +1668,10 @@ Random Theme</property>
 					  <property name="yalign">0</property>
 					  <property name="xpad">0</property>
 					  <property name="ypad">0</property>
+					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					  <property name="width_chars">-1</property>
+					  <property name="single_line_mode">False</property>
+					  <property name="angle">0</property>
 					</widget>
 					<packing>
 					  <property name="left_attach">0</property>
@@ -1576,6 +1696,10 @@ Random Theme</property>
 					  <property name="yalign">0</property>
 					  <property name="xpad">0</property>
 					  <property name="ypad">0</property>
+					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					  <property name="width_chars">-1</property>
+					  <property name="single_line_mode">False</property>
+					  <property name="angle">0</property>
 					</widget>
 					<packing>
 					  <property name="left_attach">0</property>
@@ -1600,6 +1724,10 @@ Random Theme</property>
 					  <property name="yalign">0</property>
 					  <property name="xpad">0</property>
 					  <property name="ypad">0</property>
+					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					  <property name="width_chars">-1</property>
+					  <property name="single_line_mode">False</property>
+					  <property name="angle">0</property>
 					</widget>
 					<packing>
 					  <property name="left_attach">0</property>
@@ -1769,7 +1897,7 @@ widget</property>
 	  <child>
 	    <widget class="GtkLabel" id="label5">
 	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_3 Themed Greeter</property>
+	      <property name="label" translatable="yes">Themed Greeter</property>
 	      <property name="use_underline">True</property>
 	      <property name="use_markup">False</property>
 	      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1779,6 +1907,10 @@ widget</property>
 	      <property name="yalign">0.5</property>
 	      <property name="xpad">0</property>
 	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
 	    </widget>
 	    <packing>
 	      <property name="type">tab</property>
@@ -1811,6 +1943,10 @@ widget</property>
 		      <property name="yalign">0.5</property>
 		      <property name="xpad">0</property>
 		      <property name="ypad">0</property>
+		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		      <property name="width_chars">-1</property>
+		      <property name="single_line_mode">False</property>
+		      <property name="angle">0</property>
 		    </widget>
 		    <packing>
 		      <property name="padding">0</property>
@@ -1838,6 +1974,10 @@ widget</property>
 			  <property name="yalign">0.5</property>
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="padding">0</property>
@@ -1875,7 +2015,7 @@ widget</property>
 			    <widget class="GtkCheckButton" id="fb_browser">
 			      <property name="visible">True</property>
 			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">Show choosable user images (_Face Browser)</property>
+			      <property name="label" translatable="yes">Show _Face Browser</property>
 			      <property name="use_underline">True</property>
 			      <property name="relief">GTK_RELIEF_NORMAL</property>
 			      <property name="focus_on_click">True</property>
@@ -2005,6 +2145,10 @@ widget</property>
 				  <property name="yalign">0.5</property>
 				  <property name="xpad">0</property>
 				  <property name="ypad">0</property>
+				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				  <property name="width_chars">-1</property>
+				  <property name="single_line_mode">False</property>
+				  <property name="angle">0</property>
 				</widget>
 				<packing>
 				  <property name="padding">0</property>
@@ -2058,6 +2202,10 @@ widget</property>
 				  <property name="yalign">0.5</property>
 				  <property name="xpad">0</property>
 				  <property name="ypad">0</property>
+				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				  <property name="width_chars">-1</property>
+				  <property name="single_line_mode">False</property>
+				  <property name="angle">0</property>
 				</widget>
 				<packing>
 				  <property name="padding">0</property>
@@ -2096,7 +2244,7 @@ widget</property>
 			    <widget class="GtkCheckButton" id="disallow_tcp">
 			      <property name="visible">True</property>
 			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">Always _disallow TCP connections to X server (disables all remote connections)</property>
+			      <property name="label" translatable="yes">_Disallow TCP connections to Xserver (disables xforwarding, but does not affect XDMCP)</property>
 			      <property name="use_underline">True</property>
 			      <property name="relief">GTK_RELIEF_NORMAL</property>
 			      <property name="focus_on_click">True</property>
@@ -2131,6 +2279,10 @@ widget</property>
 				  <property name="xpad">0</property>
 				  <property name="ypad">0</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>
+				  <property name="angle">0</property>
 				  <accessibility>
 				    <atkrelation target="retry_delay" type="label-for"/>
 				  </accessibility>
@@ -2201,7 +2353,7 @@ widget</property>
 	  <child>
 	    <widget class="GtkLabel" id="label4">
 	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_4 Security</property>
+	      <property name="label" translatable="yes">Security</property>
 	      <property name="use_underline">True</property>
 	      <property name="use_markup">False</property>
 	      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -2211,6 +2363,10 @@ widget</property>
 	      <property name="yalign">0.5</property>
 	      <property name="xpad">0</property>
 	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
 	    </widget>
 	    <packing>
 	      <property name="type">tab</property>
@@ -2237,6 +2393,10 @@ widget</property>
 		  <property name="yalign">0.5</property>
 		  <property name="xpad">0</property>
 		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
 		</widget>
 		<packing>
 		  <property name="padding">0</property>
@@ -2264,6 +2424,10 @@ widget</property>
 		      <property name="yalign">0.5</property>
 		      <property name="xpad">0</property>
 		      <property name="ypad">0</property>
+		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		      <property name="width_chars">-1</property>
+		      <property name="single_line_mode">False</property>
+		      <property name="angle">0</property>
 		    </widget>
 		    <packing>
 		      <property name="padding">0</property>
@@ -2286,6 +2450,10 @@ from restarting (effectively not allowing this configuration application to run)
 		      <property name="yalign">0.5</property>
 		      <property name="xpad">0</property>
 		      <property name="ypad">0</property>
+		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		      <property name="width_chars">-1</property>
+		      <property name="single_line_mode">False</property>
+		      <property name="angle">0</property>
 		    </widget>
 		    <packing>
 		      <property name="padding">0</property>
@@ -2320,6 +2488,10 @@ from restarting (effectively not allowing this configuration application to run)
 		      <property name="yalign">0.5</property>
 		      <property name="xpad">0</property>
 		      <property name="ypad">0</property>
+		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		      <property name="width_chars">-1</property>
+		      <property name="single_line_mode">False</property>
+		      <property name="angle">0</property>
 		    </widget>
 		    <packing>
 		      <property name="padding">0</property>
@@ -2341,6 +2513,10 @@ from restarting (effectively not allowing this configuration application to run)
 		      <property name="yalign">0.5</property>
 		      <property name="xpad">0</property>
 		      <property name="ypad">0</property>
+		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		      <property name="width_chars">-1</property>
+		      <property name="single_line_mode">False</property>
+		      <property name="angle">0</property>
 		    </widget>
 		    <packing>
 		      <property name="padding">0</property>
@@ -2416,6 +2592,9 @@ from restarting (effectively not allowing this configuration application to run)
 					      <property name="rules_hint">False</property>
 					      <property name="reorderable">False</property>
 					      <property name="enable_search">True</property>
+					      <property name="fixed_height_mode">False</property>
+					      <property name="hover_selection">False</property>
+					      <property name="hover_expand">False</property>
 					    </widget>
 					  </child>
 					</widget>
@@ -2496,6 +2675,8 @@ from restarting (effectively not allowing this configuration application to run)
 					    <widget class="GtkComboBox" id="xserver_server_combobox">
 					      <property name="visible">True</property>
 					      <property name="items" translatable="yes"></property>
+					      <property name="add_tearoffs">False</property>
+					      <property name="focus_on_click">True</property>
 					    </widget>
 					    <packing>
 					      <property name="padding">0</property>
@@ -2571,6 +2752,10 @@ from restarting (effectively not allowing this configuration application to run)
 			      <property name="yalign">0.5</property>
 			      <property name="xpad">0</property>
 			      <property name="ypad">0</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
 			    </widget>
 			    <packing>
 			      <property name="type">label_item</property>
@@ -2627,6 +2812,10 @@ from restarting (effectively not allowing this configuration application to run)
 			      <property name="yalign">0.5</property>
 			      <property name="xpad">0</property>
 			      <property name="ypad">0</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
 			    </widget>
 			    <packing>
 			      <property name="padding">0</property>
@@ -2639,6 +2828,8 @@ from restarting (effectively not allowing this configuration application to run)
 			    <widget class="GtkComboBox" id="xserver_mod_combobox">
 			      <property name="visible">True</property>
 			      <property name="items" translatable="yes"></property>
+			      <property name="add_tearoffs">False</property>
+			      <property name="focus_on_click">True</property>
 			    </widget>
 			    <packing>
 			      <property name="padding">0</property>
@@ -2700,6 +2891,10 @@ from restarting (effectively not allowing this configuration application to run)
 					  <property name="yalign">0.5</property>
 					  <property name="xpad">0</property>
 					  <property name="ypad">0</property>
+					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					  <property name="width_chars">-1</property>
+					  <property name="single_line_mode">False</property>
+					  <property name="angle">0</property>
 					</widget>
 					<packing>
 					  <property name="padding">0</property>
@@ -2764,6 +2959,10 @@ from restarting (effectively not allowing this configuration application to run)
 					  <property name="yalign">0.5</property>
 					  <property name="xpad">0</property>
 					  <property name="ypad">0</property>
+					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					  <property name="width_chars">-1</property>
+					  <property name="single_line_mode">False</property>
+					  <property name="angle">0</property>
 					</widget>
 					<packing>
 					  <property name="padding">0</property>
@@ -2955,6 +3154,10 @@ from restarting (effectively not allowing this configuration application to run)
 					  <property name="yalign">0.5</property>
 					  <property name="xpad">0</property>
 					  <property name="ypad">0</property>
+					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					  <property name="width_chars">-1</property>
+					  <property name="single_line_mode">False</property>
+					  <property name="angle">0</property>
 					</widget>
 					<packing>
 					  <property name="padding">0</property>
@@ -3002,6 +3205,10 @@ from restarting (effectively not allowing this configuration application to run)
 					  <property name="yalign">0.5</property>
 					  <property name="xpad">0</property>
 					  <property name="ypad">0</property>
+					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					  <property name="width_chars">-1</property>
+					  <property name="single_line_mode">False</property>
+					  <property name="angle">0</property>
 					</widget>
 					<packing>
 					  <property name="padding">0</property>
@@ -3049,6 +3256,10 @@ from restarting (effectively not allowing this configuration application to run)
 					  <property name="yalign">0.5</property>
 					  <property name="xpad">0</property>
 					  <property name="ypad">0</property>
+					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					  <property name="width_chars">-1</property>
+					  <property name="single_line_mode">False</property>
+					  <property name="angle">0</property>
 					</widget>
 					<packing>
 					  <property name="padding">0</property>
@@ -3085,6 +3296,10 @@ from restarting (effectively not allowing this configuration application to run)
 			      <property name="yalign">0.5</property>
 			      <property name="xpad">0</property>
 			      <property name="ypad">0</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
 			    </widget>
 			    <packing>
 			      <property name="type">label_item</property>
@@ -3159,7 +3374,7 @@ from restarting (effectively not allowing this configuration application to run)
 	  <child>
 	    <widget class="GtkLabel" id="XServer_label">
 	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_5 XServer</property>
+	      <property name="label" translatable="yes">XServer</property>
 	      <property name="use_underline">True</property>
 	      <property name="use_markup">False</property>
 	      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -3169,6 +3384,10 @@ from restarting (effectively not allowing this configuration application to run)
 	      <property name="yalign">0.5</property>
 	      <property name="xpad">0</property>
 	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
 	    </widget>
 	    <packing>
 	      <property name="type">tab</property>
@@ -3201,6 +3420,10 @@ from restarting (effectively not allowing this configuration application to run)
 		      <property name="yalign">0.5</property>
 		      <property name="xpad">0</property>
 		      <property name="ypad">0</property>
+		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		      <property name="width_chars">-1</property>
+		      <property name="single_line_mode">False</property>
+		      <property name="angle">0</property>
 		    </widget>
 		    <packing>
 		      <property name="padding">0</property>
@@ -3228,6 +3451,10 @@ from restarting (effectively not allowing this configuration application to run)
 			  <property name="yalign">0.5</property>
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="padding">0</property>
@@ -3265,7 +3492,7 @@ from restarting (effectively not allowing this configuration application to run)
 			    <widget class="GtkCheckButton" id="acc_theme">
 			      <property name="visible">True</property>
 			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">Allow theme selection in _GTK+ Greeter.</property>
+			      <property name="label" translatable="yes">Allow theme selection in _GTK+ Greeter</property>
 			      <property name="use_underline">True</property>
 			      <property name="relief">GTK_RELIEF_NORMAL</property>
 			      <property name="focus_on_click">True</property>
@@ -3319,6 +3546,10 @@ from restarting (effectively not allowing this configuration application to run)
 				  <property name="yalign">0.5</property>
 				  <property name="xpad">0</property>
 				  <property name="ypad">0</property>
+				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				  <property name="width_chars">-1</property>
+				  <property name="single_line_mode">False</property>
+				  <property name="angle">0</property>
 				</widget>
 				<packing>
 				  <property name="padding">0</property>
@@ -3353,6 +3584,10 @@ from restarting (effectively not allowing this configuration application to run)
 					  <property name="yalign">0.5</property>
 					  <property name="xpad">0</property>
 					  <property name="ypad">0</property>
+					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					  <property name="width_chars">-1</property>
+					  <property name="single_line_mode">False</property>
+					  <property name="angle">0</property>
 					</widget>
 					<packing>
 					  <property name="padding">0</property>
@@ -3374,6 +3609,10 @@ from restarting (effectively not allowing this configuration application to run)
 					  <property name="yalign">0.5</property>
 					  <property name="xpad">0</property>
 					  <property name="ypad">0</property>
+					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					  <property name="width_chars">-1</property>
+					  <property name="single_line_mode">False</property>
+					  <property name="angle">0</property>
 					</widget>
 					<packing>
 					  <property name="padding">5</property>
@@ -3506,6 +3745,10 @@ from restarting (effectively not allowing this configuration application to run)
 				  <property name="yalign">0.5</property>
 				  <property name="xpad">0</property>
 				  <property name="ypad">0</property>
+				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				  <property name="width_chars">-1</property>
+				  <property name="single_line_mode">False</property>
+				  <property name="angle">0</property>
 				</widget>
 				<packing>
 				  <property name="padding">0</property>
@@ -3540,6 +3783,10 @@ from restarting (effectively not allowing this configuration application to run)
 					  <property name="yalign">0.5</property>
 					  <property name="xpad">0</property>
 					  <property name="ypad">0</property>
+					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					  <property name="width_chars">-1</property>
+					  <property name="single_line_mode">False</property>
+					  <property name="angle">0</property>
 					</widget>
 					<packing>
 					  <property name="padding">0</property>
@@ -3561,6 +3808,10 @@ from restarting (effectively not allowing this configuration application to run)
 					  <property name="yalign">0.5</property>
 					  <property name="xpad">0</property>
 					  <property name="ypad">0</property>
+					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					  <property name="width_chars">-1</property>
+					  <property name="single_line_mode">False</property>
+					  <property name="angle">0</property>
 					</widget>
 					<packing>
 					  <property name="padding">5</property>
@@ -3693,6 +3944,10 @@ from restarting (effectively not allowing this configuration application to run)
 				  <property name="yalign">0.5</property>
 				  <property name="xpad">0</property>
 				  <property name="ypad">0</property>
+				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				  <property name="width_chars">-1</property>
+				  <property name="single_line_mode">False</property>
+				  <property name="angle">0</property>
 				</widget>
 				<packing>
 				  <property name="padding">0</property>
@@ -3727,6 +3982,10 @@ from restarting (effectively not allowing this configuration application to run)
 					  <property name="yalign">0.5</property>
 					  <property name="xpad">0</property>
 					  <property name="ypad">0</property>
+					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					  <property name="width_chars">-1</property>
+					  <property name="single_line_mode">False</property>
+					  <property name="angle">0</property>
 					</widget>
 					<packing>
 					  <property name="padding">0</property>
@@ -3748,6 +4007,10 @@ from restarting (effectively not allowing this configuration application to run)
 					  <property name="yalign">0.5</property>
 					  <property name="xpad">0</property>
 					  <property name="ypad">0</property>
+					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					  <property name="width_chars">-1</property>
+					  <property name="single_line_mode">False</property>
+					  <property name="angle">0</property>
 					</widget>
 					<packing>
 					  <property name="padding">5</property>
@@ -3871,7 +4134,7 @@ from restarting (effectively not allowing this configuration application to run)
 	  <child>
 	    <widget class="GtkLabel" id="label59">
 	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_6 Accessibility</property>
+	      <property name="label" translatable="yes">Accessibility</property>
 	      <property name="use_underline">True</property>
 	      <property name="use_markup">False</property>
 	      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -3881,6 +4144,10 @@ from restarting (effectively not allowing this configuration application to run)
 	      <property name="yalign">0.5</property>
 	      <property name="xpad">0</property>
 	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
 	    </widget>
 	    <packing>
 	      <property name="type">tab</property>
@@ -3908,6 +4175,10 @@ from restarting (effectively not allowing this configuration application to run)
 		  <property name="yalign">0.5</property>
 		  <property name="xpad">0</property>
 		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
 		</widget>
 		<packing>
 		  <property name="padding">0</property>
@@ -3941,6 +4212,10 @@ from restarting (effectively not allowing this configuration application to run)
 			  <property name="yalign">0.5</property>
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="padding">0</property>
@@ -3995,6 +4270,10 @@ from restarting (effectively not allowing this configuration application to run)
 			      <property name="xpad">0</property>
 			      <property name="ypad">0</property>
 			      <property name="mnemonic_widget">udpport</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
 			      <accessibility>
 				<atkrelation target="udpport" type="label-for"/>
 			      </accessibility>
@@ -4023,6 +4302,10 @@ from restarting (effectively not allowing this configuration application to run)
 			      <property name="xpad">0</property>
 			      <property name="ypad">0</property>
 			      <property name="mnemonic_widget">maxpending</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
 			      <accessibility>
 				<atkrelation target="maxpending" type="label-for"/>
 			      </accessibility>
@@ -4051,6 +4334,10 @@ from restarting (effectively not allowing this configuration application to run)
 			      <property name="xpad">0</property>
 			      <property name="ypad">0</property>
 			      <property name="mnemonic_widget">maxpendingindirect</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
 			      <accessibility>
 				<atkrelation target="maxpendingindirect" type="label-for"/>
 			      </accessibility>
@@ -4079,6 +4366,10 @@ from restarting (effectively not allowing this configuration application to run)
 			      <property name="xpad">0</property>
 			      <property name="ypad">0</property>
 			      <property name="mnemonic_widget">maxremotesessions</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
 			      <accessibility>
 				<atkrelation target="maxremotesessions" type="label-for"/>
 			      </accessibility>
@@ -4107,6 +4398,10 @@ from restarting (effectively not allowing this configuration application to run)
 			      <property name="xpad">0</property>
 			      <property name="ypad">0</property>
 			      <property name="mnemonic_widget">maxwait</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
 			      <accessibility>
 				<atkrelation target="maxwait" type="label-for"/>
 			      </accessibility>
@@ -4135,6 +4430,10 @@ from restarting (effectively not allowing this configuration application to run)
 			      <property name="xpad">0</property>
 			      <property name="ypad">0</property>
 			      <property name="mnemonic_widget">maxwaitindirect</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
 			      <accessibility>
 				<atkrelation target="maxwaitindirect" type="label-for"/>
 			      </accessibility>
@@ -4163,6 +4462,10 @@ from restarting (effectively not allowing this configuration application to run)
 			      <property name="xpad">0</property>
 			      <property name="ypad">0</property>
 			      <property name="mnemonic_widget">displaysperhost</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
 			      <accessibility>
 				<atkrelation target="displaysperhost" type="label-for"/>
 			      </accessibility>
@@ -4191,6 +4494,10 @@ from restarting (effectively not allowing this configuration application to run)
 			      <property name="xpad">0</property>
 			      <property name="ypad">0</property>
 			      <property name="mnemonic_widget">pinginterval</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
 			      <accessibility>
 				<atkproperty name="AtkObject::accessible_name" translatable="yes">Ping interval (seconds):</atkproperty>
 				<atkrelation target="pinginterval" type="label-for"/>
@@ -4437,7 +4744,7 @@ from restarting (effectively not allowing this configuration application to run)
 	  <child>
 	    <widget class="GtkLabel" id="XDMCP_label">
 	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_7 XDMCP</property>
+	      <property name="label" translatable="yes">XDMCP</property>
 	      <property name="use_underline">True</property>
 	      <property name="use_markup">False</property>
 	      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -4447,6 +4754,10 @@ from restarting (effectively not allowing this configuration application to run)
 	      <property name="yalign">0.5</property>
 	      <property name="xpad">0</property>
 	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
 	    </widget>
 	    <packing>
 	      <property name="type">tab</property>
@@ -4461,10 +4772,50 @@ from restarting (effectively not allowing this configuration application to run)
 	      <property name="spacing">0</property>
 
 	      <child>
+		<widget class="GtkLabel" id="label132">
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes">The Users tab specifies which users are visible to GDM.  Users listed as Included will appear
+in the Face Browser if it is enabled in the &quot;Security&quot; tab and will also appear in the
+drop-down list for Automatic/Timed login under the &quot;General&quot; tab.  Users listed as Excluded
+will not be displayed regardless of whether &quot;Include All Users&quot; is checked.</property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">False</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">False</property>
+		  <property name="xalign">0.5</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
+		</widget>
+		<packing>
+		  <property name="padding">5</property>
+		  <property name="expand">False</property>
+		  <property name="fill">False</property>
+		</packing>
+	      </child>
+
+	      <child>
+		<widget class="GtkHSeparator" id="hseparator42">
+		  <property name="visible">True</property>
+		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">False</property>
+		</packing>
+	      </child>
+
+	      <child>
 		<widget class="GtkCheckButton" id="fb_allusers">
+		  <property name="border_width">3</property>
 		  <property name="visible">True</property>
 		  <property name="can_focus">True</property>
-		  <property name="label" translatable="yes">_Include All Users</property>
+		  <property name="label" translatable="yes">_Include All Users (Get Include user list from /etc/passwd, not appropriate if using NIS)</property>
 		  <property name="use_underline">True</property>
 		  <property name="relief">GTK_RELIEF_NORMAL</property>
 		  <property name="focus_on_click">True</property>
@@ -4473,7 +4824,7 @@ from restarting (effectively not allowing this configuration application to run)
 		  <property name="draw_indicator">True</property>
 		</widget>
 		<packing>
-		  <property name="padding">0</property>
+		  <property name="padding">5</property>
 		  <property name="expand">False</property>
 		  <property name="fill">False</property>
 		</packing>
@@ -4481,12 +4832,13 @@ from restarting (effectively not allowing this configuration application to run)
 
 	      <child>
 		<widget class="GtkHBox" id="hbox20">
+		  <property name="border_width">3</property>
 		  <property name="visible">True</property>
 		  <property name="homogeneous">False</property>
 		  <property name="spacing">0</property>
 
 		  <child>
-		    <widget class="GtkVBox" id="vbox24">
+		    <widget class="GtkVBox" id="fb_includebox">
 		      <property name="visible">True</property>
 		      <property name="homogeneous">False</property>
 		      <property name="spacing">0</property>
@@ -4504,6 +4856,10 @@ from restarting (effectively not allowing this configuration application to run)
 			  <property name="yalign">0.5</property>
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="padding">0</property>
@@ -4529,6 +4885,9 @@ from restarting (effectively not allowing this configuration application to run)
 			      <property name="rules_hint">False</property>
 			      <property name="reorderable">False</property>
 			      <property name="enable_search">True</property>
+			      <property name="fixed_height_mode">False</property>
+			      <property name="hover_selection">False</property>
+			      <property name="hover_expand">False</property>
 			    </widget>
 			  </child>
 			</widget>
@@ -4552,6 +4911,10 @@ from restarting (effectively not allowing this configuration application to run)
 			  <property name="yalign">0.5</property>
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="padding">3</property>
@@ -4632,7 +4995,7 @@ from restarting (effectively not allowing this configuration application to run)
 		  </child>
 
 		  <child>
-		    <widget class="GtkVBox" id="vbox26">
+		    <widget class="GtkVBox" id="fb_buttonbox">
 		      <property name="visible">True</property>
 		      <property name="homogeneous">True</property>
 		      <property name="spacing">0</property>
@@ -4695,6 +5058,10 @@ from restarting (effectively not allowing this configuration application to run)
 			  <property name="yalign">0.5</property>
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="padding">0</property>
@@ -4720,6 +5087,9 @@ from restarting (effectively not allowing this configuration application to run)
 			      <property name="rules_hint">False</property>
 			      <property name="reorderable">False</property>
 			      <property name="enable_search">True</property>
+			      <property name="fixed_height_mode">False</property>
+			      <property name="hover_selection">False</property>
+			      <property name="hover_expand">False</property>
 			    </widget>
 			  </child>
 			</widget>
@@ -4743,6 +5113,10 @@ from restarting (effectively not allowing this configuration application to run)
 			  <property name="yalign">0.5</property>
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="padding">3</property>
@@ -4865,6 +5239,10 @@ from restarting (effectively not allowing this configuration application to run)
 		      <property name="yalign">0.5</property>
 		      <property name="xpad">0</property>
 		      <property name="ypad">0</property>
+		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		      <property name="width_chars">-1</property>
+		      <property name="single_line_mode">False</property>
+		      <property name="angle">0</property>
 		    </widget>
 		    <packing>
 		      <property name="padding">0</property>
@@ -4890,7 +5268,7 @@ from restarting (effectively not allowing this configuration application to run)
 	  <child>
 	    <widget class="GtkLabel" id="Face_label">
 	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_8 Face Browser</property>
+	      <property name="label" translatable="yes">Users</property>
 	      <property name="use_underline">True</property>
 	      <property name="use_markup">False</property>
 	      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -4900,6 +5278,10 @@ from restarting (effectively not allowing this configuration application to run)
 	      <property name="yalign">0.5</property>
 	      <property name="xpad">0</property>
 	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
 	    </widget>
 	    <packing>
 	      <property name="type">tab</property>