#include "corenetworkconfig.h"
#include "coresessioneventprocessor.h"
#include "coreusersettings.h"
+#include "ctcpparser.h"
#include "eventmanager.h"
#include "eventstringifier.h"
#include "ircchannel.h"
_coreInfo(this),
_eventManager(new EventManager(this)),
_eventStringifier(new EventStringifier(this)),
- _eventProcessor(new CoreSessionEventProcessor(this)),
+ _sessionEventProcessor(new CoreSessionEventProcessor(this)),
+ _ctcpParser(new CtcpParser(this)),
_ircParser(new IrcParser(this)),
scriptEngine(new QScriptEngine(this)),
_processMessages(false),
initScriptEngine();
eventManager()->registerObject(ircParser(), EventManager::NormalPriority);
- eventManager()->registerObject(eventStringifier(), EventManager::HighPriority, "earlyProcess"); // some need to be sent before statechange
- eventManager()->registerObject(eventProcessor(), EventManager::HighPriority); // needs to process events *before* the stringifier!
+ eventManager()->registerObject(sessionEventProcessor(), EventManager::HighPriority); // needs to process events *before* the stringifier!
+ eventManager()->registerObject(ctcpParser(), EventManager::NormalPriority);
eventManager()->registerObject(eventStringifier(), EventManager::NormalPriority);
eventManager()->registerObject(this, EventManager::LowPriority); // for sending MessageEvents to the client
+ // some events need to be handled after msg generation
+ eventManager()->registerObject(sessionEventProcessor(), EventManager::LowPriority, "lateProcess");
+ eventManager()->registerObject(ctcpParser(), EventManager::LowPriority, "send");
// periodically save our session state
connect(&(Core::instance()->syncTimer()), SIGNAL(timeout()), this, SLOT(saveSessionState()));
return;
if(net->connectionState() != Network::Disconnected) {
- connect(net, SIGNAL(disconnected(NetworkId)), SLOT(destroyNetwork(NetworkId)));
+ // make sure we no longer receive data from the tcp buffer
+ disconnect(net, SIGNAL(displayMsg(NetworkId, Message::Type, BufferInfo::Type, const QString &, const QString &, const QString &, Message::Flags)), this, 0);
+ disconnect(net, SIGNAL(displayStatusMsg(QString)), this, 0);
+ connect(net, SIGNAL(disconnected(NetworkId)), this, SLOT(destroyNetwork(NetworkId)));
net->disconnectFromIrc();
} else {
destroyNetwork(id);
QList<BufferId> removedBuffers = Core::requestBufferIdsForNetwork(user(), id);
Network *net = _networks.take(id);
if(net && Core::removeNetwork(user(), id)) {
+ // make sure that all unprocessed RawMessages from this network are removed
+ QList<RawMessage>::iterator messageIter = _messageQueue.begin();
+ while(messageIter != _messageQueue.end()) {
+ if(messageIter->networkId == id) {
+ messageIter = _messageQueue.erase(messageIter);
+ } else {
+ messageIter++;
+ }
+ }
+ // remove buffers from syncer
foreach(BufferId bufferId, removedBuffers) {
_bufferSyncer->removeBuffer(bufferId);
}