# HG changeset patch
# User Ka-Hing Cheung <khc@hxbc.us>
# Date 1231571576 0
# Node ID 3e39e4652c360b3f7484d28fe8f29dd81727ca88
# Parent  a7b24833397712aef55b4460ae809d231a5d7199
xmpp does this!

diff -r a7b248333977 -r 3e39e4652c36 libpurple/protocols/msn/msn.c
--- a/libpurple/protocols/msn/msn.c	Fri Jan 09 03:57:07 2009 +0000
+++ b/libpurple/protocols/msn/msn.c	Sat Jan 10 07:12:56 2009 +0000
@@ -647,6 +647,13 @@
 	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 @@
 		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;
 }