[gtk+/gtk-2-24] filechooserentry: Fold in start_loading_current_folder()

[Federico Mena Quintero <federico src gnome org>]

commit fc84c3e02eaebbd5efae922a49a65d9dca4749c1
Author: Benjamin Otte <otte redhat com>
Date:   Thu Nov 3 15:20:28 2011 +0100

    filechooserentry: Fold in start_loading_current_folder()
    
    The function just did one thing, we can just fold it into the only
    caller.
    
    Conflicts:
        gtk/gtkfilechooserentry.c

 gtk/gtkfilechooserentry.c |   38 ++++++++++++--------------------------
 1 files changed, 12 insertions(+), 26 deletions(-)
---
diff --git a/gtk/gtkfilechooserentry.c b/gtk/gtkfilechooserentry.c
index 89cda6f..4a35296 100644
--- a/gtk/gtkfilechooserentry.c
+++ b/gtk/gtkfilechooserentry.c
@@ -1452,31 +1452,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
-      && !_gtk_file_has_native_path (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)
 {
@@ -1492,9 +1467,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