aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortopfs2 <topfs2@svn>2010-05-10 17:42:43 +0000
committertopfs2 <topfs2@svn>2010-05-10 17:42:43 +0000
commitfe40ff5fed0e3b7e1761686831ff9ce0cf6c6912 (patch)
tree4ca2ae3ebad7b9026f2f1c71e6e9faedc6715a7f
parent4c26740eb03c0e80b7ad86132ca780b938b48b4e (diff)
Prefer UPower over DeviceKit.Power
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@29992 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
-rw-r--r--xbmc/PowerManager.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/xbmc/PowerManager.cpp b/xbmc/PowerManager.cpp
index b61f804be7..a04f54a5a9 100644
--- a/xbmc/PowerManager.cpp
+++ b/xbmc/PowerManager.cpp
@@ -75,10 +75,10 @@ void CPowerManager::Initialize()
#ifdef __APPLE__
m_instance = new CCocoaPowerSyscall();
#elif defined(_LINUX) && defined(HAS_DBUS)
- if (CConsoleDeviceKitPowerSyscall::HasDeviceConsoleKit())
- m_instance = new CConsoleDeviceKitPowerSyscall();
- else if (CConsoleUPowerSyscall::HasDeviceConsoleKit())
+ if (CConsoleUPowerSyscall::HasDeviceConsoleKit())
m_instance = new CConsoleUPowerSyscall();
+ else if (CConsoleDeviceKitPowerSyscall::HasDeviceConsoleKit())
+ m_instance = new CConsoleDeviceKitPowerSyscall();
#ifdef HAS_HAL
else
m_instance = new CHALPowerSyscall();