git.iko.soy/unity8
on xenial help sign in
Revert to the old tightly-coupled way of determining which lightdm to load
7d0fe62Josh Arenson
qml/Greeter/LightDM.qml+1−3
compare with xenial
unifiedsplit
@@ -24,13 +24,12 @@ import QtQuick 2.3
24Loader {
24Loader {
25 id: loader
25 id: loader
26
26
27− property bool greeterMode: null
28 property var greeter: d.valid ? loader.item.greeter : null
27 property var greeter: d.valid ? loader.item.greeter : null
29 property var infographic: d.valid ? loader.item.infographic : null
28 property var infographic: d.valid ? loader.item.infographic : null
30 property var users: d.valid ? loader.item.users : null
29 property var users: d.valid ? loader.item.users : null
31 property var userRoles: d.valid ? loader.item.userRoles : null
30 property var userRoles: d.valid ? loader.item.userRoles : null
32
31
33− source: greeterMode ?
32+ source: shell.mode === "greeter" ?
34 "./FullLightDMImpl.qml" : "./IntegratedLightDMImpl.qml"
33 "./FullLightDMImpl.qml" : "./IntegratedLightDMImpl.qml"
35
34
36 QtObject {
35 QtObject {
@@ -38,5 +37,4 @@ Loader {
38
37
39 property bool valid: loader.item !== null
38 property bool valid: loader.item !== null
40 }
39 }
41−
42}
40}
qml/Shell.qml−1
@@ -168,7 +168,6 @@ Item {
168
168
169 LightDM{
169 LightDM{
170 id: lightDM
170 id: lightDM
171− greeterMode: shell.mode === "greeter"
172 }
171 }
173
172
174 VolumeControl {
173 VolumeControl {