diff options
| author | Mark Doliner <markdoliner@pidgin.im> | 2009-03-09 02:19:51 +0000 |
|---|---|---|
| committer | Mark Doliner <markdoliner@pidgin.im> | 2009-03-09 02:19:51 +0000 |
| commit | bdfb17e7f3f9201472d8f37f67c82ace1d2085fa (patch) | |
| tree | 7b74b770525af6c919dadd9172c258107e58d0e0 | |
| parent | d146fdb6d64bcc32c533ab727ed1362c35ff976f (diff) | |
| download | pidgin-bdfb17e7f3f9201472d8f37f67c82ace1d2085fa.tar.gz | |
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.
| -rw-r--r-- | COPYRIGHT | 1 | ||||
| -rw-r--r-- | libpurple/protocols/oscar/oscar.c | 9 |
2 files changed, 8 insertions, 2 deletions
@@ -432,6 +432,7 @@ Mårten Svantesson (fursten) Amir Szekely (kichik) Robert T. Greg Taeger +Rob Taft Peter Tang Brian Tarricone Peter Teichman diff --git a/libpurple/protocols/oscar/oscar.c b/libpurple/protocols/oscar/oscar.c index da934f3a60..4b8534e8bd 100644 --- a/libpurple/protocols/oscar/oscar.c +++ b/libpurple/protocols/oscar/oscar.c @@ -5030,10 +5030,15 @@ static int purple_ssi_parseerr(OscarData *od, FlapConnection *conn, FlapFrame *f 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; } |