X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclientsyncer.cpp;h=139f44b3c25b53909c740811f8eebc316e996662;hp=a5a64d741da394bfeccee38bbd8ebe9b31db4c73;hb=26b9300ccab24e526a9f43bef95a2a70f59161df;hpb=01922b87be01cd5c9844d2a273acd9a71aee8e96

diff --git a/src/client/clientsyncer.cpp b/src/client/clientsyncer.cpp
index a5a64d74..139f44b3 100644
--- a/src/client/clientsyncer.cpp
+++ b/src/client/clientsyncer.cpp
@@ -33,10 +33,6 @@
 #include "quassel.h"
 #include "signalproxy.h"
 
-//#ifdef BUILD_MONO
-#include "core.h"
-//#endif
-
 ClientSyncer::ClientSyncer(QObject *parent)
   : QObject(parent)
 {
@@ -44,11 +40,6 @@ ClientSyncer::ClientSyncer(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() {
@@ -178,7 +169,9 @@ void ClientSyncer::coreSocketConnected() {
   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());
 }
 
@@ -256,7 +249,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()->setConnectedToCore(coreConnectionInfo["AccountId"].value<AccountId>());
   syncToCore(state);
 }
 
@@ -264,13 +257,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<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>());
@@ -294,6 +285,8 @@ void ClientSyncer::syncToCore(const QVariantMap &sessionState) {
   // 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()));