summaryrefslogtreecommitdiffstats
path: root/kdm/kfrontend
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-09-16 05:31:28 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-09-16 05:31:28 +0000
commit76da651e47a07dde3b2babf82bf32c915ebf41c6 (patch)
tree7f84d71caa05da5181f84099d0a3dfc346dd3824 /kdm/kfrontend
parent94ee9219ddacdc535bed160960c1e4c136cb8a7e (diff)
downloadtdebase-76da651e47a07dde3b2babf82bf32c915ebf41c6.tar.gz
tdebase-76da651e47a07dde3b2babf82bf32c915ebf41c6.zip
Add configuration option for SAK usage to KDM control center module
Replace call in kdm to system() with KProcess git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1253892 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdm/kfrontend')
-rw-r--r--kdm/kfrontend/kgapp.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/kdm/kfrontend/kgapp.cpp b/kdm/kfrontend/kgapp.cpp
index 5e1581fb2..1f2cd64da 100644
--- a/kdm/kfrontend/kgapp.cpp
+++ b/kdm/kfrontend/kgapp.cpp
@@ -186,8 +186,11 @@ kg_main( const char *argv0 )
KCrash::setSafer( true );
trinity_desktop_lock_use_sak = _useSAK;
+ KProcess *tsak = 0;
if (trinity_desktop_lock_use_sak) {
- system(TQString(TQCString( argv0, strrchr( argv0, '/' ) - argv0 + 2 ) + "tsak &").ascii());
+ tsak = new KProcess;
+ *tsak << TQCString( argv0, strrchr( argv0, '/' ) - argv0 + 2 ) + "tsak";
+ tsak->start();
}
#ifdef HAVE_XCOMPOSITE
@@ -429,6 +432,11 @@ kg_main( const char *argv0 )
kwin->detach();
delete kwin;
}
+ if (tsak) {
+ tsak->closeStdin();
+ tsak->detach();
+ delete tsak;
+ }
delete proc;
UnsecureDisplay( dpy );
restore_modifiers();