# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1236565191 0
# Node ID 53b04369fb10c716234a8ec7cc6cd8c44c95420a
# Parent  7114d475a9e75757b49a8091991934dbeeb4d6ff
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.

diff -r 7114d475a9e7 -r 53b04369fb10 COPYRIGHT
--- 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
diff -r 7114d475a9e7 -r 53b04369fb10 libpurple/protocols/oscar/oscar.c
--- 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;
 	}