Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'jb39585' into 'master'
Change default device lock timeout to immediate

See merge request !29
  • Loading branch information
rainemak committed Sep 12, 2017
2 parents 82172d2 + c83cb94 commit cf3eed1
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion rpm/nemo-qml-plugin-devicelock.spec
Expand Up @@ -57,7 +57,7 @@ Requires: pkgconfig(nemodbus)

%build
%qmake5
make %{?jobs:-j%jobs}
make make %{?_smp_mflags}

%install
rm -rf %{buildroot}
Expand Down
4 changes: 2 additions & 2 deletions src/nemo-devicelock/private/settingswatcher.cpp
Expand Up @@ -81,7 +81,7 @@ SettingsWatcher *SettingsWatcher::sharedInstance = nullptr;

SettingsWatcher::SettingsWatcher(QObject *parent)
: QSocketNotifier(inotify_init(), Read, parent)
, automaticLocking(10)
, automaticLocking(0)
, minimumLength(5)
, maximumLength(42)
, maximumAttempts(-1)
Expand Down Expand Up @@ -253,7 +253,7 @@ void SettingsWatcher::reloadSettings()
GKeyFile * const settings = g_key_file_new();
g_key_file_load_from_file(settings, m_settingsPath.toUtf8().constData(), G_KEY_FILE_NONE, 0);

read(settings, this, automaticLockingKey, 5, &automaticLocking, &SettingsWatcher::automaticLockingChanged);
read(settings, this, automaticLockingKey, 0, &automaticLocking, &SettingsWatcher::automaticLockingChanged);
read(settings, this, minimumLengthKey, 5, &minimumLength, &SettingsWatcher::minimumLengthChanged);
read(settings, this, maximumLengthKey, 42, &maximumLength, &SettingsWatcher::maximumLengthChanged);
read(settings, this, maximumAttemptsKey, -1, &maximumAttempts, &SettingsWatcher::maximumAttemptsChanged);
Expand Down

0 comments on commit cf3eed1

Please sign in to comment.