summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2015-04-12 22:32:28 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2015-04-12 22:33:03 -0500
commit92d1f764023e933f1767335d074299230ac23a3f (patch)
treef40af3057f766d698a4c1826d6e190de37b67226
parent85126bf580edb675048843910c0e0c1c56c9ff89 (diff)
downloadtdebase-92d1f764.tar.gz
tdebase-92d1f764.zip
Handle screen locking internally on user switch
This removes an external dcop call
-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 );
}
}