X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fircparser.cpp;h=7811e05de38a80c07f643ed7b54a2cb3c97c9bef;hp=34e693d6aab0dae0bba8fbd58dd0317e5c539451;hb=a5ee21025ec613dc128ceb78a7e5fcd0f353275e;hpb=96cd8441f9ab217b1d3c2ba0f2899ef64ca781e4

diff --git a/src/core/ircparser.cpp b/src/core/ircparser.cpp
index 34e693d6..7811e05d 100644
--- a/src/core/ircparser.cpp
+++ b/src/core/ircparser.cpp
@@ -56,6 +56,9 @@ QByteArray IrcParser::decrypt(Network *network, const QString &bufferName, const
 
   return isTopic? cipher->decryptTopic(message) : cipher->decrypt(message);
 #else
+  Q_UNUSED(network);
+  Q_UNUSED(bufferName);
+  Q_UNUSED(isTopic);
   return message;
 #endif
 }
@@ -174,8 +177,7 @@ void IrcParser::processNetworkIncoming(NetworkDataEvent *e) {
 
         msg = decrypt(net, target, msg);
 
-        events << new IrcEventRawMessage(EventManager::IrcEventRawPrivmsg, net, prefix, target, msg);
-        //events << new MessageEvent(Message::Plain, net, net->channelDecode(target, msg), target, prefix);
+        events << new IrcEventRawMessage(EventManager::IrcEventRawPrivmsg, net, msg, prefix, target, e->timestamp());
       }
     }
     break;
@@ -200,7 +202,7 @@ void IrcParser::processNetworkIncoming(NetworkDataEvent *e) {
             CoreIrcChannel *chan = static_cast<CoreIrcChannel *>(net->ircChannel(channelname)); // we only have CoreIrcChannels in the core, so this cast is safe
             if(chan && !chan->receivedWelcomeMsg()) {
               chan->setReceivedWelcomeMsg();
-              events << new MessageEvent(Message::Notice, net, decMsg, channelname, prefix);
+              events << new MessageEvent(Message::Notice, net, decMsg, prefix, channelname, Message::None, e->timestamp());
               continue;
             }
           }
@@ -214,7 +216,7 @@ void IrcParser::processNetworkIncoming(NetworkDataEvent *e) {
           if(!net->isChannelName(target))
             target = nickFromMask(prefix);
         }
-        events << new IrcEventRawMessage(EventManager::IrcEventRawNotice, net, prefix, target, msg);
+        events << new IrcEventRawMessage(EventManager::IrcEventRawNotice, net, params[1], prefix, target, e->timestamp());
       }
     }
     break;
@@ -290,6 +292,7 @@ void IrcParser::processNetworkIncoming(NetworkDataEvent *e) {
     else
       event = new IrcEvent(type, net, prefix);
     event->setParams(decParams);
+    event->setTimestamp(e->timestamp());
     events << event;
   }