X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fircserverhandler.cpp;h=dba9f85f0e4057ddcf46bbcdfb1b9e70235b0e14;hp=6a220dbc0f08bbddb40c46d49cb624f7d736eedd;hb=28fc9bfe81feab904fdce65d433d5f072ee5c81e;hpb=9d12f8189a0dfd8ac76e41aea86ac56bdf907fde

diff --git a/src/core/ircserverhandler.cpp b/src/core/ircserverhandler.cpp
index 6a220dbc..dba9f85f 100644
--- a/src/core/ircserverhandler.cpp
+++ b/src/core/ircserverhandler.cpp
@@ -156,9 +156,10 @@ void IrcServerHandler::defaultHandler(QString cmd, QString prefix, QList<QByteAr
         break;
       // Server error messages, display them in red. First param will be appended.
       case 401: case 402: case 403: case 404: case 406: case 408: case 415: case 421: case 442:
-      { QString p = params.takeFirst();
-        emit displayMsg(Message::Error, "", params.join(" ") + " " + p, prefix);
-        break;
+      { QString channelName = params.takeFirst();
+      emit displayMsg(Message::Error, "", params.join(" ") + " " + channelName, prefix);
+      emit displayMsg(Message::Error, channelName, params.join(" ") + " " + channelName, prefix);
+      break;
       }
       // Server error messages which will be displayed with a colon between the first param and the rest
       case 413: case 414: case 423: case 441: case 444: case 461:
@@ -285,9 +286,9 @@ void IrcServerHandler::handleNotice(QString prefix, QList<QByteArray> params) {
 
   QString target = serverDecode(params[0]);
 
-  // are we the target?
+  // kick notices to the server buffer if they are directly addressed to us
   if(network()->isMyNick(target))
-    target = nickFromMask(target);
+    target = QString("");
 
   networkConnection->ctcpHandler()->parse(Message::Notice, prefix, target, userDecode(prefix, params[1]));
 }
@@ -321,17 +322,11 @@ void IrcServerHandler::handlePrivmsg(QString prefix, QList<QByteArray> params) {
 
   // are we the target?
   if(network()->isMyNick(target))
-    target = nickFromMask(target);
+    target = nickFromMask(ircuser->nick());
 
   // it's possible to pack multiple privmsgs into one param using ctcp
   // - > we let the ctcpHandler do the work
   networkConnection->ctcpHandler()->parse(Message::Plain, prefix, target, userDecode(ircuser->nick(), params[1]));
-//   QStringList messages = 
-
-//   foreach(QString message, messages) {
-//     emit displayMsg(Message::Plain, target, message, prefix);
-//   }
-  
 }
 
 void IrcServerHandler::handleQuit(QString prefix, QList<QByteArray> params) {