r29313 - in /packages/unstable/rhythmbox/debian: changelog patches/07_remove_remaining_libnotify_api.patch patches/series

[sjoerd at users.alioth.debian.org]

Author: sjoerd
Date: Mon Aug  1 19:23:12 2011
New Revision: 29313

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=29313
Log:
* debian/patches/07_remove_remaining_libnotify_api.patch
  * Added. Remove usage of notify_notification_attach_to_status_icon, it
    doesn't exist in libnotify 0.7 (Closes: #636220)

Added:
    packages/unstable/rhythmbox/debian/patches/07_remove_remaining_libnotify_api.patch
Modified:
    packages/unstable/rhythmbox/debian/changelog
    packages/unstable/rhythmbox/debian/patches/series

Modified: packages/unstable/rhythmbox/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/rhythmbox/debian/changelog?rev=29313&op=diff
==============================================================================
--- packages/unstable/rhythmbox/debian/changelog [utf-8] (original)
+++ packages/unstable/rhythmbox/debian/changelog [utf-8] Mon Aug  1 19:23:12 2011
@@ -1,3 +1,11 @@
+rhythmbox (0.12.8-5) unstable; urgency=low
+
+  * debian/patches/07_remove_remaining_libnotify_api.patch
+    * Added. Remove usage of notify_notification_attach_to_status_icon, it
+      doesn't exist in libnotify 0.7 (Closes: #636220)
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Mon, 01 Aug 2011 20:23:07 +0100
+
 rhythmbox (0.12.8-4) unstable; urgency=low
 
   * debian/patches/05_port_to_libnotify0.7.patch

Added: packages/unstable/rhythmbox/debian/patches/07_remove_remaining_libnotify_api.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/rhythmbox/debian/patches/07_remove_remaining_libnotify_api.patch?rev=29313&op=file
==============================================================================
--- packages/unstable/rhythmbox/debian/patches/07_remove_remaining_libnotify_api.patch (added)
+++ packages/unstable/rhythmbox/debian/patches/07_remove_remaining_libnotify_api.patch [utf-8] Mon Aug  1 19:23:12 2011
@@ -1,0 +1,74 @@
+From 3e73c8c2724d0bb7e789c5befeca04000673c1ac Mon Sep 17 00:00:00 2001
+From: Sjoerd Simons <sjoerd.simons at collabora.co.uk>
+Date: Mon, 1 Aug 2011 19:40:56 +0100
+Subject: [PATCH] Remove usage of notify_notification_attach_to_status_icon
+
+---
+ plugins/status-icon/rb-status-icon-plugin.c |   15 ---------------
+ plugins/status-icon/rb-tray-icon-gtk.c      |    8 --------
+ plugins/status-icon/rb-tray-icon-gtk.h      |    4 ----
+ 3 files changed, 0 insertions(+), 27 deletions(-)
+
+diff --git a/plugins/status-icon/rb-status-icon-plugin.c b/plugins/status-icon/rb-status-icon-plugin.c
+index 46003ca..70c3531 100644
+--- a/plugins/status-icon/rb-status-icon-plugin.c
++++ b/plugins/status-icon/rb-status-icon-plugin.c
+@@ -405,21 +405,6 @@ do_notify (RBStatusIconPlugin *plugin,
+ 		notify_notification_update (plugin->priv->notification, primary, secondary, icon_name);
+ 	}
+ 
+-	switch (plugin->priv->icon_mode) {
+-	case ICON_NEVER:
+-		break;
+-
+-	case ICON_WITH_NOTIFY:
+-	case ICON_ALWAYS:
+-	case ICON_OWNS_WINDOW:
+-		rb_tray_icon_attach_notification (plugin->priv->tray_icon,
+-						  plugin->priv->notification);
+-		break;
+-
+-	default:
+-		g_assert_not_reached ();
+-	}
+-
+ 	notify_notification_set_timeout (plugin->priv->notification, timeout);
+ 
+ 	if (pixbuf != NULL) {
+diff --git a/plugins/status-icon/rb-tray-icon-gtk.c b/plugins/status-icon/rb-tray-icon-gtk.c
+index eb68aa8..20ed082 100644
+--- a/plugins/status-icon/rb-tray-icon-gtk.c
++++ b/plugins/status-icon/rb-tray-icon-gtk.c
+@@ -339,14 +339,6 @@ rb_tray_icon_is_embedded (RBTrayIcon *tray)
+ 	return gtk_status_icon_is_embedded (tray->priv->icon);
+ }
+ 
+-#if defined(HAVE_NOTIFY)
+-void
+-rb_tray_icon_attach_notification (RBTrayIcon *tray, NotifyNotification *notification)
+-{
+-	notify_notification_attach_to_status_icon (notification, tray->priv->icon);
+-}
+-#endif
+-
+ void
+ rb_tray_icon_set_visible (RBTrayIcon *tray, gboolean visible)
+ {
+diff --git a/plugins/status-icon/rb-tray-icon-gtk.h b/plugins/status-icon/rb-tray-icon-gtk.h
+index 730f34d..68911a6 100644
+--- a/plugins/status-icon/rb-tray-icon-gtk.h
++++ b/plugins/status-icon/rb-tray-icon-gtk.h
+@@ -74,10 +74,6 @@ gboolean		rb_tray_icon_is_embedded (RBTrayIcon *icon);
+ 
+ void			rb_tray_icon_menu_popup (RBTrayIcon *icon, GtkWidget *popup, gint button);
+ 
+-#if defined(HAVE_NOTIFY)
+-void			rb_tray_icon_attach_notification (RBTrayIcon *icon, NotifyNotification *notification);
+-#endif
+-
+ void			rb_tray_icon_set_visible (RBTrayIcon *icon, gboolean visible);
+ 
+ G_END_DECLS
+-- 
+1.7.5.4
+

Modified: packages/unstable/rhythmbox/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/rhythmbox/debian/patches/series?rev=29313&op=diff
==============================================================================
--- packages/unstable/rhythmbox/debian/patches/series [utf-8] (original)
+++ packages/unstable/rhythmbox/debian/patches/series [utf-8] Mon Aug  1 19:23:12 2011
@@ -3,3 +3,4 @@
 04_mtp_crash.patch
 05_port_to_libnotify0.7.patch
 06_fix_pause_shadowing.patch
+07_remove_remaining_libnotify_api.patch