pidgin: a1354021: xmpp does this!

[khc at pidgin.im]

-----------------------------------------------------------------
Revision: a135402149bf1e32aa10c63071cb337eb3c9b2e6
Ancestor: 605fc2c13ec364c27814f3ad22a721078fd5f970
Author: khc at pidgin.im
Date: 2009-01-10T07:12:56
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/a135402149bf1e32aa10c63071cb337eb3c9b2e6

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

ChangeLog: 

xmpp does this!

-------------- next part --------------
============================================================
--- libpurple/protocols/msn/msn.c	7c36df4d86117f0a4ea199f2b25f2f1a40f2dfd2
+++ libpurple/protocols/msn/msn.c	a5ea67bc8fc42fecb29491bc239e0c906d6f5d4e
@@ -647,6 +647,13 @@ msn_status_text(PurpleBuddy *buddy)
 	presence = purple_buddy_get_presence(buddy);
 	status = purple_presence_get_active_status(presence);
 
+	/* Official client says media takes precedence over message */
+	/* I say message take precedence over media! Plus prpl-jabber agrees
+	   too */
+	msg = purple_status_get_attr_string(status, "message");
+	if (msg && *msg)
+		return g_markup_escape_text(msg, -1);
+
 	if (purple_presence_is_status_primitive_active(presence, PURPLE_STATUS_TUNE)) {
 		const char *title, *game, *office;
 		char *media, *esc;
@@ -677,11 +684,6 @@ msn_status_text(PurpleBuddy *buddy)
 		return esc;
 	}
 
-	/* Official client says media takes precedence over message */
-	msg = purple_status_get_attr_string(status, "message");
-	if (msg && *msg)
-		return g_markup_escape_text(msg, -1);
-
 	return NULL;
 }