=== modified file 'debian/changelog' --- debian/changelog 2009-01-22 10:40:16 +0000 +++ debian/changelog 2009-02-10 14:59:26 +0000 @@ -1,3 +1,10 @@ +banshee (1.4.2-1ubuntu2) intrepid; urgency=low + + * Check notification daemon to see if it supports actions + + debian/03_notification_actions.patch + + -- Cody Russell Tue, 10 Feb 2009 09:25:05 -0500 + banshee (1.4.2-1ubuntu1) jaunty; urgency=low * Merge from Debian experimental. Remaining Ubuntu changes: === added file 'debian/patches/03_notification_actions.patch' --- debian/patches/03_notification_actions.patch 1970-01-01 00:00:00 +0000 +++ debian/patches/03_notification_actions.patch 2009-02-10 14:16:32 +0000 @@ -0,0 +1,33 @@ +=== modified file 'src/AssemblyInfo.cs' +--- old/src/AssemblyInfo.cs 2009-01-22 10:40:08 +0000 ++++ new/src/AssemblyInfo.cs 2009-02-09 17:26:53 +0000 +@@ -3,7 +3,7 @@ + using System.Runtime.CompilerServices; + + [assembly: ApplicationVersion ("1.4.2", "1.4.2")] +-[assembly: ApplicationBuildInformation ("svn-checkout", "linux-gnu", "x86_64", "2009-01-20 18:40:37 EST")] ++[assembly: ApplicationBuildInformation ("source-tarball", "linux-gnu", "i686", "2009-02-09 12:26:51 EST")] + + [assembly: AssemblyVersion ("1.4.0.0")] + [assembly: AssemblyTitle ("Banshee")] + +=== modified file 'src/Extensions/Banshee.NotificationArea/Notifications/Notification.cs' +--- old/src/Extensions/Banshee.NotificationArea/Notifications/Notification.cs 2008-11-06 23:45:08 +0000 ++++ new/src/Extensions/Banshee.NotificationArea/Notifications/Notification.cs 2009-02-10 13:22:19 +0000 +@@ -282,10 +282,12 @@ + } + + public void AddAction (string action, string label, ActionHandler handler) { +- lock (action_map) { +- action_map[action] = new ActionTuple (label, handler); ++ if (Array.IndexOf (Notifications.Global.Capabilities, "actions") > -1) { ++ lock (action_map) { ++ action_map[action] = new ActionTuple (label, handler); ++ } ++ Update (); + } +- Update (); + } + + public void RemoveAction (string action) { +