From aff2b3fc3eb85e246add6ac0612f52912c78d0cf Mon Sep 17 00:00:00 2001
From: Marcus Eggenberger <egs@quassel-irc.org>
Date: Mon, 28 Jan 2008 19:09:12 +0000
Subject: [PATCH 1/1] made the handlers for ERR_ERRONEUSNICKNAME and
 ERR_NICKNAMEINUSE more verbose

---
 src/core/ircserverhandler.cpp | 15 ++++++++++-----
 src/core/ircserverhandler.h   |  5 +++--
 version.inc                   |  2 +-
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/core/ircserverhandler.cpp b/src/core/ircserverhandler.cpp
index d7014418..5b4c8952 100644
--- a/src/core/ircserverhandler.cpp
+++ b/src/core/ircserverhandler.cpp
@@ -444,7 +444,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 +452,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 +471,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"));
   }
-  
 }
 
+
 /***********************************************************************************/
 
 
diff --git a/src/core/ircserverhandler.h b/src/core/ircserverhandler.h
index d9b65b13..c8894de3 100644
--- a/src/core/ircserverhandler.h
+++ b/src/core/ircserverhandler.h
@@ -63,8 +63,9 @@ public slots:
 
   void defaultHandler(QString cmd, QString prefix, QList<QByteArray> params);
 
-  private:
-    NetworkConnection *networkConnection;
+private:
+  void tryNextNick(const QString &errnick);
+  NetworkConnection *networkConnection;
 };
 
 
diff --git a/version.inc b/version.inc
index 104d0fd0..9922abbf 100644
--- a/version.inc
+++ b/version.inc
@@ -5,7 +5,7 @@
 
   quasselVersion = "0.2.0-pre";
   quasselDate = "2008-01-28";
-  quasselBuild = 398;
+  quasselBuild = 399;
 
   //! Minimum client build number the core needs
   clientBuildNeeded = 358;
-- 
2.20.1