rpms/xfce4-notifyd/devel xfce4-notifyd-0.1.0-send-second-arg-notification-closed.patch, NONE, 1.1 xfce4-notifyd.spec, 1.3, 1.4

[Christoph Wickert]

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-notifyd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28745

Modified Files:
	xfce4-notifyd.spec 
Added Files:
	xfce4-notifyd-0.1.0-send-second-arg-notification-closed.patch 
Log Message:
add send-reason patch

xfce4-notifyd-0.1.0-send-second-arg-notification-closed.patch:

--- NEW FILE xfce4-notifyd-0.1.0-send-second-arg-notification-closed.patch ---

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
--- /dev/null
+++ b/po/POTFILES.skip
@@ -0,0 +1 @@
+.pc/01_send-second-arg-notification-closed.patch/xfce4-notifyd/xfce-notify-daemon.c
diff --git a/xfce4-notifyd/xfce-notify-daemon.c b/xfce4-notifyd/xfce-notify-daemon.c
index 9a14e30..cd71cbb 100644
--- a/xfce4-notifyd/xfce-notify-daemon.c
+++ b/xfce4-notifyd/xfce-notify-daemon.c
@@ -125,15 +125,10 @@
                                                     G_SIGNAL_RUN_LAST,
                                                     0,
                                                     NULL, NULL,
-                                                    g_cclosure_marshal_VOID__UINT,
-                                                    G_TYPE_NONE, 1,
-                                                    G_TYPE_UINT);
-#if 0  /* it seems libnotify doesn't support 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



Index: xfce4-notifyd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-notifyd/devel/xfce4-notifyd.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- xfce4-notifyd.spec	13 May 2009 23:53:23 -0000	1.3
+++ xfce4-notifyd.spec	14 May 2009 00:03:41 -0000	1.4
@@ -10,6 +10,7 @@ License:        GPLv2
 URL:            http://spuriousinterrupt.org/projects/xfce4-notifyd
 Source0:        http://spuriousinterrupt.org/files/xfce4-notifyd/xfce4-notifyd-%{version}.tar.bz2
 Patch0:         xfce4-notifyd-0.1.0-dbus-service-name.patch
+Patch1:         xfce4-notifyd-0.1.0-send-second-arg-notification-closed.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.10.0
@@ -40,6 +41,7 @@ Features:
 %prep
 %setup -q
 %patch0 -p1 -b .dbus-service-name
+%patch1 -p1 -b .reason-arg
 
 %build
 %configure
@@ -94,6 +96,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Mon Feb 23 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.0-2
 - Patch to rename dbus-service file to avoid conflict with notification-daemon
+- Add Debian's patch support the reason arg in libnotify 0.4.5
 
 * Mon Feb 23 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.0-1
 - Initial Fedora Package