X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcore%2Fcoresession.cpp;h=3fd539ea6e905702497dbaf3f1a0823fa9dc9876;hb=283fdb2c49e5efa1d497d8c3e6f624f86d008ff8;hp=0ea6dec0f7396bd41d1e5c59307a573d8269e75c;hpb=68eca2c9f0ae5acbda19a6965a2630bd4649ef24;p=quassel.git

diff --git a/src/core/coresession.cpp b/src/core/coresession.cpp
index 0ea6dec0..3fd539ea 100644
--- a/src/core/coresession.cpp
+++ b/src/core/coresession.cpp
@@ -34,6 +34,7 @@
 #include "corenetworkconfig.h"
 #include "coresessioneventprocessor.h"
 #include "coreusersettings.h"
+#include "ctcpparser.h"
 #include "eventmanager.h"
 #include "eventstringifier.h"
 #include "ircchannel.h"
@@ -63,7 +64,8 @@ CoreSession::CoreSession(UserId uid, bool restoreState, QObject *parent)
     _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),
@@ -96,11 +98,13 @@ CoreSession::CoreSession(UserId uid, bool restoreState, QObject *parent)
   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
-  eventManager()->registerObject(eventProcessor(), EventManager::LowPriority, "lateProcess"); // some events need to be handled after msg generation
+   // 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()));