From af216eb5f2fe6491d3b5dcc2b746e1c9c3172dc5 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Mon, 12 Sep 2011 21:53:33 +0000
Subject: 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
---
 kdesktop/lock/lockdlg.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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();
-- 
cgit v1.2.1