rpms/rhythmbox/devel rhythmbox-0.9.3.1-use-icon-name.patch, NONE, 1.1 rhythmbox.spec, 1.53, 1.54

[fedora-cvs-commits at redhat.com]

Author: rstrode

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

Modified Files:
	rhythmbox.spec 
Added Files:
	rhythmbox-0.9.3.1-use-icon-name.patch 
Log Message:
- fix icon on notification bubbles (bug 183720)
- patch from CVS to escape bubble markup, found by 
  Bill Nottingham


rhythmbox-0.9.3.1-use-icon-name.patch:
 eggtrayicon.c |   32 ++++++++++++++------------------
 1 files changed, 14 insertions(+), 18 deletions(-)

--- NEW FILE rhythmbox-0.9.3.1-use-icon-name.patch ---
--- rhythmbox-0.9.3.1/widgets/eggtrayicon.c.use-icon-name	2006-03-08 01:17:43.000000000 -0500
+++ rhythmbox-0.9.3.1/widgets/eggtrayicon.c	2006-03-08 01:18:59.000000000 -0500
@@ -563,35 +563,31 @@ egg_tray_icon_notify (EggTrayIcon *icon,
       notify_notification_close (icon->notify->handle, NULL);
     }
 
+  pixbuf = NULL;
+
   esc_primary = g_markup_escape_text (primary, strlen (primary));
   esc_secondary = g_markup_escape_text (secondary, strlen (secondary));
-  icon->notify->handle = notify_notification_new (esc_primary,
-                                                  esc_secondary,
-                                                  NULL,
-                                                  GTK_WIDGET (icon));
-  g_free (esc_primary);
-  g_free (esc_secondary);
-
-  notify_notification_set_timeout (icon->notify->handle, timeout);
 
   if (msgicon) 
     {
+      icon->notify->handle = notify_notification_new (esc_primary,
+                                                      esc_secondary,
+                                                      NULL,
+                                                      GTK_WIDGET (icon));
       pixbuf = gtk_image_get_pixbuf (GTK_IMAGE (msgicon));
     }
   else
     {
-      GtkIconTheme *theme;
-      gint icon_size;
-
-      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",
-                                         icon_size,
-                                         0,
-                                         NULL);
+      icon->notify->handle = notify_notification_new (esc_primary,
+                                                      esc_secondary,
+                                                      "gnome-media-player",
+                                                      GTK_WIDGET (icon));
     }
 
+  notify_notification_set_timeout (icon->notify->handle, timeout);
+  g_free (esc_primary);
+  g_free (esc_secondary);
+
   if (pixbuf)
     {
 #if (LIBNOTIFY_VERSION_MICRO < 2)


Index: rhythmbox.spec
===================================================================
RCS file: /cvs/dist/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- rhythmbox.spec	8 Mar 2006 06:12:54 -0000	1.53
+++ rhythmbox.spec	8 Mar 2006 06:20:08 -0000	1.54
@@ -29,6 +29,7 @@
 ExcludeArch: s390 s390x
 Patch0: rhythmbox-0.9.3.1-playlist.patch
 Patch1: rhythmbox-0.9.3.1-trayicon.patch
+Patch2: rhythmbox-0.9.3.1-use-icon-name.patch
 
 %description
 Rhythmbox is an integrated music management application based on the powerful
@@ -40,6 +41,7 @@
 %setup -q
 %patch0 -p1 -b .playlist
 %patch1 -p1 -b .trayicon
+%patch2 -p1 -b .use-icon-name
 
 %build
 
@@ -101,6 +103,11 @@
 %{_libdir}/pkgconfig/rhythmbox.pc
 
 %changelog
+* Wed Mar 08 2006 Ray Strode <rstrode at redhat.com> - 0.9.3.1-3
+- fix icon on notification bubbles (bug 183720)
+- patch from CVS to escape bubble markup, found by 
+  Bill Nottingham
+
 * Fri Mar 03 2006 Ray Strode <rstrode at redhat.com> - 0.9.3.1-2
 - add patch from James "Doc" Livingston to stop a hang
   for new users (bug 183883)