changeset
merge of 'd4786c872b12920875d38f2e67fb148aa8b3f36b'
Sun, 08 Jun 2008 21:44:50 +0000
- author
- Ka-Hing Cheung <khc@pidgin.im>
- date
- Sun, 08 Jun 2008 21:44:50 +0000
- changeset 23463
- 296f09306ca3
- parent 23461
- d4786c872b12 (current diff)
- parent 23462
- 30de01dfe3f2 (diff)
- child 23464
- 9be1a1116c15
merge of 'd4786c872b12920875d38f2e67fb148aa8b3f36b'
and '30de01dfe3f2470fa6346d3076849452cb8cbb91'
--- a/libpurple/protocols/oscar/oscar.c Sun Jun 08 19:15:26 2008 +0000 +++ b/libpurple/protocols/oscar/oscar.c Sun Jun 08 21:44:50 2008 +0000 @@ -871,8 +871,8 @@ if (b) { if (purple_presence_is_online(presence)) { - if (aim_snvalid_icq(b->name) || !message || !(*message)) { - /* Append the status name for online ICQ statuses and for all buddies with no message. + if (aim_snvalid_icq(b->name) || is_away || !message || !(*message)) { + /* Append the status name for online ICQ statuses, away AIM statuses, and for all buddies with no message. * If the status name and the message are the same, only show one. */ const char *status_name = purple_status_get_name(status); if (status_name && message && !strcmp(status_name, message))
