Index: gnome-ui-properties.glade
===================================================================
--- gnome-ui-properties.glade	(revision 7299)
+++ 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">
@@ -605,65 +589,56 @@
 			  <property name="right_padding">0</property>
 
 			  <child>
-			    <widget class="GtkHandleBox" id="toolbar_handlebox">
+			    <widget class="GtkToolbar" id="toolbar_toolbar">
 			      <property name="visible">True</property>
-			      <property name="shadow_type">GTK_SHADOW_OUT</property>
-			      <property name="handle_position">GTK_POS_LEFT</property>
-			      <property name="snap_edge">GTK_POS_TOP</property>
+			      <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
+			      <property name="toolbar_style">GTK_TOOLBAR_BOTH</property>
+			      <property name="tooltips">True</property>
+			      <property name="show_arrow">True</property>
 
 			      <child>
-				<widget class="GtkToolbar" id="toolbar_toolbar">
+				<widget class="GtkToolButton" id="button7">
 				  <property name="visible">True</property>
-				  <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
-				  <property name="toolbar_style">GTK_TOOLBAR_BOTH</property>
-				  <property name="tooltips">True</property>
-				  <property name="show_arrow">True</property>
+				  <property name="tooltip" translatable="yes">New File</property>
+				  <property name="stock_id">gtk-new</property>
+				  <property name="visible_horizontal">True</property>
+				  <property name="visible_vertical">True</property>
+				  <property name="is_important">True</property>
+				</widget>
+				<packing>
+				  <property name="expand">False</property>
+				  <property name="homogeneous">True</property>
+				</packing>
+			      </child>
 
-				  <child>
-				    <widget class="GtkToolButton" id="button7">
-				      <property name="visible">True</property>
-				      <property name="tooltip" translatable="yes">New File</property>
-				      <property name="stock_id">gtk-new</property>
-				      <property name="visible_horizontal">True</property>
-				      <property name="visible_vertical">True</property>
-				      <property name="is_important">True</property>
-				    </widget>
-				    <packing>
-				      <property name="expand">False</property>
-				      <property name="homogeneous">True</property>
-				    </packing>
-				  </child>
+			      <child>
+				<widget class="GtkToolButton" id="button8">
+				  <property name="visible">True</property>
+				  <property name="tooltip" translatable="yes">Open File</property>
+				  <property name="stock_id">gtk-open</property>
+				  <property name="visible_horizontal">True</property>
+				  <property name="visible_vertical">True</property>
+				  <property name="is_important">False</property>
+				</widget>
+				<packing>
+				  <property name="expand">False</property>
+				  <property name="homogeneous">True</property>
+				</packing>
+			      </child>
 
-				  <child>
-				    <widget class="GtkToolButton" id="button8">
-				      <property name="visible">True</property>
-				      <property name="tooltip" translatable="yes">Open File</property>
-				      <property name="stock_id">gtk-open</property>
-				      <property name="visible_horizontal">True</property>
-				      <property name="visible_vertical">True</property>
-				      <property name="is_important">False</property>
-				    </widget>
-				    <packing>
-				      <property name="expand">False</property>
-				      <property name="homogeneous">True</property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkToolButton" id="save_button">
-				      <property name="visible">True</property>
-				      <property name="tooltip" translatable="yes">Save File</property>
-				      <property name="stock_id">gtk-save</property>
-				      <property name="visible_horizontal">True</property>
-				      <property name="visible_vertical">True</property>
-				      <property name="is_important">False</property>
-				    </widget>
-				    <packing>
-				      <property name="expand">False</property>
-				      <property name="homogeneous">True</property>
-				    </packing>
-				  </child>
+			      <child>
+				<widget class="GtkToolButton" id="save_button">
+				  <property name="visible">True</property>
+				  <property name="tooltip" translatable="yes">Save File</property>
+				  <property name="stock_id">gtk-save</property>
+				  <property name="visible_horizontal">True</property>
+				  <property name="visible_vertical">True</property>
+				  <property name="is_important">False</property>
 				</widget>
+				<packing>
+				  <property name="expand">False</property>
+				  <property name="homogeneous">True</property>
+				</packing>
 			      </child>
 			    </widget>
 			  </child>
Index: gnome-ui-properties.c
===================================================================
--- gnome-ui-properties.c	(revision 7299)
+++ gnome-ui-properties.c	(working copy)
@@ -90,43 +90,12 @@
   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;
 }
 
 static void
-show_handlebar (GladeXML *dialog, gboolean show)
-{
-  GtkWidget *handlebox;
-  GtkWidget *toolbar;
-  GtkWidget *align;
-
-  handlebox = WID ("toolbar_handlebox");
-  toolbar = WID ("toolbar_toolbar");
-  align = WID ("toolbar_align");
-
-  g_object_ref (handlebox);
-  g_object_ref (toolbar);
-
-  if (GTK_BIN (align)->child)
-    gtk_container_remove (GTK_CONTAINER (align), GTK_BIN (align)->child);
-  if (GTK_BIN (handlebox)->child)
-    gtk_container_remove (GTK_CONTAINER (handlebox), GTK_BIN (handlebox)->child);
-  if (show)
-    {
-      gtk_container_add (GTK_CONTAINER (align), handlebox);
-      gtk_container_add (GTK_CONTAINER (handlebox), toolbar);
-      g_object_unref (handlebox);
-    }
-  else
-    {
-      gtk_container_add (GTK_CONTAINER (align), toolbar);
-    }
-  g_object_unref (toolbar);
-
-  
-}
-
-static void
 set_toolbar_style (GladeXML *dialog, const char *value)
 {
   static const GtkToolbarStyle gtk_toolbar_styles[] = 
@@ -142,15 +111,6 @@
 }
 
 static void
-toolbar_detachable_cb (GConfPropertyEditor *peditor,
-		       gchar               *key,
-		       GConfValue          *value,
-		       GladeXML            *dialog)
-{
-  show_handlebar (dialog, gconf_value_get_bool (value));
-}
-
-static void
 toolbar_style_cb (GConfPropertyEditor *peditor,
 		  gchar               *key,
 		  GConfValue          *value,
@@ -209,14 +169,6 @@
   set_have_icons (dialog, gconf_value_get_bool (value));
 }
 
-static gint
-button_press_blocker (GtkWidget *toolbar,
-		      GdkEvent  *event,
-		      gpointer   data)
-{
-  return TRUE;
-}
-
 static void
 setup_dialog (GladeXML *dialog, GConfChangeSet *changeset)
 {
@@ -226,12 +178,6 @@
   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);
-
-  peditor = gconf_peditor_new_boolean
     (changeset, "/desktop/gnome/interface/can_change_accels", WID ("menu_accel_toggle"), NULL);
 
   peditor = gconf_peditor_new_boolean
@@ -254,21 +200,11 @@
     "value_changed", 
 		    G_CALLBACK (toolbar_style_cb), dialog);
 
-  widget = WID ("toolbar_handlebox");
-  g_signal_connect (G_OBJECT (widget),
-    "button_press_event",
-    G_CALLBACK (button_press_blocker), NULL);
-
   widget = WID ("gnome_ui_properties_dialog");
   g_signal_connect (G_OBJECT (widget),
 	"response",
 	G_CALLBACK (dialog_button_clicked_cb), changeset);
 
-  show_handlebar (dialog, 
-		  gconf_client_get_bool (client,
-					 "/desktop/gnome/interface/toolbar_detachable",
-					 NULL));
-
   toolbar_style = gconf_client_get_string (client,
 					   "/desktop/gnome/interface/toolbar_style", 
 					   NULL);
