rpms/rhythmbox/devel rhythmbox-0.8.8-cell-renderer.patch, NONE, 1.1 rhythmbox.spec, 1.15, 1.16

[fedora-cvs-commits at redhat.com]

Author: walters

Update of /cvs/dist/rpms/rhythmbox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13043

Modified Files:
	rhythmbox.spec 
Added Files:
	rhythmbox-0.8.8-cell-renderer.patch 
Log Message:
bluecurve icon work

rhythmbox-0.8.8-cell-renderer.patch:
 rb-cell-renderer-rating.c |   14 +++-----------
 rb-entry-view.c           |    3 ++-
 2 files changed, 5 insertions(+), 12 deletions(-)

--- NEW FILE rhythmbox-0.8.8-cell-renderer.patch ---
--- rhythmbox-0.8.8/widgets/rb-entry-view.c.cell-renderer	2004-10-05 13:26:05.000000000 -0400
+++ rhythmbox-0.8.8/widgets/rb-entry-view.c	2005-06-13 17:39:23.000000000 -0400
@@ -23,6 +23,7 @@
 
 #include <gtk/gtktreeselection.h>
 #include <gtk/gtkcellrenderertext.h>
+#include <gtk/gtkcellrendererpixbuf.h>
 #include <gtk/gtkiconfactory.h>
 #include <gtk/gtktooltips.h>
 #include <gdk/gdkkeysyms.h>
@@ -1402,7 +1403,7 @@
 		
 		/* Playing icon column */
 		column = GTK_TREE_VIEW_COLUMN (rb_tree_view_column_new ());
-		renderer = rb_cell_renderer_pixbuf_new ();
+		renderer = gtk_cell_renderer_pixbuf_new ();
 		gtk_tree_view_column_pack_start (column, renderer, TRUE);
 		gtk_tree_view_column_set_cell_data_func (column, renderer,
 							 (GtkTreeCellDataFunc)
--- rhythmbox-0.8.8/widgets/rb-cell-renderer-rating.c.cell-renderer	2004-04-28 11:38:16.000000000 -0400
+++ rhythmbox-0.8.8/widgets/rb-cell-renderer-rating.c	2005-06-13 17:47:44.000000000 -0400
@@ -142,16 +142,19 @@
 							     GTK_ICON_SIZE_MENU,
 							     NULL);
 	g_assert (cellrating->priv->pix_star);
+	g_assert (GDK_IS_PIXBUF (cellrating->priv->pix_star));
 	cellrating->priv->pix_unset_star = gtk_widget_render_icon (dummy,
 							           RB_STOCK_UNSET_STAR,
 							           GTK_ICON_SIZE_MENU,
 							           NULL);
 	g_assert (cellrating->priv->pix_unset_star);
+	g_assert (GDK_IS_PIXBUF (cellrating->priv->pix_unset_star));
 	cellrating->priv->pix_blank = gtk_widget_render_icon (dummy,
 							      RB_STOCK_NO_STAR,
 							      GTK_ICON_SIZE_MENU,
 							      NULL);
 	g_assert (cellrating->priv->pix_blank);
+	g_assert (GDK_IS_PIXBUF (cellrating->priv->pix_blank));
 
 	gtk_widget_destroy (dummy);
 }
@@ -351,16 +354,6 @@
 		else
 			buf = cellrating->priv->pix_blank;
 
-		if (selected == FALSE)
-			offset = 120;
-
-		buf = eel_create_colorized_pixbuf (buf,
-						   widget->style->text[state].red + offset,
-						   widget->style->text[state].green + offset,
-						   widget->style->text[state].blue + offset);
-		if (buf == NULL)
-			return;
-
 		if (rtl) {
 			x_offset = draw_rect.x + (MAX_SCORE-i-1) * icon_width;
 		} else {
@@ -380,7 +373,6 @@
 						     0,
 						     GDK_RGB_DITHER_NORMAL,
 						     0, 0);
-		g_object_unref (G_OBJECT (buf));
 	}
 }
 


Index: rhythmbox.spec
===================================================================
RCS file: /cvs/dist/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- rhythmbox.spec	27 May 2005 14:50:45 -0000	1.15
+++ rhythmbox.spec	13 Jun 2005 21:55:27 -0000	1.16
@@ -8,6 +8,7 @@
 Group: Applications/Multimedia
 Source: ftp://ftp.gnome.org/pub/GNOME/sources/rhythmbox/0.8/%{name}-%{version}.tar.gz
 Source1: rhythmbox-bluecurve.tar.gz
+Patch1: rhythmbox-0.8.8-cell-renderer.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Requires: gtk2 >= 2.4.0
@@ -26,6 +27,7 @@
 
 %prep
 %setup -q
+%patch1 -p1 -b .cell-renderer
 
 %build
 
@@ -81,8 +83,11 @@
 %{_libdir}/pkgconfig/rhythmbox.pc
 
 %changelog
-* Fri May 27 2005 Colin Walters <walters at redhat.com> - 0.8.8-3
+* Fri Jun 13 2005 Colin Walters <walters at redhat.com> - 0.8.8-3
 - Add Bluecurve-ized icons from Jeff Schroeder (157716)
+- Add rhythmbox-0.8.8-cell-renderer.patch to remove use of custom
+  cell renderer for playback icon (no longer necessary) and
+  changes the rating renderer to work with non-b&w icons
 
 * Mon Mar 14 2005 Colin Walters <walters at redhat.com> - 0.8.8-2
 - Rebuild for GCC4