rpms/rhythmbox/devel rhythmbox-0.9.6-use-icon-name.patch, NONE, 1.1 rhythmbox.spec, 1.82, 1.83

[fedora-cvs-commits at redhat.com]

Author: mclasen

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

Modified Files:
	rhythmbox.spec 
Added Files:
	rhythmbox-0.9.6-use-icon-name.patch 
Log Message:
fix a patch


rhythmbox-0.9.6-use-icon-name.patch:
 eggtrayicon.c |   33 +++++++++++++++------------------
 1 files changed, 15 insertions(+), 18 deletions(-)

--- NEW FILE rhythmbox-0.9.6-use-icon-name.patch ---
--- rhythmbox-0.9.6/widgets/eggtrayicon.c.use-icon-name	2006-09-24 07:03:49.000000000 -0400
+++ rhythmbox-0.9.6/widgets/eggtrayicon.c	2006-10-22 21:48:19.000000000 -0400
@@ -595,35 +595,32 @@
       secondary = "";
     }
 
+  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_MAJOR == 0 && LIBNOTIFY_VERSION_MINOR <=3 && LIBNOTIFY_VERSION_MICRO < 2)


Index: rhythmbox.spec
===================================================================
RCS file: /cvs/dist/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- rhythmbox.spec	23 Oct 2006 01:20:20 -0000	1.82
+++ rhythmbox.spec	23 Oct 2006 01:46:27 -0000	1.83
@@ -39,7 +39,7 @@
 BuildRequires: hal-devel
 BuildRequires: perl-XML-Parser
 
-Patch2: rhythmbox-0.9.3.1-use-icon-name.patch
+Patch2: rhythmbox-0.9.6-use-icon-name.patch
 Patch3: rhythmbox-0.9.5-dbus-deprecated.patch
 Patch4: rhythmbox-0.9.5-transparent.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=355713