git.iko.soy/unity8
on xenial help sign in
fix bad merge in Greeter stuff
commit8dc12867b2f416a1a2aa7d9f0793715e4a431fba authorMichael Zanetti <michael.zanetti@canonical.com> dateWed 14 Sep 2016, 17:26 (10 years ago) parent350f00d
2 files changed−5
compare with xenial
unifiedsplit
qml/Greeter/Greeter.qml−2 qml/Greeter/LoginList.qml−3
qml/Greeter/Greeter.qml−2
@@ -216,7 +216,6 @@ Showable {
216216 }
217217
218218 function login() {
219− console.log("JOSH-> Entering Greeter::login()")
220219 d.waiting = true;
221220 if (LightDMService.greeter.startSessionSync(root.sessionToStart())) {
222221 sessionStarted();
@@ -392,7 +391,6 @@ Showable {
392391 d.selectUser(index, true);
393392 }
394393 onResponded: {
395− console.log("JOSH-> Greeter:onResponded handler called ->" + root.locked)
396394 if (root.locked) {
397395 LightDMService.greeter.respond(response);
398396 } else {
qml/Greeter/LoginList.qml−3
@@ -93,7 +93,6 @@ StyledItem {
9393 id: d
9494
9595 function checkIfPromptless() {
96− console.log("JOSH-> Entering LoginList:checkIfPromptless(): " + waiting + " : " + wasPrompted);
9796 if (!waiting && !wasPrompted) {
9897 passwordInput.isPrompt = false;
9998 passwordInput.text = root.locked ? i18n.tr("Retry")
@@ -109,7 +108,6 @@ StyledItem {
109108 name: "Ubuntu.Components.Themes.Ambiance"
110109 }
111110
112− KeyNavigation.tab: sessionChooser
113111 Keys.onUpPressed: {
114112 selected(currentIndex - 1);
115113 event.accepted = true;
@@ -166,7 +164,6 @@ StyledItem {
166164 moveTimer.start();
167165 }
168166
169− onCurrentItemChanged: console.log("JOSH-> LoginList currentItem.height = " + currentItem.height);
170167 delegate: Item {
171168 width: parent.width
172169 height: root.cellHeight