# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1259523156 0
# Node ID 7e4117c5372a8a977216ea502a502c37d5abd8c5
# Parent  8d213c65abad20f6c865f829709d7853006926ba
oscar: Fix '<' in AIM/ICQ status messages.  Closes #10304.

This is sadrul's patch, which I also tested as working.  It even seems to
work when using a rich-text status message (from AIM 7.0) and viewing in
Finch (I can't have Pidgin and AIM 7 available concurrently).

diff -r 8d213c65abad -r 7e4117c5372a libpurple/protocols/oscar/oscar.c
--- a/libpurple/protocols/oscar/oscar.c	Sun Nov 29 17:36:41 2009 +0000
+++ b/libpurple/protocols/oscar/oscar.c	Sun Nov 29 19:32:36 2009 +0000
@@ -896,10 +896,14 @@
 			   (userinfo && (userinfo->flags & AIM_FLAG_AWAY)));
 
 	if (strip_html_tags) {
-		/* Away messges are HTML, but available messages were originally plain text.
+		/* Away messages are HTML, but available messages were originally plain text.
 		 * We therefore need to strip away messages but not available messages if we're asked to remove HTML tags.
 		 */
-		if (is_away && message) {
+		/*
+		 * It seems like the above comment no longer applies.  All messages need
+		 * to be escaped.
+		 */
+		if (message) {
 			gchar *tmp2;
 			tmp = purple_markup_strip_html(message);
 			g_free(message);
@@ -918,7 +922,7 @@
 	}
 	g_free(itmsurl);
 
-	if (is_away && message) {
+	if (message) {
 		tmp = purple_str_sub_away_formatters(message, purple_account_get_username(account));
 		g_free(message);
 		message = tmp;