[Pkg-xfce-commits] r3230 - in goodies/trunk/xfce4-notifyd/debian: . patches

[Evgeni Golov]

Author: evgeni
Date: 2009-05-10 19:45:31 +0000 (Sun, 10 May 2009)
New Revision: 3230

Modified:
   goodies/trunk/xfce4-notifyd/debian/changelog
   goodies/trunk/xfce4-notifyd/debian/patches/01_send-second-arg-notification-closed.patch
Log:
Now really send the reason argument with NotificationClosed.



Modified: goodies/trunk/xfce4-notifyd/debian/changelog
===================================================================
--- goodies/trunk/xfce4-notifyd/debian/changelog	2009-05-10 16:24:14 UTC (rev 3229)
+++ goodies/trunk/xfce4-notifyd/debian/changelog	2009-05-10 19:45:31 UTC (rev 3230)
@@ -1,3 +1,10 @@
+xfce4-notifyd (0.1.0-4) unstable; urgency=low
+
+  * debian/patches/01_send-second-arg-notification-closed.patch:
+    Now really send the reason argument with NotificationClosed. closes: 522729
+
+ -- Evgeni Golov <evgeni at debian.org>  Sun, 10 May 2009 21:43:20 +0200
+
 xfce4-notifyd (0.1.0-3) unstable; urgency=low
 
   [ Evgeni Golov ]

Modified: goodies/trunk/xfce4-notifyd/debian/patches/01_send-second-arg-notification-closed.patch
===================================================================
--- goodies/trunk/xfce4-notifyd/debian/patches/01_send-second-arg-notification-closed.patch	2009-05-10 16:24:14 UTC (rev 3229)
+++ goodies/trunk/xfce4-notifyd/debian/patches/01_send-second-arg-notification-closed.patch	2009-05-10 19:45:31 UTC (rev 3230)
@@ -1,3 +1,6 @@
+Revert e5e86376c5824b74073ab1ab2a332ee9c3bb64fc
+We want to send the reason as libnotify 0.4.5 does support the reason arg.
+
 diff --git a/po/POTFILES.skip b/po/POTFILES.skip
 new file mode 100644
 index 0000000..4afffb8
@@ -9,14 +12,30 @@
 index 9a14e30..cd71cbb 100644
 --- a/xfce4-notifyd/xfce-notify-daemon.c
 +++ b/xfce4-notifyd/xfce-notify-daemon.c
-@@ -127,8 +127,8 @@ xfce_notify_daemon_class_init(XfceNotifyDaemonClass *klass)
+@@ -125,15 +125,10 @@
+                                                     G_SIGNAL_RUN_LAST,
+                                                     0,
                                                      NULL, NULL,
-                                                     g_cclosure_marshal_VOID__UINT,
-                                                     G_TYPE_NONE, 1,
+-                                                    g_cclosure_marshal_VOID__UINT,
+-                                                    G_TYPE_NONE, 1,
 -                                                    G_TYPE_UINT);
 -#if 0  /* it seems libnotify doesn't support the close-reason arg */
-+                                                    G_TYPE_UINT,
-+#if 1  /* it seems libnotify now supports the close-reason arg */
                                                      xfce_notify_marshal_VOID__UINT_UINT,
                                                      G_TYPE_NONE, 2,
                                                      G_TYPE_UINT,
+                                                     G_TYPE_UINT);
+-#endif
+     signals[SIG_ACTION_INVOKED] = g_signal_new("action-invoked",
+                                                XFCE_TYPE_NOTIFY_DAEMON,
+                                                G_SIGNAL_RUN_LAST,
+@@ -215,9 +210,7 @@
+ 
+     g_tree_remove(daemon->active_notifications, id_p);
+     g_signal_emit(G_OBJECT(daemon), signals[SIG_NOTIFICATION_CLOSED], 0,
+-                  GPOINTER_TO_UINT(id_p));
+-    /* NOTE: libnotify doesn't support the close-reason argument to
+-     * the signal.  not sure why. */
++                  GPOINTER_TO_UINT(id_p), reason);
+ }
+ 
+ static void