Re: [Rhythmbox-devel] Rhythmbox pre-release, and landing of generic audio player write support

[Ed Catmur <ed catmur co uk>]

On Mon, 2007-02-12 at 14:35 -0500, William Jon McCann wrote:
> On 2/12/07, Ed Catmur <ed catmur co uk> wrote:
> > On Mon, 2007-02-12 at 11:24 -0500, Andrew Conkling wrote:
> > > On 2/12/07, Ed Catmur <ed catmur co uk> wrote:
> > > > On Mon, 2007-02-12 at 01:35 -0500, Andrew Conkling wrote:
> > > > > It's a tasteful X, but I'd prefer nothing:
> > > > > http://img361.imageshack.us/img361/975/rbcoverartzb8.png
> > > >
> > > > Ah.  That's wrong; it should be the Rhythmbox icon.  Currently it uses
> > > > "gnome-media-player"; maybe that should be changed to "rhythmbox"?
> > >
> > > Not sure, but apparently (if only in Ubuntu) the icon isn't being
> > > registered correctly.
> > Hm - "gnome-media-player" isn't in hicolor, but "rhythmbox" is.  This
> > might be the problem.
> 
> http://svn.gnome.org/viewcvs/gnome-icon-theme?rev=1112&view=rev
> 
> Looks like that icon has been axed.

Right, yeah.  This patch against current svn uses RB_APP_ICON from
rb-stock-icons.[ch], which was always the correct thing to do - and uses
it in notifications as well.

Index: shell/rb-tray-icon.c
===================================================================
--- shell/rb-tray-icon.c	(revision 4814)
+++ shell/rb-tray-icon.c	(working copy)
@@ -41,7 +41,6 @@
 #include "rb-shell-player.h"
 
 #define TRAY_ICON_DEFAULT_TOOLTIP _("Music Player")
-#define DEFAULT_TOOLTIP_ICON "" /*"gnome-media-player"*/
 #define TOOLTIPS_DELAY 500
 #define TOOLTIPS_STICKY_REVERT_DELAY 1000
 
@@ -628,9 +627,8 @@
 	GList *children;
 
 	if (msgicon == NULL)
-		/*msgicon = gtk_image_new_from_icon_name (DEFAULT_TOOLTIP_ICON,
-							GTK_ICON_SIZE_DIALOG);*/
-		msgicon = gtk_image_new ();
+		msgicon = gtk_image_new_from_icon_name (RB_APP_ICON,
+							GTK_ICON_SIZE_DIALOG);
 	image_box = GTK_CONTAINER (icon->priv->tooltip_image_box);
 	children = gtk_container_get_children (image_box);
 	current_image = GTK_WIDGET (g_list_nth_data (children, 0));
@@ -778,9 +776,8 @@
 	gtk_misc_set_alignment  (GTK_MISC  (icon->priv->tooltip_secondary),
 				 0.0, 0.0);
 
-	/*image = gtk_image_new_from_icon_name (DEFAULT_TOOLTIP_ICON,
-					      GTK_ICON_SIZE_DIALOG);*/
-	image = gtk_image_new ();
+	image = gtk_image_new_from_icon_name (RB_APP_ICON,
+					      GTK_ICON_SIZE_DIALOG);
 	icon->priv->tooltip_image_box = gtk_vbox_new (FALSE, 12);
 	gtk_box_pack_start (GTK_BOX (icon->priv->tooltip_image_box), image,
 			    FALSE, FALSE, 0);
Index: widgets/eggtrayicon.c
===================================================================
--- widgets/eggtrayicon.c	(revision 4814)
+++ widgets/eggtrayicon.c	(working copy)
@@ -612,7 +612,7 @@
       theme = gtk_icon_theme_get_default ();
       gtk_icon_size_lookup (GTK_ICON_SIZE_DIALOG, &icon_size, NULL);
       pixbuf = gtk_icon_theme_load_icon (theme,
-                                         "gnome-media-player",
+                                         RB_APP_ICON,
                                          icon_size,
                                          0,
                                          NULL);
Index: lib/rb-stock-icons.h
===================================================================
--- lib/rb-stock-icons.h	(revision 4814)
+++ lib/rb-stock-icons.h	(working copy)
@@ -25,6 +25,7 @@
 
 G_BEGIN_DECLS
 
+extern const char RB_APP_ICON[];
 extern const char RB_STOCK_TRAY_ICON[];
 extern const char RB_STOCK_SET_STAR[];
 extern const char RB_STOCK_UNSET_STAR[];