#include "client.h"
#include "identity.h"
-#include "ircuser.h"
-#include "ircchannel.h"
#include "network.h"
#include "networkmodel.h"
#include "quassel.h"
SignalProxy::writeDataToDevice(socket, clientInit);
}
-void ClientSyncer::useInternalCore() {
+void ClientSyncer::useInternalCore(AccountId internalAccountId) {
+ coreConnectionInfo["AccountId"] = QVariant::fromValue<AccountId>(internalAccountId);
emit startInternalCore();
emit connectToInternalCore(Client::instance()->signalProxy());
}
void ClientSyncer::internalSessionStateReceived(const QVariant &packedState) {
QVariantMap state = packedState.toMap();
emit sessionProgress(1, 1);
- // Client::instance()->setConnectedToCore(socket, AccountId());
+ Client::instance()->setConnectedToCore(coreConnectionInfo["AccountId"].value<AccountId>());
syncToCore(state);
}
emit sessionProgress(1, 1);
disconnect(this, SIGNAL(recvPartialItem(quint32, quint32)), this, SIGNAL(sessionProgress(quint32, quint32)));
disconnect(socket, 0, this, 0); // rest of communication happens through SignalProxy
- //Client::signalProxy()->addPeer(socket);
- Client::instance()->setConnectedToCore(socket, coreConnectionInfo["AccountId"].value<AccountId>());
+ Client::instance()->setConnectedToCore(coreConnectionInfo["AccountId"].value<AccountId>(), socket);
syncToCore(state);
}
void ClientSyncer::syncToCore(const QVariantMap &sessionState) {
-
// create identities
foreach(QVariant vid, sessionState["Identities"].toList()) {
Client::instance()->coreIdentityCreated(vid.value<Identity>());
// create network objects
foreach(QVariant networkid, networkids) {
NetworkId netid = networkid.value<NetworkId>();
+ if(Client::network(netid))
+ continue;
Network *net = new Network(netid, Client::instance());
netsToSync.insert(net);
connect(net, SIGNAL(initDone()), this, SLOT(networkInitDone()));