QVariantMap clientInit;
clientInit["MsgType"] = "ClientInit";
clientInit["ClientVersion"] = Quassel::buildInfo().fancyVersionString;
QVariantMap clientInit;
clientInit["MsgType"] = "ClientInit";
clientInit["ClientVersion"] = Quassel::buildInfo().fancyVersionString;
clientInit["ClientDate"] = Quassel::buildInfo().buildDate;
clientInit["ProtocolVersion"] = Quassel::buildInfo().protocolVersion;
clientInit["UseSsl"] = coreConnectionInfo["useSsl"];
clientInit["ClientDate"] = Quassel::buildInfo().buildDate;
clientInit["ProtocolVersion"] = Quassel::buildInfo().protocolVersion;
clientInit["UseSsl"] = coreConnectionInfo["useSsl"];
+void ClientSyncer::useInternalCore(AccountId internalAccountId) {
+ coreConnectionInfo["AccountId"] = QVariant::fromValue<AccountId>(internalAccountId);
+ emit startInternalCore();
+ emit connectToInternalCore(Client::instance()->signalProxy());
+}
+
void ClientSyncer::coreSocketDisconnected() {
emit socketDisconnected();
Client::instance()->disconnectFromCore();
void ClientSyncer::coreSocketDisconnected() {
emit socketDisconnected();
Client::instance()->disconnectFromCore();
void ClientSyncer::clientInitAck(const QVariantMap &msg) {
// Core has accepted our version info and sent its own. Let's see if we accept it as well...
void ClientSyncer::clientInitAck(const QVariantMap &msg) {
// Core has accepted our version info and sent its own. Let's see if we accept it as well...
if(ver < Quassel::buildInfo().clientNeedsProtocol) {
emit connectionError(tr("<b>The Quassel Core you are trying to connect to is too old!</b><br>"
"Need at least core/client protocol v%1 to connect.").arg(Quassel::buildInfo().clientNeedsProtocol));
if(ver < Quassel::buildInfo().clientNeedsProtocol) {
emit connectionError(tr("<b>The Quassel Core you are trying to connect to is too old!</b><br>"
"Need at least core/client protocol v%1 to connect.").arg(Quassel::buildInfo().clientNeedsProtocol));
+void ClientSyncer::internalSessionStateReceived(const QVariant &packedState) {
+ QVariantMap state = packedState.toMap();
+ emit sessionProgress(1, 1);
+ Client::instance()->setConnectedToCore(coreConnectionInfo["AccountId"].value<AccountId>());
+ 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
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<AccountId>());
+ Client::instance()->setConnectedToCore(coreConnectionInfo["AccountId"].value<AccountId>(), socket);
// create identities
foreach(QVariant vid, sessionState["Identities"].toList()) {
Client::instance()->coreIdentityCreated(vid.value<Identity>());
// 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>();
// create network objects
foreach(QVariant networkid, networkids) {
NetworkId netid = networkid.value<NetworkId>();
Network *net = new Network(netid, Client::instance());
netsToSync.insert(net);
connect(net, SIGNAL(initDone()), this, SLOT(networkInitDone()));
Network *net = new Network(netid, Client::instance());
netsToSync.insert(net);
connect(net, SIGNAL(initDone()), this, SLOT(networkInitDone()));