[gnome-system-monitor] Handle show-all-fs settings within Disks

[Stefano Facchini <sfacchini src gnome org>]

commit d7fe44d2db65e5d68f9f38cfc8ff3d5f0fddd78e
Author: Stefano Facchini <stefano facchini gmail com>
Date:   Fri Aug 2 16:04:06 2013 +0200

    Handle show-all-fs settings within Disks

 src/disks.cpp       |   20 ++++++++++++++++++--
 src/procman-app.cpp |   15 ---------------
 src/procman-app.h   |    1 -
 3 files changed, 18 insertions(+), 18 deletions(-)
---
diff --git a/src/disks.cpp b/src/disks.cpp
index d18242a..293b0c6 100644
--- a/src/disks.cpp
+++ b/src/disks.cpp
@@ -244,15 +244,17 @@ disks_update(ProcmanApp *app)
     glibtop_mountentry * entries;
     glibtop_mountlist mountlist;
     guint i;
+    gboolean show_all_fs;
 
     list = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(app->disk_list)));
+    show_all_fs = g_settings_get_boolean (app->settings, "show-all-fs");
 
-    entries = glibtop_get_mountlist(&mountlist, app->config.show_all_fs);
+    entries = glibtop_get_mountlist (&mountlist, show_all_fs);
 
     remove_old_disks(GTK_TREE_MODEL(list), entries, mountlist.number);
 
     for (i = 0; i < mountlist.number; i++)
-        add_disk(list, &entries[i], app->config.show_all_fs);
+        add_disk(list, &entries[i], show_all_fs);
 
     g_free(entries);
 }
@@ -348,6 +350,16 @@ cb_disk_list_destroying (GtkWidget *self, gpointer data)
                                           data);
 }
 
+static void
+cb_show_all_fs_changed (GSettings *settings, const gchar *key, gpointer data)
+{
+    ProcmanApp *app = (ProcmanApp *) data;
+
+    disks_update (app);
+    disks_reset_timeout (app);
+}
+
+
 void
 create_disk_view(ProcmanApp *app, GtkBuilder *builder)
 {
@@ -483,5 +495,9 @@ create_disk_view(ProcmanApp *app, GtkBuilder *builder)
                       
     g_signal_connect (G_OBJECT (model), "sort-column-changed",
                       G_CALLBACK (cb_sort_changed), app);
+
+    g_signal_connect (app->settings, "changed::show-all-fs",
+                      G_CALLBACK (cb_show_all_fs_changed), app);
+
     gtk_widget_show (disk_tree);
 }
diff --git a/src/procman-app.cpp b/src/procman-app.cpp
index fd063c8..893ef65 100644
--- a/src/procman-app.cpp
+++ b/src/procman-app.cpp
@@ -189,16 +189,6 @@ color_changed_cb (GSettings *settings, const gchar *key, gpointer data)
     g_free (color);
 }
 
-static void
-show_all_fs_changed_cb (GSettings *settings, const gchar *key, gpointer data)
-{
-    ProcmanApp *app = static_cast<ProcmanApp *>(data);
-
-    app->config.show_all_fs = g_settings_get_boolean (settings, key);
-
-    disks_update (app);
-}
-
 void
 ProcmanApp::load_settings()
 {
@@ -232,11 +222,6 @@ ProcmanApp::load_settings()
     g_signal_connect (G_OBJECT(settings), "changed::disks-interval", G_CALLBACK(timeouts_changed_cb), this);
 
 
-    /* show_all_fs */
-    config.show_all_fs = g_settings_get_boolean (settings, "show-all-fs");
-    g_signal_connect (settings, "changed::show-all-fs", G_CALLBACK(show_all_fs_changed_cb), this);
-
-
     g_signal_connect (G_OBJECT(settings), "changed::show-whose-processes", 
G_CALLBACK(cb_show_whose_processes_changed), this);
 
     /* Determine number of cpus since libgtop doesn't really tell you*/
diff --git a/src/procman-app.h b/src/procman-app.h
index 951dc02..dcbd0fc 100644
--- a/src/procman-app.h
+++ b/src/procman-app.h
@@ -27,7 +27,6 @@ enum ProcmanTab
 
 struct ProcConfig
 {
-    gboolean        show_all_fs;
     int             update_interval;
     int             graph_update_interval;
     int             disks_update_interval;