From d4571114e8b8949922213ac23825075880e59231 Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Fri, 21 Oct 2011 14:11:57 +0200
Subject: Bug #660738 - Font changes ignored since 3.2

---
 e-util/e-util.c | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

(limited to 'e-util')

diff --git a/e-util/e-util.c b/e-util/e-util.c
index cd489849e4..cda17cbbc9 100644
--- a/e-util/e-util.c
+++ b/e-util/e-util.c
@@ -1390,9 +1390,19 @@ e_binding_transform_color_to_string (GBinding *binding,
 	g_return_val_if_fail (G_IS_BINDING (binding), FALSE);
 
 	color = g_value_get_boxed (source_value);
-	string = gdk_color_to_string (color);
-	g_value_set_string (target_value, string);
-	g_free (string);
+	if (!color) {
+		g_value_set_string (target_value, "");
+	} else {
+		/* encode color manually, because css styles expect colors in #rrggbb,
+		   not in #rrrrggggbbbb, which is a result of gdk_color_to_string()
+		*/
+		string = g_strdup_printf ("#%02x%02x%02x",
+			(gint) color->red * 256 / 65536,
+			(gint) color->green * 256 / 65536,
+			(gint) color->blue * 256 / 65536);
+		g_value_set_string (target_value, string);
+		g_free (string);
+	}
 
 	return TRUE;
 }
-- 
cgit v1.2.3