From: Ethan B. <ebl...@us...> - 2005-02-22 16:02:58
|
Update of /cvsroot/gaim/gaim/src/protocols/irc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3981/src/protocols/irc Modified Files: Tag: oldstatus msgs.c Log Message: Escape IRC nicks Index: msgs.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/protocols/irc/msgs.c,v retrieving revision 1.39.2.4 retrieving revision 1.39.2.5 diff -u -d -p -r1.39.2.4 -r1.39.2.5 --- msgs.c 16 Feb 2005 19:55:26 -0000 1.39.2.4 +++ msgs.c 22 Feb 2005 16:02:50 -0000 1.39.2.5 @@ -167,7 +167,7 @@ void irc_msg_endwhois(struct irc_conn *i GaimConnection *gc; GString *info; char buffer[256]; - char *str; + char *str, *tmp; if (!irc->whois.nick) { gaim_debug(GAIM_DEBUG_WARNING, "irc", "Unexpected End of WHOIS for %s\n", args[1]); @@ -179,18 +179,20 @@ void irc_msg_endwhois(struct irc_conn *i } info = g_string_new(""); - g_string_append_printf(info, _("<b>%s:</b> %s"), _("Nick"), args[1]); + tmp = g_markup_escape_text(args[1], -1); + g_string_append_printf(info, _("<b>%s:</b> %s"), _("Nick"), tmp); + g_free(tmp); g_string_append_printf(info, "%s%s<br>", irc->whois.ircop ? _(" <i>(ircop)</i>") : "", irc->whois.identified ? _(" <i>(identified)</i>") : ""); if (irc->whois.away) { - char *tmp = g_markup_escape_text(irc->whois.away, strlen(irc->whois.away)); + tmp = g_markup_escape_text(irc->whois.away, strlen(irc->whois.away)); g_free(irc->whois.away); g_string_append_printf(info, _("<b>%s:</b> %s<br>"), _("Away"), tmp); g_free(tmp); } if (irc->whois.userhost) { - char *tmp = g_markup_escape_text(irc->whois.name, strlen(irc->whois.name)); + tmp = g_markup_escape_text(irc->whois.name, strlen(irc->whois.name)); g_free(irc->whois.name); g_string_append_printf(info, _("<b>%s:</b> %s<br>"), _("Username"), irc->whois.userhost); g_string_append_printf(info, _("<b>%s:</b> %s<br>"), _("Realname"), tmp); @@ -444,6 +446,7 @@ void irc_msg_nonick(struct irc_conn *irc { GaimConnection *gc; GaimConversation *convo; + char *nick; convo = gaim_find_conversation_with_account(args[1], irc->account); if (convo) { @@ -456,7 +459,9 @@ void irc_msg_nonick(struct irc_conn *irc } else { if ((gc = gaim_account_get_connection(irc->account)) == NULL) return; - gaim_notify_error(gc, NULL, _("No such nick or channel"), args[1]); + nick = g_markup_escape_text (args[1], -1); + gaim_notify_error(gc, NULL, _("No such nick or channel"), nick); + g_free (nick); } if (irc->whois.nick && !gaim_utf8_strcasecmp(irc->whois.nick, args[1])) { |