Index: gnome-ui-properties.glade
===================================================================
--- gnome-ui-properties.glade	(revision 7308)
+++ gnome-ui-properties.glade	(working copy)
@@ -18,6 +18,7 @@
   <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="urgency_hint">False</property>
   <property name="has_separator">False</property>
 
   <child internal-child="vbox">
@@ -179,25 +180,6 @@
 		      </child>
 
 		      <child>
-			<widget class="GtkCheckButton" id="detachable_toolbars_toggle">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">_Detachable toolbars</property>
-			  <property name="use_underline">True</property>
-			  <property name="relief">GTK_RELIEF_NORMAL</property>
-			  <property name="focus_on_click">True</property>
-			  <property name="active">True</property>
-			  <property name="inconsistent">False</property>
-			  <property name="draw_indicator">True</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
 			<widget class="GtkHBox" id="hbox1">
 			  <property name="visible">True</property>
 			  <property name="homogeneous">False</property>
@@ -380,6 +362,8 @@
 		      <child>
 			<widget class="GtkMenuBar" id="menubar1">
 			  <property name="visible">True</property>
+			  <property name="pack_direction">GTK_PACK_DIRECTION_LTR</property>
+			  <property name="child_pack_direction">GTK_PACK_DIRECTION_LTR</property>
 
 			  <child>
 			    <widget class="GtkMenuItem" id="File Menu">
Index: gnome-ui-properties.c
===================================================================
--- gnome-ui-properties.c	(revision 7308)
+++ gnome-ui-properties.c	(working copy)
@@ -90,6 +90,9 @@
   GladeXML *dialog;
 
   dialog = glade_xml_new (GNOMECC_GLADE_DIR "/gnome-ui-properties.glade", "gnome_ui_properties_dialog", NULL);
+  if (dialog == NULL)
+    dialog = glade_xml_new ("gnome-ui-properties.glade", "gnome_ui_properties_dialog", NULL);
+
   return dialog;
 }
 
@@ -142,11 +145,13 @@
 }
 
 static void
-toolbar_detachable_cb (GConfPropertyEditor *peditor,
-		       gchar               *key,
-		       GConfValue          *value,
-		       GladeXML            *dialog)
+toolbar_detachable_cb (GConfClient* client,
+		       const gchar* key,
+		       GConfValue* value,
+		       GladeXML *dialog)
 {
+  if (key == NULL || strcmp (key, "/desktop/gnome/interface/toolbar_detachable") != 0)
+    return;
   show_handlebar (dialog, gconf_value_get_bool (value));
 }
 
@@ -225,11 +230,9 @@
   char *toolbar_style;
   GConfClient *client = gconf_client_get_default ();
 
-  peditor = gconf_peditor_new_boolean
-    (changeset, "/desktop/gnome/interface/toolbar_detachable", WID ("detachable_toolbars_toggle"), NULL);
-  g_signal_connect (peditor,
-    "value_changed",
-    G_CALLBACK (toolbar_detachable_cb), dialog);
+  /* There's no UI for the detachable toolbars */
+  gconf_client_add_dir (client, "/desktop/gnome/interface", GCONF_CLIENT_PRELOAD_NONE, NULL);
+  g_signal_connect (G_OBJECT (client), "value-changed", G_CALLBACK (toolbar_detachable_cb), dialog);
 
   peditor = gconf_peditor_new_boolean
     (changeset, "/desktop/gnome/interface/can_change_accels", WID ("menu_accel_toggle"), NULL);
