Merge lp:~alexlauni/do/notify-osd into lp:do

[Alex Launi]

[Alex Launi (alexlauni)]

Applies a number of fixes to make Do behave better with the new Ubuntu notification system. Preserves compatibility with notification-daemon for other distros, and older Ubuntu releases.

[Jason Smith (jassmith)]

review: Approve

=== modified file 'Do.Platform.Linux/src/Do.Platform/Do.Platform.Linux/NotificationHelper.cs'
--- Do.Platform.Linux/src/Do.Platform/Do.Platform.Linux/NotificationHelper.cs	2009-03-11 03:09:33 +0000
+++ Do.Platform.Linux/src/Do.Platform/Do.Platform.Linux/NotificationHelper.cs	2009-03-29 19:29:59 +0000
@@ -28,13 +28,28 @@
 using Do.Interface;
 
 namespace Do.Platform.Linux
-{
+{	
+	public enum NotificationCapability {
+       	actions,
+       	append,
+		body,
+      	body_hyperlinks,
+       	body_images,
+       	body_markup,
+       	icon_multi,
+       	icon_static,
+       	image_svg,
+		max,
+		positioning, // not an official capability
+		scaling, // not an official capability
+		sound
+	}
 	
 	internal class NotificationHelper
 	{
 		const string DefaultIconName = "gnome-do";
-
-		const int IconSize = 24;
+		
+		const int IconSize = 48;
 		const int LettersPerWord = 7;
 		const int MillisecondsPerWord = 350;
 		const int MinNotifyShow = 5000;
@@ -55,24 +70,47 @@
 			return Math.Min (Math.Max (t, MinNotifyShow), MaxNotifyShow);
 		}
 
+		public void Notify (Notification note)
+		{
+			Notify (note, Screen.Default, 0, 0);
+		}
+		
 		public void Notify (Notification note, Screen screen, int x, int y)
 		{
 			LibNotify.Notification notify = ToNotify (note);
 			notify.SetGeometryHints (screen, x, y);
 			notify.Show ();
 		}
+		
+		public bool SupportsCapability (NotificationCapability capability)
+		{
+			// positioning and scaling are not actual capabilities, i just know for a fact most other servers
+			// support geo. hints, and notify-osd is the only that auto scales images
+			if (capability == NotificationCapability.positioning)
+				return LibNotify.Global.ServerInformation.Name != "notify-osd";
+			else if (capability == NotificationCapability.scaling)
+				return LibNotify.Global.ServerInformation.Name == "notify-osd";
+			
+			return Array.IndexOf (LibNotify.Global.Capabilities, Enum.GetName (typeof (NotificationCapability), capability)) > -1;
+		}
 
 		LibNotify.Notification ToNotify (Notification note)
 		{
 			LibNotify.Notification notify = new LibNotify.Notification ();
-			
-			notify.Icon = string.IsNullOrEmpty (note.Icon)
-				? DefaultIcon
-				: IconProvider.PixbufFromIconName (note.Icon, IconSize);
 			notify.Body = GLib.Markup.EscapeText (note.Body);
 			notify.Summary = GLib.Markup.EscapeText (note.Title);
+			notify.Closed += (sender, e) => OnNotificationClosed (note);
 			notify.Timeout = ReadableDurationForMessage (note.Title, note.Body);
-			notify.Closed += (sender, e) => OnNotificationClosed (note);
+			
+			if (SupportsCapability (NotificationCapability.scaling)) {
+				notify.IconName = string.IsNullOrEmpty (note.Icon)
+					? DefaultIconName
+					: note.Icon;
+			} else {
+				notify.Icon = string.IsNullOrEmpty (note.Icon)
+					? DefaultIcon
+					: IconProvider.PixbufFromIconName (note.Icon, IconSize);
+			}
 
 			if (note is ActionableNotification) {
 				ActionableNotification anote = note as ActionableNotification;
@@ -85,10 +123,9 @@
 
 		void OnNotificationClosed (Notification note)
 		{
-			if (NotificationClosed == null) return;
-			NotificationClosed (this, new NotificationEventArgs (note));
+			if (NotificationClosed != null)
+				NotificationClosed (this, new NotificationEventArgs (note));
 		}
-		
 	}
-
 }
+	
 \ No newline at end of file
 
=== modified file 'Do.Platform.Linux/src/Do.Platform/Do.Platform.Linux/TrayIconService.cs'
--- Do.Platform.Linux/src/Do.Platform/Do.Platform.Linux/TrayIconService.cs	2009-01-23 21:15:13 +0000
+++ Do.Platform.Linux/src/Do.Platform/Do.Platform.Linux/TrayIconService.cs	2009-03-28 21:45:43 +0000
@@ -61,15 +61,16 @@
 
 		~TrayIconService ()
 		{
+			status_icon.Activate -= OnActivate;
 			status_icon.PopupMenu -= OnPopupMenu;
-			status_icon.Activate -= OnActivate;
 		}
 
 		public void Initialize ()
 		{
 			Preferences = new TrayIconPreferences ();
 			Preferences.IconVisibleChanged += OnIconVisibleChanged;
-			if (!Preferences.IconVisible) Hide ();
+			if (!Preferences.IconVisible) 
+				Hide ();
 
 			// Listen for notifications so we can show a libnotify bubble.
 			Services.Notifications.Notified += OnNotified;
@@ -102,14 +103,19 @@
 		{
 			int x, y;
 			Screen screen;
-
-			Show ();
-			GetLocationOnScreen (out screen, out x, out y);
-
-			// We delay this so that the status icon has time to show.
-			Services.Application.RunOnMainThread (() => {
-			    notifier.Notify (note, screen, x, y);
-			}, NotifyDelay);
+			
+			if (notifier.SupportsCapability (NotificationCapability.positioning)) {
+				Show ();
+				GetLocationOnScreen (out screen, out x, out y);
+				// We delay this so that the status icon has time to show.
+				Services.Application.RunOnMainThread (() => {
+			    	notifier.Notify (note, screen, x, y);
+				}, NotifyDelay);
+			} else {
+				Services.Application.RunOnMainThread (() => {
+					notifier.Notify (note);
+				});
+			}
 		}
 
 		void Show ()
@@ -158,6 +164,5 @@
 			else
 				y += area.Height;
 		}
-
 	}
 }
 
=== modified file 'Do.Platform/src/Do.Platform/Notification.cs'
--- Do.Platform/src/Do.Platform/Notification.cs	2008-12-17 01:35:02 +0000
+++ Do.Platform/src/Do.Platform/Notification.cs	2009-03-29 19:25:40 +0000
@@ -46,6 +46,5 @@
 			Body = body;
 			Icon = icon;
 		}
-
 	}
 }
 
=== modified file 'Do.mds'
--- Do.mds	2009-03-20 20:43:06 +0000
+++ Do.mds	2009-03-28 15:34:37 +0000
@@ -1,9 +1,4 @@
 <Combine fileversion="2.0" outputpath="build/bin/" name="Do">
-  <Policies>
-    <ChangeLogPolicy UpdateMode="Nearest" inheritsSet="Mono">
-      <MessageStyle Header="" Indent="" LineAlign="0" />
-    </ChangeLogPolicy>
-  </Policies>
   <Configurations active="Debug">
     <Configuration name="Debug" ctype="CombineConfiguration">
       <Entry build="True" name="Do" configuration="Debug" />