X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fircserverhandler.cpp;h=2f9c013d7946a6c2c0b58e743599d20eb7f16ff4;hp=d70144181850c86403c95dede64ff2f528262372;hb=f6b8a17e16ab970860c6957745718ed9ce102274;hpb=e2ae384f869498c51d2b42cc366359547c25f890

diff --git a/src/core/ircserverhandler.cpp b/src/core/ircserverhandler.cpp
index d7014418..2f9c013d 100644
--- a/src/core/ircserverhandler.cpp
+++ b/src/core/ircserverhandler.cpp
@@ -308,10 +308,12 @@ void IrcServerHandler::handlePrivmsg(QString prefix, QList<QByteArray> params) {
   if(network()->isMyNick(target)) {
     // it's possible to pack multiple privmsgs into one param using ctcp
     QStringList messages = networkConnection->ctcpHandler()->parse(CtcpHandler::CtcpQuery, prefix, target, userDecode(ircuser->nick(), params[1]));
+    quint8 flags;
     foreach(QString message, messages) {
-      if(!message.isEmpty()) {
-	emit displayMsg(Message::Plain, "", message, prefix, Message::PrivMsg);
-      }
+      flags = Message::PrivMsg;
+      if(message.contains(network()->myNick()))
+	flags |= Message::Highlight;
+      emit displayMsg(Message::Plain, "", message, prefix, flags);
     }
   } else {
     // so it's probably a channel..
@@ -321,8 +323,13 @@ void IrcServerHandler::handlePrivmsg(QString prefix, QList<QByteArray> params) {
     }
 
     QStringList messages = networkConnection->ctcpHandler()->parse(CtcpHandler::CtcpQuery, prefix, target, bufferDecode(target, params[1]));
-    foreach(QString message, messages)
-      emit displayMsg(Message::Plain, target, message, prefix);
+    quint8 flags;
+    foreach(QString message, messages) {
+      flags = Message::None;
+      if(message.contains(network()->myNick()))
+	flags |= Message::Highlight;
+      emit displayMsg(Message::Plain, target, message, prefix, flags);
+    }
   }
 
 }
@@ -444,7 +451,7 @@ void IrcServerHandler::handle432(QString prefix, QList<QByteArray> params) {
   } else {
     QString errnick = params[0];
     emit displayMsg(Message::Error, "", tr("Nick %1 contains illegal characters").arg(errnick));
-    handle433(prefix, params);
+    tryNextNick(errnick);
   }
 }
 
@@ -452,13 +459,18 @@ void IrcServerHandler::handle432(QString prefix, QList<QByteArray> params) {
 void IrcServerHandler::handle433(QString prefix, QList<QByteArray> params) {
   Q_UNUSED(prefix);
 
-  // if there is a problem while connecting to the server -> we handle it
+  QString errnick = serverDecode(params[0]);
+  emit displayMsg(Message::Error, "", tr("Nick already in use: %1").arg(errnick));
 
+  // if there is a problem while connecting to the server -> we handle it
   // but only if our connection has not been finished yet...
   if(!networkConnection->network()->currentServer().isEmpty())
     return;
-  
-  QString errnick = serverDecode(params[0]);
+
+  tryNextNick(errnick);
+}
+
+void IrcServerHandler::tryNextNick(const QString &errnick) {
   QStringList desiredNicks = networkConnection->coreSession()->identity(networkConnection->network()->identity())->nicks();
   int nextNick = desiredNicks.indexOf(errnick) + 1;
   if(desiredNicks.size() > nextNick) {
@@ -466,9 +478,9 @@ void IrcServerHandler::handle433(QString prefix, QList<QByteArray> params) {
   } else {
     emit displayMsg(Message::Error, "", tr("No free and valid nicks in nicklist found. use: /nick <othernick> to continue"));
   }
-  
 }
 
+
 /***********************************************************************************/