pidgin.2.5.7: fbab3d52: Backport the buddy list error for ICQ/AI..

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: fbab3d52df9aff739254b5dcefec110084139ac8
Ancestor: 5639740a26a96a4e19f1d11c4e6a6f3ea6a46479
Author: darkrain42 at pidgin.im
Date: 2009-06-20T00:26:06
Branch: im.pidgin.pidgin.2.5.7
URL: http://d.pidgin.im/viewmtn/revision/info/fbab3d52df9aff739254b5dcefec110084139ac8

Modified files:
        COPYRIGHT libpurple/protocols/oscar/oscar.c

ChangeLog: 

Backport the buddy list error for ICQ/AIM, since the servers seem to be having
problems on a regular basis.

*** Plucked rev e1b1e80d999e393a80f201a484ef61289c258fbe (markdoliner at 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.


-------------- next part --------------
============================================================
--- COPYRIGHT	17e91672a8b2aec69ee57fb9c8acaaa63ad4a5b9
+++ COPYRIGHT	b0991a42923769684e70964da87b17174a283e4e
@@ -432,6 +432,7 @@ Greg Taeger
 Amir Szekely (kichik)
 Robert T.
 Greg Taeger
+Rob Taft
 Peter Tang
 Brian Tarricone
 Peter Teichman
============================================================
--- libpurple/protocols/oscar/oscar.c	21b76f1d4cf14275ad190156b09d271b4b94c6c9
+++ libpurple/protocols/oscar/oscar.c	56f5cf0d31fa40cfc20cfbdcd6bf6f9ad47a0a3c
@@ -5029,11 +5029,16 @@ static int purple_ssi_parseerr(OscarData
 	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;
 	}