diff options
| author | Timothy Pearson <[email protected]> | 2013-04-06 15:10:56 -0500 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-04-06 15:10:56 -0500 |
| commit | 091b1eface0a6172927a481c8d7e4030f3d2d0b9 (patch) | |
| tree | 96e1d92104f359027f1546049e9098e90755a270 /kdesktop/lock/main.cc | |
| parent | 67fdaf7041a47e442bc96b21a108931745180d71 (diff) | |
| download | tdebase-091b1eface0a6172927a481c8d7e4030f3d2d0b9.tar.gz tdebase-091b1eface0a6172927a481c8d7e4030f3d2d0b9.zip | |
Honor per-user lock screen SAK setting
This resolves Bug 811
Clean up screen saver settings display to more accurately reflect the current configuration
Diffstat (limited to 'kdesktop/lock/main.cc')
| -rw-r--r-- | kdesktop/lock/main.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/kdesktop/lock/main.cc b/kdesktop/lock/main.cc index c2a6c753a..0659217a0 100644 --- a/kdesktop/lock/main.cc +++ b/kdesktop/lock/main.cc @@ -321,11 +321,7 @@ int main( int argc, char **argv ) struct stat st; KSimpleConfig* tdmconfig; OPEN_TDMCONFIG_AND_SET_GROUP -#ifdef BUILD_TSAK - trinity_desktop_lock_use_sak = tdmconfig->readBoolEntry("UseSAK", true); -#else - trinity_desktop_lock_use_sak = false; -#endif + LockProcess process; // Start loading core functions, such as the desktop wallpaper interface @@ -390,7 +386,7 @@ int main( int argc, char **argv ) trinity_desktop_lock_delay_screensaver_start = KDesktopSettings::delaySaverStart(); if (trinity_desktop_lock_use_system_modal_dialogs) { #ifdef BUILD_TSAK - trinity_desktop_lock_use_sak = tdmconfig->readBoolEntry("UseSAK", true); + trinity_desktop_lock_use_sak = tdmconfig->readBoolEntry("UseSAK", true) && KDesktopSettings::useTDESAK(); #else trinity_desktop_lock_use_sak = false; #endif |