git.iko.soy/unity8
on xenial help sign in
Don't rely on changed signals from GSettings, they don't seem reliable
f87f818Michael Terry
qml/Greeter/Greeter.qml+3−9
compare with xenial
unifiedsplit
@@ -185,11 +185,6 @@ 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− onChanged: {
189− if (key === "locked-out-time") {
190− forcedDelayTimer.checkForForcedDelay();
191− }
192− }
193 }
188 }
194
189
195 Timer {
190 Timer {
@@ -200,8 +195,8 @@ Showable {
200 // for a few minutes. When we wake up, we want to quickly be correct.
195 // for a few minutes. When we wake up, we want to quickly be correct.
201 interval: 500
196 interval: 500
202
197
203− property var delayTarget;
198+ property var delayTarget
204− property int delayMinutes;
199+ property int delayMinutes
205
200
206 function forceDelay() {
201 function forceDelay() {
207 // Store the beginning time for a lockout in GSettings, so that
202 // Store the beginning time for a lockout in GSettings, so that
@@ -216,9 +211,8 @@ Showable {
216 // settings to keep the user out longer. But by storing
211 // settings to keep the user out longer. But by storing
217 // start-time, we never make the user wait longer than the full
212 // start-time, we never make the user wait longer than the full
218 // lock out time.
213 // lock out time.
219− // The code below that watches GSettings will pick up the change
220− // for us.
221 greeterSettings.lockedOutTime = new Date().getTime();
214 greeterSettings.lockedOutTime = new Date().getTime();
215+ checkForForcedDelay();
222 }
216 }
223
217
224 onTriggered: {
218 onTriggered: {
tests/mocks/GSettings.1.0/fake_gsettings.h+1
@@ -19,6 +19,7 @@
19
19
20#include <QList>
20#include <QList>
21#include <QObject>
21#include <QObject>
22+#include <QVariant>
22
23
23class GSettingsSchemaQml: public QObject
24class GSettingsSchemaQml: public QObject
24{
25{