X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclient.cpp;h=28c656e980ab059ebfd0b011dc0c56ff8830f05c;hp=bfce15d195e2298c3a72a0134ec2186c4f70986e;hb=45d9ea6ed5d64eec3ca351fdcf7610c7cff3529d;hpb=7795adca52f35204f8c354da6fcc5d8e8ee35531 diff --git a/src/client/client.cpp b/src/client/client.cpp index bfce15d1..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 * @@ -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! @@ -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()));