projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Hook up the event system to CoreSession's legacy displayMsg() processing
[quassel.git]
/
src
/
core
/
coresession.cpp
diff --git
a/src/core/coresession.cpp
b/src/core/coresession.cpp
index
2e138bb
..
52cab60
100644
(file)
--- a/
src/core/coresession.cpp
+++ b/
src/core/coresession.cpp
@@
-39,6
+39,7
@@
#include "ircparser.h"
#include "ircuser.h"
#include "logger.h"
#include "ircparser.h"
#include "ircuser.h"
#include "logger.h"
+#include "messageevent.h"
#include "signalproxy.h"
#include "storage.h"
#include "util.h"
#include "signalproxy.h"
#include "storage.h"
#include "util.h"
@@
-94,6
+95,7
@@
CoreSession::CoreSession(UserId uid, bool restoreState, QObject *parent)
eventManager()->registerObject(ircParser(), EventManager::NormalPriority, "process");
eventManager()->registerObject(eventProcessor(), EventManager::HighPriority, "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()));
// periodically save our session state
connect(&(Core::instance()->syncTimer()), SIGNAL(timeout()), this, SLOT(saveSessionState()));
@@
-248,6
+250,11
@@
void CoreSession::recvStatusMsgFromServer(QString msg) {
emit displayStatusMsg(net->networkName(), 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());
}
QList<BufferInfo> CoreSession::buffers() const {
return Core::requestBuffers(user());
}