pidgin: e1b1e80d: Only show the oscar error "we couldn't f...

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: e1b1e80d999e393a80f201a484ef61289c258fbe
Ancestor: a840b7a77c7e395db5e7877fab90763d91f70b3a
Author: markdoliner at pidgin.im
Date: 2009-03-09T02:19:51
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/e1b1e80d999e393a80f201a484ef61289c258fbe

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

ChangeLog: 

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	434440ee17f2be25f03fad275610515b45eb06c4
+++ COPYRIGHT	7403db48da9775c3ef5a597a9cc2889859fbb885
@@ -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	0d45664f454a1e315f72c9317ff2bf7536651066
+++ libpurple/protocols/oscar/oscar.c	704715710ea0f3812d16d7d33f099de2f1140684
@@ -5030,10 +5030,15 @@ 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);
+		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;
 	}