gaim/gaim

Patch 3/4 (this is some escaping stuff, I should've mentioned it earlier)
oldstatus
2005-03-25, Stu Tomlinson
9230aa8eb647
Parents 90d97d5d538e
Children 1670d7bebd49
Patch 3/4 (this is some escaping stuff, I should've mentioned it earlier)
1 files changed, 10 insertions(+), 4 deletions(-)
  • +10 -4
    src/protocols/irc/msgs.c
    • --- a/src/protocols/irc/msgs.c Fri Mar 25 20:18:24 2005 -0500
    +++ b/src/protocols/irc/msgs.c Fri Mar 25 20:19:45 2005 -0500
    @@ -56,11 +56,15 @@
    static void irc_chat_remove_buddy(GaimConversation *convo, char *data[2])
    {
    - char *message = g_strdup_printf("quit: %s", data[1]);
    + char *escaped, *message;
    +
    + escaped = g_markup_escape_text(data[1], -1);
    + message = g_strdup_printf("quit: %s", escaped);
    if (gaim_conv_chat_find_user(GAIM_CONV_CHAT(convo), data[0]))
    gaim_conv_chat_remove_user(GAIM_CONV_CHAT(convo), data[0], message);
    + g_free(escaped);
    g_free(message);
    }
    @@ -819,7 +823,7 @@
    {
    GaimConnection *gc = gaim_account_get_connection(irc->account);
    GaimConversation *convo;
    - char *nick, *msg;
    + char *nick, *msg, *escaped;
    if (!args || !args[0] || !gc)
    return;
    @@ -830,17 +834,19 @@
    return;
    }
    + escaped = (args[1] && *args[1]) ? g_markup_escape_text(args[1], -1) : NULL;
    nick = irc_mask_nick(from);
    if (!gaim_utf8_strcasecmp(nick, gaim_connection_get_display_name(gc))) {
    msg = g_strdup_printf(_("You have parted the channel%s%s"),
    (args[1] && *args[1]) ? ": " : "",
    - (args[1] && *args[1]) ? args[1] : "");
    + (escaped && *escaped) ? escaped : "");
    gaim_conv_chat_write(GAIM_CONV_CHAT(convo), args[0], msg, GAIM_MESSAGE_SYSTEM, time(NULL));
    g_free(msg);
    serv_got_chat_left(gc, gaim_conv_chat_get_id(GAIM_CONV_CHAT(convo)));
    } else {
    - gaim_conv_chat_remove_user(GAIM_CONV_CHAT(convo), nick, args[1]);
    + gaim_conv_chat_remove_user(GAIM_CONV_CHAT(convo), nick, escaped);
    }
    + g_free(escaped);
    g_free(nick);
    }