diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2019-03-10 17:24:02 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2019-03-10 17:24:02 +0900 |
| commit | 7aa9258f19a31fd12da607e64e324e4c503d0cf4 (patch) | |
| tree | a638bf1149b956e1cb0316c80adfe161c32d9883 /kcontrol | |
| parent | c80e5d45b719cf0a769410ecd90fb0156394d322 (diff) | |
| download | tdebase-7aa9258f19a31fd12da607e64e324e4c503d0cf4.tar.gz tdebase-7aa9258f19a31fd12da607e64e324e4c503d0cf4.zip | |
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>
Diffstat (limited to 'kcontrol')
| -rw-r--r-- | kcontrol/screensaver/scrnsave.cpp | 19 |
1 files changed, 7 insertions, 12 deletions
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", |