Fix bad merges
commitf25231d46043d85f7974c7f1a5cae75119ed2a24
authorJosh Arenson <joshua.arenson@canonical.com>
dateFri 22 Jul 2016, 13:58 (10 years ago)
parent1571934
qml/Greeter/Greeter.qml+1−1
@@ -205,7 +205,7 @@ Showable {
205205 }
206206
207207 function login() {
208− enabled = false;
208+ d.waiting = true;
209209 if (LightDMService.greeter.startSessionSync(root.sessionToStart())) {
210210 sessionStarted();
211211 hideView();
qml/Greeter/LoginList.qml−1
@@ -41,7 +41,6 @@ StyledItem {
4141 property bool wasPrompted: false
4242
4343 signal loginListSessionChanged(string session)
44− signal promptlessLogin()
4544 signal responded(string response)
4645 signal selected(int index)
4746 signal sessionChooserButtonClicked()
qml/Greeter/WideView.qml−1
@@ -212,7 +212,6 @@ FocusScope {
212212 loginAreaLoader.currentSession = loginAreaLoader.item.currentSession
213213 }
214214 }
215− onPromptlessLogin: root.promptlessLogin()
216215
217216 onSessionChooserButtonClicked: loginListShown = false;
218217 ignoreUnknownSignals: true