on xenial help sign in
unbreak locking the device from the session indicator
commitcced04dc0bc83cb3faf945f39d3546023d03fbca authorLukáš Tinkl <lukas.tinkl@canonical.com> dateWed 9 Mar 2016, 14:17 (11 years ago) parent44d21d7
2 files changed+9−1
plugins/Unity/Session/dbusunitysessionservice.cpp+4−1 qml/Shell.qml+5
plugins/Unity/Session/dbusunitysessionservice.cpp+4−1
@@ -336,6 +336,9 @@ void DBusUnitySessionService::PromptLock()
336336
337337void DBusUnitySessionService::Lock()
338338{
339+ // signal u8 to show the lockscreen/greeter
340+ PromptLock();
341+
339342 // lock the session using the org.freedesktop.DisplayManager system DBUS service
340343 const QString sessionPath = QString::fromLocal8Bit(qgetenv("XDG_SESSION_PATH"));
341344 QDBusMessage msg = QDBusMessage::createMethodCall(QStringLiteral("org.freedesktop.DisplayManager"),
@@ -348,7 +351,7 @@ void DBusUnitySessionService::Lock()
348351 connect(watcher, &QDBusPendingCallWatcher::finished,
349352 this, [this](QDBusPendingCallWatcher* watcher) {
350353
351− QDBusPendingReply<QVariant> reply = *watcher;
354+ QDBusPendingReply<void> reply = *watcher;
352355 watcher->deleteLater();
353356 if (reply.isError()) {
354357 qWarning() << "Lock call failed" << reply.error().message();
qml/Shell.qml+5
@@ -428,6 +428,11 @@ Item {
428428 }
429429 }
430430
431+ Connections {
432+ target: DBusUnitySessionService
433+ onLockRequested: lightDM.greeter.showGreeter()
434+ }
435+
431436 Timer {
432437 // See powerConnection for why this is useful
433438 id: showGreeterDelayed