summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kdesktop/lock/lockprocess.cc9
-rw-r--r--kdesktop/lock/securedlg.cc1
2 files changed, 8 insertions, 2 deletions
diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc
index 3c67ac06d..96c3b03da 100644
--- a/kdesktop/lock/lockprocess.cc
+++ b/kdesktop/lock/lockprocess.cc
@@ -674,6 +674,8 @@ void LockProcess::startSecureDialog()
// the screensaver kicks in because the user moved the mouse after
// selecting "lock screen", that looks really untidy.
mBusy = true;
+ // Make sure the cursor is not showing busy status
+ setCursor( tqarrowCursor );
if (startLock())
{
if (trinity_desktop_lock_delay_screensaver_start) {
@@ -694,8 +696,13 @@ void LockProcess::startSecureDialog()
}
kapp->quit();
}
+ if (ret == 3) {
+ trinity_desktop_lock_closing_windows = 1;
+ DCOPRef("ksmserver","ksmserver").send("logout", -1, 0, 1);
+ kapp->quit();
+ }
// FIXME
- // Handle remaining two cases (logoff menu and switch user)
+ // Handle remaining case (switch user)
if (forcecontdisp) {
ENABLE_CONTINUOUS_LOCKDLG_DISPLAY
}
diff --git a/kdesktop/lock/securedlg.cc b/kdesktop/lock/securedlg.cc
index 7f203f0c0..87a50eefd 100644
--- a/kdesktop/lock/securedlg.cc
+++ b/kdesktop/lock/securedlg.cc
@@ -102,7 +102,6 @@ SecureDlg::SecureDlg(LockProcess *parent)
mShutdownButton = new TQPushButton( frame );
mShutdownButton->setText(i18n("Logoff Menu"));
- mShutdownButton->setEnabled(false); // FIXME
mSwitchButton = new TQPushButton( frame );
mSwitchButton->setText(i18n("Switch User"));