[gnumeric] replace GdkColor with GdkRGBA with GTK 3.2 and later

[Andreas J. Guelzow <guelzow src gnome org>]

commit 9fc94f3165640f22947ba93b5307e98ba1bd2164
Author: Andreas J Guelzow <aguelzow pyrshep ca>
Date:   Mon Jan 9 08:09:12 2012 -0700

    replace	GdkColor with GdkRGBA with GTK 3.2 and later
    
    2012-01-09  Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* src/gui-util.c (gnm_store_text_tag_attr_in_pango): replace
    	GdkColor with GdkRGBA with GTK 3.2 and later

 ChangeLog      |    5 +++++
 src/gui-util.c |   30 +++++++++++++++++++++++-------
 2 files changed, 28 insertions(+), 7 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 4b82a63..2cc4982 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-09  Andreas J. Guelzow <aguelzow pyrshep ca>
+
+	* src/gui-util.c (gnm_store_text_tag_attr_in_pango): replace
+	GdkColor with GdkRGBA with GTK 3.2 and later
+
 2012-01-08  Jean Brefort  <jean brefort normalesup org>
 
 	* src/graph.c (gnm_go_data_vector_load_len): use
diff --git a/src/gui-util.c b/src/gui-util.c
index 5b9c8ac..84e3afc 100644
--- a/src/gui-util.c
+++ b/src/gui-util.c
@@ -425,7 +425,7 @@ gnm_gui_group_value (gpointer gui, char const * const group[])
 }
 
 static void
-kill_popup_menu (GtkWidget *widget, GtkMenu *menu)
+kill_popup_menu (G_GNUC_UNUSED GtkWidget *widget, GtkMenu *menu)
 {
 	g_return_if_fail (menu != NULL);
 	g_return_if_fail (GTK_IS_MENU (menu));
@@ -973,13 +973,29 @@ gnm_store_text_tag_attr_in_pango (PangoAttrList *list, GtkTextTag *tag, GtkTextI
 
 	g_object_get (G_OBJECT (tag), "foreground-set", &is_set, NULL);
 	if (is_set) {
-		GdkColor* color;
+#if GTK_MAJOR_VERSION > 3 || GTK_MINOR_VERSION >= 2
+		GdkRGBA *color = NULL;
+		g_object_get (G_OBJECT (tag), "foreground-rgba", &color, NULL);			
+#else
+		GdkColor *color = NULL;
 		g_object_get (G_OBJECT (tag), "foreground-gdk", &color, NULL);
-		attr =  pango_attr_foreground_new (color->red, color->green, color->blue);
-		attr->start_index = x;
-		attr->end_index = y;
-		pango_attr_list_change (list, attr);
-		gdk_color_free (color);
+#endif
+		if (color) {
+#if GTK_MAJOR_VERSION > 3 || GTK_MINOR_VERSION >= 2
+			/* dividing 0 to 1 into 65536 equal length intervals */
+			attr =  pango_attr_foreground_new 
+				((int)(CLAMP (color->red * 65536, 0., 65535.)), 
+				 (int)(CLAMP (color->green * 65536, 0., 65535.)), 
+				 (int)(CLAMP (color->blue * 65536, 0., 65535.)));
+			gdk_rgba_free (color);
+#else
+			attr =  pango_attr_foreground_new (color->red, color->green, color->blue);
+			gdk_color_free (color);
+#endif
+			attr->start_index = x;
+			attr->end_index = y;
+			pango_attr_list_change (list, attr);
+		}
 	}
 
 	gnmstoretexttagattrinpangoint ("style-set", "style", pango_attr_style_new)