pidgin.2.6.3: e37623b5: *** Plucked rev 97e003ed2bc2bafbb993693c...

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: e37623b5567c442c6771daf90fc175ae7898a10b
Ancestor: aae05a9e04bcb848572ca4a72598fc647d574013
Author: markdoliner at pidgin.im
Date: 2009-10-16T09:27:11
Branch: im.pidgin.pidgin.2.6.3
Tag: v2.6.3
URL: http://d.pidgin.im/viewmtn/revision/info/e37623b5567c442c6771daf90fc175ae7898a10b

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

ChangeLog: 

*** Plucked rev 97e003ed2bc2bafbb993693c9ae9c6d667731cc1 (markdoliner at pidgin.im):
If an oscar buddy on our buddy list is away and we have not yet
fetched their HTML info, then fallback to using their plaintext
status message when fetching the buddies status text.
Fixes #9843


-------------- next part --------------
============================================================
--- libpurple/protocols/oscar/oscar.c	4746634556dd2192cdcb8cd9a64f6fb094753241
+++ libpurple/protocols/oscar/oscar.c	9853f082e14b9686640d58f9d1327c752b990d36
@@ -829,19 +829,25 @@ static void oscar_user_info_append_statu
 	   the "message" attribute of the status contains only the plaintext
 	   message. */
 	if (userinfo) {
-		if ((userinfo->flags & AIM_FLAG_AWAY)) {
-			/* Away message? */
-			if ((userinfo->flags & AIM_FLAG_AWAY) && (userinfo->away_len > 0) && (userinfo->away != NULL) && (userinfo->away_encoding != NULL)) {
-				tmp = oscar_encoding_extract(userinfo->away_encoding);
-				message = oscar_encoding_to_utf8(account, tmp, userinfo->away,
-												   userinfo->away_len);
-				g_free(tmp);
-			}
+		if ((userinfo->flags & AIM_FLAG_AWAY)
+				&& userinfo->away_len > 0
+				&& userinfo->away != NULL
+				&& userinfo->away_encoding != NULL)
+		{
+			/* Away message */
+			tmp = oscar_encoding_extract(userinfo->away_encoding);
+			message = oscar_encoding_to_utf8(account,
+					tmp, userinfo->away, userinfo->away_len);
+			g_free(tmp);
 		} else {
-			/* Available message? */
+			/*
+			 * Available message or non-HTML away message (because that's
+			 * all we have right now.
+			 */
 			if ((userinfo->status != NULL) && userinfo->status[0] != '\0') {
-				message = oscar_encoding_to_utf8(account, userinfo->status_encoding,
-											 userinfo->status, userinfo->status_len);
+				message = oscar_encoding_to_utf8(account,
+						userinfo->status_encoding, userinfo->status,
+						userinfo->status_len);
 			}
 #if defined (_WIN32) || defined (__APPLE__)
 			if (userinfo->itmsurl && (userinfo->itmsurl[0] != '\0'))