X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclient.cpp;h=759afcf96ec3dc851587c837cc579d4a2803875f;hp=865855ec6dc738f17cfc3931528ceb5cec2e4978;hb=aadd816dbcae859ce9ac5b44d609bd3094b3d6fc;hpb=7a814314a9bb879f3af6148ce74f31d6427650db;ds=sidebyside diff --git a/src/client/client.cpp b/src/client/client.cpp index 865855ec..759afcf9 100644 --- a/src/client/client.cpp +++ b/src/client/client.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-08 by the Quassel Project * + * Copyright (C) 2005-09 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -20,22 +20,29 @@ #include "client.h" +#include "abstractmessageprocessor.h" +#include "abstractui.h" #include "bufferinfo.h" +#include "buffermodel.h" +#include "buffersettings.h" #include "buffersyncer.h" +#include "bufferviewconfig.h" #include "clientbacklogmanager.h" -#include "bufferviewmanager.h" -#include "global.h" -#include "identity.h" +#include "clientbufferviewmanager.h" +#include "clientirclisthelper.h" +#include "clientidentity.h" #include "ircchannel.h" #include "ircuser.h" #include "message.h" +#include "messagemodel.h" #include "network.h" #include "networkmodel.h" -#include "buffermodel.h" -#include "quasselui.h" +#include "quassel.h" #include "signalproxy.h" #include "util.h" -#include "buffersettings.h" + +#include +#include QPointer Client::instanceptr = 0; AccountId Client::_currentCoreAccount = 0; @@ -49,31 +56,36 @@ Client *Client::instance() { } void Client::destroy() { - //delete instanceptr; - instanceptr->deleteLater(); + if(instanceptr) { + delete instanceptr->mainUi(); + instanceptr->deleteLater(); + instanceptr = 0; + } } void Client::init(AbstractUi *ui) { - instance()->mainUi = ui; + instance()->_mainUi = ui; instance()->init(); } Client::Client(QObject *parent) : QObject(parent), - socket(0), _signalProxy(new SignalProxy(SignalProxy::Client, this)), - mainUi(0), + _mainUi(0), _networkModel(0), _bufferModel(0), _bufferSyncer(0), _backlogManager(new ClientBacklogManager(this)), _bufferViewManager(0), + _ircListHelper(new ClientIrcListHelper(this)), + _messageModel(0), + _messageProcessor(0), _connectedToCore(false), - _syncedToCore(false) + _syncedToCore(false), + _internalCore(false), + _debugLog(&_debugLogBuffer) { - _monitorBuffer = new Buffer(BufferInfo(), this); - connect(_backlogManager, SIGNAL(backlog(BufferId, const QVariantList &)), - this, SLOT(receiveBacklog(BufferId, const QVariantList &))); + _signalProxy->synchronize(_ircListHelper); } Client::~Client() { @@ -83,50 +95,51 @@ Client::~Client() { void Client::init() { _currentCoreAccount = 0; _networkModel = new NetworkModel(this); - connect(this, SIGNAL(bufferUpdated(BufferInfo)), - _networkModel, SLOT(bufferUpdated(BufferInfo))); + connect(this, SIGNAL(networkRemoved(NetworkId)), - _networkModel, SLOT(networkRemoved(NetworkId))); + _networkModel, SLOT(networkRemoved(NetworkId))); _bufferModel = new BufferModel(_networkModel); + _messageModel = mainUi()->createMessageModel(this); + _messageProcessor = mainUi()->createMessageProcessor(this); SignalProxy *p = signalProxy(); p->attachSlot(SIGNAL(displayMsg(const Message &)), this, SLOT(recvMessage(const Message &))); p->attachSlot(SIGNAL(displayStatusMsg(QString, QString)), this, SLOT(recvStatusMsg(QString, QString))); - p->attachSlot(SIGNAL(bufferInfoUpdated(BufferInfo)), this, SLOT(updateBufferInfo(BufferInfo))); + p->attachSlot(SIGNAL(bufferInfoUpdated(BufferInfo)), _networkModel, SLOT(bufferUpdated(BufferInfo))); p->attachSignal(this, SIGNAL(sendInput(BufferInfo, QString))); p->attachSignal(this, SIGNAL(requestNetworkStates())); - p->attachSignal(this, SIGNAL(requestCreateIdentity(const Identity &)), SIGNAL(createIdentity(const Identity &))); - p->attachSignal(this, SIGNAL(requestUpdateIdentity(const Identity &)), SIGNAL(updateIdentity(const Identity &))); + p->attachSignal(this, SIGNAL(requestCreateIdentity(const Identity &, const QVariantMap &)), SIGNAL(createIdentity(const Identity &, const QVariantMap &))); p->attachSignal(this, SIGNAL(requestRemoveIdentity(IdentityId)), SIGNAL(removeIdentity(IdentityId))); p->attachSlot(SIGNAL(identityCreated(const Identity &)), this, SLOT(coreIdentityCreated(const Identity &))); p->attachSlot(SIGNAL(identityRemoved(IdentityId)), this, SLOT(coreIdentityRemoved(IdentityId))); - p->attachSignal(this, SIGNAL(requestCreateNetwork(const NetworkInfo &)), SIGNAL(createNetwork(const NetworkInfo &))); - p->attachSignal(this, SIGNAL(requestUpdateNetwork(const NetworkInfo &)), SIGNAL(updateNetwork(const NetworkInfo &))); + p->attachSignal(this, SIGNAL(requestCreateNetwork(const NetworkInfo &, const QStringList &)), SIGNAL(createNetwork(const NetworkInfo &, const QStringList &))); p->attachSignal(this, SIGNAL(requestRemoveNetwork(NetworkId)), SIGNAL(removeNetwork(NetworkId))); p->attachSlot(SIGNAL(networkCreated(NetworkId)), this, SLOT(coreNetworkCreated(NetworkId))); p->attachSlot(SIGNAL(networkRemoved(NetworkId)), this, SLOT(coreNetworkRemoved(NetworkId))); - connect(p, SIGNAL(disconnected()), this, SLOT(disconnectFromCore())); - - //connect(mainUi, SIGNAL(connectToCore(const QVariantMap &)), this, SLOT(connectToCore(const QVariantMap &))); - connect(mainUi, SIGNAL(disconnectFromCore()), this, SLOT(disconnectFromCore())); - connect(this, SIGNAL(connected()), mainUi, SLOT(connectedToCore())); - connect(this, SIGNAL(disconnected()), mainUi, SLOT(disconnectedFromCore())); + connect(p, SIGNAL(disconnected()), this, SLOT(disconnectedFromCore())); - layoutTimer = new QTimer(this); - layoutTimer->setInterval(0); - layoutTimer->setSingleShot(false); - connect(layoutTimer, SIGNAL(timeout()), this, SLOT(layoutMsg())); + //connect(mainUi(), SIGNAL(connectToCore(const QVariantMap &)), this, SLOT(connectToCore(const QVariantMap &))); + connect(mainUi(), SIGNAL(disconnectFromCore()), this, SLOT(disconnectFromCore())); + connect(this, SIGNAL(connected()), mainUi(), SLOT(connectedToCore())); + connect(this, SIGNAL(disconnected()), mainUi(), SLOT(disconnectedFromCore())); + // attach backlog manager + p->synchronize(backlogManager()); + connect(backlogManager(), SIGNAL(messagesReceived(BufferId, int)), _messageModel, SLOT(messagesReceived(BufferId, int))); } /*** public static methods ***/ +AbstractUi *Client::mainUi() { + return instance()->_mainUi; +} + AccountId Client::currentCoreAccount() { return _currentCoreAccount; } @@ -135,56 +148,6 @@ void Client::setCurrentCoreAccount(AccountId id) { _currentCoreAccount = id; } -QList Client::allBufferInfos() { - QList bufferids; - foreach(Buffer *buffer, buffers()) { - bufferids << buffer->bufferInfo(); - } - return bufferids; -} - -QList Client::buffers() { - return instance()->_buffers.values(); -} - - -Buffer *Client::statusBuffer(const NetworkId &networkId) const { - if(_statusBuffers.contains(networkId)) - return _statusBuffers[networkId]; - else - return 0; -} - -Buffer *Client::buffer(BufferId bufferId) { - if(instance()->_buffers.contains(bufferId)) - return instance()->_buffers[bufferId]; - else - return 0; -} - -Buffer *Client::buffer(BufferInfo bufferInfo) { - Buffer *buff = buffer(bufferInfo.bufferId()); - - if(!buff) { - Client *client = Client::instance(); - buff = new Buffer(bufferInfo, client); - connect(buff, SIGNAL(destroyed()), client, SLOT(bufferDestroyed())); - client->_buffers[bufferInfo.bufferId()] = buff; - if(bufferInfo.type() == BufferInfo::StatusBuffer) - client->_statusBuffers[bufferInfo.networkId()] = buff; - - emit client->bufferUpdated(bufferInfo); - - // I don't like this: but currently there isn't really a prettier way: - if(isSynced()) { // this slows down syncing a lot, so disable it during sync - QModelIndex bufferIdx = networkModel()->bufferIndex(bufferInfo.bufferId()); - bufferModel()->setCurrentIndex(bufferModel()->mapFromSource(bufferIdx)); - } - } - Q_ASSERT(buff); - return buff; -} - bool Client::isConnected() { return instance()->_connectedToCore; } @@ -204,18 +167,23 @@ const Network * Client::network(NetworkId networkid) { else return 0; } -void Client::createNetwork(const NetworkInfo &info) { - emit instance()->requestCreateNetwork(info); -} - -void Client::updateNetwork(const NetworkInfo &info) { - emit instance()->requestUpdateNetwork(info); +void Client::createNetwork(const NetworkInfo &info, const QStringList &persistentChannels) { + emit instance()->requestCreateNetwork(info, persistentChannels); } void Client::removeNetwork(NetworkId id) { emit instance()->requestRemoveNetwork(id); } +void Client::updateNetwork(const NetworkInfo &info) { + Network *netptr = instance()->_networks.value(info.networkId, 0); + if(!netptr) { + qWarning() << "Update for unknown network requested:" << info; + return; + } + netptr->requestSetNetworkInfo(info); +} + void Client::addNetwork(Network *net) { net->setProxy(signalProxy()); signalProxy()->synchronize(net); @@ -235,7 +203,8 @@ void Client::coreNetworkCreated(NetworkId id) { } void Client::coreNetworkRemoved(NetworkId id) { - if(!_networks.contains(id)) return; + if(!_networks.contains(id)) + return; Network *net = _networks.take(id); emit networkRemoved(net->networkId()); net->deleteLater(); @@ -247,17 +216,27 @@ QList Client::identityIds() { return instance()->_identities.keys(); } -const Identity * Client::identity(IdentityId id) { +const Identity *Client::identity(IdentityId id) { if(instance()->_identities.contains(id)) return instance()->_identities[id]; else return 0; } -void Client::createIdentity(const Identity &id) { - emit instance()->requestCreateIdentity(id); +void Client::createIdentity(const CertIdentity &id) { + QVariantMap additional; +#ifdef HAVE_SSL + additional["KeyPem"] = id.sslKey().toPem(); + additional["CertPem"] = id.sslCert().toPem(); +#endif + emit instance()->requestCreateIdentity(id, additional); } -void Client::updateIdentity(const Identity &id) { - emit instance()->requestUpdateIdentity(id); +void Client::updateIdentity(IdentityId id, const QVariantMap &ser) { + Identity *idptr = instance()->_identities.value(id, 0); + if(!idptr) { + qWarning() << "Update for unknown identity requested:" << id; + return; + } + idptr->requestUpdate(ser); } void Client::removeIdentity(IdentityId id) { @@ -291,9 +270,14 @@ void Client::userInput(BufferInfo bufferInfo, QString message) { /*** core connection stuff ***/ -void Client::setConnectedToCore(QIODevice *sock, AccountId id) { - socket = sock; - signalProxy()->addPeer(socket); +void Client::setConnectedToCore(AccountId id, QIODevice *socket) { + if(socket) { // external core + // if the socket is an orphan, the signalProxy adopts it. + // -> we don't need to care about it anymore + socket->setParent(0); + signalProxy()->addPeer(socket); + } + _internalCore = !socket; _connectedToCore = true; setCurrentCoreAccount(id); } @@ -302,37 +286,59 @@ void Client::setSyncedToCore() { // create buffersyncer Q_ASSERT(!_bufferSyncer); _bufferSyncer = new BufferSyncer(this); - connect(bufferSyncer(), SIGNAL(lastSeenMsgSet(BufferId, MsgId)), this, SLOT(updateLastSeenMsg(BufferId, MsgId))); + connect(bufferSyncer(), SIGNAL(lastSeenMsgSet(BufferId, MsgId)), _networkModel, SLOT(setLastSeenMsgId(BufferId, MsgId))); connect(bufferSyncer(), SIGNAL(bufferRemoved(BufferId)), this, SLOT(bufferRemoved(BufferId))); connect(bufferSyncer(), SIGNAL(bufferRenamed(BufferId, QString)), this, SLOT(bufferRenamed(BufferId, QString))); + connect(bufferSyncer(), SIGNAL(buffersPermanentlyMerged(BufferId, BufferId)), this, SLOT(buffersPermanentlyMerged(BufferId, BufferId))); + connect(bufferSyncer(), SIGNAL(buffersPermanentlyMerged(BufferId, BufferId)), _messageModel, SLOT(buffersPermanentlyMerged(BufferId, BufferId))); + connect(bufferSyncer(), SIGNAL(initDone()), this, SLOT(requestInitialBacklog())); + connect(networkModel(), SIGNAL(setLastSeenMsg(BufferId, MsgId)), bufferSyncer(), SLOT(requestSetLastSeenMsg(BufferId, const MsgId &))); signalProxy()->synchronize(bufferSyncer()); - // attach backlog manager - signalProxy()->synchronize(backlogManager()); - // create a new BufferViewManager - _bufferViewManager = new BufferViewManager(signalProxy(), this); - + Q_ASSERT(!_bufferViewManager); + _bufferViewManager = new ClientBufferViewManager(signalProxy(), this); + connect(bufferViewManager(), SIGNAL(initDone()), this, SLOT(requestInitialBacklog())); + connect(bufferViewManager(), SIGNAL(initDone()), this, SLOT(createDefaultBufferView())); + _syncedToCore = true; emit connected(); emit coreConnectionStateChanged(true); } +void Client::requestInitialBacklog() { + if(bufferViewManager()->isInitialized() && bufferSyncer()->isInitialized()) + Client::backlogManager()->requestInitialBacklog(); +} + +void Client::createDefaultBufferView() { + if(bufferViewManager()->bufferViewConfigs().isEmpty()) { + BufferViewConfig config(-1); + config.setBufferViewName(tr("All Buffers")); + config.initSetBufferList(networkModel()->allBufferIdsSorted()); + bufferViewManager()->requestCreateBufferView(config.toVariantMap()); + } +} + void Client::disconnectFromCore() { if(!isConnected()) return; - - if(socket) { - socket->close(); - socket->deleteLater(); - } + + signalProxy()->removeAllPeers(); +} + +void Client::disconnectedFromCore() { _connectedToCore = false; _syncedToCore = false; - setCurrentCoreAccount(0); emit disconnected(); emit coreConnectionStateChanged(false); + backlogManager()->reset(); + messageProcessor()->reset(); + // Clear internal data. Hopefully nothing relies on it at this point. + setCurrentCoreAccount(0); + if(_bufferSyncer) { _bufferSyncer->deleteLater(); _bufferSyncer = 0; @@ -342,19 +348,9 @@ void Client::disconnectFromCore() { _bufferViewManager->deleteLater(); _bufferViewManager = 0; } - - _networkModel->clear(); - - QHash::iterator bufferIter = _buffers.begin(); - while(bufferIter != _buffers.end()) { - Buffer *buffer = bufferIter.value(); - disconnect(buffer, SIGNAL(destroyed()), this, 0); - bufferIter = _buffers.erase(bufferIter); - buffer->deleteLater(); - } - Q_ASSERT(_buffers.isEmpty()); - _statusBuffers.clear(); + _messageModel->clear(); + _networkModel->clear(); QHash::iterator netIter = _networks.begin(); while(netIter != _networks.end()) { @@ -366,50 +362,19 @@ void Client::disconnectFromCore() { } Q_ASSERT(_networks.isEmpty()); - QHash::iterator idIter = _identities.begin(); + QHash::iterator idIter = _identities.begin(); while(idIter != _identities.end()) { + emit identityRemoved(idIter.key()); Identity *id = idIter.value(); - emit identityRemoved(id->id()); idIter = _identities.erase(idIter); id->deleteLater(); } Q_ASSERT(_identities.isEmpty()); - layoutQueue.clear(); - layoutTimer->stop(); -} - -void Client::setCoreConfiguration(const QVariantMap &settings) { - SignalProxy::writeDataToDevice(socket, settings); } /*** ***/ -void Client::updateBufferInfo(BufferInfo id) { - emit bufferUpdated(id); -} - -void Client::bufferDestroyed() { - Buffer *buffer = static_cast(sender()); - QHash::iterator iter = _buffers.begin(); - while(iter != _buffers.end()) { - if(iter.value() == buffer) { - iter = _buffers.erase(iter); - break; - } - iter++; - } - - QHash::iterator statusIter = _statusBuffers.begin(); - while(statusIter != _statusBuffers.end()) { - if(statusIter.value() == buffer) { - statusIter = _statusBuffers.erase(statusIter); - break; - } - statusIter++; - } -} - void Client::networkDestroyed() { Network *net = static_cast(sender()); QHash::iterator netIter = _networks.begin(); @@ -423,188 +388,47 @@ void Client::networkDestroyed() { } } -void Client::recvMessage(const Message &message) { - Message msg = message; - Buffer *b; - - checkForHighlight(msg); - - if(msg.flags() & Message::Redirected) { - BufferSettings bufferSettings; - bool inStatus = bufferSettings.value("UserMessagesInStatusBuffer", QVariant(true)).toBool(); - bool inQuery = bufferSettings.value("UserMessagesInQueryBuffer", QVariant(false)).toBool(); - bool inCurrent = bufferSettings.value("UserMessagesInCurrentBuffer", QVariant(false)).toBool(); - - if(inStatus) { - b = statusBuffer(msg.bufferInfo().networkId()); - if(b) { - b->appendMsg(msg); - } else if(!inQuery && !inCurrent) { // make sure the message get's shown somewhere - b = buffer(msg.bufferInfo()); - b->appendMsg(msg); - } - } - - if(inQuery) { - b = buffer(msg.bufferInfo().bufferId()); - if(b) { - b->appendMsg(msg); - } else if(!inStatus && !inCurrent) { // make sure the message get's shown somewhere - b = statusBuffer(msg.bufferInfo().networkId()); - if(!b) - b = buffer(msg.bufferInfo()); // seems like we have to create the buffer anyways... - b->appendMsg(msg); - } - } - - if(inCurrent) { - BufferId currentId = bufferModel()->currentIndex().data(NetworkModel::BufferIdRole).value(); - b = buffer(currentId); - if(b && currentId != msg.bufferInfo().bufferId() && !inQuery) { - b->appendMsg(msg); - } else if(!inStatus && !inQuery) { // make sure the message get's shown somewhere - b = statusBuffer(msg.bufferInfo().networkId()); - if(!b) - b = buffer(msg.bufferInfo()); // seems like we have to create the buffer anyways... - b->appendMsg(msg); - } - } - } else { - // the regular case: we can deliver where it was supposed to go - b = buffer(msg.bufferInfo()); - b->appendMsg(msg); - } - - //bufferModel()->updateBufferActivity(msg); - - if(msg.type() == Message::Plain || msg.type() == Message::Notice || msg.type() == Message::Action) { - const Network *net = network(msg.bufferInfo().networkId()); - QString networkName = net != 0 - ? net->networkName() + ":" - : QString(); - QString sender = networkName + msg.bufferInfo().bufferName() + ":" + msg.sender(); - Message mmsg = Message(msg.timestamp(), msg.bufferInfo(), msg.type(), msg.text(), sender, msg.flags()); - monitorBuffer()->appendMsg(mmsg); - } - - emit messageReceived(msg); -} - +// Hmm... we never used this... void Client::recvStatusMsg(QString /*net*/, QString /*msg*/) { //recvMessage(net, Message::server("", QString("[STATUS] %1").arg(msg))); } -void Client::receiveBacklog(BufferId bufferId, const QVariantList &msgs) { - Buffer *buffer_ = buffer(bufferId); - if(!buffer_) { - qWarning() << "Client::recvBacklogData(): received Backlog for unknown Buffer:" << bufferId; - return; - } - - if(msgs.isEmpty()) - return; // no work to be done... - - QVariantList::const_iterator msgIter = msgs.constBegin(); - QVariantList::const_iterator msgIterEnd = msgs.constEnd(); - Message msg; - while(msgIter != msgIterEnd) { - msg = (*msgIter).value(); - checkForHighlight(msg); - buffer_->prependMsg(msg); - msgIter++; - } - - if(!layoutQueue.contains(buffer_)) - layoutQueue.append(buffer_); - - if(!layoutTimer->isActive()) { - layoutTimer->start(); - } +void Client::recvMessage(const Message &msg) { + Message msg_ = msg; + messageProcessor()->process(msg_); } -void Client::layoutMsg() { - if(layoutQueue.isEmpty()) { - layoutTimer->stop(); - return; - } - - Buffer *buffer = layoutQueue.takeFirst(); - if(buffer->layoutMsg()) { - layoutQueue.append(buffer); // Buffer has more messages in its queue --> Round Robin +void Client::setBufferLastSeenMsg(BufferId id, const MsgId &msgId) { + if(!bufferSyncer()) return; - } - - if(layoutQueue.isEmpty()) - layoutTimer->stop(); -} - -AbstractUiMsg *Client::layoutMsg(const Message &msg) { - return instance()->mainUi->layoutMsg(msg); + bufferSyncer()->requestSetLastSeenMsg(id, msgId); } -void Client::checkForHighlight(Message &msg) { - NotificationSettings notificationSettings; - const Network *net = network(msg.bufferInfo().networkId()); - if(net && !net->myNick().isEmpty()) { - if(notificationSettings.highlightCurrentNick()) { - QRegExp nickRegExp("^(.*\\W)?" + QRegExp::escape(net->myNick()) + "(\\W.*)?$"); - if((msg.type() & (Message::Plain | Message::Notice | Message::Action)) - && !(msg.flags() & Message::Self) - && nickRegExp.exactMatch(msg.text())) { - msg.setFlags(msg.flags() | Message::Highlight); - return; - } - } - foreach(QVariant highlight, notificationSettings.highlightList()) { - QVariantMap highlightRule = highlight.toMap(); - if(!highlightRule["enable"].toBool()) - continue; - QString name = highlightRule["name"].toString(); - QRegExp userRegExp; - if(highlightRule["regex"].toBool()) { - userRegExp = QRegExp(name); - } else { - userRegExp = QRegExp("^(.*\\W)?" + QRegExp::escape(name) + "(\\W.*)?$"); - } - if((msg.type() & (Message::Plain | Message::Notice | Message::Action)) - && !(msg.flags() & Message::Self) - && userRegExp.exactMatch(msg.text())) { - msg.setFlags(msg.flags() | Message::Highlight); - return; - } - } - } +void Client::removeBuffer(BufferId id) { + if(!bufferSyncer()) return; + bufferSyncer()->requestRemoveBuffer(id); } -void Client::updateLastSeenMsg(BufferId id, const MsgId &msgId) { - Buffer *b = buffer(id); - if(!b) { - qWarning() << "Client::updateLastSeen(): Unknown buffer" << id; +void Client::renameBuffer(BufferId bufferId, const QString &newName) { + if(!bufferSyncer()) return; - } - b->setLastSeenMsg(msgId); + bufferSyncer()->requestRenameBuffer(bufferId, newName); } -void Client::setBufferLastSeenMsg(BufferId id, const MsgId &msgId) { +void Client::mergeBuffersPermanently(BufferId bufferId1, BufferId bufferId2) { if(!bufferSyncer()) return; - bufferSyncer()->requestSetLastSeenMsg(id, msgId); + bufferSyncer()->requestMergeBuffersPermanently(bufferId1, bufferId2); } -void Client::removeBuffer(BufferId id) { - if(!bufferSyncer()) return; - bufferSyncer()->requestRemoveBuffer(id); +void Client::purgeKnownBufferIds() { + if(!bufferSyncer()) + return; + bufferSyncer()->requestPurgeBufferIds(); } void Client::bufferRemoved(BufferId bufferId) { - // first remove the buffer from has. this prohibits further lastSeenUpdates - Buffer *buff = 0; - if(_buffers.contains(bufferId)) { - buff = _buffers.take(bufferId); - disconnect(buff, 0, this, 0); - } - - // then we select a sane buffer (status buffer) + // select a sane buffer (status buffer) /* we have to manually select a buffer because otherwise inconsitent changes * to the model might occur: * the result of a buffer removal triggers a change in the selection model. @@ -619,9 +443,6 @@ void Client::bufferRemoved(BufferId bufferId) { // and remove it from the model networkModel()->removeBuffer(bufferId); - - if(buff) - buff->deleteLater(); } void Client::bufferRenamed(BufferId bufferId, const QString &newName) { @@ -630,3 +451,22 @@ void Client::bufferRenamed(BufferId bufferId, const QString &newName) { networkModel()->setData(bufferIndex, newName, Qt::DisplayRole); } } + +void Client::buffersPermanentlyMerged(BufferId bufferId1, BufferId bufferId2) { + QModelIndex idx = networkModel()->bufferIndex(bufferId1); + bufferModel()->setCurrentIndex(bufferModel()->mapFromSource(idx)); + networkModel()->removeBuffer(bufferId2); +} + +void Client::logMessage(QtMsgType type, const char *msg) { + fprintf(stderr, "%s\n", msg); + fflush(stderr); + if(type == QtFatalMsg) { + Quassel::logFatalMessage(msg); + } else { + QString msgString = QString("%1\n").arg(msg); + instance()->_debugLog << msgString; + emit instance()->logUpdated(msgString); + } +} +