X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclient.cpp;h=28c656e980ab059ebfd0b011dc0c56ff8830f05c;hp=ec01b283f2086768b8c32dbd9979c3afd8bd5f55;hb=45d9ea6ed5d64eec3ca351fdcf7610c7cff3529d;hpb=a7f5d6a23f7214b11f6db85346a67fd7d02767da

diff --git a/src/client/client.cpp b/src/client/client.cpp
index ec01b283..28c656e9 100644
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -1,11 +1,11 @@
 /***************************************************************************
- *   Copyright (C) 2005-07 by The Quassel Team                             *
+ *   Copyright (C) 2005-07 by the Quassel IRC Team                         *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
+ *   (at your option) version 3.                                           *
  *                                                                         *
  *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
@@ -20,14 +20,13 @@
 
 #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 "util.h"
@@ -104,10 +103,11 @@ Buffer *Client::buffer(BufferInfo id) {
 
 // FIXME switch to netids!
 // WHEN IS THIS NEEDED ANYHOW!?
+// ...only for finding the Buffer for a channel, I guess...
 BufferInfo Client::bufferInfo(QString net, QString buf) {
   foreach(Buffer *buffer_, buffers()) {
     BufferInfo bufferInfo = buffer_->bufferInfo();
-    if(bufferInfo.network() == net && bufferInfo.buffer() == buf)
+    if(!bufferInfo.network().compare(net, Qt::CaseInsensitive) && !bufferInfo.buffer().compare(buf, Qt::CaseInsensitive))
       return bufferInfo;
   }
   Q_ASSERT(false);  // should never happen!
@@ -140,6 +140,7 @@ Client::Client(QObject *parent)
 }
 
 Client::~Client() {
+  
 }
 
 void Client::init() {
@@ -282,7 +283,7 @@ void Client::coreSocketDisconnected() {
     net->deleteLater();
   }
   Q_ASSERT(_networkInfo.isEmpty());
-  
+
   coreConnectionInfo.clear();
   sessionData.clear();
   layoutQueue.clear();
@@ -443,12 +444,14 @@ void Client::networkConnected(uint netid) {
 
   NetworkInfo *netinfo = new NetworkInfo(netid, this);
   netinfo->setProxy(signalProxy());
+  bufferModel()->attachNetworkInfo(netinfo);
   
   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;
 }
@@ -461,7 +464,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!";
@@ -469,6 +472,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);
 }