modified GtkFileChooserDialog for embedded

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2596 311d38ba-8fff-0310-9ca6-ca027cbcb966

6 files changed, 6977 insertions, 2 deletions

diff --git a/meta/packages/gtk+/gtk+-2.10.14/filechooser-default.patch b/meta/packages/gtk+/gtk+-2.10.14/filechooser-default.patch
new file mode 100644
index 000000000..0495cc9a8
--- /dev/null
+++ b/meta/packages/gtk+/gtk+-2.10.14/filechooser-default.patch
@@ -0,0 +1,6637 @@
+Index: gtk+-2.10.14/gtk/gtkfilechooserdefault.c
+===================================================================
+--- gtk+-2.10.14.orig/gtk/gtkfilechooserdefault.c	2007-07-16 20:44:17.000000000 +0100
++++ gtk+-2.10.14/gtk/gtkfilechooserdefault.c	2007-08-29 18:03:50.000000000 +0100
+@@ -33,7 +33,6 @@
+ #include "gtkcombobox.h"
+ #include "gtkentry.h"
+ #include "gtkeventbox.h"
+-#include "gtkexpander.h"
+ #include "gtkfilechooserprivate.h"
+ #include "gtkfilechooserdefault.h"
+ #include "gtkfilechooserembed.h"
+@@ -54,7 +53,6 @@
+ #include "gtkmarshalers.h"
+ #include "gtkmenuitem.h"
+ #include "gtkmessagedialog.h"
+-#include "gtkpathbar.h"
+ #include "gtkprivate.h"
+ #include "gtkradiobutton.h"
+ #include "gtkscrolledwindow.h"
+@@ -88,6 +86,8 @@
+ #include <io.h>
+ #endif
+ 
++#define DEFAULT_SPACING 5
++
+ /* Profiling stuff */
+ #undef PROFILE_FILE_CHOOSER
+ #ifdef PROFILE_FILE_CHOOSER
+@@ -98,6 +98,7 @@
+ #endif
+ 
+ #define PROFILE_INDENT 4
++
+ static int profile_indent;
+ 
+ static void
+@@ -137,8 +138,6 @@
+ #define profile_msg(x, y)
+ #endif
+ 
+-
+-
+ typedef struct _GtkFileChooserDefaultClass GtkFileChooserDefaultClass;
+ 
+ #define GTK_FILE_CHOOSER_DEFAULT_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_FILE_CHOOSER_DEFAULT, GtkFileChooserDefaultClass))
+@@ -146,6 +145,7 @@
+ #define GTK_FILE_CHOOSER_DEFAULT_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_FILE_CHOOSER_DEFAULT, GtkFileChooserDefaultClass))
+ 
+ #define MAX_LOADING_TIME 500
++#define LONG_CLICK_LENGTH 500
+ 
+ struct _GtkFileChooserDefaultClass
+ {
+@@ -159,27 +159,12 @@
+   UP_FOLDER,
+   DOWN_FOLDER,
+   HOME_FOLDER,
+-  DESKTOP_FOLDER,
+-  QUICK_BOOKMARK,
+-  LOCATION_TOGGLE_POPUP,
+   SHOW_HIDDEN,
+   LAST_SIGNAL
+ };
+ 
+ static guint signals[LAST_SIGNAL] = { 0 };
+ 
+-/* Column numbers for the shortcuts tree.  Keep these in sync with shortcuts_model_create() */
+-enum {
+-  SHORTCUTS_COL_PIXBUF,
+-  SHORTCUTS_COL_NAME,
+-  SHORTCUTS_COL_DATA,
+-  SHORTCUTS_COL_IS_VOLUME,
+-  SHORTCUTS_COL_REMOVABLE,
+-  SHORTCUTS_COL_PIXBUF_VISIBLE,
+-  SHORTCUTS_COL_HANDLE,
+-  SHORTCUTS_COL_NUM_COLUMNS
+-};
+-
+ /* Column numbers for the file list */
+ enum {
+   FILE_LIST_COL_NAME,
+@@ -188,62 +173,10 @@
+   FILE_LIST_COL_NUM_COLUMNS
+ };
+ 
+-/* Identifiers for target types */
+-enum {
+-  GTK_TREE_MODEL_ROW,
+-  TEXT_URI_LIST
+-};
+-
+-/* Target types for dragging from the shortcuts list */
+-static const GtkTargetEntry shortcuts_source_targets[] = {
+-  { "GTK_TREE_MODEL_ROW", GTK_TARGET_SAME_WIDGET, GTK_TREE_MODEL_ROW }
+-};
+-
+-static const int num_shortcuts_source_targets = (sizeof (shortcuts_source_targets)
+-						 / sizeof (shortcuts_source_targets[0]));
+-
+-/* Target types for dropping into the shortcuts list */
+-static const GtkTargetEntry shortcuts_dest_targets[] = {
+-  { "GTK_TREE_MODEL_ROW", GTK_TARGET_SAME_WIDGET, GTK_TREE_MODEL_ROW },
+-  { "text/uri-list", 0, TEXT_URI_LIST }
+-};
+-
+-static const int num_shortcuts_dest_targets = (sizeof (shortcuts_dest_targets)
+-					       / sizeof (shortcuts_dest_targets[0]));
+-
+-/* Target types for DnD from the file list */
+-static const GtkTargetEntry file_list_source_targets[] = {
+-  { "text/uri-list", 0, TEXT_URI_LIST }
+-};
+-
+-static const int num_file_list_source_targets = (sizeof (file_list_source_targets)
+-						 / sizeof (file_list_source_targets[0]));
+-
+-/* Target types for dropping into the file list */
+-static const GtkTargetEntry file_list_dest_targets[] = {
+-  { "text/uri-list", 0, TEXT_URI_LIST }
+-};
+-
+-static const int num_file_list_dest_targets = (sizeof (file_list_dest_targets)
+-					       / sizeof (file_list_dest_targets[0]));
+-
+-
+-/* Interesting places in the shortcuts bar */
+-typedef enum {
+-  SHORTCUTS_HOME,
+-  SHORTCUTS_DESKTOP,
+-  SHORTCUTS_VOLUMES,
+-  SHORTCUTS_SHORTCUTS,
+-  SHORTCUTS_BOOKMARKS_SEPARATOR,
+-  SHORTCUTS_BOOKMARKS,
+-  SHORTCUTS_CURRENT_FOLDER_SEPARATOR,
+-  SHORTCUTS_CURRENT_FOLDER
+-} ShortcutsIndex;
+-
+ /* Icon size for if we can't get it from the theme */
+-#define FALLBACK_ICON_SIZE 16
++#define FALLBACK_ICON_SIZE 24
+ 
+-#define PREVIEW_HBOX_SPACING 12
++#define LIST_HBOX_SPACING DEFAULT_SPACING
+ #define NUM_LINES 45
+ #define NUM_CHARS 60
+ 
+@@ -308,7 +241,6 @@
+ 								       const GtkFilePath *path,
+ 								       GError           **error);
+ static GSList *       gtk_file_chooser_default_list_shortcut_folders  (GtkFileChooser    *chooser);
+-
+ static void           gtk_file_chooser_default_get_default_size       (GtkFileChooserEmbed *chooser_embed,
+ 								       gint                *default_width,
+ 								       gint                *default_height);
+@@ -316,50 +248,17 @@
+ static gboolean       gtk_file_chooser_default_should_respond         (GtkFileChooserEmbed *chooser_embed);
+ static void           gtk_file_chooser_default_initial_focus          (GtkFileChooserEmbed *chooser_embed);
+ 
+-static void location_popup_handler (GtkFileChooserDefault *impl,
+-				    const gchar           *path);
+-static void location_popup_on_paste_handler (GtkFileChooserDefault *impl);
+-static void location_toggle_popup_handler   (GtkFileChooserDefault *impl);
+ static void up_folder_handler      (GtkFileChooserDefault *impl);
+ static void down_folder_handler    (GtkFileChooserDefault *impl);
+ static void home_folder_handler    (GtkFileChooserDefault *impl);
+-static void desktop_folder_handler (GtkFileChooserDefault *impl);
+-static void quick_bookmark_handler (GtkFileChooserDefault *impl,
+-				    gint                   bookmark_index);
+ static void show_hidden_handler    (GtkFileChooserDefault *impl);
+ static void update_appearance      (GtkFileChooserDefault *impl);
+ 
+-static void set_current_filter   (GtkFileChooserDefault *impl,
+-				  GtkFileFilter         *filter);
+-static void check_preview_change (GtkFileChooserDefault *impl);
+-
+ static void filter_combo_changed       (GtkComboBox           *combo_box,
+ 					GtkFileChooserDefault *impl);
+-static void     shortcuts_row_activated_cb (GtkTreeView           *tree_view,
+-					    GtkTreePath           *path,
+-					    GtkTreeViewColumn     *column,
+-					    GtkFileChooserDefault *impl);
+-
+-static gboolean shortcuts_key_press_event_cb (GtkWidget             *widget,
+-					      GdkEventKey           *event,
+-					      GtkFileChooserDefault *impl);
+-
+-static gboolean shortcuts_select_func   (GtkTreeSelection      *selection,
+-					 GtkTreeModel          *model,
+-					 GtkTreePath           *path,
+-					 gboolean               path_currently_selected,
+-					 gpointer               data);
+-static gboolean shortcuts_get_selected  (GtkFileChooserDefault *impl,
+-					 GtkTreeIter           *iter);
+-static void shortcuts_activate_iter (GtkFileChooserDefault *impl,
+-				     GtkTreeIter           *iter);
+-static int shortcuts_get_index (GtkFileChooserDefault *impl,
+-				ShortcutsIndex         where);
+-static int shortcut_find_position (GtkFileChooserDefault *impl,
+-				   const GtkFilePath     *path);
+-
+-static void bookmarks_check_add_sensitivity (GtkFileChooserDefault *impl);
+ 
++static void set_current_filter   (GtkFileChooserDefault *impl,
++				  GtkFileFilter         *filter);
+ static gboolean list_select_func   (GtkTreeSelection      *selection,
+ 				    GtkTreeModel          *model,
+ 				    GtkTreePath           *path,
+@@ -378,19 +277,6 @@
+ 			 GtkTreeIter        *iter,
+ 			 gpointer            user_data);
+ 
+-static void path_bar_clicked           (GtkPathBar            *path_bar,
+-					GtkFilePath           *file_path,
+-					GtkFilePath	      *child_path,
+-					gboolean               child_is_hidden,
+-					GtkFileChooserDefault *impl);
+-
+-static void add_bookmark_button_clicked_cb    (GtkButton             *button,
+-					       GtkFileChooserDefault *impl);
+-static void remove_bookmark_button_clicked_cb (GtkButton             *button,
+-					       GtkFileChooserDefault *impl);
+-static void save_folder_combo_changed_cb      (GtkComboBox           *combo,
+-					       GtkFileChooserDefault *impl);
+-
+ static void list_icon_data_func (GtkTreeViewColumn *tree_column,
+ 				 GtkCellRenderer   *cell,
+ 				 GtkTreeModel      *tree_model,
+@@ -422,40 +308,8 @@
+ 
+ static void location_button_toggled_cb (GtkToggleButton *toggle,
+ 					GtkFileChooserDefault *impl);
+-static void location_switch_to_path_bar (GtkFileChooserDefault *impl);
+ static void settings_load               (GtkFileChooserDefault *impl);
+ 
+-
+-
+-/* Drag and drop interface declarations */
+-
+-typedef struct {
+-  GtkTreeModelFilter parent;
+-
+-  GtkFileChooserDefault *impl;
+-} ShortcutsModelFilter;
+-
+-typedef struct {
+-  GtkTreeModelFilterClass parent_class;
+-} ShortcutsModelFilterClass;
+-
+-#define SHORTCUTS_MODEL_FILTER_TYPE (_shortcuts_model_filter_get_type ())
+-#define SHORTCUTS_MODEL_FILTER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SHORTCUTS_MODEL_FILTER_TYPE, ShortcutsModelFilter))
+-
+-static void shortcuts_model_filter_drag_source_iface_init (GtkTreeDragSourceIface *iface);
+-
+-G_DEFINE_TYPE_WITH_CODE (ShortcutsModelFilter,
+-			 _shortcuts_model_filter,
+-			 GTK_TYPE_TREE_MODEL_FILTER,
+-			 G_IMPLEMENT_INTERFACE (GTK_TYPE_TREE_DRAG_SOURCE,
+-						shortcuts_model_filter_drag_source_iface_init))
+-
+-static GtkTreeModel *shortcuts_model_filter_new (GtkFileChooserDefault *impl,
+-						 GtkTreeModel          *child_model,
+-						 GtkTreePath           *root);
+-
+-
+-
+ G_DEFINE_TYPE_WITH_CODE (GtkFileChooserDefault, _gtk_file_chooser_default, GTK_TYPE_VBOX,
+ 			 G_IMPLEMENT_INTERFACE (GTK_TYPE_FILE_CHOOSER,
+ 						gtk_file_chooser_default_iface_init)
+@@ -465,13 +319,9 @@
+ static void
+ _gtk_file_chooser_default_class_init (GtkFileChooserDefaultClass *class)
+ {
+-  static const guint quick_bookmark_keyvals[10] = {
+-    GDK_1, GDK_2, GDK_3, GDK_4, GDK_5, GDK_6, GDK_7, GDK_8, GDK_9, GDK_0
+-  };
+   GObjectClass *gobject_class = G_OBJECT_CLASS (class);
+   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
+   GtkBindingSet *binding_set;
+-  int i;
+ 
+   gobject_class->finalize = gtk_file_chooser_default_finalize;
+   gobject_class->constructor = gtk_file_chooser_default_constructor;
+@@ -491,7 +341,7 @@
+     _gtk_binding_signal_new (I_("location-popup"),
+ 			     G_OBJECT_CLASS_TYPE (class),
+ 			     G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
+-			     G_CALLBACK (location_popup_handler),
++			     NULL,
+ 			     NULL, NULL,
+ 			     _gtk_marshal_VOID__STRING,
+ 			     G_TYPE_NONE, 1, G_TYPE_STRING);
+@@ -499,15 +349,7 @@
+     _gtk_binding_signal_new ("location-popup-on-paste",
+ 			     G_OBJECT_CLASS_TYPE (class),
+ 			     G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
+-			     G_CALLBACK (location_popup_on_paste_handler),
+-			     NULL, NULL,
+-			     _gtk_marshal_VOID__VOID,
+-			     G_TYPE_NONE, 0);
+-  signals[LOCATION_TOGGLE_POPUP] =
+-    _gtk_binding_signal_new (I_("location-toggle-popup"),
+-			     G_OBJECT_CLASS_TYPE (class),
+-			     G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
+-			     G_CALLBACK (location_toggle_popup_handler),
++			     NULL,
+ 			     NULL, NULL,
+ 			     _gtk_marshal_VOID__VOID,
+ 			     G_TYPE_NONE, 0);
+@@ -535,22 +377,6 @@
+ 			     NULL, NULL,
+ 			     _gtk_marshal_VOID__VOID,
+ 			     G_TYPE_NONE, 0);
+-  signals[DESKTOP_FOLDER] =
+-    _gtk_binding_signal_new (I_("desktop-folder"),
+-			     G_OBJECT_CLASS_TYPE (class),
+-			     G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
+-			     G_CALLBACK (desktop_folder_handler),
+-			     NULL, NULL,
+-			     _gtk_marshal_VOID__VOID,
+-			     G_TYPE_NONE, 0);
+-  signals[QUICK_BOOKMARK] =
+-    _gtk_binding_signal_new (I_("quick-bookmark"),
+-			     G_OBJECT_CLASS_TYPE (class),
+-			     G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
+-			     G_CALLBACK (quick_bookmark_handler),
+-			     NULL, NULL,
+-			     _gtk_marshal_VOID__INT,
+-			     G_TYPE_NONE, 1, G_TYPE_INT);
+   signals[SHOW_HIDDEN] =
+     _gtk_binding_signal_new ("show-hidden",
+ 			     G_OBJECT_CLASS_TYPE (class),
+@@ -618,20 +444,10 @@
+ 				"home-folder",
+ 				0);
+   gtk_binding_entry_add_signal (binding_set,
+-				GDK_d, GDK_MOD1_MASK,
+-				"desktop-folder",
+-				0);
+-  gtk_binding_entry_add_signal (binding_set,
+ 				GDK_h, GDK_CONTROL_MASK,
+                                 "show-hidden",
+                                 0);
+ 
+-  for (i = 0; i < 10; i++)
+-    gtk_binding_entry_add_signal (binding_set,
+-				  quick_bookmark_keyvals[i], GDK_MOD1_MASK,
+-				  "quick-bookmark",
+-				  1, G_TYPE_INT, i);
+-
+   _gtk_file_chooser_install_properties (gobject_class);
+ 
+   gtk_settings_install_property (g_param_spec_string ("gtk-file-chooser-backend",
+@@ -649,7 +465,6 @@
+   iface->select_all = gtk_file_chooser_default_select_all;
+   iface->unselect_all = gtk_file_chooser_default_unselect_all;
+   iface->get_paths = gtk_file_chooser_default_get_paths;
+-  iface->get_preview_path = gtk_file_chooser_default_get_preview_path;
+   iface->get_file_system = gtk_file_chooser_default_get_file_system;
+   iface->set_current_folder = gtk_file_chooser_default_set_current_folder;
+   iface->get_current_folder = gtk_file_chooser_default_get_current_folder;
+@@ -657,9 +472,12 @@
+   iface->add_filter = gtk_file_chooser_default_add_filter;
+   iface->remove_filter = gtk_file_chooser_default_remove_filter;
+   iface->list_filters = gtk_file_chooser_default_list_filters;
++
++  /* these are only stubs */
++  iface->get_preview_path = gtk_file_chooser_default_get_preview_path;
+   iface->add_shortcut_folder = gtk_file_chooser_default_add_shortcut_folder;
+   iface->remove_shortcut_folder = gtk_file_chooser_default_remove_shortcut_folder;
+-  iface->list_shortcut_folders = gtk_file_chooser_default_list_shortcut_folders;
++
+ }
+ 
+ static void
+@@ -679,80 +497,27 @@
+   access ("MARK: *** CREATE FILE CHOOSER", F_OK);
+ #endif
+   impl->local_only = TRUE;
+-  impl->preview_widget_active = TRUE;
+-  impl->use_preview_label = TRUE;
+   impl->select_multiple = FALSE;
+   impl->show_hidden = FALSE;
++  impl->show_create_folder = TRUE;
+   impl->icon_size = FALLBACK_ICON_SIZE;
+   impl->load_state = LOAD_EMPTY;
+   impl->reload_state = RELOAD_EMPTY;
+   impl->pending_select_paths = NULL;
+-  impl->location_mode = LOCATION_MODE_PATH_BAR;
++  impl->location_mode = LOCATION_MODE_FILENAME_ENTRY;
++  impl->path_history = NULL;
+ 
+-  gtk_box_set_spacing (GTK_BOX (impl), 12);
++  gtk_box_set_spacing (GTK_BOX (impl), DEFAULT_SPACING);
+ 
+   impl->tooltips = gtk_tooltips_new ();
+   g_object_ref_sink (impl->tooltips);
+ 
+-  profile_end ("end", NULL);
+-}
+-
+-/* Frees the data columns for the specified iter in the shortcuts model*/
+-static void
+-shortcuts_free_row_data (GtkFileChooserDefault *impl,
+-			 GtkTreeIter           *iter)
+-{
+-  gpointer col_data;
+-  gboolean is_volume;
+-  GtkFileSystemHandle *handle;
+-
+-  gtk_tree_model_get (GTK_TREE_MODEL (impl->shortcuts_model), iter,
+-		      SHORTCUTS_COL_DATA, &col_data,
+-		      SHORTCUTS_COL_IS_VOLUME, &is_volume,
+-		      SHORTCUTS_COL_HANDLE, &handle,
+-		      -1);
+-
+-  if (handle)
+-    gtk_file_system_cancel_operation (handle);
+-
+-  if (!col_data)
+-    return;
+-
+-  if (is_volume)
+-    {
+-      GtkFileSystemVolume *volume;
+-
+-      volume = col_data;
+-      gtk_file_system_volume_free (impl->file_system, volume);
+-    }
+-  else
+-    {
+-      GtkFilePath *path;
++  if (!impl->root_folder)
++      impl->root_folder = g_strdup ("/");
+ 
+-      path = col_data;
+-      gtk_file_path_free (path);
+-    }
++  profile_end ("end", NULL);
+ }
+ 
+-/* Frees all the data columns in the shortcuts model */
+-static void
+-shortcuts_free (GtkFileChooserDefault *impl)
+-{
+-  GtkTreeIter iter;
+-
+-  if (!impl->shortcuts_model)
+-    return;
+-
+-  if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (impl->shortcuts_model), &iter))
+-    do
+-      {
+-	shortcuts_free_row_data (impl, &iter);
+-      }
+-    while (gtk_tree_model_iter_next (GTK_TREE_MODEL (impl->shortcuts_model), &iter));
+-
+-  g_object_unref (impl->shortcuts_model);
+-  impl->shortcuts_model = NULL;
+-}
+ 
+ static void
+ pending_select_paths_free (GtkFileChooserDefault *impl)
+@@ -771,6 +536,7 @@
+   impl->pending_select_paths = NULL;
+ }
+ 
++
+ static void
+ pending_select_paths_add (GtkFileChooserDefault *impl,
+ 			  const GtkFilePath     *path)
+@@ -810,15 +576,27 @@
+ }
+ 
+ static void
+-gtk_file_chooser_default_finalize (GObject *object)
++path_history_free (GtkFileChooserDefault *impl)
+ {
+-  GtkFileChooserDefault *impl = GTK_FILE_CHOOSER_DEFAULT (object);
+   GSList *l;
+ 
+-  if (impl->shortcuts_filter_model)
+-    g_object_unref (impl->shortcuts_filter_model);
++  for (l = impl->path_history; l; l = l->next)
++    {
++      GtkFilePath *path;
++
++      path = l->data;
++      gtk_file_path_free (path);
++    }
++
++  g_slist_free (impl->path_history);
++  impl->path_history = NULL;
++}
+ 
+-  shortcuts_free (impl);
++static void
++gtk_file_chooser_default_finalize (GObject *object)
++{
++  GtkFileChooserDefault *impl = GTK_FILE_CHOOSER_DEFAULT (object);
++  GSList *l;
+ 
+   g_object_unref (impl->file_system);
+ 
+@@ -842,8 +620,7 @@
+   if (impl->current_folder)
+     gtk_file_path_free (impl->current_folder);
+ 
+-  if (impl->preview_path)
+-    gtk_file_path_free (impl->preview_path);
++  path_history_free (impl);
+ 
+   load_remove_timer (impl);
+ 
+@@ -854,12 +631,18 @@
+   if (impl->sort_model)
+     g_object_unref (impl->sort_model);
+ 
+-  g_free (impl->preview_display_name);
++  if (impl->list_press_path)
++    {
++      gtk_tree_path_free (impl->list_press_path);
++      impl->list_press_path = NULL;
++    }
+ 
+   g_free (impl->edited_new_text);
+ 
+   g_object_unref (impl->tooltips);
+ 
++  g_free (impl->root_folder);
++
+   G_OBJECT_CLASS (_gtk_file_chooser_default_parent_class)->finalize (object);
+ }
+ 
+@@ -944,28 +727,6 @@
+ 		path, error);
+ }
+ 
+-/* Shows an error dialog about not being able to add a bookmark */
+-static void
+-error_adding_bookmark_dialog (GtkFileChooserDefault *impl,
+-			      const GtkFilePath     *path,
+-			      GError                *error)
+-{
+-  error_dialog (impl,
+-		_("Could not add a bookmark"),
+-		path, error);
+-}
+-
+-/* Shows an error dialog about not being able to remove a bookmark */
+-static void
+-error_removing_bookmark_dialog (GtkFileChooserDefault *impl,
+-				const GtkFilePath     *path,
+-				GError                *error)
+-{
+-  error_dialog (impl,
+-		_("Could not remove bookmark"),
+-		path, error);
+-}
+-
+ /* Shows an error dialog about not being able to create a folder */
+ static void
+ error_creating_folder_dialog (GtkFileChooserDefault *impl,
+@@ -1015,2637 +776,387 @@
+ 
+ /* Changes folders, displaying an error dialog if this fails */
+ static gboolean
+-change_folder_and_display_error (GtkFileChooserDefault *impl,
+-				 const GtkFilePath     *path,
+-				 gboolean               clear_entry)
++change_folder (GtkFileChooserDefault *impl, const GtkFilePath *path,
++ 	       gboolean errormsg)
+ {
+   GError *error;
+   gboolean result;
+   GtkFilePath *path_copy;
++  gchar * file_name;
+ 
+   g_return_val_if_fail (path != NULL, FALSE);
+ 
+-  profile_start ("start", (char *) path);
++  path_copy = gtk_file_path_copy (path);
++  file_name = gtk_file_system_path_to_filename (impl->file_system, path_copy);
+ 
+-  /* We copy the path because of this case:
+-   *
+-   * list_row_activated()
+-   *   fetches path from model; path belongs to the model (*)
+-   *   calls change_folder_and_display_error()
+-   *     calls _gtk_file_chooser_set_current_folder_path()
+-   *       changing folders fails, sets model to NULL, thus freeing the path in (*)
+-   */
++  if (!file_name)
++  {
++      gtk_file_path_free (path_copy);
++      return 0;
++  }
++
++  if (impl->root_folder && file_name[0] == '/' && file_name[1] == 0)
++  {
++      /* If changing to / and we have root_folder, change into it instead */
++      gtk_file_path_free (path_copy);
++      path_copy = gtk_file_system_filename_to_path (impl->file_system,
++						    impl->root_folder);
++
++      gtk_widget_set_sensitive (impl->up_button, FALSE);
++  }
++  else if (impl->root_folder &&
++	   strcmp (file_name, impl->root_folder) &&
++	   !strncmp (file_name, impl->root_folder, strlen (file_name)))
++  {
++      /* refuse to change below the root */
++      gtk_file_path_free (path_copy);
++      g_free (file_name);
++      return 0;
++  }
++  else if (!strcmp (file_name, impl->root_folder))
++  {
++      gtk_widget_set_sensitive (impl->up_button, FALSE);
++  }
++  else if (impl->current_folder && !strcmp (file_name, "/media"))
++  {
++      /* Asked to changed into /media -- if we are already in a media
++       * child folder, we refuse, but if we are in the root, we permit this
++       */
++      gchar *name =
++	  gtk_file_system_path_to_filename (impl->file_system,
++					    impl->current_folder);
++
++      if (name && !strncmp (name, "/media", 6))
++      {
++	  g_free (name);
++	  gtk_file_path_free (path_copy);
++	  g_free (file_name);
++	  return 0;
++      }
++
++      gtk_widget_set_sensitive (impl->up_button, TRUE);
++  }
++  else if (!strncmp (file_name, "/media/", 7))
++  {
++      /* Changing into a media child -- if it is an immediate child, disable
++       * the Up button
++       */
++      gchar * p = file_name + 7;
++      gchar * q = strchr (p, '/');
++      if (!q)
++	  gtk_widget_set_sensitive (impl->up_button, FALSE);
++      else
++	  gtk_widget_set_sensitive (impl->up_button, TRUE);
++  }
++  else
++  {
++      gtk_widget_set_sensitive (impl->up_button, TRUE);
++  }
+ 
+-  path_copy = gtk_file_path_copy (path);
+ 
+   error = NULL;
+-  result = gtk_file_chooser_default_update_current_folder (GTK_FILE_CHOOSER (impl), path_copy, TRUE, clear_entry, &error);
++  result = _gtk_file_chooser_set_current_folder_path (GTK_FILE_CHOOSER (impl), path_copy, &error);
+ 
+-  if (!result)
++  if (errormsg && !result)
+     error_changing_folder_dialog (impl, path_copy, error);
+ 
+   gtk_file_path_free (path_copy);
+-
+-  profile_end ("end", (char *) path);
++  g_free (file_name);
+ 
+   return result;
+ }
+ 
+-static void
+-update_preview_widget_visibility (GtkFileChooserDefault *impl)
++static gboolean
++change_folder_and_display_error (GtkFileChooserDefault *impl,
++				 const GtkFilePath     *path)
+ {
+-  if (impl->use_preview_label)
+-    {
+-      if (!impl->preview_label)
+-	{
+-	  impl->preview_label = gtk_label_new (impl->preview_display_name);
+-	  gtk_box_pack_start (GTK_BOX (impl->preview_box), impl->preview_label, FALSE, FALSE, 0);
+-	  gtk_box_reorder_child (GTK_BOX (impl->preview_box), impl->preview_label, 0);
+-	  gtk_label_set_ellipsize (GTK_LABEL (impl->preview_label), PANGO_ELLIPSIZE_MIDDLE);
+-	  gtk_widget_show (impl->preview_label);
+-	}
+-    }
++    return change_folder (impl, path, TRUE);
++}
++
++
++/* FIXME: GtkFileSystem needs a function to split a remote path
++ * into hostname and path components, or maybe just have a
++ * gtk_file_system_path_get_display_name().
++ *
++ * This function is also used in gtkfilechooserbutton.c
++ */
++gchar *
++_gtk_file_chooser_label_for_uri (const gchar *uri)
++{
++  const gchar *path, *start, *end, *p;
++  gchar *host, *label;
++
++  start = strstr (uri, "://");
++  start += 3;
++  path = strchr (start, '/');
++
++  if (path)
++    end = path;
+   else
+     {
+-      if (impl->preview_label)
+-	{
+-	  gtk_widget_destroy (impl->preview_label);
+-	  impl->preview_label = NULL;
+-	}
++      end = uri + strlen (uri);
++      path = "/";
+     }
+ 
+-  if (impl->preview_widget_active && impl->preview_widget)
+-    gtk_widget_show (impl->preview_box);
+-  else
+-    gtk_widget_hide (impl->preview_box);
++  /* strip username */
++  p = strchr (start, '@');
++  if (p && p < end)
++    {
++      start = p + 1;
++    }
+ 
+-  g_signal_emit_by_name (impl, "default-size-changed");
+-}
++  p = strchr (start, ':');
++  if (p && p < end)
++    end = p;
+ 
+-static void
+-set_preview_widget (GtkFileChooserDefault *impl,
+-		    GtkWidget             *preview_widget)
+-{
+-  if (preview_widget == impl->preview_widget)
+-    return;
++  host = g_strndup (start, end - start);
+ 
+-  if (impl->preview_widget)
+-    gtk_container_remove (GTK_CONTAINER (impl->preview_box),
+-			  impl->preview_widget);
++  /* Translators: the first string is a path and the second string
++   * is a hostname. Nautilus and the panel contain the same string
++   * to translate.
++   */
++  label = g_strdup_printf (_("%1$s on %2$s"), path, host);
+ 
+-  impl->preview_widget = preview_widget;
+-  if (impl->preview_widget)
+-    {
+-      gtk_widget_show (impl->preview_widget);
+-      gtk_box_pack_start (GTK_BOX (impl->preview_box), impl->preview_widget, TRUE, TRUE, 0);
+-      gtk_box_reorder_child (GTK_BOX (impl->preview_box),
+-			     impl->preview_widget,
+-			     (impl->use_preview_label && impl->preview_label) ? 1 : 0);
+-    }
++  g_free (host);
+ 
+-  update_preview_widget_visibility (impl);
++  return label;
+ }
+ 
+-/* Re-reads all the icons for the shortcuts, used when the theme changes */
+-struct ReloadIconsData
+-{
+-  GtkFileChooserDefault *impl;
+-  GtkTreeRowReference *row_ref;
+-};
+ 
++/* Callback used when the "New Folder" button is clicked */
+ static void
+-shortcuts_reload_icons_get_info_cb (GtkFileSystemHandle *handle,
+-				    const GtkFileInfo   *info,
+-				    const GError        *error,
+-				    gpointer             user_data)
++new_folder_button_clicked (GtkButton             *button,
++			   GtkFileChooserDefault *impl)
+ {
+-  GdkPixbuf *pixbuf;
+   GtkTreeIter iter;
+   GtkTreePath *path;
+-  gboolean cancelled = handle->cancelled;
+-  struct ReloadIconsData *data = user_data;
+-
+-  if (!g_slist_find (data->impl->reload_icon_handles, handle))
+-    goto out;
+-
+-  data->impl->reload_icon_handles = g_slist_remove (data->impl->reload_icon_handles, handle);
+ 
+-  if (cancelled || error)
+-    goto out;
++  if (!impl->browse_files_model)
++    return; /* FIXME: this sucks.  Disable the New Folder button or something. */
+ 
+-  pixbuf = gtk_file_info_render_icon (info, GTK_WIDGET (data->impl),
+-				      data->impl->icon_size, NULL);
++  /* Prevent button from being clicked twice */
++  gtk_widget_set_sensitive (impl->browse_new_folder_button, FALSE);
+ 
+-  path = gtk_tree_row_reference_get_path (data->row_ref);
+-  gtk_tree_model_get_iter (GTK_TREE_MODEL (data->impl->shortcuts_model), &iter, path);
+-  gtk_list_store_set (data->impl->shortcuts_model, &iter,
+-		      SHORTCUTS_COL_PIXBUF, pixbuf,
+-		      -1);
+-  gtk_tree_path_free (path);
++  _gtk_file_system_model_add_editable (impl->browse_files_model, &iter);
+ 
+-  if (pixbuf)
+-    g_object_unref (pixbuf);
++  path = gtk_tree_model_get_path (GTK_TREE_MODEL (impl->browse_files_model), &iter);
++  gtk_tree_view_scroll_to_cell (GTK_TREE_VIEW (impl->browse_files_tree_view),
++				path, impl->list_name_column,
++				FALSE, 0.0, 0.0);
+ 
+-out:
+-  gtk_tree_row_reference_free (data->row_ref);
+-  g_object_unref (data->impl);
+-  g_free (data);
++  g_object_set (impl->list_name_renderer, "editable", TRUE, NULL);
++  gtk_tree_view_set_cursor (GTK_TREE_VIEW (impl->browse_files_tree_view),
++			    path,
++			    impl->list_name_column,
++			    TRUE);
+ 
+-  g_object_unref (handle);
++  gtk_tree_path_free (path);
+ }
+ 
+ static void
+-shortcuts_reload_icons (GtkFileChooserDefault *impl)
++edited_idle_create_folder_cb (GtkFileSystemHandle *handle,
++			      const GtkFilePath   *path,
++			      const GError        *error,
++			      gpointer             data)
+ {
+-  GSList *l;
+-  GtkTreeIter iter;
+-
+-  profile_start ("start", NULL);
++  gboolean cancelled = handle->cancelled;
++  GtkFileChooserDefault *impl = data;
+ 
+-  if (!gtk_tree_model_get_iter_first (GTK_TREE_MODEL (impl->shortcuts_model), &iter))
++  if (!g_slist_find (impl->pending_handles, handle))
+     goto out;
+ 
+-  for (l = impl->reload_icon_handles; l; l = l->next)
+-    {
+-      GtkFileSystemHandle *handle = GTK_FILE_SYSTEM_HANDLE (l->data);
+-      gtk_file_system_cancel_operation (handle);
+-    }
+-  g_slist_free (impl->reload_icon_handles);
+-  impl->reload_icon_handles = NULL;
+-
+-  do
+-    {
+-      gpointer data;
+-      gboolean is_volume;
+-      gboolean pixbuf_visible;
+-      GdkPixbuf *pixbuf;
++  impl->pending_handles = g_slist_remove (impl->pending_handles, handle);
+ 
+-      gtk_tree_model_get (GTK_TREE_MODEL (impl->shortcuts_model), &iter,
+-			  SHORTCUTS_COL_DATA, &data,
+-			  SHORTCUTS_COL_IS_VOLUME, &is_volume,
+-			  SHORTCUTS_COL_PIXBUF_VISIBLE, &pixbuf_visible,
+-			  -1);
++  if (cancelled)
++    goto out;
+ 
+-      if (pixbuf_visible && data)
+-        {
+-	  if (is_volume)
+-	    {
+-	      GtkFileSystemVolume *volume;
++  if (!error)
++    change_folder_and_display_error (impl, path);
++  else
++    error_creating_folder_dialog (impl, path, g_error_copy (error));
+ 
+-	      volume = data;
+-	      pixbuf = gtk_file_system_volume_render_icon (impl->file_system, volume, GTK_WIDGET (impl),
+-							   impl->icon_size, NULL);
+-
+-	      gtk_list_store_set (impl->shortcuts_model, &iter,
+-				  SHORTCUTS_COL_PIXBUF, pixbuf,
+-				  -1);
++ out:
++  g_object_unref (impl);
++  g_object_unref (handle);
++}
+ 
+-	      if (pixbuf)
+-		g_object_unref (pixbuf);
+-	    }
+-	  else if (gtk_file_system_path_is_local (impl->file_system, (GtkFilePath *)data))
+-	    {
+-	      const GtkFilePath *path;
+-	      struct ReloadIconsData *info;
+-	      GtkTreePath *tree_path;
+-	      GtkFileSystemHandle *handle;
+-
+-	      path = data;
+-
+-	      info = g_new0 (struct ReloadIconsData, 1);
+-	      info->impl = g_object_ref (impl);
+-	      tree_path = gtk_tree_model_get_path (GTK_TREE_MODEL (impl->shortcuts_model), &iter);
+-	      info->row_ref = gtk_tree_row_reference_new (GTK_TREE_MODEL (impl->shortcuts_model), tree_path);
+-	      gtk_tree_path_free (tree_path);
+-
+-	      handle = gtk_file_system_get_info (impl->file_system, path,
+-						 GTK_FILE_INFO_ICON,
+-						 shortcuts_reload_icons_get_info_cb,
+-						 info);
+-	      impl->reload_icon_handles = g_slist_append (impl->reload_icon_handles, handle);
+-	    }
+-	  else
+-	    {
+-	      GtkIconTheme *icon_theme;
+-
+-	      /* Don't call get_info for remote paths to avoid latency and
+-	       * auth dialogs.
+-	       * If we switch to a better bookmarks file format (XBEL), we
+-	       * should use mime info to get a better icon.
+-	       */
+-	      icon_theme = gtk_icon_theme_get_for_screen (gtk_widget_get_screen (GTK_WIDGET (impl)));
+-	      pixbuf = gtk_icon_theme_load_icon (icon_theme, "gnome-fs-directory", 
+-						 impl->icon_size, 0, NULL);
+-
+-	      gtk_list_store_set (impl->shortcuts_model, &iter,
+-				  SHORTCUTS_COL_PIXBUF, pixbuf,
+-				  -1);
+-
+-	      if (pixbuf)
+-		g_object_unref (pixbuf);
+-	    }
+-	}
+-    }
+-  while (gtk_tree_model_iter_next (GTK_TREE_MODEL (impl->shortcuts_model),&iter));
+-
+- out:
+-
+-  profile_end ("end", NULL);
+-}
+-
+-static void 
+-shortcuts_find_folder (GtkFileChooserDefault *impl,
+-		       GtkFilePath           *folder)
+-{
+-  GtkTreeSelection *selection;
+-  int pos;
+-  GtkTreePath *path;
+-
+-  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (impl->browse_shortcuts_tree_view));
+-
+-  g_assert (folder != NULL);
+-  pos = shortcut_find_position (impl, folder);
+-  if (pos == -1)
+-    {
+-      gtk_tree_selection_unselect_all (selection);
+-      return;
+-    }
+-
+-  path = gtk_tree_path_new_from_indices (pos, -1);
+-  gtk_tree_selection_select_path (selection, path);
+-  gtk_tree_path_free (path);
+-}
+-
+-/* If a shortcut corresponds to the current folder, selects it */
+-static void
+-shortcuts_find_current_folder (GtkFileChooserDefault *impl)
+-{
+-  shortcuts_find_folder (impl, impl->current_folder);
+-}
+-
+-/* Removes the specified number of rows from the shortcuts list */
+-static void
+-shortcuts_remove_rows (GtkFileChooserDefault *impl,
+-		       int                    start_row,
+-		       int                    n_rows)
+-{
+-  GtkTreePath *path;
+-
+-  path = gtk_tree_path_new_from_indices (start_row, -1);
+-
+-  for (; n_rows; n_rows--)
+-    {
+-      GtkTreeIter iter;
+-
+-      if (!gtk_tree_model_get_iter (GTK_TREE_MODEL (impl->shortcuts_model), &iter, path))
+-	g_assert_not_reached ();
+-
+-      shortcuts_free_row_data (impl, &iter);
+-      gtk_list_store_remove (impl->shortcuts_model, &iter);
+-    }
+-
+-  gtk_tree_path_free (path);
+-}
+-
+-static void
+-shortcuts_update_count (GtkFileChooserDefault *impl,
+-			ShortcutsIndex         type,
+-			gint                   value)
+-{
+-  switch (type)
+-    {
+-      case SHORTCUTS_HOME:
+-	if (value < 0)
+-	  impl->has_home = FALSE;
+-	else
+-	  impl->has_home = TRUE;
+-	break;
+-
+-      case SHORTCUTS_DESKTOP:
+-	if (value < 0)
+-	  impl->has_desktop = FALSE;
+-	else
+-	  impl->has_desktop = TRUE;
+-	break;
+-
+-      case SHORTCUTS_VOLUMES:
+-	impl->num_volumes += value;
+-	break;
+-
+-      case SHORTCUTS_SHORTCUTS:
+-	impl->num_shortcuts += value;
+-	break;
+-
+-      case SHORTCUTS_BOOKMARKS:
+-	impl->num_bookmarks += value;
+-	break;
+-
+-      case SHORTCUTS_CURRENT_FOLDER:
+-	if (value < 0)
+-	  impl->shortcuts_current_folder_active = FALSE;
+-	else
+-	  impl->shortcuts_current_folder_active = TRUE;
+-	break;
+-
+-      default:
+-	/* nothing */
+-	break;
+-    }
+-}
+-
+-struct ShortcutsInsertRequest
+-{
+-  GtkFileChooserDefault *impl;
+-  GtkFilePath *parent_path;
+-  GtkFilePath *path;
+-  int pos;
+-  char *label_copy;
+-  GtkTreeRowReference *row_ref;
+-  ShortcutsIndex type;
+-  gboolean name_only;
+-  gboolean removable;
+-};
+-
+-static void
+-get_file_info_finished (GtkFileSystemHandle *handle,
+-		        const GtkFileInfo   *info,
+-		        const GError        *error,
+-		        gpointer             data)
+-{
+-  gint pos = -1;
+-  gboolean cancelled = handle->cancelled;
+-  gboolean is_volume = FALSE;
+-  GdkPixbuf *pixbuf;
+-  GtkTreePath *path;
+-  GtkTreeIter iter;
+-  GtkFileSystemHandle *model_handle;
+-  struct ShortcutsInsertRequest *request = data;
+-
+-  path = gtk_tree_row_reference_get_path (request->row_ref);
+-  if (!path)
+-    /* Handle doesn't exist anymore in the model */
+-    goto out;
+-
+-  pos = gtk_tree_path_get_indices (path)[0];
+-  gtk_tree_model_get_iter (GTK_TREE_MODEL (request->impl->shortcuts_model),
+-			   &iter, path);
+-  gtk_tree_path_free (path);
+-
+-  /* validate handle, else goto out */
+-  gtk_tree_model_get (GTK_TREE_MODEL (request->impl->shortcuts_model), &iter,
+-		      SHORTCUTS_COL_HANDLE, &model_handle,
+-		      -1);
+-  if (handle != model_handle)
+-    goto out;
+-
+-  /* set the handle to NULL in the model (we unref later on) */
+-  gtk_list_store_set (request->impl->shortcuts_model, &iter,
+-		      SHORTCUTS_COL_HANDLE, NULL,
+-		      -1);
+-
+-  if (cancelled)
+-    goto out;
+-
+-  if (!info)
+-    {
+-      gtk_list_store_remove (request->impl->shortcuts_model, &iter);
+-      shortcuts_update_count (request->impl, request->type, -1);
+-
+-      if (request->type == SHORTCUTS_HOME)
+-        {
+-	  const char *home = g_get_home_dir ();
+-	  GtkFilePath *home_path;
+-
+-	  home_path = gtk_file_system_filename_to_path (request->impl->file_system, home);
+-	  error_getting_info_dialog (request->impl, home_path, g_error_copy (error));
+-	  gtk_file_path_free (home_path);
+-	}
+-      else if (request->type == SHORTCUTS_CURRENT_FOLDER)
+-        {
+-	  /* Remove the current folder separator */
+-	  gint separator_pos = shortcuts_get_index (request->impl, SHORTCUTS_CURRENT_FOLDER_SEPARATOR);
+-	  shortcuts_remove_rows (request->impl, separator_pos, 1);
+-        }
+-
+-      goto out;
+-    }
+-  
+-  if (!request->label_copy)
+-    request->label_copy = g_strdup (gtk_file_info_get_display_name (info));
+-  pixbuf = gtk_file_info_render_icon (info, GTK_WIDGET (request->impl),
+-				      request->impl->icon_size, NULL);
+-
+-  gtk_list_store_set (request->impl->shortcuts_model, &iter,
+-		      SHORTCUTS_COL_PIXBUF, pixbuf,
+-		      SHORTCUTS_COL_PIXBUF_VISIBLE, TRUE,
+-		      SHORTCUTS_COL_NAME, request->label_copy,
+-		      SHORTCUTS_COL_IS_VOLUME, is_volume,
+-		      SHORTCUTS_COL_REMOVABLE, request->removable,
+-		      -1);
+-
+-  if (request->impl->shortcuts_filter_model)
+-    gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (request->impl->shortcuts_filter_model));
+-
+-  if (request->type == SHORTCUTS_CURRENT_FOLDER
+-      && request->impl->save_folder_combo != NULL)
+-    {
+-      /* The current folder is updated via _activate_iter(), don't
+-       * have save_folder_combo_changed_cb() call _activate_iter()
+-       * again.
+-       */
+-      g_signal_handlers_block_by_func (request->impl->save_folder_combo,
+-				       G_CALLBACK (save_folder_combo_changed_cb),
+-				       request->impl);
+-      gtk_combo_box_set_active (GTK_COMBO_BOX (request->impl->save_folder_combo), pos);
+-      g_signal_handlers_unblock_by_func (request->impl->save_folder_combo,
+-				         G_CALLBACK (save_folder_combo_changed_cb),
+-				         request->impl);
+-    }
+-
+-  if (pixbuf)
+-    g_object_unref (pixbuf);
+-
+-out:
+-  g_object_unref (request->impl);
+-  gtk_file_path_free (request->parent_path);
+-  gtk_file_path_free (request->path);
+-  gtk_tree_row_reference_free (request->row_ref);
+-  g_free (request->label_copy);
+-  g_free (request);
+-
+-  g_object_unref (handle);
+-}
+-
+-/* FIXME: GtkFileSystem needs a function to split a remote path
+- * into hostname and path components, or maybe just have a 
+- * gtk_file_system_path_get_display_name().
+- *
+- * This function is also used in gtkfilechooserbutton.c
+- */
+-gchar *
+-_gtk_file_chooser_label_for_uri (const gchar *uri)
+-{
+-  const gchar *path, *start, *end, *p;
+-  gchar *host, *label;
+-  
+-  start = strstr (uri, "://");
+-  start += 3;
+-  path = strchr (start, '/');
+-  
+-  if (path)
+-    end = path;
+-  else
+-    {
+-      end = uri + strlen (uri);
+-      path = "/";
+-    }
+-
+-  /* strip username */
+-  p = strchr (start, '@');
+-  if (p && p < end)
+-    {
+-      start = p + 1;
+-    }
+-  
+-  p = strchr (start, ':');
+-  if (p && p < end)
+-    end = p;
+-  
+-  host = g_strndup (start, end - start);
+-
+-  /* Translators: the first string is a path and the second string 
+-   * is a hostname. Nautilus and the panel contain the same string 
+-   * to translate. 
+-   */
+-  label = g_strdup_printf (_("%1$s on %2$s"), path, host);
+-  
+-  g_free (host);
+-
+-  return label;
+-}
+-
+-/* Inserts a path in the shortcuts tree, making a copy of it; alternatively,
+- * inserts a volume.  A position of -1 indicates the end of the tree.
+- */
+-static void
+-shortcuts_insert_path (GtkFileChooserDefault *impl,
+-		       int                    pos,
+-		       gboolean               is_volume,
+-		       GtkFileSystemVolume   *volume,
+-		       const GtkFilePath     *path,
+-		       const char            *label,
+-		       gboolean               removable,
+-		       ShortcutsIndex         type)
+-{
+-  char *label_copy;
+-  GdkPixbuf *pixbuf = NULL;
+-  gpointer data = NULL;
+-  GtkTreeIter iter;
+-  GtkIconTheme *icon_theme;      
+-
+-  profile_start ("start", is_volume ? "volume" : (char *) path);
+-
+-  if (is_volume)
+-    {
+-      data = volume;
+-      label_copy = gtk_file_system_volume_get_display_name (impl->file_system, volume);
+-      pixbuf = gtk_file_system_volume_render_icon (impl->file_system, volume, GTK_WIDGET (impl),
+-						   impl->icon_size, NULL);
+-    }
+-  else if (gtk_file_system_path_is_local (impl->file_system, path))
+-    {
+-      struct ShortcutsInsertRequest *request;
+-      GtkFileSystemHandle *handle;
+-      GtkTreePath *p;
+-
+-      request = g_new0 (struct ShortcutsInsertRequest, 1);
+-      request->impl = g_object_ref (impl);
+-      request->path = gtk_file_path_copy (path);
+-      request->name_only = TRUE;
+-      request->removable = removable;
+-      request->pos = pos;
+-      request->type = type;
+-      if (label)
+-	request->label_copy = g_strdup (label);
+-
+-      if (pos == -1)
+-	gtk_list_store_append (impl->shortcuts_model, &iter);
+-      else
+-	gtk_list_store_insert (impl->shortcuts_model, &iter, pos);
+-
+-      p = gtk_tree_model_get_path (GTK_TREE_MODEL (impl->shortcuts_model), &iter);
+-      request->row_ref = gtk_tree_row_reference_new (GTK_TREE_MODEL (impl->shortcuts_model), p);
+-      gtk_tree_path_free (p);
+-
+-      handle = gtk_file_system_get_info (request->impl->file_system, request->path,
+-					 GTK_FILE_INFO_DISPLAY_NAME | GTK_FILE_INFO_IS_HIDDEN | GTK_FILE_INFO_ICON,
+-					 get_file_info_finished, request);
+-
+-      gtk_list_store_set (impl->shortcuts_model, &iter,
+-			  SHORTCUTS_COL_DATA, gtk_file_path_copy (path),
+-			  SHORTCUTS_COL_IS_VOLUME, is_volume,
+-			  SHORTCUTS_COL_HANDLE, handle,
+-			  -1);
+-
+-      shortcuts_update_count (impl, type, 1);
+-
+-      return;
+-    }
+-  else
+-    {
+-      /* Don't call get_info for remote paths to avoid latency and
+-       * auth dialogs.
+-       */
+-      data = gtk_file_path_copy (path);
+-      if (label)
+-	label_copy = g_strdup (label);
+-      else
+-	{
+-	  gchar *uri;
+-
+-	  uri = gtk_file_system_path_to_uri (impl->file_system, path);
+-
+-	  label_copy = _gtk_file_chooser_label_for_uri (uri);
+-
+-	  g_free (uri);
+-	}
+-    
+-      /* If we switch to a better bookmarks file format (XBEL), we
+-       * should use mime info to get a better icon.
+-       */
+-      icon_theme = gtk_icon_theme_get_for_screen (gtk_widget_get_screen (GTK_WIDGET (impl)));
+-      pixbuf = gtk_icon_theme_load_icon (icon_theme, "gnome-fs-directory", 
+-					 impl->icon_size, 0, NULL);
+-    }
+-
+-  if (pos == -1)
+-    gtk_list_store_append (impl->shortcuts_model, &iter);
+-  else
+-    gtk_list_store_insert (impl->shortcuts_model, &iter, pos);
+-
+-  shortcuts_update_count (impl, type, 1);
+-
+-  gtk_list_store_set (impl->shortcuts_model, &iter,
+-		      SHORTCUTS_COL_PIXBUF, pixbuf,
+-		      SHORTCUTS_COL_PIXBUF_VISIBLE, TRUE,
+-		      SHORTCUTS_COL_NAME, label_copy,
+-		      SHORTCUTS_COL_DATA, data,
+-		      SHORTCUTS_COL_IS_VOLUME, is_volume,
+-		      SHORTCUTS_COL_REMOVABLE, removable,
+-		      SHORTCUTS_COL_HANDLE, NULL,
+-		      -1);
+-
+-  if (impl->shortcuts_filter_model)
+-    gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (impl->shortcuts_filter_model));
+-
+-  if (type == SHORTCUTS_CURRENT_FOLDER && impl->save_folder_combo != NULL)
+-    {
+-      /* The current folder is updated via _activate_iter(), don't
+-       * have save_folder_combo_changed_cb() call _activate_iter()
+-       * again.
+-       */
+-      gint combo_pos = shortcuts_get_index (impl, SHORTCUTS_CURRENT_FOLDER);
+-      g_signal_handlers_block_by_func (impl->save_folder_combo,
+-				       G_CALLBACK (save_folder_combo_changed_cb),
+-				       impl);
+-      gtk_combo_box_set_active (GTK_COMBO_BOX (impl->save_folder_combo), combo_pos);
+-      g_signal_handlers_unblock_by_func (impl->save_folder_combo,
+-				         G_CALLBACK (save_folder_combo_changed_cb),
+-				         impl);
+-    }
+-
+-  g_free (label_copy);
+-
+-  if (pixbuf)
+-    g_object_unref (pixbuf);
+-
+-  profile_end ("end", NULL);
+-}
+-
+-/* Appends an item for the user's home directory to the shortcuts model */
+-static void
+-shortcuts_append_home (GtkFileChooserDefault *impl)
+-{
+-  const char *home;
+-  GtkFilePath *home_path;
+-
+-  profile_start ("start", NULL);
+-
+-  home = g_get_home_dir ();
+-  if (home == NULL)
+-    {
+-      profile_end ("end - no home directory!?", NULL);
+-      return;
+-    }
+-
+-  home_path = gtk_file_system_filename_to_path (impl->file_system, home);
+-
+-  shortcuts_insert_path (impl, -1, FALSE, NULL, home_path, NULL, FALSE, SHORTCUTS_HOME);
+-
+-  gtk_file_path_free (home_path);
+-
+-  profile_end ("end", NULL);
+-}
+-
+-/* Appends the ~/Desktop directory to the shortcuts model */
+-static void
+-shortcuts_append_desktop (GtkFileChooserDefault *impl)
+-{
+-  char *name;
+-  const char *home;
+-  GtkFilePath *path;
+-
+-  profile_start ("start", NULL);
+-
+-#ifdef G_OS_WIN32
+-  name = _gtk_file_system_win32_get_desktop ();
+-#else
+-  home = g_get_home_dir ();
+-  if (home == NULL)
+-    {
+-      profile_end ("end - no home directory!?", NULL);
+-      return;
+-    }
+-
+-  name = g_build_filename (home, "Desktop", NULL);
+-#endif
+-
+-  path = gtk_file_system_filename_to_path (impl->file_system, name);
+-  g_free (name);
+-
+-  shortcuts_insert_path (impl, -1, FALSE, NULL, path, _("Desktop"), FALSE, SHORTCUTS_DESKTOP);
+-  /* We do not actually pop up an error dialog if there is no desktop directory
+-   * because some people may really not want to have one.
+-   */
+-
+-  gtk_file_path_free (path);
+-
+-  profile_end ("end", NULL);
+-}
+-
+-/* Appends a list of GtkFilePath to the shortcuts model; returns how many were inserted */
+-static int
+-shortcuts_append_paths (GtkFileChooserDefault *impl,
+-			GSList                *paths)
+-{
+-  int start_row;
+-  int num_inserted;
+-  gchar *label;
+-
+-  profile_start ("start", NULL);
+-
+-  /* As there is no separator now, we want to start there.
+-   */
+-  start_row = shortcuts_get_index (impl, SHORTCUTS_BOOKMARKS_SEPARATOR);
+-  num_inserted = 0;
+-
+-  for (; paths; paths = paths->next)
+-    {
+-      GtkFilePath *path;
+-
+-      path = paths->data;
+-
+-      if (impl->local_only &&
+-	  !gtk_file_system_path_is_local (impl->file_system, path))
+-	continue;
+-
+-      label = gtk_file_system_get_bookmark_label (impl->file_system, path);
+-
+-      /* NULL GError, but we don't really want to show error boxes here */
+-      shortcuts_insert_path (impl, start_row + num_inserted, FALSE, NULL, path, label, TRUE, SHORTCUTS_BOOKMARKS);
+-      num_inserted++;
+-
+-      g_free (label);
+-    }
+-
+-  profile_end ("end", NULL);
+-
+-  return num_inserted;
+-}
+-
+-/* Returns the index for the corresponding item in the shortcuts bar */
+-static int
+-shortcuts_get_index (GtkFileChooserDefault *impl,
+-		     ShortcutsIndex         where)
+-{
+-  int n;
+-
+-  n = 0;
+-
+-  if (where == SHORTCUTS_HOME)
+-    goto out;
+-
+-  n += impl->has_home ? 1 : 0;
+-
+-  if (where == SHORTCUTS_DESKTOP)
+-    goto out;
+-
+-  n += impl->has_desktop ? 1 : 0;
+-
+-  if (where == SHORTCUTS_VOLUMES)
+-    goto out;
+-
+-  n += impl->num_volumes;
+-
+-  if (where == SHORTCUTS_SHORTCUTS)
+-    goto out;
+-
+-  n += impl->num_shortcuts;
+-
+-  if (where == SHORTCUTS_BOOKMARKS_SEPARATOR)
+-    goto out;
+-
+-  /* If there are no bookmarks there won't be a separator */
+-  n += (impl->num_bookmarks > 0) ? 1 : 0;
+-
+-  if (where == SHORTCUTS_BOOKMARKS)
+-    goto out;
+-
+-  n += impl->num_bookmarks;
+-
+-  if (where == SHORTCUTS_CURRENT_FOLDER_SEPARATOR)
+-    goto out;
+-
+-  n += 1;
+-
+-  if (where == SHORTCUTS_CURRENT_FOLDER)
+-    goto out;
+-
+-  g_assert_not_reached ();
+-
+- out:
+-
+-  return n;
+-}
+-
+-/* Adds all the file system volumes to the shortcuts model */
+-static void
+-shortcuts_add_volumes (GtkFileChooserDefault *impl)
+-{
+-  int start_row;
+-  GSList *list, *l;
+-  int n;
+-  gboolean old_changing_folders;
+-
+-  profile_start ("start", NULL);
+-
+-
+-  old_changing_folders = impl->changing_folder;
+-  impl->changing_folder = TRUE;
+-
+-  start_row = shortcuts_get_index (impl, SHORTCUTS_VOLUMES);
+-  shortcuts_remove_rows (impl, start_row, impl->num_volumes);
+-  impl->num_volumes = 0;
+-
+-  list = gtk_file_system_list_volumes (impl->file_system);
+-
+-  n = 0;
+-
+-  for (l = list; l; l = l->next)
+-    {
+-      GtkFileSystemVolume *volume;
+-
+-      volume = l->data;
+-
+-      if (impl->local_only)
+-	{
+-	  if (gtk_file_system_volume_get_is_mounted (impl->file_system, volume))
+-	    {
+-	      GtkFilePath *base_path;
+-
+-	      base_path = gtk_file_system_volume_get_base_path (impl->file_system, volume);
+-	      if (base_path != NULL)
+-		{
+-		  gboolean is_local = gtk_file_system_path_is_local (impl->file_system, base_path);
+-		  gtk_file_path_free (base_path);
+-
+-		  if (!is_local)
+-		    {
+-		      gtk_file_system_volume_free (impl->file_system, volume);
+-		      continue;
+-		    }
+-		}
+-	    }
+-	}
+-
+-      shortcuts_insert_path (impl, start_row + n, TRUE, volume, NULL, NULL, FALSE, SHORTCUTS_VOLUMES);
+-      n++;
+-    }
+-
+-  impl->num_volumes = n;
+-  g_slist_free (list);
+-
+-  if (impl->shortcuts_filter_model)
+-    gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (impl->shortcuts_filter_model));
+-
+-  impl->changing_folder = old_changing_folders;
+-
+-  profile_end ("end", NULL);
+-}
+-
+-/* Inserts a separator node in the shortcuts list */
+-static void
+-shortcuts_insert_separator (GtkFileChooserDefault *impl,
+-			    ShortcutsIndex where)
+-{
+-  GtkTreeIter iter;
+-
+-  g_assert (where == SHORTCUTS_BOOKMARKS_SEPARATOR || where == SHORTCUTS_CURRENT_FOLDER_SEPARATOR);
+-
+-  gtk_list_store_insert (impl->shortcuts_model, &iter,
+-			 shortcuts_get_index (impl, where));
+-  gtk_list_store_set (impl->shortcuts_model, &iter,
+-		      SHORTCUTS_COL_PIXBUF, NULL,
+-		      SHORTCUTS_COL_PIXBUF_VISIBLE, FALSE,
+-		      SHORTCUTS_COL_NAME, NULL,
+-		      SHORTCUTS_COL_DATA, NULL,
+-		      -1);
+-}
+-
+-/* Updates the list of bookmarks */
+-static void
+-shortcuts_add_bookmarks (GtkFileChooserDefault *impl)
+-{
+-  GSList *bookmarks;
+-  gboolean old_changing_folders;
+-  GtkTreeIter iter;
+-  GtkFilePath *list_selected = NULL;
+-  GtkFilePath *combo_selected = NULL;
+-  gboolean is_volume;
+-  gpointer col_data;
+-
+-  profile_start ("start", NULL);
+-        
+-  old_changing_folders = impl->changing_folder;
+-  impl->changing_folder = TRUE;
+-
+-  if (shortcuts_get_selected (impl, &iter))
+-    {
+-      gtk_tree_model_get (GTK_TREE_MODEL (impl->shortcuts_model), 
+-			  &iter, 
+-			  SHORTCUTS_COL_DATA, &col_data,
+-			  SHORTCUTS_COL_IS_VOLUME, &is_volume,
+-			  -1);
+-
+-      if (col_data && !is_volume)
+-	list_selected = gtk_file_path_copy (col_data);
+-    }
+-
+-  if (impl->save_folder_combo &&
+-      gtk_combo_box_get_active_iter (GTK_COMBO_BOX (impl->save_folder_combo), 
+-				     &iter))
+-    {
+-      gtk_tree_model_get (GTK_TREE_MODEL (impl->shortcuts_model), 
+-			  &iter, 
+-			  SHORTCUTS_COL_DATA, &col_data,
+-			  SHORTCUTS_COL_IS_VOLUME, &is_volume,
+-			  -1);
+-      
+-      if (col_data && !is_volume)
+-	combo_selected = gtk_file_path_copy (col_data);
+-    }
+-
+-  if (impl->num_bookmarks > 0)
+-    shortcuts_remove_rows (impl,
+-			   shortcuts_get_index (impl, SHORTCUTS_BOOKMARKS_SEPARATOR),
+-			   impl->num_bookmarks + 1);
+-
+-  impl->num_bookmarks = 0;
+-
+-  bookmarks = gtk_file_system_list_bookmarks (impl->file_system);
+-  shortcuts_append_paths (impl, bookmarks);
+-  gtk_file_paths_free (bookmarks);
+-
+-  if (impl->num_bookmarks > 0)
+-    shortcuts_insert_separator (impl, SHORTCUTS_BOOKMARKS_SEPARATOR);
+-
+-  if (impl->shortcuts_filter_model)
+-    gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (impl->shortcuts_filter_model));
+-
+-  if (list_selected)
+-    {
+-      shortcuts_find_folder (impl, list_selected);
+-      gtk_file_path_free (list_selected);
+-    }
+-
+-  if (combo_selected)
+-    {
+-      gint pos;
+-
+-      pos = shortcut_find_position (impl, combo_selected);
+-      if (pos != -1)
+-	gtk_combo_box_set_active (GTK_COMBO_BOX (impl->save_folder_combo), 
+-				  pos);
+-      gtk_file_path_free (combo_selected);
+-    }
+-  
+-  impl->changing_folder = old_changing_folders;
+-
+-  profile_end ("end", NULL);
+-}
+-
+-/* Appends a separator and a row to the shortcuts list for the current folder */
+-static void
+-shortcuts_add_current_folder (GtkFileChooserDefault *impl)
+-{
+-  int pos;
+-  gboolean success;
+-
+-  g_assert (!impl->shortcuts_current_folder_active);
+-
+-  success = TRUE;
+-
+-  g_assert (impl->current_folder != NULL);
+-
+-  pos = shortcut_find_position (impl, impl->current_folder);
+-  if (pos == -1)
+-    {
+-      GtkFileSystemVolume *volume;
+-      GtkFilePath *base_path;
+-
+-      /* Separator */
+-
+-      shortcuts_insert_separator (impl, SHORTCUTS_CURRENT_FOLDER_SEPARATOR);
+-
+-      /* Item */
+-
+-      pos = shortcuts_get_index (impl, SHORTCUTS_CURRENT_FOLDER);
+-
+-      volume = gtk_file_system_get_volume_for_path (impl->file_system, impl->current_folder);
+-      if (volume)
+-	base_path = gtk_file_system_volume_get_base_path (impl->file_system, volume);
+-      else
+-	base_path = NULL;
+-
+-      if (base_path &&
+-	  strcmp (gtk_file_path_get_string (base_path), gtk_file_path_get_string (impl->current_folder)) == 0)
+-	{
+-	  shortcuts_insert_path (impl, pos, TRUE, volume, NULL, NULL, FALSE, SHORTCUTS_CURRENT_FOLDER);
+-	}
+-      else
+-        {
+-	  shortcuts_insert_path (impl, pos, FALSE, NULL, impl->current_folder, NULL, FALSE, SHORTCUTS_CURRENT_FOLDER);
+-	  if (volume)
+-	    gtk_file_system_volume_free (impl->file_system, volume);
+-	}
+-
+-      if (base_path)
+-	gtk_file_path_free (base_path);
+-    }
+-  else if (impl->save_folder_combo != NULL)
+-    gtk_combo_box_set_active (GTK_COMBO_BOX (impl->save_folder_combo), pos);
+-}
+-
+-/* Updates the current folder row in the shortcuts model */
+-static void
+-shortcuts_update_current_folder (GtkFileChooserDefault *impl)
+-{
+-  int pos;
+-
+-  pos = shortcuts_get_index (impl, SHORTCUTS_CURRENT_FOLDER_SEPARATOR);
+-
+-  if (impl->shortcuts_current_folder_active)
+-    {
+-      shortcuts_remove_rows (impl, pos, 2);
+-      impl->shortcuts_current_folder_active = FALSE;
+-    }
+-
+-  shortcuts_add_current_folder (impl);
+-}
+-
+-/* Filter function used for the shortcuts filter model */
+-static gboolean
+-shortcuts_filter_cb (GtkTreeModel          *model,
+-		     GtkTreeIter           *iter,
+-		     gpointer               data)
+-{
+-  GtkFileChooserDefault *impl;
+-  GtkTreePath *path;
+-  int pos;
+-
+-  impl = GTK_FILE_CHOOSER_DEFAULT (data);
+-
+-  path = gtk_tree_model_get_path (model, iter);
+-  if (!path)
+-    return FALSE;
+-
+-  pos = *gtk_tree_path_get_indices (path);
+-  gtk_tree_path_free (path);
+-
+-  return (pos < shortcuts_get_index (impl, SHORTCUTS_CURRENT_FOLDER_SEPARATOR));
+-}
+-
+-/* Creates the list model for shortcuts */
+-static void
+-shortcuts_model_create (GtkFileChooserDefault *impl)
+-{
+-  /* Keep this order in sync with the SHORCUTS_COL_* enum values */
+-  impl->shortcuts_model = gtk_list_store_new (SHORTCUTS_COL_NUM_COLUMNS,
+-					      GDK_TYPE_PIXBUF,	/* pixbuf */
+-					      G_TYPE_STRING,	/* name */
+-					      G_TYPE_POINTER,	/* path or volume */
+-					      G_TYPE_BOOLEAN,   /* is the previous column a volume? */
+-					      G_TYPE_BOOLEAN,   /* removable */
+-					      G_TYPE_BOOLEAN,   /* pixbuf cell visibility */
+-					      G_TYPE_POINTER);   /* GtkFileSystemHandle */
+-
+-  if (impl->file_system)
+-    {
+-      shortcuts_append_home (impl);
+-      shortcuts_append_desktop (impl);
+-      shortcuts_add_volumes (impl);
+-    }
+-
+-  impl->shortcuts_filter_model = shortcuts_model_filter_new (impl,
+-							     GTK_TREE_MODEL (impl->shortcuts_model),
+-							     NULL);
+-
+-  gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER (impl->shortcuts_filter_model),
+-					  shortcuts_filter_cb,
+-					  impl,
+-					  NULL);
+-}
+-
+-/* Callback used when the "New Folder" button is clicked */
+-static void
+-new_folder_button_clicked (GtkButton             *button,
+-			   GtkFileChooserDefault *impl)
+-{
+-  GtkTreeIter iter;
+-  GtkTreePath *path;
+-
+-  if (!impl->browse_files_model)
+-    return; /* FIXME: this sucks.  Disable the New Folder button or something. */
+-
+-  /* Prevent button from being clicked twice */
+-  gtk_widget_set_sensitive (impl->browse_new_folder_button, FALSE);
+-
+-  _gtk_file_system_model_add_editable (impl->browse_files_model, &iter);
+-
+-  path = gtk_tree_model_get_path (GTK_TREE_MODEL (impl->browse_files_model), &iter);
+-  gtk_tree_view_scroll_to_cell (GTK_TREE_VIEW (impl->browse_files_tree_view),
+-				path, impl->list_name_column,
+-				FALSE, 0.0, 0.0);
+-
+-  g_object_set (impl->list_name_renderer, "editable", TRUE, NULL);
+-  gtk_tree_view_set_cursor (GTK_TREE_VIEW (impl->browse_files_tree_view),
+-			    path,
+-			    impl->list_name_column,
+-			    TRUE);
+-
+-  gtk_tree_path_free (path);
+-}
+-
+-static void
+-edited_idle_create_folder_cb (GtkFileSystemHandle *handle,
+-			      const GtkFilePath   *path,
+-			      const GError        *error,
+-			      gpointer             data)
+-{
+-  gboolean cancelled = handle->cancelled;
+-  GtkFileChooserDefault *impl = data;
+-
+-  if (!g_slist_find (impl->pending_handles, handle))
+-    goto out;
+-
+-  impl->pending_handles = g_slist_remove (impl->pending_handles, handle);
+-
+-  if (cancelled)
+-    goto out;
+-
+-  if (!error)
+-    change_folder_and_display_error (impl, path, FALSE);
+-  else
+-    error_creating_folder_dialog (impl, path, g_error_copy (error));
+-
+- out:
+-  g_object_unref (impl);
+-  g_object_unref (handle);
+-}
+-
+-/* Idle handler for creating a new folder after editing its name cell, or for
+- * canceling the editing.
+- */
+-static gboolean
+-edited_idle_cb (GtkFileChooserDefault *impl)
+-{
+-  GDK_THREADS_ENTER ();
+-  
+-  g_source_destroy (impl->edited_idle);
+-  impl->edited_idle = NULL;
+-
+-  _gtk_file_system_model_remove_editable (impl->browse_files_model);
+-  g_object_set (impl->list_name_renderer, "editable", FALSE, NULL);
+-
+-  gtk_widget_set_sensitive (impl->browse_new_folder_button, TRUE);
+-
+-  if (impl->edited_new_text) /* not cancelled? */
+-    {
+-      GError *error;
+-      GtkFilePath *file_path;
+-
+-      error = NULL;
+-      file_path = gtk_file_system_make_path (impl->file_system,
+-					     impl->current_folder,
+-					     impl->edited_new_text,
+-					     &error);
+-      if (file_path)
+-	{
+-	  GtkFileSystemHandle *handle;
+-
+-	  handle = gtk_file_system_create_folder (impl->file_system, file_path,
+-						  edited_idle_create_folder_cb,
+-						  g_object_ref (impl));
+-	  impl->pending_handles = g_slist_append (impl->pending_handles, handle);
+-
+-	  gtk_file_path_free (file_path);
+-	}
+-      else
+-	error_creating_folder_dialog (impl, file_path, error);
+-
+-      g_free (impl->edited_new_text);
+-      impl->edited_new_text = NULL;
+-    }
+-
+-  GDK_THREADS_LEAVE ();
+-
+-  return FALSE;
+-}
+-
+-static void
+-queue_edited_idle (GtkFileChooserDefault *impl,
+-		   const gchar           *new_text)
+-{
+-  /* We create the folder in an idle handler so that we don't modify the tree
+-   * just now.
+-   */
+-
+-  if (!impl->edited_idle)
+-    {
+-      impl->edited_idle = g_idle_source_new ();
+-      g_source_set_closure (impl->edited_idle,
+-			    g_cclosure_new_object (G_CALLBACK (edited_idle_cb),
+-						   G_OBJECT (impl)));
+-      g_source_attach (impl->edited_idle, NULL);
+-    }
+-
+-  g_free (impl->edited_new_text);
+-  impl->edited_new_text = g_strdup (new_text);
+-}
+-
+-/* Callback used from the text cell renderer when the new folder is named */
+-static void
+-renderer_edited_cb (GtkCellRendererText   *cell_renderer_text,
+-		    const gchar           *path,
+-		    const gchar           *new_text,
+-		    GtkFileChooserDefault *impl)
+-{
+- /* work around bug #154921 */
+-  g_object_set (cell_renderer_text, 
+-		"mode", GTK_CELL_RENDERER_MODE_INERT, NULL);
+-   queue_edited_idle (impl, new_text);
+-}
+-
+-/* Callback used from the text cell renderer when the new folder edition gets
+- * canceled.
+- */
+-static void
+-renderer_editing_canceled_cb (GtkCellRendererText   *cell_renderer_text,
+-			      GtkFileChooserDefault *impl)
+-{
+- /* work around bug #154921 */
+-  g_object_set (cell_renderer_text, 
+-		"mode", GTK_CELL_RENDERER_MODE_INERT, NULL);
+-   queue_edited_idle (impl, NULL);
+-}
+-
+-/* Creates the widgets for the filter combo box */
+-static GtkWidget *
+-filter_create (GtkFileChooserDefault *impl)
+-{
+-  impl->filter_combo = gtk_combo_box_new_text ();
+-  gtk_combo_box_set_focus_on_click (GTK_COMBO_BOX (impl->filter_combo), FALSE);
+-
+-  g_signal_connect (impl->filter_combo, "changed",
+-		    G_CALLBACK (filter_combo_changed), impl);
+-
+-  return impl->filter_combo;
+-}
+-
+-static GtkWidget *
+-button_new (GtkFileChooserDefault *impl,
+-	    const char *text,
+-	    const char *stock_id,
+-	    gboolean    sensitive,
+-	    gboolean    show,
+-	    GCallback   callback)
+-{
+-  GtkWidget *button;
+-  GtkWidget *image;
+-
+-  button = gtk_button_new_with_mnemonic (text);
+-  image = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_BUTTON);
+-  gtk_button_set_image (GTK_BUTTON (button), image);
+-
+-  gtk_widget_set_sensitive (button, sensitive);
+-  g_signal_connect (button, "clicked", callback, impl);
+-
+-  if (show)
+-    gtk_widget_show (button);
+-
+-  return button;
+-}
+-
+-/* Looks for a path among the shortcuts; returns its index or -1 if it doesn't exist */
+-static int
+-shortcut_find_position (GtkFileChooserDefault *impl,
+-			const GtkFilePath     *path)
+-{
+-  GtkTreeIter iter;
+-  int i;
+-  int current_folder_separator_idx;
+-
+-  if (!gtk_tree_model_get_iter_first (GTK_TREE_MODEL (impl->shortcuts_model), &iter))
+-    return -1;
+-
+-  current_folder_separator_idx = shortcuts_get_index (impl, SHORTCUTS_CURRENT_FOLDER_SEPARATOR);
+-
+-#if 0
+-  /* FIXME: is this still needed? */
+-  if (current_folder_separator_idx >= impl->shortcuts_model->length)
+-    return -1;
+-#endif
+-
+-  for (i = 0; i < current_folder_separator_idx; i++)
+-    {
+-      gpointer col_data;
+-      gboolean is_volume;
+-
+-      gtk_tree_model_get (GTK_TREE_MODEL (impl->shortcuts_model), &iter,
+-			  SHORTCUTS_COL_DATA, &col_data,
+-			  SHORTCUTS_COL_IS_VOLUME, &is_volume,
+-			  -1);
+-
+-      if (col_data)
+-	{
+-	  if (is_volume)
+-	    {
+-	      GtkFileSystemVolume *volume;
+-	      GtkFilePath *base_path;
+-	      gboolean exists;
+-
+-	      volume = col_data;
+-	      base_path = gtk_file_system_volume_get_base_path (impl->file_system, volume);
+-
+-	      exists = base_path && strcmp (gtk_file_path_get_string (path),
+-					    gtk_file_path_get_string (base_path)) == 0;
+-	      g_free (base_path);
+-
+-	      if (exists)
+-		return i;
+-	    }
+-	  else
+-	    {
+-	      GtkFilePath *model_path;
+-
+-	      model_path = col_data;
+-
+-	      if (model_path && gtk_file_path_compare (model_path, path) == 0)
+-		return i;
+-	    }
+-	}
+-
+-      if (i < current_folder_separator_idx - 1)
+-	{
+-	  if (!gtk_tree_model_iter_next (GTK_TREE_MODEL (impl->shortcuts_model), &iter))
+-	    g_assert_not_reached ();
+-	}
+-    }
+-
+-  return -1;
+-}
+-
+-/* Tries to add a bookmark from a path name */
+-static gboolean
+-shortcuts_add_bookmark_from_path (GtkFileChooserDefault *impl,
+-				  const GtkFilePath     *path,
+-				  int                    pos)
+-{
+-  GError *error;
+-
+-  g_return_val_if_fail (path != NULL, FALSE);
+- 
+-  if (shortcut_find_position (impl, path) != -1)
+-    return FALSE;
+-
+-  error = NULL;
+-  if (!gtk_file_system_insert_bookmark (impl->file_system, path, pos, &error))
+-    {
+-      error_adding_bookmark_dialog (impl, path, error);
+-      return FALSE;
+-    }
+-
+-  return TRUE;
+-}
+-
+-static void
+-add_bookmark_foreach_cb (GtkTreeModel *model,
+-			 GtkTreePath  *path,
+-			 GtkTreeIter  *iter,
+-			 gpointer      data)
+-{
+-  GtkFileChooserDefault *impl;
+-  GtkFileSystemModel *fs_model;
+-  GtkTreeIter child_iter;
+-  const GtkFilePath *file_path;
+-
+-  impl = (GtkFileChooserDefault *) data;
+-
+-  fs_model = impl->browse_files_model;
+-  gtk_tree_model_sort_convert_iter_to_child_iter (impl->sort_model, &child_iter, iter);
+-
+-  file_path = _gtk_file_system_model_get_path (fs_model, &child_iter);
+-  shortcuts_add_bookmark_from_path (impl, file_path, -1);
+-}
+-
+-/* Adds a bookmark from the currently selected item in the file list */
+-static void
+-bookmarks_add_selected_folder (GtkFileChooserDefault *impl)
+-{
+-  GtkTreeSelection *selection;
+-
+-  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (impl->browse_files_tree_view));
+-
+-  if (gtk_tree_selection_count_selected_rows (selection) == 0)
+-    shortcuts_add_bookmark_from_path (impl, impl->current_folder, -1);
+-  else
+-    gtk_tree_selection_selected_foreach (selection,
+-					 add_bookmark_foreach_cb,
+-					 impl);
+-}
+-
+-/* Callback used when the "Add bookmark" button is clicked */
+-static void
+-add_bookmark_button_clicked_cb (GtkButton *button,
+-				GtkFileChooserDefault *impl)
+-{
+-  bookmarks_add_selected_folder (impl);
+-}
+-
+-/* Returns TRUE plus an iter in the shortcuts_model if a row is selected;
+- * returns FALSE if no shortcut is selected.
+- */
+-static gboolean
+-shortcuts_get_selected (GtkFileChooserDefault *impl,
+-			GtkTreeIter           *iter)
+-{
+-  GtkTreeSelection *selection;
+-  GtkTreeIter parent_iter;
+-
+-  if (!impl->browse_shortcuts_tree_view)
+-    return FALSE;
+-
+-  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (impl->browse_shortcuts_tree_view));
+-
+-  if (!gtk_tree_selection_get_selected (selection, NULL, &parent_iter))
+-    return FALSE;
+-
+-  gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER (impl->shortcuts_filter_model),
+-						    iter,
+-						    &parent_iter);
+-  return TRUE;
+-}
+-
+-/* Removes the selected bookmarks */
+-static void
+-remove_selected_bookmarks (GtkFileChooserDefault *impl)
+-{
+-  GtkTreeIter iter;
+-  gpointer col_data;
+-  GtkFilePath *path;
+-  gboolean removable;
+-  GError *error;
+-
+-  if (!shortcuts_get_selected (impl, &iter))
+-    return;
+-
+-  gtk_tree_model_get (GTK_TREE_MODEL (impl->shortcuts_model), &iter,
+-		      SHORTCUTS_COL_DATA, &col_data,
+-		      SHORTCUTS_COL_REMOVABLE, &removable,
+-		      -1);
+-  g_assert (col_data != NULL);
+-
+-  if (!removable)
+-    return;
+-
+-  path = col_data;
+-
+-  error = NULL;
+-  if (!gtk_file_system_remove_bookmark (impl->file_system, path, &error))
+-    error_removing_bookmark_dialog (impl, path, error);
+-}
+-
+-/* Callback used when the "Remove bookmark" button is clicked */
+-static void
+-remove_bookmark_button_clicked_cb (GtkButton *button,
+-				   GtkFileChooserDefault *impl)
+-{
+-  remove_selected_bookmarks (impl);
+-}
+-
+-struct selection_check_closure {
+-  GtkFileChooserDefault *impl;
+-  int num_selected;
+-  gboolean all_files;
+-  gboolean all_folders;
+-};
+-
+-/* Used from gtk_tree_selection_selected_foreach() */
+-static void
+-selection_check_foreach_cb (GtkTreeModel *model,
+-			    GtkTreePath  *path,
+-			    GtkTreeIter  *iter,
+-			    gpointer      data)
+-{
+-  struct selection_check_closure *closure;
+-  GtkTreeIter child_iter;
+-  const GtkFileInfo *info;
+-  gboolean is_folder;
+-
+-  closure = data;
+-  closure->num_selected++;
+-
+-  gtk_tree_model_sort_convert_iter_to_child_iter (closure->impl->sort_model, &child_iter, iter);
+-
+-  info = _gtk_file_system_model_get_info (closure->impl->browse_files_model, &child_iter);
+-  is_folder = info ? gtk_file_info_get_is_folder (info) : FALSE;
+-
+-  closure->all_folders = closure->all_folders && is_folder;
+-  closure->all_files = closure->all_files && !is_folder;
+-}
+-
+-/* Checks whether the selected items in the file list are all files or all folders */
+-static void
+-selection_check (GtkFileChooserDefault *impl,
+-		 gint                  *num_selected,
+-		 gboolean              *all_files,
+-		 gboolean              *all_folders)
+-{
+-  struct selection_check_closure closure;
+-  GtkTreeSelection *selection;
+-
+-  closure.impl = impl;
+-  closure.num_selected = 0;
+-  closure.all_files = TRUE;
+-  closure.all_folders = TRUE;
+-
+-  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (impl->browse_files_tree_view));
+-  gtk_tree_selection_selected_foreach (selection,
+-				       selection_check_foreach_cb,
+-				       &closure);
+-
+-  g_assert (closure.num_selected == 0 || !(closure.all_files && closure.all_folders));
+-
+-  if (num_selected)
+-    *num_selected = closure.num_selected;
+-
+-  if (all_files)
+-    *all_files = closure.all_files;
+-
+-  if (all_folders)
+-    *all_folders = closure.all_folders;
+-}
+-
+-struct get_selected_path_closure {
+-  GtkFileChooserDefault *impl;
+-  const GtkFilePath *path;
+-};
+-
+-static void
+-get_selected_path_foreach_cb (GtkTreeModel *model,
+-			      GtkTreePath  *path,
+-			      GtkTreeIter  *iter,
+-			      gpointer      data)
+-{
+-  struct get_selected_path_closure *closure;
+-  GtkTreeIter child_iter;
+-
+-  closure = data;
+-
+-  gtk_tree_model_sort_convert_iter_to_child_iter (closure->impl->sort_model, &child_iter, iter);
+-  closure->path = _gtk_file_system_model_get_path (closure->impl->browse_files_model, &child_iter);
+-}
+-
+-/* Returns a selected path from the file list */
+-static const GtkFilePath *
+-get_selected_path (GtkFileChooserDefault *impl)
+-{
+-  struct get_selected_path_closure closure;
+-  GtkTreeSelection *selection;
+-
+-  closure.impl = impl;
+-  closure.path = NULL;
+-
+-  selection =  gtk_tree_view_get_selection (GTK_TREE_VIEW (impl->browse_files_tree_view));
+-  gtk_tree_selection_selected_foreach (selection,
+-				       get_selected_path_foreach_cb,
+-				       &closure);
+-
+-  return closure.path;
+-}
+-
+-typedef struct {
+-  GtkFileChooserDefault *impl;
+-  gchar *tip;
+-} UpdateTooltipData;
+-
+-static void 
+-update_tooltip (GtkTreeModel      *model,
+-		GtkTreePath       *path,
+-		GtkTreeIter       *iter,
+-		gpointer           data)
+-{
+-  UpdateTooltipData *udata = data;
+-  GtkTreeIter child_iter;
+-  const GtkFileInfo *info;
+-
+-  if (udata->tip == NULL)
+-    {
+-      gtk_tree_model_sort_convert_iter_to_child_iter (udata->impl->sort_model,
+-						      &child_iter,
+-						      iter);
+-  
+-      info = _gtk_file_system_model_get_info (udata->impl->browse_files_model, &child_iter);
+-      udata->tip = g_strdup_printf (_("Add the folder '%s' to the bookmarks"),
+-				    gtk_file_info_get_display_name (info));
+-    }
+-}
+-
+-
+-/* Sensitize the "add bookmark" button if all the selected items are folders, or
+- * if there are no selected items *and* the current folder is not in the
+- * bookmarks list.  De-sensitize the button otherwise.
+- */
+-static void
+-bookmarks_check_add_sensitivity (GtkFileChooserDefault *impl)
+-{
+-  gint num_selected;
+-  gboolean all_folders;
+-  gboolean active;
+-  gchar *tip;
+-
+-  selection_check (impl, &num_selected, NULL, &all_folders);
+-
+-  if (num_selected == 0)
+-    active = (impl->current_folder != NULL) && (shortcut_find_position (impl, impl->current_folder) == -1);
+-  else if (num_selected == 1)
+-    {
+-      const GtkFilePath *path;
+-
+-      path = get_selected_path (impl);
+-      active = all_folders && (shortcut_find_position (impl, path) == -1);
+-    }
+-  else
+-    active = all_folders;
+-
+-  gtk_widget_set_sensitive (impl->browse_shortcuts_add_button, active);
+-
+-  if (impl->browse_files_popup_menu_add_shortcut_item)
+-    gtk_widget_set_sensitive (impl->browse_files_popup_menu_add_shortcut_item,
+-			      (num_selected == 0) ? FALSE : active);
+-
+-  if (active)
+-    {
+-      if (num_selected == 0)
+-	tip = g_strdup_printf (_("Add the current folder to the bookmarks"));    
+-      else if (num_selected > 1)
+-	tip = g_strdup_printf (_("Add the selected folders to the bookmarks"));
+-      else
+-	{
+-	  GtkTreeSelection *selection;
+-	  UpdateTooltipData data;
+-	  
+-	  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (impl->browse_files_tree_view));
+-	  data.impl = impl;
+-	  data.tip = NULL;
+-	  gtk_tree_selection_selected_foreach (selection, update_tooltip, &data);
+-	  tip = data.tip;
+-	  
+-	}
+-      gtk_tooltips_set_tip (impl->tooltips, impl->browse_shortcuts_add_button, tip, NULL);
+-      g_free (tip);
+-    }
+-}
+-
+-/* Sets the sensitivity of the "remove bookmark" button depending on whether a
+- * bookmark row is selected in the shortcuts tree.
+- */
+-static void
+-bookmarks_check_remove_sensitivity (GtkFileChooserDefault *impl)
+-{
+-  GtkTreeIter iter;
+-  gboolean removable = FALSE;
+-  gchar *name = NULL;
+-  
+-  if (shortcuts_get_selected (impl, &iter))
+-    gtk_tree_model_get (GTK_TREE_MODEL (impl->shortcuts_model), &iter,
+-			SHORTCUTS_COL_REMOVABLE, &removable,
+-			SHORTCUTS_COL_NAME, &name,
+-			-1);
+-
+-  gtk_widget_set_sensitive (impl->browse_shortcuts_remove_button, removable);
+-
+-  if (removable)
+-    {
+-      gchar *tip;
+-
+-      tip = g_strdup_printf (_("Remove the bookmark '%s'"), name);
+-      gtk_tooltips_set_tip (impl->tooltips, impl->browse_shortcuts_remove_button,
+-			    tip, NULL);
+-      g_free (tip);
+-    }
+-
+-  g_free (name);
+-}
+-
+-static void
+-shortcuts_check_popup_sensitivity (GtkFileChooserDefault *impl)
+-{
+-  GtkTreeIter iter;
+-  gboolean removable = FALSE;
+-
+-  if (impl->browse_shortcuts_popup_menu == NULL)
+-    return;
+-
+-  if (shortcuts_get_selected (impl, &iter))
+-    gtk_tree_model_get (GTK_TREE_MODEL (impl->shortcuts_model), &iter,
+-			SHORTCUTS_COL_REMOVABLE, &removable,
+-			-1);
+-
+-  gtk_widget_set_sensitive (impl->browse_shortcuts_popup_menu_remove_item, removable);
+-  gtk_widget_set_sensitive (impl->browse_shortcuts_popup_menu_rename_item, removable);
+-}
+-
+-/* GtkWidget::drag-begin handler for the shortcuts list. */
+-static void
+-shortcuts_drag_begin_cb (GtkWidget             *widget,
+-			 GdkDragContext        *context,
+-			 GtkFileChooserDefault *impl)
+-{
+-#if 0
+-  impl->shortcuts_drag_context = g_object_ref (context);
+-#endif
+-}
+-
+-#if 0
+-/* Removes the idle handler for outside drags */
+-static void
+-shortcuts_cancel_drag_outside_idle (GtkFileChooserDefault *impl)
+-{
+-  if (!impl->shortcuts_drag_outside_idle)
+-    return;
+-
+-  g_source_destroy (impl->shortcuts_drag_outside_idle);
+-  impl->shortcuts_drag_outside_idle = NULL;
+-}
+-#endif
+-
+-/* GtkWidget::drag-end handler for the shortcuts list. */
+-static void
+-shortcuts_drag_end_cb (GtkWidget             *widget,
+-		       GdkDragContext        *context,
+-		       GtkFileChooserDefault *impl)
+-{
+-#if 0
+-  g_object_unref (impl->shortcuts_drag_context);
+-
+-  shortcuts_cancel_drag_outside_idle (impl);
+-
+-  if (!impl->shortcuts_drag_outside)
+-    return;
+-
+-  gtk_button_clicked (GTK_BUTTON (impl->browse_shortcuts_remove_button));
+-
+-  impl->shortcuts_drag_outside = FALSE;
+-#endif
+-}
+-
+-/* GtkWidget::drag-data-delete handler for the shortcuts list. */
+-static void
+-shortcuts_drag_data_delete_cb (GtkWidget             *widget,
+-			       GdkDragContext        *context,
+-			       GtkFileChooserDefault *impl)
+-{
+-  g_signal_stop_emission_by_name (widget, "drag_data_delete");
+-}
+-
+-#if 0
+-/* Creates a suitable drag cursor to indicate that the selected bookmark will be
+- * deleted or not.
+- */
+-static void
+-shortcuts_drag_set_delete_cursor (GtkFileChooserDefault *impl,
+-				  gboolean               delete)
+-{
+-  GtkTreeView *tree_view;
+-  GtkTreeIter iter;
+-  GtkTreePath *path;
+-  GdkPixmap *row_pixmap;
+-  GdkBitmap *mask;
+-  int row_pixmap_y;
+-  int cell_y;
+-
+-  tree_view = GTK_TREE_VIEW (impl->browse_shortcuts_tree_view);
+-
+-  /* Find the selected path and get its drag pixmap */
+-
+-  if (!shortcuts_get_selected (impl, &iter))
+-    g_assert_not_reached ();
+-
+-  path = gtk_tree_model_get_path (GTK_TREE_MODEL (impl->shortcuts_model), &iter);
+-
+-  row_pixmap = gtk_tree_view_create_row_drag_icon (tree_view, path);
+-  gtk_tree_path_free (path);
+-
+-  mask = NULL;
+-  row_pixmap_y = 0;
+-
+-  if (delete)
+-    {
+-      GdkPixbuf *pixbuf;
+-
+-      pixbuf = gtk_widget_render_icon (impl->browse_shortcuts_tree_view,
+-				       GTK_STOCK_DELETE,
+-				       GTK_ICON_SIZE_DND,
+-				       NULL);
+-      if (pixbuf)
+-	{
+-	  GdkPixmap *composite;
+-	  int row_pixmap_width, row_pixmap_height;
+-	  int pixbuf_width, pixbuf_height;
+-	  int composite_width, composite_height;
+-	  int pixbuf_x, pixbuf_y;
+-	  GdkGC *gc, *mask_gc;
+-	  GdkColor color;
+-	  GdkBitmap *pixbuf_mask;
+-
+-	  /* Create pixmap and mask for composite image */
+-
+-	  gdk_drawable_get_size (row_pixmap, &row_pixmap_width, &row_pixmap_height);
+-	  pixbuf_width = gdk_pixbuf_get_width (pixbuf);
+-	  pixbuf_height = gdk_pixbuf_get_height (pixbuf);
+-
+-	  composite_width = MAX (row_pixmap_width, pixbuf_width);
+-	  composite_height = MAX (row_pixmap_height, pixbuf_height);
+-
+-	  row_pixmap_y = (composite_height - row_pixmap_height) / 2;
+-
+-	  if (gtk_widget_get_direction (impl->browse_shortcuts_tree_view) == GTK_TEXT_DIR_RTL)
+-	    pixbuf_x = 0;
+-	  else
+-	    pixbuf_x = composite_width - pixbuf_width;
+-
+-	  pixbuf_y = (composite_height - pixbuf_height) / 2;
+-
+-	  composite = gdk_pixmap_new (row_pixmap, composite_width, composite_height, -1);
+-	  gc = gdk_gc_new (composite);
+-
+-	  mask = gdk_pixmap_new (row_pixmap, composite_width, composite_height, 1);
+-	  mask_gc = gdk_gc_new (mask);
+-	  color.pixel = 0;
+-	  gdk_gc_set_foreground (mask_gc, &color);
+-	  gdk_draw_rectangle (mask, mask_gc, TRUE, 0, 0, composite_width, composite_height);
+-
+-	  color.red = 0xffff;
+-	  color.green = 0xffff;
+-	  color.blue = 0xffff;
+-	  gdk_gc_set_rgb_fg_color (gc, &color);
+-	  gdk_draw_rectangle (composite, gc, TRUE, 0, 0, composite_width, composite_height);
+-
+-	  /* Composite the row pixmap and the pixbuf */
+-
+-	  gdk_pixbuf_render_pixmap_and_mask_for_colormap
+-	    (pixbuf,
+-	     gtk_widget_get_colormap (impl->browse_shortcuts_tree_view),
+-	     NULL, &pixbuf_mask, 128);
+-	  gdk_draw_drawable (mask, mask_gc, pixbuf_mask,
+-			     0, 0,
+-			     pixbuf_x, pixbuf_y,
+-			     pixbuf_width, pixbuf_height);
+-	  g_object_unref (pixbuf_mask);
+-
+-	  gdk_draw_drawable (composite, gc, row_pixmap,
+-			     0, 0,
+-			     0, row_pixmap_y,
+-			     row_pixmap_width, row_pixmap_height);
+-	  color.pixel = 1;
+-	  gdk_gc_set_foreground (mask_gc, &color);
+-	  gdk_draw_rectangle (mask, mask_gc, TRUE, 0, row_pixmap_y, row_pixmap_width, row_pixmap_height);
+-
+-	  gdk_draw_pixbuf (composite, gc, pixbuf,
+-			   0, 0,
+-			   pixbuf_x, pixbuf_y,
+-			   pixbuf_width, pixbuf_height,
+-			   GDK_RGB_DITHER_MAX,
+-			   0, 0);
+-
+-	  g_object_unref (pixbuf);
+-	  g_object_unref (row_pixmap);
+-
+-	  row_pixmap = composite;
+-	}
+-    }
+-
+-  /* The hotspot offsets here are copied from gtk_tree_view_drag_begin(), ugh */
+-
+-  gtk_tree_view_get_path_at_pos (tree_view,
+-                                 tree_view->priv->press_start_x,
+-                                 tree_view->priv->press_start_y,
+-                                 NULL,
+-                                 NULL,
+-                                 NULL,
+-                                 &cell_y);
+-
+-  gtk_drag_set_icon_pixmap (impl->shortcuts_drag_context,
+-			    gdk_drawable_get_colormap (row_pixmap),
+-			    row_pixmap,
+-			    mask,
+-			    tree_view->priv->press_start_x + 1,
+-			    row_pixmap_y + cell_y + 1);
+-
+-  g_object_unref (row_pixmap);
+-  if (mask)
+-    g_object_unref (mask);
+-}
+-
+-/* We set the delete cursor and the shortcuts_drag_outside flag in an idle
+- * handler so that we can tell apart the drag_leave event that comes right
+- * before a drag_drop, from a normal drag_leave.  We don't want to set the
+- * cursor nor the flag in the latter case.
+- */
+-static gboolean
+-shortcuts_drag_outside_idle_cb (GtkFileChooserDefault *impl)
+-{
+-  GDK_THREADS_ENTER ();
+-  
+-  shortcuts_drag_set_delete_cursor (impl, TRUE);
+-  impl->shortcuts_drag_outside = TRUE;
+-
+-  shortcuts_cancel_drag_outside_idle (impl);
+-
+-  GDK_THREADS_LEAVE ();
+-
+-  return FALSE;
+-}
+-#endif
+-
+-/* GtkWidget::drag-leave handler for the shortcuts list.  We unhighlight the
+- * drop position.
+- */
+-static void
+-shortcuts_drag_leave_cb (GtkWidget             *widget,
+-			 GdkDragContext        *context,
+-			 guint                  time_,
+-			 GtkFileChooserDefault *impl)
+-{
+-#if 0
+-  if (gtk_drag_get_source_widget (context) == widget && !impl->shortcuts_drag_outside_idle)
+-    {
+-      impl->shortcuts_drag_outside_idle = g_idle_source_new ();
+-      g_source_set_closure (impl->shortcuts_drag_outside_idle,
+-			    g_cclosure_new_object (G_CALLBACK (shortcuts_drag_outside_idle_cb),
+-						   G_OBJECT (impl)));
+-      g_source_attach (impl->shortcuts_drag_outside_idle, NULL);
+-    }
+-#endif
+-
+-  gtk_tree_view_set_drag_dest_row (GTK_TREE_VIEW (impl->browse_shortcuts_tree_view),
+-				   NULL,
+-				   GTK_TREE_VIEW_DROP_BEFORE);
+-
+-  g_signal_stop_emission_by_name (widget, "drag_leave");
+-}
+-
+-/* Computes the appropriate row and position for dropping */
+-static void
+-shortcuts_compute_drop_position (GtkFileChooserDefault   *impl,
+-				 int                      x,
+-				 int                      y,
+-				 GtkTreePath            **path,
+-				 GtkTreeViewDropPosition *pos)
+-{
+-  GtkTreeView *tree_view;
+-  GtkTreeViewColumn *column;
+-  int cell_y;
+-  GdkRectangle cell;
+-  int row;
+-  int bookmarks_index;
+-
+-  tree_view = GTK_TREE_VIEW (impl->browse_shortcuts_tree_view);
+-
+-  bookmarks_index = shortcuts_get_index (impl, SHORTCUTS_BOOKMARKS);
+-
+-  if (!gtk_tree_view_get_path_at_pos (tree_view,
+-                                      x,
+-				      y - TREE_VIEW_HEADER_HEIGHT (tree_view),
+-                                      path,
+-                                      &column,
+-                                      NULL,
+-                                      &cell_y))
+-    {
+-      row = bookmarks_index + impl->num_bookmarks - 1;
+-      *path = gtk_tree_path_new_from_indices (row, -1);
+-      *pos = GTK_TREE_VIEW_DROP_AFTER;
+-      return;
+-    }
+-
+-  row = *gtk_tree_path_get_indices (*path);
+-  gtk_tree_view_get_background_area (tree_view, *path, column, &cell);
+-  gtk_tree_path_free (*path);
+-
+-  if (row < bookmarks_index)
+-    {
+-      row = bookmarks_index;
+-      *pos = GTK_TREE_VIEW_DROP_BEFORE;
+-    }
+-  else if (row > bookmarks_index + impl->num_bookmarks - 1)
+-    {
+-      row = bookmarks_index + impl->num_bookmarks - 1;
+-      *pos = GTK_TREE_VIEW_DROP_AFTER;
+-    }
+-  else
+-    {
+-      if (cell_y < cell.height / 2)
+-	*pos = GTK_TREE_VIEW_DROP_BEFORE;
+-      else
+-	*pos = GTK_TREE_VIEW_DROP_AFTER;
+-    }
+-
+-  *path = gtk_tree_path_new_from_indices (row, -1);
+-}
+-
+-/* GtkWidget::drag-motion handler for the shortcuts list.  We basically
+- * implement the destination side of DnD by hand, due to limitations in
+- * GtkTreeView's DnD API.
++/* Idle handler for creating a new folder after editing its name cell, or for
++ * canceling the editing.
+  */
+ static gboolean
+-shortcuts_drag_motion_cb (GtkWidget             *widget,
+-			  GdkDragContext        *context,
+-			  gint                   x,
+-			  gint                   y,
+-			  guint                  time_,
+-			  GtkFileChooserDefault *impl)
+-{
+-  GtkTreePath *path;
+-  GtkTreeViewDropPosition pos;
+-  GdkDragAction action;
+-
+-#if 0
+-  if (gtk_drag_get_source_widget (context) == widget)
+-    {
+-      shortcuts_cancel_drag_outside_idle (impl);
+-
+-      if (impl->shortcuts_drag_outside)
+-	{
+-	  shortcuts_drag_set_delete_cursor (impl, FALSE);
+-	  impl->shortcuts_drag_outside = FALSE;
+-	}
+-    }
+-#endif
+-
+-  if (context->suggested_action == GDK_ACTION_COPY || (context->actions & GDK_ACTION_COPY) != 0)
+-    action = GDK_ACTION_COPY;
+-  else if (context->suggested_action == GDK_ACTION_MOVE || (context->actions & GDK_ACTION_MOVE) != 0)
+-    action = GDK_ACTION_MOVE;
+-  else
+-    {
+-      action = 0;
+-      goto out;
+-    }
+-
+-  shortcuts_compute_drop_position (impl, x, y, &path, &pos);
+-  gtk_tree_view_set_drag_dest_row (GTK_TREE_VIEW (impl->browse_shortcuts_tree_view), path, pos);
+-  gtk_tree_path_free (path);
+-
+- out:
+-
+-  g_signal_stop_emission_by_name (widget, "drag_motion");
+-
+-  if (action != 0)
+-    {
+-      gdk_drag_status (context, action, time_);
+-      return TRUE;
+-    }
+-  else
+-    return FALSE;
+-}
+-
+-/* GtkWidget::drag-drop handler for the shortcuts list. */
+-static gboolean
+-shortcuts_drag_drop_cb (GtkWidget             *widget,
+-			GdkDragContext        *context,
+-			gint                   x,
+-			gint                   y,
+-			guint                  time_,
+-			GtkFileChooserDefault *impl)
++edited_idle_cb (GtkFileChooserDefault *impl)
+ {
+-#if 0
+-  shortcuts_cancel_drag_outside_idle (impl);
+-#endif
++  GDK_THREADS_ENTER ();
+ 
+-  g_signal_stop_emission_by_name (widget, "drag_drop");
+-  return TRUE;
+-}
++  g_source_destroy (impl->edited_idle);
++  impl->edited_idle = NULL;
+ 
+-/* Parses a "text/uri-list" string and inserts its URIs as bookmarks */
+-static void
+-shortcuts_drop_uris (GtkFileChooserDefault *impl,
+-		     const char            *data,
+-		     int                    position)
+-{
+-  gchar **uris;
+-  gint i;
++  _gtk_file_system_model_remove_editable (impl->browse_files_model);
++  g_object_set (impl->list_name_renderer, "editable", FALSE, NULL);
+ 
+-  uris = g_uri_list_extract_uris (data);
++  gtk_widget_set_sensitive (impl->browse_new_folder_button, TRUE);
+ 
+-  for (i = 0; uris[i]; i++)
++  if (impl->edited_new_text) /* not cancelled? */
+     {
+-      char *uri;
+-      GtkFilePath *path;
+-
+-      uri = uris[i];
+-      path = gtk_file_system_uri_to_path (impl->file_system, uri);
++      GError *error;
++      GtkFilePath *file_path;
+ 
+-      if (path)
++      error = NULL;
++      file_path = gtk_file_system_make_path (impl->file_system,
++					     impl->current_folder,
++					     impl->edited_new_text,
++					     &error);
++      if (file_path)
+ 	{
+-	  if (shortcuts_add_bookmark_from_path (impl, path, position))
+-	    position++;
++	  GtkFileSystemHandle *handle;
+ 
+-	  gtk_file_path_free (path);
+-	}
+-      else
+-	{
+-	  GError *error;
++	  handle = gtk_file_system_create_folder (impl->file_system, file_path,
++						  edited_idle_create_folder_cb,
++						  g_object_ref (impl));
++	  impl->pending_handles = g_slist_append (impl->pending_handles, handle);
+ 
+-	  g_set_error (&error,
+-		       GTK_FILE_CHOOSER_ERROR,
+-		       GTK_FILE_CHOOSER_ERROR_BAD_FILENAME,
+-		       _("Could not add a bookmark for '%s' "
+-			 "because it is an invalid path name."),
+-		       uri);
+-	  error_adding_bookmark_dialog (impl, path, error);
++	  gtk_file_path_free (file_path);
+ 	}
+-    }
+-
+-  g_strfreev (uris);
+-}
+-
+-/* Reorders the selected bookmark to the specified position */
+-static void
+-shortcuts_reorder (GtkFileChooserDefault *impl,
+-		   int                    new_position)
+-{
+-  GtkTreeIter iter;
+-  gpointer col_data;
+-  gboolean is_volume;
+-  GtkTreePath *path;
+-  int old_position;
+-  int bookmarks_index;
+-  const GtkFilePath *file_path;
+-  GtkFilePath *file_path_copy;
+-  GError *error;
+-  gchar *name;
+-
+-  /* Get the selected path */
+-
+-  if (!shortcuts_get_selected (impl, &iter))
+-    g_assert_not_reached ();
+-
+-  path = gtk_tree_model_get_path (GTK_TREE_MODEL (impl->shortcuts_model), &iter);
+-  old_position = *gtk_tree_path_get_indices (path);
+-  gtk_tree_path_free (path);
+-
+-  bookmarks_index = shortcuts_get_index (impl, SHORTCUTS_BOOKMARKS);
+-  old_position -= bookmarks_index;
+-  g_assert (old_position >= 0 && old_position < impl->num_bookmarks);
+-
+-  gtk_tree_model_get (GTK_TREE_MODEL (impl->shortcuts_model), &iter,
+-		      SHORTCUTS_COL_NAME, &name,
+-		      SHORTCUTS_COL_DATA, &col_data,
+-		      SHORTCUTS_COL_IS_VOLUME, &is_volume,
+-		      -1);
+-  g_assert (col_data != NULL);
+-  g_assert (!is_volume);
+-  
+-  file_path = col_data;
+-  file_path_copy = gtk_file_path_copy (file_path); /* removal below will free file_path, so we need a copy */
+-
+-  /* Remove the path from the old position and insert it in the new one */
+-
+-  if (new_position > old_position)
+-    new_position--;
+-
+-  if (old_position == new_position)
+-    goto out;
++      else
++	error_creating_folder_dialog (impl, file_path, error);
+ 
+-  error = NULL;
+-  if (gtk_file_system_remove_bookmark (impl->file_system, file_path_copy, &error))
+-    {
+-      shortcuts_add_bookmark_from_path (impl, file_path_copy, new_position);
+-      gtk_file_system_set_bookmark_label (impl->file_system, file_path_copy, name);
++      g_free (impl->edited_new_text);
++      impl->edited_new_text = NULL;
+     }
+-  else
+-    error_adding_bookmark_dialog (impl, file_path_copy, error);
+-
+- out:
+-
+-  gtk_file_path_free (file_path_copy);
+-}
+-
+-/* Callback used when we get the drag data for the bookmarks list.  We add the
+- * received URIs as bookmarks if they are folders.
+- */
+-static void
+-shortcuts_drag_data_received_cb (GtkWidget          *widget,
+-				 GdkDragContext     *context,
+-				 gint                x,
+-				 gint                y,
+-				 GtkSelectionData   *selection_data,
+-				 guint               info,
+-				 guint               time_,
+-				 gpointer            data)
+-{
+-  GtkFileChooserDefault *impl;
+-  GtkTreePath *tree_path;
+-  GtkTreeViewDropPosition tree_pos;
+-  int position;
+-  int bookmarks_index;
+-
+-  impl = GTK_FILE_CHOOSER_DEFAULT (data);
+-
+-  /* Compute position */
+-
+-  bookmarks_index = shortcuts_get_index (impl, SHORTCUTS_BOOKMARKS);
+-
+-  shortcuts_compute_drop_position (impl, x, y, &tree_path, &tree_pos);
+-  position = *gtk_tree_path_get_indices (tree_path);
+-  gtk_tree_path_free (tree_path);
+-
+-  if (tree_pos == GTK_TREE_VIEW_DROP_AFTER)
+-    position++;
+-
+-  g_assert (position >= bookmarks_index);
+-  position -= bookmarks_index;
+-
+-  if (selection_data->target == gdk_atom_intern_static_string ("text/uri-list"))
+-    shortcuts_drop_uris (impl, (const char *) selection_data->data, position);
+-  else if (selection_data->target == gdk_atom_intern_static_string ("GTK_TREE_MODEL_ROW"))
+-    shortcuts_reorder (impl, position);
+-
+-  g_signal_stop_emission_by_name (widget, "drag_data_received");
+-}
+-
+-/* Callback used when the selection in the shortcuts tree changes */
+-static void
+-shortcuts_selection_changed_cb (GtkTreeSelection      *selection,
+-				GtkFileChooserDefault *impl)
+-{
+-  bookmarks_check_remove_sensitivity (impl);
+-  shortcuts_check_popup_sensitivity (impl);
+-}
+-
+-static gboolean
+-shortcuts_row_separator_func (GtkTreeModel *model,
+-			      GtkTreeIter  *iter,
+-			      gpointer      data)
+-{
+-  gint column = GPOINTER_TO_INT (data);
+-  gchar *text;
+-
+-  gtk_tree_model_get (model, iter, column, &text, -1);
+-  
+-  if (!text)
+-    return TRUE;
+-
+-  g_free (text);
+-
+-  return FALSE;
+-}
+ 
+-/* Since GtkTreeView has a keybinding attached to '/', we need to catch
+- * keypresses before the TreeView gets them.
+- */
+-static gboolean
+-tree_view_keybinding_cb (GtkWidget             *tree_view,
+-			 GdkEventKey           *event,
+-			 GtkFileChooserDefault *impl)
+-{
+-  if ((event->keyval == GDK_slash
+-       || event->keyval == GDK_KP_Divide
+-#ifdef G_OS_UNIX
+-       || event->keyval == GDK_asciitilde
+-#endif
+-       ) && ! (event->state & (~GDK_SHIFT_MASK & gtk_accelerator_get_default_mod_mask ())))
+-    {
+-      location_popup_handler (impl, event->string);
+-      return TRUE;
+-    }
++  GDK_THREADS_LEAVE ();
+ 
+   return FALSE;
+ }
+ 
+-/* Callback used when the file list's popup menu is detached */
+-static void
+-shortcuts_popup_menu_detach_cb (GtkWidget *attach_widget,
+-				GtkMenu   *menu)
+-{
+-  GtkFileChooserDefault *impl;
+-  
+-  impl = g_object_get_data (G_OBJECT (attach_widget), "GtkFileChooserDefault");
+-  g_assert (GTK_IS_FILE_CHOOSER_DEFAULT (impl));
+-
+-  impl->browse_shortcuts_popup_menu = NULL;
+-  impl->browse_shortcuts_popup_menu_remove_item = NULL;
+-  impl->browse_shortcuts_popup_menu_rename_item = NULL;
+-}
+-
+-static void
+-remove_shortcut_cb (GtkMenuItem           *item,
+-		    GtkFileChooserDefault *impl)
+-{
+-  remove_selected_bookmarks (impl);
+-}
+-
+-/* Rename the selected bookmark */
+-static void
+-rename_selected_bookmark (GtkFileChooserDefault *impl)
+-{
+-  GtkTreeIter iter;
+-  GtkTreePath *path;
+-  GtkTreeViewColumn *column;
+-  GtkCellRenderer *cell;
+-  GList *renderers;
+-
+-  if (shortcuts_get_selected (impl, &iter))
+-    {
+-      path = gtk_tree_model_get_path (GTK_TREE_MODEL (impl->shortcuts_model), &iter);
+-      column = gtk_tree_view_get_column (GTK_TREE_VIEW (impl->browse_shortcuts_tree_view), 0);
+-      renderers = gtk_tree_view_column_get_cell_renderers (column);
+-      cell = g_list_nth_data (renderers, 1);
+-      g_list_free (renderers);
+-      g_object_set (cell, "editable", TRUE, NULL);
+-      gtk_tree_view_set_cursor_on_cell (GTK_TREE_VIEW (impl->browse_shortcuts_tree_view),
+-					path, column, cell, TRUE);
+-      gtk_tree_path_free (path);
+-    }
+-}
+-
+-static void
+-rename_shortcut_cb (GtkMenuItem           *item,
+-		    GtkFileChooserDefault *impl)
+-{
+-  rename_selected_bookmark (impl);
+-}
+-
+-/* Constructs the popup menu for the file list if needed */
+-static void
+-shortcuts_build_popup_menu (GtkFileChooserDefault *impl)
+-{
+-  GtkWidget *item;
+-
+-  if (impl->browse_shortcuts_popup_menu)
+-    return;
+-
+-  impl->browse_shortcuts_popup_menu = gtk_menu_new ();
+-  gtk_menu_attach_to_widget (GTK_MENU (impl->browse_shortcuts_popup_menu),
+-			     impl->browse_shortcuts_tree_view,
+-			     shortcuts_popup_menu_detach_cb);
+-
+-  item = gtk_image_menu_item_new_with_label (_("Remove"));
+-  impl->browse_shortcuts_popup_menu_remove_item = item;
+-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item),
+-				 gtk_image_new_from_stock (GTK_STOCK_REMOVE, GTK_ICON_SIZE_MENU));
+-  g_signal_connect (item, "activate",
+-		    G_CALLBACK (remove_shortcut_cb), impl);
+-  gtk_widget_show (item);
+-  gtk_menu_shell_append (GTK_MENU_SHELL (impl->browse_shortcuts_popup_menu), item);
+-
+-  item = gtk_menu_item_new_with_label (_("Rename..."));
+-  impl->browse_shortcuts_popup_menu_rename_item = item;
+-  g_signal_connect (item, "activate",
+-		    G_CALLBACK (rename_shortcut_cb), impl);
+-  gtk_widget_show (item);
+-  gtk_menu_shell_append (GTK_MENU_SHELL (impl->browse_shortcuts_popup_menu), item);
+-
+-  shortcuts_check_popup_sensitivity (impl);
+-}
+-
+ static void
+-shortcuts_update_popup_menu (GtkFileChooserDefault *impl)
++queue_edited_idle (GtkFileChooserDefault *impl,
++		   const gchar           *new_text)
+ {
+-  shortcuts_build_popup_menu (impl);  
+-}
+-
+-static void
+-popup_position_func (GtkMenu   *menu,
+-                     gint      *x,
+-                     gint      *y,
+-                     gboolean  *push_in,
+-                     gpointer	user_data);
++  /* We create the folder in an idle handler so that we don't modify the tree
++   * just now.
++   */
+ 
+-static void
+-shortcuts_popup_menu (GtkFileChooserDefault *impl,
+-		      GdkEventButton        *event)
+-{
+-  shortcuts_update_popup_menu (impl);
+-  if (event)
+-    gtk_menu_popup (GTK_MENU (impl->browse_shortcuts_popup_menu),
+-		    NULL, NULL, NULL, NULL,
+-		    event->button, event->time);
+-  else
++  if (!impl->edited_idle)
+     {
+-      gtk_menu_popup (GTK_MENU (impl->browse_shortcuts_popup_menu),
+-		      NULL, NULL,
+-		      popup_position_func, impl->browse_shortcuts_tree_view,
+-		      0, GDK_CURRENT_TIME);
+-      gtk_menu_shell_select_first (GTK_MENU_SHELL (impl->browse_shortcuts_popup_menu),
+-				   FALSE);
++      impl->edited_idle = g_idle_source_new ();
++      g_source_set_closure (impl->edited_idle,
++			    g_cclosure_new_object (G_CALLBACK (edited_idle_cb),
++						   G_OBJECT (impl)));
++      g_source_attach (impl->edited_idle, NULL);
+     }
+-}
+-
+-/* Callback used for the GtkWidget::popup-menu signal of the shortcuts list */
+-static gboolean
+-shortcuts_popup_menu_cb (GtkWidget *widget,
+-			 GtkFileChooserDefault *impl)
+-{
+-  shortcuts_popup_menu (impl, NULL);
+-  return TRUE;
+-}
+-
+-/* Callback used when a button is pressed on the shortcuts list.  
+- * We trap button 3 to bring up a popup menu.
+- */
+-static gboolean
+-shortcuts_button_press_event_cb (GtkWidget             *widget,
+-				 GdkEventButton        *event,
+-				 GtkFileChooserDefault *impl)
+-{
+-  static gboolean in_press = FALSE;
+-  gboolean handled;
+-
+-  if (in_press)
+-    return FALSE;
+-
+-  if (event->button != 3)
+-    return FALSE;
+-
+-  in_press = TRUE;
+-  handled = gtk_widget_event (impl->browse_shortcuts_tree_view, (GdkEvent *) event);
+-  in_press = FALSE;
+ 
+-  if (!handled)
+-    return FALSE;
+-
+-  shortcuts_popup_menu (impl, event);
+-  return TRUE;
++  g_free (impl->edited_new_text);
++  impl->edited_new_text = g_strdup (new_text);
+ }
+ 
++/* Callback used from the text cell renderer when the new folder is named */
+ static void
+-shortcuts_edited (GtkCellRenderer       *cell,
+-		  gchar                 *path_string,
+-		  gchar                 *new_text,
+-		  GtkFileChooserDefault *impl)
+-{
+-  GtkTreePath *path;
+-  GtkTreeIter iter;
+-  GtkFilePath *shortcut;
+-
+-  g_object_set (cell, "editable", FALSE, NULL);
+-
+-  path = gtk_tree_path_new_from_string (path_string);
+-  if (!gtk_tree_model_get_iter (GTK_TREE_MODEL (impl->shortcuts_model), &iter, path))
+-    g_assert_not_reached ();
+-
+-  gtk_tree_model_get (GTK_TREE_MODEL (impl->shortcuts_model), &iter,
+-		      SHORTCUTS_COL_DATA, &shortcut,
+-		      -1);
+-  gtk_tree_path_free (path);
+-  
+-  gtk_file_system_set_bookmark_label (impl->file_system, shortcut, new_text);
++renderer_edited_cb (GtkCellRendererText   *cell_renderer_text,
++		    const gchar           *path,
++		    const gchar           *new_text,
++		    GtkFileChooserDefault *impl)
++{
++ /* work around bug #154921 */
++  g_object_set (cell_renderer_text,
++		"mode", GTK_CELL_RENDERER_MODE_INERT, NULL);
++   queue_edited_idle (impl, new_text);
+ }
+ 
++/* Callback used from the text cell renderer when the new folder edition gets
++ * canceled.
++ */
+ static void
+-shortcuts_editing_canceled (GtkCellRenderer       *cell,
+-			    GtkFileChooserDefault *impl)
++renderer_editing_canceled_cb (GtkCellRendererText   *cell_renderer_text,
++			      GtkFileChooserDefault *impl)
+ {
+-  g_object_set (cell, "editable", FALSE, NULL);
++ /* work around bug #154921 */
++  g_object_set (cell_renderer_text,
++		"mode", GTK_CELL_RENDERER_MODE_INERT, NULL);
++   queue_edited_idle (impl, NULL);
+ }
+ 
+-/* Creates the widgets for the shortcuts and bookmarks tree */
++/* Creates the widgets for the filter combo box */
+ static GtkWidget *
+-shortcuts_list_create (GtkFileChooserDefault *impl)
++filter_create (GtkFileChooserDefault *impl)
+ {
+-  GtkWidget *swin;
+-  GtkTreeSelection *selection;
+-  GtkTreeViewColumn *column;
+-  GtkCellRenderer *renderer;
+-
+-  /* Scrolled window */
+-
+-  swin = gtk_scrolled_window_new (NULL, NULL);
+-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swin),
+-				  GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+-  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (swin),
+-				       GTK_SHADOW_IN);
+-  gtk_widget_show (swin);
+-
+-  /* Tree */
+-
+-  impl->browse_shortcuts_tree_view = gtk_tree_view_new ();
+-#ifdef PROFILE_FILE_CHOOSER
+-  g_object_set_data (G_OBJECT (impl->browse_shortcuts_tree_view), "fmq-name", "shortcuts");
+-#endif
+-  g_signal_connect (impl->browse_shortcuts_tree_view, "key_press_event",
+-		    G_CALLBACK (tree_view_keybinding_cb), impl);
+-  g_signal_connect (impl->browse_shortcuts_tree_view, "popup_menu",
+-		    G_CALLBACK (shortcuts_popup_menu_cb), impl);
+-  g_signal_connect (impl->browse_shortcuts_tree_view, "button_press_event",
+-		    G_CALLBACK (shortcuts_button_press_event_cb), impl);
+-  /* Accessible object name for the file chooser's shortcuts pane */
+-  atk_object_set_name (gtk_widget_get_accessible (impl->browse_shortcuts_tree_view), _("Places"));
+-
+-  gtk_tree_view_set_model (GTK_TREE_VIEW (impl->browse_shortcuts_tree_view), impl->shortcuts_filter_model);
+-
+-  gtk_tree_view_enable_model_drag_source (GTK_TREE_VIEW (impl->browse_shortcuts_tree_view),
+-					  GDK_BUTTON1_MASK,
+-					  shortcuts_source_targets,
+-					  num_shortcuts_source_targets,
+-					  GDK_ACTION_MOVE);
+-
+-  gtk_drag_dest_set (impl->browse_shortcuts_tree_view,
+-		     GTK_DEST_DEFAULT_ALL,
+-		     shortcuts_dest_targets,
+-		     num_shortcuts_dest_targets,
+-		     GDK_ACTION_COPY | GDK_ACTION_MOVE);
+-
+-  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (impl->browse_shortcuts_tree_view));
+-  gtk_tree_selection_set_mode (selection, GTK_SELECTION_BROWSE);
+-  gtk_tree_selection_set_select_function (selection,
+-					  shortcuts_select_func,
+-					  impl, NULL);
+-
+-  g_signal_connect (selection, "changed",
+-		    G_CALLBACK (shortcuts_selection_changed_cb), impl);
+-
+-  g_signal_connect (impl->browse_shortcuts_tree_view, "row_activated",
+-		    G_CALLBACK (shortcuts_row_activated_cb), impl);
+-
+-  g_signal_connect (impl->browse_shortcuts_tree_view, "key_press_event",
+-		    G_CALLBACK (shortcuts_key_press_event_cb), impl);
++  impl->filter_combo = gtk_combo_box_new_text ();
++  gtk_combo_box_set_focus_on_click (GTK_COMBO_BOX (impl->filter_combo), FALSE);
+ 
+-  g_signal_connect (impl->browse_shortcuts_tree_view, "drag_begin",
+-		    G_CALLBACK (shortcuts_drag_begin_cb), impl);
+-  g_signal_connect (impl->browse_shortcuts_tree_view, "drag_end",
+-		    G_CALLBACK (shortcuts_drag_end_cb), impl);
+-  g_signal_connect (impl->browse_shortcuts_tree_view, "drag_data_delete",
+-		    G_CALLBACK (shortcuts_drag_data_delete_cb), impl);
+-
+-  g_signal_connect (impl->browse_shortcuts_tree_view, "drag_leave",
+-		    G_CALLBACK (shortcuts_drag_leave_cb), impl);
+-  g_signal_connect (impl->browse_shortcuts_tree_view, "drag_motion",
+-		    G_CALLBACK (shortcuts_drag_motion_cb), impl);
+-  g_signal_connect (impl->browse_shortcuts_tree_view, "drag_drop",
+-		    G_CALLBACK (shortcuts_drag_drop_cb), impl);
+-  g_signal_connect (impl->browse_shortcuts_tree_view, "drag_data_received",
+-		    G_CALLBACK (shortcuts_drag_data_received_cb), impl);
++  g_signal_connect (impl->filter_combo, "changed",
++		    G_CALLBACK (filter_combo_changed), impl);
+ 
+-  gtk_container_add (GTK_CONTAINER (swin), impl->browse_shortcuts_tree_view);
+-  gtk_widget_show (impl->browse_shortcuts_tree_view);
++  return impl->filter_combo;
++}
+ 
+-  /* Column */
++struct selection_check_closure {
++  GtkFileChooserDefault *impl;
++  int num_selected;
++  gboolean all_files;
++  gboolean all_folders;
++};
+ 
+-  column = gtk_tree_view_column_new ();
+-  /* Column header for the file chooser's shortcuts pane */
+-  gtk_tree_view_column_set_title (column, _("_Places"));
++/* Used from gtk_tree_selection_selected_foreach() */
++static void
++selection_check_foreach_cb (GtkTreeModel *model,
++			    GtkTreePath  *path,
++			    GtkTreeIter  *iter,
++			    gpointer      data)
++{
++  struct selection_check_closure *closure;
++  GtkTreeIter child_iter;
++  const GtkFileInfo *info;
++  gboolean is_folder;
+ 
+-  renderer = gtk_cell_renderer_pixbuf_new ();
+-  gtk_tree_view_column_pack_start (column, renderer, FALSE);
+-  gtk_tree_view_column_set_attributes (column, renderer,
+-				       "pixbuf", SHORTCUTS_COL_PIXBUF,
+-				       "visible", SHORTCUTS_COL_PIXBUF_VISIBLE,
+-				       NULL);
++  closure = data;
++  closure->num_selected++;
+ 
+-  renderer = gtk_cell_renderer_text_new ();
+-  g_signal_connect (renderer, "edited", 
+-		    G_CALLBACK (shortcuts_edited), impl);
+-  g_signal_connect (renderer, "editing-canceled", 
+-		    G_CALLBACK (shortcuts_editing_canceled), impl);
+-  gtk_tree_view_column_pack_start (column, renderer, TRUE);
+-  gtk_tree_view_column_set_attributes (column, renderer,
+-				       "text", SHORTCUTS_COL_NAME,
+-				       NULL);
+-
+-  gtk_tree_view_set_row_separator_func (GTK_TREE_VIEW (impl->browse_shortcuts_tree_view),
+-					shortcuts_row_separator_func,
+-					GINT_TO_POINTER (SHORTCUTS_COL_NAME),
+-					NULL);
++  gtk_tree_model_sort_convert_iter_to_child_iter (closure->impl->sort_model, &child_iter, iter);
+ 
+-  gtk_tree_view_append_column (GTK_TREE_VIEW (impl->browse_shortcuts_tree_view), column);
++  info = _gtk_file_system_model_get_info (closure->impl->browse_files_model, &child_iter);
++  is_folder = info ? gtk_file_info_get_is_folder (info) : FALSE;
+ 
+-  return swin;
++  closure->all_folders = closure->all_folders && is_folder;
++  closure->all_files = closure->all_files && !is_folder;
+ }
+ 
+-/* Creates the widgets for the shortcuts/bookmarks pane */
+-static GtkWidget *
+-shortcuts_pane_create (GtkFileChooserDefault *impl,
+-		       GtkSizeGroup          *size_group)
++/* Checks whether the selected items in the file list are all files or all folders */
++static void
++selection_check (GtkFileChooserDefault *impl,
++		 gint                  *num_selected,
++		 gboolean              *all_files,
++		 gboolean              *all_folders)
+ {
+-  GtkWidget *vbox;
+-  GtkWidget *hbox;
+-  GtkWidget *widget;
+-
+-  vbox = gtk_vbox_new (FALSE, 6);
+-  gtk_widget_show (vbox);
+-
+-  /* Shortcuts tree */
++  struct selection_check_closure closure;
++  GtkTreeSelection *selection;
+ 
+-  widget = shortcuts_list_create (impl);
+-  gtk_box_pack_start (GTK_BOX (vbox), widget, TRUE, TRUE, 0);
++  closure.impl = impl;
++  closure.num_selected = 0;
++  closure.all_files = TRUE;
++  closure.all_folders = TRUE;
+ 
+-  /* Box for buttons */
++  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (impl->browse_files_tree_view));
++  gtk_tree_selection_selected_foreach (selection,
++				       selection_check_foreach_cb,
++				       &closure);
+ 
+-  hbox = gtk_hbox_new (TRUE, 6);
+-  gtk_size_group_add_widget (size_group, hbox);
+-  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+-  gtk_widget_show (hbox);
++  g_assert (closure.num_selected == 0 || !(closure.all_files && closure.all_folders));
+ 
+-  /* Add bookmark button */
++  if (num_selected)
++    *num_selected = closure.num_selected;
+ 
+-  impl->browse_shortcuts_add_button = button_new (impl,
+-						  _("_Add"),
+-						  GTK_STOCK_ADD,
+-						  FALSE,
+-						  TRUE,
+-						  G_CALLBACK (add_bookmark_button_clicked_cb));
+-  gtk_box_pack_start (GTK_BOX (hbox), impl->browse_shortcuts_add_button, TRUE, TRUE, 0);
+-  gtk_tooltips_set_tip (impl->tooltips, impl->browse_shortcuts_add_button,
+-                        _("Add the selected folder to the Bookmarks"), NULL);
+-
+-  /* Remove bookmark button */
+-
+-  impl->browse_shortcuts_remove_button = button_new (impl,
+-						     _("_Remove"),
+-						     GTK_STOCK_REMOVE,
+-						     FALSE,
+-						     TRUE,
+-						     G_CALLBACK (remove_bookmark_button_clicked_cb));
+-  gtk_box_pack_start (GTK_BOX (hbox), impl->browse_shortcuts_remove_button, TRUE, TRUE, 0);
+-  gtk_tooltips_set_tip (impl->tooltips, impl->browse_shortcuts_remove_button,
+-                        _("Remove the selected bookmark"), NULL);
++  if (all_files)
++    *all_files = closure.all_files;
+ 
+-  return vbox;
++  if (all_folders)
++    *all_folders = closure.all_folders;
+ }
+ 
++struct get_selected_path_closure {
++  GtkFileChooserDefault *impl;
++  const GtkFilePath *path;
++};
++
+ /* Handles key press events on the file list, so that we can trap Enter to
+  * activate the default button on our own.  Also, checks to see if '/' has been
+  * pressed.  See comment by tree_view_keybinding_cb() for more details.
+@@ -3662,17 +1173,6 @@
+ 
+   modifiers = gtk_accelerator_get_default_mod_mask ();
+ 
+-  if ((event->keyval == GDK_slash
+-       || event->keyval == GDK_KP_Divide
+-#ifdef G_OS_UNIX
+-       || event->keyval == GDK_asciitilde
+-#endif
+-       ) && ! (event->state & (~GDK_SHIFT_MASK & modifiers)))
+-    {
+-      location_popup_handler (impl, event->string);
+-      return TRUE;
+-    }
+-
+   if ((event->keyval == GDK_Return
+        || event->keyval == GDK_ISO_Enter
+        || event->keyval == GDK_KP_Enter
+@@ -3692,372 +1192,71 @@
+ 	  gtk_window_activate_default (window);
+ 	  return TRUE;
+ 	}
+-    }
+-
+-  return FALSE;
+-}
+-
+-/* Callback used when the file list's popup menu is detached */
+-static void
+-popup_menu_detach_cb (GtkWidget *attach_widget,
+-		      GtkMenu   *menu)
+-{
+-  GtkFileChooserDefault *impl;
+-
+-  impl = g_object_get_data (G_OBJECT (attach_widget), "GtkFileChooserDefault");
+-  g_assert (GTK_IS_FILE_CHOOSER_DEFAULT (impl));
+-
+-  impl->browse_files_popup_menu = NULL;
+-  impl->browse_files_popup_menu_add_shortcut_item = NULL;
+-  impl->browse_files_popup_menu_hidden_files_item = NULL;
+-}
+-
+-/* Callback used when the "Add to Bookmarks" menu item is activated */
+-static void
+-add_to_shortcuts_cb (GtkMenuItem           *item,
+-		     GtkFileChooserDefault *impl)
+-{
+-  bookmarks_add_selected_folder (impl);
+-}
+-
+-/* Callback used when the "Show Hidden Files" menu item is toggled */
+-static void
+-show_hidden_toggled_cb (GtkCheckMenuItem      *item,
+-			GtkFileChooserDefault *impl)
+-{
+-  g_object_set (impl,
+-		"show-hidden", gtk_check_menu_item_get_active (item),
+-		NULL);
+-}
+-
+-/* Shows an error dialog about not being able to select a dragged file */
+-static void
+-error_selecting_dragged_file_dialog (GtkFileChooserDefault *impl,
+-				     const GtkFilePath     *path,
+-				     GError                *error)
+-{
+-  error_dialog (impl,
+-		_("Could not select file"),
+-		path, error);
+-}
+-
+-static void
+-file_list_drag_data_select_uris (GtkFileChooserDefault  *impl,
+-				 gchar                 **uris)
+-{
+-  int i;
+-  char *uri;
+-  GtkFileChooser *chooser = GTK_FILE_CHOOSER (impl);
+-
+-  for (i = 1; uris[i]; i++)
+-    {
+-      GtkFilePath *path;
+-
+-      uri = uris[i];
+-      path = gtk_file_system_uri_to_path (impl->file_system, uri);
+-
+-      if (path)
+-        {
+-	  GError *error = NULL;
+-
+-	  gtk_file_chooser_default_select_path (chooser, path, &error);
+-	  if (error)
+-	    error_selecting_dragged_file_dialog (impl, path, error);
+-
+-	  gtk_file_path_free (path);
+-	}
+-    }
+-}
+-
+-struct FileListDragData
+-{
+-  GtkFileChooserDefault *impl;
+-  gchar **uris;
+-  GtkFilePath *path;
+-};
+-
+-static void
+-file_list_drag_data_received_get_info_cb (GtkFileSystemHandle *handle,
+-					  const GtkFileInfo   *info,
+-					  const GError        *error,
+-					  gpointer             user_data)
+-{
+-  gboolean cancelled = handle->cancelled;
+-  struct FileListDragData *data = user_data;
+-  GtkFileChooser *chooser = GTK_FILE_CHOOSER (data->impl);
+-
+-  if (handle != data->impl->file_list_drag_data_received_handle)
+-    goto out;
+-
+-  data->impl->file_list_drag_data_received_handle = NULL;
+-
+-  if (cancelled || error)
+-    goto out;
+-
+-  if ((data->impl->action == GTK_FILE_CHOOSER_ACTION_OPEN ||
+-       data->impl->action == GTK_FILE_CHOOSER_ACTION_SAVE) &&
+-      data->uris[1] == 0 && !error &&
+-      gtk_file_info_get_is_folder (info))
+-    change_folder_and_display_error (data->impl, data->path, FALSE);
+-  else
+-    {
+-      GError *error = NULL;
+-
+-      gtk_file_chooser_default_unselect_all (chooser);
+-      gtk_file_chooser_default_select_path (chooser, data->path, &error);
+-      if (error)
+-	error_selecting_dragged_file_dialog (data->impl, data->path, error);
+-      else
+-	browse_files_center_selected_row (data->impl);
+-    }
+-
+-  if (data->impl->select_multiple)
+-    file_list_drag_data_select_uris (data->impl, data->uris);
+-
+-out:
+-  g_object_unref (data->impl);
+-  g_strfreev (data->uris);
+-  gtk_file_path_free (data->path);
+-  g_free (data);
+-
+-  g_object_unref (handle);
+-}
+-
+-static void
+-file_list_drag_data_received_cb (GtkWidget          *widget,
+-				 GdkDragContext     *context,
+-				 gint                x,
+-				 gint                y,
+-				 GtkSelectionData   *selection_data,
+-				 guint               info,
+-				 guint               time_,
+-				 gpointer            data)
+-{
+-  GtkFileChooserDefault *impl;
+-  GtkFileChooser *chooser;
+-  gchar **uris;
+-  char *uri;
+-  GtkFilePath *path;
+-  GError *error = NULL;
+- 
+-  impl = GTK_FILE_CHOOSER_DEFAULT (data);
+-  chooser = GTK_FILE_CHOOSER (data);
+-  
+-  /* Parse the text/uri-list string, navigate to the first one */
+-  uris = g_uri_list_extract_uris ((const char *) selection_data->data);
+-  if (uris[0]) 
+-    {
+-      uri = uris[0];
+-      path = gtk_file_system_uri_to_path (impl->file_system, uri);
+-      
+-      if (path)
+-	{
+-	  struct FileListDragData *data;
+-
+-	  data = g_new0 (struct FileListDragData, 1);
+-	  data->impl = g_object_ref (impl);
+-	  data->uris = uris;
+-	  data->path = path;
+-
+-	  if (impl->file_list_drag_data_received_handle)
+-	    gtk_file_system_cancel_operation (impl->file_list_drag_data_received_handle);
+-
+-	  impl->file_list_drag_data_received_handle =
+-	    gtk_file_system_get_info (impl->file_system, path,
+-				      GTK_FILE_INFO_IS_FOLDER,
+-				      file_list_drag_data_received_get_info_cb,
+-				      data);
+-	  goto out;
+-	}
+-      else
+-	{
+- 	  g_set_error (&error,
+- 		       GTK_FILE_CHOOSER_ERROR,
+- 		       GTK_FILE_CHOOSER_ERROR_BAD_FILENAME,
+- 		       _("Could not select file '%s' "
+- 			 "because it is an invalid path name."),
+- 		       uri);
+-	  error_selecting_dragged_file_dialog (impl, NULL, error);
+-	}
+-
+-      if (impl->select_multiple)
+-	file_list_drag_data_select_uris (impl, uris);
+-    }
+-
+-  g_strfreev (uris);
+-
+-out:
+-  g_signal_stop_emission_by_name (widget, "drag_data_received");
+-}
+-
+-/* Don't do anything with the drag_drop signal */
+-static gboolean
+-file_list_drag_drop_cb (GtkWidget             *widget,
+-			GdkDragContext        *context,
+-			gint                   x,
+-			gint                   y,
+-			guint                  time_,
+-			GtkFileChooserDefault *impl)
+-{
+-  g_signal_stop_emission_by_name (widget, "drag_drop");
+-  return TRUE;
+-}
+-
+-/* Disable the normal tree drag motion handler, it makes it look like you're
+-   dropping the dragged item onto a tree item */
+-static gboolean
+-file_list_drag_motion_cb (GtkWidget             *widget,
+-                          GdkDragContext        *context,
+-                          gint                   x,
+-                          gint                   y,
+-                          guint                  time_,
+-                          GtkFileChooserDefault *impl)
+-{
+-  g_signal_stop_emission_by_name (widget, "drag_motion");
+-  return TRUE;
+-}
+-
+-/* Constructs the popup menu for the file list if needed */
+-static void
+-file_list_build_popup_menu (GtkFileChooserDefault *impl)
+-{
+-  GtkWidget *item;
+-
+-  if (impl->browse_files_popup_menu)
+-    return;
+-
+-  impl->browse_files_popup_menu = gtk_menu_new ();
+-  gtk_menu_attach_to_widget (GTK_MENU (impl->browse_files_popup_menu),
+-			     impl->browse_files_tree_view,
+-			     popup_menu_detach_cb);
+-
+-  item = gtk_image_menu_item_new_with_mnemonic (_("_Add to Bookmarks"));
+-  impl->browse_files_popup_menu_add_shortcut_item = item;
+-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item),
+-				 gtk_image_new_from_stock (GTK_STOCK_ADD, GTK_ICON_SIZE_MENU));
+-  gtk_widget_set_sensitive (item, FALSE);
+-  g_signal_connect (item, "activate",
+-		    G_CALLBACK (add_to_shortcuts_cb), impl);
+-  gtk_widget_show (item);
+-  gtk_menu_shell_append (GTK_MENU_SHELL (impl->browse_files_popup_menu), item);
+-
+-  item = gtk_separator_menu_item_new ();
+-  gtk_widget_show (item);
+-  gtk_menu_shell_append (GTK_MENU_SHELL (impl->browse_files_popup_menu), item);
+-
+-  item = gtk_check_menu_item_new_with_mnemonic (_("Show _Hidden Files"));
+-  impl->browse_files_popup_menu_hidden_files_item = item;
+-  g_signal_connect (item, "toggled",
+-		    G_CALLBACK (show_hidden_toggled_cb), impl);
+-  gtk_widget_show (item);
+-  gtk_menu_shell_append (GTK_MENU_SHELL (impl->browse_files_popup_menu), item);
+-}
+-
+-/* Updates the popup menu for the file list, creating it if necessary */
+-static void
+-file_list_update_popup_menu (GtkFileChooserDefault *impl)
+-{
+-  file_list_build_popup_menu (impl);
+-
+-  /* The sensitivity of the Add to Bookmarks item is set in
+-   * bookmarks_check_add_sensitivity()
+-   */
+-
+-  g_signal_handlers_block_by_func (impl->browse_files_popup_menu_hidden_files_item,
+-				   G_CALLBACK (show_hidden_toggled_cb), impl);
+-  gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (impl->browse_files_popup_menu_hidden_files_item),
+-				  impl->show_hidden);
+-  g_signal_handlers_unblock_by_func (impl->browse_files_popup_menu_hidden_files_item,
+-				     G_CALLBACK (show_hidden_toggled_cb), impl);
+-}
+-
+-static void
+-popup_position_func (GtkMenu   *menu,
+-                     gint      *x,
+-                     gint      *y,
+-                     gboolean  *push_in,
+-                     gpointer	user_data)
+-{
+-  GtkWidget *widget = GTK_WIDGET (user_data);
+-  GdkScreen *screen = gtk_widget_get_screen (widget);
+-  GtkRequisition req;
+-  gint monitor_num;
+-  GdkRectangle monitor;
+-
+-  g_return_if_fail (GTK_WIDGET_REALIZED (widget));
+-
+-  gdk_window_get_origin (widget->window, x, y);
+-
+-  gtk_widget_size_request (GTK_WIDGET (menu), &req);
+-
+-  *x += (widget->allocation.width - req.width) / 2;
+-  *y += (widget->allocation.height - req.height) / 2;
+-
+-  monitor_num = gdk_screen_get_monitor_at_point (screen, *x, *y);
+-  gtk_menu_set_monitor (menu, monitor_num);
+-  gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor);
+-
+-  *x = CLAMP (*x, monitor.x, monitor.x + MAX (0, monitor.width - req.width));
+-  *y = CLAMP (*y, monitor.y, monitor.y + MAX (0, monitor.height - req.height));
++    }
+ 
+-  *push_in = FALSE;
++  return FALSE;
+ }
+ 
+-static void
+-file_list_popup_menu (GtkFileChooserDefault *impl,
+-		      GdkEventButton        *event)
++static gboolean
++list_button_press (GtkWidget *widget, GdkEventButton *event, gpointer data)
+ {
+-  file_list_update_popup_menu (impl);
+-  if (event)
+-    gtk_menu_popup (GTK_MENU (impl->browse_files_popup_menu),
+-		    NULL, NULL, NULL, NULL,
+-		    event->button, event->time);
+-  else
++  GtkTreeView * tree = GTK_TREE_VIEW (widget);
++  GtkFileChooserDefault *impl = data;
++  GtkTreePath *path;
++
++  if (event->type != GDK_BUTTON_PRESS ||
++      !gtk_tree_view_get_path_at_pos (tree, (gint)event->x, (gint)event->y,
++				      &path, NULL, NULL, NULL))
+     {
+-      gtk_menu_popup (GTK_MENU (impl->browse_files_popup_menu),
+-		      NULL, NULL,
+-		      popup_position_func, impl->browse_files_tree_view,
+-		      0, GDK_CURRENT_TIME);
+-      gtk_menu_shell_select_first (GTK_MENU_SHELL (impl->browse_files_popup_menu),
+-				   FALSE);
++      return FALSE;
+     }
+ 
+-}
++  impl->list_press_time = event->time;
++  impl->list_press_path = path;
+ 
+-/* Callback used for the GtkWidget::popup-menu signal of the file list */
+-static gboolean
+-list_popup_menu_cb (GtkWidget *widget,
+-		    GtkFileChooserDefault *impl)
+-{
+-  file_list_popup_menu (impl, NULL);
+-  return TRUE;
++  return FALSE;
+ }
+ 
+-/* Callback used when a button is pressed on the file list.  We trap button 3 to
+- * bring up a popup menu.
+- */
+ static gboolean
+-list_button_press_event_cb (GtkWidget             *widget,
+-			    GdkEventButton        *event,
+-			    GtkFileChooserDefault *impl)
++list_button_release (GtkWidget *widget, GdkEventButton *event, gpointer data)
+ {
+-  static gboolean in_press = FALSE;
+-  gboolean handled;
++  GtkTreeView * tree = GTK_TREE_VIEW (widget);
++  GtkFileChooserDefault *impl = data;
++  GtkTreePath *path = NULL;
++  gboolean retval = FALSE;
+ 
+-  if (in_press)
+-    return FALSE;
++  if (!impl->list_press_time ||
++      !impl->list_press_path ||
++      event->type != GDK_BUTTON_RELEASE ||
++      !gtk_tree_view_get_path_at_pos (tree, (gint)event->x, (gint)event->y,
++				      &path, NULL, NULL, NULL))
++    {
++      goto done;
++    }
+ 
+-  if (event->button != 3)
+-    return FALSE;
++  if (event->time - impl->list_press_time > LONG_CLICK_LENGTH &&
++      !gtk_tree_path_compare (impl->list_press_path, path))
++    {
++      retval = TRUE;
++      list_row_activated (tree, path, NULL, impl);
++    }
++
++ done:
++  if (path)
++    gtk_tree_path_free (path);
+ 
+-  in_press = TRUE;
+-  handled = gtk_widget_event (impl->browse_files_tree_view, (GdkEvent *) event);
+-  in_press = FALSE;
++  impl->list_press_time = 0;
+ 
+-  file_list_popup_menu (impl, event);
+-  return TRUE;
++  if (impl->list_press_path)
++    {
++      gtk_tree_path_free (impl->list_press_path);
++      impl->list_press_path = NULL;
++    }
++
++  return FALSE;
+ }
+ 
++
+ /* Creates the widgets for the file list */
+ static GtkWidget *
+ create_file_list (GtkFileChooserDefault *impl)
+@@ -4087,37 +1286,19 @@
+   gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (impl->browse_files_tree_view), TRUE);
+   gtk_container_add (GTK_CONTAINER (swin), impl->browse_files_tree_view);
+ 
+-  gtk_drag_dest_set (impl->browse_files_tree_view,
+-                     GTK_DEST_DEFAULT_ALL,
+-                     file_list_dest_targets,
+-                     num_file_list_dest_targets,
+-                     GDK_ACTION_COPY | GDK_ACTION_MOVE);
+-  
+   g_signal_connect (impl->browse_files_tree_view, "row_activated",
+ 		    G_CALLBACK (list_row_activated), impl);
+   g_signal_connect (impl->browse_files_tree_view, "key_press_event",
+     		    G_CALLBACK (trap_activate_cb), impl);
+-  g_signal_connect (impl->browse_files_tree_view, "popup_menu",
+-		    G_CALLBACK (list_popup_menu_cb), impl);
+   g_signal_connect (impl->browse_files_tree_view, "button_press_event",
+-		    G_CALLBACK (list_button_press_event_cb), impl);
+-
+-  g_signal_connect (impl->browse_files_tree_view, "drag_data_received",
+-                    G_CALLBACK (file_list_drag_data_received_cb), impl);
+-  g_signal_connect (impl->browse_files_tree_view, "drag_drop",
+-                    G_CALLBACK (file_list_drag_drop_cb), impl);
+-  g_signal_connect (impl->browse_files_tree_view, "drag_motion",
+-                    G_CALLBACK (file_list_drag_motion_cb), impl);
++		    G_CALLBACK (list_button_press), impl);
++  g_signal_connect (impl->browse_files_tree_view, "button_release_event",
++		    G_CALLBACK (list_button_release), impl);
+ 
+   selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (impl->browse_files_tree_view));
+   gtk_tree_selection_set_select_function (selection,
+ 					  list_select_func,
+ 					  impl, NULL);
+-  gtk_tree_view_enable_model_drag_source (GTK_TREE_VIEW (impl->browse_files_tree_view),
+-					  GDK_BUTTON1_MASK,
+-					  file_list_source_targets,
+-					  num_file_list_source_targets,
+-					  GDK_ACTION_COPY);
+ 
+   g_signal_connect (selection, "changed",
+ 		    G_CALLBACK (list_selection_changed), impl);
+@@ -4178,230 +1359,206 @@
+   return swin;
+ }
+ 
+-static GtkWidget *
+-create_path_bar (GtkFileChooserDefault *impl)
+-{
+-  GtkWidget *path_bar;
+-
+-  path_bar = g_object_new (GTK_TYPE_PATH_BAR, NULL);
+-  _gtk_path_bar_set_file_system (GTK_PATH_BAR (path_bar), impl->file_system);
+-
+-  return path_bar;
+-}
+-
+ static void
+-set_filter_tooltip (GtkWidget *widget, 
+-		    gpointer   data)
++up_button_clicked_cb (GtkButton *button, gpointer data)
+ {
+-  GtkTooltips *tooltips = (GtkTooltips *)data;
+-
+-  if (GTK_IS_BUTTON (widget))
+-    gtk_tooltips_set_tip (tooltips, widget,
+-			  _("Select which types of files are shown"), 
+-			  NULL);
++    GtkFileChooserDefault *impl = GTK_FILE_CHOOSER_DEFAULT (data);
++    up_folder_handler (impl);
+ }
+ 
+ static void
+-realize_filter_combo (GtkWidget *combo,
+-		      gpointer   data)
++volume_button_clicked_cb (GtkButton *button, gpointer data)
+ {
+-  GtkFileChooserDefault *impl = (GtkFileChooserDefault *)data;
++    GtkFileChooserDefault *impl = GTK_FILE_CHOOSER_DEFAULT (data);
++    GtkFilePath * path = g_object_get_data (G_OBJECT (button), "file-path");
+ 
+-  gtk_container_forall (GTK_CONTAINER (combo),
+-			set_filter_tooltip,
+-			impl->tooltips);
++    change_folder_and_display_error (impl, path);
+ }
+ 
+-/* Creates the widgets for the files/folders pane */
+ static GtkWidget *
+-file_pane_create (GtkFileChooserDefault *impl,
+-		  GtkSizeGroup          *size_group)
++create_bar (GtkFileChooserDefault *impl)
+ {
+-  GtkWidget *vbox;
+-  GtkWidget *hbox;
+-  GtkWidget *widget;
++  GSList *list, *l;
++  int n;
++  GtkWidget *bar = gtk_hbox_new (FALSE, DEFAULT_SPACING);
++  GtkWidget *img;
+ 
+-  vbox = gtk_vbox_new (FALSE, 6);
+-  gtk_widget_show (vbox);
++  /* first the Up button */
++  img = gtk_image_new_from_stock (GTK_STOCK_GO_UP, GTK_ICON_SIZE_BUTTON);
++  gtk_widget_show (img);
++
++  impl->up_button = gtk_button_new ();
++  gtk_container_add (GTK_CONTAINER (impl->up_button), img);
++  gtk_widget_show (impl->up_button);
++  gtk_widget_set_sensitive (impl->up_button, FALSE);
++  gtk_button_set_focus_on_click (GTK_BUTTON (impl->up_button), FALSE);
++
++  g_signal_connect (impl->up_button, "clicked",
++		    G_CALLBACK (up_button_clicked_cb), impl);
++  gtk_box_pack_start (GTK_BOX(bar), impl->up_button, FALSE, FALSE, 0);
++
++  impl->num_volumes = 0;
++  list = gtk_file_system_list_volumes (impl->file_system);
+ 
+-  /* Box for lists and preview */
++  n = 0;
+ 
+-  hbox = gtk_hbox_new (FALSE, PREVIEW_HBOX_SPACING);
+-  gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
+-  gtk_widget_show (hbox);
++  for (l = list; l; l = l->next, n++)
++    {
++      GtkFileSystemVolume *volume;
++      GdkPixbuf *pixbuf;
++      GtkWidget *button;
++      GtkWidget *image;
++      GtkFilePath *base_path;
++      gchar * file_name = NULL;
+ 
+-  /* File list */
++      volume = l->data;
++      base_path =
++	  gtk_file_system_volume_get_base_path (impl->file_system, volume);
+ 
+-  widget = create_file_list (impl);
+-  gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE, 0);
++      if (impl->local_only)
++	{
++	  gboolean is_local =
++	      gtk_file_system_path_is_local (impl->file_system, base_path);
++
++	  if (!is_local)
++	    {
++	      gtk_file_path_free (base_path);
++	      gtk_file_system_volume_free (impl->file_system, volume);
++	      continue;
++	    }
++	}
+ 
+-  /* Preview */
++#if 0
++      label_copy =
++	  gtk_file_system_volume_get_display_name (impl->file_system, volume);
++#endif
++      pixbuf =
++	  gtk_file_system_volume_render_icon (impl->file_system, volume,
++					      GTK_WIDGET (impl),
++					      impl->icon_size, NULL);
+ 
+-  impl->preview_box = gtk_vbox_new (FALSE, 12);
+-  gtk_box_pack_start (GTK_BOX (hbox), impl->preview_box, FALSE, FALSE, 0);
+-  /* Don't show preview box initially */
++      button = gtk_button_new ();
++      image = gtk_image_new_from_pixbuf (pixbuf);
++      g_object_unref (G_OBJECT (pixbuf));
++      gtk_container_add (GTK_CONTAINER (button), image);
++      gtk_button_set_focus_on_click (GTK_BUTTON (button), FALSE);
++
++      file_name =
++	  gtk_file_system_path_to_filename (impl->file_system, base_path);
++
++      if (file_name && impl->root_folder &&
++	  strcmp (file_name, impl->root_folder) &&
++	  !strncmp (file_name, impl->root_folder, strlen (file_name)))
++      {
++	  /* The base path is below the root folder; we replace it with
++           * the root folder
++           */
++	  gtk_file_path_free (base_path);
++	  base_path = gtk_file_system_filename_to_path (impl->file_system,
++							impl->root_folder);
++      }
+ 
+-  /* Filter combo */
++      g_free (file_name);
++      gtk_widget_show_all (button);
+ 
+-  impl->filter_combo_hbox = gtk_hbox_new (FALSE, 12);
++      g_object_set_data (G_OBJECT (button), "file-path", base_path);
+ 
+-  widget = filter_create (impl);
++      g_signal_connect (button, "clicked",
++			G_CALLBACK (volume_button_clicked_cb), impl);
+ 
+-  g_signal_connect (widget, "realize",
+-		    G_CALLBACK (realize_filter_combo), impl);
++      gtk_box_pack_start (GTK_BOX(bar), button, FALSE, FALSE, 0);
++   }
+ 
+-  gtk_widget_show (widget);
+-  gtk_box_pack_end (GTK_BOX (impl->filter_combo_hbox), widget, FALSE, FALSE, 0);
++  impl->num_volumes = n;
++  g_slist_free (list);
+ 
+-  gtk_size_group_add_widget (size_group, impl->filter_combo_hbox);
+-  gtk_box_pack_end (GTK_BOX (vbox), impl->filter_combo_hbox, FALSE, FALSE, 0);
++  gtk_widget_show (bar);
+ 
+-  return vbox;
++  return bar;
+ }
+ 
+-/* Callback used when the "Browse for more folders" expander is toggled */
+-static void
+-expander_changed_cb (GtkExpander           *expander,
+-		     GParamSpec            *pspec,
+-		     GtkFileChooserDefault *impl)
++/* Creates the widgets for the files/folders pane */
++static GtkWidget *
++file_pane_create (GtkFileChooserDefault *impl)
+ {
+-  impl->expand_folders = gtk_expander_get_expanded(GTK_EXPANDER (impl->save_expander));
+-  update_appearance (impl);
+-}
++  GtkWidget *vbox;
++  GtkWidget *hbox;
++  GtkWidget *widget;
++  vbox = gtk_vbox_new (FALSE, DEFAULT_SPACING);
++  gtk_widget_show (vbox);
+ 
+-/* Callback used when the selection changes in the save folder combo box */
+-static void
+-save_folder_combo_changed_cb (GtkComboBox           *combo,
+-			      GtkFileChooserDefault *impl)
+-{
+-  GtkTreeIter iter;
++  /* The volume bar and 'Create Folder' button */
++  hbox = gtk_hbox_new (FALSE, DEFAULT_SPACING);
++  gtk_widget_show (hbox);
++  impl->bar = create_bar (impl);
++  gtk_widget_show_all (impl->bar);
++  gtk_box_pack_start (GTK_BOX (hbox), impl->bar, TRUE, TRUE, 0);
+ 
+-  if (impl->changing_folder)
+-    return;
++   /* Create Folder */
++  widget = gtk_image_new_from_icon_name ("folder-new", GTK_ICON_SIZE_BUTTON);
++  gtk_widget_show (widget);
++  impl->browse_new_folder_button = gtk_button_new ();
++  gtk_container_add (GTK_CONTAINER (impl->browse_new_folder_button), widget);
++  gtk_button_set_focus_on_click (GTK_BUTTON (impl->browse_new_folder_button),
++				 FALSE);
+ 
+-  if (gtk_combo_box_get_active_iter (combo, &iter))
+-    shortcuts_activate_iter (impl, &iter);
+-}
++  g_signal_connect (impl->browse_new_folder_button, "clicked",
++		    G_CALLBACK (new_folder_button_clicked), impl);
++  gtk_box_pack_end (GTK_BOX (hbox), impl->browse_new_folder_button, FALSE, FALSE, 0);
+ 
+-/* Creates the combo box with the save folders */
+-static GtkWidget *
+-save_folder_combo_create (GtkFileChooserDefault *impl)
+-{
+-  GtkWidget *combo;
+-  GtkCellRenderer *cell;
++  widget = filter_create (impl);
++  gtk_widget_hide (widget);
++  gtk_box_pack_end (GTK_BOX (hbox), widget, FALSE, FALSE, 0);
++
++  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
++
++  /* Box for lists */
++  hbox = gtk_hbox_new (FALSE, LIST_HBOX_SPACING);
++  gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
++  gtk_widget_show (hbox);
+ 
+-  combo = g_object_new (GTK_TYPE_COMBO_BOX,
+-			"model", impl->shortcuts_model,
+-			"focus-on-click", FALSE,
+-                        NULL);
+-  gtk_widget_show (combo);
+-
+-  cell = gtk_cell_renderer_pixbuf_new ();
+-  gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), cell, FALSE);
+-  gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo), cell,
+-				  "pixbuf", SHORTCUTS_COL_PIXBUF,
+-				  "visible", SHORTCUTS_COL_PIXBUF_VISIBLE,
+-				  "sensitive", SHORTCUTS_COL_PIXBUF_VISIBLE,
+-				  NULL);
+-
+-  cell = gtk_cell_renderer_text_new ();
+-  gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), cell, TRUE);
+-  gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo), cell,
+-				  "text", SHORTCUTS_COL_NAME,
+-				  "sensitive", SHORTCUTS_COL_PIXBUF_VISIBLE,
+-				  NULL);
+-
+-  gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (combo),
+-					shortcuts_row_separator_func,
+-					GINT_TO_POINTER (SHORTCUTS_COL_NAME),
+-					NULL);
++  /* File list */
+ 
+-  g_signal_connect (combo, "changed",
+-		    G_CALLBACK (save_folder_combo_changed_cb), impl);
++  widget = create_file_list (impl);
++  gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE, 0);
+ 
+-  return combo;
++  return vbox;
+ }
+ 
+ /* Creates the widgets specific to Save mode */
+-static void
++static GtkWidget *
+ save_widgets_create (GtkFileChooserDefault *impl)
+ {
+   GtkWidget *vbox;
+-  GtkWidget *table;
++  GtkWidget *hbox;
+   GtkWidget *widget;
+-  GtkWidget *alignment;
+ 
+-  if (impl->save_widgets != NULL)
+-    return;
+-
+-  location_switch_to_path_bar (impl);
+-
+-  vbox = gtk_vbox_new (FALSE, 12);
+-
+-  table = gtk_table_new (2, 2, FALSE);
+-  gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0);
+-  gtk_widget_show (table);
+-  gtk_table_set_row_spacings (GTK_TABLE (table), 12);
+-  gtk_table_set_col_spacings (GTK_TABLE (table), 12);
++  vbox = gtk_vbox_new (FALSE, 0);
++  hbox = gtk_hbox_new (FALSE, DEFAULT_SPACING);
+ 
+-  /* Label */
+-
+-  widget = gtk_label_new_with_mnemonic (_("_Name:"));
++  widget = gtk_label_new (_("Name:"));
+   gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.5);
+-  gtk_table_attach (GTK_TABLE (table), widget,
+-		    0, 1, 0, 1,
+-		    GTK_FILL, GTK_FILL,
+-		    0, 0);
++  gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, FALSE, 0);
+   gtk_widget_show (widget);
+ 
+-  /* Location entry */
+-
+   impl->location_entry = _gtk_file_chooser_entry_new (TRUE);
+   _gtk_file_chooser_entry_set_file_system (GTK_FILE_CHOOSER_ENTRY (impl->location_entry),
+ 					   impl->file_system);
+-  gtk_entry_set_width_chars (GTK_ENTRY (impl->location_entry), 45);
++/*   gtk_entry_set_width_chars (GTK_ENTRY (impl->location_entry), 45); */
+   gtk_entry_set_activates_default (GTK_ENTRY (impl->location_entry), TRUE);
+-  gtk_table_attach (GTK_TABLE (table), impl->location_entry,
+-		    1, 2, 0, 1,
+-		    GTK_EXPAND | GTK_FILL, 0,
+-		    0, 0);
++  gtk_box_pack_start (GTK_BOX (hbox), impl->location_entry,
++		      TRUE, TRUE, 0);
++
+   gtk_widget_show (impl->location_entry);
+-  gtk_label_set_mnemonic_widget (GTK_LABEL (widget), impl->location_entry);
+ 
+-  /* Folder combo */
+-  impl->save_folder_label = gtk_label_new (NULL);
+-  gtk_misc_set_alignment (GTK_MISC (impl->save_folder_label), 0.0, 0.5);
+-  gtk_table_attach (GTK_TABLE (table), impl->save_folder_label,
+-		    0, 1, 1, 2,
+-		    GTK_FILL, GTK_FILL,
+-		    0, 0);
+-  gtk_widget_show (impl->save_folder_label);
+-
+-  impl->save_folder_combo = save_folder_combo_create (impl);
+-  gtk_table_attach (GTK_TABLE (table), impl->save_folder_combo,
+-		    1, 2, 1, 2,
+-		    GTK_EXPAND | GTK_FILL, GTK_FILL,
+-		    0, 0);
+-  gtk_label_set_mnemonic_widget (GTK_LABEL (impl->save_folder_label), impl->save_folder_combo);
+-
+-  /* Expander */
+-  alignment = gtk_alignment_new (0.0, 0.5, 1.0, 1.0);
+-  gtk_box_pack_start (GTK_BOX (vbox), alignment, FALSE, FALSE, 0);
+-
+-  impl->save_expander = gtk_expander_new_with_mnemonic (_("_Browse for other folders"));
+-  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_show (hbox);
++  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+ 
+-  impl->save_widgets = vbox;
+-  gtk_box_pack_start (GTK_BOX (impl), impl->save_widgets, FALSE, FALSE, 0);
+-  gtk_box_reorder_child (GTK_BOX (impl), impl->save_widgets, 0);
+-  gtk_widget_show (impl->save_widgets);
++  return vbox;
+ }
+ 
+ /* Destroys the widgets specific to Save mode */
++/* ??? */
+ static void
+ save_widgets_destroy (GtkFileChooserDefault *impl)
+ {
+@@ -4411,293 +1568,17 @@
+   gtk_widget_destroy (impl->save_widgets);
+   impl->save_widgets = NULL;
+   impl->location_entry = NULL;
+-  impl->save_folder_label = NULL;
+-  impl->save_folder_combo = NULL;
+-  impl->save_expander = NULL;
+-}
+-
+-/* Turns on the path bar widget.  Can be called even if we are already in that
+- * mode.
+- */
+-static void
+-location_switch_to_path_bar (GtkFileChooserDefault *impl)
+-{
+-  if (impl->location_entry)
+-    {
+-      gtk_widget_destroy (impl->location_entry);
+-      impl->location_entry = NULL;
+-    }
+-
+-  gtk_widget_hide (impl->location_entry_box);
+-}
+-
+-/* Sets the full path of the current folder as the text in the location entry. */
+-static void
+-location_entry_set_initial_text (GtkFileChooserDefault *impl)
+-{
+-  char *text;
+-
+-  if (!impl->current_folder)
+-    return;
+-
+-  if (gtk_file_system_path_is_local (impl->file_system, impl->current_folder))
+-    {
+-      char *filename;
+-
+-      filename = gtk_file_system_path_to_filename (impl->file_system, impl->current_folder);
+-      if (filename)
+-	{
+-	  text = g_filename_to_utf8 (filename, -1, NULL, NULL, NULL);
+-	  g_free (filename);
+-	}
+-      else
+-	text = NULL;
+-    }
+-  else
+-    text = gtk_file_system_path_to_uri (impl->file_system, impl->current_folder);
+-
+-  if (text)
+-    {
+-      gboolean need_slash;
+-      int len;
+-
+-      len = strlen (text);
+-      need_slash = (text[len - 1] != G_DIR_SEPARATOR);
+-
+-      if (need_slash)
+-	{
+-	  char *slash_text;
+-
+-	  slash_text = g_new (char, len + 2);
+-	  strcpy (slash_text, text);
+-	  slash_text[len] = G_DIR_SEPARATOR;
+-	  slash_text[len + 1] = 0;
+-
+-	  g_free (text);
+-	  text = slash_text;
+-	}
+-
+-      _gtk_file_chooser_entry_set_file_part (GTK_FILE_CHOOSER_ENTRY (impl->location_entry), text);
+-      g_free (text);
+-    }
+-}
+-
+-/* Turns on the location entry.  Can be called even if we are already in that
+- * mode.
+- */
+-static void
+-location_switch_to_filename_entry (GtkFileChooserDefault *impl)
+-{
+-  if (impl->location_entry)
+-    gtk_widget_destroy (impl->location_entry);
+-
+-  /* Box */
+-
+-  gtk_widget_show (impl->location_entry_box);
+-
+-  /* Entry */
+-
+-  impl->location_entry = _gtk_file_chooser_entry_new (TRUE);
+-  _gtk_file_chooser_entry_set_file_system (GTK_FILE_CHOOSER_ENTRY (impl->location_entry),
+-					   impl->file_system);
+-  gtk_entry_set_activates_default (GTK_ENTRY (impl->location_entry), TRUE);
+-  _gtk_file_chooser_entry_set_action (GTK_FILE_CHOOSER_ENTRY (impl->location_entry), impl->action);
+-
+-  gtk_box_pack_start (GTK_BOX (impl->location_entry_box), impl->location_entry, TRUE, TRUE, 0);
+-  gtk_label_set_mnemonic_widget (GTK_LABEL (impl->location_label), impl->location_entry);
+-
+-  /* Configure the entry */
+-
+-  _gtk_file_chooser_entry_set_base_folder (GTK_FILE_CHOOSER_ENTRY (impl->location_entry), impl->current_folder);
+-
+-  /* Done */
+-
+-  gtk_widget_show (impl->location_entry);
+-  gtk_widget_grab_focus (impl->location_entry);
+-}
+-
+-/* Sets a new location mode.  set_buttons determines whether the toggle button
+- * for the mode will also be changed.
+- */
+-static void
+-location_mode_set (GtkFileChooserDefault *impl,
+-		   LocationMode new_mode,
+-		   gboolean set_button)
+-{
+-  if (impl->action == GTK_FILE_CHOOSER_ACTION_OPEN
+-      || impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER)
+-    {
+-      GtkWindow *toplevel;
+-      GtkWidget *current_focus;
+-      gboolean button_active;
+-      gboolean switch_to_file_list;
+-
+-      switch (new_mode)
+-	{
+-	case LOCATION_MODE_PATH_BAR:
+-	  button_active = FALSE;
+-
+-	  /* The location_entry will disappear when we switch to path bar mode.  So,
+-	   * we'll focus the file list in that case, to avoid having a window with
+-	   * no focused widget.
+-	   */
+-	  toplevel = get_toplevel (GTK_WIDGET (impl));
+-	  switch_to_file_list = FALSE;
+-	  if (toplevel)
+-	    {
+-	      current_focus = gtk_window_get_focus (toplevel);
+-	      if (!current_focus || current_focus == impl->location_entry)
+-		switch_to_file_list = TRUE;
+-	    }
+-
+-	  location_switch_to_path_bar (impl);
+-
+-	  if (switch_to_file_list)
+-	    gtk_widget_grab_focus (impl->browse_files_tree_view);
+-
+-	  break;
+-
+-	case LOCATION_MODE_FILENAME_ENTRY:
+-	  button_active = TRUE;
+-	  location_switch_to_filename_entry (impl);
+-	  break;
+-
+-	default:
+-	  g_assert_not_reached ();
+-	  return;
+-	}
+-
+-      if (set_button)
+-	{
+-	  g_signal_handlers_block_by_func (impl->location_button,
+-					   G_CALLBACK (location_button_toggled_cb), impl);
+-
+-	  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->location_button), button_active);
+-
+-	  g_signal_handlers_unblock_by_func (impl->location_button,
+-					     G_CALLBACK (location_button_toggled_cb), impl);
+-	}
+-    }
+-
+-  impl->location_mode = new_mode;
+-}
+-
+-static void
+-toggle_location_mode (GtkFileChooserDefault *impl,
+-                      gboolean               set_button)
+-{
+-  LocationMode new_mode;
+-
+-  /* toggle value */
+-  new_mode = (impl->location_mode == LOCATION_MODE_PATH_BAR) ?
+-    LOCATION_MODE_FILENAME_ENTRY : LOCATION_MODE_PATH_BAR;
+-
+-  location_mode_set (impl, new_mode, set_button);
+-}
+-
+-static void
+-location_toggle_popup_handler (GtkFileChooserDefault *impl)
+-{
+-  toggle_location_mode (impl, TRUE);
+-}
+-
+-/* Callback used when one of the location mode buttons is toggled */
+-static void
+-location_button_toggled_cb (GtkToggleButton *toggle,
+-			    GtkFileChooserDefault *impl)
+-{
+-  gboolean is_active;
+-
+-  is_active = gtk_toggle_button_get_active (toggle);
+-
+-  if (is_active)
+-    g_assert (impl->location_mode == LOCATION_MODE_PATH_BAR);
+-  else
+-    g_assert (impl->location_mode == LOCATION_MODE_FILENAME_ENTRY);
+-
+-  toggle_location_mode (impl, FALSE);
+-}
+-
+-/* Creates a toggle button for the location entry. */
+-static void
+-location_button_create (GtkFileChooserDefault *impl)
+-{
+-  GtkWidget *image;
+-  const char *str;
+-
+-  image = gtk_image_new_from_stock (GTK_STOCK_EDIT, GTK_ICON_SIZE_BUTTON);
+-  gtk_widget_show (image);
+-
+-  impl->location_button = g_object_new (GTK_TYPE_TOGGLE_BUTTON,
+-					"image", image,
+-					NULL);
+-
+-  g_signal_connect (impl->location_button, "toggled",
+-		    G_CALLBACK (location_button_toggled_cb), impl);
+-
+-  str = _("Type a file name");
+-
+-  gtk_tooltips_set_tip (impl->tooltips, impl->location_button, str, NULL);
+-  atk_object_set_name (gtk_widget_get_accessible (impl->location_button), str);
+ }
+ 
+-/* Creates the main hpaned with the widgets shared by Open and Save mode */
+-static GtkWidget *
+-browse_widgets_create (GtkFileChooserDefault *impl)
+-{
+-  GtkWidget *vbox;
+-  GtkWidget *hbox;
+-  GtkWidget *hpaned;
+-  GtkWidget *widget;
+-  GtkSizeGroup *size_group;
+-
+-  /* size group is used by the [+][-] buttons and the filter combo */
+-  size_group = gtk_size_group_new (GTK_SIZE_GROUP_VERTICAL);
+-  vbox = gtk_vbox_new (FALSE, 12);
+-
+-  /* Location widgets */
+-  hbox = gtk_hbox_new (FALSE, 12);
+-  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+-  gtk_widget_show (hbox);
+-
+-  location_button_create (impl);
+-  gtk_box_pack_start (GTK_BOX (hbox), impl->location_button, FALSE, FALSE, 0);
+-
+-  /* Path bar */
+-
+-  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"));
+-  g_signal_connect (impl->browse_new_folder_button, "clicked",
+-		    G_CALLBACK (new_folder_button_clicked), impl);
+-  gtk_box_pack_end (GTK_BOX (hbox), impl->browse_new_folder_button, FALSE, FALSE, 0);
+-
+-  /* Box for the location label and entry */
+-
+-  impl->location_entry_box = gtk_hbox_new (FALSE, 12);
+-  gtk_box_pack_start (GTK_BOX (vbox), impl->location_entry_box, FALSE, FALSE, 0);
+-
+-  impl->location_label = gtk_label_new_with_mnemonic (_("_Location:"));
+-  gtk_widget_show (impl->location_label);
+-  gtk_box_pack_start (GTK_BOX (impl->location_entry_box), impl->location_label, FALSE, FALSE, 0);
+-
+-  /* Paned widget */
+-  hpaned = gtk_hpaned_new ();
+-  gtk_widget_show (hpaned);
+-  gtk_box_pack_start (GTK_BOX (vbox), hpaned, TRUE, TRUE, 0);
+-
+-  widget = shortcuts_pane_create (impl, size_group);
+-  gtk_paned_pack1 (GTK_PANED (hpaned), widget, FALSE, FALSE);
+-  widget = file_pane_create (impl, size_group);
+-  gtk_paned_pack2 (GTK_PANED (hpaned), widget, TRUE, FALSE);
++/* Creates the main hpaned with the widgets shared by Open and Save mode */
++static GtkWidget *
++browse_widgets_create (GtkFileChooserDefault *impl)
++{
++  GtkWidget *widget;
+ 
+-  g_object_unref (size_group);
++  widget = file_pane_create (impl);
+ 
+-  return vbox;
++  return widget;
+ }
+ 
+ static GObject*
+@@ -4719,18 +1600,14 @@
+ 
+   gtk_widget_push_composite_child ();
+ 
+-  /* Shortcuts model */
+-
+-  shortcuts_model_create (impl);
++  /* Widgets for Save mode */
++  impl->save_widgets = save_widgets_create (impl);
++  gtk_box_pack_start (GTK_BOX (impl), impl->save_widgets, FALSE, FALSE, 0);
+ 
+   /* The browse widgets */
+   impl->browse_widgets = browse_widgets_create (impl);
+   gtk_box_pack_start (GTK_BOX (impl), impl->browse_widgets, TRUE, TRUE, 0);
+ 
+-  /* Alignment to hold extra widget */
+-  impl->extra_align = gtk_alignment_new (0.0, 0.5, 1.0, 1.0);
+-  gtk_box_pack_start (GTK_BOX (impl), impl->extra_align, FALSE, FALSE, 0);
+-
+   gtk_widget_pop_composite_child ();
+   update_appearance (impl);
+ 
+@@ -4739,34 +1616,6 @@
+   return object;
+ }
+ 
+-/* Sets the extra_widget by packing it in the appropriate place */
+-static void
+-set_extra_widget (GtkFileChooserDefault *impl,
+-		  GtkWidget             *extra_widget)
+-{
+-  if (extra_widget)
+-    {
+-      g_object_ref (extra_widget);
+-      /* FIXME: is this right ? */
+-      gtk_widget_show (extra_widget);
+-    }
+-
+-  if (impl->extra_widget)
+-    {
+-      gtk_container_remove (GTK_CONTAINER (impl->extra_align), impl->extra_widget);
+-      g_object_unref (impl->extra_widget);
+-    }
+-
+-  impl->extra_widget = extra_widget;
+-  if (impl->extra_widget)
+-    {
+-      gtk_container_add (GTK_CONTAINER (impl->extra_align), impl->extra_widget);
+-      gtk_widget_show (impl->extra_align);
+-    }
+-  else
+-    gtk_widget_hide (impl->extra_align);
+-}
+-
+ static void
+ set_local_only (GtkFileChooserDefault *impl,
+ 		gboolean               local_only)
+@@ -4775,12 +1624,6 @@
+     {
+       impl->local_only = local_only;
+ 
+-      if (impl->shortcuts_model && impl->file_system)
+-	{
+-	  shortcuts_add_volumes (impl);
+-	  shortcuts_add_bookmarks (impl);
+-	}
+-
+       if (local_only &&
+ 	  !gtk_file_system_path_is_local (impl->file_system, impl->current_folder))
+ 	{
+@@ -4807,19 +1650,7 @@
+ volumes_changed_cb (GtkFileSystem         *file_system,
+ 		    GtkFileChooserDefault *impl)
+ {
+-  shortcuts_add_volumes (impl);
+-}
+-
+-/* Callback used when the set of bookmarks changes in the file system */
+-static void
+-bookmarks_changed_cb (GtkFileSystem         *file_system,
+-		      GtkFileChooserDefault *impl)
+-{
+-  shortcuts_add_bookmarks (impl);
+-
+-  bookmarks_check_add_sensitivity (impl);
+-  bookmarks_check_remove_sensitivity (impl);
+-  shortcuts_check_popup_sensitivity (impl);
++  /* FIXME -- update the bar */
+ }
+ 
+ /* Sets the file chooser to multiple selection mode */
+@@ -4841,8 +1672,6 @@
+ 
+   impl->select_multiple = select_multiple;
+   g_object_notify (G_OBJECT (impl), "select-multiple");
+-
+-  check_preview_change (impl);
+ }
+ 
+ static void
+@@ -4855,8 +1684,6 @@
+     {
+       g_signal_handler_disconnect (impl->file_system, impl->volumes_changed_id);
+       impl->volumes_changed_id = 0;
+-      g_signal_handler_disconnect (impl->file_system, impl->bookmarks_changed_id);
+-      impl->bookmarks_changed_id = 0;
+       g_object_unref (impl->file_system);
+     }
+ 
+@@ -4892,9 +1719,6 @@
+       impl->volumes_changed_id = g_signal_connect (impl->file_system, "volumes-changed",
+ 						   G_CALLBACK (volumes_changed_cb),
+ 						   impl);
+-      impl->bookmarks_changed_id = g_signal_connect (impl->file_system, "bookmarks-changed",
+-						     G_CALLBACK (bookmarks_changed_cb),
+-						     impl);
+     }
+ 
+   profile_end ("end", NULL);
+@@ -4911,32 +1735,13 @@
+   if (impl->action == GTK_FILE_CHOOSER_ACTION_SAVE ||
+       impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER)
+     {
+-      const char *text;
+-
+-      gtk_widget_hide (impl->location_button);
+-      save_widgets_create (impl);
+-
+-      if (impl->action == GTK_FILE_CHOOSER_ACTION_SAVE)
+-	text = _("Save in _folder:");
+-      else
+-	text = _("Create in _folder:");
+-
+-      gtk_label_set_text_with_mnemonic (GTK_LABEL (impl->save_folder_label), text);
++      gtk_widget_show (impl->save_widgets);
++      gtk_widget_show (impl->browse_widgets);
+ 
+-      if (gtk_expander_get_expanded (GTK_EXPANDER (impl->save_expander)))
+-	{
+-	  gtk_widget_set_sensitive (impl->save_folder_label, FALSE);
+-	  gtk_widget_set_sensitive (impl->save_folder_combo, FALSE);
+-	  gtk_widget_show (impl->browse_widgets);
+-	}
++      if (impl->show_create_folder)
++	  gtk_widget_show (impl->browse_new_folder_button);
+       else
+-	{
+-	  gtk_widget_set_sensitive (impl->save_folder_label, TRUE);
+-	  gtk_widget_set_sensitive (impl->save_folder_combo, TRUE);
+-	  gtk_widget_hide (impl->browse_widgets);
+-	}
+-
+-      gtk_widget_show (impl->browse_new_folder_button);
++	  gtk_widget_hide (impl->browse_new_folder_button);
+ 
+       if (impl->select_multiple)
+ 	{
+@@ -4948,23 +1753,17 @@
+   else if (impl->action == GTK_FILE_CHOOSER_ACTION_OPEN ||
+ 	   impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER)
+     {
+-      gtk_widget_show (impl->location_button);
+-      save_widgets_destroy (impl);
++      gtk_widget_hide (impl->save_widgets);
++      gtk_widget_hide (impl->browse_new_folder_button);
+       gtk_widget_show (impl->browse_widgets);
+-      location_mode_set (impl, impl->location_mode, TRUE);
+     }
+ 
+-  if (impl->location_entry)
+-    _gtk_file_chooser_entry_set_action (GTK_FILE_CHOOSER_ENTRY (impl->location_entry), impl->action);
+-
+-  if (impl->action == GTK_FILE_CHOOSER_ACTION_OPEN)
++  if (impl->action == GTK_FILE_CHOOSER_ACTION_OPEN ||
++      !impl->show_create_folder)
+     gtk_widget_hide (impl->browse_new_folder_button);
+   else
+     gtk_widget_show (impl->browse_new_folder_button);
+ 
+-  /* This *is* needed; we need to redraw the file list because the "sensitivity"
+-   * of files may change depending whether we are in a file or folder-only mode.
+-   */
+   gtk_widget_queue_draw (impl->browse_files_tree_view);
+ 
+   g_signal_emit_by_name (impl, "default-size-changed");
+@@ -5016,24 +1815,6 @@
+       set_local_only (impl, g_value_get_boolean (value));
+       break;
+ 
+-    case GTK_FILE_CHOOSER_PROP_PREVIEW_WIDGET:
+-      set_preview_widget (impl, g_value_get_object (value));
+-      break;
+-
+-    case GTK_FILE_CHOOSER_PROP_PREVIEW_WIDGET_ACTIVE:
+-      impl->preview_widget_active = g_value_get_boolean (value);
+-      update_preview_widget_visibility (impl);
+-      break;
+-
+-    case GTK_FILE_CHOOSER_PROP_USE_PREVIEW_LABEL:
+-      impl->use_preview_label = g_value_get_boolean (value);
+-      update_preview_widget_visibility (impl);
+-      break;
+-
+-    case GTK_FILE_CHOOSER_PROP_EXTRA_WIDGET:
+-      set_extra_widget (impl, g_value_get_object (value));
+-      break;
+-
+     case GTK_FILE_CHOOSER_PROP_SELECT_MULTIPLE:
+       {
+ 	gboolean select_multiple = g_value_get_boolean (value);
+@@ -5070,6 +1851,55 @@
+       }
+       break;
+ 
++    case GTK_FILE_CHOOSER_PROP_ROOT_FOLDER:
++      {
++	  GtkFilePath * path;
++	  gchar * new_root = g_strdup (g_value_get_string (value));
++
++	  if (!new_root)
++	  {
++	      new_root = g_strdup ("/");
++	  }
++
++	  path = gtk_file_system_filename_to_path (impl->file_system,
++						   new_root);
++	  if (change_folder (impl, path, FALSE))
++	  {
++	      g_free (impl->root_folder);
++	      impl->root_folder = new_root;
++	  }
++	  else
++	  {
++	      g_warning ("Unable to set [%s] as root folder", new_root);
++	      g_free (new_root);
++	  }
++
++	  gtk_file_path_free (path);
++      }
++      break;
++
++    case GTK_FILE_CHOOSER_PROP_SHOW_CREATE_FOLDER:
++      {
++	gboolean show = g_value_get_boolean (value);
++	if (show != impl->show_create_folder)
++	  {
++	    impl->show_create_folder = show;
++
++	    if (show)
++		gtk_widget_show (impl->browse_new_folder_button);
++	    else
++		gtk_widget_hide (impl->browse_new_folder_button);
++	  }
++      }
++      break;
++
++    /* These are not supported */
++    case GTK_FILE_CHOOSER_PROP_PREVIEW_WIDGET:
++    case GTK_FILE_CHOOSER_PROP_PREVIEW_WIDGET_ACTIVE:
++    case GTK_FILE_CHOOSER_PROP_USE_PREVIEW_LABEL:
++    case GTK_FILE_CHOOSER_PROP_EXTRA_WIDGET:
++      break;
++
+     default:
+       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+       break;
+@@ -5098,28 +1928,32 @@
+       g_value_set_boolean (value, impl->local_only);
+       break;
+ 
+-    case GTK_FILE_CHOOSER_PROP_PREVIEW_WIDGET:
+-      g_value_set_object (value, impl->preview_widget);
++    case GTK_FILE_CHOOSER_PROP_SELECT_MULTIPLE:
++      g_value_set_boolean (value, impl->select_multiple);
+       break;
+ 
+-    case GTK_FILE_CHOOSER_PROP_PREVIEW_WIDGET_ACTIVE:
+-      g_value_set_boolean (value, impl->preview_widget_active);
++    case GTK_FILE_CHOOSER_PROP_SHOW_HIDDEN:
++      g_value_set_boolean (value, impl->show_hidden);
+       break;
+ 
+-    case GTK_FILE_CHOOSER_PROP_USE_PREVIEW_LABEL:
+-      g_value_set_boolean (value, impl->use_preview_label);
++    case GTK_FILE_CHOOSER_PROP_ROOT_FOLDER:
++      g_value_set_string (value, impl->root_folder);
+       break;
+ 
+-    case GTK_FILE_CHOOSER_PROP_EXTRA_WIDGET:
+-      g_value_set_object (value, impl->extra_widget);
++    case GTK_FILE_CHOOSER_PROP_SHOW_CREATE_FOLDER:
++      g_value_set_boolean (value, impl->show_create_folder);
+       break;
+ 
+-    case GTK_FILE_CHOOSER_PROP_SELECT_MULTIPLE:
+-      g_value_set_boolean (value, impl->select_multiple);
++    case GTK_FILE_CHOOSER_PROP_PREVIEW_WIDGET:
++      g_value_set_object (value, NULL);
+       break;
+ 
+-    case GTK_FILE_CHOOSER_PROP_SHOW_HIDDEN:
+-      g_value_set_boolean (value, impl->show_hidden);
++    case GTK_FILE_CHOOSER_PROP_PREVIEW_WIDGET_ACTIVE:
++      g_value_set_boolean (value, FALSE);
++      break;
++
++    case GTK_FILE_CHOOSER_PROP_USE_PREVIEW_LABEL:
++      g_value_set_boolean (value, FALSE);
+       break;
+ 
+     case GTK_FILE_CHOOSER_PROP_DO_OVERWRITE_CONFIRMATION:
+@@ -5154,24 +1988,12 @@
+   GSList *l;
+   GtkFileChooserDefault *impl = (GtkFileChooserDefault *) object;
+ 
+-  if (impl->extra_widget)
+-    {
+-      g_object_unref (impl->extra_widget);
+-      impl->extra_widget = NULL;
+-    }
+-
+   if (impl->volumes_changed_id > 0)
+     {
+       g_signal_handler_disconnect (impl->file_system, impl->volumes_changed_id);
+       impl->volumes_changed_id = 0;
+     }
+ 
+-  if (impl->bookmarks_changed_id > 0)
+-    {
+-      g_signal_handler_disconnect (impl->file_system, impl->bookmarks_changed_id);
+-      impl->bookmarks_changed_id = 0;
+-    }
+-
+   pending_select_paths_free (impl);
+ 
+   /* cancel all pending operations */
+@@ -5197,23 +2019,6 @@
+       impl->reload_icon_handles = NULL;
+     }
+ 
+-  if (impl->loading_shortcuts)
+-    {
+-      for (l = impl->loading_shortcuts; l; l = l->next)
+-        {
+-	  GtkFileSystemHandle *handle =l->data;
+-	  gtk_file_system_cancel_operation (handle);
+-        }
+-      g_slist_free (impl->loading_shortcuts);
+-      impl->loading_shortcuts = NULL;
+-    }
+-
+-  if (impl->file_list_drag_data_received_handle)
+-    {
+-      gtk_file_system_cancel_operation (impl->file_list_drag_data_received_handle);
+-      impl->file_list_drag_data_received_handle = NULL;
+-    }
+-
+   if (impl->update_current_folder_handle)
+     {
+       gtk_file_system_cancel_operation (impl->update_current_folder_handle);
+@@ -5238,12 +2043,6 @@
+       impl->update_from_entry_handle = NULL;
+     }
+ 
+-  if (impl->shortcuts_activate_iter_handle)
+-    {
+-      gtk_file_system_cancel_operation (impl->shortcuts_activate_iter_handle);
+-      impl->shortcuts_activate_iter_handle = NULL;
+-    }
+-
+   remove_settings_signal (impl, gtk_widget_get_screen (GTK_WIDGET (impl)));
+ 
+   G_OBJECT_CLASS (_gtk_file_chooser_default_parent_class)->dispose (object);
+@@ -5256,12 +2055,7 @@
+ static void
+ gtk_file_chooser_default_show_all (GtkWidget *widget)
+ {
+-  GtkFileChooserDefault *impl = (GtkFileChooserDefault *) widget;
+-
+   gtk_widget_show (widget);
+-
+-  if (impl->extra_widget)
+-    gtk_widget_show_all (impl->extra_widget);
+ }
+ 
+ /* Handler for GtkWindow::set-focus; this is where we save the last-focused
+@@ -5322,7 +2116,6 @@
+   else
+     impl->icon_size = FALLBACK_ICON_SIZE;
+ 
+-  shortcuts_reload_icons (impl);
+   gtk_widget_queue_resize (impl->browse_files_tree_view);
+ 
+   profile_end ("end", NULL);
+@@ -5441,15 +2234,6 @@
+ 
+   impl->default_width = allocation->width;
+   impl->default_height = allocation->height;
+-
+-  if (impl->preview_widget_active &&
+-      impl->preview_widget &&
+-      GTK_WIDGET_DRAWABLE (impl->preview_widget))
+-    impl->default_width -= impl->preview_widget->allocation.width + PREVIEW_HBOX_SPACING;
+-
+-  if (impl->extra_widget &&
+-      GTK_WIDGET_DRAWABLE (impl->extra_widget))
+-    impl->default_height -= GTK_BOX (widget)->spacing + impl->extra_widget->allocation.height;
+ }
+ 
+ static gboolean
+@@ -5503,23 +2287,18 @@
+ settings_load (GtkFileChooserDefault *impl)
+ {
+   GtkFileChooserSettings *settings;
+-  LocationMode location_mode;
+   gboolean show_hidden;
+   gboolean expand_folders;
+ 
+   settings = _gtk_file_chooser_settings_new ();
+ 
+-  location_mode = _gtk_file_chooser_settings_get_location_mode (settings);
+   show_hidden = _gtk_file_chooser_settings_get_show_hidden (settings);
+   expand_folders = _gtk_file_chooser_settings_get_expand_folders (settings);
+ 
+   g_object_unref (settings);
+ 
+-  location_mode_set (impl, location_mode, TRUE);
+   gtk_file_chooser_set_show_hidden (GTK_FILE_CHOOSER (impl), show_hidden);
+   impl->expand_folders = expand_folders;
+-  if (impl->save_expander)
+-    gtk_expander_set_expanded (GTK_EXPANDER (impl->save_expander), expand_folders);
+ }
+ 
+ static void
+@@ -5529,7 +2308,6 @@
+ 
+   settings = _gtk_file_chooser_settings_new ();
+ 
+-  _gtk_file_chooser_settings_set_location_mode (settings, impl->location_mode);
+   _gtk_file_chooser_settings_set_show_hidden (settings, gtk_file_chooser_get_show_hidden (GTK_FILE_CHOOSER (impl)));
+   _gtk_file_chooser_settings_set_expand_folders (settings, impl->expand_folders);
+ 
+@@ -5570,7 +2348,7 @@
+       if (impl->current_folder)
+         {
+           pending_select_paths_store_selection (impl);
+-          change_folder_and_display_error (impl, impl->current_folder, FALSE);
++          change_folder_and_display_error (impl, impl->current_folder);
+ 	}
+       break;
+ 
+@@ -5578,8 +2356,6 @@
+       g_assert_not_reached ();
+     }
+ 
+-  bookmarks_changed_cb (impl->file_system, impl);
+-
+   settings_load (impl);
+ 
+   profile_end ("end", NULL);
+@@ -5897,12 +2673,10 @@
+ 					gpointer user_data)
+ {
+   gboolean have_hidden;
+-  gboolean have_filtered;
+   GSList *l;
+   struct ShowAndSelectPathsData *data = user_data;
+ 
+   have_hidden = FALSE;
+-  have_filtered = FALSE;
+ 
+   for (l = data->paths; l; l = l->next)
+     {
+@@ -5918,12 +2692,9 @@
+ 	  if (!have_hidden)
+ 	    have_hidden = gtk_file_info_get_is_hidden (info);
+ 
+-	  if (!have_filtered)
+-	    have_filtered = !gtk_file_info_get_is_folder (info) && get_is_file_filtered (data->impl, path, info);
+-
+ 	  gtk_file_info_free (info);
+ 
+-	  if (have_hidden && have_filtered)
++	  if (have_hidden)
+ 	    break; /* we now have all the information we need */
+ 	}
+     }
+@@ -5937,9 +2708,6 @@
+   if (have_hidden)
+     g_object_set (data->impl, "show-hidden", TRUE, NULL);
+ 
+-  if (have_filtered)
+-    set_current_filter (data->impl, NULL);
+-
+   for (l = data->paths; l; l = l->next)
+     {
+       const GtkFilePath *path;
+@@ -6197,9 +2965,8 @@
+ 
+   if (!(impl->action == GTK_FILE_CHOOSER_ACTION_SAVE
+ 	|| impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER
+-	|| ((impl->action == GTK_FILE_CHOOSER_ACTION_OPEN
+-	     || impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER)
+-	    && impl->location_mode == LOCATION_MODE_FILENAME_ENTRY)))
++	|| impl->action == GTK_FILE_CHOOSER_ACTION_OPEN
++	|| impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER))
+     return;
+ 
+   g_assert (impl->location_entry != NULL);
+@@ -6387,9 +3154,6 @@
+   if (!gtk_file_info_get_is_folder (info))
+     goto out;
+ 
+-  if (!_gtk_path_bar_set_path (GTK_PATH_BAR (impl->browse_path_bar), data->path, data->keep_trail, NULL))
+-    goto out;
+-
+   if (impl->current_folder != data->path)
+     {
+       if (impl->current_folder)
+@@ -6400,17 +3164,6 @@
+       impl->reload_state = RELOAD_HAS_FOLDER;
+     }
+ 
+-  /* Update the widgets that may trigger a folder change themselves.  */
+-
+-  if (!impl->changing_folder)
+-    {
+-      impl->changing_folder = TRUE;
+-
+-      shortcuts_update_current_folder (impl);
+-
+-      impl->changing_folder = FALSE;
+-    }
+-
+   /* Set the folder on the save entry */
+ 
+   if (impl->location_entry)
+@@ -6430,13 +3183,7 @@
+ 
+   /* Refresh controls */
+ 
+-  shortcuts_find_current_folder (impl);
+-
+   g_signal_emit_by_name (impl, "current-folder-changed", 0);
+-
+-  check_preview_change (impl);
+-  bookmarks_check_add_sensitivity (impl);
+-
+   g_signal_emit_by_name (impl, "selection-changed", 0);
+ 
+ out:
+@@ -6698,9 +3445,8 @@
+ 
+   g_assert (impl->action == GTK_FILE_CHOOSER_ACTION_SAVE
+ 	    || impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER
+-	    || ((impl->action == GTK_FILE_CHOOSER_ACTION_OPEN
+-		 || impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER)
+-		&& impl->location_mode == LOCATION_MODE_FILENAME_ENTRY));
++	    || impl->action == GTK_FILE_CHOOSER_ACTION_OPEN
++	    || impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
+ 
+   chooser_entry = GTK_FILE_CHOOSER_ENTRY (impl->location_entry);
+ 
+@@ -6878,17 +3624,6 @@
+   return g_slist_reverse (info.result);
+ }
+ 
+-static GtkFilePath *
+-gtk_file_chooser_default_get_preview_path (GtkFileChooser *chooser)
+-{
+-  GtkFileChooserDefault *impl = GTK_FILE_CHOOSER_DEFAULT (chooser);
+-
+-  if (impl->preview_path)
+-    return gtk_file_path_copy (impl->preview_path);
+-  else
+-    return NULL;
+-}
+-
+ static GtkFileSystem *
+ gtk_file_chooser_default_get_file_system (GtkFileChooser *chooser)
+ {
+@@ -6903,9 +3638,9 @@
+ 	      gboolean               show)
+ {
+   if (show)
+-    gtk_widget_show (impl->filter_combo_hbox);
++    gtk_widget_show (impl->filter_combo);
+   else
+-    gtk_widget_hide (impl->filter_combo_hbox);
++    gtk_widget_hide (impl->filter_combo);
+ }
+ 
+ static void
+@@ -6915,6 +3650,8 @@
+   GtkFileChooserDefault *impl = GTK_FILE_CHOOSER_DEFAULT (chooser);
+   const gchar *name;
+ 
++  g_debug ("adding filter");
++
+   if (g_slist_find (impl->filters, filter))
+     {
+       g_warning ("gtk_file_chooser_add_filter() called on filter already in list\n");
+@@ -6925,291 +3662,62 @@
+   impl->filters = g_slist_append (impl->filters, filter);
+ 
+   name = gtk_file_filter_get_name (filter);
+-  if (!name)
+-    name = "Untitled filter";	/* Place-holder, doesn't need to be marked for translation */
+-
+-  gtk_combo_box_append_text (GTK_COMBO_BOX (impl->filter_combo), name);
+-
+-  if (!g_slist_find (impl->filters, impl->current_filter))
+-    set_current_filter (impl, filter);
+-
+-  show_filters (impl, TRUE);
+-}
+-
+-static void
+-gtk_file_chooser_default_remove_filter (GtkFileChooser *chooser,
+-					GtkFileFilter  *filter)
+-{
+-  GtkFileChooserDefault *impl = GTK_FILE_CHOOSER_DEFAULT (chooser);
+-  GtkTreeModel *model;
+-  GtkTreeIter iter;
+-  gint filter_index;
+-
+-  filter_index = g_slist_index (impl->filters, filter);
+-
+-  if (filter_index < 0)
+-    {
+-      g_warning ("gtk_file_chooser_remove_filter() called on filter not in list\n");
+-      return;
+-    }
+-
+-  impl->filters = g_slist_remove (impl->filters, filter);
+-
+-  if (filter == impl->current_filter)
+-    {
+-      if (impl->filters)
+-	set_current_filter (impl, impl->filters->data);
+-      else
+-	set_current_filter (impl, NULL);
+-    }
+-
+-  /* Remove row from the combo box */
+-  model = gtk_combo_box_get_model (GTK_COMBO_BOX (impl->filter_combo));
+-  if (!gtk_tree_model_iter_nth_child  (model, &iter, NULL, filter_index))
+-    g_assert_not_reached ();
+-
+-  gtk_list_store_remove (GTK_LIST_STORE (model), &iter);
+-
+-  g_object_unref (filter);
+-
+-  if (!impl->filters)
+-    show_filters (impl, FALSE);
+-}
+-
+-static GSList *
+-gtk_file_chooser_default_list_filters (GtkFileChooser *chooser)
+-{
+-  GtkFileChooserDefault *impl = GTK_FILE_CHOOSER_DEFAULT (chooser);
+-
+-  return g_slist_copy (impl->filters);
+-}
+-
+-/* Returns the position in the shortcuts tree where the nth specified shortcut would appear */
+-static int
+-shortcuts_get_pos_for_shortcut_folder (GtkFileChooserDefault *impl,
+-				       int                    pos)
+-{
+-  return pos + shortcuts_get_index (impl, SHORTCUTS_SHORTCUTS);
+-}
+-
+-struct AddShortcutData
+-{
+-  GtkFileChooserDefault *impl;
+-  GtkFilePath *path;
+-};
+-
+-static void
+-add_shortcut_get_info_cb (GtkFileSystemHandle *handle,
+-			  const GtkFileInfo   *info,
+-			  const GError        *error,
+-			  gpointer             user_data)
+-{
+-  int pos;
+-  gboolean cancelled = handle->cancelled;
+-  struct AddShortcutData *data = user_data;
+-
+-  if (!g_slist_find (data->impl->loading_shortcuts, handle))
+-    goto out;
+-
+-  data->impl->loading_shortcuts = g_slist_remove (data->impl->loading_shortcuts, handle);
+-
+-  if (cancelled || error || !gtk_file_info_get_is_folder (info))
+-    goto out;
+-
+-  pos = shortcuts_get_pos_for_shortcut_folder (data->impl, data->impl->num_shortcuts);
+-
+-  shortcuts_insert_path (data->impl, pos, FALSE, NULL, data->path, NULL, FALSE, SHORTCUTS_SHORTCUTS);
+-
+-out:
+-  g_object_unref (data->impl);
+-  gtk_file_path_free (data->path);
+-  g_free (data);
+-
+-  g_object_unref (handle);
+-}
+-
+-static gboolean
+-gtk_file_chooser_default_add_shortcut_folder (GtkFileChooser    *chooser,
+-					      const GtkFilePath *path,
+-					      GError           **error)
+-{
+-  GtkFileSystemHandle *handle;
+-  GtkFileChooserDefault *impl = GTK_FILE_CHOOSER_DEFAULT (chooser);
+-  struct AddShortcutData *data;
+-  GSList *l;
+-  int pos;
+-
+-  /* Avoid adding duplicates */
+-  pos = shortcut_find_position (impl, path);
+-  if (pos >= 0 && pos < shortcuts_get_index (impl, SHORTCUTS_BOOKMARKS_SEPARATOR))
+-    {
+-      gchar *uri;
+-
+-      uri = gtk_file_system_path_to_uri (impl->file_system, path);
+-      /* translators, "Shortcut" means "Bookmark" here */
+-      g_set_error (error,
+-		   GTK_FILE_CHOOSER_ERROR,
+-		   GTK_FILE_CHOOSER_ERROR_ALREADY_EXISTS,
+-		   _("Shortcut %s already exists"),
+-		   uri);
+-      g_free (uri);
+-
+-      return FALSE;
+-    }
+-
+-  for (l = impl->loading_shortcuts; l; l = l->next)
+-    {
+-      GtkFileSystemHandle *h = l->data;
+-      GtkFilePath *p;
+-
+-      p = g_object_get_data (G_OBJECT (h), "add-shortcut-path-key");
+-      if (p && !gtk_file_path_compare (path, p))
+-        {
+-	  gchar *uri;
+-
+-          uri = gtk_file_system_path_to_uri (impl->file_system, path);
+-          g_set_error (error,
+-		       GTK_FILE_CHOOSER_ERROR,
+-		       GTK_FILE_CHOOSER_ERROR_ALREADY_EXISTS,
+-		       _("Shortcut %s already exists"),
+-		       uri);
+-          g_free (uri);
+-
+-          return FALSE;
+-	}
+-    }
+-
+-  data = g_new0 (struct AddShortcutData, 1);
+-  data->impl = g_object_ref (impl);
+-  data->path = gtk_file_path_copy (path);
+-
+-  handle = gtk_file_system_get_info (impl->file_system, path,
+-				     GTK_FILE_INFO_IS_FOLDER,
+-				     add_shortcut_get_info_cb, data);
++  if (!name)
++    name = "Untitled filter";	/* Place-holder, doesn't need to be marked for translation */
+ 
+-  if (!handle)
+-    return FALSE;
++  gtk_combo_box_append_text (GTK_COMBO_BOX (impl->filter_combo), name);
+ 
+-  impl->loading_shortcuts = g_slist_append (impl->loading_shortcuts, handle);
+-  g_object_set_data (G_OBJECT (handle), "add-shortcut-path-key", data->path);
++  if (!g_slist_find (impl->filters, impl->current_filter))
++    set_current_filter (impl, filter);
+ 
+-  return TRUE;
++  show_filters (impl, g_slist_length (impl->filters) > 1);
+ }
+ 
+-static gboolean
+-gtk_file_chooser_default_remove_shortcut_folder (GtkFileChooser    *chooser,
+-						 const GtkFilePath *path,
+-						 GError           **error)
++static void
++gtk_file_chooser_default_remove_filter (GtkFileChooser *chooser,
++					GtkFileFilter  *filter)
+ {
+   GtkFileChooserDefault *impl = GTK_FILE_CHOOSER_DEFAULT (chooser);
+-  int pos;
++  GtkTreeModel *model;
+   GtkTreeIter iter;
+-  GSList *l;
+-  char *uri;
+-  int i;
++  gint filter_index;
+ 
+-  for (l = impl->loading_shortcuts; l; l = l->next)
+-    {
+-      GtkFileSystemHandle *h = l->data;
+-      GtkFilePath *p;
++  filter_index = g_slist_index (impl->filters, filter);
+ 
+-      p = g_object_get_data (G_OBJECT (h), "add-shortcut-path-key");
+-      if (p && !gtk_file_path_compare (path, p))
+-        {
+-	  impl->loading_shortcuts = g_slist_remove (impl->loading_shortcuts, h);
+-	  gtk_file_system_cancel_operation (h);
+-          return TRUE;
+-	}
++  if (filter_index < 0)
++    {
++      g_warning ("gtk_file_chooser_remove_filter() called on filter not in list\n");
++      return;
+     }
+ 
+-  if (impl->num_shortcuts == 0)
+-    goto out;
+-
+-  pos = shortcuts_get_pos_for_shortcut_folder (impl, 0);
+-  if (!gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (impl->shortcuts_model), &iter, NULL, pos))
+-    g_assert_not_reached ();
++  impl->filters = g_slist_remove (impl->filters, filter);
+ 
+-  for (i = 0; i < impl->num_shortcuts; i++)
++  if (filter == impl->current_filter)
+     {
+-      gpointer col_data;
+-      gboolean is_volume;
+-      GtkFilePath *shortcut;
+-
+-      gtk_tree_model_get (GTK_TREE_MODEL (impl->shortcuts_model), &iter,
+-			  SHORTCUTS_COL_DATA, &col_data,
+-			  SHORTCUTS_COL_IS_VOLUME, &is_volume,
+-			  -1);
+-      g_assert (col_data != NULL);
+-      g_assert (!is_volume);
+-
+-      shortcut = col_data;
+-      if (gtk_file_path_compare (shortcut, path) == 0)
+-	{
+-	  shortcuts_remove_rows (impl, pos + i, 1);
+-	  impl->num_shortcuts--;
+-	  return TRUE;
+-	}
+-
+-      if (!gtk_tree_model_iter_next (GTK_TREE_MODEL (impl->shortcuts_model), &iter))
+-	g_assert_not_reached ();
++      if (impl->filters)
++	set_current_filter (impl, impl->filters->data);
++      else
++	set_current_filter (impl, NULL);
+     }
+ 
+- out:
++  /* Remove row from the combo box */
++  model = gtk_combo_box_get_model (GTK_COMBO_BOX (impl->filter_combo));
++  if (!gtk_tree_model_iter_nth_child  (model, &iter, NULL, filter_index))
++    g_assert_not_reached ();
+ 
+-  uri = gtk_file_system_path_to_uri (impl->file_system, path);
+-  /* translators, "Shortcut" means "Bookmark" here */
+-  g_set_error (error,
+-	       GTK_FILE_CHOOSER_ERROR,
+-	       GTK_FILE_CHOOSER_ERROR_NONEXISTENT,
+-	       _("Shortcut %s does not exist"),
+-	       uri);
+-  g_free (uri);
++  gtk_list_store_remove (GTK_LIST_STORE (model), &iter);
+ 
+-  return FALSE;
++  g_object_unref (filter);
++
++  show_filters (impl, g_slist_length (impl->filters) > 1);
+ }
+ 
+ static GSList *
+-gtk_file_chooser_default_list_shortcut_folders (GtkFileChooser *chooser)
++gtk_file_chooser_default_list_filters (GtkFileChooser *chooser)
+ {
+   GtkFileChooserDefault *impl = GTK_FILE_CHOOSER_DEFAULT (chooser);
+-  int pos;
+-  GtkTreeIter iter;
+-  int i;
+-  GSList *list;
+-
+-  if (impl->num_shortcuts == 0)
+-    return NULL;
+-
+-  pos = shortcuts_get_pos_for_shortcut_folder (impl, 0);
+-  if (!gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (impl->shortcuts_model), &iter, NULL, pos))
+-    g_assert_not_reached ();
+-
+-  list = NULL;
+-
+-  for (i = 0; i < impl->num_shortcuts; i++)
+-    {
+-      gpointer col_data;
+-      gboolean is_volume;
+-      GtkFilePath *shortcut;
+-
+-      gtk_tree_model_get (GTK_TREE_MODEL (impl->shortcuts_model), &iter,
+-			  SHORTCUTS_COL_DATA, &col_data,
+-			  SHORTCUTS_COL_IS_VOLUME, &is_volume,
+-			  -1);
+-      g_assert (col_data != NULL);
+-      g_assert (!is_volume);
+-
+-      shortcut = col_data;
+-      list = g_slist_prepend (list, gtk_file_path_copy (shortcut));
+ 
+-      if (i != impl->num_shortcuts - 1)
+-	{
+-	  if (!gtk_tree_model_iter_next (GTK_TREE_MODEL (impl->shortcuts_model), &iter))
+-	    g_assert_not_reached ();
+-	}
+-    }
+-
+-  return g_slist_reverse (list);
++  return g_slist_copy (impl->filters);
+ }
+ 
+ /* Guesses a size based upon font sizes */
+@@ -7256,25 +3764,9 @@
+ 					   gint                *default_height)
+ {
+   GtkFileChooserDefault *impl;
+-  GtkRequisition req;
+ 
+   impl = GTK_FILE_CHOOSER_DEFAULT (chooser_embed);
+   find_good_size_from_style (GTK_WIDGET (chooser_embed), default_width, default_height);
+-
+-  if (impl->preview_widget_active &&
+-      impl->preview_widget &&
+-      GTK_WIDGET_VISIBLE (impl->preview_widget))
+-    {
+-      gtk_widget_size_request (impl->preview_box, &req);
+-      *default_width += PREVIEW_HBOX_SPACING + req.width;
+-    }
+-
+-  if (impl->extra_widget &&
+-      GTK_WIDGET_VISIBLE (impl->extra_widget))
+-    {
+-      gtk_widget_size_request (impl->extra_align, &req);
+-      *default_height += GTK_BOX (chooser_embed)->spacing + req.height;
+-    }
+ }
+ 
+ static gboolean
+@@ -7285,8 +3777,7 @@
+   impl = GTK_FILE_CHOOSER_DEFAULT (chooser_embed);
+ 
+   return (impl->action == GTK_FILE_CHOOSER_ACTION_OPEN ||
+-	  impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER ||
+-	  gtk_expander_get_expanded (GTK_EXPANDER (impl->save_expander)));
++	  impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
+ }
+ 
+ struct switch_folder_closure {
+@@ -7333,7 +3824,7 @@
+ 
+   g_assert (closure.path && closure.num_selected == 1);
+ 
+-  change_folder_and_display_error (impl, closure.path, FALSE);
++  change_folder_and_display_error (impl, closure.path);
+ }
+ 
+ /* Gets the GtkFileInfo for the selected row in the file list; assumes single
+@@ -7628,7 +4119,7 @@
+   else
+     {
+       /* This will display an error, which is what we want */
+-      change_folder_and_display_error (data->impl, data->parent_path, FALSE);
++      change_folder_and_display_error (data->impl, data->parent_path);
+     }
+ 
+ out:
+@@ -7706,50 +4197,6 @@
+   g_object_unref (handle);
+ }
+ 
+-static void
+-paste_text_received (GtkClipboard          *clipboard,
+-		     const gchar           *text,
+-		     GtkFileChooserDefault *impl)
+-{
+-  GtkFilePath *path;
+-
+-  if (!text)
+-    return;
+-
+-  path = gtk_file_system_uri_to_path (impl->file_system, text);
+-  if (!path) 
+-    {
+-      if (!g_path_is_absolute (text)) 
+-	{
+-	  location_popup_handler (impl, text);
+-	  return;
+-	}
+-
+-      path = gtk_file_system_filename_to_path (impl->file_system, text);
+-      if (!path) 
+-	{
+-	  location_popup_handler (impl, text);
+-	  return;
+-	}
+-    }
+-
+-  if (!gtk_file_chooser_default_select_path (GTK_FILE_CHOOSER (impl), path, NULL))
+-    location_popup_handler (impl, text);
+-
+-  gtk_file_path_free (path);
+-}
+-
+-/* Handler for the "location-popup-on-paste" keybinding signal */
+-static void
+-location_popup_on_paste_handler (GtkFileChooserDefault *impl)
+-{
+-  GtkClipboard *clipboard = gtk_widget_get_clipboard (GTK_WIDGET (impl),
+-		  				      GDK_SELECTION_CLIPBOARD);
+-  gtk_clipboard_request_text (clipboard,
+-		  	      (GtkClipboardTextReceivedFunc) paste_text_received,
+-			      impl);
+-}
+-
+ 
+ /* Implementation for GtkFileChooserEmbed::should_respond() */
+ static gboolean
+@@ -7855,9 +4302,8 @@
+ 
+       g_assert (impl->action == GTK_FILE_CHOOSER_ACTION_SAVE
+ 		|| impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER
+-		|| ((impl->action == GTK_FILE_CHOOSER_ACTION_OPEN
+-		     || impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER)
+-		    && impl->location_mode == LOCATION_MODE_FILENAME_ENTRY));
++		|| impl->action == GTK_FILE_CHOOSER_ACTION_OPEN
++		|| impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
+ 
+       entry = GTK_FILE_CHOOSER_ENTRY (impl->location_entry);
+       check_save_entry (impl, &path, &is_well_formed, &is_empty, &is_file_part_empty, &is_folder);
+@@ -7873,7 +4319,7 @@
+ 	  if (impl->action == GTK_FILE_CHOOSER_ACTION_OPEN
+ 	      || impl->action == GTK_FILE_CHOOSER_ACTION_SAVE)
+ 	    {
+-	      change_folder_and_display_error (impl, path, TRUE);
++	      change_folder_and_display_error (impl, path);
+ 	      retval = FALSE;
+ 	    }
+ 	  else if (impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER
+@@ -7896,430 +4342,126 @@
+ 
+ 	  /* We need to check whether path exists and is not a folder */
+ 
+-	  data = g_new0 (struct FileExistsData, 1);
+-	  data->impl = g_object_ref (impl);
+-	  data->path = gtk_file_path_copy (path);
+-	  data->parent_path = gtk_file_path_copy (_gtk_file_chooser_entry_get_current_folder (entry));
+-
+-	  if (impl->file_exists_get_info_handle)
+-	    gtk_file_system_cancel_operation (impl->file_exists_get_info_handle);
+-
+-	  impl->file_exists_get_info_handle =
+-	    gtk_file_system_get_info (impl->file_system, path,
+-				      GTK_FILE_INFO_IS_FOLDER,
+-				      file_exists_get_info_cb,
+-				      data);
+-
+-	  set_busy_cursor (impl, TRUE);
+-	  retval = FALSE;
+-
+-	  if (error != NULL)
+-	    g_error_free (error);
+-	}
+-
+-      gtk_file_path_free (path);
+-      return retval;
+-    }
+-  else if (impl->toplevel_last_focus_widget == impl->browse_shortcuts_tree_view)
+-    {
+-      /* The focus is on a dialog's action area button, *and* the widget that
+-       * was focused immediately before it is the shortcuts list.  Switch to the
+-       * selected shortcut and tell the caller not to respond.
+-       */
+-      GtkTreeIter iter;
+-
+-      if (shortcuts_get_selected (impl, &iter))
+-	{
+-	  shortcuts_activate_iter (impl, &iter);
+-	  
+-	  gtk_widget_grab_focus (impl->browse_files_tree_view);
+-	}
+-      else
+-	goto file_list;
+-
+-      return FALSE;
+-    }
+-  else if (impl->toplevel_last_focus_widget == impl->browse_files_tree_view)
+-    {
+-      /* The focus is on a dialog's action area button, *and* the widget that
+-       * was focused immediately before it is the file list.  
+-       */
+-      goto file_list;
+-    }
+-  else if (impl->location_entry && impl->toplevel_last_focus_widget == impl->location_entry)
+-    {
+-      /* The focus is on a dialog's action area button, *and* the widget that
+-       * was focused immediately before it is the location entry.
+-       */
+-      goto save_entry;
+-    }
+-  else
+-    /* The focus is on a dialog's action area button or something else */
+-    if (impl->action == GTK_FILE_CHOOSER_ACTION_SAVE
+-	|| impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER)
+-      goto save_entry;
+-    else
+-      goto file_list; 
+-  
+-  g_assert_not_reached ();
+-  return FALSE;
+-}
+-
+-/* Implementation for GtkFileChooserEmbed::initial_focus() */
+-static void
+-gtk_file_chooser_default_initial_focus (GtkFileChooserEmbed *chooser_embed)
+-{
+-  GtkFileChooserDefault *impl;
+-  GtkWidget *widget;
+-
+-  impl = GTK_FILE_CHOOSER_DEFAULT (chooser_embed);
+-
+-  if (impl->action == GTK_FILE_CHOOSER_ACTION_OPEN
+-      || impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER)
+-    {
+-      if (impl->location_mode == LOCATION_MODE_PATH_BAR)
+-	widget = impl->browse_files_tree_view;
+-      else
+-	widget = impl->location_entry;
+-    }
+-  else if (impl->action == GTK_FILE_CHOOSER_ACTION_SAVE
+-	   || impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER)
+-    widget = impl->location_entry;
+-  else
+-    {
+-      g_assert_not_reached ();
+-      widget = NULL;
+-    }
+-
+-  g_assert (widget != NULL);
+-  gtk_widget_grab_focus (widget);
+-}
+-
+-static void
+-set_current_filter (GtkFileChooserDefault *impl,
+-		    GtkFileFilter         *filter)
+-{
+-  if (impl->current_filter != filter)
+-    {
+-      int filter_index;
+-
+-      /* NULL filters are allowed to reset to non-filtered status
+-       */
+-      filter_index = g_slist_index (impl->filters, filter);
+-      if (impl->filters && filter && filter_index < 0)
+-	return;
+-
+-      if (impl->current_filter)
+-	g_object_unref (impl->current_filter);
+-      impl->current_filter = filter;
+-      if (impl->current_filter)
+-	{
+-	  g_object_ref_sink (impl->current_filter);
+-	}
+-
+-      if (impl->filters)
+-	gtk_combo_box_set_active (GTK_COMBO_BOX (impl->filter_combo),
+-				  filter_index);
+-
+-      if (impl->browse_files_model)
+-	install_list_model_filter (impl);
+-
+-      g_object_notify (G_OBJECT (impl), "filter");
+-    }
+-}
+-
+-static void
+-filter_combo_changed (GtkComboBox           *combo_box,
+-		      GtkFileChooserDefault *impl)
+-{
+-  gint new_index = gtk_combo_box_get_active (combo_box);
+-  GtkFileFilter *new_filter = g_slist_nth_data (impl->filters, new_index);
+-
+-  set_current_filter (impl, new_filter);
+-}
+-
+-static void
+-check_preview_change (GtkFileChooserDefault *impl)
+-{
+-  GtkTreePath *cursor_path;
+-  const GtkFilePath *new_path;
+-  const GtkFileInfo *new_info;
+-
+-  gtk_tree_view_get_cursor (GTK_TREE_VIEW (impl->browse_files_tree_view), &cursor_path, NULL);
+-  if (cursor_path && impl->sort_model)
+-    {
+-      GtkTreeIter iter;
+-      GtkTreeIter child_iter;
+-
+-      if (!gtk_tree_model_get_iter (GTK_TREE_MODEL (impl->sort_model), &iter, cursor_path))
+-	g_assert_not_reached ();
+-
+-      gtk_tree_path_free (cursor_path);
+-
+-      gtk_tree_model_sort_convert_iter_to_child_iter (impl->sort_model, &child_iter, &iter);
+-
+-      new_path = _gtk_file_system_model_get_path (impl->browse_files_model, &child_iter);
+-      new_info = _gtk_file_system_model_get_info (impl->browse_files_model, &child_iter);
+-    }
+-  else
+-    {
+-      new_path = NULL;
+-      new_info = NULL;
+-    }
+-
+-  if (new_path != impl->preview_path &&
+-      !(new_path && impl->preview_path &&
+-	gtk_file_path_compare (new_path, impl->preview_path) == 0))
+-    {
+-      if (impl->preview_path)
+-	{
+-	  gtk_file_path_free (impl->preview_path);
+-	  g_free (impl->preview_display_name);
+-	}
+-
+-      if (new_path)
+-	{
+-	  impl->preview_path = gtk_file_path_copy (new_path);
+-	  impl->preview_display_name = g_strdup (gtk_file_info_get_display_name (new_info));
+-	}
+-      else
+-	{
+-	  impl->preview_path = NULL;
+-	  impl->preview_display_name = NULL;
+-	}
+-
+-      if (impl->use_preview_label && impl->preview_label)
+-	gtk_label_set_text (GTK_LABEL (impl->preview_label), impl->preview_display_name);
+-
+-      g_signal_emit_by_name (impl, "update-preview");
+-    }
+-}
+-
+-static void
+-shortcuts_activate_volume_mount_cb (GtkFileSystemHandle *handle,
+-				    GtkFileSystemVolume *volume,
+-				    const GError        *error,
+-				    gpointer             data)
+-{
+-  GtkFilePath *path;
+-  gboolean cancelled = handle->cancelled;
+-  GtkFileChooserDefault *impl = data;
+-
+-  if (handle != impl->shortcuts_activate_iter_handle)
+-    goto out;
+-
+-  impl->shortcuts_activate_iter_handle = NULL;
+-
+-  set_busy_cursor (impl, FALSE);
++	  data = g_new0 (struct FileExistsData, 1);
++	  data->impl = g_object_ref (impl);
++	  data->path = gtk_file_path_copy (path);
++	  data->parent_path = gtk_file_path_copy (_gtk_file_chooser_entry_get_current_folder (entry));
+ 
+-  if (cancelled)
+-    goto out;
++	  if (impl->file_exists_get_info_handle)
++	    gtk_file_system_cancel_operation (impl->file_exists_get_info_handle);
+ 
+-  if (error)
+-    {
+-      char *msg;
++	  impl->file_exists_get_info_handle =
++	    gtk_file_system_get_info (impl->file_system, path,
++				      GTK_FILE_INFO_IS_FOLDER,
++				      file_exists_get_info_cb,
++				      data);
+ 
+-      msg = g_strdup_printf (_("Could not mount %s"),
+-			     gtk_file_system_volume_get_display_name (impl->file_system, volume));
+-      error_message (impl, msg, error->message);
+-      g_free (msg);
++	  set_busy_cursor (impl, TRUE);
++	  retval = FALSE;
+ 
+-      goto out;
+-    }
++	  if (error != NULL)
++	    g_error_free (error);
++	}
+ 
+-  path = gtk_file_system_volume_get_base_path (impl->file_system, volume);
+-  if (path != NULL)
+-    {
+-      change_folder_and_display_error (impl, path, FALSE);
+       gtk_file_path_free (path);
++      return retval;
+     }
+-
+-out:
+-  g_object_unref (impl);
+-  g_object_unref (handle);
+-}
+-
+-
+-/* Activates a volume by mounting it if necessary and then switching to its
+- * base path.
+- */
+-static void
+-shortcuts_activate_volume (GtkFileChooserDefault *impl,
+-			   GtkFileSystemVolume   *volume)
+-{
+-  GtkFilePath *path;
+-
+-  /* We ref the file chooser since volume_mount() may run a main loop, and the
+-   * user could close the file chooser window in the meantime.
+-   */
+-  g_object_ref (impl);
+-
+-  if (!gtk_file_system_volume_get_is_mounted (impl->file_system, volume))
++  else if (impl->toplevel_last_focus_widget == impl->browse_files_tree_view)
+     {
+-      set_busy_cursor (impl, TRUE);
+-
+-      impl->shortcuts_activate_iter_handle =
+-        gtk_file_system_volume_mount (impl->file_system, volume,
+-				      shortcuts_activate_volume_mount_cb,
+-				      g_object_ref (impl));
++      /* The focus is on a dialog's action area button, *and* the widget that
++       * was focused immediately before it is the file list.
++       */
++      goto file_list;
+     }
+-  else
++  else if (impl->location_entry && impl->toplevel_last_focus_widget == impl->location_entry)
+     {
+-      path = gtk_file_system_volume_get_base_path (impl->file_system, volume);
+-      if (path != NULL)
+-        {
+-          change_folder_and_display_error (impl, path, FALSE);
+-          gtk_file_path_free (path);
+-        }
++      /* The focus is on a dialog's action area button, *and* the widget that
++       * was focused immediately before it is the location entry.
++       */
++      goto save_entry;
+     }
+-
+-  g_object_unref (impl);
+-}
+-
+-/* Opens the folder or volume at the specified iter in the shortcuts model */
+-struct ShortcutsActivateData
+-{
+-  GtkFileChooserDefault *impl;
+-  GtkFilePath *path;
+-};
+-
+-static void
+-shortcuts_activate_get_info_cb (GtkFileSystemHandle *handle,
+-			        const GtkFileInfo   *info,
+-			        const GError        *error,
+-			        gpointer             user_data)
+-{
+-  gboolean cancelled = handle->cancelled;
+-  struct ShortcutsActivateData *data = user_data;
+-
+-  if (handle != data->impl->shortcuts_activate_iter_handle)
+-    goto out;
+-
+-  data->impl->shortcuts_activate_iter_handle = NULL;
+-
+-  if (cancelled)
+-    goto out;
+-
+-  if (!error && gtk_file_info_get_is_folder (info))
+-    change_folder_and_display_error (data->impl, data->path, FALSE);
+   else
+-    gtk_file_chooser_default_select_path (GTK_FILE_CHOOSER (data->impl), data->path, NULL);
+-
+-out:
+-  g_object_unref (data->impl);
+-  gtk_file_path_free (data->path);
+-  g_free (data);
++    /* The focus is on a dialog's action area button or something else */
++    if (impl->action == GTK_FILE_CHOOSER_ACTION_SAVE
++	|| impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER)
++      goto save_entry;
++    else
++      goto file_list;
+ 
+-  g_object_unref (handle);
++  g_assert_not_reached ();
++  return FALSE;
+ }
+ 
++/* Implementation for GtkFileChooserEmbed::initial_focus() */
+ static void
+-shortcuts_activate_iter (GtkFileChooserDefault *impl,
+-			 GtkTreeIter           *iter)
++gtk_file_chooser_default_initial_focus (GtkFileChooserEmbed *chooser_embed)
+ {
+-  gpointer col_data;
+-  gboolean is_volume;
+-
+-  if (impl->location_mode == LOCATION_MODE_FILENAME_ENTRY && impl->action != GTK_FILE_CHOOSER_ACTION_SAVE)
+-    _gtk_file_chooser_entry_set_file_part (GTK_FILE_CHOOSER_ENTRY (impl->location_entry), "");
+-
+-  gtk_tree_model_get (GTK_TREE_MODEL (impl->shortcuts_model), iter,
+-		      SHORTCUTS_COL_DATA, &col_data,
+-		      SHORTCUTS_COL_IS_VOLUME, &is_volume,
+-		      -1);
++  GtkFileChooserDefault *impl;
++  GtkWidget *widget;
+ 
+-  if (!col_data)
+-    return; /* We are on a separator */
++  impl = GTK_FILE_CHOOSER_DEFAULT (chooser_embed);
+ 
+-  if (impl->shortcuts_activate_iter_handle)
++  if (impl->action == GTK_FILE_CHOOSER_ACTION_OPEN
++      || impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER)
+     {
+-      gtk_file_system_cancel_operation (impl->shortcuts_activate_iter_handle);
+-      impl->shortcuts_activate_iter_handle = NULL;
++	widget = impl->browse_files_tree_view;
+     }
+-
+-  if (is_volume)
++  else if (impl->action == GTK_FILE_CHOOSER_ACTION_SAVE
++	   || impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER)
+     {
+-      GtkFileSystemVolume *volume;
+-
+-      volume = col_data;
+-
+-      shortcuts_activate_volume (impl, volume);
++      widget = impl->location_entry;
+     }
+   else
+     {
+-      struct ShortcutsActivateData *data;
+-
+-      data = g_new0 (struct ShortcutsActivateData, 1);
+-      data->impl = g_object_ref (impl);
+-      data->path = gtk_file_path_copy (col_data);
+-
+-      impl->shortcuts_activate_iter_handle =
+-        gtk_file_system_get_info (impl->file_system, data->path,
+-				  GTK_FILE_INFO_IS_FOLDER,
+-				  shortcuts_activate_get_info_cb, data);
++      g_assert_not_reached ();
++      widget = NULL;
+     }
++
++  g_assert (widget != NULL);
++  gtk_widget_grab_focus (widget);
+ }
+ 
+-/* Callback used when a row in the shortcuts list is activated */
+ static void
+-shortcuts_row_activated_cb (GtkTreeView           *tree_view,
+-			    GtkTreePath           *path,
+-			    GtkTreeViewColumn     *column,
+-			    GtkFileChooserDefault *impl)
++set_current_filter (GtkFileChooserDefault *impl,
++		    GtkFileFilter         *filter)
+ {
+-  GtkTreeIter iter;
+-  GtkTreeIter child_iter;
+-
+-  if (!gtk_tree_model_get_iter (impl->shortcuts_filter_model, &iter, path))
+-    return;
+-
+-  gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER (impl->shortcuts_filter_model),
+-						    &child_iter,
+-						    &iter);
+-  shortcuts_activate_iter (impl, &child_iter);
++  if (impl->current_filter != filter)
++    {
++      int filter_index;
+ 
+-  gtk_widget_grab_focus (impl->browse_files_tree_view);
+-}
++      /* NULL filters are allowed to reset to non-filtered status
++       */
++      filter_index = g_slist_index (impl->filters, filter);
++      if (impl->filters && filter && filter_index < 0)
++	return;
+ 
+-/* Handler for GtkWidget::key-press-event on the shortcuts list */
+-static gboolean
+-shortcuts_key_press_event_cb (GtkWidget             *widget,
+-			      GdkEventKey           *event,
+-			      GtkFileChooserDefault *impl)
+-{
+-  guint modifiers;
++      if (impl->current_filter)
++	g_object_unref (impl->current_filter);
++      impl->current_filter = filter;
++      if (impl->current_filter)
++	{
++	  g_object_ref_sink (impl->current_filter);
++	}
+ 
+-  modifiers = gtk_accelerator_get_default_mod_mask ();
++      if (impl->filters)
++	gtk_combo_box_set_active (GTK_COMBO_BOX (impl->filter_combo),
++				  filter_index);
+ 
+-  if ((event->keyval == GDK_BackSpace
+-      || event->keyval == GDK_Delete
+-      || event->keyval == GDK_KP_Delete)
+-      && (event->state & modifiers) == 0)
+-    {
+-      remove_selected_bookmarks (impl);
+-      return TRUE;
+-    }
++      if (impl->browse_files_model)
++	install_list_model_filter (impl);
+ 
+-  if ((event->keyval == GDK_F2)
+-      && (event->state & modifiers) == 0)
+-    {
+-      rename_selected_bookmark (impl);
+-      return TRUE;
++      g_object_notify (G_OBJECT (impl), "filter");
+     }
+-
+-  return FALSE;
+ }
+ 
+-static gboolean
+-shortcuts_select_func  (GtkTreeSelection  *selection,
+-			GtkTreeModel      *model,
+-			GtkTreePath       *path,
+-			gboolean           path_currently_selected,
+-			gpointer           data)
++static void
++filter_combo_changed (GtkComboBox           *combo_box,
++		      GtkFileChooserDefault *impl)
+ {
+-  GtkFileChooserDefault *impl = data;
++  gint new_index = gtk_combo_box_get_active (combo_box);
++  GtkFileFilter *new_filter = g_slist_nth_data (impl->filters, new_index);
+ 
+-  return (*gtk_tree_path_get_indices (path) != shortcuts_get_index (impl, SHORTCUTS_BOOKMARKS_SEPARATOR));
++  set_current_filter (impl, new_filter);
+ }
+ 
+ static gboolean
+@@ -8373,8 +4515,6 @@
+ 
+   if (impl->location_entry)
+     update_chooser_entry (impl);
+-  check_preview_change (impl);
+-  bookmarks_check_add_sensitivity (impl);
+ 
+   g_signal_emit_by_name (impl, "selection-changed", 0);
+ }
+@@ -8401,7 +4541,8 @@
+       const GtkFilePath *file_path;
+ 
+       file_path = _gtk_file_system_model_get_path (impl->browse_files_model, &child_iter);
+-      change_folder_and_display_error (impl, file_path, FALSE);
++
++      change_folder_and_display_error (impl, file_path);
+ 
+       return;
+     }
+@@ -8411,27 +4552,6 @@
+     g_signal_emit_by_name (impl, "file-activated");
+ }
+ 
+-static void
+-path_bar_clicked (GtkPathBar            *path_bar,
+-		  GtkFilePath           *file_path,
+-		  GtkFilePath		*child_path,
+-		  gboolean               child_is_hidden,
+-		  GtkFileChooserDefault *impl)
+-{
+-  if (child_path)
+-    pending_select_paths_add (impl, child_path);
+-
+-  if (!change_folder_and_display_error (impl, file_path, FALSE))
+-    return;
+-
+-  /* Say we have "/foo/bar/[.baz]" and the user clicks on "bar".  We should then
+-   * show hidden files so that ".baz" appears in the file list, as it will still
+-   * be shown in the path bar: "/foo/[bar]/.baz"
+-   */
+-  if (child_is_hidden)
+-    g_object_set (impl, "show-hidden", TRUE, NULL);
+-}
+-
+ static const GtkFileInfo *
+ get_list_file_info (GtkFileChooserDefault *impl,
+ 		    GtkTreeIter           *iter)
+@@ -8659,210 +4779,73 @@
+ 			NULL);
+ }
+ 
+-static void
+-location_set_user_text (GtkFileChooserDefault *impl,
+-			const gchar           *path)
+-{
+-  _gtk_file_chooser_entry_set_file_part (GTK_FILE_CHOOSER_ENTRY (impl->location_entry), path);
+-  gtk_editable_set_position (GTK_EDITABLE (impl->location_entry), -1);
+-}
+-
+-static void
+-location_popup_handler (GtkFileChooserDefault *impl,
+-			const gchar           *path)
+-{
+-  if (impl->action == GTK_FILE_CHOOSER_ACTION_OPEN
+-      || impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER)
+-    {
+-      LocationMode new_mode;
+-
+-      if (path != NULL)
+-	{
+-	  /* since the user typed something, we unconditionally want to turn on the entry */
+-	  new_mode = LOCATION_MODE_FILENAME_ENTRY;
+-	}
+-      else if (impl->location_mode == LOCATION_MODE_PATH_BAR)
+-	new_mode = LOCATION_MODE_FILENAME_ENTRY;
+-      else if (impl->location_mode == LOCATION_MODE_FILENAME_ENTRY)
+-	new_mode = LOCATION_MODE_PATH_BAR;
+-      else
+-	{
+-	  g_assert_not_reached ();
+-	  return;
+-	}
+-
+-      location_mode_set (impl, new_mode, TRUE);
+-      if (new_mode == LOCATION_MODE_FILENAME_ENTRY)
+-	{
+-	  if (path != NULL)
+-	    location_set_user_text (impl, path);
+-	  else
+-	    {
+-	      location_entry_set_initial_text (impl);
+-	      gtk_editable_select_region (GTK_EDITABLE (impl->location_entry), 0, -1);
+-	    }
+-	}
+-    }
+-  else if (impl->action == GTK_FILE_CHOOSER_ACTION_SAVE
+-	   || impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER)
+-    {
+-      gtk_widget_grab_focus (impl->location_entry);
+-      if (path != NULL)
+-	location_set_user_text (impl, path);
+-    }
+-  else
+-    g_assert_not_reached ();
+-}
+-
+ /* Handler for the "up-folder" keybinding signal */
+ static void
+ up_folder_handler (GtkFileChooserDefault *impl)
+ {
+-  _gtk_path_bar_up (GTK_PATH_BAR (impl->browse_path_bar));
++  GtkFilePath * parent;
++  pending_select_paths_add (impl, impl->current_folder);
++
++  if (gtk_file_system_get_parent (impl->file_system, impl->current_folder,
++				  &parent, NULL) && parent)
++  {
++    impl->path_history = g_slist_prepend (impl->path_history,
++				gtk_file_path_copy (impl->current_folder));
++
++    change_folder_and_display_error (impl, parent);
++    gtk_file_path_free (parent);
++  }
+ }
+ 
+ /* Handler for the "down-folder" keybinding signal */
+ static void
+ down_folder_handler (GtkFileChooserDefault *impl)
+ {
+-  _gtk_path_bar_down (GTK_PATH_BAR (impl->browse_path_bar));
+-}
+-
+-/* Switches to the shortcut in the specified index */
+-static void
+-switch_to_shortcut (GtkFileChooserDefault *impl,
+-		    int pos)
+-{
+-  GtkTreeIter iter;
+-
+-  if (!gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (impl->shortcuts_model), &iter, NULL, pos))
+-    g_assert_not_reached ();
+-
+-  shortcuts_activate_iter (impl, &iter);
++  if (impl->path_history)
++  {
++    GtkFilePath * path = impl->path_history->data;
++
++    change_folder_and_display_error (impl, path);
++    impl->path_history = g_slist_remove (impl->path_history, path);
++    gtk_file_path_free (path);
++  }
+ }
+ 
+ /* Handler for the "home-folder" keybinding signal */
+ static void
+ home_folder_handler (GtkFileChooserDefault *impl)
+ {
+-  if (impl->has_home)
+-    switch_to_shortcut (impl, shortcuts_get_index (impl, SHORTCUTS_HOME));
+-}
+-
+-/* Handler for the "desktop-folder" keybinding signal */
+-static void
+-desktop_folder_handler (GtkFileChooserDefault *impl)
+-{
+-  if (impl->has_desktop)
+-    switch_to_shortcut (impl, shortcuts_get_index (impl, SHORTCUTS_DESKTOP));
+-}
+-
+-static void
+-quick_bookmark_handler (GtkFileChooserDefault *impl,
+-			gint bookmark_index)
+-{
+-  int bookmark_pos;
+-  GtkTreePath *path;
+-
+-  if (bookmark_index < 0 || bookmark_index >= impl->num_bookmarks)
+-    return;
+-
+-  bookmark_pos = shortcuts_get_index (impl, SHORTCUTS_BOOKMARKS) + bookmark_index;
+-
+-  path = gtk_tree_path_new_from_indices (bookmark_pos, -1);
+-  gtk_tree_view_scroll_to_cell (GTK_TREE_VIEW (impl->browse_shortcuts_tree_view),
+-				path, NULL,
+-				FALSE, 0.0, 0.0);
+-  gtk_tree_path_free (path);
+-
+-  switch_to_shortcut (impl, bookmark_pos);
+ }
+ 
+ static void
+ show_hidden_handler (GtkFileChooserDefault *impl)
+ {
+-  g_object_set (impl,
+-		"show-hidden", !impl->show_hidden,
+-		NULL);
+-}
+-
+-
+-/* Drag and drop interfaces */
+-
+-static void
+-_shortcuts_model_filter_class_init (ShortcutsModelFilterClass *class)
+-{
+ }
+ 
+-static void
+-_shortcuts_model_filter_init (ShortcutsModelFilter *model)
++static GtkFilePath *
++gtk_file_chooser_default_get_preview_path (GtkFileChooser *chooser)
+ {
+-  model->impl = NULL;
++    return NULL;
+ }
+ 
+-/* GtkTreeDragSource::row_draggable implementation for the shortcuts filter model */
+ static gboolean
+-shortcuts_model_filter_row_draggable (GtkTreeDragSource *drag_source,
+-				      GtkTreePath       *path)
++gtk_file_chooser_default_add_shortcut_folder (GtkFileChooser     *chooser,
++					      const GtkFilePath  *path,
++					      GError            **error)
+ {
+-  ShortcutsModelFilter *model;
+-  int pos;
+-  int bookmarks_pos;
+-
+-  model = SHORTCUTS_MODEL_FILTER (drag_source);
+-
+-  pos = *gtk_tree_path_get_indices (path);
+-  bookmarks_pos = shortcuts_get_index (model->impl, SHORTCUTS_BOOKMARKS);
+-
+-  return (pos >= bookmarks_pos && pos < bookmarks_pos + model->impl->num_bookmarks);
++    return FALSE;
+ }
+ 
+-/* GtkTreeDragSource::drag_data_get implementation for the shortcuts filter model */
+ static gboolean
+-shortcuts_model_filter_drag_data_get (GtkTreeDragSource *drag_source,
+-				      GtkTreePath       *path,
+-				      GtkSelectionData  *selection_data)
+-{
+-  ShortcutsModelFilter *model;
+-
+-  model = SHORTCUTS_MODEL_FILTER (drag_source);
+-
+-  /* FIXME */
+-
+-  return FALSE;
+-}
+-
+-/* Fill the GtkTreeDragSourceIface vtable */
+-static void
+-shortcuts_model_filter_drag_source_iface_init (GtkTreeDragSourceIface *iface)
++gtk_file_chooser_default_remove_shortcut_folder (GtkFileChooser     *chooser,
++						 const GtkFilePath  *path,
++						 GError            **error)
+ {
+-  iface->row_draggable = shortcuts_model_filter_row_draggable;
+-  iface->drag_data_get = shortcuts_model_filter_drag_data_get;
++    return TRUE;
+ }
+ 
+-#if 0
+-/* Fill the GtkTreeDragDestIface vtable */
+-static void
+-shortcuts_model_filter_drag_dest_iface_init (GtkTreeDragDestIface *iface)
++static GSList *
++gtk_file_chooser_default_list_shortcut_folders  (GtkFileChooser *chooser)
+ {
+-  iface->drag_data_received = shortcuts_model_filter_drag_data_received;
+-  iface->row_drop_possible = shortcuts_model_filter_row_drop_possible;
+-}
+-#endif
+-
+-static GtkTreeModel *
+-shortcuts_model_filter_new (GtkFileChooserDefault *impl,
+-			    GtkTreeModel          *child_model,
+-			    GtkTreePath           *root)
+-{
+-  ShortcutsModelFilter *model;
+-
+-  model = g_object_new (SHORTCUTS_MODEL_FILTER_TYPE,
+-			"child-model", child_model,
+-			"virtual-root", root,
+-			NULL);
+-
+-  model->impl = impl;
+-
+-  return GTK_TREE_MODEL (model);
++    return NULL;
+ }
+Index: gtk+-2.10.14/gtk/gtkfilechooserprivate.h
+===================================================================
+--- gtk+-2.10.14.orig/gtk/gtkfilechooserprivate.h	2007-07-16 20:44:17.000000000 +0100
++++ gtk+-2.10.14/gtk/gtkfilechooserprivate.h	2007-08-29 18:02:50.000000000 +0100
+@@ -153,36 +153,19 @@
+ 
+   /* Save mode widgets */
+   GtkWidget *save_widgets;
+-
+-  GtkWidget *save_folder_label;
+-  GtkWidget *save_folder_combo;
+-  GtkWidget *save_expander;
++  GtkWidget *save_file_name_entry;
+ 
+   /* The file browsing widgets */
+   GtkWidget *browse_widgets;
+-  GtkWidget *browse_shortcuts_tree_view;
+-  GtkWidget *browse_shortcuts_add_button;
+-  GtkWidget *browse_shortcuts_remove_button;
+-  GtkWidget *browse_shortcuts_popup_menu;
+-  GtkWidget *browse_shortcuts_popup_menu_remove_item;
+-  GtkWidget *browse_shortcuts_popup_menu_rename_item;
+   GtkWidget *browse_files_tree_view;
+-  GtkWidget *browse_files_popup_menu;
+-  GtkWidget *browse_files_popup_menu_add_shortcut_item;
+-  GtkWidget *browse_files_popup_menu_hidden_files_item;
+   GtkWidget *browse_new_folder_button;
+-  GtkWidget *browse_path_bar;
++  GtkWidget *bar;
++  GtkWidget *up_button;
+ 
+   GtkFileSystemModel *browse_files_model;
+-  char *browse_files_last_selected_name;
++  char *browse_files_last_selected_name; /* ??? */
+ 
+-  GtkWidget *filter_combo_hbox;
+   GtkWidget *filter_combo;
+-  GtkWidget *preview_box;
+-  GtkWidget *preview_label;
+-  GtkWidget *preview_widget;
+-  GtkWidget *extra_align;
+-  GtkWidget *extra_widget;
+ 
+   GtkWidget *location_button;
+   GtkWidget *location_entry_box;
+@@ -198,7 +181,6 @@
+   /* Handles */
+   GSList *loading_shortcuts;
+   GSList *reload_icon_handles;
+-  GtkFileSystemHandle *file_list_drag_data_received_handle;
+   GtkFileSystemHandle *update_current_folder_handle;
+   GtkFileSystemHandle *show_and_select_paths_handle;
+   GtkFileSystemHandle *should_respond_get_info_handle;
+@@ -212,29 +194,24 @@
+   guint load_timeout_id;
+ 
+   GSList *pending_select_paths;
++  GSList *path_history;
+ 
+   GtkFileFilter *current_filter;
+   GSList *filters;
+ 
+   GtkTooltips *tooltips;
+ 
+-  gboolean has_home;
+-  gboolean has_desktop;
+-
+   int num_volumes;
+-  int num_shortcuts;
+-  int num_bookmarks;
+ 
+   gulong volumes_changed_id;
+-  gulong bookmarks_changed_id;
+ 
+   GtkFilePath *current_volume_path;
+   GtkFilePath *current_folder;
+-  GtkFilePath *preview_path;
+-  char *preview_display_name;
+ 
+   GtkTreeViewColumn *list_name_column;
+   GtkCellRenderer *list_name_renderer;
++  guint32          list_press_time;
++  GtkTreePath     *list_press_path;
+ 
+   GSource *edited_idle;
+   char *edited_new_text;
+@@ -245,10 +222,7 @@
+   gulong toplevel_set_focus_id;
+   GtkWidget *toplevel_last_focus_widget;
+ 
+-#if 0
+-  GdkDragContext *shortcuts_drag_context;
+-  GSource *shortcuts_drag_outside_idle;
+-#endif
++  gchar * root_folder;
+ 
+   gint default_width;
+   gint default_height;
+@@ -256,19 +230,13 @@
+   /* Flags */
+ 
+   guint local_only : 1;
+-  guint preview_widget_active : 1;
+-  guint use_preview_label : 1;
+   guint select_multiple : 1;
+   guint show_hidden : 1;
++  guint show_create_folder : 1;
+   guint do_overwrite_confirmation : 1;
+   guint list_sort_ascending : 1;
+   guint changing_folder : 1;
+-  guint shortcuts_current_folder_active : 1;
+   guint expand_folders : 1;
+-
+-#if 0
+-  guint shortcuts_drag_outside : 1;
+-#endif
+ };
+ 
+ 
+Index: gtk+-2.10.14/tests/autotestfilechooser.c
+===================================================================
+--- gtk+-2.10.14.orig/tests/autotestfilechooser.c	2007-07-16 20:45:12.000000000 +0100
++++ gtk+-2.10.14/tests/autotestfilechooser.c	2007-08-28 15:19:31.000000000 +0100
+@@ -452,9 +452,6 @@
+ 			  && (impl->location_mode == LOCATION_MODE_PATH_BAR
+ 			      ? impl->location_entry == NULL
+ 			      : impl->location_entry != NULL)
+-			  && impl->save_folder_label == NULL
+-			  && impl->save_folder_combo == NULL
+-			  && impl->save_expander == NULL
+ 			  && GTK_IS_CONTAINER (impl->browse_widgets) && GTK_WIDGET_DRAWABLE (impl->browse_widgets));
+     }
+   else if (has_action (save_actions, G_N_ELEMENTS (save_actions), impl->action))
+@@ -465,9 +462,6 @@
+        */
+       passed = passed && (GTK_IS_CONTAINER (impl->save_widgets) && GTK_WIDGET_DRAWABLE (impl->save_widgets)
+ 			  && impl->location_entry != NULL && GTK_WIDGET_DRAWABLE (impl->location_entry)
+-			  && GTK_IS_LABEL (impl->save_folder_label) && GTK_WIDGET_DRAWABLE (impl->save_folder_label)
+-			  && GTK_IS_COMBO_BOX (impl->save_folder_combo) && GTK_WIDGET_DRAWABLE (impl->save_folder_combo)
+-			  && GTK_IS_EXPANDER (impl->save_expander) && GTK_WIDGET_DRAWABLE (impl->save_expander)
+ 			  && GTK_IS_CONTAINER (impl->browse_widgets));
+ 
+       /* FIXME: we are in a SAVE mode; test the visibility and sensitivity of
+@@ -968,11 +962,6 @@
+   gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), base_dir);
+   sleep_in_main_loop (500);
+ 
+-  g_signal_emit_by_name (impl->browse_path_bar, "path-clicked",
+-			 (GtkFilePath *) cwd_path,
+-			 (GtkFilePath *) base_dir_path,
+-			 FALSE);
+-  sleep_in_main_loop (500);
+   passed = passed && (gtk_file_chooser_get_filter (GTK_FILE_CHOOSER (dialog)) == txt_filter);
+ 
+   log_test (passed, "test_folder_switch_and_filters(): filter after changing folder");
diff --git a/meta/packages/gtk+/gtk+-2.10.14/filechooser-respect-style.patch b/meta/packages/gtk+/gtk+-2.10.14/filechooser-respect-style.patch
new file mode 100644
index 000000000..0de8e02dc
--- /dev/null
+++ b/meta/packages/gtk+/gtk+-2.10.14/filechooser-respect-style.patch
@@ -0,0 +1,77 @@
+Index: gtk+-2.10.14/gtk/gtkfilechooserdialog.c
+===================================================================
+--- gtk+-2.10.14.orig/gtk/gtkfilechooserdialog.c	2007-08-29 18:03:04.000000000 +0100
++++ gtk+-2.10.14/gtk/gtkfilechooserdialog.c	2007-08-29 18:04:27.000000000 +0100
+@@ -50,8 +50,6 @@
+ 
+ static void     gtk_file_chooser_dialog_map          (GtkWidget             *widget);
+ static void     gtk_file_chooser_dialog_unmap        (GtkWidget             *widget);
+-static void     gtk_file_chooser_dialog_style_set    (GtkWidget             *widget,
+-						      GtkStyle              *previous_style);
+ 
+ static void response_cb (GtkDialog *dialog,
+ 			 gint       response_id);
+@@ -73,7 +71,6 @@
+ 
+   widget_class->map       = gtk_file_chooser_dialog_map;
+   widget_class->unmap     = gtk_file_chooser_dialog_unmap;
+-  widget_class->style_set = gtk_file_chooser_dialog_style_set;
+ 
+   _gtk_file_chooser_install_properties (gobject_class);
+ 
+@@ -86,10 +83,16 @@
+   GtkFileChooserDialogPrivate *priv = G_TYPE_INSTANCE_GET_PRIVATE (dialog,
+ 								   GTK_TYPE_FILE_CHOOSER_DIALOG,
+ 								   GtkFileChooserDialogPrivate);
++
++  GtkDialog *fc_dialog = GTK_DIALOG (dialog);
++
+   dialog->priv = priv;
+   dialog->priv->response_requested = FALSE;
+ 
+-  gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
++  gtk_dialog_set_has_separator (fc_dialog, FALSE);
++  gtk_container_set_border_width (GTK_CONTAINER (fc_dialog), 5);
++  gtk_box_set_spacing (GTK_BOX (fc_dialog->vbox), 2); /* 2 * 5 + 2 = 12 */
++  gtk_container_set_border_width (GTK_CONTAINER (fc_dialog->action_area), 5);
+ 
+   /* We do a signal connection here rather than overriding the method in
+    * class_init because GtkDialog::response is a RUN_LAST signal.  We want *our*
+@@ -285,6 +288,7 @@
+   g_signal_connect (priv->widget, "response-requested",
+ 		    G_CALLBACK (file_chooser_widget_response_requested), object);
+ 
++  gtk_container_set_border_width (GTK_CONTAINER (priv->widget), 5);
+   gtk_box_pack_start (GTK_BOX (GTK_DIALOG (object)->vbox), priv->widget, TRUE, TRUE, 0);
+ 
+   gtk_widget_show (priv->widget);
+@@ -414,29 +418,6 @@
+   gtk_widget_unmap (priv->widget);
+ }
+ 
+-static void
+-gtk_file_chooser_dialog_style_set (GtkWidget *widget,
+-				   GtkStyle  *previous_style)
+-{
+-  GtkDialog *dialog;
+-
+-  if (GTK_WIDGET_CLASS (gtk_file_chooser_dialog_parent_class)->style_set)
+-    GTK_WIDGET_CLASS (gtk_file_chooser_dialog_parent_class)->style_set (widget, previous_style);
+-
+-  dialog = GTK_DIALOG (widget);
+-
+-  /* Override the style properties with HIG-compliant spacings.  Ugh.
+-   * http://developer.gnome.org/projects/gup/hig/1.0/layout.html#layout-dialogs
+-   * http://developer.gnome.org/projects/gup/hig/1.0/windows.html#alert-spacing
+-   */
+-
+-  gtk_container_set_border_width (GTK_CONTAINER (dialog->vbox), 12);
+-  gtk_box_set_spacing (GTK_BOX (dialog->vbox), 24);
+-
+-  gtk_container_set_border_width (GTK_CONTAINER (dialog->action_area), 0);
+-  gtk_box_set_spacing (GTK_BOX (dialog->action_area), 6);
+-}
+-
+ /* GtkDialog::response handler */
+ static void
+ response_cb (GtkDialog *dialog,
diff --git a/meta/packages/gtk+/gtk+-2.10.14/filechooser-utils.patch b/meta/packages/gtk+/gtk+-2.10.14/filechooser-utils.patch
new file mode 100644
index 000000000..c22ccba37
--- /dev/null
+++ b/meta/packages/gtk+/gtk+-2.10.14/filechooser-utils.patch
@@ -0,0 +1,32 @@
+Index: gtk+-2.10.14/gtk/gtkfilechooserutils.h
+===================================================================
+--- gtk+-2.10.14.orig/gtk/gtkfilechooserutils.h	2007-08-24 08:37:40.000000000 +0100
++++ gtk+-2.10.14/gtk/gtkfilechooserutils.h	2007-08-24 08:51:59.000000000 +0100
+@@ -41,7 +41,9 @@
+   GTK_FILE_CHOOSER_PROP_SELECT_MULTIPLE,
+   GTK_FILE_CHOOSER_PROP_SHOW_HIDDEN,
+   GTK_FILE_CHOOSER_PROP_DO_OVERWRITE_CONFIRMATION,
+-  GTK_FILE_CHOOSER_PROP_LAST                   = GTK_FILE_CHOOSER_PROP_DO_OVERWRITE_CONFIRMATION
++  GTK_FILE_CHOOSER_PROP_ROOT_FOLDER,
++  GTK_FILE_CHOOSER_PROP_SHOW_CREATE_FOLDER,
++  GTK_FILE_CHOOSER_PROP_LAST = GTK_FILE_CHOOSER_PROP_SHOW_CREATE_FOLDER
+ } GtkFileChooserProp;
+ 
+ void _gtk_file_chooser_install_properties (GObjectClass *klass);
+Index: gtk+-2.10.14/gtk/gtkfilechooserutils.c
+===================================================================
+--- gtk+-2.10.14.orig/gtk/gtkfilechooserutils.c	2007-08-24 08:37:28.000000000 +0100
++++ gtk+-2.10.14/gtk/gtkfilechooserutils.c	2007-08-24 08:51:47.000000000 +0100
+@@ -117,6 +117,12 @@
+   g_object_class_override_property (klass,
+ 				    GTK_FILE_CHOOSER_PROP_DO_OVERWRITE_CONFIRMATION,
+ 				    "do-overwrite-confirmation");
++  g_object_class_override_property (klass,
++				    GTK_FILE_CHOOSER_PROP_ROOT_FOLDER,
++				    "root-folder");
++  g_object_class_override_property (klass,
++				    GTK_FILE_CHOOSER_PROP_SHOW_CREATE_FOLDER,
++				    "show-create-folder");
+ }
+ 
+ /**
diff --git a/meta/packages/gtk+/gtk+-2.10.14/filechooser.patch b/meta/packages/gtk+/gtk+-2.10.14/filechooser.patch
new file mode 100644
index 000000000..bb0904986
--- /dev/null
+++ b/meta/packages/gtk+/gtk+-2.10.14/filechooser.patch
@@ -0,0 +1,25 @@
+Index: gtk+-2.10.14/gtk/gtkfilechooser.c
+===================================================================
+--- gtk+-2.10.14.orig/gtk/gtkfilechooser.c	2007-08-24 08:52:32.000000000 +0100
++++ gtk+-2.10.14/gtk/gtkfilechooser.c	2007-08-24 08:57:21.000000000 +0100
+@@ -272,6 +272,20 @@
+ 								"if necessary."),
+ 							     FALSE,
+ 							     GTK_PARAM_READWRITE));
++
++  g_object_interface_install_property (g_iface,
++				       g_param_spec_string ("root-folder",
++							    P_("File System Root"),
++							    P_("Root folder for the file system below which the user should not be able to switch"),
++							    NULL,
++							    G_PARAM_WRITABLE));
++
++  g_object_interface_install_property (g_iface,
++				       g_param_spec_boolean ("show-create-folder",
++							     P_("Show Create Folder button"),
++							     P_("Whether the Create Folder button should be visible on the bar"),
++							     TRUE,
++							     G_PARAM_READWRITE));
+ }
+ 
+ /**
diff --git a/meta/packages/gtk+/gtk+-2.10.14/filesystem-volumes.patch b/meta/packages/gtk+/gtk+-2.10.14/filesystem-volumes.patch
new file mode 100644
index 000000000..ec15ea3f5
--- /dev/null
+++ b/meta/packages/gtk+/gtk+-2.10.14/filesystem-volumes.patch
@@ -0,0 +1,198 @@
+Index: gtk+-2.10.14/gtk/gtkfilesystemunix.c
+===================================================================
+--- gtk+-2.10.14.orig/gtk/gtkfilesystemunix.c	2007-07-16 20:44:17.000000000 +0100
++++ gtk+-2.10.14/gtk/gtkfilesystemunix.c	2007-08-24 08:29:43.000000000 +0100
+@@ -38,6 +38,7 @@
+ #include <errno.h>
+ #include <string.h>
+ #include <sys/stat.h>
++#include <sys/statvfs.h>
+ #include <sys/types.h>
+ #include <pwd.h>
+ #ifdef HAVE_UNISTD_H
+@@ -475,7 +476,55 @@
+ static GSList *
+ gtk_file_system_unix_list_volumes (GtkFileSystem *file_system)
+ {
+-  return g_slist_append (NULL, get_root_volume ());
++  struct statvfs stv;
++  struct stat    st;
++  GSList * l = g_slist_append (NULL, get_root_volume ());
++
++  if (!statvfs ("/.", &stv))
++  {
++      fsblkcnt_t root_blocks = stv.f_blocks;
++      fsfilcnt_t root_files  = stv.f_files;
++	  
++      GDir * dir;
++      if ((dir = g_dir_open ("/media", 0, NULL)) != NULL)
++      {
++	  const gchar * name;
++	  while ((name = g_dir_read_name (dir)) != NULL)
++	  {
++	      gchar * abs_name;
++
++	      /* Skip ram disks */
++	      if (!strcmp (name, "ram"))
++		  continue;
++	      
++	      abs_name = g_strconcat ("/media/", name, NULL);
++		  
++	      if (!stat (abs_name, &st) && S_ISDIR (st.st_mode))
++	      {
++		  gchar * dot = g_strconcat (abs_name, "/.", NULL);
++		  if (!statvfs (dot, &stv) &&
++		      (stv.f_blocks != root_blocks ||
++		       stv.f_files  != root_files))
++		  {
++		      GtkFilePath * path = 
++			  gtk_file_system_filename_to_path (file_system,
++							    abs_name);
++
++		      if (path)
++			  l = g_slist_append (l, path);
++		  }
++
++		  g_free (dot);
++	      }
++
++	      g_free (abs_name);
++	  }
++
++	  g_dir_close (dir);
++      }
++  }
++
++  return l;
+ }
+ 
+ static GtkFileSystemVolume *
+@@ -489,13 +538,18 @@
+ remove_trailing_slash (const char *filename)
+ {
+   int len;
+-
++  
+   len = strlen (filename);
+ 
+-  if (len > 1 && filename[len - 1] == '/')
+-    return g_strndup (filename, len - 1);
+-  else
+-    return g_memdup (filename, len + 1);
++  if (len > 1)
++  {
++    gchar *c = g_utf8_prev_char (filename + len);
++
++    if (c && *c == '/')
++       return g_strndup (filename, len - 1);
++  }
++  
++  return g_memdup (filename, len + 1);
+ }
+ 
+ /* Delay callback dispatching
+@@ -1143,7 +1197,7 @@
+ gtk_file_system_unix_volume_get_base_path (GtkFileSystem        *file_system,
+ 					   GtkFileSystemVolume  *volume)
+ {
+-  return gtk_file_path_new_dup ("/");
++  return gtk_file_path_copy ((GtkFilePath*)volume);
+ }
+ 
+ static gboolean
+@@ -1177,7 +1231,32 @@
+ gtk_file_system_unix_volume_get_display_name (GtkFileSystem       *file_system,
+ 					      GtkFileSystemVolume *volume)
+ {
+-  return g_strdup (_("File System")); /* Same as Nautilus */
++  gchar * slash;
++  gchar * path;
++  gchar * c;
++  
++  g_return_val_if_fail (file_system && volume, NULL);
++  
++  path = gtk_file_system_path_to_filename (file_system, (GtkFilePath*) volume);
++
++  g_return_val_if_fail (path && *path, NULL);
++  
++  if (path[0] == '/' && !path[1])
++    return g_strdup (_("Filesystem")); /* Same as Nautilus */
++
++  /* Now the media volumes */
++  /* strip trailing / if any */
++  c = g_utf8_prev_char (path + strlen(path));
++  
++  if (*c == '/')
++    *c = 0;
++
++  slash = g_utf8_strrchr (path, -1, '/');
++
++  if (!slash)
++      return g_strdup (path);
++
++  return g_strdup (slash + 1);
+ }
+ 
+ static IconType
+@@ -1265,10 +1344,57 @@
+ 					   GtkFileSystemVolume  *volume,
+ 					   GError              **error)
+ {
+-  /* FIXME: maybe we just always want to return GTK_STOCK_HARDDISK here?
+-   * or the new tango icon name?
+-   */
+-  return g_strdup ("gnome-dev-harddisk");
++  gchar * c;
++  gchar * slash;
++  gchar * path = NULL;
++  GtkFilePath * fpath;
++  const gchar * id = NULL;
++  
++  g_return_val_if_fail (file_system && volume, NULL);
++
++  fpath = gtk_file_system_volume_get_base_path (file_system, volume);
++
++  if (!fpath)
++    goto out;
++  
++  path = gtk_file_system_path_to_filename (file_system, fpath);
++  gtk_file_path_free (fpath);
++
++  if (!path || !*path || (*path == '/' && !path[1]))
++    goto out;
++  
++  /* Now the media volumes */
++  /* strip trailing / if any */
++  c = g_utf8_prev_char (path + strlen(path));
++  
++  if (*c == '/')
++    *c = 0;
++
++  slash = g_utf8_strrchr (path, -1, '/');
++
++  if (slash)
++    {
++      slash++;
++
++      if (!strcmp (slash, "card"))
++	id = "gnome-dev-media-sdmmc";
++      else if (!strcmp (slash, "cf"))
++	id = "gnome-dev-media-cf";
++      else if (!strncmp (slash, "mmc", 3))
++	id = "gnome-dev-media-sdmmc";
++      else if (!strcmp (slash, "usbhdd"))
++	id = "gnome-dev-removable-usb";
++      else
++	id = "gnome-dev-removable";
++    }
++
++ out:
++  g_free (path);
++  
++  if (!id)
++    id = "gnome-fs-blockdev";
++
++  return g_strdup (id);
+ }
+ 
+ static char *
diff --git a/meta/packages/gtk+/gtk+_2.10.14.bb b/meta/packages/gtk+/gtk+_2.10.14.bb
index 014028617..6ef825349 100644
--- a/meta/packages/gtk+/gtk+_2.10.14.bb
+++ b/meta/packages/gtk+/gtk+_2.10.14.bb
@@ -1,7 +1,7 @@
 require gtk+.inc
 
 DEPENDS += "cairo"
-PR = "r12"
+PR = "r13"
 
 # disable per default - untested and not all patches included.
 DEFAULT_PREFERENCE = "-1" 
@@ -24,12 +24,18 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \
         file://toggle-font.diff;patch=1;pnum=0 \
         file://combo-arrow-size.patch;patch=1;pnum=0 \
         file://range-no-redraw.patch;patch=1;pnum=0 \
-        file://scrolled-placement.patch;patch=1;pnum=0"
+        file://scrolled-placement.patch;patch=1;pnum=0 \
 #           file://scroll-timings.patch;patch=1 \
 #           file://pangoxft2.10.6.diff;patch=1"
 #           file://gtk+-handhelds.patch;patch=1
 #	   file://single-click.patch;patch=1
 #	   file://spinbutton.patch;patch=1 \
+	   file://filesystem-volumes.patch;patch=1\
+	   file://filechooser-utils.patch;patch=1\
+	   file://filechooser.patch;patch=1\
+	   file://filechooser-default.patch;patch=1\
+	   file://filechooser-respect-style.patch;patch=1"
+
 
 EXTRA_OECONF = "--without-libtiff --disable-xkb --disable-glibtest --enable-display-migration"