A warning message is now displayed when your nickname is already taken or not valid...

issues automagically again. But for now there is no nice way to access the identity list from within a
serverhandler.

diff --git a/src/core/ircserverhandler.cpp b/src/core/ircserverhandler.cpp
index 90f496e..dab5882 100644 (file)
--- a/src/core/ircserverhandler.cpp
+++ b/src/core/ircserverhandler.cpp
@@ -392,6 +392,10 @@ void IrcServerHandler::handle353(QString prefix, QStringList params) {
 void IrcServerHandler::handle432(QString prefix, QStringList params) {
   Q_UNUSED(prefix)
   Q_UNUSED(params)
 void IrcServerHandler::handle432(QString prefix, QStringList params) {
   Q_UNUSED(prefix)
   Q_UNUSED(params)

+  emit displayMsg(Message::Error, "", tr("Your desired nickname contains illegal characters!"));
+  emit displayMsg(Message::Error, "", tr("Please use /nick <othernick> to continue your IRC-Session!"));
+  // FIXME!
+

 //   if(params.size() < 2) {
 //     // handle unreal-ircd bug, where unreal ircd doesnt supply a TARGET in ERR_ERRONEUSNICKNAME during registration phase:
 //     // nick @@@
 //   if(params.size() < 2) {
 //     // handle unreal-ircd bug, where unreal ircd doesnt supply a TARGET in ERR_ERRONEUSNICKNAME during registration phase:
 //     // nick @@@


@@ -421,9 +425,11 @@ void IrcServerHandler::handle432(QString prefix, QStringList params) {
 /* ERR_NICKNAMEINUSE */
 void IrcServerHandler::handle433(QString prefix, QStringList params) {
   Q_UNUSED(prefix)
 /* ERR_NICKNAMEINUSE */
 void IrcServerHandler::handle433(QString prefix, QStringList params) {
   Q_UNUSED(prefix)

-  Q_UNUSED(params)
-//   QString errnick = params[0];
-//   emit displayMsg(Message::Error, "", tr("Nick %1 is already taken").arg(errnick));
+  QString errnick = params[0];
+  emit displayMsg(Message::Error, "", tr("Nick %1 is already taken").arg(errnick));
+  emit displayMsg(Message::Error, "", tr("Please use /nick <othernick> to continue your IRC-Session!"));
+  // FIXME!
+  

 //   // if there is a problem while connecting to the server -> we handle it
 //   // TODO rely on another source...
 //   if(currentServer.isEmpty()) {
 //   // if there is a problem while connecting to the server -> we handle it
 //   // TODO rely on another source...
 //   if(currentServer.isEmpty()) {

diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp
index 8220669..f078a54 100644 (file)
--- a/src/qtui/mainwin.cpp
+++ b/src/qtui/mainwin.cpp
@@ -100,6 +100,7 @@ void MainWin::init() {
 
 
   QDockWidget *dock = new QDockWidget("Topic Dock", this);
 
 
   QDockWidget *dock = new QDockWidget("Topic Dock", this);

+  dock->setObjectName("TopicDock");

   dock->setAllowedAreas(Qt::TopDockWidgetArea | Qt::BottomDockWidgetArea);
 
   TopicWidget *topicwidget = new TopicWidget(dock);
   dock->setAllowedAreas(Qt::TopDockWidgetArea | Qt::BottomDockWidgetArea);
 
   TopicWidget *topicwidget = new TopicWidget(dock);