]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtkfilechooserentry.c
Make the new GtkAction code work with PolicyKit-gnome's use of actions.
[~andy/gtk] / gtk / gtkfilechooserentry.c
index cbae54c121f906a609243df14c91fbf936caa9de..bb8b0511c4e7e48aea9a2af433672afb1744c7bc 100644 (file)
  * Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
 #include <string.h>
 
+#include "gtkalignment.h"
 #include "gtkcelllayout.h"
 #include "gtkcellrenderertext.h"
 #include "gtkentry.h"
 #include "gtkfilechooserentry.h"
+#include "gtklabel.h"
 #include "gtkmain.h"
+#include "gtkwindow.h"
 #include "gtkintl.h"
 #include "gtkalias.h"
 
@@ -40,6 +43,22 @@ struct _GtkFileChooserEntryClass
   GtkEntryClass parent_class;
 };
 
+/* Action to take when the current folder finishes loading (for explicit or automatic completion) */
+typedef enum {
+  LOAD_COMPLETE_NOTHING,
+  LOAD_COMPLETE_AUTOCOMPLETE,
+  LOAD_COMPLETE_EXPLICIT_COMPLETION
+} LoadCompleteAction;
+
+typedef enum
+{
+  REFRESH_OK,
+  REFRESH_INVALID_INPUT,
+  REFRESH_INCOMPLETE_HOSTNAME,
+  REFRESH_NONEXISTENT,
+  REFRESH_NOT_LOCAL
+} RefreshStatus;
+
 struct _GtkFileChooserEntry
 {
   GtkEntry parent_instance;
@@ -47,47 +66,76 @@ struct _GtkFileChooserEntry
   GtkFileChooserAction action;
 
   GtkFileSystem *file_system;
-  GtkFilePath *base_folder;
-  GtkFilePath *current_folder_path;
+  GFile *base_folder;
+  GFile *current_folder_file;
   gchar *file_part;
   gint file_part_pos;
-  GSource *check_completion_idle;
-  GSource *load_directory_idle;
 
-  GtkFileFolder *current_folder;
-  GtkFileSystemHandle *load_folder_handle;
+  /* Folder being loaded or already loaded */
+  GtkFolder *current_folder;
+  GCancellable *load_folder_cancellable;
+
+  LoadCompleteAction load_complete_action;
 
   GtkListStore *completion_store;
 
+  guint start_autocompletion_idle_id;
+
+  GtkWidget *completion_feedback_window;
+  GtkWidget *completion_feedback_label;
+  guint completion_feedback_timeout_id;
+
   guint has_completion : 1;
   guint in_change      : 1;
   guint eat_tabs       : 1;
+  guint local_only     : 1;
 };
 
 enum
 {
   DISPLAY_NAME_COLUMN,
-  PATH_COLUMN,
+  FILE_COLUMN,
   N_COLUMNS
 };
 
-static void gtk_file_chooser_entry_class_init (GtkFileChooserEntryClass *class);
-static void gtk_file_chooser_entry_iface_init (GtkEditableClass         *iface);
-static void gtk_file_chooser_entry_init       (GtkFileChooserEntry      *chooser_entry);
+#define COMPLETION_FEEDBACK_TIMEOUT_MS 2000
+
+static void     gtk_file_chooser_entry_iface_init     (GtkEditableClass *iface);
 
 static void     gtk_file_chooser_entry_finalize       (GObject          *object);
 static void     gtk_file_chooser_entry_dispose        (GObject          *object);
+static void     gtk_file_chooser_entry_grab_focus     (GtkWidget        *widget);
+static void     gtk_file_chooser_entry_unmap          (GtkWidget        *widget);
 static gboolean gtk_file_chooser_entry_focus          (GtkWidget        *widget,
                                                       GtkDirectionType  direction);
+static gboolean gtk_file_chooser_entry_focus_out_event (GtkWidget       *widget,
+                                                       GdkEventFocus   *event);
 static void     gtk_file_chooser_entry_activate       (GtkEntry         *entry);
-static void     gtk_file_chooser_entry_changed        (GtkEditable      *editable);
 static void     gtk_file_chooser_entry_do_insert_text (GtkEditable *editable,
                                                       const gchar *new_text,
                                                       gint         new_text_length,
                                                       gint        *position);
+static void     gtk_file_chooser_entry_do_delete_text (GtkEditable *editable,
+                                                      gint         start_pos,
+                                                      gint         end_pos);
+static void     gtk_file_chooser_entry_set_position (GtkEditable *editable,
+                                                    gint         position);
+static void     gtk_file_chooser_entry_set_selection_bounds (GtkEditable *editable,
+                                                            gint         start_pos,
+                                                            gint         end_pos);
+
+#ifdef G_OS_WIN32
+static gint     insert_text_callback      (GtkFileChooserEntry *widget,
+                                          const gchar         *new_text,
+                                          gint                 new_text_length,
+                                          gint                *position,
+                                          gpointer             user_data);
+static void     delete_text_callback      (GtkFileChooserEntry *widget,
+                                          gint                 start_pos,
+                                          gint                 end_pos,
+                                          gpointer             user_data);
+#endif
 
-static void     clear_completion_callback (GtkFileChooserEntry *chooser_entry,
-                                          GParamSpec          *pspec);
 static gboolean match_selected_callback   (GtkEntryCompletion  *completion,
                                           GtkTreeModel        *model,
                                           GtkTreeIter         *iter,
@@ -96,71 +144,46 @@ static gboolean completion_match_func     (GtkEntryCompletion  *comp,
                                           const char          *key,
                                           GtkTreeIter         *iter,
                                           gpointer             data);
-static void     files_added_cb            (GtkFileSystem       *file_system,
-                                          GSList              *added_uris,
-                                          GtkFileChooserEntry *chooser_entry);
-static void     files_deleted_cb          (GtkFileSystem       *file_system,
-                                          GSList              *deleted_uris,
-                                          GtkFileChooserEntry *chooser_entry);
-static char    *maybe_append_separator_to_path (GtkFileChooserEntry *chooser_entry,
-                                               GtkFilePath         *path,
-                                               gchar               *display_name);
+static char    *maybe_append_separator_to_file (GtkFileChooserEntry *chooser_entry,
+                                               GFile               *file,
+                                               gchar               *display_name,
+                                               gboolean            *appended);
+
+typedef enum {
+  REFRESH_UP_TO_CURSOR_POSITION,
+  REFRESH_WHOLE_TEXT
+} RefreshMode;
+
+static RefreshStatus refresh_current_folder_and_file_part (GtkFileChooserEntry *chooser_entry,
+                                                 RefreshMode refresh_mode);
+static void finished_loading_cb (GtkFolder *folder,
+                                gpointer   data);
+static void autocomplete (GtkFileChooserEntry *chooser_entry);
+static void install_start_autocompletion_idle (GtkFileChooserEntry *chooser_entry);
+static void remove_completion_feedback (GtkFileChooserEntry *chooser_entry);
+static void pop_up_completion_feedback (GtkFileChooserEntry *chooser_entry,
+                                       const gchar         *feedback);
 
-static GObjectClass *parent_class;
 static GtkEditableClass *parent_editable_iface;
 
-GType
-_gtk_file_chooser_entry_get_type (void)
-{
-  static GType file_chooser_entry_type = 0;
-
-  if (!file_chooser_entry_type)
-    {
-      static const GTypeInfo file_chooser_entry_info =
-      {
-       sizeof (GtkFileChooserEntryClass),
-       NULL,           /* base_init */
-       NULL,           /* base_finalize */
-       (GClassInitFunc) gtk_file_chooser_entry_class_init,
-       NULL,           /* class_finalize */
-       NULL,           /* class_data */
-       sizeof (GtkFileChooserEntry),
-       0,              /* n_preallocs */
-       (GInstanceInitFunc) gtk_file_chooser_entry_init,
-      };
-
-      static const GInterfaceInfo editable_info =
-      {
-       (GInterfaceInitFunc) gtk_file_chooser_entry_iface_init, /* interface_init */
-       NULL,                                                 /* interface_finalize */
-       NULL                                                  /* interface_data */
-      };
-
-
-      file_chooser_entry_type = g_type_register_static (GTK_TYPE_ENTRY, I_("GtkFileChooserEntry"),
-                                                       &file_chooser_entry_info, 0);
-      g_type_add_interface_static (file_chooser_entry_type,
-                                  GTK_TYPE_EDITABLE,
-                                  &editable_info);
-    }
-
-
-  return file_chooser_entry_type;
-}
+G_DEFINE_TYPE_WITH_CODE (GtkFileChooserEntry, _gtk_file_chooser_entry, GTK_TYPE_ENTRY,
+                        G_IMPLEMENT_INTERFACE (GTK_TYPE_EDITABLE,
+                                               gtk_file_chooser_entry_iface_init))
 
 static void
-gtk_file_chooser_entry_class_init (GtkFileChooserEntryClass *class)
+_gtk_file_chooser_entry_class_init (GtkFileChooserEntryClass *class)
 {
   GObjectClass *gobject_class = G_OBJECT_CLASS (class);
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
   GtkEntryClass *entry_class = GTK_ENTRY_CLASS (class);
 
-  parent_class = g_type_class_peek_parent (class);
-
   gobject_class->finalize = gtk_file_chooser_entry_finalize;
   gobject_class->dispose = gtk_file_chooser_entry_dispose;
 
+  widget_class->grab_focus = gtk_file_chooser_entry_grab_focus;
+  widget_class->unmap = gtk_file_chooser_entry_unmap;
   widget_class->focus = gtk_file_chooser_entry_focus;
+  widget_class->focus_out_event = gtk_file_chooser_entry_focus_out_event;
 
   entry_class->activate = gtk_file_chooser_entry_activate;
 }
@@ -171,15 +194,19 @@ gtk_file_chooser_entry_iface_init (GtkEditableClass *iface)
   parent_editable_iface = g_type_interface_peek_parent (iface);
 
   iface->do_insert_text = gtk_file_chooser_entry_do_insert_text;
-  iface->changed = gtk_file_chooser_entry_changed;
+  iface->do_delete_text = gtk_file_chooser_entry_do_delete_text;
+  iface->set_position = gtk_file_chooser_entry_set_position;
+  iface->set_selection_bounds = gtk_file_chooser_entry_set_selection_bounds;
 }
 
 static void
-gtk_file_chooser_entry_init (GtkFileChooserEntry *chooser_entry)
+_gtk_file_chooser_entry_init (GtkFileChooserEntry *chooser_entry)
 {
   GtkEntryCompletion *comp;
   GtkCellRenderer *cell;
 
+  chooser_entry->local_only = TRUE;
+
   g_object_set (chooser_entry, "truncate-multiline", TRUE, NULL);
 
   comp = gtk_entry_completion_new ();
@@ -203,10 +230,12 @@ gtk_file_chooser_entry_init (GtkFileChooserEntry *chooser_entry)
   gtk_entry_set_completion (GTK_ENTRY (chooser_entry), comp);
   g_object_unref (comp);
 
-  g_signal_connect (chooser_entry, "notify::cursor-position",
-                   G_CALLBACK (clear_completion_callback), NULL);
-  g_signal_connect (chooser_entry, "notify::selection-bound",
-                   G_CALLBACK (clear_completion_callback), NULL);
+#ifdef G_OS_WIN32
+  g_signal_connect (chooser_entry, "insert-text",
+                   G_CALLBACK (insert_text_callback), NULL);
+  g_signal_connect (chooser_entry, "delete-text",
+                   G_CALLBACK (delete_text_callback), NULL);
+#endif
 }
 
 static void
@@ -214,38 +243,67 @@ gtk_file_chooser_entry_finalize (GObject *object)
 {
   GtkFileChooserEntry *chooser_entry = GTK_FILE_CHOOSER_ENTRY (object);
 
-  gtk_file_path_free (chooser_entry->base_folder);
-  gtk_file_path_free (chooser_entry->current_folder_path);
+  if (chooser_entry->base_folder)
+    g_object_unref (chooser_entry->base_folder);
+
+  if (chooser_entry->current_folder)
+    g_object_unref (chooser_entry->current_folder);
+
+  if (chooser_entry->current_folder_file)
+    g_object_unref (chooser_entry->current_folder_file);
+
   g_free (chooser_entry->file_part);
 
-  parent_class->finalize (object);
+  G_OBJECT_CLASS (_gtk_file_chooser_entry_parent_class)->finalize (object);
 }
 
 static void
-gtk_file_chooser_entry_dispose (GObject *object)
+discard_current_folder (GtkFileChooserEntry *chooser_entry)
 {
-  GtkFileChooserEntry *chooser_entry = GTK_FILE_CHOOSER_ENTRY (object);
+  if (chooser_entry->current_folder)
+    {
+      g_signal_handlers_disconnect_by_func (chooser_entry->current_folder,
+                                           G_CALLBACK (finished_loading_cb), chooser_entry);
+      g_object_unref (chooser_entry->current_folder);
+      chooser_entry->current_folder = NULL;
+    }
+}
 
-  if (chooser_entry->completion_store)
+static void
+discard_loading_and_current_folder_file (GtkFileChooserEntry *chooser_entry)
+{
+  if (chooser_entry->load_folder_cancellable)
     {
-      g_object_unref (chooser_entry->completion_store);
-      chooser_entry->completion_store = NULL;
+      g_cancellable_cancel (chooser_entry->load_folder_cancellable);
+      chooser_entry->load_folder_cancellable = NULL;
     }
 
-  if (chooser_entry->load_folder_handle)
+  if (chooser_entry->current_folder_file)
     {
-      gtk_file_system_cancel_operation (chooser_entry->load_folder_handle);
-      chooser_entry->load_folder_handle = NULL;
+      g_object_unref (chooser_entry->current_folder_file);
+      chooser_entry->current_folder_file = NULL;
     }
+}
 
-  if (chooser_entry->current_folder)
+static void
+gtk_file_chooser_entry_dispose (GObject *object)
+{
+  GtkFileChooserEntry *chooser_entry = GTK_FILE_CHOOSER_ENTRY (object);
+
+  remove_completion_feedback (chooser_entry);
+  discard_current_folder (chooser_entry);
+  discard_loading_and_current_folder_file (chooser_entry);
+
+  if (chooser_entry->start_autocompletion_idle_id != 0)
     {
-      g_signal_handlers_disconnect_by_func (chooser_entry->current_folder,
-                                           G_CALLBACK (files_added_cb), chooser_entry);
-      g_signal_handlers_disconnect_by_func (chooser_entry->current_folder,
-                                           G_CALLBACK (files_deleted_cb), chooser_entry);
-      g_object_unref (chooser_entry->current_folder);
-      chooser_entry->current_folder = NULL;
+      g_source_remove (chooser_entry->start_autocompletion_idle_id);
+      chooser_entry->start_autocompletion_idle_id = 0;
+    }
+
+  if (chooser_entry->completion_store)
+    {
+      g_object_unref (chooser_entry->completion_store);
+      chooser_entry->completion_store = NULL;
     }
 
   if (chooser_entry->file_system)
@@ -254,7 +312,7 @@ gtk_file_chooser_entry_dispose (GObject *object)
       chooser_entry->file_system = NULL;
     }
 
-  parent_class->dispose (object);
+  G_OBJECT_CLASS (_gtk_file_chooser_entry_parent_class)->dispose (object);
 }
 
 /* Match functions for the GtkEntryCompletion */
@@ -265,23 +323,24 @@ match_selected_callback (GtkEntryCompletion  *completion,
                         GtkFileChooserEntry *chooser_entry)
 {
   char *display_name;
-  GtkFilePath *path;
+  GFile *file;
   gint pos;
+  gboolean dummy;
   
   gtk_tree_model_get (model, iter,
                      DISPLAY_NAME_COLUMN, &display_name,
-                     PATH_COLUMN, &path,
+                     FILE_COLUMN, &file,
                      -1);
 
-  if (!display_name || !path)
+  if (!display_name || !file)
     {
       /* these shouldn't complain if passed NULL */
-      gtk_file_path_free (path);
+      g_object_unref (file);
       g_free (display_name);
       return FALSE;
     }
 
-  display_name = maybe_append_separator_to_path (chooser_entry, path, display_name);
+  display_name = maybe_append_separator_to_file (chooser_entry, file, display_name, &dummy);
 
   pos = chooser_entry->file_part_pos;
 
@@ -294,7 +353,7 @@ match_selected_callback (GtkEntryCompletion  *completion,
                            &pos);
   gtk_editable_set_position (GTK_EDITABLE (chooser_entry), -1);
 
-  gtk_file_path_free (path);
+  g_object_unref (file);
   g_free (display_name);
 
   return TRUE;
@@ -372,141 +431,328 @@ completion_match_func (GtkEntryCompletion *comp,
   return result;
 }
 
+static void
+clear_completions (GtkFileChooserEntry *chooser_entry)
+{
+  chooser_entry->has_completion = FALSE;
+  chooser_entry->load_complete_action = LOAD_COMPLETE_NOTHING;
+
+  remove_completion_feedback (chooser_entry);
+}
+
+static void
+beep (GtkFileChooserEntry *chooser_entry)
+{
+  gtk_widget_error_bell (GTK_WIDGET (chooser_entry));
+}
+
 /* This function will append a directory separator to paths to
  * display_name iff the path associated with it is a directory.
- * maybe_append_separator_to_path will g_free the display_name and
+ * maybe_append_separator_to_file will g_free the display_name and
  * return a new one if needed.  Otherwise, it will return the old one.
  * You should be safe calling
  *
- * display_name = maybe_append_separator_to_path (entry, path, display_name);
+ * display_name = maybe_append_separator_to_file (entry, file, display_name, &appended);
  * ...
  * g_free (display_name);
  */
 static char *
-maybe_append_separator_to_path (GtkFileChooserEntry *chooser_entry,
-                               GtkFilePath         *path,
-                               gchar               *display_name)
+maybe_append_separator_to_file (GtkFileChooserEntry *chooser_entry,
+                               GFile               *file,
+                               gchar               *display_name,
+                               gboolean            *appended)
 {
-  if (path)
+  *appended = FALSE;
+
+  if (!g_str_has_suffix (display_name, G_DIR_SEPARATOR_S) && file)
     {
-      GtkFileInfo *info;
-           
-      info = gtk_file_folder_get_info (chooser_entry->current_folder,
-                                      path, NULL); /* NULL-GError */
+      GFileInfo *info;
+
+      info = _gtk_folder_get_info (chooser_entry->current_folder, file);
 
       if (info)
        {
-         if (gtk_file_info_get_is_folder (info))
+         if (_gtk_file_info_consider_as_directory (info))
            {
              gchar *tmp = display_name;
              display_name = g_strconcat (tmp, G_DIR_SEPARATOR_S, NULL);
+             *appended = TRUE;
              g_free (tmp);
            }
-         
-         gtk_file_info_free (info);
-       }
 
+         g_object_unref (info);
+       }
     }
 
   return display_name;
 }
 
+static char *
+trim_dir_separator_suffix (const char *str)
+{
+  int len;
+
+  len = strlen (str);
+  if (len > 0 && G_IS_DIR_SEPARATOR (str[len - 1]))
+    return g_strndup (str, len - 1);
+  else
+    return g_strdup (str);
+}
+
 /* Determines if the completion model has entries with a common prefix relative
  * to the current contents of the entry.  Also, if there's one and only one such
  * path, stores it in unique_path_ret.
  */
-static void
+static gboolean
 find_common_prefix (GtkFileChooserEntry *chooser_entry,
                    gchar               **common_prefix_ret,
-                   GtkFilePath         **unique_path_ret)
+                   GFile               **unique_file_ret,
+                   gboolean             *is_complete_not_unique_ret,
+                   gboolean             *prefix_expands_the_file_part_ret,
+                   GError              **error)
 {
+  GtkEditable *editable;
   GtkTreeIter iter;
+  gboolean parsed;
   gboolean valid;
+  char *text_up_to_cursor;
+  GFile *parsed_folder_file;
+  char *parsed_file_part;
 
   *common_prefix_ret = NULL;
-  *unique_path_ret = NULL;
+  *unique_file_ret = NULL;
+  *is_complete_not_unique_ret = FALSE;
+  *prefix_expands_the_file_part_ret = FALSE;
 
-  if (chooser_entry->completion_store == NULL)
-    return;
+  editable = GTK_EDITABLE (chooser_entry);
+
+  text_up_to_cursor = gtk_editable_get_chars (editable, 0, gtk_editable_get_position (editable));
+
+  parsed = _gtk_file_system_parse (chooser_entry->file_system,
+                                  chooser_entry->base_folder,
+                                  text_up_to_cursor,
+                                  &parsed_folder_file,
+                                  &parsed_file_part,
+                                  error);
+
+  g_free (text_up_to_cursor);
+
+  if (!parsed)
+    return FALSE;
+
+  g_assert (parsed_folder_file != NULL
+           && chooser_entry->current_folder != NULL
+           && g_file_equal (parsed_folder_file, chooser_entry->current_folder_file));
+
+  g_object_unref (parsed_folder_file);
+
+  /* First pass: find the common prefix */
 
   valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (chooser_entry->completion_store), &iter);
 
   while (valid)
     {
       gchar *display_name;
-      GtkFilePath *path;
+      GFile *file;
 
       gtk_tree_model_get (GTK_TREE_MODEL (chooser_entry->completion_store),
                          &iter,
                          DISPLAY_NAME_COLUMN, &display_name,
-                         PATH_COLUMN, &path,
+                         FILE_COLUMN, &file,
                          -1);
 
-      if (g_str_has_prefix (display_name, chooser_entry->file_part))
+      if (g_str_has_prefix (display_name, parsed_file_part))
        {
          if (!*common_prefix_ret)
            {
-             *common_prefix_ret = g_strdup (display_name);
-             *unique_path_ret = gtk_file_path_copy (path);
+             *common_prefix_ret = trim_dir_separator_suffix (display_name);
+             *unique_file_ret = g_object_ref (file);
            }
          else
            {
              gchar *p = *common_prefix_ret;
              const gchar *q = display_name;
-                 
+
              while (*p && *p == *q)
                {
                  p++;
                  q++;
                }
-                 
+
              *p = '\0';
 
-             gtk_file_path_free (*unique_path_ret);
-             *unique_path_ret = NULL;
+             if (*unique_file_ret)
+               {
+                 g_object_unref (*unique_file_ret);
+                 *unique_file_ret = NULL;
+               }
            }
        }
 
       g_free (display_name);
-      gtk_file_path_free (path);
+      g_object_unref (file);
       valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (chooser_entry->completion_store), &iter);
     }
+
+  /* Second pass: see if the prefix we found is a complete match */
+
+  if (*common_prefix_ret != NULL)
+    {
+      valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (chooser_entry->completion_store), &iter);
+
+      while (valid)
+       {
+         gchar *display_name;
+         int len;
+
+         gtk_tree_model_get (GTK_TREE_MODEL (chooser_entry->completion_store),
+                             &iter,
+                             DISPLAY_NAME_COLUMN, &display_name,
+                             -1);
+         len = strlen (display_name);
+         g_assert (len > 0);
+
+         if (G_IS_DIR_SEPARATOR (display_name[len - 1]))
+           len--;
+
+         if (*unique_file_ret == NULL && strncmp (*common_prefix_ret, display_name, len) == 0)
+           *is_complete_not_unique_ret = TRUE;
+
+         g_free (display_name);
+         valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (chooser_entry->completion_store), &iter);
+       }
+
+      /* Finally:  Did we generate a new completion, or was the user's input already completed as far as it could go? */
+
+      *prefix_expands_the_file_part_ret = g_utf8_strlen (*common_prefix_ret, -1) > g_utf8_strlen (parsed_file_part, -1);
+    }
+
+  g_free (parsed_file_part);
+
+  return TRUE;
+}
+
+static gboolean
+char_after_cursor_is_directory_separator (GtkFileChooserEntry *chooser_entry)
+{
+  int cursor_pos;
+  gboolean result;
+
+  result = FALSE;
+
+  cursor_pos = gtk_editable_get_position (GTK_EDITABLE (chooser_entry));
+  if (cursor_pos < GTK_ENTRY (chooser_entry)->text_length)
+    {
+      char *next_char_str;
+
+      next_char_str = gtk_editable_get_chars (GTK_EDITABLE (chooser_entry), cursor_pos, cursor_pos + 1);
+      if (G_IS_DIR_SEPARATOR (*next_char_str))
+       result = TRUE;
+
+      g_free (next_char_str);
+    }
+
+  return result;
 }
 
+typedef enum {
+  INVALID_INPUT,               /* what the user typed is bogus */
+  NO_MATCH,                    /* no matches based on what the user typed */
+  NOTHING_INSERTED_COMPLETE,   /* what the user typed is already completed as far as it will go */
+  NOTHING_INSERTED_UNIQUE,     /* what the user typed is already completed, and is a unique match */
+  COMPLETED,                   /* completion inserted (ambiguous suffix) */
+  COMPLETED_UNIQUE,            /* completion inserted, and it is a complete name and a unique match */
+  COMPLETE_BUT_NOT_UNIQUE      /* completion inserted, it is a complete name but not unique */
+} CommonPrefixResult;
+
 /* Finds a common prefix based on the contents of the entry and mandatorily appends it */
-static void
+static CommonPrefixResult
 append_common_prefix (GtkFileChooserEntry *chooser_entry,
-                     gboolean             highlight)
+                     gboolean             highlight,
+                     gboolean             show_errors)
 {
   gchar *common_prefix;
-  GtkFilePath *unique_path;
+  GFile *unique_file;
+  gboolean is_complete_not_unique;
+  gboolean prefix_expands_the_file_part;
+  GError *error;
+  CommonPrefixResult result;
+  gboolean have_result;
+
+  clear_completions (chooser_entry);
+
+  if (chooser_entry->completion_store == NULL)
+    return NO_MATCH;
 
-  find_common_prefix (chooser_entry, &common_prefix, &unique_path);
+  error = NULL;
+  if (!find_common_prefix (chooser_entry, &common_prefix, &unique_file, &is_complete_not_unique, &prefix_expands_the_file_part, &error))
+    {
+      /* If the user types an incomplete hostname ("http://foo" without a slash
+       * after that), it's not an error.  We just don't want to pop up a
+       * meaningless completion window in that state.
+       */
+      if (!g_error_matches (error, GTK_FILE_CHOOSER_ERROR, GTK_FILE_CHOOSER_ERROR_INCOMPLETE_HOSTNAME)
+         && show_errors)
+       {
+         beep (chooser_entry);
+         pop_up_completion_feedback (chooser_entry, _("Invalid path"));
+       }
+
+      g_error_free (error);
+
+      return INVALID_INPUT;
+    }
+
+  have_result = FALSE;
 
-  if (unique_path)
+  if (unique_file)
+    {
+      if (!char_after_cursor_is_directory_separator (chooser_entry))
+       {
+         gboolean appended;
+
+         common_prefix = maybe_append_separator_to_file (chooser_entry,
+                                                         unique_file,
+                                                         common_prefix,
+                                                         &appended);
+         if (appended)
+           prefix_expands_the_file_part = TRUE;
+       }
+
+      g_object_unref (unique_file);
+
+      if (prefix_expands_the_file_part)
+       result = COMPLETED_UNIQUE;
+      else
+       result = NOTHING_INSERTED_UNIQUE;
+
+      have_result = TRUE;
+    }
+  else
     {
-      common_prefix = maybe_append_separator_to_path (chooser_entry,
-                                                     unique_path,
-                                                     common_prefix);
-      gtk_file_path_free (unique_path);
+      if (is_complete_not_unique)
+       {
+         result = COMPLETE_BUT_NOT_UNIQUE;
+         have_result = TRUE;
+       }
     }
 
   if (common_prefix)
     {
-      gint file_part_len;
+      gint cursor_pos;
       gint common_prefix_len;
       gint pos;
 
-      file_part_len = g_utf8_strlen (chooser_entry->file_part, -1);
+      cursor_pos = gtk_editable_get_position (GTK_EDITABLE (chooser_entry));
       common_prefix_len = g_utf8_strlen (common_prefix, -1);
 
-      if (common_prefix_len > file_part_len)
-       {
-         pos = chooser_entry->file_part_pos;
+      pos = chooser_entry->file_part_pos;
 
+      if (prefix_expands_the_file_part)
+       {
          chooser_entry->in_change = TRUE;
          gtk_editable_delete_text (GTK_EDITABLE (chooser_entry),
-                                   pos, -1);
+                                   pos, cursor_pos);
          gtk_editable_insert_text (GTK_EDITABLE (chooser_entry),
                                    common_prefix, -1, 
                                    &pos);
@@ -515,225 +761,482 @@ append_common_prefix (GtkFileChooserEntry *chooser_entry,
          if (highlight)
            {
              gtk_editable_select_region (GTK_EDITABLE (chooser_entry),
-                                         chooser_entry->file_part_pos + file_part_len,
-                                         chooser_entry->file_part_pos + common_prefix_len);
+                                         cursor_pos,
+                                         pos); /* equivalent to cursor_pos + common_prefix_len); */
              chooser_entry->has_completion = TRUE;
            }
+         else
+           gtk_editable_set_position (GTK_EDITABLE (chooser_entry), pos);
+       }
+      else if (!have_result)
+       {
+         result = NOTHING_INSERTED_COMPLETE;
+         have_result = TRUE;
        }
 
       g_free (common_prefix);
+
+      if (have_result)
+       return result;
+      else
+       return COMPLETED;
+    }
+  else
+    {
+      if (have_result)
+       return result;
+      else
+       return NO_MATCH;
     }
 }
 
-static gboolean
-check_completion_callback (GtkFileChooserEntry *chooser_entry)
+static void
+gtk_file_chooser_entry_do_insert_text (GtkEditable *editable,
+                                      const gchar *new_text,
+                                      gint         new_text_length,
+                                      gint        *position)
 {
-  GDK_THREADS_ENTER ();
-
-  g_assert (chooser_entry->file_part);
-
-  chooser_entry->check_completion_idle = NULL;
+  GtkFileChooserEntry *chooser_entry = GTK_FILE_CHOOSER_ENTRY (editable);
+  gint old_text_len;
+  gint insert_pos;
 
-  if (strcmp (chooser_entry->file_part, "") == 0)
-    goto done;
+  old_text_len = GTK_ENTRY (chooser_entry)->text_length;
+  insert_pos = *position;
 
-  /* We only insert the common prefix without requiring the user to hit Tab in
-   * the "open" modes.  For "save" modes, the user must hit Tab to cause the prefix
-   * to be inserted.  That happens in gtk_file_chooser_entry_focus().
-   */
-  if (chooser_entry->action == GTK_FILE_CHOOSER_ACTION_OPEN
-      || chooser_entry->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER)
-    append_common_prefix (chooser_entry, TRUE);
+  parent_editable_iface->do_insert_text (editable, new_text, new_text_length, position);
 
- done:
+  if (chooser_entry->in_change)
+    return;
 
-  GDK_THREADS_LEAVE ();
+  remove_completion_feedback (chooser_entry);
 
-  return FALSE;
+  if ((chooser_entry->action == GTK_FILE_CHOOSER_ACTION_OPEN
+       || chooser_entry->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER)
+      && insert_pos == old_text_len)
+    install_start_autocompletion_idle (chooser_entry);
 }
 
 static void
-add_completion_idle (GtkFileChooserEntry *chooser_entry)
+clear_completions_if_not_in_change (GtkFileChooserEntry *chooser_entry)
 {
-  /* idle to update the selection based on the file list */
-  if (chooser_entry->check_completion_idle == NULL)
-    {
-      chooser_entry->check_completion_idle = g_idle_source_new ();
-      g_source_set_priority (chooser_entry->check_completion_idle, G_PRIORITY_HIGH);
-      g_source_set_closure (chooser_entry->check_completion_idle,
-                           g_cclosure_new_object (G_CALLBACK (check_completion_callback),
-                                                  G_OBJECT (chooser_entry)));
-      g_source_attach (chooser_entry->check_completion_idle, NULL);
-    }
-}
+  if (chooser_entry->in_change)
+    return;
 
+  clear_completions (chooser_entry);
+}
 
 static void
-update_current_folder_files (GtkFileChooserEntry *chooser_entry,
-                            GSList              *added_uris)
+gtk_file_chooser_entry_do_delete_text (GtkEditable *editable,
+                                      gint         start_pos,
+                                      gint         end_pos)
 {
-  GSList *tmp_list;
-
-  g_assert (chooser_entry->completion_store != NULL);
-
-  /* Bah.  Need to turn off sorting */
-  for (tmp_list = added_uris; tmp_list; tmp_list = tmp_list->next)
-    {
-      GtkFileInfo *info;
-      GtkFilePath *path;
-
-      path = tmp_list->data;
+  GtkFileChooserEntry *chooser_entry = GTK_FILE_CHOOSER_ENTRY (editable);
 
-      info = gtk_file_folder_get_info (chooser_entry->current_folder,
-                                      path,
-                                      NULL); /* NULL-GError */
-      if (info)
-       {
-         const gchar *display_name = gtk_file_info_get_display_name (info);
-         GtkTreeIter iter;
+  parent_editable_iface->do_delete_text (editable, start_pos, end_pos);
 
-         gtk_list_store_append (chooser_entry->completion_store, &iter);
-         gtk_list_store_set (chooser_entry->completion_store, &iter,
-                             DISPLAY_NAME_COLUMN, display_name,
-                             PATH_COLUMN, path,
-                             -1);
+  clear_completions_if_not_in_change (chooser_entry);
+}
 
-         gtk_file_info_free (info);
-       }
-    }
+static void
+gtk_file_chooser_entry_set_position (GtkEditable *editable,
+                                    gint         position)
+{
+  GtkFileChooserEntry *chooser_entry = GTK_FILE_CHOOSER_ENTRY (editable);
 
-  /* FIXME: we want to turn off sorting temporarily.  I suck... */
-  gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (chooser_entry->completion_store),
-                                       DISPLAY_NAME_COLUMN, GTK_SORT_ASCENDING);
+  parent_editable_iface->set_position (editable, position);
 
-  add_completion_idle (chooser_entry);
+  clear_completions_if_not_in_change (chooser_entry);
 }
 
 static void
-files_added_cb (GtkFileSystem       *file_system,
-               GSList              *added_uris,
-               GtkFileChooserEntry *chooser_entry)
+gtk_file_chooser_entry_set_selection_bounds (GtkEditable *editable,
+                                            gint         start_pos,
+                                            gint         end_pos)
 {
-  update_current_folder_files (chooser_entry, added_uris);
+  GtkFileChooserEntry *chooser_entry = GTK_FILE_CHOOSER_ENTRY (editable);
+
+  parent_editable_iface->set_selection_bounds (editable, start_pos, end_pos);
+
+  clear_completions_if_not_in_change (chooser_entry);
 }
 
 static void
-files_deleted_cb (GtkFileSystem       *file_system,
-                 GSList              *deleted_uris,
-                 GtkFileChooserEntry *chooser_entry)
+gtk_file_chooser_entry_grab_focus (GtkWidget *widget)
 {
-  /* FIXME: gravy... */
+  GTK_WIDGET_CLASS (_gtk_file_chooser_entry_parent_class)->grab_focus (widget);
+  _gtk_file_chooser_entry_select_filename (GTK_FILE_CHOOSER_ENTRY (widget));
 }
 
 static void
-load_directory_get_folder_callback (GtkFileSystemHandle *handle,
-                                   GtkFileFolder       *folder,
-                                   const GError        *error,
-                                   gpointer             data)
+gtk_file_chooser_entry_unmap (GtkWidget *widget)
 {
-  gboolean cancelled = handle->cancelled;
-  GtkFileChooserEntry *chooser_entry = data;
+  GtkFileChooserEntry *chooser_entry = GTK_FILE_CHOOSER_ENTRY (widget);
 
-  if (handle != chooser_entry->load_folder_handle)
-    goto out;
+  remove_completion_feedback (chooser_entry);
 
-  chooser_entry->load_folder_handle = NULL;
+  GTK_WIDGET_CLASS (_gtk_file_chooser_entry_parent_class)->unmap (widget);
+}
 
-  if (cancelled || error)
-    goto out;
+static gboolean
+completion_feedback_window_expose_event_cb (GtkWidget      *widget,
+                                           GdkEventExpose *event,
+                                           gpointer        data)
+{
+  /* Stolen from gtk_tooltip_paint_window() */
 
-  chooser_entry->current_folder = folder;
-  g_signal_connect (chooser_entry->current_folder, "files-added",
-                   G_CALLBACK (files_added_cb), chooser_entry);
-  g_signal_connect (chooser_entry->current_folder, "files-removed",
-                   G_CALLBACK (files_deleted_cb), chooser_entry);
-  
-  chooser_entry->completion_store = gtk_list_store_new (N_COLUMNS,
-                                                       G_TYPE_STRING,
-                                                       GTK_TYPE_FILE_PATH);
+  GtkFileChooserEntry *chooser_entry = GTK_FILE_CHOOSER_ENTRY (data);
 
-  gtk_entry_completion_set_model (gtk_entry_get_completion (GTK_ENTRY (chooser_entry)),
-                                 GTK_TREE_MODEL (chooser_entry->completion_store));
+  gtk_paint_flat_box (chooser_entry->completion_feedback_window->style,
+                     chooser_entry->completion_feedback_window->window,
+                     GTK_STATE_NORMAL,
+                     GTK_SHADOW_OUT,
+                     NULL,
+                     chooser_entry->completion_feedback_window,
+                     "tooltip",
+                     0, 0,
+                     chooser_entry->completion_feedback_window->allocation.width,
+                     chooser_entry->completion_feedback_window->allocation.height);
 
-out:
-  g_object_unref (chooser_entry);
-  g_object_unref (handle);
+  return FALSE;
 }
 
-static gboolean
-load_directory_callback (GtkFileChooserEntry *chooser_entry)
+static void
+set_invisible_mouse_cursor (GdkWindow *window)
 {
-  GSList *child_paths = NULL;
+  GdkDisplay *display;
+  GdkCursor *cursor;
 
-  GDK_THREADS_ENTER ();
+  display = gdk_drawable_get_display (window);
+  cursor = gdk_cursor_new_for_display (display, GDK_BLANK_CURSOR);
 
-  chooser_entry->load_directory_idle = NULL;
+  gdk_window_set_cursor (window, cursor);
 
-  /* guard against bogus settings*/
-  if (chooser_entry->current_folder_path == NULL ||
-      chooser_entry->file_system == NULL)
-    goto done;
+  gdk_cursor_unref (cursor);
+}
 
-  if (chooser_entry->current_folder != NULL)
-    {
-      g_warning ("idle activate multiple times without clearing the folder object first.");
-      goto done;
-    }
-  g_assert (chooser_entry->completion_store == NULL);
+static void
+completion_feedback_window_realize_cb (GtkWidget *widget,
+                                      gpointer data)
+{
+  /* We hide the mouse cursor inside the completion feedback window, since
+   * GtkEntry hides the cursor when the user types.  We don't want the cursor to
+   * come back if the completion feedback ends up where the mouse is.
+   */
+  set_invisible_mouse_cursor (widget->window);
+}
 
-  /* Load the folder */
-  if (chooser_entry->load_folder_handle)
-    gtk_file_system_cancel_operation (chooser_entry->load_folder_handle);
+static void
+create_completion_feedback_window (GtkFileChooserEntry *chooser_entry)
+{
+  /* Stolen from gtk_tooltip_init() */
+
+  GtkWidget *alignment;
+
+  chooser_entry->completion_feedback_window = gtk_window_new (GTK_WINDOW_POPUP);
+  gtk_window_set_type_hint (GTK_WINDOW (chooser_entry->completion_feedback_window),
+                           GDK_WINDOW_TYPE_HINT_TOOLTIP);
+  gtk_widget_set_app_paintable (chooser_entry->completion_feedback_window, TRUE);
+  gtk_window_set_resizable (GTK_WINDOW (chooser_entry->completion_feedback_window), FALSE);
+  gtk_widget_set_name (chooser_entry->completion_feedback_window, "gtk-tooltip");
+
+  alignment = gtk_alignment_new (0.5, 0.5, 1.0, 1.0);
+  gtk_alignment_set_padding (GTK_ALIGNMENT (alignment),
+                            chooser_entry->completion_feedback_window->style->ythickness,
+                            chooser_entry->completion_feedback_window->style->ythickness,
+                            chooser_entry->completion_feedback_window->style->xthickness,
+                            chooser_entry->completion_feedback_window->style->xthickness);
+  gtk_container_add (GTK_CONTAINER (chooser_entry->completion_feedback_window), alignment);
+  gtk_widget_show (alignment);
+
+  g_signal_connect (chooser_entry->completion_feedback_window, "expose-event",
+                   G_CALLBACK (completion_feedback_window_expose_event_cb), chooser_entry);
+  g_signal_connect (chooser_entry->completion_feedback_window, "realize",
+                   G_CALLBACK (completion_feedback_window_realize_cb), chooser_entry);
+  /* FIXME: connect to motion-notify-event, and *show* the cursor when the mouse moves */
+
+  chooser_entry->completion_feedback_label = gtk_label_new (NULL);
+  gtk_container_add (GTK_CONTAINER (alignment), chooser_entry->completion_feedback_label);
+  gtk_widget_show (chooser_entry->completion_feedback_label);
+}
 
-  chooser_entry->load_folder_handle =
-    gtk_file_system_get_folder (chooser_entry->file_system,
-                               chooser_entry->current_folder_path,
-                               GTK_FILE_INFO_DISPLAY_NAME | GTK_FILE_INFO_IS_FOLDER,
-                               load_directory_get_folder_callback,
-                               g_object_ref (chooser_entry));
+static gboolean
+completion_feedback_timeout_cb (gpointer data)
+{
+  GtkFileChooserEntry *chooser_entry = GTK_FILE_CHOOSER_ENTRY (data);
 
- done:
-  
-  GDK_THREADS_LEAVE ();
+  chooser_entry->completion_feedback_timeout_id = 0;
 
+  remove_completion_feedback (chooser_entry);
   return FALSE;
 }
 
 static void
-gtk_file_chooser_entry_do_insert_text (GtkEditable *editable,
-                                      const gchar *new_text,
-                                      gint         new_text_length,
-                                      gint        *position)
+install_completion_feedback_timer (GtkFileChooserEntry *chooser_entry)
 {
-  GtkFileChooserEntry *chooser_entry = GTK_FILE_CHOOSER_ENTRY (editable);
-
-  parent_editable_iface->do_insert_text (editable, new_text, new_text_length, position);
+  if (chooser_entry->completion_feedback_timeout_id != 0)
+    g_source_remove (chooser_entry->completion_feedback_timeout_id);
 
-  if (! chooser_entry->in_change)
-    add_completion_idle (GTK_FILE_CHOOSER_ENTRY (editable));
+  chooser_entry->completion_feedback_timeout_id = gdk_threads_add_timeout (COMPLETION_FEEDBACK_TIMEOUT_MS,
+                                                                          completion_feedback_timeout_cb,
+                                                                          chooser_entry);
 }
 
-static gboolean
-gtk_file_chooser_entry_focus (GtkWidget        *widget,
-                             GtkDirectionType  direction)
+/* Gets the x position of the text cursor in the entry, in widget coordinates */
+static void
+get_entry_cursor_x (GtkFileChooserEntry *chooser_entry,
+                   gint                *x_ret)
 {
-  GtkFileChooserEntry *chooser_entry;
-  GtkEditable *editable;
-  GtkEntry *entry;
-  GdkModifierType state;
-  gboolean control_pressed;
+  /* FIXME: see the docs for gtk_entry_get_layout_offsets().  As an exercise for
+   * the reader, you have to implement support for the entry's scroll offset and
+   * RTL layouts and all the fancy Pango stuff.
+   */
 
-  chooser_entry = GTK_FILE_CHOOSER_ENTRY (widget);
-  editable = GTK_EDITABLE (widget);
-  entry = GTK_ENTRY (widget);
+  PangoLayout *layout;
+  gint layout_x, layout_y;
+  gint layout_index;
+  PangoRectangle strong_pos;
 
-  if (!chooser_entry->eat_tabs)
-    return GTK_WIDGET_CLASS (parent_class)->focus (widget, direction);
+  layout = gtk_entry_get_layout (GTK_ENTRY (chooser_entry));
 
-  control_pressed = FALSE;
+  gtk_entry_get_layout_offsets (GTK_ENTRY (chooser_entry), &layout_x, &layout_y);
 
-  if (gtk_get_current_event_state (&state))
-    {
+  layout_index = gtk_entry_text_index_to_layout_index (GTK_ENTRY (chooser_entry),
+                                                      GTK_ENTRY (chooser_entry)->current_pos);
+
+  pango_layout_get_cursor_pos (layout, layout_index, &strong_pos, NULL);
+
+  *x_ret = layout_x + strong_pos.x / PANGO_SCALE;
+}
+
+static void
+show_completion_feedback_window (GtkFileChooserEntry *chooser_entry)
+{
+  /* More or less stolen from gtk_tooltip_position() */
+
+  GtkRequisition feedback_req;
+  gint entry_x, entry_y;
+  gint cursor_x;
+  GtkAllocation *entry_allocation;
+  int feedback_x, feedback_y;
+
+  gtk_widget_size_request (chooser_entry->completion_feedback_window, &feedback_req);
+
+  gdk_window_get_origin (GTK_WIDGET (chooser_entry)->window, &entry_x, &entry_y);
+  entry_allocation = &(GTK_WIDGET (chooser_entry)->allocation);
+
+  get_entry_cursor_x (chooser_entry, &cursor_x);
+
+  /* FIXME: fit to the screen if we bump on the screen's edge */
+  feedback_x = entry_x + cursor_x + entry_allocation->height / 2; /* cheap "half M-width" */
+  feedback_y = entry_y + (entry_allocation->height - feedback_req.height) / 2;
+
+  gtk_window_move (GTK_WINDOW (chooser_entry->completion_feedback_window), feedback_x, feedback_y);
+  gtk_widget_show (chooser_entry->completion_feedback_window);
+
+  install_completion_feedback_timer (chooser_entry);
+}
+
+static void
+pop_up_completion_feedback (GtkFileChooserEntry *chooser_entry,
+                           const gchar         *feedback)
+{
+  if (chooser_entry->completion_feedback_window == NULL)
+    create_completion_feedback_window (chooser_entry);
+
+  gtk_label_set_text (GTK_LABEL (chooser_entry->completion_feedback_label), feedback);
+
+  show_completion_feedback_window (chooser_entry);
+}
+
+static void
+remove_completion_feedback (GtkFileChooserEntry *chooser_entry)
+{
+  if (chooser_entry->completion_feedback_window)
+    gtk_widget_destroy (chooser_entry->completion_feedback_window);
+
+  chooser_entry->completion_feedback_window = NULL;
+  chooser_entry->completion_feedback_label = NULL;
+
+  if (chooser_entry->completion_feedback_timeout_id != 0)
+    {
+      g_source_remove (chooser_entry->completion_feedback_timeout_id);
+      chooser_entry->completion_feedback_timeout_id = 0;
+    }
+}
+
+static void
+explicitly_complete (GtkFileChooserEntry *chooser_entry)
+{
+  CommonPrefixResult result;
+
+  g_assert (chooser_entry->current_folder != NULL);
+  g_assert (_gtk_folder_is_finished_loading (chooser_entry->current_folder));
+
+  /* FIXME: see what Emacs does in case there is no common prefix, or there is more than one match:
+   *
+   * - If there is a common prefix, insert it (done)
+   * - If there is no common prefix, pop up the suggestion window
+   * - If there are no matches at all, beep and bring up a tooltip (done)
+   * - If the suggestion window is already up, scroll it
+   */
+  result = append_common_prefix (chooser_entry, FALSE, TRUE);
+
+  switch (result)
+    {
+    case INVALID_INPUT:
+      /* We already beeped in append_common_prefix(); do nothing here */
+      break;
+
+    case NO_MATCH:
+      beep (chooser_entry);
+      /* translators: this text is shown when there are no completions 
+       * for something the user typed in a file chooser entry
+       */
+      pop_up_completion_feedback (chooser_entry, _("No match"));
+      break;
+
+    case NOTHING_INSERTED_COMPLETE:
+      /* FIXME: pop up the suggestion window or scroll it */
+      break;
+
+    case NOTHING_INSERTED_UNIQUE:
+      /* translators: this text is shown when there is exactly one completion 
+       * for something the user typed in a file chooser entry
+       */
+      pop_up_completion_feedback (chooser_entry, _("Sole completion"));
+      break;
+
+    case COMPLETED:
+      /* Nothing to do */
+      break;
+
+    case COMPLETED_UNIQUE:
+      /* Nothing to do */
+      break;
+
+    case COMPLETE_BUT_NOT_UNIQUE:
+      /* translators: this text is shown when the text in a file chooser
+       * entry is a complete filename, but could be continued to find
+       * a longer match
+       */
+      pop_up_completion_feedback (chooser_entry, _("Complete, but not unique"));
+      break;
+
+    default:
+      g_assert_not_reached ();
+    }
+}
+
+static void
+start_explicit_completion (GtkFileChooserEntry *chooser_entry)
+{
+  RefreshStatus status;
+  gboolean is_error;
+  char *feedback_msg;
+
+  status = refresh_current_folder_and_file_part (chooser_entry, REFRESH_UP_TO_CURSOR_POSITION);
+
+  is_error = FALSE;
+
+  switch (status)
+    {
+    case REFRESH_OK:
+      g_assert (chooser_entry->current_folder_file != NULL);
+
+      if (chooser_entry->current_folder && _gtk_folder_is_finished_loading (chooser_entry->current_folder))
+       explicitly_complete (chooser_entry);
+      else
+       {
+         chooser_entry->load_complete_action = LOAD_COMPLETE_EXPLICIT_COMPLETION;
+
+         /* Translators: this text is shown while the system is searching
+          * for possible completions for filenames in a file chooser entry. */
+         pop_up_completion_feedback (chooser_entry, _("Completing..."));
+       }
+
+      break;
+
+    case REFRESH_INVALID_INPUT:
+      is_error = TRUE;
+      /* Translators: this is shown in the feedback for Tab-completion in a file
+       * chooser's text entry, when the user enters an invalid path. */
+      feedback_msg = _("Invalid path");
+      break;
+
+    case REFRESH_INCOMPLETE_HOSTNAME:
+      is_error = TRUE;
+
+      if (chooser_entry->local_only)
+       {
+         /* hostnames in a local_only file chooser?  user error */
+
+         /* Translators: this is shown in the feedback for Tab-completion in a
+          * file chooser's text entry when the user enters something like
+          * "sftp://blahblah" in an app that only supports local filenames. */
+         feedback_msg = _("Only local files may be selected");
+       }
+      else
+       {
+         /* Another option is to complete the hostname based on the remote volumes that are mounted */
+
+         /* Translators: this is shown in the feedback for Tab-completion in a
+          * file chooser's text entry when the user hasn't entered the first '/'
+          * after a hostname and yet hits Tab (such as "sftp://blahblah[Tab]") */
+         feedback_msg = _("Incomplete hostname; end it with '/'");
+       }
+
+      break;
+
+    case REFRESH_NONEXISTENT:
+      is_error = TRUE;
+
+      /* Translators: this is shown in the feedback for Tab-completion in a file
+       * chooser's text entry when the user enters a path that does not exist
+       * and then hits Tab */
+      feedback_msg = _("Path does not exist");
+      break;
+
+    case REFRESH_NOT_LOCAL:
+      is_error = TRUE;
+      feedback_msg = _("Only local files may be selected");
+      break;
+
+    default:
+      g_assert_not_reached ();
+      return;
+    }
+
+  if (is_error)
+    {
+      g_assert (chooser_entry->current_folder_file == NULL);
+
+      beep (chooser_entry);
+      pop_up_completion_feedback (chooser_entry, feedback_msg);
+      chooser_entry->load_complete_action = LOAD_COMPLETE_NOTHING;
+    }
+}
+
+static gboolean
+gtk_file_chooser_entry_focus (GtkWidget        *widget,
+                             GtkDirectionType  direction)
+{
+  GtkFileChooserEntry *chooser_entry;
+  GtkEditable *editable;
+  GtkEntry *entry;
+  GdkModifierType state;
+  gboolean control_pressed;
+
+  chooser_entry = GTK_FILE_CHOOSER_ENTRY (widget);
+  editable = GTK_EDITABLE (widget);
+  entry = GTK_ENTRY (widget);
+
+  if (!chooser_entry->eat_tabs)
+    return GTK_WIDGET_CLASS (_gtk_file_chooser_entry_parent_class)->focus (widget, direction);
+
+  control_pressed = FALSE;
+
+  if (gtk_get_current_event_state (&state))
+    {
       if ((state & GDK_CONTROL_MASK) == GDK_CONTROL_MASK)
        control_pressed = TRUE;
     }
@@ -744,23 +1247,39 @@ gtk_file_chooser_entry_focus (GtkWidget        *widget,
       (GTK_WIDGET_HAS_FOCUS (widget)) &&
       (! control_pressed))
     {
-      gint pos = 0;
+      if (chooser_entry->has_completion)
+       gtk_editable_set_position (editable, entry->text_length);
+      else
+       start_explicit_completion (chooser_entry);
 
-      if (!chooser_entry->has_completion
-         && gtk_editable_get_position (editable) == entry->text_length)
-       append_common_prefix (chooser_entry, FALSE);
+      return TRUE;
+    }
+  else
+    return GTK_WIDGET_CLASS (_gtk_file_chooser_entry_parent_class)->focus (widget, direction);
+}
 
-      gtk_editable_set_position (editable, entry->text_length);
+static gboolean
+gtk_file_chooser_entry_focus_out_event (GtkWidget     *widget,
+                                       GdkEventFocus *event)
+{
+  GtkFileChooserEntry *chooser_entry = GTK_FILE_CHOOSER_ENTRY (widget);
 
-      /* Trigger the completion window to pop up again by a 
-       * zero-length insertion, a bit of a hack.
-       */
-      gtk_editable_insert_text (editable, "", -1, &pos);
+  chooser_entry->load_complete_action = LOAD_COMPLETE_NOTHING;
+  return GTK_WIDGET_CLASS (_gtk_file_chooser_entry_parent_class)->focus_out_event (widget, event);
+}
 
-      return TRUE;
+static void
+commit_completion_and_refresh (GtkFileChooserEntry *chooser_entry)
+{
+  if (chooser_entry->has_completion)
+    {
+      gtk_editable_set_position (GTK_EDITABLE (chooser_entry),
+                                GTK_ENTRY (chooser_entry)->text_length);
     }
-  else
-    return GTK_WIDGET_CLASS (parent_class)->focus (widget, direction);
+
+  /* Here we ignore the result of refresh_current_folder_and_file_part(); there is nothing we can do with it */
+  refresh_current_folder_and_file_part (chooser_entry, REFRESH_WHOLE_TEXT);
 }
 
 static void
@@ -768,129 +1287,475 @@ gtk_file_chooser_entry_activate (GtkEntry *entry)
 {
   GtkFileChooserEntry *chooser_entry = GTK_FILE_CHOOSER_ENTRY (entry);
 
-  if (chooser_entry->has_completion)
+  commit_completion_and_refresh (chooser_entry);
+  GTK_ENTRY_CLASS (_gtk_file_chooser_entry_parent_class)->activate (entry);
+}
+
+static void
+discard_completion_store (GtkFileChooserEntry *chooser_entry)
+{
+  if (!chooser_entry->completion_store)
+    return;
+
+  gtk_entry_completion_set_model (gtk_entry_get_completion (GTK_ENTRY (chooser_entry)), NULL);
+  g_object_unref (chooser_entry->completion_store);
+  chooser_entry->completion_store = NULL;
+}
+
+/* Fills the completion store from the contents of the current folder */
+static void
+populate_completion_store (GtkFileChooserEntry *chooser_entry)
+{
+  GSList *files;
+  GSList *tmp_list;
+
+  discard_completion_store (chooser_entry);
+
+  files = _gtk_folder_list_children (chooser_entry->current_folder);
+
+  chooser_entry->completion_store = gtk_list_store_new (N_COLUMNS,
+                                                       G_TYPE_STRING,
+                                                       G_TYPE_FILE);
+
+  for (tmp_list = files; tmp_list; tmp_list = tmp_list->next)
     {
-      gtk_editable_set_position (GTK_EDITABLE (entry),
-                                entry->text_length);
+      GFileInfo *info;
+      GFile *file;
+
+      file = tmp_list->data;
+
+      info = _gtk_folder_get_info (chooser_entry->current_folder, file);
+
+      if (info)
+       {
+         gchar *display_name = g_strdup (g_file_info_get_display_name (info));
+         GtkTreeIter iter;
+         gboolean dummy;
+
+          display_name = maybe_append_separator_to_file (chooser_entry, file, display_name, &dummy);
+
+         gtk_list_store_append (chooser_entry->completion_store, &iter);
+         gtk_list_store_set (chooser_entry->completion_store, &iter,
+                             DISPLAY_NAME_COLUMN, display_name,
+                             FILE_COLUMN, file,
+                             -1);
+
+         g_object_unref (info);
+          g_free (display_name);
+       }
     }
-  
-  GTK_ENTRY_CLASS (parent_class)->activate (entry);
+
+  g_slist_foreach (files, (GFunc) g_object_unref, NULL);
+  g_slist_free (files);
+
+  gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (chooser_entry->completion_store),
+                                       DISPLAY_NAME_COLUMN, GTK_SORT_ASCENDING);
+
+  gtk_entry_completion_set_model (gtk_entry_get_completion (GTK_ENTRY (chooser_entry)),
+                                 GTK_TREE_MODEL (chooser_entry->completion_store));
 }
 
-/* This will see if a path typed by the user is new, and installs the loading
- * idle if it is.
+/* When we finish loading the current folder, this function should get called to
+ * perform the deferred autocompletion or explicit completion.
  */
 static void
-gtk_file_chooser_entry_maybe_update_directory (GtkFileChooserEntry *chooser_entry,
-                                              GtkFilePath         *folder_path,
-                                              gboolean             force_reload)
+perform_load_complete_action (GtkFileChooserEntry *chooser_entry)
+{
+  switch (chooser_entry->load_complete_action)
+    {
+    case LOAD_COMPLETE_NOTHING:
+      break;
+
+    case LOAD_COMPLETE_AUTOCOMPLETE:
+      autocomplete (chooser_entry);
+      break;
+
+    case LOAD_COMPLETE_EXPLICIT_COMPLETION:
+      explicitly_complete (chooser_entry);
+      break;
+
+    default:
+      g_assert_not_reached ();
+    }
+
+  chooser_entry->load_complete_action = LOAD_COMPLETE_NOTHING;
+}
+
+static void
+finish_folder_load (GtkFileChooserEntry *chooser_entry)
 {
-  gboolean queue_idle = FALSE;
+  populate_completion_store (chooser_entry);
+  perform_load_complete_action (chooser_entry);
 
-  if (chooser_entry->current_folder_path)
+  gtk_widget_set_tooltip_text (GTK_WIDGET (chooser_entry), NULL);
+}
+
+/* Callback when the current folder finishes loading */
+static void
+finished_loading_cb (GtkFolder *folder,
+                    gpointer   data)
+{
+  GtkFileChooserEntry *chooser_entry = GTK_FILE_CHOOSER_ENTRY (data);
+
+  finish_folder_load (chooser_entry);
+}
+
+/* Callback when the current folder's handle gets obtained (not necessarily loaded completely) */
+static void
+load_directory_get_folder_callback (GCancellable  *cancellable,
+                                   GtkFolder     *folder,
+                                   const GError  *error,
+                                   gpointer       data)
+{
+  gboolean cancelled = g_cancellable_is_cancelled (cancellable);
+  GtkFileChooserEntry *chooser_entry = data;
+
+  if (cancellable != chooser_entry->load_folder_cancellable)
+    goto out;
+
+  chooser_entry->load_folder_cancellable = NULL;
+
+  if (error)
     {
-      if (gtk_file_path_compare (folder_path, chooser_entry->current_folder_path) != 0 || force_reload)
-       {
-         /* We changed our current directory.  We need to clear out the old
-          * directory information.
-          */
-         if (chooser_entry->current_folder)
-           {
-             g_signal_handlers_disconnect_by_func (chooser_entry->current_folder,
-                                                   G_CALLBACK (files_added_cb), chooser_entry);
-             g_signal_handlers_disconnect_by_func (chooser_entry->current_folder,
-                                                   G_CALLBACK (files_deleted_cb), chooser_entry);
+      LoadCompleteAction old_load_complete_action;
 
-             g_object_unref (chooser_entry->current_folder);
-             chooser_entry->current_folder = NULL;
-           }
-         if (chooser_entry->completion_store)
-           {
-             gtk_entry_completion_set_model (gtk_entry_get_completion (GTK_ENTRY (chooser_entry)), NULL);
-             g_object_unref (chooser_entry->completion_store);
-             chooser_entry->completion_store = NULL;
-           }
+      old_load_complete_action = chooser_entry->load_complete_action;
+
+      discard_completion_store (chooser_entry);
+      clear_completions (chooser_entry);
+
+      if (old_load_complete_action == LOAD_COMPLETE_EXPLICIT_COMPLETION)
+       {
+         /* Since this came from explicit user action (Tab completion), we'll present errors visually */
 
-         queue_idle = TRUE;
+         beep (chooser_entry);
+         pop_up_completion_feedback (chooser_entry, error->message);
        }
 
-      gtk_file_path_free (chooser_entry->current_folder_path);
+      discard_current_folder (chooser_entry);
     }
+
+  if (cancelled || error)
+    goto out;
+
+  g_assert (folder != NULL);
+  chooser_entry->current_folder = g_object_ref (folder);
+
+  discard_completion_store (chooser_entry);
+
+  if (_gtk_folder_is_finished_loading (chooser_entry->current_folder))
+    finish_folder_load (chooser_entry);
   else
-    {
-      queue_idle = TRUE;
-    }
+    g_signal_connect (chooser_entry->current_folder, "finished-loading",
+                     G_CALLBACK (finished_loading_cb), chooser_entry);
 
-  chooser_entry->current_folder_path = folder_path;
+out:
+  g_object_unref (chooser_entry);
+  g_object_unref (cancellable);
+}
 
-  if (queue_idle && chooser_entry->load_directory_idle == NULL)
+static RefreshStatus
+start_loading_current_folder (GtkFileChooserEntry *chooser_entry)
+{
+  if (chooser_entry->file_system == NULL)
+    return REFRESH_OK;
+
+  g_assert (chooser_entry->current_folder_file != NULL);
+  g_assert (chooser_entry->current_folder == NULL);
+  g_assert (chooser_entry->load_folder_cancellable == NULL);
+
+  if (chooser_entry->local_only
+      && !g_file_is_native (chooser_entry->current_folder_file))
     {
-      chooser_entry->load_directory_idle = g_idle_source_new ();
-      g_source_set_priority (chooser_entry->load_directory_idle, G_PRIORITY_HIGH);
-      g_source_set_closure (chooser_entry->load_directory_idle,
-                           g_cclosure_new_object (G_CALLBACK (load_directory_callback),
-                                                  G_OBJECT (chooser_entry)));
-      g_source_attach (chooser_entry->load_directory_idle, NULL);
+      g_object_unref (chooser_entry->current_folder_file);
+      chooser_entry->current_folder_file = NULL;
+
+      return REFRESH_NOT_LOCAL;
     }
+
+  chooser_entry->load_folder_cancellable =
+    _gtk_file_system_get_folder (chooser_entry->file_system,
+                                chooser_entry->current_folder_file,
+                               "standard::name,standard::display-name,standard::type",
+                                load_directory_get_folder_callback,
+                                g_object_ref (chooser_entry));
+
+  return REFRESH_OK;
 }
 
+static RefreshStatus
+reload_current_folder (GtkFileChooserEntry *chooser_entry,
+                      GFile               *folder_file,
+                      gboolean             force_reload)
+{
+  gboolean reload = FALSE;
 
+  g_assert (folder_file != NULL);
 
-static void
-gtk_file_chooser_entry_changed (GtkEditable *editable)
+  if (chooser_entry->current_folder_file)
+    {
+      if ((!(g_file_equal (folder_file, chooser_entry->current_folder_file)
+            && chooser_entry->load_folder_cancellable))
+         || force_reload)
+       {
+         reload = TRUE;
+
+          discard_current_folder (chooser_entry);
+         discard_loading_and_current_folder_file (chooser_entry);
+
+         chooser_entry->current_folder_file = g_object_ref (folder_file);
+       }
+    }
+  else
+    {
+      chooser_entry->current_folder_file = g_object_ref (folder_file);
+      reload = TRUE;
+    }
+
+  if (reload)
+    return start_loading_current_folder (chooser_entry);
+  else
+    return REFRESH_OK;
+}
+
+static RefreshStatus
+refresh_current_folder_and_file_part (GtkFileChooserEntry *chooser_entry,
+                                     RefreshMode          refresh_mode)
 {
-  GtkFileChooserEntry *chooser_entry = GTK_FILE_CHOOSER_ENTRY (editable);
-  const gchar *text;
-  GtkFilePath *folder_path;
+  GtkEditable *editable;
+  gint end_pos;
+  gchar *text;
+  GFile *folder_file;
   gchar *file_part;
   gsize total_len, file_part_len;
   gint file_part_pos;
+  GError *error;
+  RefreshStatus result;
 
-  if (chooser_entry->in_change)
-    return;
+  editable = GTK_EDITABLE (chooser_entry);
 
-  text = gtk_entry_get_text (GTK_ENTRY (editable));
-  
+  switch (refresh_mode)
+    {
+    case REFRESH_UP_TO_CURSOR_POSITION:
+      end_pos = gtk_editable_get_position (editable);
+      break;
+
+    case REFRESH_WHOLE_TEXT:
+      end_pos = GTK_ENTRY (chooser_entry)->text_length;
+      break;
+
+    default:
+      g_assert_not_reached ();
+      return REFRESH_INVALID_INPUT;
+    }
+
+  text = gtk_editable_get_chars (editable, 0, end_pos);
+
+  error = NULL;
   if (!chooser_entry->file_system ||
       !chooser_entry->base_folder ||
-      !gtk_file_system_parse (chooser_entry->file_system,
-                             chooser_entry->base_folder, text,
-                             &folder_path, &file_part, NULL)) /* NULL-GError */
+      !_gtk_file_system_parse (chooser_entry->file_system,
+                              chooser_entry->base_folder, text,
+                              &folder_file, &file_part, &error))
     {
-      folder_path = gtk_file_path_copy (chooser_entry->base_folder);
+      if (g_error_matches (error, GTK_FILE_CHOOSER_ERROR, GTK_FILE_CHOOSER_ERROR_INCOMPLETE_HOSTNAME))
+       {
+         folder_file = NULL;
+         result = REFRESH_INCOMPLETE_HOSTNAME;
+       }
+      else
+       {
+         folder_file = (chooser_entry->base_folder) ? g_object_ref (chooser_entry->base_folder) : NULL;
+
+         if (g_error_matches (error, GTK_FILE_CHOOSER_ERROR, GTK_FILE_CHOOSER_ERROR_NONEXISTENT))
+           result = REFRESH_NONEXISTENT;
+         else
+           result = REFRESH_INVALID_INPUT;
+       }
+
+      if (error)
+       g_error_free (error);
+
       file_part = g_strdup ("");
       file_part_pos = -1;
     }
   else
     {
+      g_assert (folder_file != NULL);
+
       file_part_len = strlen (file_part);
       total_len = strlen (text);
       if (total_len > file_part_len)
        file_part_pos = g_utf8_strlen (text, total_len - file_part_len);
       else
        file_part_pos = 0;
+
+      result = REFRESH_OK;
     }
 
-  if (chooser_entry->file_part)
-    g_free (chooser_entry->file_part);
+  g_free (text);
+
+  g_free (chooser_entry->file_part);
 
   chooser_entry->file_part = file_part;
   chooser_entry->file_part_pos = file_part_pos;
 
-  gtk_file_chooser_entry_maybe_update_directory (chooser_entry, folder_path, file_part_pos == -1);
+  if (result == REFRESH_OK)
+    {
+      result = reload_current_folder (chooser_entry, folder_file, file_part_pos == -1);
+    }
+  else
+    {
+      discard_current_folder (chooser_entry);
+      discard_loading_and_current_folder_file (chooser_entry);
+    }
+
+  if (folder_file)
+    g_object_unref (folder_file);
+
+  g_assert (/* we are OK and we have a current folder file and (loading process or folder handle)... */
+           ((result == REFRESH_OK)
+            && (chooser_entry->current_folder_file != NULL)
+            && (((chooser_entry->load_folder_cancellable != NULL) && (chooser_entry->current_folder == NULL))
+                || ((chooser_entry->load_folder_cancellable == NULL) && (chooser_entry->current_folder != NULL))))
+           /* ... OR we have an error, and we don't have a current folder file nor a loading process nor a folder handle */
+           || ((result != REFRESH_OK)
+               && (chooser_entry->current_folder_file == NULL)
+               && (chooser_entry->load_folder_cancellable == NULL)
+               && (chooser_entry->current_folder == NULL)));
+
+  return result;
 }
 
 static void
-clear_completion_callback (GtkFileChooserEntry *chooser_entry,
-                          GParamSpec          *pspec)
+autocomplete (GtkFileChooserEntry *chooser_entry)
 {
-  if (chooser_entry->has_completion)
+  if (!(chooser_entry->current_folder != NULL
+       && _gtk_folder_is_finished_loading (chooser_entry->current_folder)
+       && gtk_editable_get_position (GTK_EDITABLE (chooser_entry)) == GTK_ENTRY (chooser_entry)->text_length))
+    return;
+
+  append_common_prefix (chooser_entry, TRUE, FALSE);
+}
+
+static void
+start_autocompletion (GtkFileChooserEntry *chooser_entry)
+{
+  RefreshStatus status;
+
+  status = refresh_current_folder_and_file_part (chooser_entry, REFRESH_UP_TO_CURSOR_POSITION);
+
+  switch (status)
     {
-      chooser_entry->has_completion = FALSE;
-      gtk_file_chooser_entry_changed (GTK_EDITABLE (chooser_entry));
+    case REFRESH_OK:
+      g_assert (chooser_entry->current_folder_file != NULL);
+
+      if (chooser_entry->current_folder && _gtk_folder_is_finished_loading (chooser_entry->current_folder))
+       autocomplete (chooser_entry);
+      else
+       chooser_entry->load_complete_action = LOAD_COMPLETE_AUTOCOMPLETE;
+
+      break;
+
+    case REFRESH_INVALID_INPUT:
+    case REFRESH_INCOMPLETE_HOSTNAME:
+    case REFRESH_NONEXISTENT:
+    case REFRESH_NOT_LOCAL:
+      /* We don't beep or anything, since this is autocompletion - the user
+       * didn't request any action explicitly.
+       */
+      break;
+
+    default:
+      g_assert_not_reached ();
     }
 }
 
+static gboolean
+start_autocompletion_idle_handler (gpointer data)
+{
+  GtkFileChooserEntry *chooser_entry = GTK_FILE_CHOOSER_ENTRY (data);
+
+  start_autocompletion (chooser_entry);
+
+  chooser_entry->start_autocompletion_idle_id = 0;
+
+  return FALSE;
+}
+
+static void
+install_start_autocompletion_idle (GtkFileChooserEntry *chooser_entry)
+{
+  if (chooser_entry->start_autocompletion_idle_id != 0)
+    return;
+
+  chooser_entry->start_autocompletion_idle_id = gdk_threads_add_idle (start_autocompletion_idle_handler, chooser_entry);
+}
+
+#ifdef G_OS_WIN32
+static gint
+insert_text_callback (GtkFileChooserEntry *chooser_entry,
+                     const gchar         *new_text,
+                     gint                 new_text_length,
+                     gint                *position,
+                     gpointer             user_data)
+{
+  const gchar *colon = memchr (new_text, ':', new_text_length);
+  gint i;
+
+  /* Disallow these characters altogether */
+  for (i = 0; i < new_text_length; i++)
+    {
+      if (new_text[i] == '<' ||
+         new_text[i] == '>' ||
+         new_text[i] == '"' ||
+         new_text[i] == '|' ||
+         new_text[i] == '*' ||
+         new_text[i] == '?')
+       break;
+    }
+
+  if (i < new_text_length ||
+      /* Disallow entering text that would cause a colon to be anywhere except
+       * after a drive letter.
+       */
+      (colon != NULL &&
+       *position + (colon - new_text) != 1) ||
+      (new_text_length > 0 &&
+       *position <= 1 &&
+       GTK_ENTRY (chooser_entry)->text_length >= 2 &&
+       gtk_entry_get_text (GTK_ENTRY (chooser_entry))[1] == ':'))
+    {
+      gtk_widget_error_bell (GTK_WIDGET (chooser_entry));
+      g_signal_stop_emission_by_name (chooser_entry, "insert_text");
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+static void
+delete_text_callback (GtkFileChooserEntry *chooser_entry,
+                     gint                 start_pos,
+                     gint                 end_pos,
+                     gpointer             user_data)
+{
+  /* If deleting a drive letter, delete the colon, too */
+  if (start_pos == 0 && end_pos == 1 &&
+      GTK_ENTRY (chooser_entry)->text_length >= 2 &&
+      gtk_entry_get_text (GTK_ENTRY (chooser_entry))[1] == ':')
+    {
+      g_signal_handlers_block_by_func (chooser_entry,
+                                      G_CALLBACK (delete_text_callback),
+                                      user_data);
+      gtk_editable_delete_text (GTK_EDITABLE (chooser_entry), 0, 1);
+      g_signal_handlers_unblock_by_func (chooser_entry,
+                                        G_CALLBACK (delete_text_callback),
+                                        user_data);
+    }
+}
+#endif
+
 /**
  * _gtk_file_chooser_entry_new:
  * @eat_tabs: If %FALSE, allow focus navigation with the tab key.
@@ -939,21 +1804,24 @@ _gtk_file_chooser_entry_set_file_system (GtkFileChooserEntry *chooser_entry,
 /**
  * _gtk_file_chooser_entry_set_base_folder:
  * @chooser_entry: a #GtkFileChooserEntry
- * @path: path of a folder in the chooser entries current file system.
+ * @file: file for a folder in the chooser entries current file system.
  *
  * Sets the folder with respect to which completions occur.
  **/
 void
 _gtk_file_chooser_entry_set_base_folder (GtkFileChooserEntry *chooser_entry,
-                                        const GtkFilePath   *path)
+                                        GFile               *file)
 {
   if (chooser_entry->base_folder)
-    gtk_file_path_free (chooser_entry->base_folder);
+    g_object_unref (chooser_entry->base_folder);
 
-  chooser_entry->base_folder = gtk_file_path_copy (path);
+  chooser_entry->base_folder = file;
 
-  gtk_file_chooser_entry_changed (GTK_EDITABLE (chooser_entry));
-  gtk_editable_select_region (GTK_EDITABLE (chooser_entry), 0, -1);
+  if (chooser_entry->base_folder)
+    g_object_ref (chooser_entry->base_folder);
+
+  clear_completions (chooser_entry);
+  _gtk_file_chooser_entry_select_filename (chooser_entry);
 }
 
 /**
@@ -961,25 +1829,20 @@ _gtk_file_chooser_entry_set_base_folder (GtkFileChooserEntry *chooser_entry,
  * @chooser_entry: a #GtkFileChooserEntry
  *
  * Gets the current folder for the #GtkFileChooserEntry. If the
- * user has only entered a filename, this will be the base folder
+ * user has only entered a filename, this will be in the base folder
  * (see _gtk_file_chooser_entry_set_base_folder()), but if the
  * user has entered a relative or absolute path, then it will
- * be different. If the user has entered a relative or absolute
- * path that doesn't point to a folder in the file system, it will
- * be %NULL.
+ * be different.  If the user has entered unparsable text, or text which
+ * the entry cannot handle, this will return %NULL.
  *
- * Return value: the path of current folder - this value is owned by the
+ * Return value: the file for the current folder - this value is owned by the
  *  chooser entry and must not be modified or freed.
  **/
-const GtkFilePath *
+GFile *
 _gtk_file_chooser_entry_get_current_folder (GtkFileChooserEntry *chooser_entry)
 {
-  if (chooser_entry->has_completion)
-    {
-      gtk_editable_set_position (GTK_EDITABLE (chooser_entry),
-                                GTK_ENTRY (chooser_entry)->text_length);
-    }
-  return chooser_entry->current_folder_path;
+  commit_completion_and_refresh (chooser_entry);
+  return chooser_entry->current_folder_file;
 }
 
 /**
@@ -988,7 +1851,7 @@ _gtk_file_chooser_entry_get_current_folder (GtkFileChooserEntry *chooser_entry)
  *
  * Gets the non-folder portion of whatever the user has entered
  * into the file selector. What is returned is a UTF-8 string,
- * and if a filename path is needed, gtk_file_system_make_path()
+ * and if a filename path is needed, g_file_get_child_for_display_name()
  * must be used
   *
  * Return value: the entered filename - this value is owned by the
@@ -997,11 +1860,7 @@ _gtk_file_chooser_entry_get_current_folder (GtkFileChooserEntry *chooser_entry)
 const gchar *
 _gtk_file_chooser_entry_get_file_part (GtkFileChooserEntry *chooser_entry)
 {
-  if (chooser_entry->has_completion)
-    {
-      gtk_editable_set_position (GTK_EDITABLE (chooser_entry),
-                                GTK_ENTRY (chooser_entry)->text_length);
-    }
+  commit_completion_and_refresh (chooser_entry);
   return chooser_entry->file_part;
 }
 
@@ -1018,7 +1877,10 @@ _gtk_file_chooser_entry_set_file_part (GtkFileChooserEntry *chooser_entry,
 {
   g_return_if_fail (GTK_IS_FILE_CHOOSER_ENTRY (chooser_entry));
 
+  chooser_entry->in_change = TRUE;
+  clear_completions (chooser_entry);
   gtk_entry_set_text (GTK_ENTRY (chooser_entry), file_part);
+  chooser_entry->in_change = FALSE;
 }
 
 
@@ -1045,6 +1907,8 @@ _gtk_file_chooser_entry_set_action (GtkFileChooserEntry *chooser_entry,
 
       comp = gtk_entry_get_completion (GTK_ENTRY (chooser_entry));
 
+      /* FIXME: do we need to actually set the following? */
+
       switch (action)
        {
        case GTK_FILE_CHOOSER_ACTION_OPEN:
@@ -1079,25 +1943,61 @@ _gtk_file_chooser_entry_get_action (GtkFileChooserEntry *chooser_entry)
 
 gboolean
 _gtk_file_chooser_entry_get_is_folder (GtkFileChooserEntry *chooser_entry,
-                                      const GtkFilePath   *path)
+                                      GFile               *file)
 {
   gboolean retval = FALSE;
 
   if (chooser_entry->current_folder)
     {
-      GtkFileInfo *file_info;
+      GFileInfo *file_info;
+
+      file_info = _gtk_folder_get_info (chooser_entry->current_folder, file);
 
-      file_info = gtk_file_folder_get_info (chooser_entry->current_folder,
-                                           path, NULL);
       if (file_info)
         {
-         retval = gtk_file_info_get_is_folder (file_info);
-         gtk_file_info_free (file_info);
+         retval = _gtk_file_info_consider_as_directory (file_info);
+         g_object_unref (file_info);
        }
     }
 
   return retval;
 }
 
-#define __GTK_FILE_CHOOSER_ENTRY_C__
-#include "gtkaliasdef.c"
+
+/*
+ * _gtk_file_chooser_entry_select_filename:
+ * @chooser_entry: a #GtkFileChooserEntry
+ *
+ * Selects the filename (without the extension) for user edition.
+ */
+void
+_gtk_file_chooser_entry_select_filename (GtkFileChooserEntry *chooser_entry)
+{
+  const gchar *str, *ext;
+  glong len = -1;
+
+  if (chooser_entry->action == GTK_FILE_CHOOSER_ACTION_SAVE)
+    {
+      str = gtk_entry_get_text (GTK_ENTRY (chooser_entry));
+      ext = g_strrstr (str, ".");
+
+      if (ext)
+       len = g_utf8_pointer_to_offset (str, ext);
+    }
+
+  gtk_editable_select_region (GTK_EDITABLE (chooser_entry), 0, (gint) len);
+}
+
+void
+_gtk_file_chooser_entry_set_local_only (GtkFileChooserEntry *chooser_entry,
+                                        gboolean             local_only)
+{
+  chooser_entry->local_only = local_only;
+  clear_completions (chooser_entry);
+}
+
+gboolean
+_gtk_file_chooser_entry_get_local_only (GtkFileChooserEntry *chooser_entry)
+{
+  return chooser_entry->local_only;
+}