Changes based on comments in pull #771.

4 files changed, 8 insertions, 5 deletions

diff --git a/src/core/chatnet-rec.h b/src/core/chatnet-rec.h
index 96ef6914..e3ed8aa0 100644
--- a/src/core/chatnet-rec.h
+++ b/src/core/chatnet-rec.h
@@ -4,7 +4,6 @@ int chat_type; /* chat_protocol_lookup(xx) */
 char *name;
 
 char *nick;
-char *alternate_nick;
 char *username;
 char *realname;
 
diff --git a/src/irc/core/irc-chatnets.c b/src/irc/core/irc-chatnets.c
index 0796e0cb..98ce89c3 100644
--- a/src/irc/core/irc-chatnets.c
+++ b/src/irc/core/irc-chatnets.c
@@ -43,6 +43,9 @@ static void sig_chatnet_read(IRC_CHATNET_REC *rec, CONFIG_NODE *node)
 	value = config_node_get_str(node, "usermode", NULL);
 	rec->usermode = (value != NULL && *value != '\0') ? g_strdup(value) : NULL;
 
+	value = config_node_get_str(node, "alternate_nick", NULL);
+	rec->alternate_nick = (value != NULL && *value != '\0') ? g_strdup(value) : NULL;
+
 	rec->max_cmds_at_once = config_node_get_int(node, "cmdmax", 0);
 	rec->cmd_queue_speed = config_node_get_int(node, "cmdspeed", 0);
 	rec->max_query_chans = config_node_get_int(node, "max_query_chans", 0);
@@ -65,6 +68,9 @@ static void sig_chatnet_saved(IRC_CHATNET_REC *rec, CONFIG_NODE *node)
 	if (rec->usermode != NULL)
 		iconfig_node_set_str(node, "usermode", rec->usermode);
 
+	if (rec->alternate_nick != NULL)
+		iconfig_node_set_str(node, "alternate_nick", rec->alternate_nick);
+
 	if (rec->max_cmds_at_once > 0)
 		iconfig_node_set_int(node, "cmdmax", rec->max_cmds_at_once);
 	if (rec->cmd_queue_speed > 0)
@@ -93,6 +99,7 @@ static void sig_chatnet_destroyed(IRC_CHATNET_REC *rec)
 {
 	if (IS_IRC_CHATNET(rec)) {
 		g_free(rec->usermode);
+		g_free(rec->alternate_nick);
 		g_free(rec->sasl_mechanism);
 		g_free(rec->sasl_username);
 		g_free(rec->sasl_password);
diff --git a/src/irc/core/irc-chatnets.h b/src/irc/core/irc-chatnets.h
index 2bb10fa9..3fd44472 100644
--- a/src/irc/core/irc-chatnets.h
+++ b/src/irc/core/irc-chatnets.h
@@ -18,6 +18,7 @@ struct _IRC_CHATNET_REC {
 #include "chatnet-rec.h"
 
 	char *usermode;
+	char *alternate_nick;
 
 	char *sasl_mechanism;
 	char *sasl_username;
diff --git a/src/irc/core/irc-servers-setup.c b/src/irc/core/irc-servers-setup.c
index a51ce2e2..bae7d3b4 100644
--- a/src/irc/core/irc-servers-setup.c
+++ b/src/irc/core/irc-servers-setup.c
@@ -69,10 +69,6 @@ static void sig_server_setup_fill_chatnet(IRC_SERVER_CONNECT_REC *conn,
 		return;
 	g_return_if_fail(IS_IRCNET(ircnet));
 
-	if (ircnet->nick != NULL) {
-		g_free_and_null(conn->nick);
-		conn->nick = g_strdup(ircnet->nick);
-	}
 	if (ircnet->alternate_nick != NULL) {
 		g_free_and_null(conn->alternate_nick);
 		conn->alternate_nick = g_strdup(ircnet->alternate_nick);