empathy r2712 - branches/gnome-2-26/libempathy-gtk

[xclaesse svn gnome org]

Author: xclaesse
Date: Tue Mar 17 20:19:13 2009
New Revision: 2712
URL: http://svn.gnome.org/viewvc/empathy?rev=2712&view=rev

Log:
Correctly get foreground-gdk color

From: Xavier Claessens <xclaesse gmail com>

Modified:
   branches/gnome-2-26/libempathy-gtk/empathy-theme-boxes.c
   branches/gnome-2-26/libempathy-gtk/empathy-theme-manager.c

Modified: branches/gnome-2-26/libempathy-gtk/empathy-theme-boxes.c
==============================================================================
--- branches/gnome-2-26/libempathy-gtk/empathy-theme-boxes.c	(original)
+++ branches/gnome-2-26/libempathy-gtk/empathy-theme-boxes.c	Tue Mar 17 20:19:13 2009
@@ -275,10 +275,12 @@
 	tag = gtk_text_tag_table_lookup (table, EMPATHY_THEME_BOXES_TAG_HEADER);
 	g_object_get (tag, "foreground-set", &color_set, NULL);
 	if (color_set) {
-		GdkColor color;
+		GdkColor *color;
+
 		g_object_get (tag, "foreground-gdk", &color, NULL);
-		gtk_widget_modify_fg (label1, GTK_STATE_NORMAL, &color);
-		gtk_widget_modify_fg (label2, GTK_STATE_NORMAL, &color);
+		gtk_widget_modify_fg (label1, GTK_STATE_NORMAL, color);
+		gtk_widget_modify_fg (label2, GTK_STATE_NORMAL, color);
+		gdk_color_free (color);
 	}
 
 	/* Pack labels into the box */

Modified: branches/gnome-2-26/libempathy-gtk/empathy-theme-manager.c
==============================================================================
--- branches/gnome-2-26/libempathy-gtk/empathy-theme-manager.c	(original)
+++ branches/gnome-2-26/libempathy-gtk/empathy-theme-manager.c	Tue Mar 17 20:19:13 2009
@@ -231,14 +231,11 @@
 	/* Define BOXES tags */
 	tag = empathy_chat_text_view_tag_set (view, EMPATHY_THEME_BOXES_TAG_HEADER,
 					      "weight", PANGO_WEIGHT_BOLD,
-					      "foreground", header_foreground,
-					      "paragraph-background", header_background,
 					      NULL);
 	TAG_SET ("foreground", "foreground-set", header_foreground);
 	TAG_SET ("paragraph-background", "paragraph-background-set", header_background);
 	tag = empathy_chat_text_view_tag_set (view, EMPATHY_THEME_BOXES_TAG_HEADER_LINE,
 					      "size", 1,
-					      "paragraph-background", header_line_background,
 					      NULL);
 	TAG_SET ("paragraph-background", "paragraph-background-set", header_line_background);