summaryrefslogtreecommitdiffstats
path: root/kdesktop
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2015-04-12 22:32:28 -0500
committerSlávek Banko <slavek.banko@axis.cz>2015-04-14 02:27:26 +0200
commit1f266258df399ea64c10001b161a2fb209140b62 (patch)
tree8f10a55b59d09462deda8da0c2ea03329fd03522 /kdesktop
parent266bc2ac8edc120e62b75d3000f4adf37571681d (diff)
downloadtdebase-1f266258df399ea64c10001b161a2fb209140b62.tar.gz
tdebase-1f266258df399ea64c10001b161a2fb209140b62.zip
Handle screen locking internally on user switch
This removes an external dcop call (cherry picked from commit 92d1f764023e933f1767335d074299230ac23a3f)
Diffstat (limited to 'kdesktop')
-rw-r--r--kdesktop/krootwm.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/kdesktop/krootwm.cc b/kdesktop/krootwm.cc
index 72b9f0f5d..6ca1862b2 100644
--- a/kdesktop/krootwm.cc
+++ b/kdesktop/krootwm.cc
@@ -872,7 +872,11 @@ void KRootWm::slotPopulateSessions()
void KRootWm::slotSessionActivated( int ent )
{
if (ent > 0 && !sessionsMenu->isItemChecked( ent )) {
- DM().lockSwitchVT( ent );
+ m_pSaver->lockScreen();
+ if (!m_pSaver->waitForLockEngage()) {
+ return;
+ }
+ DM().switchVT( ent );
}
}