X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclientsyncer.cpp;h=ed59b9962daea7b505108e9e9783e069ebb25920;hp=655875ffd31e8a65cacaef772b0ef41a2c79a997;hb=0d49f7e83bd1055711e66aa880f3a0d62f7eefc9;hpb=f4ae0007ac4524612ae73a778ca491659cf22393 diff --git a/src/client/clientsyncer.cpp b/src/client/clientsyncer.cpp index 655875ff..ed59b996 100644 --- a/src/client/clientsyncer.cpp +++ b/src/client/clientsyncer.cpp @@ -170,6 +170,7 @@ void ClientSyncer::coreSocketConnected() { } void ClientSyncer::useInternalCore() { + emit startInternalCore(); emit connectToInternalCore(Client::instance()->signalProxy()); } @@ -247,7 +248,7 @@ void ClientSyncer::loginToCore(const QString &user, const QString &passwd) { void ClientSyncer::internalSessionStateReceived(const QVariant &packedState) { QVariantMap state = packedState.toMap(); emit sessionProgress(1, 1); - // Client::instance()->setConnectedToCore(socket, AccountId()); + Client::instance()->setConnectedToInternalCore(); syncToCore(state); } @@ -255,13 +256,11 @@ 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());