diff options
| author | Timothy Pearson <[email protected]> | 2015-10-01 03:29:59 -0500 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2015-10-01 03:29:59 -0500 |
| commit | 48cf3058c5543a65026cb1cc9d8fc7450c4ccc68 (patch) | |
| tree | 050b5981573f7ea3aa92681f61954e89870c4420 | |
| parent | 2028aa37a3aad4a77e8f45e81d3ef5f0d7694b10 (diff) | |
| download | tdebase-48cf3058c5543a65026cb1cc9d8fc7450c4ccc68.tar.gz tdebase-48cf3058c5543a65026cb1cc9d8fc7450c4ccc68.zip | |
Move VT switch on card insertion to cryptocardwatcher process
| -rw-r--r-- | kdesktop/lock/lockprocess.cc | 15 | ||||
| -rw-r--r-- | tdm/cryptocardwatcher/watcher.cc | 4 |
2 files changed, 4 insertions, 15 deletions
diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc index 38526d644..5cf422500 100644 --- a/kdesktop/lock/lockprocess.cc +++ b/kdesktop/lock/lockprocess.cc @@ -2831,21 +2831,6 @@ void LockProcess::cryptographicCardInserted(TDECryptographicCardDevice* cdevice) if (login_name != "") { KUser user; if (login_name == user.loginName()) { - // Activate appropriate VT - DM dm; - SessList sess; - if (dm.localSessions(sess)) { - TQString user, loc; - for (SessList::ConstIterator it = sess.begin(); it != sess.end(); ++it) { - DM::sess2Str2(*it, user, loc); - if ((*it).self) { - // Switch VTs - DM().switchVT((*it).vt); - break; - } - } - } - // Pass login to the PAM stack... m_loginCardDevice = cdevice; if (dynamic_cast<SAKDlg*>(currentDialog)) { diff --git a/tdm/cryptocardwatcher/watcher.cc b/tdm/cryptocardwatcher/watcher.cc index 021f59949..ecd4e8f3c 100644 --- a/tdm/cryptocardwatcher/watcher.cc +++ b/tdm/cryptocardwatcher/watcher.cc @@ -66,6 +66,10 @@ void CardWatcher::cryptographicCardInserted(TDECryptographicCardDevice* cdevice) if (user.startsWith(login_name + ": ")) { // Found active session user_active = true; + + // Switch VTs + DM().switchVT((*it).vt); + break; } if (user == "Unused") { |