gnome-system-monitor r2319 - trunk/src

[bdejean svn gnome org]

Author: bdejean
Date: Thu Feb 21 20:06:03 2008
New Revision: 2319
URL: http://svn.gnome.org/viewvc/gnome-system-monitor?rev=2319&view=rev

Log:
Simplified LoadGraph::colors access and added index checks.


Modified:
   trunk/src/interface.cpp
   trunk/src/load-graph.cpp
   trunk/src/load-graph.h
   trunk/src/procman.cpp

Modified: trunk/src/interface.cpp
==============================================================================
--- trunk/src/interface.cpp	(original)
+++ trunk/src/interface.cpp	Thu Feb 21 20:06:03 2008
@@ -291,8 +291,7 @@
 		/*g_signal_connect (G_OBJECT (temp_hbox), "size_request",
 					 G_CALLBACK(size_request), &cpu_size);
 */
-		color_picker = gsm_color_button_new (
-			&load_graph_get_colors(cpu_graph)[i], GSMCP_TYPE_CPU);
+		color_picker = gsm_color_button_new (&cpu_graph->colors.at(i), GSMCP_TYPE_CPU);
 		g_signal_connect (G_OBJECT (color_picker), "color_set",
 			    G_CALLBACK (cb_cpu_color_changed), GINT_TO_POINTER (i));
 		gtk_box_pack_start (GTK_BOX (temp_hbox), color_picker, FALSE, TRUE, 0);
@@ -438,7 +437,7 @@
 			    TRUE, TRUE, 0);
 
 	color_picker = gsm_color_button_new (
-		&load_graph_get_colors(net_graph)[0], GSMCP_TYPE_NETWORK_IN);
+		&net_graph->colors.at(0), GSMCP_TYPE_NETWORK_IN);
 	g_signal_connect (G_OBJECT (color_picker), "color_set",
 			    G_CALLBACK (cb_net_in_color_changed), procdata);
 	gtk_table_attach (GTK_TABLE (table), color_picker, 0, 1, 0, 2, GTK_SHRINK, GTK_SHRINK, 0, 0);
@@ -493,7 +492,7 @@
 			    TRUE, TRUE, 0);
 
 	color_picker = gsm_color_button_new (
-		&load_graph_get_colors(net_graph)[1], GSMCP_TYPE_NETWORK_OUT);
+		&net_graph->colors.at(1), GSMCP_TYPE_NETWORK_OUT);
 	g_signal_connect (G_OBJECT (color_picker), "color_set",
 			    G_CALLBACK (cb_net_out_color_changed), procdata);
 	gtk_table_attach (GTK_TABLE (table), color_picker, 0, 1, 0, 2, GTK_SHRINK, GTK_SHRINK, 0, 0);

Modified: trunk/src/load-graph.cpp
==============================================================================
--- trunk/src/load-graph.cpp	(original)
+++ trunk/src/load-graph.cpp	Thu Feb 21 20:06:03 2008
@@ -778,12 +778,6 @@
 	}
 }
 
-GdkColor*
-load_graph_get_colors (LoadGraph *g)
-{
-	return &g->colors[0];
-}
-
 
 LoadGraphLabels*
 load_graph_get_labels (LoadGraph *g)

Modified: trunk/src/load-graph.h
==============================================================================
--- trunk/src/load-graph.h	(original)
+++ trunk/src/load-graph.h	Thu Feb 21 20:06:03 2008
@@ -114,9 +114,6 @@
 load_graph_change_speed (LoadGraph *g,
 			 guint new_speed);
 
-GdkColor*
-load_graph_get_colors (LoadGraph *g) G_GNUC_CONST;
-
 LoadGraphLabels*
 load_graph_get_labels (LoadGraph *g) G_GNUC_CONST;
 

Modified: trunk/src/procman.cpp
==============================================================================
--- trunk/src/procman.cpp	(original)
+++ trunk/src/procman.cpp	Thu Feb 21 20:06:03 2008
@@ -181,7 +181,7 @@
 
 	if (g_str_equal (key, "/apps/procman/cpu_color")) {
 		gdk_color_parse (color, &procdata->config.cpu_color[0]);
-		load_graph_get_colors(procdata->cpu_graph)[0] = procdata->config.cpu_color[0];
+		procdata->cpu_graph->colors.at(0) = procdata->config.cpu_color[0];
 	}
 	else if (g_str_has_prefix (key, "/apps/procman/cpu_color")) {
 		gint i;
@@ -191,26 +191,26 @@
 			cpu_key = g_strdup_printf ("/apps/procman/cpu_color%d",i);
 			if (g_str_equal (key, cpu_key)) {
 				gdk_color_parse (color, &procdata->config.cpu_color[i]);
-				load_graph_get_colors(procdata->cpu_graph)[i] = procdata->config.cpu_color[i];
+				procdata->cpu_graph->colors.at(i) = procdata->config.cpu_color[i];
 			}
 			g_free (cpu_key);
 		}
 	}
 	else if (g_str_equal (key, "/apps/procman/mem_color")) {
 		gdk_color_parse (color, &procdata->config.mem_color);
-		load_graph_get_colors(procdata->mem_graph)[0] = procdata->config.mem_color;
+		procdata->mem_graph->colors.at(0) = procdata->config.mem_color;
 	}
 	else if (g_str_equal (key, "/apps/procman/swap_color")) {
 		gdk_color_parse (color, &procdata->config.swap_color);
-		load_graph_get_colors(procdata->mem_graph)[1] = procdata->config.swap_color;
+		procdata->mem_graph->colors.at(1) = procdata->config.swap_color;
 	}
 	else if (g_str_equal (key, "/apps/procman/net_in_color")) {
 		gdk_color_parse (color, &procdata->config.net_in_color);
-		load_graph_get_colors(procdata->net_graph)[0] = procdata->config.net_in_color;
+		procdata->net_graph->colors.at(0) = procdata->config.net_in_color;
 	}
 	else if (g_str_equal (key, "/apps/procman/net_out_color")) {
 		gdk_color_parse (color, &procdata->config.net_out_color);
-		load_graph_get_colors(procdata->net_graph)[1] = procdata->config.net_out_color;
+		procdata->net_graph->colors.at(1) = procdata->config.net_out_color;
 	}
 	else {
 		g_assert_not_reached();