rpms/rhythmbox/devel rhythmbox-0.9.7-use-icon-name.patch, NONE, 1.1 rhythmbox.spec, 1.90, 1.91
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Dec 19 21:15:57 UTC 2006
- Previous message (by thread): rpms/evolution-connector/devel .cvsignore, 1.41, 1.42 evolution-connector.spec, 1.83, 1.84 sources, 1.41, 1.42
- Next message (by thread): rpms/virt-manager/devel virt-manager-disable-config-hvm.patch, NONE, 1.1 virt-manager-hostname-resolution-errors.patch, NONE, 1.1 vm-limit-memory.patch, NONE, 1.1 vm-non-sparse-file.patch, NONE, 1.1 vm-use-ipv4-for-console.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 virt-manager.spec, 1.13, 1.14
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mclasen
Update of /cvs/dist/rpms/rhythmbox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10139
Modified Files:
rhythmbox.spec
Added Files:
rhythmbox-0.9.7-use-icon-name.patch
Log Message:
fix icon name patch
rhythmbox-0.9.7-use-icon-name.patch:
eggtrayicon.c | 33 +++++++++++++++------------------
1 files changed, 15 insertions(+), 18 deletions(-)
--- NEW FILE rhythmbox-0.9.7-use-icon-name.patch ---
--- rhythmbox-0.9.7/widgets/eggtrayicon.c.use-icon-name 2006-10-09 06:00:57.000000000 -0400
+++ rhythmbox-0.9.7/widgets/eggtrayicon.c 2006-12-19 16:20:07.000000000 -0500
@@ -595,39 +595,36 @@
secondary = "";
}
+ pixbuf = NULL;
+
#if (LIBNOTIFY_VERSION_MAJOR == 0 && LIBNOTIFY_VERSION_MINOR == 3 && LIBNOTIFY_VERSION_MICRO == 0)
esc_primary = strdup (primary);
#else
esc_primary = g_markup_escape_text (primary, strlen (primary));
#endif
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.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- rhythmbox.spec 19 Dec 2006 20:51:39 -0000 1.90
+++ rhythmbox.spec 19 Dec 2006 21:15:55 -0000 1.91
@@ -38,7 +38,7 @@
BuildRequires: hal-devel
BuildRequires: perl-XML-Parser
-Patch2: rhythmbox-0.9.6-use-icon-name.patch
+Patch2: rhythmbox-0.9.7-use-icon-name.patch
%description
Rhythmbox is an integrated music management application based on the powerful
- Previous message (by thread): rpms/evolution-connector/devel .cvsignore, 1.41, 1.42 evolution-connector.spec, 1.83, 1.84 sources, 1.41, 1.42
- Next message (by thread): rpms/virt-manager/devel virt-manager-disable-config-hvm.patch, NONE, 1.1 virt-manager-hostname-resolution-errors.patch, NONE, 1.1 vm-limit-memory.patch, NONE, 1.1 vm-non-sparse-file.patch, NONE, 1.1 vm-use-ipv4-for-console.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 virt-manager.spec, 1.13, 1.14
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list