soc.2008.themes: 5b1d9544: fixed group coloring

[ffdragon at soc.pidgin.im]

-----------------------------------------------------------------
Revision: 5b1d9544761ba8cb275d69dc9d19045c61f93c09
Ancestor: 3cad8b52079261a00489f793b967976f00070bff
Author: ffdragon at soc.pidgin.im
Date: 2008-07-18T22:31:28
Branch: im.pidgin.soc.2008.themes
URL: http://d.pidgin.im/viewmtn/revision/info/5b1d9544761ba8cb275d69dc9d19045c61f93c09

Modified files:
        pidgin/gtkblist-theme.c pidgin/gtkblist.c

ChangeLog: 

fixed group coloring

-------------- next part --------------
============================================================
--- pidgin/gtkblist-theme.c	8934ddab933fa5affdca342b91dcb61023e76086
+++ pidgin/gtkblist-theme.c	a550f5959637e3fe61f2d4c782d67e8bcc37d695
@@ -303,12 +303,12 @@ pidgin_blist_theme_class_init (PidginBli
 	pspec = g_param_spec_pointer("collapsed-color", "Collapsed Background Color",
 				    "The background color of a collapsed group",
 				    G_PARAM_READWRITE);
-	g_object_class_install_property(obj_class, PROP_EXPANDED_COLOR, pspec);
+	g_object_class_install_property(obj_class, PROP_COLLAPSED_COLOR, pspec);
 
 	pspec = g_param_spec_pointer("collapsed-text", "Collapsed Text",
                                      "The text information for when a group is collapsed",
                                      G_PARAM_READWRITE);
-	g_object_class_install_property(obj_class, PROP_EXPANDED_TEXT, pspec);
+	g_object_class_install_property(obj_class, PROP_COLLAPSED_TEXT, pspec);
 
 	/* Buddy */
 	pspec = g_param_spec_pointer("buddy-bgcolor1", "Buddy Background Color 1",
============================================================
--- pidgin/gtkblist.c	c07177b390704f127079c9d8a7952944de7d10ab
+++ pidgin/gtkblist.c	56ba37b64b247e79a5a3e845b621ab72996f418f
@@ -5980,7 +5980,7 @@ static void pidgin_blist_update_group(Pu
 		GtkTreeIter iter;
 		GtkTreePath *path;
 		gboolean expanded;
-		GdkColor *bgcolor;
+		GdkColor *bgcolor = NULL;
 		GdkPixbuf *avatar = NULL;
 		PidginBlistTheme *theme;
 
@@ -5989,16 +5989,12 @@ static void pidgin_blist_update_group(Pu
 
 		theme = pidgin_blist_get_theme();
 
-		/*if(theme == NULL){
+		if (theme == NULL)
 			bgcolor = &(gtkblist->treeview->style->bg[GTK_STATE_ACTIVE]);
-g_print("\nNULL\n");
-		}
-		else if(purple_blist_node_get_bool(gnode, "collapsed"))
-			bgcolor = (pidgin_blist_theme_get_collapsed_text_info(theme))->color;
-		else bgcolor = (pidgin_blist_theme_get_expanded_text_info(theme))->color;
+		else if (purple_blist_node_get_bool(gnode, "collapsed") || count <= 0)
+			bgcolor = pidgin_blist_theme_get_collapsed_background_color(theme);
+		else bgcolor = pidgin_blist_theme_get_expanded_background_color(theme);
 
-g_print("\n\n\%s\n\n", gdk_color_to_string(&bgcolor));*/
-
 		path = gtk_tree_model_get_path(GTK_TREE_MODEL(gtkblist->treemodel), &iter);
 		expanded = gtk_tree_view_row_expanded(GTK_TREE_VIEW(gtkblist->treeview), path);
 		gtk_tree_path_free(path);
@@ -6015,7 +6011,7 @@ g_print("\n\n\%s\n\n", gdk_color_to_stri
 				   STATUS_ICON_COLUMN, NULL,
 				   NAME_COLUMN, title,
 				   NODE_COLUMN, gnode,
-				   BGCOLOR_COLUMN, &bgcolor,
+				   BGCOLOR_COLUMN, bgcolor,
 				   GROUP_EXPANDER_COLUMN, TRUE,
 				   GROUP_EXPANDER_VISIBLE_COLUMN, TRUE,
 				   CONTACT_EXPANDER_VISIBLE_COLUMN, FALSE,