Index: gtk+/gtk/gtkfilechooserdefault.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkfilechooserdefault.c,v
retrieving revision 1.312
diff -u -p -r1.312 gtkfilechooserdefault.c
--- gtk+/gtk/gtkfilechooserdefault.c	27 Jan 2006 17:22:17 -0000	1.312
+++ gtk+/gtk/gtkfilechooserdefault.c	16 Feb 2006 03:24:08 -0000
@@ -3252,6 +3252,12 @@ shortcuts_pane_create (GtkFileChooserDef
   vbox = gtk_vbox_new (FALSE, 6);
   gtk_widget_show (vbox);
 
+  /* bookmark label for clarity */
+  widget=gtk_label_new("Bookmarks");
+  gtk_box_pack_start ( GTK_BOX (vbox), widget, FALSE, FALSE, 0 );
+  gtk_misc_set_alignment( GTK_MISC (widget) ,0,0 );
+  gtk_widget_show (widget);
+
   /* Shortcuts tree */
 
   widget = shortcuts_list_create (impl);
@@ -3812,10 +3818,6 @@ file_pane_create (GtkFileChooserDefault 
   /* The path bar and 'Create Folder' button */
   hbox = gtk_hbox_new (FALSE, 12);
   gtk_widget_show (hbox);
-  impl->browse_path_bar = create_path_bar (impl);
-  g_signal_connect (impl->browse_path_bar, "path-clicked", G_CALLBACK (path_bar_clicked), impl);
-  gtk_widget_show_all (impl->browse_path_bar);
-  gtk_box_pack_start (GTK_BOX (hbox), impl->browse_path_bar, TRUE, TRUE, 0);
 
   /* Create Folder */
   impl->browse_new_folder_button = gtk_button_new_with_mnemonic (_("Create Fo_lder"));
@@ -3984,11 +3986,13 @@ save_widgets_create (GtkFileChooserDefau
   gtk_box_pack_start (GTK_BOX (vbox), alignment, FALSE, FALSE, 0);
 
   impl->save_expander = gtk_expander_new_with_mnemonic (_("_Browse for other folders"));
+  gtk_expander_set_expanded (GTK_EXPANDER (impl->save_expander),TRUE);
   gtk_container_add (GTK_CONTAINER (alignment), impl->save_expander);
   g_signal_connect (impl->save_expander, "notify::expanded",
 		    G_CALLBACK (expander_changed_cb),
 		    impl);
   gtk_widget_show_all (alignment);
+  gtk_widget_hide (impl->save_expander);
 
   impl->save_widgets = vbox;
   gtk_box_pack_start (GTK_BOX (impl), impl->save_widgets, FALSE, FALSE, 0);
@@ -4028,6 +4032,13 @@ browse_widgets_create (GtkFileChooserDef
   hpaned = gtk_hpaned_new ();
   gtk_widget_show (hpaned);
   gtk_paned_set_position (GTK_PANED (hpaned), 200); /* FIXME: this sucks */
+
+  /// add pathbar to vbox ///
+  impl->browse_path_bar = create_path_bar (impl);
+  g_signal_connect (impl->browse_path_bar, "path-clicked", G_CALLBACK (path_bar_clicked), impl);
+  gtk_widget_show_all (impl->browse_path_bar);
+  gtk_box_pack_start (GTK_BOX (vbox), impl->browse_path_bar, FALSE, FALSE, 0);
+
   gtk_box_pack_start (GTK_BOX (vbox), hpaned, TRUE, TRUE, 0);
 
   widget = shortcuts_pane_create (impl, size_group);
@@ -7330,6 +7341,12 @@ location_popup_handler (GtkFileChooserDe
   label = gtk_label_new_with_mnemonic (_("_Location:"));
   gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
 
+  /// if empty, user hit cntl-l
+  if ( !path[0] )
+  {
+     path=impl->current_folder;
+  }
+  
   entry = location_entry_create (impl, path);
 
   gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0);
Index: gtk+/gtk/gtkpathbar.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkpathbar.c,v
retrieving revision 1.51
diff -u -p -r1.51 gtkpathbar.c
--- gtk+/gtk/gtkpathbar.c	22 Nov 2005 12:40:15 -0000	1.51
+++ gtk+/gtk/gtkpathbar.c	16 Feb 2006 03:24:11 -0000
@@ -1177,11 +1177,11 @@ make_directory_button (GtkPathBar  *path
 
   switch (button_data->type)
     {
-    case ROOT_BUTTON:
-      button_data->image = gtk_image_new ();
-      child = button_data->image;
-      button_data->label = NULL;
-      break;
+//    case ROOT_BUTTON:
+//      button_data->image = gtk_image_new ();
+//      child = button_data->image;
+//      button_data->label = NULL;
+//      break;
     case HOME_BUTTON:
     case DESKTOP_BUTTON:
       button_data->image = gtk_image_new ();
@@ -1375,8 +1375,8 @@ _gtk_path_bar_set_path (GtkPathBar      
 
       new_buttons = g_list_prepend (new_buttons, button_data);
 
-      if (BUTTON_IS_FAKE_ROOT (button_data))
-	fake_root = new_buttons;
+//      if (BUTTON_IS_FAKE_ROOT (button_data))
+//	fake_root = new_buttons;
 
       path = parent_path;
       first_directory = FALSE;
