Move VT switch on card insertion to cryptocardwatcher process

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)) {

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") {