git.iko.soy/unity8
on xenial help sign in
Fix issue where a passwordless user was logged in automatically.
commita5c485f9e3ee731ceae7c304381ab719b1178bab authorJosh Arenson <joshua.arenson@canonical.com> dateWed 24 Feb 2016, 10:49 (11 years ago) parent19ca6e9
3 files changed+6−1
compare with xenial
unifiedsplit
qml/Greeter/Greeter.qml+2−1 qml/Greeter/LoginList.qml+2 qml/Greeter/WideView.qml+2
qml/Greeter/Greeter.qml+2−1
@@ -278,6 +278,7 @@ Showable {
278278 onSelected: {
279279 d.selectUser(index, true);
280280 }
281+ onPromptlessLogin: d.login();
281282 onResponded: {
282283 if (root.locked) {
283284 LightDMService.greeter.respond(response);
@@ -400,8 +401,8 @@ Showable {
400401
401402 if (LightDMService.greeter.authenticated) {
402403 AccountsService.failedLogins = 0;
403− d.login();
404404 if (!LightDMService.greeter.promptless) {
405+ d.login();
405406 loader.item.hide();
406407 }
407408 } else {
qml/Greeter/LoginList.qml+2
@@ -35,6 +35,7 @@ Item {
3535
3636 signal selected(int index)
3737 signal responded(string response)
38+ signal promptlessLogin()
3839
3940 function tryToUnlock() {
4041 if (wasPrompted) {
@@ -43,6 +44,7 @@ Item {
4344 if (root.locked) {
4445 root.selected(currentIndex);
4546 } else {
47+ promptlessLogin();
4648 root.responded("");
4749 }
4850 }
qml/Greeter/WideView.qml+2
@@ -37,6 +37,7 @@ FocusScope {
3737 // so that it can be replaced in tests with a mock object
3838 property var inputMethod: Qt.inputMethod
3939
40+ signal promptlessLogin()
4041 signal selected(int index)
4142 signal responded(string response)
4243 signal tease()
@@ -128,6 +129,7 @@ FocusScope {
128129
129130 locked: root.locked
130131
132+ onPromptlessLogin: root.promptlessLogin()
131133 onSelected: root.selected(index)
132134 onResponded: root.responded(response)
133135 }