#include "quassel.h"
#include "signalproxy.h"
-//#ifdef BUILD_MONO
-#include "core.h"
-//#endif
-
ClientSyncer::ClientSyncer(QObject *parent)
: QObject(parent)
{
blockSize = 0;
connect(Client::signalProxy(), SIGNAL(disconnected()), this, SLOT(coreSocketDisconnected()));
-
- //#ifdef BUILD_MONO
- connect(this, SIGNAL(connectToInternalCore(SignalProxy *)), Core::instance(), SLOT(setupInternalClientSession(SignalProxy *)));
- connect(Core::instance(), SIGNAL(sessionState(const QVariant &)), this, SLOT(internalSessionStateReceived(const QVariant &)));
- //#endif
}
ClientSyncer::~ClientSyncer() {
}
void ClientSyncer::useInternalCore() {
+ 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()->setConnectedToInternalCore();
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>());
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()));