git.iko.soy/unity8
on xenial help sign in
Let systemd/logind handle the lid-close action
56355c8Lukáš Tinkl
plugins/Unity/Session/dbusunitysessionservice.cpp+2−4
compare with xenial
unifiedsplit
@@ -84,11 +84,11 @@ public:
84 if (m_systemdInhibitFd.isValid())
84 if (m_systemdInhibitFd.isValid())
85 return;
85 return;
86
86
87− // inhibit systemd handling of power/sleep/lid buttons
87+ // inhibit systemd handling of power/sleep/hibernate buttons
88 // http://www.freedesktop.org/wiki/Software/systemd/inhibit
88 // http://www.freedesktop.org/wiki/Software/systemd/inhibit
89
89
90 QDBusMessage msg = QDBusMessage::createMethodCall(LOGIN1_SERVICE, LOGIN1_PATH, LOGIN1_IFACE, QStringLiteral("Inhibit"));
90 QDBusMessage msg = QDBusMessage::createMethodCall(LOGIN1_SERVICE, LOGIN1_PATH, LOGIN1_IFACE, QStringLiteral("Inhibit"));
91− msg << "handle-power-key:handle-suspend-key:handle-hibernate-key:handle-lid-switch"; // what
91+ msg << "handle-power-key:handle-suspend-key:handle-hibernate-key"; // what
92 msg << "Unity"; // who
92 msg << "Unity"; // who
93 msg << "Unity8 handles power events"; // why
93 msg << "Unity8 handles power events"; // why
94 msg << "block"; // mode
94 msg << "block"; // mode
@@ -97,7 +97,6 @@ public:
97 QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingCall, this);
97 QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingCall, this);
98 connect(watcher, &QDBusPendingCallWatcher::finished,
98 connect(watcher, &QDBusPendingCallWatcher::finished,
99 this, [this](QDBusPendingCallWatcher* watcher) {
99 this, [this](QDBusPendingCallWatcher* watcher) {
100−
101 QDBusPendingReply<QDBusUnixFileDescriptor> reply = *watcher;
100 QDBusPendingReply<QDBusUnixFileDescriptor> reply = *watcher;
102 watcher->deleteLater();
101 watcher->deleteLater();
103 if (reply.isError()) {
102 if (reply.isError()) {
@@ -109,7 +108,6 @@ public:
109 });
108 });
110 }
109 }
111
110
112−
113 bool checkLogin1Call(const QString &method) const
111 bool checkLogin1Call(const QString &method) const
114 {
112 {
115 QDBusMessage msg = QDBusMessage::createMethodCall(LOGIN1_SERVICE, LOGIN1_PATH, LOGIN1_IFACE, method);
113 QDBusMessage msg = QDBusMessage::createMethodCall(LOGIN1_SERVICE, LOGIN1_PATH, LOGIN1_IFACE, method);