im.pidgin.pidgin.2.3.1: 36539552dc3f61d69e68c54d5ffc3e80ce34e2f3

[nosnilmot at pidgin.im]

-----------------------------------------------------------------
Revision: 36539552dc3f61d69e68c54d5ffc3e80ce34e2f3
Ancestor: adc0a83809e77c5c02ae26b2aff13e543de65cb3
Author: nosnilmot at pidgin.im
Date: 2007-12-07T01:31:35
Branch: im.pidgin.pidgin.2.3.1

Modified files:
        pidgin/gtkblist.c

ChangeLog: 

applied changes from fd241751ba7c5d47fe66c0b96787eae776d435af
             through 291ef07a3b75f3cde5bcdd92767af92401228a7a

<nosnilmot> seanegan: should 291ef07a3b75f3cde5bcdd92767af92401228a7a make it in to 2.3.1 ?
<seanegan> nosnilmot: yeah

Don't set the color for the group node text, now that we're not setting its background

-------------- next part --------------
============================================================
--- pidgin/gtkblist.c	966617642f39748e76642945f9aeeabc489e4891
+++ pidgin/gtkblist.c	250a6b03f2691a20a2be9437981462ea4d7437b0
@@ -5695,7 +5695,6 @@ static char *pidgin_get_group_title(Purp
 static char *pidgin_get_group_title(PurpleBlistNode *gnode, gboolean expanded)
 {
 	PurpleGroup *group;
-	GdkColor textcolor;
 	gboolean selected;
 	char group_count[12] = "";
 	char *mark, *esc;
@@ -5703,7 +5702,6 @@ static char *pidgin_get_group_title(Purp
 	GtkTreeIter iter;
 
 	group = (PurpleGroup*)gnode;
-	textcolor = gtkblist->treeview->style->fg[GTK_STATE_ACTIVE];
 
 	if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(gtkblist->treeview)), NULL, &iter)) {
 		gtk_tree_model_get(GTK_TREE_MODEL(gtkblist->treemodel), &iter,
@@ -5718,12 +5716,7 @@ static char *pidgin_get_group_title(Purp
 	}
 
 	esc = g_markup_escape_text(group->name, -1);
-	if (selected)
-		mark = g_strdup_printf("<span weight='bold'>%s</span>%s", esc ? esc : "", group_count);
-	else
-		mark = g_strdup_printf("<span color='#%02x%02x%02x' weight='bold'>%s</span>%s",
-				       textcolor.red>>8, textcolor.green>>8, textcolor.blue>>8,
-				       esc ? esc : "", group_count);
+	mark = g_strdup_printf("<span weight='bold'>%s</span>%s", esc ? esc : "", group_count);
 
 	g_free(esc);
 	return mark;