Fix kdesktop lock process

Enable the new codepaths by default
This does change user visible behaviour, however it also repairs severe problems with the lock dialog appearing UNDER the xscreensaver hack, as well as many of the OpenGL xhacks failing.


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1253074 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 4 insertions, 1 deletions

diff --git a/kdesktop/lock/main.cc b/kdesktop/lock/main.cc
index 14dd75384..90883f61e 100644
--- a/kdesktop/lock/main.cc
+++ b/kdesktop/lock/main.cc
@@ -34,7 +34,7 @@
 #include <X11/Xlib.h>
 #include <fixx11h.h>
 
-// [FIXME] These two settings should be user configurable!
+// [FIXME] Add GUI configuration checkboxes for these two settings (see kdesktoprc [ScreenSaver] UseUnmanagedLockWindows and DelaySaverStart)
 bool trinity_desktop_lock_use_system_modal_dialogs = FALSE;
 bool trinity_desktop_lock_delay_screensaver_start = FALSE;
 
@@ -151,6 +151,9 @@ int main( int argc, char **argv )
     // we need to read from the right rc file - possibly taking screen number in account
     KDesktopSettings::instance("kdesktoprc");
 
+    trinity_desktop_lock_use_system_modal_dialogs = !KDesktopSettings::useUnmanagedLockWindows();
+    trinity_desktop_lock_delay_screensaver_start = KDesktopSettings::delaySaverStart();
+
     LockProcess process(child, args->isSet( "blank" ));
     if (!child)
         process.setChildren(child_sockets);