diff options
author | Timothy Pearson <[email protected]> | 2015-04-12 22:32:28 -0500 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2015-04-12 22:33:03 -0500 |
commit | 92d1f764023e933f1767335d074299230ac23a3f (patch) | |
tree | f40af3057f766d698a4c1826d6e190de37b67226 /kdesktop/krootwm.cc | |
parent | 85126bf580edb675048843910c0e0c1c56c9ff89 (diff) | |
download | tdebase-92d1f764023e933f1767335d074299230ac23a3f.tar.gz tdebase-92d1f764023e933f1767335d074299230ac23a3f.zip |
Handle screen locking internally on user switch
This removes an external dcop call
Diffstat (limited to 'kdesktop/krootwm.cc')
-rw-r--r-- | kdesktop/krootwm.cc | 6 |
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 ); } } |