diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2012-08-22 22:03:43 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-08-22 22:09:58 +0200 |
| commit | d70d3bb050b2ef8080fa4208eaf7857d2a28b409 (patch) | |
| tree | babba600548d5bc533816b2d35a9afe99c9e568b /kdesktop/lock | |
| parent | 57fccb8a96b0c9075bd5a8c30614499e6f536608 (diff) | |
| download | tdebase-d70d3bb050b2ef8080fa4208eaf7857d2a28b409.tar.gz tdebase-d70d3bb050b2ef8080fa4208eaf7857d2a28b409.zip | |
Disable use of SAK if TSAK is not built
Thanks to Francois Andriot for the patch
This resolves Bug 1180
(cherry picked from commit 8f514540fcb06ca42c2829313b4058e45dda3a53)
Diffstat (limited to 'kdesktop/lock')
| -rw-r--r-- | kdesktop/lock/main.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/kdesktop/lock/main.cc b/kdesktop/lock/main.cc index e1126369c..c1277cd90 100644 --- a/kdesktop/lock/main.cc +++ b/kdesktop/lock/main.cc @@ -207,8 +207,11 @@ 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 @@ -272,7 +275,11 @@ int main( int argc, char **argv ) trinity_desktop_lock_use_system_modal_dialogs = !KDesktopSettings::useUnmanagedLockWindows(); 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); +#else + trinity_desktop_lock_use_sak = false; +#endif } else { trinity_desktop_lock_use_sak = false; // If SAK is enabled with unmanaged windows, the SAK dialog will never close and will "burn in" the screen |