Merge lp:~jpds/do-plugins/session-dbus-fixes into lp:do-plugins

[Jonathan Davies]

[Jonathan Davies (jpds)]

This branch fixes D-Bus changes in Ubuntu Karmic (notably org.gnome.PowerManagement to DeviceKit).

[Alex Launi (alexlauni)]

Looks good. Thanks a lot for fixing this!

review: Approve

=== modified file 'GNOME-Session/src/PowerManagement.cs'
--- GNOME-Session/src/PowerManagement.cs	2009-05-17 07:43:33 +0000
+++ GNOME-Session/src/PowerManagement.cs	2009-09-18 20:17:57 +0000
@@ -30,21 +30,21 @@
 
 	class PowerManagement
 	{
-		[Interface ("org.freedesktop.PowerManagement")]
+		[Interface ("org.freedesktop.DeviceKit.Power")]
 		interface IPowerManagementProxy
 		{
 			void Hibernate ();
 			void Suspend ();
 		}
 
-		const string BusName = "org.freedesktop.PowerManagement";
-		const string ObjectPath = "/org/freedesktop/PowerManagement";
+		const string BusName = "org.freedesktop.DeviceKit.Power";
+		const string ObjectPath = "/org/freedesktop/DeviceKit/Power";
 
 		static IPowerManagementProxy BusInstance
 		{
 			get {
 				try {
-					return Bus.Session.GetObject<IPowerManagementProxy> (BusName, new ObjectPath (ObjectPath));
+					return Bus.System.GetObject<IPowerManagementProxy> (BusName, new ObjectPath (ObjectPath));
 				} catch (Exception e) {
 					Log<PowerManagement>.Error ("Could not get PowerManagement bus object: {0}", e.Message);
 					Log<PowerManagement>.Debug (e.StackTrace);