git.iko.soy/unity8
on xenial help sign in
Fix bad merges
f25231dJosh Arenson
qml/Greeter/Greeter.qml+1−1
compare with xenial
unifiedsplit
@@ -205,7 +205,7 @@ Showable {
205 }
205 }
206
206
207 function login() {
207 function login() {
208− enabled = false;
208+ d.waiting = true;
209 if (LightDMService.greeter.startSessionSync(root.sessionToStart())) {
209 if (LightDMService.greeter.startSessionSync(root.sessionToStart())) {
210 sessionStarted();
210 sessionStarted();
211 hideView();
211 hideView();
qml/Greeter/LoginList.qml−1
@@ -41,7 +41,6 @@ StyledItem {
41 property bool wasPrompted: false
41 property bool wasPrompted: false
42
42
43 signal loginListSessionChanged(string session)
43 signal loginListSessionChanged(string session)
44− signal promptlessLogin()
45 signal responded(string response)
44 signal responded(string response)
46 signal selected(int index)
45 signal selected(int index)
47 signal sessionChooserButtonClicked()
46 signal sessionChooserButtonClicked()
qml/Greeter/WideView.qml−1
@@ -212,7 +212,6 @@ FocusScope {
212 loginAreaLoader.currentSession = loginAreaLoader.item.currentSession
212 loginAreaLoader.currentSession = loginAreaLoader.item.currentSession
213 }
213 }
214 }
214 }
215− onPromptlessLogin: root.promptlessLogin()
216
215
217 onSessionChooserButtonClicked: loginListShown = false;
216 onSessionChooserButtonClicked: loginListShown = false;
218 ignoreUnknownSignals: true
217 ignoreUnknownSignals: true