git.iko.soy/unity8
on xenial help sign in
Fix sessionToStart logic
add3e60Michael Terry
qml/Greeter/Greeter.qml+1−5
compare with xenial
unifiedsplit
@@ -144,11 +144,7 @@ Showable {
144 }
144 }
145 }
145 }
146
146
147− if (loader.item.sessionToStart === LightDM.Greeter.defaultSession) {
148− return LightDM.Greeter.defaultSession;
147+ return LightDM.Greeter.defaultSession;
149− } else {
150− return "ubuntu"; // The default / fallback
151− }
152 }
148 }
153
149
154 QtObject {
150 QtObject {
qml/Greeter/NarrowView.qml+1−1
@@ -34,7 +34,7 @@ FocusScope {
34 property alias alphanumeric: loginList.alphanumeric
34 property alias alphanumeric: loginList.alphanumeric
35 property alias userModel: loginList.model
35 property alias userModel: loginList.model
36 property alias infographicModel: coverPage.infographicModel
36 property alias infographicModel: coverPage.infographicModel
37− property string sessionToStart
37+ property alias sessionToStart: loginList.currentSession
38 property bool waiting
38 property bool waiting
39 readonly property bool fullyShown: coverPage.showProgress === 1 || lockscreen.shown
39 readonly property bool fullyShown: coverPage.showProgress === 1 || lockscreen.shown
40 readonly property bool required: coverPage.required || lockscreen.required
40 readonly property bool required: coverPage.required || lockscreen.required