Branch: master

ccb5fcaf 2014-04-28 00:58:34 Michele Calgaro
Enabled Cancel button in "Desktop Session Locked" dialog window.
This allows to press the Cancel button or Esc to start the screensaver.
This resolves bug 1584, but have a look at bug 2038 for further details.
M kdesktop/lock/lockdlg.cc
diff --git a/kdesktop/lock/lockdlg.cc b/kdesktop/lock/lockdlg.cc
index 163a03e..30a892c 100644
--- a/kdesktop/lock/lockdlg.cc
+++ b/kdesktop/lock/lockdlg.cc
@@ -150,11 +150,10 @@
     mNewSessButton = new KPushButton( KGuiItem(i18n("Sw&itch User..."), "fork"), frame );
     ok = new KPushButton( i18n("Unl&ock"), frame );
     cancel = new KPushButton( KStdGuiItem::cancel(), frame );
-    if (!trinity_desktop_lock_autohide_lockdlg && !trinity_desktop_lock_use_sak) cancel->setEnabled(false);
+    //if (!trinity_desktop_lock_autohide_lockdlg && !trinity_desktop_lock_use_sak) cancel->setEnabled(false);
 
     greet = plugin->info->create( this, 0, this, mLayoutButton, TQString::null,
               KGreeterPlugin::Authenticate, KGreeterPlugin::ExUnlock );
-
 
     TQVBoxLayout *unlockDialogLayout = new TQVBoxLayout( this );
     unlockDialogLayout->addWidget( frame );
@@ -257,7 +256,7 @@
 
 void PasswordDlg::reject()
 {
-    if (trinity_desktop_lock_autohide_lockdlg || trinity_desktop_lock_use_sak)
+  //  if (trinity_desktop_lock_autohide_lockdlg || trinity_desktop_lock_use_sak)
         TQDialog::reject();
 }
 
@@ -440,7 +439,7 @@
                 updateLabel();
                 mFailedTimerId = startTimer(1500);
                 ok->setEnabled(false);
-                cancel->setEnabled(false);
+                //cancel->setEnabled(false);
                 mNewSessButton->setEnabled( false );
                 return;
             case AuthAbort: