git.iko.soy/unity8
on xenial help sign in
fix bad merge in Greeter stuff
8dc1286Michael Zanetti
qml/Greeter/Greeter.qml−2
compare with xenial
unifiedsplit
@@ -216,7 +216,6 @@ Showable {
216 }
216 }
217
217
218 function login() {
218 function login() {
219− console.log("JOSH-> Entering Greeter::login()")
220 d.waiting = true;
219 d.waiting = true;
221 if (LightDMService.greeter.startSessionSync(root.sessionToStart())) {
220 if (LightDMService.greeter.startSessionSync(root.sessionToStart())) {
222 sessionStarted();
221 sessionStarted();
@@ -392,7 +391,6 @@ Showable {
392 d.selectUser(index, true);
391 d.selectUser(index, true);
393 }
392 }
394 onResponded: {
393 onResponded: {
395− console.log("JOSH-> Greeter:onResponded handler called ->" + root.locked)
396 if (root.locked) {
394 if (root.locked) {
397 LightDMService.greeter.respond(response);
395 LightDMService.greeter.respond(response);
398 } else {
396 } else {
qml/Greeter/LoginList.qml−3
@@ -93,7 +93,6 @@ StyledItem {
93 id: d
93 id: d
94
94
95 function checkIfPromptless() {
95 function checkIfPromptless() {
96− console.log("JOSH-> Entering LoginList:checkIfPromptless(): " + waiting + " : " + wasPrompted);
97 if (!waiting && !wasPrompted) {
96 if (!waiting && !wasPrompted) {
98 passwordInput.isPrompt = false;
97 passwordInput.isPrompt = false;
99 passwordInput.text = root.locked ? i18n.tr("Retry")
98 passwordInput.text = root.locked ? i18n.tr("Retry")
@@ -109,7 +108,6 @@ StyledItem {
109 name: "Ubuntu.Components.Themes.Ambiance"
108 name: "Ubuntu.Components.Themes.Ambiance"
110 }
109 }
111
110
112− KeyNavigation.tab: sessionChooser
113 Keys.onUpPressed: {
111 Keys.onUpPressed: {
114 selected(currentIndex - 1);
112 selected(currentIndex - 1);
115 event.accepted = true;
113 event.accepted = true;
@@ -166,7 +164,6 @@ StyledItem {
166 moveTimer.start();
164 moveTimer.start();
167 }
165 }
168
166
169− onCurrentItemChanged: console.log("JOSH-> LoginList currentItem.height = " + currentItem.height);
170 delegate: Item {
167 delegate: Item {
171 width: parent.width
168 width: parent.width
172 height: root.cellHeight
169 height: root.cellHeight