summaryrefslogtreecommitdiffstats
path: root/kdesktop
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-04-06 15:10:56 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-04-06 15:10:56 -0500
commit091b1eface0a6172927a481c8d7e4030f3d2d0b9 (patch)
tree96e1d92104f359027f1546049e9098e90755a270 /kdesktop
parent67fdaf7041a47e442bc96b21a108931745180d71 (diff)
downloadtdebase-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')
-rw-r--r--kdesktop/kdesktop.kcfg7
-rw-r--r--kdesktop/lock/main.cc8
2 files changed, 9 insertions, 6 deletions
diff --git a/kdesktop/kdesktop.kcfg b/kdesktop/kdesktop.kcfg
index bbb495989..2895db99d 100644
--- a/kdesktop/kdesktop.kcfg
+++ b/kdesktop/kdesktop.kcfg
@@ -332,6 +332,13 @@
<!-- /home/paco/cvsroot/tdebase/kdesktop/lock/lockprocess.cc:336 -->
<!-- mSaver = config.readEntry("HideActiveWindowsFromSaver"); -->
</entry>
+ <entry key="UseTDESAK" type="Bool">
+ <default>true</default>
+ <label></label>
+ <whatsthis>When enabled, the Trinity Secure Attention Key (TSAK) system will be used to secure the screen locker. This requires system wide TSAK support to be enabled prior to use.</whatsthis>
+ <!-- /home/paco/cvsroot/tdebase/kdesktop/lock/lockprocess.cc:336 -->
+ <!-- mSaver = config.readEntry("UseTDESAK"); -->
+ </entry>
<entry key="PluginsUnlock" type="StringList">
<default></default>
<label></label>
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