git.iko.soy/unity8
on xenial help sign in
Remove shell.mode dependency from LightDM.qml
8c3166aJosh Arenson
qml/Greeter/LightDM.qml+2−2
compare with xenial
unifiedsplit
@@ -24,13 +24,13 @@ import QtQuick 2.3
24Loader {
24Loader {
25 id: loader
25 id: loader
26
26
27+ property bool greeterMode: null
27 property var greeter: d.valid ? loader.item.greeter : null
28 property var greeter: d.valid ? loader.item.greeter : null
28 property var infographic: d.valid ? loader.item.infographic : null
29 property var infographic: d.valid ? loader.item.infographic : null
29 property var users: d.valid ? loader.item.users : null
30 property var users: d.valid ? loader.item.users : null
30 property var userRoles: d.valid ? loader.item.userRoles : null
31 property var userRoles: d.valid ? loader.item.userRoles : null
31− property string shellMode: shell.mode ? shell.mode : ""
32
32
33− source: shellMode === "greeter" ?
33+ source: greeterMode ?
34 "./FullLightDMImpl.qml" : "./IntegratedLightDMImpl.qml"
34 "./FullLightDMImpl.qml" : "./IntegratedLightDMImpl.qml"
35
35
36 QtObject {
36 QtObject {
qml/Shell.qml+5−1
@@ -166,7 +166,11 @@ Item {
166 finishStartUpTimer.start();
166 finishStartUpTimer.start();
167 }
167 }
168
168
169+ LightDM{
169− LightDM{id: lightDM} // Provide backend access
170+ id: lightDM
171+ greeterMode: shell.mode === "greeter"
172+ }
173+
170 VolumeControl {
174 VolumeControl {
171 id: volumeControl
175 id: volumeControl
172 }
176 }