summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2015-10-01 08:29:59 (GMT)
committer Timothy Pearson <kb9vqf@pearsoncomputing.net>2015-10-01 08:29:59 (GMT)
commit48cf3058c5543a65026cb1cc9d8fc7450c4ccc68 (patch)
tree050b5981573f7ea3aa92681f61954e89870c4420
parent2028aa37a3aad4a77e8f45e81d3ef5f0d7694b10 (diff)
downloadtdebase-48cf3058.zip
tdebase-48cf3058.tar.gz
Move VT switch on card insertion to cryptocardwatcher process
-rw-r--r--kdesktop/lock/lockprocess.cc15
-rw-r--r--tdm/cryptocardwatcher/watcher.cc4
2 files changed, 4 insertions, 15 deletions
diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc
index 38526d6..5cf4225 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 021f599..ecd4e8f 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") {