summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukas Tinkl <lukas@kde.org>2012-10-05 09:57:13 (GMT)
committerLukas Tinkl <lukas@kde.org>2012-10-05 09:57:13 (GMT)
commita18b78d7da8cb8d627ad2e85f666bfcf1a2721e1 (patch)
tree98cc9ce372e48f547ff266606de7b98c34b6b4d7
parent79d25320272f3e70ec903a60298e1ba3f78eb628 (diff)
store the filedescriptor in a member variable
make systemd-inhibit work as intended, PowerDevil now handles power/sleep/lid buttons as intended BUG: 307412
-rw-r--r--powerdevil/daemon/powerdevilpolicyagent.cpp9
-rw-r--r--powerdevil/daemon/powerdevilpolicyagent.h2
2 files changed, 8 insertions, 3 deletions
diff --git a/powerdevil/daemon/powerdevilpolicyagent.cpp b/powerdevil/daemon/powerdevilpolicyagent.cpp
index efc3476..70588db 100644
--- a/powerdevil/daemon/powerdevilpolicyagent.cpp
+++ b/powerdevil/daemon/powerdevilpolicyagent.cpp
@@ -29,7 +29,6 @@
#include <QtDBus/QDBusPendingReply>
#include <QtDBus/QDBusConnectionInterface>
#include <QtDBus/QDBusServiceWatcher>
-#include <QtDBus/QDBusUnixFileDescriptor>
#include <KGlobal>
#include <KDebug>
@@ -225,6 +224,9 @@ void PolicyAgent::onSessionHandlerRegistered(const QString & serviceName)
onActiveSessionChanged(m_activeSessionPath);
// inhibit systemd handling of power/sleep/lid buttons
+ // http://www.freedesktop.org/wiki/Software/systemd/inhibit
+ kDebug() << "fd passing available:" << bool(managerIface.connection().connectionCapabilities() & QDBusConnection::UnixFileDescriptorPassing);
+
QVariantList args;
args << "handle-power-key:handle-suspend-key:handle-hibernate-key:handle-lid-switch"; // what
args << "PowerDevil"; // who
@@ -232,8 +234,9 @@ void PolicyAgent::onSessionHandlerRegistered(const QString & serviceName)
args << "block"; // mode
QDBusPendingReply<QDBusUnixFileDescriptor> desc = managerIface.asyncCallWithArgumentList("Inhibit", args);
desc.waitForFinished();
- if (desc.isValid() && desc.value().isValid()) {
- kDebug() << "systemd powersave events handling inhibited";
+ if (desc.isValid()) {
+ m_systemdInhibitFd = desc.value();
+ kDebug() << "systemd powersave events handling inhibited, descriptor:" << m_systemdInhibitFd.fileDescriptor();
}
else
kWarning() << "failed to inhibit systemd powersave handling";
diff --git a/powerdevil/daemon/powerdevilpolicyagent.h b/powerdevil/daemon/powerdevilpolicyagent.h
index 6001846..a046497 100644
--- a/powerdevil/daemon/powerdevilpolicyagent.h
+++ b/powerdevil/daemon/powerdevilpolicyagent.h
@@ -27,6 +27,7 @@
#include <QtCore/QWeakPointer>
#include <QtDBus/QDBusContext>
+#include <QtDBus/QDBusUnixFileDescriptor>
#include <kdemacros.h>
@@ -108,6 +109,7 @@ private:
QString m_activeSessionPath;
QWeakPointer< QDBusInterface > m_sdSessionInterface;
QWeakPointer< QDBusInterface > m_sdSeatInterface;
+ QDBusUnixFileDescriptor m_systemdInhibitFd;
// ConsoleKit support
bool m_ckAvailable;