Fixed commit 59ef38d: now the Desktop Session Locked works as expected.
This resolves (again) bug 1584.

diff --git a/kdesktop/lock/lockdlg.cc b/kdesktop/lock/lockdlg.cc
index c377958..847e018 100644
--- a/kdesktop/lock/lockdlg.cc
+++ b/kdesktop/lock/lockdlg.cc
@@ -271,7 +271,8 @@
 
 void PasswordDlg::reject()
 {
-  if (!trinity_desktop_lock_hide_cancel_button)
+  if (!trinity_desktop_lock_hide_cancel_button || trinity_desktop_lock_autohide_lockdlg ||
+      trinity_desktop_lock_use_sak)
   {
     TQDialog::reject();
   }