From 7aa9258f19a31fd12da607e64e324e4c503d0cf4 Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Sun, 10 Mar 2019 17:24:02 +0900
Subject: Fixed use of SAK in lock process when autologin is used in TDM. This
 resolves bug 2945.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
---
 kcontrol/screensaver/scrnsave.cpp | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

(limited to 'kcontrol')

diff --git a/kcontrol/screensaver/scrnsave.cpp b/kcontrol/screensaver/scrnsave.cpp
index a0b26ae46..b66f7bbd6 100644
--- a/kcontrol/screensaver/scrnsave.cpp
+++ b/kcontrol/screensaver/scrnsave.cpp
@@ -46,20 +46,9 @@
 #include <ksimpleconfig.h>
 
 #include <X11/Xlib.h>
-
 #include "scrnsave.h"
-
 #include <fixx11h.h>
 
-#define OPEN_TDMCONFIG_AND_SET_GROUP									\
-if( stat( KDE_CONFDIR "/tdm/tdmdistrc" , &st ) == 0) {							\
-	mTDMConfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdm/tdmdistrc" ));		\
-}													\
-else {													\
-	mTDMConfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdm/tdmrc" ));		\
-}													\
-mTDMConfig->setGroup("X-:*-Greeter");
-
 template class TQPtrList<SaverConfig>;
 
 const uint widgetEventMask =                 // X event mask
@@ -94,7 +83,13 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis
     mTesting = false;
 
     struct stat st;
-    OPEN_TDMCONFIG_AND_SET_GROUP
+    if( stat( KDE_CONFDIR "/tdm/tdmdistrc" , &st ) == 0) {
+			mTDMConfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdm/tdmdistrc" ));
+		}
+		else {
+			mTDMConfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdm/tdmrc" ));
+		}
+		mTDMConfig->setGroup("X-:*-Greeter");
 
     // Add non-TDE path
     TDEGlobal::dirs()->addResourceType("scrsav",
-- 
cgit v1.2.1