diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-04-22 19:47:48 -0500 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-06-03 03:27:08 +0200 |
| commit | c47b417bbb791b9bd4156000c9a3ecde7babcbbe (patch) | |
| tree | 6bced5d8e71efc048570678126ba7c344faf9e9e /kdesktop/lock/lockprocess.cc | |
| parent | a3dd6c9dcd7d1e669cb93a83e6b86180aa296d4b (diff) | |
| download | tdebase-c47b417bbb791b9bd4156000c9a3ecde7babcbbe.tar.gz tdebase-c47b417bbb791b9bd4156000c9a3ecde7babcbbe.zip | |
Fix kdesktop_lock secure dialog
Minor whitespace cleanup and warning fixes
(cherry picked from commit 50739c9ba4737317108da68c148472c3da856c95)
Diffstat (limited to 'kdesktop/lock/lockprocess.cc')
| -rw-r--r-- | kdesktop/lock/lockprocess.cc | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc index 166887b31..f3f1e6cfe 100644 --- a/kdesktop/lock/lockprocess.cc +++ b/kdesktop/lock/lockprocess.cc @@ -658,6 +658,10 @@ void LockProcess::startSecureDialog() mBusy = true; execDialog( &inDlg ); mBusy = false; + bool forcecontdisp = mForceContinualLockDisplayTimer->isActive(); + if (forcecontdisp) { + DISABLE_CONTINUOUS_LOCKDLG_DISPLAY + } trinity_desktop_lock_in_sec_dlg = false; if (ret == 0) { kapp->quit(); @@ -690,6 +694,9 @@ void LockProcess::startSecureDialog() } // FIXME // Handle remaining two cases (logoff menu and switch user) + if (forcecontdisp) { + ENABLE_CONTINUOUS_LOCKDLG_DISPLAY + } stopSaver(); } @@ -1495,17 +1502,21 @@ void LockProcess::hackExited(KProcess *) void LockProcess::displayLockDialogIfNeeded() { - if (m_startupStatusDialog) { m_startupStatusDialog->closeSMDialog(); m_startupStatusDialog=NULL; } - if (trinity_desktop_lock_use_system_modal_dialogs) { - if (!mBusy) { - mBusy = true; - if (mLocked) { - if (checkPass()) { - stopSaver(); - kapp->quit(); + if (m_startupStatusDialog) { + m_startupStatusDialog->closeSMDialog(); m_startupStatusDialog=NULL; + } + if (!trinity_desktop_lock_in_sec_dlg) { + if (trinity_desktop_lock_use_system_modal_dialogs) { + if (!mBusy) { + mBusy = true; + if (mLocked) { + if (checkPass()) { + stopSaver(); + kapp->quit(); + } } + mBusy = false; } - mBusy = false; } } } |