# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1137030644 0
# Node ID 12b23eaa4911f580c991f5f44979fb2ddff91137
# Parent  2bf82fdddf5e3558d1b568545e46acf1084e78f2
[gaim-migrate @ 15188]
Fix an escaping issue reported in SF Bug #1220557.

committer: Tailor Script <tailor@pidgin.im>

diff -r 2bf82fdddf5e -r 12b23eaa4911 src/conversation.c
--- a/src/conversation.c	Thu Jan 12 01:26:51 2006 +0000
+++ b/src/conversation.c	Thu Jan 12 01:50:44 2006 +0000
@@ -1502,13 +1502,18 @@
 		aliases = g_list_prepend(aliases, (char *)alias);
 
 		if (!quiet && new_arrivals) {
+			char *escaped = g_markup_escape_text(alias, -1);
 			char *tmp;
 
 			if (extra_msg == NULL)
-				tmp = g_strdup_printf(_("%s entered the room."), alias);
-			else
+				tmp = g_strdup_printf(_("%s entered the room."), escaped);
+			else {
+				char *escaped2 = g_markup_escape_text(extra_msg, -1);
 				tmp = g_strdup_printf(_("%s [<I>%s</I>] entered the room."),
-									  alias, extra_msg);
+									  escaped, escaped2);
+				g_free(escaped2);
+			}
+			g_free(escaped);
 
 			gaim_conversation_write(conv, NULL, tmp, GAIM_MESSAGE_SYSTEM, time(NULL));
 			g_free(tmp);