Mercurial > pidgin

changeset 22055:895120b1b926

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge of '6523df90f67ed0428e11d3ebc7bf15777986ebcf' and 'd567c3024540efcf356b0e1201e926ef551c8ec6'
author Sadrul Habib Chowdhury <imadil@gmail.com>
date Thu, 10 Jan 2008 02:28:42 +0000
parents 658785fe1992 (current diff) 2d4c3b775620 (diff)
children fdebef95b300
files
diffstat 1 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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);