From eaf5fadba819d19042e8ba6aee637a54b29cc8aa Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Tue, 24 Apr 2012 19:21:48 -0500
Subject: Fix SAK dialog momentary display when SAK disabled Clean up build
 warnings in kdesktop (cherry picked from commit
 30617b6fb78c56e76aedd1480429dd4e68da201a)

---
 kdesktop/lock/main.cc | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

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

diff --git a/kdesktop/lock/main.cc b/kdesktop/lock/main.cc
index 89dc1917c..66aa62243 100644
--- a/kdesktop/lock/main.cc
+++ b/kdesktop/lock/main.cc
@@ -29,6 +29,7 @@
 #include <kdebug.h>
 #include <kglobalsettings.h>
 #include <dcopref.h>
+#include <ksimpleconfig.h>
 
 #include <kdmtsak.h>
 
@@ -199,7 +200,19 @@ int main( int argc, char **argv )
 
         trinity_desktop_lock_use_system_modal_dialogs = !KDesktopSettings::useUnmanagedLockWindows();
         trinity_desktop_lock_delay_screensaver_start = KDesktopSettings::delaySaverStart();
-        trinity_desktop_lock_use_sak = KDesktopSettings::useTDESAK();
+
+        // RAJA
+        struct stat st;
+        KSimpleConfig* tdmconfig;
+        if( stat( KDE_CONFDIR "/kdm/kdmdistrc" , &st ) == 0) {
+            tdmconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kdm/kdmdistrc" ));
+        }
+        else {
+            tdmconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kdm/kdmrc" ));
+        }
+        tdmconfig->setGroup("X-*-Greeter");
+        trinity_desktop_lock_use_sak = tdmconfig->readBoolEntry("UseSAK", true);
+        delete tdmconfig;
 
         if (args->isSet( "internal" )) {
             while (signalled_run == FALSE) {
-- 
cgit v1.2.3