diff options
| author | Benjamin Otte <otte@redhat.com> | 2011-11-03 15:20:28 +0100 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2011-12-16 20:09:11 +0100 |
| commit | 2ead847f7d40c8add836164484c3bb3040c08ce7 (patch) | |
| tree | 5eb36cc06d71a94871045d1c275c04f39aba66fa /gtk/gtkfilechooserentry.c | |
| parent | a04b70e51fdda52fc88a174c69a754ed89a95081 (diff) | |
| download | gtk+-2ead847f7d40c8add836164484c3bb3040c08ce7.tar.gz | |
filechooserentry: Fold in start_loading_current_folder()
The function just did one thing, we can just fold it into the only
caller.
Diffstat (limited to 'gtk/gtkfilechooserentry.c')
| -rw-r--r-- | gtk/gtkfilechooserentry.c | 38 |
1 files changed, 12 insertions, 26 deletions
diff --git a/gtk/gtkfilechooserentry.c b/gtk/gtkfilechooserentry.c index 306ea66a08..4093bdc1a8 100644 --- a/gtk/gtkfilechooserentry.c +++ b/gtk/gtkfilechooserentry.c @@ -1460,31 +1460,6 @@ out: } static RefreshStatus -start_loading_current_folder (GtkFileChooserEntry *chooser_entry) -{ - 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)) - { - discard_loading_and_current_folder_file (chooser_entry); - - 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) { @@ -1500,9 +1475,20 @@ reload_current_folder (GtkFileChooserEntry *chooser_entry, discard_loading_and_current_folder_file (chooser_entry); } + if (chooser_entry->local_only + && !g_file_is_native (folder_file)) + return REFRESH_NOT_LOCAL; + chooser_entry->current_folder_file = g_object_ref (folder_file); - return start_loading_current_folder (chooser_entry); + 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 |