diff options
author | Benjamin Otte <otte@redhat.com> | 2011-11-07 02:58:26 +0100 |
---|---|---|
committer | Benjamin Otte <otte@redhat.com> | 2011-12-16 20:09:13 +0100 |
commit | f6f2a78d3ec1303a26f5992cbcfd3204f4b1221d (patch) | |
tree | 2062ed51a0757872955871553c2ecab450d79bb4 /gtk/gtkfilechooserentry.c | |
parent | ad1672c194bdefb7969cb81662222f87926dc09e (diff) | |
download | gtk+-f6f2a78d3ec1303a26f5992cbcfd3204f4b1221d.tar.gz |
filechooserentry: Don't update the folder when completing
The folder is always up to date, there's no need to update it. (If the
folder is not up to date, that is a bug and needs to be fixed
elsewhere.)
Diffstat (limited to 'gtk/gtkfilechooserentry.c')
-rw-r--r-- | gtk/gtkfilechooserentry.c | 57 |
1 files changed, 4 insertions, 53 deletions
diff --git a/gtk/gtkfilechooserentry.c b/gtk/gtkfilechooserentry.c index 91089982f0..af73ab18b8 100644 --- a/gtk/gtkfilechooserentry.c +++ b/gtk/gtkfilechooserentry.c @@ -676,59 +676,10 @@ gtk_file_chooser_entry_grab_focus (GtkWidget *widget) static void start_explicit_completion (GtkFileChooserEntry *chooser_entry) { - RefreshStatus status; - gboolean is_error; - char *text; - - text = gtk_editable_get_chars (GTK_EDITABLE (chooser_entry), - 0, gtk_editable_get_position (GTK_EDITABLE (chooser_entry))); - status = refresh_current_folder_and_file_part (chooser_entry, text); - g_free (text); - - is_error = FALSE; - - switch (status) - { - case REFRESH_OK: - g_assert (chooser_entry->current_folder_file != NULL); - - if (chooser_entry->current_folder_loaded) - explicitly_complete (chooser_entry); - else - { - chooser_entry->load_complete_action = LOAD_COMPLETE_EXPLICIT_COMPLETION; - } - - break; - - case REFRESH_INVALID_INPUT: - is_error = TRUE; - break; - - case REFRESH_INCOMPLETE_HOSTNAME: - is_error = TRUE; - break; - - case REFRESH_NONEXISTENT: - is_error = TRUE; - break; - - case REFRESH_NOT_LOCAL: - is_error = TRUE; - break; - - default: - g_assert_not_reached (); - return; - } - - if (is_error) - { - g_assert (chooser_entry->current_folder_file == NULL); - - beep (chooser_entry); - chooser_entry->load_complete_action = LOAD_COMPLETE_NOTHING; - } + if (chooser_entry->current_folder_loaded) + explicitly_complete (chooser_entry); + else + chooser_entry->load_complete_action = LOAD_COMPLETE_EXPLICIT_COMPLETION; } static gboolean |