X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fbasichandler.cpp;h=a00966d2106aa02042a9aae86ecdc45ff8f65253;hp=8288e10d2186a80275703da07b710542b04f15d6;hb=0b9f74984780aacbe85ca04c44ec6304c86557c2;hpb=723db5bff304ad3fdf5a0609198c65a66bfbaea7

diff --git a/src/core/basichandler.cpp b/src/core/basichandler.cpp
index 8288e10d..a00966d2 100644
--- a/src/core/basichandler.cpp
+++ b/src/core/basichandler.cpp
@@ -21,6 +21,7 @@
 
 #include <QMetaMethod>
 
+#include "util.h"
 #include "networkconnection.h"
 
 BasicHandler::BasicHandler(NetworkConnection *parent)
@@ -29,8 +30,8 @@ BasicHandler::BasicHandler(NetworkConnection *parent)
     _networkConnection(parent),
     initDone(false)
 {
-  connect(this, SIGNAL(displayMsg(Message::Type, BufferInfo::Type, QString, QString, QString, quint8)),
-         networkConnection(), SIGNAL(displayMsg(Message::Type, BufferInfo::Type, QString, QString, QString, quint8)));
+  connect(this, SIGNAL(displayMsg(Message::Type, BufferInfo::Type, QString, QString, QString, Message::Flags)),
+         networkConnection(), SIGNAL(displayMsg(Message::Type, BufferInfo::Type, QString, QString, QString, Message::Flags)));
 
   connect(this, SIGNAL(putCmd(QString, const QVariantList &, const QByteArray &)),
          networkConnection(), SLOT(putCmd(QString, const QVariantList &, const QByteArray &)));
@@ -187,3 +188,11 @@ void BasicHandler::putCmd(const QString &cmd, const QList<QByteArray> &params, c
   foreach(QByteArray param, params) list << param;
   emit putCmd(cmd, list, prefix);
 }
+
+void BasicHandler::displayMsg(Message::Type msgType, QString target, QString text, QString sender, Message::Flags flags) {
+  IrcChannel *channel = network()->ircChannel(target);
+  if(!channel && (target.startsWith('$') || target.startsWith('#')))
+    target = nickFromMask(sender);
+
+  emit displayMsg(msgType, typeByTarget(target), target, text, sender, flags);
+}