moparisthebest
/
hexchat
mirror of https://github.com/moparisthebest/hexchat
1
0
Fork 0
Code Issues Releases Wiki Activity

Login type cleanup

This commit is contained in:
Berke Viktor 2013-05-19 05:17:13 +02:00
parent d60cecb8d3
commit b2fec642fe
5 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/inbound.c
View File

@ -1395,10 +1395,10 @@ inbound_nickserv_login (server *serv)
{ {
case LOGIN_MSG_NICKSERV: case LOGIN_MSG_NICKSERV:
case LOGIN_NICKSERV: case LOGIN_NICKSERV:
case LOGIN_NS:
case LOGIN_MSG_NS:
case LOGIN_CHALLENGEAUTH: case LOGIN_CHALLENGEAUTH:
#if 0 #if 0
case LOGIN_NS:
case LOGIN_MSG_NS:
case LOGIN_AUTH: case LOGIN_AUTH:
#endif #endif
return 1; return 1;

4
src/common/proto-irc.c
View File

@ -73,10 +73,10 @@ irc_nickserv (server *serv, char *cmd, char *arg1, char *arg2, char *arg3)
case LOGIN_NICKSERV: case LOGIN_NICKSERV:
tcp_sendf (serv, "NICKSERV %s %s%s%s\r\n", cmd, arg1, arg2, arg3); tcp_sendf (serv, "NICKSERV %s %s%s%s\r\n", cmd, arg1, arg2, arg3);
break; break;
#if 0
case LOGIN_MSG_NS: case LOGIN_MSG_NS:
tcp_sendf (serv, "PRIVMSG NS :%s %s%s%s\r\n", cmd, arg1, arg2, arg3); tcp_sendf (serv, "PRIVMSG NS :%s %s%s%s\r\n", cmd, arg1, arg2, arg3);
break; break;
#if 0
case LOGIN_NS: case LOGIN_NS:
tcp_sendf (serv, "NS %s %s%s%s\r\n", cmd, arg1, arg2, arg3); tcp_sendf (serv, "NS %s %s%s%s\r\n", cmd, arg1, arg2, arg3);
break; break;
@ -109,7 +109,7 @@ irc_ns_identify (server *serv, char *pass)
static void static void
irc_ns_ghost (server *serv, char *usname, char *pass) 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); irc_nickserv (serv, "GHOST", usname, " ", pass);
} }

4
src/common/servlist.c
View File

@ -547,11 +547,11 @@ static const struct defaultserver def[] =
{0, "irc.servx.ru"}, {0, "irc.servx.ru"},
{0, "irc.gavnos.ru"}, {0, "irc.gavnos.ru"},
{"UnderNet", 0}, {"UnderNet", 0, 0, 0, LOGIN_CUSTOM},
{0, "us.undernet.org"}, {0, "us.undernet.org"},
{0, "eu.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.lirex.com"},
{0, "irc.naturella.com"}, {0, "irc.naturella.com"},
{0, "irc.spnet.net"}, {0, "irc.spnet.net"},

2
src/common/servlist.h
View File

@ -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_DEFAULT 0 /* this is for the login type dropdown, doesn't serve any other purpose */
#define LOGIN_MSG_NICKSERV 1 #define LOGIN_MSG_NICKSERV 1
#define LOGIN_NICKSERV 2 #define LOGIN_NICKSERV 2
#if 0
#define LOGIN_NS 3 #define LOGIN_NS 3
#define LOGIN_MSG_NS 4 #define LOGIN_MSG_NS 4
#define LOGIN_AUTH 5 #define LOGIN_AUTH 5
#endif
#define LOGIN_SASL 6 #define LOGIN_SASL 6
#define LOGIN_PASS 7 #define LOGIN_PASS 7
#define LOGIN_CHALLENGEAUTH 8 #define LOGIN_CHALLENGEAUTH 8

4
src/fe-gtk/servlistgui.c
View File

@ -121,11 +121,11 @@ static int login_types_conf[] =
LOGIN_PASS, LOGIN_PASS,
LOGIN_MSG_NICKSERV, LOGIN_MSG_NICKSERV,
LOGIN_NICKSERV, LOGIN_NICKSERV,
LOGIN_MSG_NS,
LOGIN_CHALLENGEAUTH, LOGIN_CHALLENGEAUTH,
LOGIN_CUSTOM LOGIN_CUSTOM
#if 0 #if 0
LOGIN_NS, LOGIN_NS,
LOGIN_MSG_NS,
LOGIN_AUTH, LOGIN_AUTH,
#endif #endif
}; };
@ -137,11 +137,11 @@ static const char *login_types[]=
"Server Password (/PASS password)", "Server Password (/PASS password)",
"NickServ (/MSG NickServ + password)", "NickServ (/MSG NickServ + password)",
"NickServ (/NICKSERV + password)", "NickServ (/NICKSERV + password)",
"NickServ (/MSG NS + password)",
"Challenge Auth (username + password)", "Challenge Auth (username + password)",
"Custom... (connect commands)", "Custom... (connect commands)",
#if 0 #if 0
"NickServ (/NS + password)", "NickServ (/NS + password)",
"NickServ (/MSG NS + password)",
"AUTH (/AUTH nickname password)", "AUTH (/AUTH nickname password)",
#endif #endif
NULL NULL