From: Ethan B. <ebl...@us...> - 2005-02-23 13:21:59
|
Update of /cvsroot/gaim/gaim/src/protocols/irc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20813/src/protocols/irc Modified Files: irc.h msgs.c parse.c Log Message: Handle bad nick errors Index: irc.h =================================================================== RCS file: /cvsroot/gaim/gaim/src/protocols/irc/irc.h,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -p -r1.17 -r1.18 --- irc.h 1 Feb 2005 16:13:09 -0000 1.17 +++ irc.h 23 Feb 2005 13:21:38 -0000 1.18 @@ -101,6 +101,7 @@ char *irc_format(struct irc_conn *irc, c void irc_msg_default(struct irc_conn *irc, const char *name, const char *from, char **args); void irc_msg_away(struct irc_conn *irc, const char *name, const char *from, char **args); void irc_msg_badmode(struct irc_conn *irc, const char *name, const char *from, char **args); +void irc_msg_badnick(struct irc_conn *irc, const char *name, const char *from, char **args); void irc_msg_banned(struct irc_conn *irc, const char *name, const char *from, char **args); void irc_msg_chanmode(struct irc_conn *irc, const char *name, const char *from, char **args); void irc_msg_endwhois(struct irc_conn *irc, const char *name, const char *from, char **args); Index: msgs.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/protocols/irc/msgs.c,v retrieving revision 1.46 retrieving revision 1.47 diff -u -d -p -r1.46 -r1.47 --- msgs.c 21 Feb 2005 15:05:59 -0000 1.46 +++ msgs.c 23 Feb 2005 13:21:38 -0000 1.47 @@ -740,6 +740,12 @@ void irc_msg_nick(struct irc_conn *irc, g_free(nick); } +void irc_msg_badnick(struct irc_conn *irc, const char *name, const char *from, char **args) +{ + gaim_connection_error(gaim_account_get_connection(irc->account), + _("Your selected account name was rejected by the server. It probably contains invalid characters.")); +} + void irc_msg_nickused(struct irc_conn *irc, const char *name, const char *from, char **args) { char *newnick, *buf, *end; Index: parse.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/protocols/irc/parse.c,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -p -r1.32 -r1.33 --- parse.c 18 Feb 2005 04:22:53 -0000 1.32 +++ parse.c 23 Feb 2005 13:21:38 -0000 1.33 @@ -77,6 +77,7 @@ static struct _irc_msg { { "404", "nt:", irc_msg_nosend }, /* Cannot send to chan */ { "421", "nv:", irc_msg_unknown }, /* Unknown command */ { "422", "nv:", irc_msg_endmotd }, /* No MOTD available */ + { "432", "vn:", irc_msg_badnick }, /* Erroneous nickname */ { "433", "vn:", irc_msg_nickused }, /* Nickname already in use */ { "438", "nn:", irc_msg_nochangenick }, /* Nick may not change */ { "442", "nc:", irc_msg_notinchan }, /* Not in channel */ |