close notifications with non-default actions on uninit

libnotify.spec

@@ -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,9 @@ BuildRequires: gtk2-devel >= %{gtk2_version}
 Requires: glib2 >= %{glib2_version}
 Requires: desktop-notification-daemon
 
+# http://trac.galago-project.org/ticket/194
+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 +47,7 @@ development of programs using %{name}.
 
 %prep
 %setup -q
+%patch0 -p1 -b .nondefault-actions
 
 %build
 
@@ -84,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/libnotify/*
 
 %changelog
+* Wed Nov 11 2009 Matthias Clasen <mclasen@redhat.com> - 0.4.5-4
+- Close notifications with non-default actions on uninit
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 

nondefault-actions.patch

@@ -0,0 +1,12 @@
+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;