git.iko.soy/unity8
on xenial help sign in
Fix sessionToStart logic
commitadd3e601ac4ad940f86b8949bf34a11d7fc790a9 authorMichael Terry <michael.terry@canonical.com> dateWed 28 Sep 2016, 18:12 (10 years ago) parent9c542ba
2 files changed+2−6
compare with xenial
unifiedsplit
qml/Greeter/Greeter.qml+1−5 qml/Greeter/NarrowView.qml+1−1
qml/Greeter/Greeter.qml+1−5
@@ -144,11 +144,7 @@ Showable {
144144 }
145145 }
146146
147− if (loader.item.sessionToStart === LightDM.Greeter.defaultSession) {
148− return LightDM.Greeter.defaultSession;
149− } else {
150− return "ubuntu"; // The default / fallback
151− }
147+ return LightDM.Greeter.defaultSession;
152148 }
153149
154150 QtObject {
qml/Greeter/NarrowView.qml+1−1
@@ -34,7 +34,7 @@ FocusScope {
3434 property alias alphanumeric: loginList.alphanumeric
3535 property alias userModel: loginList.model
3636 property alias infographicModel: coverPage.infographicModel
37− property string sessionToStart
37+ property alias sessionToStart: loginList.currentSession
3838 property bool waiting
3939 readonly property bool fullyShown: coverPage.showProgress === 1 || lockscreen.shown
4040 readonly property bool required: coverPage.required || lockscreen.required