summaryrefslogtreecommitdiffstats
path: root/kdesktop/lock/lockdlg.cc
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-09-12 21:53:33 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-09-12 21:53:33 +0000
commitaf216eb5f2fe6491d3b5dcc2b746e1c9c3172dc5 (patch)
tree6544ec172af91d902f42faf15d545d2ec1068096 /kdesktop/lock/lockdlg.cc
parenta6e2ce7a2ae5690c60b6f1c3dfe7d19dd3e2ea7b (diff)
downloadtdebase-af216eb5f2fe6491d3b5dcc2b746e1c9c3172dc5.tar.gz
tdebase-af216eb5f2fe6491d3b5dcc2b746e1c9c3172dc5.zip
Fix lock dialog cancel button enabling when autohide disabled
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1253064 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdesktop/lock/lockdlg.cc')
-rw-r--r--kdesktop/lock/lockdlg.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/kdesktop/lock/lockdlg.cc b/kdesktop/lock/lockdlg.cc
index b22eddbd8..652be2a7f 100644
--- a/kdesktop/lock/lockdlg.cc
+++ b/kdesktop/lock/lockdlg.cc
@@ -248,7 +248,7 @@ void PasswordDlg::timerEvent(TQTimerEvent *ev)
mUnlockingFailed = false;
updateLabel();
ok->setEnabled(true);
- cancel->setEnabled(true);
+ if (trinity_desktop_lock_autohide_lockdlg) cancel->setEnabled(true);
mNewSessButton->setEnabled( true );
greet->revive();
greet->start();