summaryrefslogtreecommitdiffstats
path: root/kdesktop/lock/lockdlg.cc
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2014-10-25 21:47:51 -0500
committerTimothy Pearson <[email protected]>2014-10-25 21:47:51 -0500
commitda8993ffb2ffebb1215ec80dba33d2c8275f0781 (patch)
tree8dc0e1ff355f84d4737491ab139a7841a9c06251 /kdesktop/lock/lockdlg.cc
parent87136458b43134c86fb2b5792022024c6d1ec968 (diff)
downloadtdebase-da8993ffb2ffebb1215ec80dba33d2c8275f0781.tar.gz
tdebase-da8993ffb2ffebb1215ec80dba33d2c8275f0781.zip
Make kdesktop_lock and ksmserver ARGB screen blanking more efficient and improve multi-head support in same
Fix kdesktop_lock busy cursor appearing over active screen saver after GUI-driven VT switch and delayed return to original VT Repair kdesktop_lock invalid password delay bypass with Cancel button
Diffstat (limited to 'kdesktop/lock/lockdlg.cc')
-rw-r--r--kdesktop/lock/lockdlg.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/kdesktop/lock/lockdlg.cc b/kdesktop/lock/lockdlg.cc
index 7b53484d2..763d7bf95 100644
--- a/kdesktop/lock/lockdlg.cc
+++ b/kdesktop/lock/lockdlg.cc
@@ -349,6 +349,7 @@ void PasswordDlg::timerEvent(TQTimerEvent *ev)
mUnlockingFailed = false;
updateLabel();
ok->setEnabled(true);
+ if (cancel) cancel->setEnabled(true);
mNewSessButton->setEnabled( true );
greet->revive();
greet->start();
@@ -463,6 +464,7 @@ void PasswordDlg::reapVerify()
updateLabel();
mFailedTimerId = startTimer(1500);
ok->setEnabled(false);
+ if (cancel) cancel->setEnabled(false);
mNewSessButton->setEnabled( false );
return;
case AuthAbort: