[Pkg-cli-libs-commits] [SCM] notify-sharp branch, master, updated. debian/0.4.0.r3032-2-8-gf64a009

[Chow Loong Jin]

The following commit has been merged in the master branch:
commit 43e42840e92c8a61b0e0aac7edb806b1ceb03042
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date:   Sat Feb 26 02:22:59 2011 +0800

    Import 02_reverse_cap_check.patch from Ubuntu

diff --git a/debian/patches/02_reverse_cap_check.patch b/debian/patches/02_reverse_cap_check.patch
new file mode 100644
index 0000000..55ea528
--- /dev/null
+++ b/debian/patches/02_reverse_cap_check.patch
@@ -0,0 +1,26 @@
+Description: Reverse the patch merged upstream which swallows actions in
+             notifications.  It is more appropriate for applications to make
+             that decision rather than a library.
+From: David Barth <david.barth at canonical.com>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/349550
+Index: notify-sharp/src/Notification.cs
+===================================================================
+--- notify-sharp.orig/src/Notification.cs	2011-02-26 02:13:37.452598287 +0800
++++ notify-sharp/src/Notification.cs	2011-02-26 02:14:10.562409163 +0800
+@@ -341,13 +341,10 @@
+ 		}
+ 
+ 		public void AddAction (string action, string label, ActionHandler handler) {
+-			if (Notifications.Global.Capabilities != null &&
+-			    Array.IndexOf (Notifications.Global.Capabilities, "actions") > -1) {
+-				lock (action_map) {
+-					action_map[action] = new ActionTuple (label, handler);
+-				}
+-				Update ();
++			lock (action_map) {
++				action_map[action] = new ActionTuple (label, handler);
+ 			}
++			Update ();
+ 		}
+ 
+ 		public void RemoveAction (string action) {
diff --git a/debian/patches/series b/debian/patches/series
index 7db5b68..1d03723 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01_pkg-config-path.patch
+02_reverse_cap_check.patch
 03-use-dbus-sharp.patch

-- 
notify-sharp