diff options
| author | Slávek Banko <[email protected]> | 2012-08-22 22:03:43 +0200 |
|---|---|---|
| committer | Slávek Banko <[email protected]> | 2012-08-22 22:09:58 +0200 |
| commit | d70d3bb050b2ef8080fa4208eaf7857d2a28b409 (patch) | |
| tree | babba600548d5bc533816b2d35a9afe99c9e568b | |
| 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)
| -rw-r--r-- | config.h.cmake | 3 | ||||
| -rw-r--r-- | kdesktop/lock/main.cc | 9 | ||||
| -rw-r--r-- | kdm/kfrontend/kgapp.cpp | 4 |
3 files changed, 15 insertions, 1 deletions
diff --git a/config.h.cmake b/config.h.cmake index ba80cabac..ccfdf43ac 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -174,3 +174,6 @@ // kdm, kcontrol #cmakedefine WITH_XRANDR "@WITH_XRANDR@" + +// tsak +#cmakedefine BUILD_TSAK "@BUILD_TSAK@" 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 diff --git a/kdm/kfrontend/kgapp.cpp b/kdm/kfrontend/kgapp.cpp index fef599488..705efada7 100644 --- a/kdm/kfrontend/kgapp.cpp +++ b/kdm/kfrontend/kgapp.cpp @@ -195,7 +195,11 @@ kg_main( const char *argv0 ) KProcess *dcop = 0; KProcess *kwin = 0; +#ifdef BUILD_TSAK trinity_desktop_lock_use_sak = _useSAK; +#else + trinity_desktop_lock_use_sak = false; +#endif if (trinity_desktop_lock_use_sak) { tsak = new KProcess; *tsak << TQCString( argv0, strrchr( argv0, '/' ) - argv0 + 2 ) + "tsak"; |