X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fclient%2Fclient.cpp;h=bfce15d195e2298c3a72a0134ec2186c4f70986e;hb=e671e9da1edaab37ec403f575979f9a92a766e9a;hp=28df0877f67512520dd479fbfdf3a200e1b5ce75;hpb=97d674034551438238c568e8b42efb08e1ba7354;p=quassel.git

diff --git a/src/client/client.cpp b/src/client/client.cpp
index 28df0877..bfce15d1 100644
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -20,17 +20,15 @@
 
 #include "client.h"
 
-#include "networkinfo.h"
-#include "ircuser.h"
-#include "ircchannel.h"
-
-#include "message.h"
-
 #include "bufferinfo.h"
 #include "buffertreemodel.h"
+#include "global.h"
+#include "ircchannel.h"
+#include "ircuser.h"
+#include "message.h"
+#include "networkinfo.h"
 #include "quasselui.h"
 #include "signalproxy.h"
-#include "synchronizer.h"
 #include "util.h"
 
 QPointer<Client> Client::instanceptr = 0;
@@ -141,6 +139,7 @@ Client::Client(QObject *parent)
 }
 
 Client::~Client() {
+  
 }
 
 void Client::init() {
@@ -232,9 +231,7 @@ void Client::connectToCore(const QVariantMap &conn) {
     socket = sock;
     connect(sock, SIGNAL(readyRead()), this, SLOT(coreHasData()));
     connect(sock, SIGNAL(connected()), this, SLOT(coreSocketConnected()));
-    connect(sock, SIGNAL(disconnected()), this, SLOT(coreSocketDisconnected()));
     connect(signalProxy(), SIGNAL(disconnected()), this, SLOT(coreSocketDisconnected()));
-    //connect(sock, SIGNAL(stateChanged(QAbstractSocket::SocketState)), this, SLOT(coreSocketStateChanged(QAbstractSocket::SocketState)));
     connect(sock, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(coreSocketError(QAbstractSocket::SocketError)));
     sock->connectToHost(conn["Host"].toString(), conn["Port"].toUInt());
   }
@@ -242,9 +239,6 @@ void Client::connectToCore(const QVariantMap &conn) {
 
 void Client::disconnectFromCore() {
   socket->close();
-  if(clientMode == LocalCore) {
-    coreSocketDisconnected();
-  }
 }
 
 void Client::setCoreConfiguration(const QVariantMap &settings) {
@@ -269,15 +263,25 @@ void Client::coreSocketDisconnected() {
 
   /* Clear internal data. Hopefully nothing relies on it at this point. */
   _bufferModel->clear();
-  foreach(Buffer *buffer, _buffers.values()) {
+
+  QHash<uint, Buffer *>::iterator bufferIter =  _buffers.begin();
+  while(bufferIter != _buffers.end()) {
+    Buffer *buffer = bufferIter.value();
+    disconnect(buffer, SIGNAL(destroyed()), this, 0);
+    bufferIter = _buffers.erase(bufferIter);
     buffer->deleteLater();
   }
-  _buffers.clear();
+  Q_ASSERT(_buffers.isEmpty());
+
 
-  foreach(NetworkInfo *networkinfo, _networkInfo.values()) {
-    networkinfo->deleteLater();
+  QHash<uint, NetworkInfo*>::iterator netIter = _networkInfo.begin();
+  while(netIter != _networkInfo.end()) {
+    NetworkInfo *net = netIter.value();
+    disconnect(net, SIGNAL(destroyed()), this, 0);
+    netIter = _networkInfo.erase(netIter);
+    net->deleteLater();
   }
-  _networkInfo.clear();
+  Q_ASSERT(_networkInfo.isEmpty());
 
   coreConnectionInfo.clear();
   sessionData.clear();
@@ -285,10 +289,6 @@ void Client::coreSocketDisconnected() {
   layoutTimer->stop();
 }
 
-void Client::coreSocketStateChanged(QAbstractSocket::SocketState state) {
-  if(state == QAbstractSocket::UnconnectedState) coreSocketDisconnected();
-}
-
 void Client::recvCoreState(const QVariant &state) {
   disconnect(this, SIGNAL(recvPartialItem(uint, uint)), this, SIGNAL(coreConnectionProgress(uint, uint)));
   disconnect(socket, 0, this, 0);  // rest of communication happens through SignalProxy
@@ -323,9 +323,10 @@ void Client::syncToCore(const QVariant &coreState) {
   foreach(QVariant networkid, networkids) {
     networkConnected(networkid.toUInt());
   }
-  
+
   instance()->connectedToCore = true;
   updateCoreConnectionProgress();
+
 }
 
 void Client::updateCoreConnectionProgress() {
@@ -380,11 +381,10 @@ void Client::updateCoreConnectionProgress() {
 
   emit coreConnectionProgress(1,1);
   emit connected();
-
   foreach(NetworkInfo *net, networkInfos()) {
     disconnect(net, 0, this, SLOT(updateCoreConnectionProgress()));
   }
-  
+
   // signalProxy()->dumpProxyStats();
 }
 
@@ -441,10 +441,15 @@ void Client::networkConnected(uint netid) {
   //Buffer *b = buffer(id);
   //b->setActive(true);
 
-  NetworkInfo *netinfo = new NetworkInfo(netid, signalProxy(), this);
-  connect(netinfo, SIGNAL(initDone()), this, SLOT(updateCoreConnectionProgress()));
-  connect(netinfo, SIGNAL(ircUserInitDone()), this, SLOT(updateCoreConnectionProgress()));
-  connect(netinfo, SIGNAL(ircChannelInitDone()), this, SLOT(updateCoreConnectionProgress()));
+  NetworkInfo *netinfo = new NetworkInfo(netid, this);
+  netinfo->setProxy(signalProxy());
+  
+  if(!isConnected()) {
+    connect(netinfo, SIGNAL(initDone()), this, SLOT(updateCoreConnectionProgress()));
+    connect(netinfo, SIGNAL(ircUserInitDone()), this, SLOT(updateCoreConnectionProgress()));
+    connect(netinfo, SIGNAL(ircChannelInitDone()), this, SLOT(updateCoreConnectionProgress()));
+  }
+  connect(netinfo, SIGNAL(ircChannelAdded(QString)), this, SLOT(ircChannelAdded(QString)));
   connect(netinfo, SIGNAL(destroyed()), this, SLOT(networkInfoDestroyed()));
   _networkInfo[netid] = netinfo;
 }
@@ -457,7 +462,7 @@ void Client::networkDisconnected(uint networkid) {
     //buffer->displayMsg(Message(bufferid, Message::Server, tr("Server disconnected."))); FIXME
     buffer->setActive(false);
   }
-  
+
   Q_ASSERT(networkInfo(networkid));
   if(!networkInfo(networkid)->initialized()) {
     qDebug() << "Network" << networkid << "disconnected while not yet initialized!";
@@ -465,6 +470,15 @@ void Client::networkDisconnected(uint networkid) {
   }
 }
 
+void Client::ircChannelAdded(QString chanName) {
+  NetworkInfo *netInfo = qobject_cast<NetworkInfo*>(sender());
+  Q_ASSERT(netInfo);
+  Buffer *buf = buffer(bufferInfo(netInfo->networkName(), chanName));
+  Q_ASSERT(buf);
+  buf->setIrcChannel(netInfo->ircChannel(chanName));
+
+}
+
 void Client::updateBufferInfo(BufferInfo id) {
   buffer(id)->updateBufferInfo(id);
 }