From a6e2ce7a2ae5690c60b6f1c3dfe7d19dd3e2ea7b Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Mon, 12 Sep 2011 21:24:43 +0000
Subject: Fix desktop locking with opengl screensavers

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1253062 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kdesktop/lock/main.cc | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'kdesktop/lock/main.cc')

diff --git a/kdesktop/lock/main.cc b/kdesktop/lock/main.cc
index 667becaa0..14dd75384 100644
--- a/kdesktop/lock/main.cc
+++ b/kdesktop/lock/main.cc
@@ -34,10 +34,12 @@
 #include <X11/Xlib.h>
 #include <fixx11h.h>
 
-// [FIXME] These settings should be user configurable!
+// [FIXME] These two settings should be user configurable!
 bool trinity_desktop_lock_use_system_modal_dialogs = FALSE;
 bool trinity_desktop_lock_delay_screensaver_start = FALSE;
 
+bool trinity_desktop_lock_forced = FALSE;
+
 bool MyApp::x11EventFilter( XEvent *ev )
 {
     if (ev->type == XKeyPress || ev->type == ButtonPress)
@@ -71,6 +73,9 @@ int main( int argc, char **argv )
     KCmdLineArgs::addCmdLineOptions( options );
     KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
 
+    if (args->isSet( "forcelock" ))
+        trinity_desktop_lock_forced = TRUE;
+
     putenv(strdup("SESSION_MANAGER="));
 
     KApplication::disableAutoDcopRegistration(); // not needed
-- 
cgit v1.2.1