pidgin: 86dfe2ea: oscar: Fix '<' in AIM/ICQ status message..

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 86dfe2ea187c8f905bc49f8683299e742cd919c6
Ancestor: fd01d69465dca1c23c811963e2545236c2749d55
Author: darkrain42 at pidgin.im
Date: 2009-11-29T19:32:36
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/86dfe2ea187c8f905bc49f8683299e742cd919c6

Modified files:
        libpurple/protocols/oscar/oscar.c

ChangeLog: 

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).

-------------- next part --------------
============================================================
--- libpurple/protocols/oscar/oscar.c	2fcb8379ecacc7945c869ef1cce5ff1d023a2189
+++ libpurple/protocols/oscar/oscar.c	527d8aac476b586cb1f72b77660795462d0cd01c
@@ -896,10 +896,14 @@ static void oscar_user_info_append_statu
 			   (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 @@ static void oscar_user_info_append_statu
 	}
 	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;