# HG changeset patch
# User Nathan Walp <nwalp@pidgin.im>
# Date 1170219232 0
# Node ID 4222b5790e0b531d5b8db706fda548712106bc1e
# Parent  8fc14c228ca895dea5355879f4b0810a1ef3420e# Parent  ce0cd7474b6422da9e6cb70ef3c02d68182ba1cd
merge of 'c2ca8d77fad6142251001c2545c83a2f56eb3660'
     and 'df9e73e952c29bcf2bf3d2f7c6e1f89e622fc8dc'

diff -r 8fc14c228ca8 -r 4222b5790e0b pidgin/plugins/convcolors.c
--- a/pidgin/plugins/convcolors.c	Wed Jan 31 04:53:48 2007 +0000
+++ b/pidgin/plugins/convcolors.c	Wed Jan 31 04:53:52 2007 +0000
@@ -124,6 +124,11 @@
 		t = *displaying;
 		*displaying = gaim_markup_strip_html(t);
 		g_free(t);
+
+		t = *displaying;
+		*displaying = g_markup_escape_text(t, -1);
+		g_free(t);
+
 		/* Restore the links */
 		t = *displaying;
 		*displaying = gaim_markup_linkify(t);