Browse Source

Disable use of SAK if TSAK is not built

Thanks to Francois Andriot for the patch
This resolves Bug 1180
(cherry picked from commit 8f514540fc)
v3.5.13-sru
Slávek Banko 10 years ago
parent
commit
d70d3bb050
  1. 3
      config.h.cmake
  2. 9
      kdesktop/lock/main.cc
  3. 4
      kdm/kfrontend/kgapp.cpp

3
config.h.cmake

@ -174,3 +174,6 @@
// kdm, kcontrol
#cmakedefine WITH_XRANDR "@WITH_XRANDR@"
// tsak
#cmakedefine BUILD_TSAK "@BUILD_TSAK@"

9
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

4
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";

Loading…
Cancel
Save