X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fcoresession.cpp;h=9f24007ab79d68b58ee790eba363c18d0ed93d48;hb=32023e27e875eede980d7323c1d05b5d4cc795d8;hp=2e138bbee550df2a505b73439f4b58669cd3fd65;hpb=86837eac3346857733f3488acccca9dc2c45605e;p=quassel.git

diff --git a/src/core/coresession.cpp b/src/core/coresession.cpp
index 2e138bbe..9f24007a 100644
--- a/src/core/coresession.cpp
+++ b/src/core/coresession.cpp
@@ -35,10 +35,12 @@
 #include "coresessioneventprocessor.h"
 #include "coreusersettings.h"
 #include "eventmanager.h"
+#include "eventstringifier.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)
     _networkConfig(new CoreNetworkConfig("GlobalNetworkConfig", this)),
     _coreInfo(this),
     _eventManager(new EventManager(this)),
+    _eventStringifier(new EventStringifier(this)),
     _eventProcessor(new CoreSessionEventProcessor(this)),
     _ircParser(new IrcParser(this)),
     scriptEngine(new QScriptEngine(this)),
@@ -92,8 +95,10 @@ CoreSession::CoreSession(UserId uid, bool restoreState, QObject *parent)
   loadSettings();
   initScriptEngine();
 
-  eventManager()->registerObject(ircParser(), EventManager::NormalPriority, "process");
-  eventManager()->registerObject(eventProcessor(), EventManager::HighPriority, "process");
+  eventManager()->registerObject(ircParser(), EventManager::NormalPriority);
+  eventManager()->registerObject(eventProcessor(), EventManager::HighPriority); // needs to process events *before* the stringifier!
+  eventManager()->registerObject(eventStringifier(), EventManager::NormalPriority);
+  eventManager()->registerObject(this, EventManager::LowPriority); // for sending MessageEvents to the client
 
   // periodically save our session state
   connect(&(Core::instance()->syncTimer()), SIGNAL(timeout()), this, SLOT(saveSessionState()));
@@ -248,6 +253,14 @@ void CoreSession::recvStatusMsgFromServer(QString msg) {
   emit displayStatusMsg(net->networkName(), msg);
 }
 
+void CoreSession::processMessageEvent(MessageEvent *event) {
+  recvMessageFromServer(event->networkId(), event->msgType(), event->bufferType(),
+                        event->target().isNull()? "" : event->target(),
+                        event->text().isNull()? "" : event->text(),
+                        event->sender().isNull()? "" : event->sender(),
+                        event->msgFlags());
+}
+
 QList<BufferInfo> CoreSession::buffers() const {
   return Core::requestBuffers(user());
 }