From: Richard L. <rl...@us...> - 2006-03-06 02:22:20
|
Update of /cvsroot/gaim/gaim/src/protocols/irc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9760/src/protocols/irc Modified Files: msgs.c Log Message: It seems like we should escape the channel or nick when building the message. Index: msgs.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/protocols/irc/msgs.c,v retrieving revision 1.74 retrieving revision 1.75 diff -u -d -p -r1.74 -r1.75 --- msgs.c 4 Feb 2006 20:55:51 -0000 1.74 +++ msgs.c 6 Mar 2006 02:22:15 -0000 1.75 @@ -311,14 +311,19 @@ void irc_msg_topic(struct irc_conn *irc, tmp2 = gaim_markup_linkify(tmp); g_free(tmp); if (!strcmp(name, "topic")) { + char *nick_esc; nick = irc_mask_nick(from); + nick_esc = g_markup_escape_text(nick, -1); gaim_conv_chat_set_topic(GAIM_CONV_CHAT(convo), nick, topic); - msg = g_strdup_printf(_("%s has changed the topic to: %s"), nick, tmp2); + msg = g_strdup_printf(_("%s has changed the topic to: %s"), nick_esc, tmp2); + g_free(nick_esc); g_free(nick); gaim_conv_chat_write(GAIM_CONV_CHAT(convo), from, msg, GAIM_MESSAGE_SYSTEM, time(NULL)); g_free(msg); } else { - msg = g_strdup_printf(_("The topic for %s is: %s"), chan, tmp2); + char *chan_esc = g_markup_escape_text(chan, -1); + msg = g_strdup_printf(_("The topic for %s is: %s"), chan_esc, tmp2); + g_free(chan_esc); gaim_conv_chat_set_topic(GAIM_CONV_CHAT(convo), NULL, topic); gaim_conv_chat_write(GAIM_CONV_CHAT(convo), "", msg, GAIM_MESSAGE_SYSTEM, time(NULL)); g_free(msg); |