By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release.

[patch] tdelibs: add the systemd/logind power features to tdehwlib (1)

tdelibs-14.0.0-logind_power-1.patch (text/plain), 13.05 KB, created by Slávek Banko on 2014-02-26 13:13:52 CST

(hide)

Description: tdelibs: add the systemd/logind power features to tdehwlib (1)

Filename:

MIME Type:

Creator: Slávek Banko

Created: 2014-02-26 13:13:52 CST

Size: 13.05 KB

patch

obsolete

>diff --git a/CMakeLists.txt b/CMakeLists.txt >index 6242410..e97ef57 100644 >--- a/CMakeLists.txt >+++ b/CMakeLists.txt >@@ -88,6 +88,7 @@ OPTION( WITH_GAMIN "Enable FAM/GAMIN support" ${WITH_ALL_OPTIONS} ) > option( WITH_TDEHWLIB_DAEMONS "Enable daemons for TDE hwlib" ${WITH_ALL_OPTIONS} ) > option( WITH_HAL "Enable HAL support" OFF ) > option( WITH_DEVKITPOWER "Enable DeviceKit Power support" OFF ) >+option( WITH_LOGINDPOWER "Enable Logind/Systemd Power support" OFF ) > option( WITH_UPOWER "Enable uPower support" ${WITH_ALL_OPTIONS} ) > option( WITH_UDISKS "Enable uDisks support" ${WITH_ALL_OPTIONS} ) > option( WITH_UDISKS2 "Enable uDisks2 support" ${WITH_ALL_OPTIONS} ) >diff --git a/tdecore/tdehw/CMakeLists.txt b/tdecore/tdehw/CMakeLists.txt >index 553cd70..f9354ec 100644 >--- a/tdecore/tdehw/CMakeLists.txt >+++ b/tdecore/tdehw/CMakeLists.txt >@@ -36,6 +36,10 @@ if( WITH_DEVKITPOWER ) > add_definitions( -DWITH_DEVKITPOWER ) > endif( ) > >+if( WITH_LOGINDPOWER ) >+ add_definitions( -DWITH_LOGINDPOWER ) >+endif( ) >+ > if( WITH_UPOWER ) > add_definitions( -DWITH_UPOWER ) > endif( ) >diff --git a/tdecore/tdehw/tderootsystemdevice.cpp b/tdecore/tdehw/tderootsystemdevice.cpp >index b62f07d..3951aa7 100644 >--- a/tdecore/tdehw/tderootsystemdevice.cpp >+++ b/tdecore/tdehw/tderootsystemdevice.cpp >@@ -221,6 +221,24 @@ bool TDERootSystemDevice::canSuspend() { > } > } > >+#ifdef WITH_LOGINDPOWER >+ { >+ TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus); >+ if (dbusConn.isConnected()) { >+ // can suspend? >+ TQT_DBusMessage msg = TQT_DBusMessage::methodCall( >+ "org.freedesktop.login1", >+ "/org/freedesktop/login1", >+ "org.freedesktop.login1.Manager", >+ "CanSuspend"); >+ TQT_DBusMessage reply = dbusConn.sendWithReply(msg); >+ if (reply.type() == TQT_DBusMessage::ReplyMessage && reply.count() == 1) { >+ return (reply[0].toString() == "yes"); >+ } >+ } >+ } >+#endif // WITH_LOGINDPOWER >+ > #ifdef WITH_UPOWER > { > TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus); >@@ -322,6 +340,24 @@ bool TDERootSystemDevice::canHibernate() { > } > } > >+#ifdef WITH_LOGINDPOWER >+ { >+ TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus); >+ if (dbusConn.isConnected()) { >+ // can hibernate? >+ TQT_DBusMessage msg = TQT_DBusMessage::methodCall( >+ "org.freedesktop.login1", >+ "/org/freedesktop/login1", >+ "org.freedesktop.login1.Manager", >+ "CanHibernate"); >+ TQT_DBusMessage reply = dbusConn.sendWithReply(msg); >+ if (reply.type() == TQT_DBusMessage::ReplyMessage && reply.count() == 1) { >+ return (reply[0].toString() == "yes"); >+ } >+ } >+ } >+#endif // WITH_LOGINDPOWER >+ > #ifdef WITH_UPOWER > { > TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus); >@@ -410,41 +446,53 @@ bool TDERootSystemDevice::canPowerOff() { > config->reparseConfiguration(); // config may have changed in the KControl module > > config->setGroup("General" ); >- bool maysd = false; >-#ifdef WITH_CONSOLEKIT >- if (config->readBoolEntry( "offerShutdown", true )) { >+ if (!config->readBoolEntry( "offerShutdown", true )) { >+ return FALSE; >+ } >+ >+#ifdef WITH_LOGINDPOWER >+ { > TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus); > if (dbusConn.isConnected()) { >- TQT_DBusProxy consoleKitManager("org.freedesktop.ConsoleKit", "/org/freedesktop/ConsoleKit/Manager", "org.freedesktop.ConsoleKit.Manager", dbusConn); >- if (consoleKitManager.canSend()) { >- // can power off? >- TQValueList<TQT_DBusData> params; >- TQT_DBusMessage reply = consoleKitManager.sendWithReply("CanStop", params); >- if (reply.type() == TQT_DBusMessage::ReplyMessage && reply.count() == 1) { >- maysd = reply[0].toBool(); >- } >- else { >- maysd = false; >- } >- } >- else { >- maysd = false; >+ // can power off? >+ TQT_DBusMessage msg = TQT_DBusMessage::methodCall( >+ "org.freedesktop.login1", >+ "/org/freedesktop/login1", >+ "org.freedesktop.login1.Manager", >+ "CanPowerOff"); >+ TQT_DBusMessage reply = dbusConn.sendWithReply(msg); >+ if (reply.type() == TQT_DBusMessage::ReplyMessage && reply.count() == 1) { >+ return (reply[0].toString() == "yes"); > } > } >- else { >- maysd = false; >+ } >+#endif // WITH_LOGINDPOWER >+ >+#ifdef WITH_CONSOLEKIT >+ { >+ TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus); >+ if (dbusConn.isConnected()) { >+ // can power off? >+ TQT_DBusMessage msg = TQT_DBusMessage::methodCall( >+ "org.freedesktop.ConsoleKit", >+ "/org/freedesktop/ConsoleKit/Manager", >+ "org.freedesktop.ConsoleKit.Manager", >+ "CanStop"); >+ TQT_DBusMessage reply = dbusConn.sendWithReply(msg); >+ if (reply.type() == TQT_DBusMessage::ReplyMessage && reply.count() == 1) { >+ return reply[0].toBool(); >+ } > } > } >-#else // WITH_CONSOLEKIT >+#endif // WITH_CONSOLEKIT >+ > // FIXME > // Can we power down this system? > // This should probably be checked via DCOP and therefore interface with TDM >- if (config->readBoolEntry( "offerShutdown", true )/* && DM().canShutdown()*/) { // FIXME >- maysd = true; >- } >-#endif // WITH_CONSOLEKIT >- >- return maysd; >+ // if ( DM().canShutdown() ) { >+ // return TRUE; >+ // } >+ return TRUE; > } > > bool TDERootSystemDevice::canReboot() { >@@ -452,41 +500,53 @@ bool TDERootSystemDevice::canReboot() { > config->reparseConfiguration(); // config may have changed in the KControl module > > config->setGroup("General" ); >- bool mayrb = false; >-#ifdef WITH_CONSOLEKIT >- if (config->readBoolEntry( "offerShutdown", true )) { >+ if (!config->readBoolEntry( "offerShutdown", true )) { >+ return FALSE; >+ } >+ >+#ifdef WITH_LOGINDPOWER >+ { > TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus); > if (dbusConn.isConnected()) { >- TQT_DBusProxy consoleKitManager("org.freedesktop.ConsoleKit", "/org/freedesktop/ConsoleKit/Manager", "org.freedesktop.ConsoleKit.Manager", dbusConn); >- if (consoleKitManager.canSend()) { >- // can reboot? >- TQValueList<TQT_DBusData> params; >- TQT_DBusMessage reply = consoleKitManager.sendWithReply("CanRestart", params); >- if (reply.type() == TQT_DBusMessage::ReplyMessage && reply.count() == 1) { >- mayrb = reply[0].toBool(); >- } >- else { >- mayrb = false; >- } >- } >- else { >- mayrb = false; >+ // can reboot? >+ TQT_DBusMessage msg = TQT_DBusMessage::methodCall( >+ "org.freedesktop.login1", >+ "/org/freedesktop/login1", >+ "org.freedesktop.login1.Manager", >+ "CanReboot"); >+ TQT_DBusMessage reply = dbusConn.sendWithReply(msg); >+ if (reply.type() == TQT_DBusMessage::ReplyMessage && reply.count() == 1) { >+ return (reply[0].toString() == "yes"); > } > } >- else { >- mayrb = false; >+ } >+#endif // WITH_LOGINDPOWER >+ >+#ifdef WITH_CONSOLEKIT >+ { >+ TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus); >+ if (dbusConn.isConnected()) { >+ // can reboot? >+ TQT_DBusMessage msg = TQT_DBusMessage::methodCall( >+ "org.freedesktop.ConsoleKit", >+ "/org/freedesktop/ConsoleKit/Manager", >+ "org.freedesktop.ConsoleKit.Manager", >+ "CanRestart"); >+ TQT_DBusMessage reply = dbusConn.sendWithReply(msg); >+ if (reply.type() == TQT_DBusMessage::ReplyMessage && reply.count() == 1) { >+ return reply[0].toBool(); >+ } > } > } >-#else // WITH_CONSOLEKIT >+#endif // WITH_CONSOLEKIT >+ > // FIXME > // Can we power down this system? > // This should probably be checked via DCOP and therefore interface with TDM >- if (config->readBoolEntry( "offerShutdown", true )/* && DM().canShutdown()*/) { // FIXME >- mayrb = true; >- } >-#endif // WITH_CONSOLEKIT >- >- return mayrb; >+ // if ( DM().canShutdown() ) { >+ // return TRUE; >+ // } >+ return TRUE; > } > > void TDERootSystemDevice::setHibernationMethod(TDESystemHibernationMethod::TDESystemHibernationMethod hm) { >@@ -575,6 +635,37 @@ bool TDERootSystemDevice::setPowerState(TDESystemPowerState::TDESystemPowerState > return true; > } > >+#ifdef WITH_LOGINDPOWER >+ { >+ TQT_DBusConnection dbusConn; >+ dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus); >+ if ( dbusConn.isConnected() ) { >+ if (ps == TDESystemPowerState::Suspend) { >+ TQT_DBusMessage msg = TQT_DBusMessage::methodCall( >+ "org.freedesktop.login1", >+ "/org/freedesktop/login1", >+ "org.freedesktop.login1.Manager", >+ "Suspend"); >+ TQT_DBusMessage reply = dbusConn.sendWithReply(msg); >+ if (reply.type() == TQT_DBusMessage::ReplyMessage) { >+ return true; >+ } >+ } >+ else if (ps == TDESystemPowerState::Hibernate) { >+ TQT_DBusMessage msg = TQT_DBusMessage::methodCall( >+ "org.freedesktop.login1", >+ "/org/freedesktop/login1", >+ "org.freedesktop.login1.Manager", >+ "Hibernate"); >+ TQT_DBusMessage reply = dbusConn.sendWithReply(msg); >+ if (reply.type() == TQT_DBusMessage::ReplyMessage) { >+ return true; >+ } >+ } >+ } >+ } >+#endif // WITH_LOGINDPOWER >+ > #ifdef WITH_UPOWER > { > TQT_DBusConnection dbusConn; >@@ -726,11 +817,31 @@ bool TDERootSystemDevice::setPowerState(TDESystemPowerState::TDESystemPowerState > return false; > } > else if (ps == TDESystemPowerState::PowerOff) { >-#ifdef WITH_CONSOLEKIT > TDEConfig *config = TDEGlobal::config(); > config->reparseConfiguration(); // config may have changed in the KControl module > config->setGroup("General" ); >- if (config->readBoolEntry( "offerShutdown", true )) { >+ if (!config->readBoolEntry( "offerShutdown", true )) { >+ return false; >+ } >+#ifdef WITH_LOGINDPOWER >+ { >+ TQT_DBusConnection dbusConn; >+ dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus); >+ if ( dbusConn.isConnected() ) { >+ TQT_DBusMessage msg = TQT_DBusMessage::methodCall( >+ "org.trinitydesktop.login1", >+ "/org/freedesktop/login1", >+ "org.freedesktop.login1.Manager", >+ "PowerOff"); >+ TQT_DBusMessage reply = dbusConn.sendWithReply(msg); >+ if (reply.type() == TQT_DBusMessage::ReplyMessage) { >+ return true; >+ } >+ } >+ } >+#endif // WITH_LOGINDPOWER >+#ifdef WITH_CONSOLEKIT >+ { > TQT_DBusConnection dbusConn; > dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus); > if ( dbusConn.isConnected() ) { >@@ -739,17 +850,13 @@ bool TDERootSystemDevice::setPowerState(TDESystemPowerState::TDESystemPowerState > "/org/freedesktop/ConsoleKit/Manager", > "org.freedesktop.ConsoleKit.Manager", > "Stop"); >- dbusConn.sendWithReply(msg); >- return true; >- } >- else { >- return false; >+ TQT_DBusMessage reply = dbusConn.sendWithReply(msg); >+ if (reply.type() == TQT_DBusMessage::ReplyMessage) { >+ return true; >+ } > } > } >- else { >- return false; >- } >-#else // WITH_CONSOLEKIT >+#endif // WITH_CONSOLEKIT > // Power down the system using a DCOP command > // Values are explained at http://lists.kde.org/?l=kde-linux&m=115770988603387 > TQByteArray data; >@@ -759,14 +866,33 @@ bool TDERootSystemDevice::setPowerState(TDESystemPowerState::TDESystemPowerState > return true; > } > return false; >-#endif // WITH_CONSOLEKIT > } > else if (ps == TDESystemPowerState::Reboot) { >-#ifdef WITH_CONSOLEKIT > TDEConfig *config = TDEGlobal::config(); > config->reparseConfiguration(); // config may have changed in the KControl module > config->setGroup("General" ); >- if (config->readBoolEntry( "offerShutdown", true )) { >+ if (!config->readBoolEntry( "offerShutdown", true )) { >+ return false; >+ } >+#ifdef WITH_LOGINDPOWER >+ { >+ TQT_DBusConnection dbusConn; >+ dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus); >+ if ( dbusConn.isConnected() ) { >+ TQT_DBusMessage msg = TQT_DBusMessage::methodCall( >+ "org.trinitydesktop.login1", >+ "/org/freedesktop/login1", >+ "org.freedesktop.login1.Manager", >+ "Reboot"); >+ TQT_DBusMessage reply = dbusConn.sendWithReply(msg); >+ if (reply.type() == TQT_DBusMessage::ReplyMessage) { >+ return true; >+ } >+ } >+ } >+#endif // WITH_LOGINDPOWER >+#ifdef WITH_CONSOLEKIT >+ { > TQT_DBusConnection dbusConn; > dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus); > if ( dbusConn.isConnected() ) { >@@ -775,17 +901,13 @@ bool TDERootSystemDevice::setPowerState(TDESystemPowerState::TDESystemPowerState > "/org/freedesktop/ConsoleKit/Manager", > "org.freedesktop.ConsoleKit.Manager", > "Restart"); >- dbusConn.sendWithReply(msg); >- return true; >- } >- else { >- return false; >+ TQT_DBusMessage reply = dbusConn.sendWithReply(msg); >+ if (reply.type() == TQT_DBusMessage::ReplyMessage) { >+ return true; >+ } > } > } >- else { >- return false; >- } >-#else // WITH_CONSOLEKIT >+#endif // WITH_CONSOLEKIT > // Power down the system using a DCOP command > // Values are explained at http://lists.kde.org/?l=kde-linux&m=115770988603387 > TQByteArray data; >@@ -795,7 +917,6 @@ bool TDERootSystemDevice::setPowerState(TDESystemPowerState::TDESystemPowerState > return true; > } > return false; >-#endif // WITH_CONSOLEKIT > } > else if (ps == TDESystemPowerState::Active) { > // Ummm...we're already active... View Attachment As Diff View Attachment As Raw

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    [x]
  • | Forgot Password
    Login: [x]