gaim/gaim

Fix bad nick change bug -- thanks, Jean-Yves Lefort
oldstatus
2005-04-01, Ethan Blanton
cff52fd5fd46
Parents 1670d7bebd49
Children 909f4b348fdc
Fix bad nick change bug -- thanks, Jean-Yves Lefort
2 files changed, 16 insertions(+), 3 deletions(-)
  • +15 -2
    src/protocols/irc/msgs.c
  • +1 -1
    src/protocols/irc/parse.c
    • --- a/src/protocols/irc/msgs.c Sun Mar 27 12:36:43 2005 -0500
    +++ b/src/protocols/irc/msgs.c Fri Apr 01 20:20:19 2005 -0500
    @@ -773,8 +773,21 @@
    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."));
    + GaimConnection *gc = gaim_account_get_connection(irc->account);
    + char *escaped, *msg;
    +
    + if (gc && gaim_connection_get_state(gc) == GAIM_CONNECTED) {
    + escaped = g_markup_escape_text(args[1], -1);
    + msg = g_strdup_printf(_("Invalid nickname '%s'"), escaped);
    + gaim_notify_error(irc->account, _("Invalid nickname"),
    + msg,
    + _("Your selected account name was rejected by the server. It probably contains invalid characters."));
    + g_free(escaped);
    + g_free(msg);
    + } else {
    + gaim_connection_error(gc,
    + _("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)
    --- a/src/protocols/irc/parse.c Sun Mar 27 12:36:43 2005 -0500
    +++ b/src/protocols/irc/parse.c Fri Apr 01 20:20:19 2005 -0500
    @@ -77,7 +77,7 @@
    { "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 */
    + { "432", "nn:", 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 */