git.iko.soy/unity8
on xenial help sign in
move the lock connection to Greeter.qml
0556d21Lukáš Tinkl
qml/Greeter/Greeter.qml+6
compare with xenial
unifiedsplit
@@ -20,6 +20,7 @@ import GSettings 1.0
20import Ubuntu.Components 1.3
20import Ubuntu.Components 1.3
21import Ubuntu.SystemImage 0.1
21import Ubuntu.SystemImage 0.1
22import Unity.Launcher 0.1
22import Unity.Launcher 0.1
23+import Unity.Session 0.1
23import "../Components"
24import "../Components"
24
25
25Showable {
26Showable {
@@ -443,6 +444,11 @@ Showable {
443 }
444 }
444 }
445 }
445
446
447+ Connections {
448+ target: DBusUnitySessionService
449+ onLockRequested: root.forceShow()
450+ }
451+
446 Binding {
452 Binding {
447 target: lightDM.greeter
453 target: lightDM.greeter
448 property: "active"
454 property: "active"
qml/Shell.qml−5
@@ -443,11 +443,6 @@ Item {
443 }
443 }
444 }
444 }
445
445
446− Connections {
447− target: DBusUnitySessionService
448− onLockRequested: lightDM.greeter.showGreeter()
449− }
450−
451 Timer {
446 Timer {
452 // See powerConnection for why this is useful
447 // See powerConnection for why this is useful
453 id: showGreeterDelayed
448 id: showGreeterDelayed