# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1170208318 0
# Node ID 4fcf3a17f03e06edbd1b3764f6e3ff544696c505
# Parent  2c81b0a81790201ac949da45523e6f6e8a874aa5# Parent  ce0cd7474b6422da9e6cb70ef3c02d68182ba1cd
merge of '9047f755d6c146b4f110727b63ed0f3dacbbe398'
     and 'df9e73e952c29bcf2bf3d2f7c6e1f89e622fc8dc'

diff -r 2c81b0a81790 -r 4fcf3a17f03e pidgin/plugins/convcolors.c
--- a/pidgin/plugins/convcolors.c	Tue Jan 30 21:04:04 2007 +0000
+++ b/pidgin/plugins/convcolors.c	Wed Jan 31 01:51:58 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);