Use macros instead of raw numbers for login type

This commit is contained in:
Berke Viktor
2013-05-13 13:22:25 +02:00
parent 2c15270be1
commit 83107ee222
5 changed files with 50 additions and 34 deletions

View File

@@ -167,7 +167,7 @@ static const struct defaultserver def[] =
{0, "irc.criten.net"},
{0, "irc.eu.criten.net"},
{"DALnet", 0, 0, 0, 2},
{"DALnet", 0},
{0, "irc.dal.net"},
{0, "irc.eu.dal.net"},
@@ -245,7 +245,7 @@ static const struct defaultserver def[] =
{0, "irc.ggn.net"},
{0, "irc.vendetta.com"},
{"freenode", 0, "#hexchat", 0, 6},
{"freenode", 0, "#hexchat", 0, LOGIN_SASL},
#ifdef USE_OPENSSL
{0, "irc.freenode.net/+6697"},
#endif
@@ -263,7 +263,7 @@ static const struct defaultserver def[] =
/* {0, "sprynet.us.galaxynet.org"},
{0, "atlanta.ga.us.galaxynet.org"},*/
{"GameSurge", 0, 0, 0, 2},
{"GameSurge", 0},
{0, "irc.gamesurge.net"},
/* {"GamesNET", 0},
@@ -426,7 +426,7 @@ static const struct defaultserver def[] =
{0, "nfsi.ptnet.org"},
{0, "fctunl.ptnet.org"},
{"QuakeNet", 0, 0, 0, 5},
{"QuakeNet", 0, 0, 0, LOGIN_AUTH},
{0, "irc.quakenet.org"},
{0, "irc.se.quakenet.org"},
{0, "irc.dk.quakenet.org"},
@@ -460,7 +460,7 @@ static const struct defaultserver def[] =
{"Rizon", 0},
{0, "irc.rizon.net"},
{"RusNet", 0, 0, "KOI8-R (Cyrillic)", 2},
{"RusNet", 0, 0, "KOI8-R (Cyrillic)"},
{0, "irc.tomsk.net"},
{0, "irc.rinet.ru"},
{0, "irc.run.net"},
@@ -545,7 +545,7 @@ static const struct defaultserver def[] =
{0, "us.undernet.org"},
{0, "eu.undernet.org"},
{"UniBG", 0, 0, 0, 4},
{"UniBG", 0, 0, 0, LOGIN_MSG_NS},
{0, "irc.lirex.com"},
{0, "irc.naturella.com"},
{0, "irc.spnet.net"},
@@ -638,7 +638,7 @@ servlist_connect (session *sess, ircnet *net, gboolean join)
return;
ircserv = list->data;
/* incase a protocol switch is added to the servlist gui */
/* in case a protocol switch is added to the servlist gui */
server_fill_her_up (sess->server);
if (join)
@@ -661,7 +661,7 @@ servlist_connect (session *sess, ircnet *net, gboolean join)
}
else
{
serv->loginmethod = 7; /* Use server password by default. If we had a NickServ password, it'd be set to 2 already. */
serv->loginmethod = LOGIN_DEFAULT_REAL;
}
serv->password[0] = 0;
@@ -1264,7 +1264,7 @@ servlist_load (void)
net->pass = strdup (buf + 2);
if (!net->logintype)
{
net->logintype = 6;
net->logintype = LOGIN_SASL;
}
}
case 'B':
@@ -1273,7 +1273,7 @@ servlist_load (void)
net->pass = strdup (buf + 2);
if (!net->logintype)
{
net->logintype = 2;
net->logintype = LOGIN_NICKSERV;
}
}
}