diff options
| author | Paul Aurich <darkrain42@pidgin.im> | 2009-06-20 00:26:06 +0000 |
|---|---|---|
| committer | Paul Aurich <darkrain42@pidgin.im> | 2009-06-20 00:26:06 +0000 |
| commit | 6001cff247ba10d36bb721acbf34f8fe49603b59 (patch) | |
| tree | 6abfdb4b1949229c1cfed92f045f3f9aa748a591 | |
| parent | 2b2d332c62e6e0dfdad9a26feaba9b1b5a49ca42 (diff) | |
| download | pidgin-6001cff247ba10d36bb721acbf34f8fe49603b59.tar.gz | |
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.
| -rw-r--r-- | COPYRIGHT | 1 | ||||
| -rw-r--r-- | libpurple/protocols/oscar/oscar.c | 11 |
2 files changed, 9 insertions, 3 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 6defbd0b83..d0bfc9ef7a 100644 --- a/libpurple/protocols/oscar/oscar.c +++ b/libpurple/protocols/oscar/oscar.c @@ -5029,11 +5029,16 @@ 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); - 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; } |