Merge lp:~stevens-ischyrus/do/dev into lp:do

[ischyrus]

[Chris Halse Rogers (raof)]

Thanks for your contribution!

This code is correct. However, I'm not sure that Do *should* continue to load when the keybindings won't work. Would this be useful for you? Do won't crash, but it also won't respond to anything but the DBus summon interface.

Probably the correct behaviour is to (a) not crash, but (b) throw up an error dialog.

review: Needs Information

Unmerged revisions

1333. By ischyrus on 2011-01-02

There is a check that ensures libdo is found\loaded, if not loaded the exception is handled and discarded.

Later on when a keybinding is added the application will crash. Because the state of libdo is already determined and RegisterOSKey\UnRegisterOSKey both return the result of the operation, the KeyBindingService should gracefully handle the scenario rather than throw an unhandled exception.

=== modified file 'Do.Platform.Linux/src/Do.Platform/Do.Platform.Linux/KeyBindingService.cs'
--- Do.Platform.Linux/src/Do.Platform/Do.Platform.Linux/KeyBindingService.cs	2009-08-08 05:48:10 +0000
+++ Do.Platform.Linux/src/Do.Platform/Do.Platform.Linux/KeyBindingService.cs	2011-01-02 08:57:57 +0000
@@ -24,6 +24,7 @@
 		public delegate void BindkeyHandler (string key, IntPtr user_data);
 		
 		BindkeyHandler key_handler;
+		bool libdoFound = false;
 		
 		public KeyBindingService () : base ()
 		{
@@ -31,6 +32,7 @@
 			
 			try {
 				gnomedo_keybinder_init ();
+				libdoFound = true;
 			} catch (DllNotFoundException) {
 				Log.Error ("libdo not found - keybindings will not work.");
 			}
@@ -45,16 +47,16 @@
 		
 		public override bool RegisterOSKey (string keyString, EventCallback cb)
 		{
-			if (string.IsNullOrEmpty (keyString) || cb == null)
+			if (!libdoFound || string.IsNullOrEmpty (keyString) || cb == null)
 				return false;
 			return gnomedo_keybinder_bind (keyString, key_handler);
 		}
 
 		public override bool UnRegisterOSKey (string keyString)
 		{
-			if (Bindings.Any (k => k.KeyString == keyString))
+			if (!libdoFound || Bindings.Any (k => k.KeyString == keyString))
 				return gnomedo_keybinder_unbind (keyString, key_handler);
 			return false;
 		}
 	}
-}
\ No newline at end of file
+}