Mercurial > pidgin
changeset 23597:49d510fc45c8
merge of '5d4c9f843c6735b316b8a1659cfdc4d162aee4c0'
and 'a1515f71238597d861299c4a998b98967c1d6ef9'
| author | Evan Schoenberg <evan.s@dreskin.net> |
|---|---|
| date | Sun, 27 Jul 2008 15:39:05 +0000 |
| parents | a06cbe1719a7 (diff) 1b7dea5ce0cd (current diff) |
| children | 224169be5830 |
| files | |
| diffstat | 1 files changed, 2 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 Sun Jul 27 15:39:05 2008 +0000 @@ -1512,6 +1512,7 @@ /* Suspended account */ purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED, _("Your account is currently suspended.")); break; + case 0x02: case 0x14: /* service temporarily unavailable */ purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _("The AOL Instant Messenger service is temporarily unavailable.")); @@ -3136,7 +3137,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);