Merge lp:~docky-core/docky/composite-notify into lp:docky

[Robert Dyer]

This branch does 2 things:

1) Waits 8 seconds during Docky startup to look for compositing, which might help work around all the complaints we get regarding the notify showing on startup (because Docky starts before compositing is enabled). In all other cases when compositing 'changes' it waits 2 seconds then checks (same as before).

2) When compositing is checked on a change, it immediately looks if a notify is shown and if so it closes it. Thus, if we notify that compositing is not available and it suddenly comes available it will immediately request to close that notify (instead of waiting for it to time out).

[Robert Dyer (psybers)]

Note that I have not tested this. We would need to test it still, assuming the code 'looks' fine.

[Rico Tzschichholz (ricotz)]

> Note that I have not tested this. We would need to test it still, assuming
> the code 'looks' fine.

So test it ;-)
Code looks fine. but I would hand over the timeout as milliseconds to CheckComposite.

[lp:~docky-core/docky/composite-notify]

1708. By Rico Tzschichholz on 2010-12-19

small optimization

[Rico Tzschichholz (ricotz)]

review: Approve

=== modified file 'Docky/Docky.csproj'
--- Docky/Docky.csproj	2010-11-04 21:16:22 +0000
+++ Docky/Docky.csproj	2010-12-19 17:42:12 +0000
@@ -93,6 +93,9 @@
       <SpecificVersion>False</SpecificVersion>
       <Package>gtk-sharp-2.0</Package>
     </Reference>
+    <Reference Include="notify-sharp, Version=0.4.0.0, Culture=neutral, PublicKeyToken=2df29c54e245917a">
+      <Package>notify-sharp</Package>
+    </Reference>
     <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
       <SpecificVersion>False</SpecificVersion>
       <Package>glib-sharp-2.0</Package>

=== modified file 'Docky/Docky/Docky.cs'
--- Docky/Docky/Docky.cs	2010-11-09 18:59:00 +0000
+++ Docky/Docky/Docky.cs	2010-12-19 17:42:12 +0000
@@ -21,6 +21,7 @@
 
 using DBus;
 using Gtk;
+using Notifications;
 
 using Docky.DBus;
 using Docky.Services;
@@ -77,7 +78,7 @@
 			DockServices.System.MainThread = Thread.CurrentThread;
 			
 			// check compositing
-			CheckComposite ();
+			CheckComposite (8);
 			Gdk.Screen.Default.CompositedChanged += delegate {
 				CheckComposite ();
 			};
@@ -109,17 +110,37 @@
 		}
 		
 		static uint checkCompositeTimer = 0;
+		static Notification compositeNotify = null;
 		static void CheckComposite ()
 		{
+			CheckComposite (2);
+		}
+		
+		static void CheckComposite (uint timeout)
+		{
 			if (checkCompositeTimer != 0) {
 				GLib.Source.Remove (checkCompositeTimer);
 				checkCompositeTimer = 0;
 			}
 			
-			checkCompositeTimer = GLib.Timeout.Add (2000, delegate {
+			// compositing is enabled and we are still showing a notify, so close it
+			if (Gdk.Screen.Default.IsComposited && compositeNotify != null) {
+				compositeNotify.Close ();
+				compositeNotify = null;
+				return;
+			}
+			
+			checkCompositeTimer = GLib.Timeout.Add (timeout * 1000, delegate {
+				// no matter what, close any notify open
+				if (compositeNotify != null) {
+					compositeNotify.Close ();
+					compositeNotify = null;
+				}
+				
 				if (!Gdk.Screen.Default.IsComposited)
-					Log.Notify (Catalog.GetString ("Docky requires compositing to work properly. " +
+					compositeNotify = Log.Notify (Catalog.GetString ("Docky requires compositing to work properly. " +
 						"Certain options are disabled and themes/animations will look incorrect. "));
+				
 				checkCompositeTimer = 0;
 				return false;
 			});

=== modified file 'Docky/Makefile.am'
--- Docky/Makefile.am	2010-11-04 21:16:22 +0000
+++ Docky/Makefile.am	2010-12-19 17:42:12 +0000
@@ -72,6 +72,7 @@
 	$(GNOME_DESKTOP_SHARP_20_LIBS) \
 	$(WNCK_SHARP_10_LIBS) \
 	$(LIBRSVG_SHARP_LIBS) \
+	$(NOTIFY_SHARP_LIBS) \
 	$(DBUS_SHARP_10_LIBS) \
 	$(DBUS_SHARP_GLIB_10_LIBS) \
 	$(MONO_ADDINS_LIBS) \