AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Discard the completion store when we change the folder

Browse Source 
Signed-off-by: Federico Mena Quintero <federico@gnu.org>

svn path=/trunk/; revision=19820
This commit is contained in:
Federico Mena Quintero 2008-03-13 00:35:31 +00:00 committed by Federico Mena Quintero
parent f5343b9037
commit 073093bde0
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gtk/gtkfilechooserentry.c
View File

@ -727,6 +727,17 @@ gtk_file_chooser_entry_activate (GtkEntry *entry)
GTK_ENTRY_CLASS (_gtk_file_chooser_entry_parent_class)->activate (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 */ /* Fills the completion store from the contents of the current folder */
static void static void
populate_completion_store (GtkFileChooserEntry *chooser_entry) populate_completion_store (GtkFileChooserEntry *chooser_entry)
@ -737,11 +748,7 @@ populate_completion_store (GtkFileChooserEntry *chooser_entry)
if (!gtk_file_folder_list_children (chooser_entry->current_folder, &paths, NULL)) /* NULL-GError */ if (!gtk_file_folder_list_children (chooser_entry->current_folder, &paths, NULL)) /* NULL-GError */
return; return;
if (chooser_entry->completion_store) discard_completion_store (chooser_entry);
{
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 = gtk_list_store_new (N_COLUMNS, chooser_entry->completion_store = gtk_list_store_new (N_COLUMNS,
G_TYPE_STRING, G_TYPE_STRING,
@ -849,6 +856,8 @@ load_directory_get_folder_callback (GtkFileSystemHandle *handle,
g_assert (folder != NULL); g_assert (folder != NULL);
chooser_entry->current_folder = folder; chooser_entry->current_folder = folder;
discard_completion_store (chooser_entry);
if (gtk_file_folder_is_finished_loading (chooser_entry->current_folder)) if (gtk_file_folder_is_finished_loading (chooser_entry->current_folder))
finish_folder_load (chooser_entry); finish_folder_load (chooser_entry);
else else