git.iko.soy/unity8
on xenial help sign in
tiny fixes
a142f21Michael Terry
qml/Greeter/Greeter.qml+3−2
compare with xenial
unifiedsplit
@@ -185,7 +185,7 @@ Showable {
185 GSettings {
185 GSettings {
186 id: greeterSettings
186 id: greeterSettings
187 schema.id: "com.canonical.Unity8.Greeter"
187 schema.id: "com.canonical.Unity8.Greeter"
188− onLockedOutUntilChanged: forcedDelayTimer.checkForForcedDelay()
188+ onLockedOutTimeChanged: forcedDelayTimer.checkForForcedDelay()
189 }
189 }
190
190
191 Timer {
191 Timer {
@@ -196,7 +196,7 @@ Showable {
196 // for a few minutes. When we wake up, we want to quickly be correct.
196 // for a few minutes. When we wake up, we want to quickly be correct.
197 interval: 500
197 interval: 500
198
198
199− property Date delayTarget;
199+ property var delayTarget;
200 property int delayMinutes;
200 property int delayMinutes;
201
201
202 function forceDelay() {
202 function forceDelay() {
@@ -229,6 +229,7 @@ Showable {
229
229
230 function checkForForcedDelay() {
230 function checkForForcedDelay() {
231 var now = new Date();
231 var now = new Date();
232+ delayTarget = now;
232 delayTarget.setTime(greeterSettings.lockedOutTime + failedLoginsDelayMinutes * 60000);
233 delayTarget.setTime(greeterSettings.lockedOutTime + failedLoginsDelayMinutes * 60000);
233
234
234 // If tooEarly is true, something went very wrong. Bug or NTP
235 // If tooEarly is true, something went very wrong. Bug or NTP
tests/qmltests/Greeter/tst_Greeter.qml+1−2
@@ -458,11 +458,10 @@ Item {
458 }
458 }
459
459
460 function test_forcedDelayOnConstruction() {
460 function test_forcedDelayOnConstruction() {
461− greeter.failedLoginsDelayMinutes = 1;
462 greeterSettings.lockedOutTime = new Date().getTime();
461 greeterSettings.lockedOutTime = new Date().getTime();
463 cleanup();
462 cleanup();
464 view = findChild(greeter, "testView");
463 view = findChild(greeter, "testView");
465− compare(view.delayMinutes, 1);
464+ compare(view.delayMinutes, greeter.failedLoginsDelayMinutes);
466 }
465 }
467
466
468 function test_forcedDelayRoundTrip() {
467 function test_forcedDelayRoundTrip() {