rhythmbox r5956 - in trunk: . sources

[mccann svn gnome org]

Author: mccann
Date: Tue Sep 30 17:01:20 2008
New Revision: 5956
URL: http://svn.gnome.org/viewvc/rhythmbox?rev=5956&view=rev

Log:
2008-09-30  William Jon McCann  <jmccann redhat com>

	* sources/rb-sourcelist.c (rb_sourcelist_cell_set_background),
	(sourcelist_get_group):
	Increase the indentation of sources instead of using
	a cell background color.
	Fixes #553984



Modified:
   trunk/ChangeLog
   trunk/sources/rb-sourcelist.c

Modified: trunk/sources/rb-sourcelist.c
==============================================================================
--- trunk/sources/rb-sourcelist.c	(original)
+++ trunk/sources/rb-sourcelist.c	Tue Sep 30 17:01:20 2008
@@ -301,15 +301,7 @@
 				      NULL);
 		}
 	} else {
-		color = style->text_aa[GTK_STATE_INSENSITIVE];
-
-		color.red = (color.red + (style->white).red) / 2;
-		color.green = (color.green + (style->white).green) / 2;
-		color.blue = (color.blue + (style->white).blue) / 2;
-
-		g_object_set (cell,
-			      "cell-background-gdk", &color,
-			      NULL);
+		/* don't set background for group heading */
 	}
 }
 
@@ -327,7 +319,7 @@
 	depth = gtk_tree_path_get_depth (path);
 	gtk_tree_path_free (path);
 	g_object_set (cell,
-		      "text", " ",
+		      "text", "    ",
 		      "visible", depth > 1,
 		      NULL);
 }
@@ -346,7 +338,7 @@
 	depth = gtk_tree_path_get_depth (path);
 	gtk_tree_path_free (path);
 	g_object_set (cell,
-		      "text", " ",
+		      "text", "    ",
 		      "visible", depth > 2,
 		      NULL);
 }
@@ -972,21 +964,21 @@
 static void
 sourcelist_get_group (RBSourceList  *sourcelist,
 		      RBSourceGroup *group,
-		      GtkTreeIter   *iter,
+		      GtkTreeIter   *iter_group,
 		      gboolean      *created)
 {
 	gboolean found;
 
 	found = rb_sourcelist_find_group_iter (sourcelist,
 					       group,
-					       iter);
+					       iter_group);
 	if (! found) {
 		if (created != NULL) {
 			*created = TRUE;
 		}
 
-		gtk_tree_store_append (GTK_TREE_STORE (sourcelist->priv->real_model), iter, NULL);
-		gtk_tree_store_set (GTK_TREE_STORE (sourcelist->priv->real_model), iter,
+		gtk_tree_store_append (GTK_TREE_STORE (sourcelist->priv->real_model), iter_group, NULL);
+		gtk_tree_store_set (GTK_TREE_STORE (sourcelist->priv->real_model), iter_group,
 				    RB_SOURCELIST_MODEL_COLUMN_PIXBUF, NULL,
 				    RB_SOURCELIST_MODEL_COLUMN_NAME, group->display_name,
 				    RB_SOURCELIST_MODEL_COLUMN_SOURCE, NULL,