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 /tdm/kfrontend/kgapp.cpp | |
| 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 'tdm/kfrontend/kgapp.cpp')
| -rw-r--r-- | tdm/kfrontend/kgapp.cpp | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/tdm/kfrontend/kgapp.cpp b/tdm/kfrontend/kgapp.cpp index b1495c8af..4ea540285 100644 --- a/tdm/kfrontend/kgapp.cpp +++ b/tdm/kfrontend/kgapp.cpp @@ -66,8 +66,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include <pwd.h> -#define TSAK_FIFO_FILE "/tmp/tdesocket-global/tsak" - bool argb_visual_available = false; bool has_twin = false; bool is_themed = false; @@ -215,7 +213,6 @@ kg_main( const char *argv0 ) TDEApplication::disableAutoDcopRegistration(); TDECrash::setSafer( true ); - TDEProcess *tsak = 0; TDEProcess *kbdl = 0; TDEProcess *proc = 0; TDEProcess *comp = 0; @@ -227,25 +224,6 @@ kg_main( const char *argv0 ) #else trinity_desktop_lock_use_sak = false; #endif - if (trinity_desktop_lock_use_sak) { - if (system(KDE_BINDIR "/tsak checkdeps") != 0) { - trinity_desktop_lock_use_sak = false; - } - } - if (trinity_desktop_lock_use_sak) { - tsak = new TDEProcess; - *tsak << TQCString( argv0, strrchr( argv0, '/' ) - argv0 + 2 ) + "tsak"; - tsak->start(TDEProcess::Block, TDEProcess::AllOutput); - } - else { - remove(TSAK_FIFO_FILE); - } - if (tsak) { - tsak->closeStdin(); - tsak->closeStdout(); - tsak->detach(); - delete tsak; - } if (trinity_desktop_synchronize_keyboard_lights && TQString(getenv("DISPLAY")).startsWith(":")) { |