Merge lp:~raof/do/devicekit-power-compat into lp:do

[Chris Halse Rogers]

[Chris Halse Rogers (raof)]

This branch adds support for the DeviceKit.Power interface. In Karmic this is where the on-battery data is exported; gnome-power-manager no longer exports this on org.freedesktop.PowerManager.

The code first checks for an org.freedesktop.PowerManager with a GetOnBattery method, then falls back on DeviceKit.Power. If both these fail, GetOnBatteryPower will always return false.

[lp:~raof/do/devicekit-power-compat]

1254. By Chris Halse Rogers on 2009-06-23

[SystemServices] Reverse DeviceKit.Power detection logic.

We now use org.freedesktop.DeviceKit.Power if it exists, then fall back on org.freedesktop.PowerManager.
This makes for cleaner code.

1255. By Chris Halse Rogers on 2009-06-24

[SystemServices] Fix camelCasing for method variables

=== modified file 'Do.Platform.Linux/src/Do.Platform/Do.Platform.Linux/SystemService.cs'
--- Do.Platform.Linux/src/Do.Platform/Do.Platform.Linux/SystemService.cs	2009-05-19 04:37:27 +0000
+++ Do.Platform.Linux/src/Do.Platform/Do.Platform.Linux/SystemService.cs	2009-06-23 03:44:20 +0000
@@ -37,6 +37,8 @@
 		
 		const string PowerManagementName = "org.freedesktop.PowerManagement";
 		const string PowerManagementPath = "/org/freedesktop/PowerManagement";
+		const string DeviceKitPowerName = "org.freedesktop.DeviceKit.Power";
+		const string DeviceKitPowerPath = "/org/freedesktop/DeviceKit/Power";
 		const string AutoStartKey = "Hidden";
 		
 		[Interface(PowerManagementName)]
@@ -46,16 +48,44 @@
 			event BoolDelegate OnBatteryChanged;
 		}
 		
+		[Interface(DeviceKitPowerName)]
+		interface IDeviceKitPower : org.freedesktop.DBus.Properties
+		{
+			event Action OnChanged;
+		}
+		
+		bool on_battery;
+		
 		IPowerManagement power;
+		IDeviceKitPower devicekit;
 		DesktopItem autostartfile;
 		
 		public void Initialize ()
 		{
+			// Set a sane default value for on_battery.  Thus, if we don't find a working power manager
+			// we assume we're not on battery.
+			on_battery = false;
 			try {
 				BusG.Init ();
 				if (Bus.Session.NameHasOwner (PowerManagementName)) {
 					power = Bus.Session.GetObject<IPowerManagement> (PowerManagementName, new ObjectPath (PowerManagementPath));
 					power.OnBatteryChanged += PowerOnBatteryChanged;
+					// Annoying hack to determine whether or not org.freedesktop.PowerManagement actually has
+					// the onbattery property.  To do this right, I'd grab the grab the Introspect data, run it through
+					// an XmlDocument, and parse out the methods available.  Try-Catch will do for now.
+					try {
+						on_battery = power.GetOnBattery ();
+					} catch (Exception e) {
+						power = null;
+						Log<SystemService>.Debug ("org.freedesktop.PowerManagement does not have OnBattery property.");
+						Log<SystemService>.Debug ("Trying DeviceKit-Power instead.");
+						if (Bus.System.NameHasOwner (DeviceKitPowerName)) {
+							devicekit = Bus.System.GetObject<IDeviceKitPower> (DeviceKitPowerName, new ObjectPath (DeviceKitPowerPath));
+							devicekit.OnChanged += DeviceKitOnChanged;
+							on_battery = (bool) devicekit.Get (DeviceKitPowerName, "on-battery");
+							Log<SystemService>.Debug ("DeviceKit.Power detected.");
+						}
+					}
 				}
 			} catch (Exception e) {
 				Log<SystemService>.Error ("Could not initialize dbus: {0}", e.Message);
@@ -65,22 +95,22 @@
 
 		void PowerOnBatteryChanged (bool val)
 		{
+			on_battery = val;
 			OnOnBatteryChanged ();
 		}
-	
+		
+		void DeviceKitOnChanged ()
+		{
+			bool new_state = (bool) devicekit.Get (DeviceKitPowerName, "on-battery");
+			if (on_battery != new_state) {
+				on_battery = new_state;
+				OnOnBatteryChanged ();
+			}
+		}
+		
 		public override bool GetOnBatteryPower ()
 		{
-			try {
-				if (power == null && !Bus.Session.NameHasOwner (PowerManagementName))
-					return false;
-				if (power == null)
-					power = Bus.Session.GetObject<IPowerManagement> (PowerManagementName, new ObjectPath (PowerManagementPath));
-				return power.GetOnBattery ();
-			} catch (Exception e) {
-				Log<SystemService>.Error ("Could not GetOnBattery: {0}", e.Message);
-				Log<SystemService>.Debug (e.StackTrace);
-			}
-			return false;
+			return on_battery;
 		}
 
 		public override void EnsureSingleApplicationInstance ()