Revert "Add option to allow expanders in empty folders (#3593)"

This reverts commits 4193e72 and
4193e72.

The issues related to the expander absence/presence are correct and
they describe either a bug or a limitation, not the need for a
configuration preference.

Possible solutions are:

- To accept this as a limitation (present scenario)
- To monitor visible subdirectories (this could be costly in perf,
potentially limited to local FS, or only done behind a pref).
- To remove expanders altogether since the information they show
is not accurate.

Author: clefebvre

gresources/nemo-file-management-properties.glade

@@ -935,22 +935,6 @@ along with .  If not, see <http://www.gnu.org/licenses/>.
                                             <property name="position">1</property>
                                           </packing>
                                         </child>
-                                        <child>
-                                          <object class="GtkCheckButton" id="list_view_show_empty_expanders_checkbutton">
-                                            <property name="label" translatable="yes">Show expanders for empty folders</property>
-                                            <property name="visible">True</property>
-                                            <property name="can-focus">True</property>
-                                            <property name="receives-default">False</property>
-                                            <property name="use-underline">True</property>
-                                            <property name="xalign">0</property>
-                                            <property name="draw-indicator">True</property>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="fill">False</property>
-                                            <property name="position">2</property>
-                                          </packing>
-                                        </child>
                                       </object>
                                     </child>
                                   </object>

libnemo-private/nemo-global-preferences.c

@@ -132,12 +132,6 @@ nemo_global_preferences_get_size_prefix_preference (void)
     return 0;
 }
 
-gboolean
-nemo_global_preferences_get_always_show_folder_expander (void)
-{
-    return g_settings_get_boolean (nemo_list_view_preferences, NEMO_PREFERENCES_LIST_VIEW_ALWAYS_SHOW_EXPANDER);
-}
-
 char *
 nemo_global_preferences_get_desktop_iid (void)
 {

libnemo-private/nemo-global-preferences.h

@@ -183,7 +183,6 @@ enum
 #define NEMO_PREFERENCES_LIST_VIEW_DEFAULT_VISIBLE_COLUMNS		"default-visible-columns"
 #define NEMO_PREFERENCES_LIST_VIEW_DEFAULT_COLUMN_ORDER		"default-column-order"
 #define NEMO_PREFERENCES_LIST_VIEW_ENABLE_EXPANSION         "enable-folder-expansion"
-#define NEMO_PREFERENCES_LIST_VIEW_ALWAYS_SHOW_EXPANDER     "always-show-folder-expander"
 
 #define NEMO_PREFERENCES_MAX_THUMBNAIL_THREADS "thumbnail-threads"
 
@@ -302,8 +301,6 @@ gint nemo_global_preferences_get_tooltip_flags (void);
 gboolean nemo_global_preferences_should_load_plugin (const gchar *name, const gchar *key);
 gchar **nemo_global_preferences_get_fileroller_mimetypes (void);
 
-gboolean nemo_global_preferences_get_always_show_folder_expander (void);
-
 gchar *nemo_global_preferences_get_mono_system_font (void);
 gchar *nemo_global_preferences_get_mono_font_family_match (const gchar *in_family);
 

libnemo-private/org.nemo.gschema.xml

@@ -532,11 +532,6 @@
       <default>false</default>
       <summary>If true, allow folders with content to be expanded in the current view.</summary>
     </key>
-    <key name="always-show-folder-expander" type="b">
-      <default>false</default>
-      <summary>If true, also allow folders without content to be expanded.</summary>
-      <description>If true, show expander arrows for all folders, even empty ones. Note: reload once to see changes.</description>
-    </key>
   </schema>
 
   <schema id="org.nemo.sidebar-panels" path="/org/nemo/sidebar-panels/" gettext-domain="nemo">

src/nemo-file-management-properties.c

@@ -73,7 +73,6 @@
 #define NEMO_FILE_MANAGEMENT_PROPERTIES_OPEN_NEW_WINDOW_WIDGET "new_window_checkbutton"
 #define NEMO_FILE_MANAGEMENT_PROPERTIES_TREE_VIEW_FOLDERS_WIDGET "treeview_folders_checkbutton"
 #define NEMO_FILE_MANAGEMENT_PROPERTIES_SHOW_LIST_VIEW_EXPANDERS_WIDGET "list_view_show_expanders_checkbutton"
-#define NEMO_FILE_MANAGEMENT_PROPERTIES_SHOW_EMPTY_FOLDER_EXPANDERS_WIDGET "list_view_show_empty_expanders_checkbutton"
 
 #define NEMO_FILE_MANAGEMENT_PROPERTIES_SHOW_PREVIOUS_ICON_TOOLBAR_WIDGET "show_previous_icon_toolbar_togglebutton"
 #define NEMO_FILE_MANAGEMENT_PROPERTIES_SHOW_NEXT_ICON_TOOLBAR_WIDGET "show_next_icon_toolbar_togglebutton"
@@ -552,16 +551,6 @@ nemo_file_management_properties_dialog_setup_list_column_page (GtkBuilder *build
 	gtk_box_pack_start (GTK_BOX (box), chooser, TRUE, TRUE, 0);
 }
 
-static void
-disable_expander_child_setting (GSettings   *settings,
-                                const gchar *key,
-                                gpointer     user_data)
-{
-    if (!g_settings_get_boolean (settings, key)) {
-        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (user_data), FALSE);
-    }
-}
-
 static void
 bind_builder_bool (GtkBuilder *builder,
 		   GSettings *settings,
@@ -1125,20 +1114,6 @@ nemo_file_management_properties_dialog_setup (GtkBuilder  *builder,
                        NEMO_FILE_MANAGEMENT_PROPERTIES_SHOW_LIST_VIEW_EXPANDERS_WIDGET,
                        NEMO_PREFERENCES_LIST_VIEW_ENABLE_EXPANSION);
 
-    bind_builder_bool (builder, nemo_list_view_preferences,
-                       NEMO_FILE_MANAGEMENT_PROPERTIES_SHOW_EMPTY_FOLDER_EXPANDERS_WIDGET,
-                       NEMO_PREFERENCES_LIST_VIEW_ALWAYS_SHOW_EXPANDER);
-
-    g_settings_bind (nemo_list_view_preferences, NEMO_PREFERENCES_LIST_VIEW_ENABLE_EXPANSION,
-                     gtk_builder_get_object (builder, NEMO_FILE_MANAGEMENT_PROPERTIES_SHOW_EMPTY_FOLDER_EXPANDERS_WIDGET),
-                     "sensitive",
-                     G_SETTINGS_BIND_GET);
-
-    g_signal_connect (nemo_list_view_preferences,
-                      "changed::" NEMO_PREFERENCES_LIST_VIEW_ENABLE_EXPANSION,
-                      G_CALLBACK (disable_expander_child_setting),
-                      gtk_builder_get_object (builder, NEMO_FILE_MANAGEMENT_PROPERTIES_SHOW_EMPTY_FOLDER_EXPANDERS_WIDGET));
-
     setup_tooltip_items (builder);
     connect_tooltip_items (builder);
 

src/nemo-list-model.c

@@ -38,7 +38,6 @@
 #include <eel/eel-graphic-effects.h>
 #include <libnemo-private/nemo-dnd.h>
 #include <libnemo-private/nemo-file-utilities.h>
-#include <libnemo-private/nemo-global-preferences.h>
 
 enum {
 	SUBDIRECTORY_UNLOADED,
@@ -519,13 +518,6 @@ nemo_list_model_iter_has_child (GtkTreeModel *tree_model, GtkTreeIter *iter)
 
 	file_entry = g_sequence_get (iter->user_data);
 
-	/* If the file is a directory and always-show-expander is enabled, always return TRUE */
-	if (file_entry->file && nemo_file_is_directory (file_entry->file)) {
-		if (nemo_global_preferences_get_always_show_folder_expander()) {
-			return TRUE;
-		}
-	}
-
 	return (file_entry->files != NULL && g_sequence_get_length (file_entry->files) > 0);
 }
 
@@ -1087,9 +1079,7 @@ nemo_list_model_add_file (NemoListModel *model, NemoFile *file,
 
         got_count = nemo_file_get_directory_item_count (file, &count, &unreadable);
 
-        /* Always add dummy row if always-show-expander is enabled, or if directory has items */
-        if (nemo_global_preferences_get_always_show_folder_expander() ||
-            (!got_count && !unreadable) || count > 0) {
+        if ((!got_count && !unreadable) || count > 0) {
             add_dummy_row (model, file_entry);
             gtk_tree_model_row_has_child_toggled (GTK_TREE_MODEL (model),
                                                   path, &iter);
@@ -1115,9 +1105,7 @@ update_dummy_row (NemoListModel *model,
 
     got_count = nemo_file_get_directory_item_count (file, &count, &unreadable);
 
-    /* Only remove dummy row if always-show-expander is disabled and directory is empty */
-    if (!nemo_global_preferences_get_always_show_folder_expander() &&
-        ((got_count && count == 0) || (!got_count && unreadable))) {
+    if ((got_count && count == 0) || (!got_count && unreadable)) {
         files = file_entry->files;
         if (g_sequence_get_length (files) == 1) {
             GSequenceIter *dummy_ptr = g_sequence_get_iter_at_pos (files, 0);
@@ -1290,9 +1278,7 @@ nemo_list_model_remove (NemoListModel *model, GtkTreeIter *iter)
 
         got_count = nemo_file_get_directory_item_count (parent_file_entry->file, &count, &unreadable);
 
-        /* Always add dummy row if always-show-expander is enabled, or if directory has items */
-        if (nemo_global_preferences_get_always_show_folder_expander() ||
-            (!got_count && !unreadable) || count > 0) {
+        if ((!got_count && !unreadable) || count > 0) {
             add_dummy_row (model, parent_file_entry);
         }
     }

src/nemo-list-view.c

@@ -292,15 +292,6 @@ expanders_enabled_changed_cb (NemoListView *view)
                                                              NEMO_PREFERENCES_LIST_VIEW_ENABLE_EXPANSION));
 }
 
-static void
-always_show_expander_changed_cb (NemoListView *view)
-{
-    g_return_if_fail (NEMO_IS_LIST_VIEW (view));
-    g_return_if_fail (GTK_IS_TREE_VIEW (view->details->tree_view) && view->details->tree_view != NULL);
-
-    nemo_window_slot_queue_reload (nemo_view_get_nemo_window_slot (NEMO_VIEW (view)), FALSE);
-}
-
 static void
 list_selection_changed_callback (GtkTreeSelection *selection, gpointer user_data)
 {
@@ -2546,11 +2537,6 @@ create_and_set_up_tree_view (NemoListView *view)
                               G_CALLBACK (expanders_enabled_changed_cb),
                               view);
 
-    g_signal_connect_swapped (nemo_list_view_preferences,
-                              "changed::" NEMO_PREFERENCES_LIST_VIEW_ALWAYS_SHOW_EXPANDER,
-                              G_CALLBACK (always_show_expander_changed_cb),
-                              view);
-
 	view->details->columns = g_hash_table_new_full (g_str_hash,
 							g_str_equal,
 							(GDestroyNotify) g_free,
@@ -4213,10 +4199,6 @@ nemo_list_view_finalize (GObject *object)
     g_signal_handlers_disconnect_by_func (nemo_list_view_preferences,
                                           expanders_enabled_changed_cb,
                                           list_view);
-    g_signal_handlers_disconnect_by_func (nemo_list_view_preferences,
-                                          always_show_expander_changed_cb,
-                                          list_view);
-
     g_signal_handlers_disconnect_by_func (nemo_preferences,
                                           tooltip_prefs_changed_callback,
                                           list_view);