diff libpurple/protocols/msn/msn.c @ 29663:af5c36fe8d6f

propagate from branch 'im.pidgin.pidgin' (head e602a35f60e3d423d43bacc72fcb7239c8b43cf0) to branch 'im.pidgin.cpw.attention_ui' (head d6e2d83ffb82d0028d802e5959d57de1d61b4faf)

--- a/libpurple/protocols/msn/msn.c	Thu Jan 01 21:19:11 2009 +0000
+++ b/libpurple/protocols/msn/msn.c	Tue Jan 13 18:39:52 2009 +0000
@@ -649,6 +649,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;
@@ -679,11 +686,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;
 }