git.iko.soy/unity8
on xenial help sign in
move the lock connection to Greeter.qml
commit0556d216818bb87c57ab424756a131a25ee722d0 authorLukáš Tinkl <lukas.tinkl@canonical.com> dateMon 14 Mar 2016, 16:46 (11 years ago) parent628587a
2 files changed+6−5
compare with xenial
unifiedsplit
qml/Greeter/Greeter.qml+6 qml/Shell.qml−5
qml/Greeter/Greeter.qml+6
@@ -20,6 +20,7 @@ import GSettings 1.0
2020import Ubuntu.Components 1.3
2121import Ubuntu.SystemImage 0.1
2222import Unity.Launcher 0.1
23+import Unity.Session 0.1
2324import "../Components"
2425
2526Showable {
@@ -443,6 +444,11 @@ Showable {
443444 }
444445 }
445446
447+ Connections {
448+ target: DBusUnitySessionService
449+ onLockRequested: root.forceShow()
450+ }
451+
446452 Binding {
447453 target: lightDM.greeter
448454 property: "active"
qml/Shell.qml−5
@@ -443,11 +443,6 @@ Item {
443443 }
444444 }
445445
446− Connections {
447− target: DBusUnitySessionService
448− onLockRequested: lightDM.greeter.showGreeter()
449− }
450−
451446 Timer {
452447 // See powerConnection for why this is useful
453448 id: showGreeterDelayed