From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Tue, 6 Nov 2007 00:39:53 +0000 (+0000)
Subject: Temporarily fixed the bug where the backlog would be displayed multiple times.
X-Git-Tag: 0.1.0~79
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=99fb0a0f1f66ae5117fa64cc204256e5b3a19499;hp=140d8a132103d2fa9baf55036e09b165624de167

Temporarily fixed the bug where the backlog would be displayed multiple times.
EgS, please check in client.cpp when updateCoreConnectionProgress() is called - I think
it's supposed to be called only during syncToCore, not every time a network (dis)connects...
---

diff --git a/src/client/client.cpp b/src/client/client.cpp
index 28df0877..d6f243f4 100644
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -326,6 +326,8 @@ void Client::syncToCore(const QVariant &coreState) {
   
   instance()->connectedToCore = true;
   updateCoreConnectionProgress();
+
+  emit connected(); // FIXME EgS: moved here from updateCoreConnectionProgress
 }
 
 void Client::updateCoreConnectionProgress() {
@@ -379,12 +381,12 @@ void Client::updateCoreConnectionProgress() {
   }
 
   emit coreConnectionProgress(1,1);
-  emit connected();
+  //emit connected(); // FIXME EgS: This caused the double backlog... but... we shouldn't be calling this whole function all the time...
 
   foreach(NetworkInfo *net, networkInfos()) {
     disconnect(net, 0, this, SLOT(updateCoreConnectionProgress()));
   }
-  
+
   // signalProxy()->dumpProxyStats();
 }
 
@@ -441,6 +443,7 @@ void Client::networkConnected(uint netid) {
   //Buffer *b = buffer(id);
   //b->setActive(true);
 
+  // FIXME EgS: do we really need to call updateCoreConnectionProgress whenever a new network is connected?
   NetworkInfo *netinfo = new NetworkInfo(netid, signalProxy(), this);
   connect(netinfo, SIGNAL(initDone()), this, SLOT(updateCoreConnectionProgress()));
   connect(netinfo, SIGNAL(ircUserInitDone()), this, SLOT(updateCoreConnectionProgress()));