[Gaim-commits] CVS: gaim/src conversation.c,1.697,1.698

[Richard L. <rl...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12120/src

Modified Files:
	conversation.c 
Log Message:
Fix an escaping issue reported in SF Bug #1220557.

Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.697
retrieving revision 1.698
diff -u -d -p -r1.697 -r1.698
--- conversation.c	9 Jan 2006 21:29:52 -0000	1.697
+++ conversation.c	12 Jan 2006 01:50:44 -0000	1.698
@@ -1502,13 +1502,18 @@ gaim_conv_chat_add_users(GaimConvChat *c
 		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);