X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fclient%2Fclient.cpp;h=e78fc17e5acd1d27ef8bdc87111510718cc9d23f;hb=e008cd12ef319c4b5f9fe5a8cc1524829551771d;hp=bfce15d195e2298c3a72a0134ec2186c4f70986e;hpb=7795adca52f35204f8c354da6fcc5d8e8ee35531;p=quassel.git

diff --git a/src/client/client.cpp b/src/client/client.cpp
index bfce15d1..e78fc17e 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        *
@@ -103,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!
@@ -242,7 +243,7 @@ void Client::disconnectFromCore() {
 }
 
 void Client::setCoreConfiguration(const QVariantMap &settings) {
-  writeDataToDevice(socket, settings);
+  SignalProxy::writeDataToDevice(socket, settings);
 }
 
 void Client::coreSocketConnected() {
@@ -252,7 +253,7 @@ void Client::coreSocketConnected() {
   clientInit["GuiProtocol"] = GUI_PROTOCOL;
   clientInit["User"] = coreConnectionInfo["User"].toString();
   clientInit["Password"] = coreConnectionInfo["Password"].toString();
-  writeDataToDevice(socket, clientInit);
+  SignalProxy::writeDataToDevice(socket, clientInit);
 }
 
 void Client::coreSocketDisconnected() {
@@ -417,7 +418,7 @@ void Client::coreSocketError(QAbstractSocket::SocketError) {
 
 void Client::coreHasData() {
   QVariant item;
-  if(readDataFromDevice(socket, blockSize, item)) {
+  if(SignalProxy::readDataFromDevice(socket, blockSize, item)) {
     emit recvPartialItem(1,1);
     QVariantMap msg = item.toMap();
     if (!msg["StartWizard"].toBool()) {
@@ -443,6 +444,7 @@ 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()));