changeset
applied changes from fd241751ba7c5d47fe66c0b96787eae776d435af
Fri, 07 Dec 2007 01:31:35 +0000
- author
- Stu Tomlinson <nosnilmot@pidgin.im>
- date
- Fri, 07 Dec 2007 01:31:35 +0000
- branch
- release-2.3.1
- changeset 21745
- 49ba4d3f61fe
- parent 21744
- ade0173ac6e5
- child 21746
- 12cf6ee726f1
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
| pidgin/gtkblist.c | file | annotate | diff | comparison | revisions |
--- a/pidgin/gtkblist.c Fri Dec 07 01:28:04 2007 +0000 +++ b/pidgin/gtkblist.c Fri Dec 07 01:31:35 2007 +0000 @@ -5695,7 +5695,6 @@ 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 @@ 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 @@ } 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;
