callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

filechooserentry: Fold in start_loading_current_folder()

Browse Source 
The function just did one thing, we can just fold it into the only
caller.
This commit is contained in:
Benjamin Otte 2011-11-03 15:20:28 +01:00
parent a04b70e51f
commit 2ead847f7d
1 changed files with 12 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
gtk/gtkfilechooserentry.c
View File

@ -1459,31 +1459,6 @@ out:
g_object_unref (cancellable); g_object_unref (cancellable);
} }
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 static RefreshStatus
reload_current_folder (GtkFileChooserEntry *chooser_entry, reload_current_folder (GtkFileChooserEntry *chooser_entry,
GFile *folder_file) GFile *folder_file)
@ -1500,9 +1475,20 @@ reload_current_folder (GtkFileChooserEntry *chooser_entry,
discard_loading_and_current_folder_file (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); 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 static RefreshStatus