pidgin: 8a9b0211: Keep track of available messages as HTML...

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: 8a9b0211abcf1d46b196aa1ade434ff3447e9e85
Ancestor: 08f60c90e65338d6b913f688c612e64731686531
Author: markdoliner at pidgin.im
Date: 2008-06-02T09:39:32
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/8a9b0211abcf1d46b196aa1ade434ff3447e9e85

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

ChangeLog: 

Keep track of available messages as HTML not plain text.  This fixes
a recent bug where available messages weren't being escaped when
displayed in the status text

-------------- next part --------------
============================================================
--- libpurple/protocols/oscar/oscar.c	7a3affc1e3cc238c71ed5d0fee3fea13e5b7a574
+++ libpurple/protocols/oscar/oscar.c	2e85b168e6453032f76c510bf6746d3c00116f41
@@ -1920,6 +1920,7 @@ static int purple_parse_oncoming(OscarDa
 	{
 		char *message = NULL;
 		char *itmsurl = NULL;
+		char *tmp;
 
 		if (info->status != NULL && info->status[0] != '\0')
 			/* Grab the available message */
@@ -1931,8 +1932,10 @@ static int purple_parse_oncoming(OscarDa
 			itmsurl = oscar_encoding_to_utf8(account, info->itmsurl_encoding,
 					info->itmsurl, info->itmsurl_len);
 
+		tmp = g_markup_escape_text(message, -1);
 		purple_prpl_got_user_status(account, info->sn, status_id,
-				"message", message, "itmsurl", itmsurl, NULL);
+				"message", tmp, "itmsurl", itmsurl, NULL);
+		g_free(tmp);
 
 		g_free(message);
 		g_free(itmsurl);
@@ -5705,7 +5708,7 @@ char *oscar_status_text(PurpleBuddy *b)
 		message = purple_status_get_attr_string(status, "message");
 		if (message != NULL)
 		{
-			ret = g_markup_escape_text(message, -1);
+			ret = g_strdup(message);
 			purple_util_chrreplace(ret, '\n', ' ');
 		}
 	}