X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcore%2Fircserverhandler.cpp;h=957ef6e44e2ed6fa1f5722bcd7cf443964d7cde8;hb=78f804479b1278b89adf09e41a8cc33236562430;hp=f3e6680ef1e18dcd4857ab06c2d8e9b95067c0bf;hpb=f62cdd391a5e30ef2d2ffbcaa0718904b1652d4e;p=quassel.git

diff --git a/src/core/ircserverhandler.cpp b/src/core/ircserverhandler.cpp
index f3e6680e..957ef6e4 100644
--- a/src/core/ircserverhandler.cpp
+++ b/src/core/ircserverhandler.cpp
@@ -202,7 +202,7 @@ void IrcServerHandler::handleMode(const QString &prefix, const QList<QByteArray>
     // This cannot be fixed unless the SignalProxy() doesn't rely on methodIds anymore
     QString modes = params[1];
     bool add = true;
-    int modeIndex = 0;
+    int modeIndex = 2;
     for(int c = 0; c < modes.length(); c++) {
       if(modes[c] == '+') {
 	add = true;
@@ -254,25 +254,12 @@ void IrcServerHandler::handleNotice(const QString &prefix, const QList<QByteArra
   }
 
   QString target = serverDecode(params[0]);
+  if(prefix.isEmpty() || target == "AUTH")
+    target = "";
+  else if(!network()->isChannelName(target))
+    target = nickFromMask(prefix);
 
-  
-  // check if it's only a Server Message or if it's a regular Notice
-  if(network()->currentServer().isEmpty() || network()->currentServer() == prefix) {
-    emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", serverDecode(params[1]), prefix);
-    return;
-  }
-
-
-
-  // kick notices to the server buffer if they are directly addressed to us
-  if(network()->isMyNick(target))
-    target = QString("");
-
-  QString sender = prefix.contains('!')
-    ? nickFromMask(prefix)
-    : prefix;
-
-  networkConnection()->ctcpHandler()->parse(Message::Notice, sender, target, params[1]);
+  networkConnection()->ctcpHandler()->parse(Message::Notice, prefix, target, params[1]);
 }
 
 void IrcServerHandler::handlePart(const QString &prefix, const QList<QByteArray> &params) {