From: Timm Bäder <mail@baedert.org>
Date: Fri, 30 Aug 2019 05:17:31 +0000 (+0200)
Subject: filechooserwidget: Inline come functions into only callers
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~20^2~901
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4766b475d04dc9fbf8a0760badd3cea32c4dd2a2;p=gtk4.git

filechooserwidget: Inline come functions into only callers

Similar to the previous commit(s), make it clearer what this function
does.
---

diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c
index 3315fbb453..f3a4eb2cd5 100644
--- a/gtk/gtkfilechooserwidget.c
+++ b/gtk/gtkfilechooserwidget.c
@@ -7480,26 +7480,6 @@ recent_clear_model (GtkFileChooserWidget *impl,
   g_set_object (&priv->recent_model, NULL);
 }
 
-static void
-recent_setup_model (GtkFileChooserWidget *impl)
-{
-  GtkFileChooserWidgetPrivate *priv = gtk_file_chooser_widget_get_instance_private (impl);
-
-  g_assert (priv->recent_model == NULL);
-
-  priv->recent_model = _gtk_file_system_model_new (file_system_model_set,
-                                                   impl,
-                                                   MODEL_COLUMN_TYPES);
-
-  _gtk_file_system_model_set_filter (priv->recent_model, priv->current_filter);
-  gtk_tree_sortable_set_default_sort_func (GTK_TREE_SORTABLE (priv->recent_model),
-                                           recent_sort_func,
-                                           impl, NULL);
-  gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (priv->recent_model),
-                                        GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID,
-                                        GTK_SORT_DESCENDING);
-}
-
 static gboolean
 recent_item_is_private (GtkRecentInfo *info)
 {
@@ -7517,82 +7497,80 @@ recent_item_is_private (GtkRecentInfo *info)
   return is_private;
 }
 
-/* Populates the file system model with the GtkRecentInfo* items
- * in the provided list; frees the items
- */
 static void
-populate_model_with_recent_items (GtkFileChooserWidget *impl,
-                                  GList                *items)
+recent_start_loading (GtkFileChooserWidget *impl)
 {
   GtkFileChooserWidgetPrivate *priv = gtk_file_chooser_widget_get_instance_private (impl);
-  gint limit;
-  GList *l;
-  gint n;
+  GList *items;
 
-  limit = DEFAULT_RECENT_FILES_LIMIT;
+  recent_clear_model (impl, TRUE);
 
-  n = 0;
+  /* Setup recent model */
+  g_assert (priv->recent_model == NULL);
 
-  for (l = items; l; l = l->next)
-    {
-      GtkRecentInfo *info = l->data;
-      GFile *file;
+  priv->recent_model = _gtk_file_system_model_new (file_system_model_set,
+                                                   impl,
+                                                   MODEL_COLUMN_TYPES);
 
-      if (recent_item_is_private (info))
-        continue;
+  _gtk_file_system_model_set_filter (priv->recent_model, priv->current_filter);
+  gtk_tree_sortable_set_default_sort_func (GTK_TREE_SORTABLE (priv->recent_model),
+                                           recent_sort_func,
+                                           impl, NULL);
+  gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (priv->recent_model),
+                                        GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID,
+                                        GTK_SORT_DESCENDING);
 
-      file = g_file_new_for_uri (gtk_recent_info_get_uri (info));
-      _gtk_file_system_model_add_and_query_file (priv->recent_model,
-                                                 file,
-                                                 MODEL_ATTRIBUTES);
-      g_object_unref (file);
 
-      n++;
-      if (limit != -1 && n >= limit)
-        break;
-    }
+  if (!priv->recent_manager)
+    return;
 
-  g_set_object (&priv->model_for_search, priv->recent_model);
-}
+  items = gtk_recent_manager_get_items (priv->recent_manager);
+  if (!items)
+    return;
 
-static void
-populate_model_with_folders (GtkFileChooserWidget *impl,
-                             GList                *items)
-{
-  GtkFileChooserWidgetPrivate *priv = gtk_file_chooser_widget_get_instance_private (impl);
-  GList *folders;
-  GList *l;
+  if (priv->action == GTK_FILE_CHOOSER_ACTION_OPEN)
+    {
+      const int limit = DEFAULT_RECENT_FILES_LIMIT;
+      GList *l;
+      int n;
 
-  folders = _gtk_file_chooser_extract_recent_folders (items);
+      n = 0;
 
-  for (l = folders; l; l = l->next)
-    _gtk_file_system_model_add_and_query_file (priv->recent_model,
-                                               G_FILE (l->data),
-                                               MODEL_ATTRIBUTES);
+      for (l = items; l; l = l->next)
+        {
+          GtkRecentInfo *info = l->data;
+          GFile *file;
 
-  g_list_free_full (folders, g_object_unref);
-}
+          if (recent_item_is_private (info))
+            continue;
 
-static void
-recent_start_loading (GtkFileChooserWidget *impl)
-{
-  GtkFileChooserWidgetPrivate *priv = gtk_file_chooser_widget_get_instance_private (impl);
-  GList *items;
+          file = g_file_new_for_uri (gtk_recent_info_get_uri (info));
+          _gtk_file_system_model_add_and_query_file (priv->recent_model,
+                                                     file,
+                                                     MODEL_ATTRIBUTES);
+          g_object_unref (file);
 
-  recent_clear_model (impl, TRUE);
-  recent_setup_model (impl);
+          n++;
+          if (limit != -1 && n >= limit)
+            break;
+        }
 
-  if (!priv->recent_manager)
-    return;
+      g_set_object (&priv->model_for_search, priv->recent_model);
+    }
+  else
+    {
+      GList *folders;
+      GList *l;
 
-  items = gtk_recent_manager_get_items (priv->recent_manager);
-  if (!items)
-    return;
+      folders = _gtk_file_chooser_extract_recent_folders (items);
 
-  if (priv->action == GTK_FILE_CHOOSER_ACTION_OPEN)
-    populate_model_with_recent_items (impl, items);
-  else
-    populate_model_with_folders (impl, items);
+      for (l = folders; l; l = l->next)
+        _gtk_file_system_model_add_and_query_file (priv->recent_model,
+                                                   G_FILE (l->data),
+                                                   MODEL_ATTRIBUTES);
+
+      g_list_free_full (folders, g_object_unref);
+    }
 
   g_list_free_full (items, (GDestroyNotify) gtk_recent_info_unref);