[gnome-system-monitor/gtk3] Fixed up most GSettings port issues.

[Chris Kühl <chriskuehl src gnome org>]

commit 9922ec74802dfc86f24744edb776f9d456dfba56
Author: Chris Kühl <chrisk openismus com>
Date:   Tue Feb 8 17:17:20 2011 +0100

    Fixed up most GSettings port issues.
    
    * Most issues fixed by replacing _ with - in key names. Duh.
    * Also fixed an infinite loop issue.
    * There are still a few issues to resolve.

 src/callbacks.cpp   |   10 +++++-----
 src/disks.cpp       |    2 +-
 src/procdialogs.cpp |   11 +++++------
 src/procman.cpp     |   33 ++++++++++++++++++---------------
 src/proctable.cpp   |    2 +-
 5 files changed, 30 insertions(+), 28 deletions(-)
---
diff --git a/src/callbacks.cpp b/src/callbacks.cpp
index 91c7d81..6e8ec66 100644
--- a/src/callbacks.cpp
+++ b/src/callbacks.cpp
@@ -235,7 +235,7 @@ cb_cpu_color_changed (GSMColorButton *cp, gpointer data)
 	gint i = GPOINTER_TO_INT (data);
 	GSettings *settings = g_settings_new (GSM_GSETTINGS_SCHEMA);
 
-	g_snprintf(key, sizeof key, "cpu_color%d", i);
+	g_snprintf(key, sizeof key, "cpu-color%d", i);
 
 	change_settings_color(settings, key, cp);
 }
@@ -244,7 +244,7 @@ void
 cb_mem_color_changed (GSMColorButton *cp, gpointer data)
 {
 	ProcData * const procdata = static_cast<ProcData*>(data);
-	change_settings_color(procdata->settings, "mem_color", cp);
+	change_settings_color(procdata->settings, "mem-color", cp);
 }
 
 
@@ -252,21 +252,21 @@ void
 cb_swap_color_changed (GSMColorButton *cp, gpointer data)
 {
 	ProcData * const procdata = static_cast<ProcData*>(data);
-	change_settings_color(procdata->settings, "swap_color", cp);
+	change_settings_color(procdata->settings, "swap-color", cp);
 }
 
 void
 cb_net_in_color_changed (GSMColorButton *cp, gpointer data)
 {
 	ProcData * const procdata = static_cast<ProcData*>(data);
-	change_settings_color(procdata->settings, "net_in_color", cp);
+	change_settings_color(procdata->settings, "net-in-color", cp);
 }
 
 void
 cb_net_out_color_changed (GSMColorButton *cp, gpointer data)
 {
 	ProcData * const procdata = static_cast<ProcData*>(data);
-	change_settings_color(procdata->settings, "net_out_color", cp);
+	change_settings_color(procdata->settings, "net-out-color", cp);
 }
 
 static void
diff --git a/src/disks.cpp b/src/disks.cpp
index 18a6b6b..97ac949 100644
--- a/src/disks.cpp
+++ b/src/disks.cpp
@@ -247,7 +247,7 @@ cb_disk_columns_changed(GtkTreeView *treeview, gpointer user_data)
 
 	procman_save_tree_state(procdata->settings,
 				GTK_WIDGET(treeview),
-				"/apps/procman/disktreenew");
+				"disktreenew");
 }
 
 
diff --git a/src/procdialogs.cpp b/src/procdialogs.cpp
index 411dcca..d84fdf9 100644
--- a/src/procdialogs.cpp
+++ b/src/procdialogs.cpp
@@ -268,8 +268,7 @@ show_kill_dialog_toggled (GtkToggleButton *button, gpointer data)
 	
 	toggled = gtk_toggle_button_get_active (button);
 	
-	g_settings_set_boolean (settings, "/apps/procman/kill_dialog", toggled);
-		
+	g_settings_set_boolean (settings, "kill-dialog", toggled);
 }
 
 
@@ -324,7 +323,7 @@ show_all_fs_toggled (GtkToggleButton *button, gpointer data)
 
 	toggled = gtk_toggle_button_get_active (button);
 
-	g_settings_set_boolean (settings, "show_all_fs", toggled);
+	g_settings_set_boolean (settings, "show-all-fs", toggled);
 }
 
 
@@ -470,9 +469,9 @@ procdialog_create_preferences_dialog (ProcData *procdata)
 
 	typedef SpinButtonUpdater SBU;
 
-	static SBU interval_updater("/apps/procman/update_interval");
-	static SBU graph_interval_updater("/apps/procman/graph_update_interval");
-	static SBU disks_interval_updater("/apps/procman/disks_interval");
+	static SBU interval_updater("update-interval");
+	static SBU graph_interval_updater("graph-update-interval");
+	static SBU disks_interval_updater("disks-interval");
 
 	GtkWidget *notebook;
 	GtkWidget *proc_box;
diff --git a/src/procman.cpp b/src/procman.cpp
index 9524527..1effa33 100644
--- a/src/procman.cpp
+++ b/src/procman.cpp
@@ -356,17 +356,17 @@ procman_free_data (ProcData *procdata)
 
 
 gboolean
-procman_get_tree_state (GSettings *settings, GtkWidget *tree, const gchar *child_scheme)
+procman_get_tree_state (GSettings *settings, GtkWidget *tree, const gchar *child_schema)
 {
 	GtkTreeModel *model;
 	GList *columns, *it;
 	gint sort_col;
 	GtkSortType order;
-        
-	GSettings *pt_settings = g_settings_get_child (settings, child_scheme);
 
 	g_assert(tree);
-	g_assert(child_scheme);
+	g_assert(child_schema);
+        
+	GSettings *pt_settings = g_settings_get_child (settings, child_schema);
 
 	model = gtk_tree_view_get_model (GTK_TREE_VIEW (tree));
 	
@@ -381,7 +381,7 @@ procman_get_tree_state (GSettings *settings, GtkWidget *tree, const gchar *child
 
 	columns = gtk_tree_view_get_columns (GTK_TREE_VIEW (tree));
 
-	if(!g_strcmp0(child_scheme, "proctree"))
+	if(!g_strcmp0(child_schema, "proctree"))
         {
             for(it = columns; it; it = it->next)
             {
@@ -413,8 +413,8 @@ procman_get_tree_state (GSettings *settings, GtkWidget *tree, const gchar *child
             }
         }
             
-	if(!g_strcmp0(child_scheme, "proctree") ||
-           !g_strcmp0(child_scheme, "disktreenew"))
+	if(!g_strcmp0(child_schema, "proctree") ||
+           !g_strcmp0(child_schema, "disktreenew"))
 	{
             GVariant     *value;
             GVariantIter iter;
@@ -451,15 +451,18 @@ procman_save_tree_state (GSettings *settings, GtkWidget *tree, const gchar *chil
 	
 	g_assert(tree);
 	g_assert(child_schema);
+        
+	GSettings *pt_settings = g_settings_get_child (settings, child_schema);
 	
 	model = gtk_tree_view_get_model (GTK_TREE_VIEW (tree));
 	if (gtk_tree_sortable_get_sort_column_id (GTK_TREE_SORTABLE (model), &sort_col,
 					          &order)) {
-		g_settings_set_int (settings, "sort-col", sort_col);		
-		g_settings_set_int (settings, "sort-order", order);
+		g_settings_set_int (pt_settings, "sort-col", sort_col);		
+		g_settings_set_int (pt_settings, "sort-order", order);
 	}			       
 	
 	columns = gtk_tree_view_get_columns (GTK_TREE_VIEW (tree));
+        g_print("%i\n", g_list_length(columns));
 
         if(!g_strcmp0(child_schema, "proctree"))
         {
@@ -477,11 +480,11 @@ procman_save_tree_state (GSettings *settings, GtkWidget *tree, const gchar *chil
 		width = gtk_tree_view_column_get_width (column);
 
 		key = g_strdup_printf ("col-%d-width", id);
-		g_settings_set_int (settings, key, width);
+		g_settings_set_int (pt_settings, key, width);
 		g_free (key);
 
 		key = g_strdup_printf ("col-%d-visible", id);
-		g_settings_set_boolean (settings, key, visible);
+		g_settings_set_boolean (pt_settings, key, visible);
 		g_free (key);
             }
         }
@@ -489,6 +492,7 @@ procman_save_tree_state (GSettings *settings, GtkWidget *tree, const gchar *chil
 	if(!g_strcmp0(child_schema, "proctree") || !g_strcmp0(child_schema, "disktreenew"))
 	{
 		GSList *order;
+		GSList *order_node;
 		GVariantBuilder *builder;
 		GVariant *order_variant;
 	
@@ -496,15 +500,14 @@ procman_save_tree_state (GSettings *settings, GtkWidget *tree, const gchar *chil
 
 		builder = g_variant_builder_new (G_VARIANT_TYPE_ARRAY);
 		
-		GSList *order_node;
-		for(order_node = order; order; order_node = order->next)
+		for(order_node = order; order_node; order_node = order_node->next)
 			g_variant_builder_add(builder, "i", GPOINTER_TO_INT(order_node->data));
 		
 		order_variant = g_variant_new("ai", builder);
-		g_settings_set_value(settings, "columns-order", order_variant);
+		g_settings_set_value(pt_settings, "columns-order", order_variant);
 
 		g_slist_free(order);	
-}
+        }
 
 	g_list_free(columns);
 }
diff --git a/src/proctable.cpp b/src/proctable.cpp
index 8b6d238..1c6b897 100644
--- a/src/proctable.cpp
+++ b/src/proctable.cpp
@@ -91,7 +91,7 @@ cb_columns_changed(GtkTreeView *treeview, gpointer user_data)
 
 	procman_save_tree_state(procdata->settings,
 				GTK_WIDGET(treeview),
-				"/apps/procman/proctree");
+				"proctree");
 }