list-view: Fix change handler, improve preferences description and

behavior.

Author: mtwebster

gresources/nemo-file-management-properties.glade

@@ -921,7 +921,7 @@ along with .  If not, see <http://www.gnu.org/licenses/>.
                                         </child>
                                         <child>
                                           <object class="GtkCheckButton" id="list_view_show_expanders_checkbutton">
-                                            <property name="label" translatable="yes">Show expanders for folders with content</property>
+                                            <property name="label" translatable="yes">Show folder expanders</property>
                                             <property name="visible">True</property>
                                             <property name="can-focus">True</property>
                                             <property name="receives-default">False</property>

src/nemo-file-management-properties.c

@@ -552,6 +552,16 @@ 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,
@@ -1119,6 +1129,16 @@ nemo_file_management_properties_dialog_setup (GtkBuilder  *builder,
                        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-view.c

@@ -298,7 +298,7 @@ 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);
 
-    /* Note: Changes require a manual refresh to take effect */
+    nemo_window_slot_queue_reload (nemo_view_get_nemo_window_slot (NEMO_VIEW (view)), FALSE);
 }
 
 static void