Mercurial > pidgin.yaz
changeset 25916:d5379aad12d0
Backport the buddy list error for ICQ/AIM, since the servers seem to be having
problems on a regular basis.
*** Plucked rev e1b1e80d999e393a80f201a484ef61289c258fbe (markdoliner@pidgin.im):
Only show the oscar error \"we couldn't fetch your buddy list, but
don't worry it will probably show up in a few minutes\" once. Thanks
to rtaft for the patch. Fixes #4845.
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Sat, 20 Jun 2009 00:26:06 +0000 |
| parents | e88a127bfa6d |
| children | 624725812fdb |
| files | COPYRIGHT libpurple/protocols/oscar/oscar.c |
| diffstat | 2 files changed, 9 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/COPYRIGHT Fri Jun 19 21:38:19 2009 +0000 +++ b/COPYRIGHT Sat Jun 20 00:26:06 2009 +0000 @@ -432,6 +432,7 @@ Amir Szekely (kichik) Robert T. Greg Taeger +Rob Taft Peter Tang Brian Tarricone Peter Teichman
--- a/libpurple/protocols/oscar/oscar.c Fri Jun 19 21:38:19 2009 +0000 +++ b/libpurple/protocols/oscar/oscar.c Sat Jun 20 00:26:06 2009 +0000 @@ -5029,11 +5029,16 @@ purple_debug_error("oscar", "ssi: SNAC error %hu\n", reason); if (reason == 0x0005) { - purple_notify_error(gc, NULL, _("Unable to Retrieve Buddy List"), - _("The AIM servers were temporarily unable to send your buddy list. Your buddy list is not lost, and will probably become available in a few minutes.")); if (od->getblisttimer > 0) purple_timeout_remove(od->getblisttimer); - od->getblisttimer = purple_timeout_add_seconds(30, purple_ssi_rerequestdata, od); + else + /* We only show this error the first time it happens */ + purple_notify_error(gc, NULL, + _("Unable to Retrieve Buddy List"), + _("The AIM servers were temporarily unable to send " + "your buddy list. Your buddy list is not lost, and " + "will probably become available in a few minutes.")); + od->getblisttimer = purple_timeout_add(30000, purple_ssi_rerequestdata, od); return 1; }