From ea3d7c278d6fb7b37554f86e733ee336733fc6ea Mon Sep 17 00:00:00 2001
From: Sebastien Helleu <flashcode@flashtux.org>
Date: Wed, 23 Nov 2005 15:44:01 +0000
Subject: [PATCH] Fixed bug with use of nick1 with a new server ("weechat_user"
 was used instead of nick1)

---
 src/irc/irc-send.c           | 2 ++
 src/irc/irc-server.c         | 1 -
 weechat/src/irc/irc-send.c   | 2 ++
 weechat/src/irc/irc-server.c | 1 -
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/irc/irc-send.c b/src/irc/irc-send.c
index bd03d9126..aaf319e78 100644
--- a/src/irc/irc-send.c
+++ b/src/irc/irc-send.c
@@ -61,6 +61,8 @@ irc_login (t_irc_server *server)
     gui_printf (server->buffer,
                 _("%s: using local hostname \"%s\"\n"),
                 PACKAGE_NAME, hostname);
+    if (!server->nick)
+        server->nick = strdup (server->nick1);
     server_sendf (server,
                   "NICK %s\r\n"
                   "USER %s %s %s :%s\r\n",
diff --git a/src/irc/irc-server.c b/src/irc/irc-server.c
index ea2f2d777..d877bd15f 100644
--- a/src/irc/irc-server.c
+++ b/src/irc/irc-server.c
@@ -400,7 +400,6 @@ server_new (char *name, int autoconnect, int autoreconnect, int autoreconnect_de
         new_server->autojoin =
             (autojoin) ? strdup (autojoin) : NULL;
         new_server->autorejoin = autorejoin;
-        new_server->nick = strdup (new_server->nick1);
         new_server->notify_levels =
             (notify_levels) ? strdup (notify_levels) : NULL;
     }
diff --git a/weechat/src/irc/irc-send.c b/weechat/src/irc/irc-send.c
index bd03d9126..aaf319e78 100644
--- a/weechat/src/irc/irc-send.c
+++ b/weechat/src/irc/irc-send.c
@@ -61,6 +61,8 @@ irc_login (t_irc_server *server)
     gui_printf (server->buffer,
                 _("%s: using local hostname \"%s\"\n"),
                 PACKAGE_NAME, hostname);
+    if (!server->nick)
+        server->nick = strdup (server->nick1);
     server_sendf (server,
                   "NICK %s\r\n"
                   "USER %s %s %s :%s\r\n",
diff --git a/weechat/src/irc/irc-server.c b/weechat/src/irc/irc-server.c
index ea2f2d777..d877bd15f 100644
--- a/weechat/src/irc/irc-server.c
+++ b/weechat/src/irc/irc-server.c
@@ -400,7 +400,6 @@ server_new (char *name, int autoconnect, int autoreconnect, int autoreconnect_de
         new_server->autojoin =
             (autojoin) ? strdup (autojoin) : NULL;
         new_server->autorejoin = autorejoin;
-        new_server->nick = strdup (new_server->nick1);
         new_server->notify_levels =
             (notify_levels) ? strdup (notify_levels) : NULL;
     }