From 9ad4372382f59d13f8073e7599b06b57a7c0d2b6 Mon Sep 17 00:00:00 2001 From: Marcus Eggenberger Date: Fri, 11 Jul 2008 16:45:48 +0200 Subject: [PATCH] network specific whois fields are now cought in a nice way (fixing BR #210) --- src/core/ircserverhandler.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/core/ircserverhandler.cpp b/src/core/ircserverhandler.cpp index d5ff3334..288a8ab5 100644 --- a/src/core/ircserverhandler.cpp +++ b/src/core/ircserverhandler.cpp @@ -108,8 +108,7 @@ void IrcServerHandler::handleServerMsg(QByteArray msg) { void IrcServerHandler::defaultHandler(QString cmd, const QString &prefix, const QList &rawparams) { // we assume that all this happens in server encoding - QStringList params; - foreach(QByteArray r, rawparams) params << serverDecode(r); + QStringList params = serverDecode(rawparams); uint num = cmd.toUInt(); if(num) { // A lot of server messages don't really need their own handler because they don't do much. @@ -150,7 +149,12 @@ void IrcServerHandler::defaultHandler(QString cmd, const QString &prefix, const // Everything else will be marked in red, so we can add them somewhere. default: - emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", cmd + " " + params.join(" "), prefix); + if(_whois) { + // many nets define their own WHOIS fields. we fetch those not in need of special attention here: + emit displayMsg(Message::Server, BufferInfo::StatusBuffer, "", "[Whois] " + params.join(" "), prefix); + } else { + emit displayMsg(Message::Error, BufferInfo::StatusBuffer, "", cmd + " " + params.join(" "), prefix); + } } //qDebug() << prefix <<":"<