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

tdelibs-14.0.0-logind_power.patch (text/plain), 8.48 KB, created by Francois Andriot on 2014-02-19 14:36:08 CST

(hide)

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

Filename:

MIME Type:

Creator: Francois Andriot

Created: 2014-02-19 14:36:08 CST

Size: 8.48 KB

patch

obsolete

>--- tdelibs/CMakeLists.txt.ORI 2014-02-18 21:12:46.381618169 +0100 >+++ tdelibs/CMakeLists.txt 2014-02-18 21:13:07.580932929 +0100 >@@ -88,6 +88,7 @@ > 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} ) >--- tdelibs/tdecore/tdehw/CMakeLists.txt.ORI 2014-02-18 21:13:42.908457596 +0100 >+++ tdelibs/tdecore/tdehw/CMakeLists.txt 2014-02-18 21:14:18.599987612 +0100 >@@ -36,6 +36,10 @@ > add_definitions( -DWITH_DEVKITPOWER ) > endif( ) > >+if( WITH_LOGINDPOWER ) >+ add_definitions( -DWITH_LOGINDPOWER ) >+endif( ) >+ > if( WITH_UPOWER ) > add_definitions( -DWITH_UPOWER ) > endif( ) >--- tdelibs/tdecore/tdehw/tderootsystemdevice.cpp.ORI 2014-02-18 21:14:39.180293185 +0100 >+++ tdelibs/tdecore/tdehw/tderootsystemdevice.cpp 2014-02-19 21:26:54.636361234 +0100 >@@ -182,6 +182,24 @@ > } > } > >+#ifdef WITH_LOGINDPOWER >+ { >+ TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus); >+ if (dbusConn.isConnected()) { >+ // can freeze? >+ TQT_DBusMessage msg = TQT_DBusMessage::methodCall( >+ "org.freedesktop.login1", >+ "/org/freedesktop/login1", >+ "org.freedesktop.login1.Manager", >+ "CanHybridSleep"); >+ 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_TDEHWLIB_DAEMONS > { > TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus); >@@ -221,6 +239,24 @@ > } > } > >+#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 +358,24 @@ > } > } > >+#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); >@@ -411,6 +465,25 @@ > > config->setGroup("General" ); > bool maysd = false; >+ >+#ifdef WITH_LOGINDPOWER >+ { >+ TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus); >+ if (dbusConn.isConnected()) { >+ // can freeze? >+ 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"); >+ } >+ } >+ } >+#endif // WITH_LOGINDPOWER >+ > #ifdef WITH_CONSOLEKIT > if (config->readBoolEntry( "offerShutdown", true )) { > TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus); >@@ -453,6 +526,25 @@ > > config->setGroup("General" ); > bool mayrb = false; >+ >+#ifdef WITH_LOGINDPOWER >+ { >+ TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus); >+ if (dbusConn.isConnected()) { >+ // can freeze? >+ 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"); >+ } >+ } >+ } >+#endif // WITH_LOGINDPOWER >+ > #ifdef WITH_CONSOLEKIT > if (config->readBoolEntry( "offerShutdown", true )) { > TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus); >@@ -575,6 +667,48 @@ > return true; > } > >+#ifdef WITH_LOGINDPOWER >+ { >+ TQT_DBusConnection dbusConn; >+ dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus); >+ if ( dbusConn.isConnected() ) { >+ if (ps == TDESystemPowerState::Freeze) { >+ TQT_DBusMessage msg = TQT_DBusMessage::methodCall( >+ "org.trinitydesktop.login1", >+ "/org/freedesktop/login1", >+ "org.freedesktop.login1.Manager", >+ "HybridSleep"); >+ TQT_DBusMessage reply = dbusConn.sendWithReply(msg); >+ if (reply.type() == TQT_DBusMessage::ReplyMessage) { >+ return true; >+ } >+ } >+ else 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,10 +860,28 @@ > 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" ); >+#ifdef WITH_LOGINDPOWER >+ if (config->readBoolEntry( "offerShutdown", true )) { >+ 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"); >+ dbusConn.sendWithReply(msg); >+ return true; >+ } >+ } >+ else { >+ return false; >+ } >+#endif // WITH_LOGINDPOWER >+#ifdef WITH_CONSOLEKIT > if (config->readBoolEntry( "offerShutdown", true )) { > TQT_DBusConnection dbusConn; > dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus); >@@ -762,10 +914,28 @@ > #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" ); >+#ifdef WITH_LOGINDPOWER >+ if (config->readBoolEntry( "offerShutdown", true )) { >+ 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"); >+ dbusConn.sendWithReply(msg); >+ return true; >+ } >+ } >+ else { >+ return false; >+ } >+#endif // WITH_LOGINDPOWER >+#ifdef WITH_CONSOLEKIT > if (config->readBoolEntry( "offerShutdown", true )) { > TQT_DBusConnection dbusConn; > dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus); View Attachment As Diff View Attachment As Raw

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