diff options
| author | Michele Calgaro <[email protected]> | 2019-03-10 17:24:02 +0900 |
|---|---|---|
| committer | Michele Calgaro <[email protected]> | 2019-03-10 17:24:02 +0900 |
| commit | 7aa9258f19a31fd12da607e64e324e4c503d0cf4 (patch) | |
| tree | a638bf1149b956e1cb0316c80adfe161c32d9883 /kdesktop | |
| 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 <[email protected]>
Diffstat (limited to 'kdesktop')
| -rw-r--r-- | kdesktop/lock/main.cc | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/kdesktop/lock/main.cc b/kdesktop/lock/main.cc index f2732345a..4960b8d01 100644 --- a/kdesktop/lock/main.cc +++ b/kdesktop/lock/main.cc @@ -54,14 +54,6 @@ # include <fixx11h.h> #endif -#define OPEN_TDMCONFIG_AND_SET_GROUP \ -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"); TQXLibWindowList trinity_desktop_lock_hidden_window_list; @@ -376,7 +368,13 @@ int main( int argc, char **argv ) struct stat st; KSimpleConfig* tdmconfig; - OPEN_TDMCONFIG_AND_SET_GROUP + 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"); // Create new LockProcess, which also spawns threads inheriting the blocked signal mask trinity_desktop_lock_process = new LockProcess; |