Mercurial > pidgin
changeset 23601:429cd88862fd
merge of '4c5a026e3419c03409089efe76548d6642ca1e2a'
and 'a1515f71238597d861299c4a998b98967c1d6ef9'
| author | Daniel Atallah <daniel.atallah@gmail.com> |
|---|---|
| date | Fri, 25 Jul 2008 18:50:54 +0000 |
| parents | 70d39f235848 (diff) 1b7dea5ce0cd (current diff) |
| children | d48d333e6ef5 |
| files | |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/oscar/oscar.c Fri Jul 25 16:33:24 2008 +0000 +++ b/libpurple/protocols/oscar/oscar.c Fri Jul 25 18:50:54 2008 +0000 @@ -3136,7 +3136,7 @@ oscar_user_info_append_status(gc, user_info, /* PurpleBuddy */ NULL, userinfo, /* strip_html_tags */ FALSE); - if (userinfo->present & AIM_USERINFO_PRESENT_IDLE) { + if ((userinfo->present & AIM_USERINFO_PRESENT_IDLE) && userinfo->idletime != 0) { tmp = purple_str_seconds_to_string(userinfo->idletime*60); oscar_user_info_add_pair(user_info, _("Idle"), tmp); g_free(tmp);