Return if we couldn't get our buddylist rather than trying to

Fri, 26 Oct 2007 00:13:18 +0000

author
Mark Doliner <markdoliner@pidgin.im>
date
Fri, 26 Oct 2007 00:13:18 +0000
changeset 21090
b57a26b1a9b1
parent 21089
0a9f0d8f2cec
child 21091
07fe1a99c47b
child 21093
b12665f5ca27

Return if we couldn't get our buddylist rather than trying to
activate it, which apparently triggers the error again.

libpurple/protocols/oscar/oscar.c file | annotate | diff | comparison | revisions
--- a/libpurple/protocols/oscar/oscar.c	Thu Oct 25 23:28:01 2007 +0000
+++ b/libpurple/protocols/oscar/oscar.c	Fri Oct 26 00:13:18 2007 +0000
@@ -4766,10 +4766,11 @@
 
 	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 hours."));
+						  _("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(30000, purple_ssi_rerequestdata, od);
+		return 1;
 	}
 
 	oscar_set_extendedstatus(gc);

mercurial