Mercurial > pidgin.yaz
changeset 26255:53b04369fb10
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 | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Mon, 09 Mar 2009 02:19:51 +0000 |
| parents | 7114d475a9e7 |
| children | c0f7f0b2a950 |
| files | COPYRIGHT libpurple/protocols/oscar/oscar.c |
| diffstat | 2 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/COPYRIGHT Sun Mar 08 06:24:15 2009 +0000 +++ b/COPYRIGHT Mon Mar 09 02:19:51 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 Sun Mar 08 06:24:15 2009 +0000 +++ b/libpurple/protocols/oscar/oscar.c Mon Mar 09 02:19:51 2009 +0000 @@ -5030,10 +5030,15 @@ 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); + 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; }