diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-04-27 13:26:04 -0500 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-06-03 03:27:16 +0200 |
| commit | 3870dbe675124cea8970e86a595827ed50c9acb4 (patch) | |
| tree | 4813abcff0939b26fb4d825dc48bc82c7d3d3636 /kdesktop/lock/lockprocess.cc | |
| parent | 33f1ecab8492e686c4bd736419ca1ae33e2c6eea (diff) | |
| download | tdebase-3870dbe675124cea8970e86a595827ed50c9acb4.tar.gz tdebase-3870dbe675124cea8970e86a595827ed50c9acb4.zip | |
Check for tsak presence on lock engage
Fix tsak not exiting on request
Clean up build warnings
(cherry picked from commit 22d0a673d7d6049d388847b476df1e5b6f3d6b70)
Diffstat (limited to 'kdesktop/lock/lockprocess.cc')
| -rw-r--r-- | kdesktop/lock/lockprocess.cc | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc index 80616b79c..34fa1c45f 100644 --- a/kdesktop/lock/lockprocess.cc +++ b/kdesktop/lock/lockprocess.cc @@ -1636,6 +1636,18 @@ bool LockProcess::checkPass() return 0; if (trinity_desktop_lock_use_sak) { + // Verify SAK operational status + KProcess* checkSAKProcess = new KProcess; + *checkSAKProcess << "kdmtsak" << "check"; + checkSAKProcess->start(KProcess::Block, KProcess::NoCommunication); + int retcode = checkSAKProcess->exitStatus(); + delete checkSAKProcess; + if (retcode != 0) { + trinity_desktop_lock_use_sak = false; + } + } + + if (trinity_desktop_lock_use_sak) { // Wait for SAK press before continuing... SAKDlg inDlg( this ); execDialog( &inDlg ); |