X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fcoresession.cpp;h=52cab60b78f0b16c7da9e2e2c81dc5c94258cdec;hb=5e9a649d94d1832e0b4f3f296e8a2df2d8741d9b;hp=bb7b8c0f75e32dccd27cdc6e76927e70cfef3f09;hpb=e9e9f28438f4e11995e6b444928da1c0f8487804;p=quassel.git

diff --git a/src/core/coresession.cpp b/src/core/coresession.cpp
index bb7b8c0f..52cab60b 100644
--- a/src/core/coresession.cpp
+++ b/src/core/coresession.cpp
@@ -36,8 +36,10 @@
 #include "coreusersettings.h"
 #include "eventmanager.h"
 #include "ircchannel.h"
+#include "ircparser.h"
 #include "ircuser.h"
 #include "logger.h"
+#include "messageevent.h"
 #include "signalproxy.h"
 #include "storage.h"
 #include "util.h"
@@ -60,6 +62,7 @@ CoreSession::CoreSession(UserId uid, bool restoreState, QObject *parent)
     _coreInfo(this),
     _eventManager(new EventManager(this)),
     _eventProcessor(new CoreSessionEventProcessor(this)),
+    _ircParser(new IrcParser(this)),
     scriptEngine(new QScriptEngine(this)),
     _processMessages(false),
     _ignoreListManager(this)
@@ -90,7 +93,9 @@ CoreSession::CoreSession(UserId uid, bool restoreState, QObject *parent)
   loadSettings();
   initScriptEngine();
 
-  eventManager()->registerObject(eventProcessor(), EventManager::Prepend, "process");
+  eventManager()->registerObject(ircParser(), EventManager::NormalPriority, "process");
+  eventManager()->registerObject(eventProcessor(), EventManager::HighPriority, "process");
+  eventManager()->registerObject(this, EventManager::LowPriority, "process"); // for sending MessageEvents to the client
 
   // periodically save our session state
   connect(&(Core::instance()->syncTimer()), SIGNAL(timeout()), this, SLOT(saveSessionState()));
@@ -245,6 +250,11 @@ void CoreSession::recvStatusMsgFromServer(QString msg) {
   emit displayStatusMsg(net->networkName(), msg);
 }
 
+void CoreSession::processMessageEvent(MessageEvent *event) {
+  recvMessageFromServer(event->networkId(), event->msgType(), event->bufferType(), event->target(),
+                        event->text(), event->sender(), event->msgFlags());
+}
+
 QList<BufferInfo> CoreSession::buffers() const {
   return Core::requestBuffers(user());
 }