diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2019-03-31 23:49:47 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2019-03-31 23:49:47 +0900 |
| commit | 4ed967f2cb719aabd74f80be4ccb60a6594b089a (patch) | |
| tree | bae95a71715861710fc6ee2ca63525808dd98284 /kdesktop | |
| parent | 2bf7659ed8669c62f4252b5cf7a5000c96ddd521 (diff) | |
| download | tdebase-4ed967f2cb719aabd74f80be4ccb60a6594b089a.tar.gz tdebase-4ed967f2cb719aabd74f80be4ccb60a6594b089a.zip | |
Fixed use of SAK in lock process when autologin is used in TDM.
This resolves bug 2945.
Manually cherry-picked from commit 7aa9258f.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
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 a79f6924f..e0ba2b662 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; @@ -369,7 +361,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"); trinity_desktop_lock_process = new LockProcess; |