git.iko.soy/unity8
on xenial help sign in
tiny fixes
commita142f21651ce21d685875a5a9ae2b7b92af37fa0 authorMichael Terry <mike@mterry.name> dateWed 19 Aug 2015, 15:47 (11 years ago) parenta7220cf
2 files changed+4−4
compare with xenial
unifiedsplit
qml/Greeter/Greeter.qml+3−2 tests/qmltests/Greeter/tst_Greeter.qml+1−2
qml/Greeter/Greeter.qml+3−2
@@ -185,7 +185,7 @@ Showable {
185185 GSettings {
186186 id: greeterSettings
187187 schema.id: "com.canonical.Unity8.Greeter"
188− onLockedOutUntilChanged: forcedDelayTimer.checkForForcedDelay()
188+ onLockedOutTimeChanged: forcedDelayTimer.checkForForcedDelay()
189189 }
190190
191191 Timer {
@@ -196,7 +196,7 @@ Showable {
196196 // for a few minutes. When we wake up, we want to quickly be correct.
197197 interval: 500
198198
199− property Date delayTarget;
199+ property var delayTarget;
200200 property int delayMinutes;
201201
202202 function forceDelay() {
@@ -229,6 +229,7 @@ Showable {
229229
230230 function checkForForcedDelay() {
231231 var now = new Date();
232+ delayTarget = now;
232233 delayTarget.setTime(greeterSettings.lockedOutTime + failedLoginsDelayMinutes * 60000);
233234
234235 // If tooEarly is true, something went very wrong. Bug or NTP
tests/qmltests/Greeter/tst_Greeter.qml+1−2
@@ -458,11 +458,10 @@ Item {
458458 }
459459
460460 function test_forcedDelayOnConstruction() {
461− greeter.failedLoginsDelayMinutes = 1;
462461 greeterSettings.lockedOutTime = new Date().getTime();
463462 cleanup();
464463 view = findChild(greeter, "testView");
465− compare(view.delayMinutes, 1);
464+ compare(view.delayMinutes, greeter.failedLoginsDelayMinutes);
466465 }
467466
468467 function test_forcedDelayRoundTrip() {