gtk+ r19832 - trunk/gtk

[federico svn gnome org]

Author: federico
Date: Thu Mar 13 00:39:56 2008
New Revision: 19832
URL: http://svn.gnome.org/viewvc/gtk+?rev=19832&view=rev

Log:
Clear the completion flags before appending the common prefix

Signed-off-by: Federico Mena Quintero <federico gnu org>


Modified:
   trunk/gtk/gtkfilechooserentry.c

Modified: trunk/gtk/gtkfilechooserentry.c
==============================================================================
--- trunk/gtk/gtkfilechooserentry.c	(original)
+++ trunk/gtk/gtkfilechooserentry.c	Thu Mar 13 00:39:56 2008
@@ -372,6 +372,13 @@
   return result;
 }
 
+static void
+clear_completions (GtkFileChooserEntry *chooser_entry)
+{
+  chooser_entry->has_completion = FALSE;
+  chooser_entry->load_complete_action = LOAD_COMPLETE_NOTHING;
+}
+
 /* 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
@@ -513,6 +520,8 @@
   gchar *common_prefix;
   GtkFilePath *unique_path;
 
+  clear_completions (chooser_entry);
+
   find_common_prefix (chooser_entry, &common_prefix, &unique_path);
 
   if (unique_path)
@@ -587,13 +596,6 @@
 }
 
 static void
-clear_completions (GtkFileChooserEntry *chooser_entry)
-{
-  chooser_entry->has_completion = FALSE;
-  chooser_entry->load_complete_action = LOAD_COMPLETE_NOTHING;
-}
-
-static void
 clear_completions_if_not_in_change (GtkFileChooserEntry *chooser_entry)
 {
   if (chooser_entry->in_change)