Mercurial > pidgin.yaz
comparison libpurple/protocols/msn/msn.c @ 29663:af5c36fe8d6f
propagate from branch 'im.pidgin.pidgin' (head e602a35f60e3d423d43bacc72fcb7239c8b43cf0)
to branch 'im.pidgin.cpw.attention_ui' (head d6e2d83ffb82d0028d802e5959d57de1d61b4faf)
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Tue, 13 Jan 2009 18:39:52 +0000 |
parents | 9ea6842536ba 1eedb375c937 |
children | 4561aa5b368c |
comparison
equal
deleted
inserted
replaced
29662:9ea6842536ba | 29663:af5c36fe8d6f |
---|---|
647 const char *msg; | 647 const char *msg; |
648 | 648 |
649 presence = purple_buddy_get_presence(buddy); | 649 presence = purple_buddy_get_presence(buddy); |
650 status = purple_presence_get_active_status(presence); | 650 status = purple_presence_get_active_status(presence); |
651 | 651 |
652 /* Official client says media takes precedence over message */ | |
653 /* I say message take precedence over media! Plus prpl-jabber agrees | |
654 too */ | |
655 msg = purple_status_get_attr_string(status, "message"); | |
656 if (msg && *msg) | |
657 return g_markup_escape_text(msg, -1); | |
658 | |
652 if (purple_presence_is_status_primitive_active(presence, PURPLE_STATUS_TUNE)) { | 659 if (purple_presence_is_status_primitive_active(presence, PURPLE_STATUS_TUNE)) { |
653 const char *title, *game, *office; | 660 const char *title, *game, *office; |
654 char *media, *esc; | 661 char *media, *esc; |
655 status = purple_presence_get_status(presence, "tune"); | 662 status = purple_presence_get_status(presence, "tune"); |
656 title = purple_status_get_attr_string(status, PURPLE_TUNE_TITLE); | 663 title = purple_status_get_attr_string(status, PURPLE_TUNE_TITLE); |
676 return NULL; | 683 return NULL; |
677 esc = g_markup_escape_text(media, -1); | 684 esc = g_markup_escape_text(media, -1); |
678 g_free(media); | 685 g_free(media); |
679 return esc; | 686 return esc; |
680 } | 687 } |
681 | |
682 /* Official client says media takes precedence over message */ | |
683 msg = purple_status_get_attr_string(status, "message"); | |
684 if (msg && *msg) | |
685 return g_markup_escape_text(msg, -1); | |
686 | 688 |
687 return NULL; | 689 return NULL; |
688 } | 690 } |
689 | 691 |
690 static void | 692 static void |