[Galago-commits] r3032 - in trunk/notify-sharp: . src

[galago-commits at freedesktop.org]

Author: slomo
Date: 2009-03-05 04:55:01 -0800 (Thu, 05 Mar 2009)
New Revision: 3032

Modified:
   trunk/notify-sharp/ChangeLog
   trunk/notify-sharp/src/Notification.cs
Log:
* src/Notification.cs:
Patch by Cody Russell  <bratsche {at} gnome.org>:
Check if Capabilities are null before using them.


Modified: trunk/notify-sharp/ChangeLog
===================================================================
--- trunk/notify-sharp/ChangeLog	2009-03-05 12:53:33 UTC (rev 3031)
+++ trunk/notify-sharp/ChangeLog	2009-03-05 12:55:01 UTC (rev 3032)
@@ -2,6 +2,12 @@
 
 	* src/Notification.cs:
 	  Patch by Cody Russell  <bratsche {at} gnome.org>:
+	  Check if Capabilities are null before using them.
+
+2009-03-05  Sebastian Dröge  <sebastian.droege at collabora.co.uk>
+
+	* src/Notification.cs:
+	  Patch by Cody Russell  <bratsche {at} gnome.org>:
 	  When adding a new action, first check that the notification
 	  daemon supports actions. (BGO #571177)
 

Modified: trunk/notify-sharp/src/Notification.cs
===================================================================
--- trunk/notify-sharp/src/Notification.cs	2009-03-05 12:53:33 UTC (rev 3031)
+++ trunk/notify-sharp/src/Notification.cs	2009-03-05 12:55:01 UTC (rev 3032)
@@ -341,7 +341,8 @@
 		}
 
 		public void AddAction (string action, string label, ActionHandler handler) {
-			if (Array.IndexOf (Notifications.Global.Capabilities, "actions") > -1) {
+			if (Notifications.Global.Capabilities != null &&
+			    Array.IndexOf (Notifications.Global.Capabilities, "actions") > -1) {
 				lock (action_map) {
 					action_map[action] = new ActionTuple (label, handler);
 				}