X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fclient%2Fclientsyncer.cpp;h=79d8c91fb09b89ee6ac953e3cb143dcd47ce4c5f;hb=e128a8ef50a0a3fce1d75d7d06121b2ea6c74d6a;hp=be5c95b8cb9b9cee6f04167706bd34056614e739;hpb=d07c7f8e2de851adefcee45049bb1bb19682d0c6;p=quassel.git

diff --git a/src/client/clientsyncer.cpp b/src/client/clientsyncer.cpp
index be5c95b8..79d8c91f 100644
--- a/src/client/clientsyncer.cpp
+++ b/src/client/clientsyncer.cpp
@@ -30,6 +30,7 @@
 #include "ircuser.h"
 #include "ircchannel.h"
 #include "network.h"
+#include "networkmodel.h"
 #include "signalproxy.h"
 
 
@@ -178,16 +179,16 @@ void ClientSyncer::coreSocketDisconnected() {
 
   coreConnectionInfo.clear();
   netsToSync.clear();
-  channelsToSync.clear();
-  usersToSync.clear();
   blockSize = 0;
   //restartPhaseNull();
 }
 
 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((msg.contains("CoreBuild") && msg["CoreBuild"].toUInt() < 732)  // legacy!
-     || (!msg.contains("CoreBuild") && msg["ProtocolVersion"].toUInt() < Global::clientNeedsProtocol)) {
+  uint ver = 0;
+  if(!msg.contains("ProtocolVersion") && msg["CoreBuild"].toUInt() >= 732) ver = 1; // legacy!
+  if(msg.contains("ProtocolVersion")) ver = msg["ProtocolVersion"].toUInt();
+  if(ver < Global::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(Global::clientNeedsProtocol));
     disconnectFromCore();
@@ -262,17 +263,17 @@ void ClientSyncer::syncToCore(const QVariantMap &sessionState) {
   // create buffers
   // FIXME: get rid of this crap
   QVariantList bufferinfos = sessionState["BufferInfos"].toList();
-  foreach(QVariant vinfo, bufferinfos) Client::buffer(vinfo.value<BufferInfo>());  // create Buffers and BufferItems
+  NetworkModel *networkModel = Client::networkModel();
+  Q_ASSERT(networkModel);
+  foreach(QVariant vinfo, bufferinfos)
+    networkModel->bufferUpdated(vinfo.value<BufferInfo>());  // create BufferItems
 
   QVariantList networkids = sessionState["NetworkIds"].toList();
 
-  // prepare sync progress thingys... FIXME: Care about removal of networks
+  // prepare sync progress thingys...
+  // FIXME: Care about removal of networks
   numNetsToSync = networkids.count();
-  numChannelsToSync = 0; //sessionState["IrcChannelCount"].toUInt();
-  numUsersToSync = 0; // sessionState["IrcUserCount"].toUInt(); qDebug() << numUsersToSync;
   emit networksProgress(0, numNetsToSync);
-  emit channelsProgress(0, numChannelsToSync);
-  emit ircUsersProgress(0, numUsersToSync);
 
   // create network objects
   foreach(QVariant networkid, networkids) {
@@ -280,12 +281,6 @@ void ClientSyncer::syncToCore(const QVariantMap &sessionState) {
     Network *net = new Network(netid, Client::instance());
     netsToSync.insert(net);
     connect(net, SIGNAL(initDone()), this, SLOT(networkInitDone()));
-    connect(net, SIGNAL(ircUserInitDone(IrcUser *)), this, SLOT(ircUserInitDone(IrcUser *)));
-    connect(net, SIGNAL(ircUserAdded(IrcUser *)), this, SLOT(ircUserAdded(IrcUser *)));
-    connect(net, SIGNAL(ircUserRemoved(QObject *)), this, SLOT(ircUserRemoved(QObject *)));
-    connect(net, SIGNAL(ircChannelInitDone(IrcChannel *)), this, SLOT(ircChannelInitDone(IrcChannel *)));
-    connect(net, SIGNAL(ircChannelAdded(IrcChannel *)), this, SLOT(ircChannelAdded(IrcChannel *)));
-    connect(net, SIGNAL(ircChannelRemoved(QObject *)), this, SLOT(ircChannelRemoved(QObject *)));
     Client::addNetwork(net);
   }
   checkSyncState();
@@ -297,83 +292,10 @@ void ClientSyncer::networkInitDone() {
   checkSyncState();
 }
 
-void ClientSyncer::ircChannelInitDone(IrcChannel *chan) {
-  channelsToSync.remove(chan);
-  emit channelsProgress(numChannelsToSync - channelsToSync.count(), numChannelsToSync);
-  checkSyncState();
-}
-
-void ClientSyncer::ircChannelAdded(IrcChannel *chan) {
-  if(!chan->isInitialized()) {
-    channelsToSync.insert(chan);
-    numChannelsToSync++;
-    emit channelsProgress(numChannelsToSync - channelsToSync.count(), numChannelsToSync);
-    checkSyncState();
-  }
-}
-
-void ClientSyncer::ircChannelRemoved(QObject *chan) {
-  if(channelsToSync.contains(chan)) {
-    numChannelsToSync--;
-    channelsToSync.remove(chan);
-    emit channelsProgress(numChannelsToSync - channelsToSync.count(), numChannelsToSync);
-    checkSyncState();
-  }
-}
-
-void ClientSyncer::ircUserInitDone(IrcUser *user) {
-  usersToSync.remove(user);
-  emit ircUsersProgress(numUsersToSync - usersToSync.count(), numUsersToSync);
-  checkSyncState();
-}
-
-void ClientSyncer::ircUserAdded(IrcUser *user) {
-  if(!user->isInitialized()) {
-    usersToSync.insert(user);
-    numUsersToSync++;
-    emit ircUsersProgress(numUsersToSync - usersToSync.count(), numUsersToSync);
-    checkSyncState();
-  }
-}
-
-void ClientSyncer::ircUserRemoved(QObject *user) {
-  if(usersToSync.contains(user)) {
-    numUsersToSync--;
-    usersToSync.remove(user);
-    emit ircUsersProgress(numUsersToSync - usersToSync.count(), numUsersToSync);
-    checkSyncState();
-  }
-}
-
 void ClientSyncer::checkSyncState() {
-  if(usersToSync.count() + channelsToSync.count() + netsToSync.count() == 0) {
-    // done syncing!
-    /*
-    qDebug() << "done";
-    foreach(Network *net, _networks.values()) {
-      //disconnect(net, 0, this, SLOT(networkInitDone()));
-      //disconnect(net, 0, this, SLOT(ircUserInitDone(IrcUser *)));
-      //disconnect(net, 0, this, SLOT(ircUserAdded(IrcUser *)));
-      //disconnect(net, 0, this, SLOT(ircUserRemoved(QObject *)));
-      //disconnect(net, 0, this, SLOT(ircChannelInitDone(IrcChannel *)));
-      //disconnect(net, 0, this, SLOT(ircChannelAdded(IrcChannel *)));
-      //disconnect(net, 0, this, SLOT(ircChannelRemoved(QObject *)));
-      qDebug() << "disconnecting";
-      disconnect(net, SIGNAL(initDone()), this, SLOT(networkInitDone()));
-      disconnect(net, SIGNAL(ircUserInitDone(IrcUser *)), this, SLOT(ircUserInitDone(IrcUser *)));
-      disconnect(net, SIGNAL(ircUserAdded(IrcUser *)), this, SLOT(ircUserAdded(IrcUser *)));
-      disconnect(net, SIGNAL(ircUserRemoved(QObject *)), this, SLOT(ircUserRemoved(QObject *)));
-      disconnect(net, SIGNAL(ircChannelInitDone(IrcChannel *)), this, SLOT(ircChannelInitDone(IrcChannel *)));
-      disconnect(net, SIGNAL(ircChannelAdded(IrcChannel *)), this, SLOT(ircChannelAdded(IrcChannel *)));
-      disconnect(net, SIGNAL(ircChannelRemoved(QObject *)), this, SLOT(ircChannelRemoved(QObject *)));
-    }
-    */
-
+  if(netsToSync.isEmpty()) {
     Client::instance()->setSyncedToCore();
     emit syncFinished();
-    //emit connected();
-    //emit connectionStateChanged(true);
-
   }
 }