[nautilus/gnome-3-20] files-view: use view_is_empty instead of custom code



commit a6ee147feb3044f7e6f05e121499108d191febd2
Author: Carlos Soriano <csoriano gnome org>
Date:   Mon Mar 14 15:49:14 2016 +0100

    files-view: use view_is_empty instead of custom code

 src/nautilus-files-view.c |   46 +++++++++++++++++++-------------------------
 1 files changed, 20 insertions(+), 26 deletions(-)
---
diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c
index 487e830..7a85a07 100644
--- a/src/nautilus-files-view.c
+++ b/src/nautilus-files-view.c
@@ -343,32 +343,6 @@ static const struct {
 #endif
 };
 
-static void
-check_empty_states (NautilusFilesView *view)
-{
-        GList *files;
-        GList *filtered;
-        gboolean show_hidden_files;
-
-        gtk_widget_hide (view->details->no_search_results_widget);
-        gtk_widget_hide (view->details->folder_is_empty_widget);
-        if (!view->details->loading && view->details->model && !NAUTILUS_IS_DESKTOP_CANVAS_VIEW (view)) {
-                files = nautilus_directory_get_file_list (view->details->model);
-                show_hidden_files = g_settings_get_boolean (gtk_filechooser_preferences,
-                                                            NAUTILUS_PREFERENCES_SHOW_HIDDEN_FILES);
-                filtered = nautilus_file_list_filter_hidden (files, show_hidden_files);
-                if (g_list_length (filtered) == 0) {
-                        if (nautilus_view_is_searching (NAUTILUS_VIEW (view))) {
-                                gtk_widget_show (view->details->no_search_results_widget);
-                        } else {
-                                gtk_widget_show (view->details->folder_is_empty_widget);
-                        }
-                }
-                nautilus_file_list_free (filtered);
-                nautilus_file_list_free (files);
-        }
-}
-
 /*
  * Floating Bar code
  */
@@ -3162,6 +3136,26 @@ reveal_selection_idle_callback (gpointer data)
 }
 
 static void
+check_empty_states (NautilusFilesView *view)
+{
+        GList *files;
+        GList *filtered;
+        gboolean show_hidden_files;
+
+        gtk_widget_hide (view->details->no_search_results_widget);
+        gtk_widget_hide (view->details->folder_is_empty_widget);
+        if (!view->details->loading &&
+            !NAUTILUS_IS_DESKTOP_CANVAS_VIEW (view) &&
+            nautilus_files_view_is_empty (view)) {
+                if (nautilus_view_is_searching (NAUTILUS_VIEW (view))) {
+                        gtk_widget_show (view->details->no_search_results_widget);
+                } else {
+                        gtk_widget_show (view->details->folder_is_empty_widget);
+                }
+        }
+}
+
+static void
 done_loading (NautilusFilesView *view,
               gboolean           all_files_seen)
 {


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]