Mercurial > pidgin.yaz

changeset 11646:42ce5c68870a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 13924] this has been bugging me committer: Tailor Script <tailor@pidgin.im>
author Nathan Walp <nwalp@pidgin.im>
date Wed, 12 Oct 2005 04:24:20 +0000
parents 39786dfdf6a2
children a4880ada048d
files src/protocols/jabber/jabber.c
diffstat 1 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/protocols/jabber/jabber.c	Wed Oct 12 04:21:18 2005 +0000
+++ b/src/protocols/jabber/jabber.c	Wed Oct 12 04:24:20 2005 +0000
@@ -986,11 +986,12 @@
 			jbr = l->data;
 
 			if(jbr->status) {
-				char *stripped;
-				stripped = gaim_markup_strip_html(jbr->status);
-				text = g_markup_escape_text(stripped, -1);
-				g_free(stripped);
-				/* XXX: need some nl to br love here */
+				char *tmp;
+				text = gaim_strreplace(jbr->status, "\n", "<br />\n");
+				tmp = gaim_markup_strip_html(text);
+				g_free(text);
+				text = g_markup_escape_text(tmp, -1);
+				g_free(tmp);
 			}
 
 			if(jbr->name)