Fix SAK dialog momentary display when SAK disabled

Clean up build warnings in kdesktop

1 files changed, 14 insertions, 1 deletions

diff --git a/kdesktop/lock/main.cc b/kdesktop/lock/main.cc
index 225d9c5b4..896defd10 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 <tdmtsak.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 "/tdm/tdmdistrc" , &st ) == 0) {
+            tdmconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdm/tdmdistrc" ));
+        }
+        else {
+            tdmconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdm/tdmrc" ));
+        }
+        tdmconfig->setGroup("X-*-Greeter");
+        trinity_desktop_lock_use_sak = tdmconfig->readBoolEntry("UseSAK", true);
+        delete tdmconfig;
 
         if (args->isSet( "internal" )) {
             while (signalled_run == FALSE) {