[mate-system-monitor] add mate-system-monitor_Check-if-cpu-color-key-exists.patch

[Wolfgang Ulbrich]

commit 51fe69f7cd001f1c7d6f66638730a3aa6c5cc488
Author: raveit65 <chat-to-me at raveit.de>
Date:   Fri Jul 26 15:18:39 2013 +0200

    add mate-system-monitor_Check-if-cpu-color-key-exists.patch

 ...tem-monitor_Check-if-cpu-color-key-exists.patch |   64 ++++++++++++++++++++
 1 files changed, 64 insertions(+), 0 deletions(-)
---
diff --git a/mate-system-monitor_Check-if-cpu-color-key-exists.patch b/mate-system-monitor_Check-if-cpu-color-key-exists.patch
new file mode 100644
index 0000000..7e2fa21
--- /dev/null
+++ b/mate-system-monitor_Check-if-cpu-color-key-exists.patch
@@ -0,0 +1,64 @@
+From 0eda7f51e3612b50da0985fa5399c99f446890db Mon Sep 17 00:00:00 2001
+From: Stefano Karapetsas <stefano at karapetsas.com>
+Date: Fri, 28 Jun 2013 12:35:34 +0000
+Subject: Check if cpu color key exists before read it
+
+Closes #14 (https://github.com/mate-desktop/mate-system-monitor/issues/14)
+---
+diff --git a/src/procman.cpp b/src/procman.cpp
+index 67cc3df..b5fa0e7 100644
+--- a/src/procman.cpp
++++ b/src/procman.cpp
+@@ -189,15 +189,7 @@ static void
+ color_changed_cb (GSettings *settings, const gchar *key, gpointer data)
+ {
+ 	ProcData * const procdata = static_cast<ProcData*>(data);
+-	gchar **keys;
+-	gchar *color = NULL;
+-
+-	keys = g_settings_list_keys (settings);
+-	if (has_key (keys, key))
+-		color = g_settings_get_string (settings, key);
+-	else
+-		color = g_strdup("#000000");	/* black default color */
+-	g_strfreev (keys);
++	const gchar *color = g_settings_get_string (settings, key); 
+ 
+ 	if (g_str_has_prefix (key, "cpu-color")) {
+ 		for (int i = 0; i < procdata->config.num_cpus; i++) {
+@@ -249,6 +241,7 @@ procman_data_new (GSettings *settings)
+ 
+ 	ProcData *pd;
+ 	gchar *color;
++	gchar **keys;
+ 	gint swidth, sheight;
+ 	gint i;
+ 	glibtop_cpu cpu;
+@@ -301,12 +294,14 @@ procman_data_new (GSettings *settings)
+ 	if (pd->config.num_cpus == 0)
+ 	pd->config.num_cpus = 1;
+ 
++	keys = g_settings_list_keys (settings);
+ 	for (int i = 0; i < pd->config.num_cpus; i++) {
+ 		gchar *key;
+ 		key = g_strdup_printf ("cpu-color%d", i);
+ 
+-		color = g_settings_get_string (settings, key);
+-		if (!color)
++		if (has_key (keys, key))
++			color = g_settings_get_string (settings, key);
++		else
+ 			color = g_strdup ("#f25915e815e8");
+ 		detail_string = std::string("changed::") + std::string(key);
+ 		g_signal_connect (G_OBJECT(settings), detail_string.c_str(),
+@@ -315,6 +310,7 @@ procman_data_new (GSettings *settings)
+ 		g_free (color);
+ 		g_free (key);
+ 	}
++	g_strfreev (keys);
+ 	color = g_settings_get_string (settings, "mem-color");
+ 	if (!color)
+ 		color = g_strdup ("#000000ff0082");
+--
+cgit 
+