Mercurial > pidgin
diff libpurple/protocols/msn/msn.c @ 26028:3fd5bda55d76
propagate from branch 'im.pidgin.pidgin' (head e602a35f60e3d423d43bacc72fcb7239c8b43cf0)
to branch 'im.pidgin.pidgin.vv' (head dcc53c9783aecbdde6269c4310ec4b0cf511bd9e)
| author | Mike Ruprecht <maiku@soc.pidgin.im> |
|---|---|
| date | Tue, 13 Jan 2009 03:02:42 +0000 |
| parents | 68f4edb42f39 1eedb375c937 |
| children | af42303654a5 |
line wrap: on
line diff
--- a/libpurple/protocols/msn/msn.c Mon Jan 12 03:43:04 2009 +0000 +++ b/libpurple/protocols/msn/msn.c Tue Jan 13 03:02:42 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; }