upower.diff

cat upower.diff
--- xbmc/linux/ConsoleDeviceKitPowerSyscall.cpp	2010-04-19 21:57:18.977267881 +0200
+++ xbmc/linux/ConsoleDeviceKitPowerSyscall.cpp.new	2010-04-19 21:55:40.239776214 +0200
@@ -32,16 +32,16 @@
 {
   m_CanPowerdown = ConsoleKitMethodCall("CanStop");

-  // If "the name org.freedesktop.DeviceKit.Power was not provided by any .service files",
+  // If "the name org.freedesktop.UPower was not provided by any .service files",
   // GetVariant() would return NULL, and asBoolean() would crash.
-  CVariant canSuspend = CDBusUtil::GetVariant("org.freedesktop.DeviceKit.Power", "/org/freedesktop/DeviceKit/Power",    "org.freedesktop.DeviceKit.Power", "can_suspend");
+  CVariant canSuspend = CDBusUtil::GetVariant("org.freedesktop.UPower", "/org/freedesktop/UPower",    "org.freedesktop.UPower", "can_suspend");

   if ( !canSuspend.isNull() )
     m_CanSuspend = canSuspend.asBoolean();
   else
     m_CanSuspend = false;

-  CVariant canHibernate = CDBusUtil::GetVariant("org.freedesktop.DeviceKit.Power", "/org/freedesktop/DeviceKit/Power",    "org.freedesktop.DeviceKit.Power", "can_hibernate");
+  CVariant canHibernate = CDBusUtil::GetVariant("org.freedesktop.UPower", "/org/freedesktop/UPower",    "org.freedesktop.UPower", "can_hibernate");

   if ( !canHibernate.isNull() )
     m_CanHibernate = canHibernate.asBoolean();
@@ -59,13 +59,13 @@

 bool CConsoleDeviceKitPowerSyscall::Suspend()
 {
-  CDBusMessage message("org.freedesktop.DeviceKit.Power", "/org/freedesktop/DeviceKit/Power", "org.freedesktop.DeviceKit.Power", "Suspend");
+  CDBusMessage message("org.freedesktop.UPower", "/org/freedesktop/UPower", "org.freedesktop.UPower", "Suspend");
   return message.SendSystem() != NULL;
 }

 bool CConsoleDeviceKitPowerSyscall::Hibernate()
 {
-  CDBusMessage message("org.freedesktop.DeviceKit.Power", "/org/freedesktop/DeviceKit/Power", "org.freedesktop.DeviceKit.Power", "Hibernate");
+  CDBusMessage message("org.freedesktop.UPower", "/org/freedesktop/UPower", "org.freedesktop.UPower", "Hibernate");
   return message.SendSystem() != NULL;
 }

@@ -111,14 +111,14 @@
   dbus_error_free (&error);

   bool hasDeviceKitPower = false;
-  CDBusMessage deviceKitMessage("org.freedesktop.DeviceKit.Disks", "/org/freedesktop/DeviceKit/Disks", "org.freedesktop.DeviceKit.Disks", "EnumerateDevices");
+  CDBusMessage deviceKitMessage("org.freedesktop.UDisks", "/org/freedesktop/UDisks", "org.freedesktop.UDisks", "EnumerateDevices");

   deviceKitMessage.Send(con, &error);

   if (!dbus_error_is_set(&error))
     hasDeviceKitPower = true;
   else
-    CLog::Log(LOGDEBUG, "DeviceKit.Power: %s - %s", error.name, error.message);
+    CLog::Log(LOGDEBUG, "UPower: %s - %s", error.name, error.message);

   dbus_error_free (&error);
   dbus_connection_unref(con);