rpms/libnotify/F-12 nondefault-actions.patch, NONE, 1.1 libnotify.spec, 1.40, 1.41

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/libnotify/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5281

Modified Files:
	libnotify.spec 
Added Files:
	nondefault-actions.patch 
Log Message:
Close notifications with non-default actions on uninit


nondefault-actions.patch:
 notification.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE nondefault-actions.patch ---
diff -up libnotify-0.4.5/libnotify/notification.c.nondefault libnotify-0.4.5/libnotify/notification.c
--- libnotify-0.4.5/libnotify/notification.c.nondefault	2009-11-11 20:55:41.327192032 -0500
+++ libnotify-0.4.5/libnotify/notification.c	2009-11-11 20:55:27.695207227 -0500
@@ -1268,7 +1268,7 @@ notify_notification_add_action(NotifyNot
 	pair->free_func = free_func;
 	g_hash_table_insert(priv->action_map, g_strdup(action), pair);
 
-	if (notification->priv->has_nondefault_actions &&
+	if (!notification->priv->has_nondefault_actions &&
 		g_ascii_strcasecmp(action, "default"))
 	{
 		notification->priv->has_nondefault_actions = TRUE;


Index: libnotify.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libnotify/F-12/libnotify.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- libnotify.spec	25 Jul 2009 06:13:46 -0000	1.40
+++ libnotify.spec	12 Nov 2009 02:01:48 -0000	1.41
@@ -8,7 +8,7 @@
 Summary: Desktop notification library 
 Name: libnotify 
 Version: 0.4.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://www.galago-project.org/specs/notification/ 
 Source0: http://www.galago-project.org/files/releases/source/%{name}/%{name}-%{version}.tar.bz2 
 License: LGPLv2+
@@ -22,6 +22,8 @@ BuildRequires: gtk2-devel >= %{gtk2_vers
 Requires: glib2 >= %{glib2_version}
 Requires: desktop-notification-daemon
 
+Patch0: nondefault-actions.patch
+
 %description
 libnotify is a library for sending desktop notifications to a notification 
 daemon, as defined in the freedesktop.org Desktop Notifications spec. These 
@@ -44,6 +46,7 @@ development of programs using %{name}.
 
 %prep
 %setup -q
+%patch0 -p1 -b .nondefault-actions
 
 %build
 
@@ -84,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT 
 %{_datadir}/gtk-doc/html/libnotify/*
 
 %changelog
+* Wed Nov 11 2009 Matthias Clasen <mclasen at redhat.com> - 0.4.5-4
+- Close notifications with non-default actions on uninit
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild