X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclientsyncer.cpp;h=ed59b9962daea7b505108e9e9783e069ebb25920;hp=2b532705e439ca5a2f1f46e7045fdfd44e6e1e0d;hb=0d49f7e83bd1055711e66aa880f3a0d62f7eefc9;hpb=e5f3a784b8c6e6b4fe9b299c3a3553f31fba5601 diff --git a/src/client/clientsyncer.cpp b/src/client/clientsyncer.cpp index 2b532705..ed59b996 100644 --- a/src/client/clientsyncer.cpp +++ b/src/client/clientsyncer.cpp @@ -169,6 +169,11 @@ void ClientSyncer::coreSocketConnected() { SignalProxy::writeDataToDevice(socket, clientInit); } +void ClientSyncer::useInternalCore() { + emit startInternalCore(); + emit connectToInternalCore(Client::instance()->signalProxy()); +} + void ClientSyncer::coreSocketDisconnected() { emit socketDisconnected(); Client::instance()->disconnectFromCore(); @@ -240,17 +245,22 @@ void ClientSyncer::loginToCore(const QString &user, const QString &passwd) { SignalProxy::writeDataToDevice(socket, clientLogin); } +void ClientSyncer::internalSessionStateReceived(const QVariant &packedState) { + QVariantMap state = packedState.toMap(); + emit sessionProgress(1, 1); + Client::instance()->setConnectedToInternalCore(); + syncToCore(state); +} + void ClientSyncer::sessionStateReceived(const QVariantMap &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()); syncToCore(state); } void ClientSyncer::syncToCore(const QVariantMap &sessionState) { - // create identities foreach(QVariant vid, sessionState["Identities"].toList()) { Client::instance()->coreIdentityCreated(vid.value());