# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1199932122 0
# Node ID 895120b1b926285e8fbd25f895e573fb3a5a7e5c
# Parent  658785fe1992a72737ad3d11f7a88983e5705b6e# Parent  2d4c3b775620680cffda63fc99382bcb61aa8cbe
merge of '6523df90f67ed0428e11d3ebc7bf15777986ebcf'
     and 'd567c3024540efcf356b0e1201e926ef551c8ec6'

diff -r 658785fe1992 -r 895120b1b926 pidgin/plugins/convcolors.c
--- a/pidgin/plugins/convcolors.c	Wed Jan 09 22:14:17 2008 +0000
+++ b/pidgin/plugins/convcolors.c	Thu Jan 10 02:28:42 2008 +0000
@@ -77,7 +77,7 @@
 	FONT_UNDERLINE	= 1 << 2
 };
 
-struct
+static struct
 {
 	PurpleMessageFlags flag;
 	char *prefix;
@@ -129,6 +129,11 @@
 
 	if (purple_prefs_get_bool(PREF_IGNORE))
 	{
+		/* This seems to be necessary, especially for received messages. */
+		t = *displaying;
+		*displaying = purple_strreplace(t, "\n", "<br>");
+		g_free(t);
+
 		t = *displaying;
 		*displaying = purple_markup_strip_html(t);
 		g_free(t);