From b2fec642fec7a4cf7f0aca2f7bb0d964656dff3e Mon Sep 17 00:00:00 2001
From: Berke Viktor <bviktor@hexchat.org>
Date: Sun, 19 May 2013 05:17:13 +0200
Subject: [PATCH] Login type cleanup

---
 src/common/inbound.c     | 4 ++--
 src/common/proto-irc.c   | 4 ++--
 src/common/servlist.c    | 4 ++--
 src/common/servlist.h    | 2 ++
 src/fe-gtk/servlistgui.c | 4 ++--
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/common/inbound.c b/src/common/inbound.c
index 06cabd45..da2cb34c 100644
--- a/src/common/inbound.c
+++ b/src/common/inbound.c
@@ -1395,10 +1395,10 @@ inbound_nickserv_login (server *serv)
 	{
 		case LOGIN_MSG_NICKSERV:
 		case LOGIN_NICKSERV:
-		case LOGIN_NS:
-		case LOGIN_MSG_NS:
 		case LOGIN_CHALLENGEAUTH:
 #if 0
+		case LOGIN_NS:
+		case LOGIN_MSG_NS:
 		case LOGIN_AUTH:
 #endif
 			return 1;
diff --git a/src/common/proto-irc.c b/src/common/proto-irc.c
index d3a17f55..cb4db0cd 100644
--- a/src/common/proto-irc.c
+++ b/src/common/proto-irc.c
@@ -73,10 +73,10 @@ irc_nickserv (server *serv, char *cmd, char *arg1, char *arg2, char *arg3)
 		case LOGIN_NICKSERV:
 			tcp_sendf (serv, "NICKSERV %s %s%s%s\r\n", cmd, arg1, arg2, arg3);
 			break;
+#if 0
 		case LOGIN_MSG_NS:
 			tcp_sendf (serv, "PRIVMSG NS :%s %s%s%s\r\n", cmd, arg1, arg2, arg3);
 			break;
-#if 0
 		case LOGIN_NS:
 			tcp_sendf (serv, "NS %s %s%s%s\r\n", cmd, arg1, arg2, arg3);
 			break;
@@ -109,7 +109,7 @@ irc_ns_identify (server *serv, char *pass)
 static void
 irc_ns_ghost (server *serv, char *usname, char *pass)
 {
-	if (serv->loginmethod != LOGIN_AUTH && serv->loginmethod != LOGIN_CHALLENGEAUTH)
+	if (serv->loginmethod != LOGIN_CHALLENGEAUTH)
 	{
 		irc_nickserv (serv, "GHOST", usname, " ", pass);
 	}
diff --git a/src/common/servlist.c b/src/common/servlist.c
index d239e1c7..0ad36446 100644
--- a/src/common/servlist.c
+++ b/src/common/servlist.c
@@ -547,11 +547,11 @@ static const struct defaultserver def[] =
 	{0,			"irc.servx.ru"},
 	{0,			"irc.gavnos.ru"},
 
-	{"UnderNet",	0},
+	{"UnderNet", 0, 0, 0, LOGIN_CUSTOM},
 	{0,			"us.undernet.org"},
 	{0,			"eu.undernet.org"},
 
-	{"UniBG", 0, 0, 0, LOGIN_MSG_NS},
+	{"UniBG", 0, 0, 0, LOGIN_CUSTOM},
 	{0,			"irc.lirex.com"},
 	{0,			"irc.naturella.com"},
 	{0,			"irc.spnet.net"},
diff --git a/src/common/servlist.h b/src/common/servlist.h
index 26bbabee..45b6dad6 100644
--- a/src/common/servlist.h
+++ b/src/common/servlist.h
@@ -70,9 +70,11 @@ extern GSList *network_list;
 #define LOGIN_DEFAULT			0				/* this is for the login type dropdown, doesn't serve any other purpose */
 #define LOGIN_MSG_NICKSERV		1
 #define LOGIN_NICKSERV			2
+#if 0
 #define LOGIN_NS				3
 #define LOGIN_MSG_NS			4
 #define LOGIN_AUTH				5
+#endif
 #define LOGIN_SASL				6
 #define LOGIN_PASS				7
 #define LOGIN_CHALLENGEAUTH		8
diff --git a/src/fe-gtk/servlistgui.c b/src/fe-gtk/servlistgui.c
index 7e3f5343..5f75cd0e 100644
--- a/src/fe-gtk/servlistgui.c
+++ b/src/fe-gtk/servlistgui.c
@@ -121,11 +121,11 @@ static int login_types_conf[] =
 	LOGIN_PASS,
 	LOGIN_MSG_NICKSERV,
 	LOGIN_NICKSERV,
-	LOGIN_MSG_NS,
 	LOGIN_CHALLENGEAUTH,
 	LOGIN_CUSTOM
 #if 0
 	LOGIN_NS,
+	LOGIN_MSG_NS,
 	LOGIN_AUTH,
 #endif
 };
@@ -137,11 +137,11 @@ static const char *login_types[]=
 	"Server Password (/PASS password)",
 	"NickServ (/MSG NickServ + password)",
 	"NickServ (/NICKSERV + password)",
-	"NickServ (/MSG NS + password)",
 	"Challenge Auth (username + password)",
 	"Custom... (connect commands)",
 #if 0
 	"NickServ (/NS + password)",
+	"NickServ (/MSG NS + password)",
 	"AUTH (/AUTH nickname password)",
 #endif
 	NULL