diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-04-24 19:39:48 -0500 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-06-03 03:27:12 +0200 |
| commit | 279160a41ba832c24a5d07d1a64b31003c5caa86 (patch) | |
| tree | a9d2b37dcd56cf5241c5bc3e47fd7e2b4b3f1adf /kdesktop/lock | |
| parent | eaf5fadba819d19042e8ba6aee637a54b29cc8aa (diff) | |
| download | tdebase-279160a41ba832c24a5d07d1a64b31003c5caa86.tar.gz tdebase-279160a41ba832c24a5d07d1a64b31003c5caa86.zip | |
Implement logout menu option in secure dialog
Ensure that cursor is not set to busy status on lock from secure dialog
(cherry picked from commit 4d538e404718982b0198ac3b44d5a894a30b5b12)
Diffstat (limited to 'kdesktop/lock')
| -rw-r--r-- | kdesktop/lock/lockprocess.cc | 9 | ||||
| -rw-r--r-- | kdesktop/lock/securedlg.cc | 1 |
2 files changed, 8 insertions, 2 deletions
diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc index 0981d2a50..5fe29a87d 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 b1bf946e0..609cdc5b8 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")); |