im.pidgin.pidgin: 19bec5deed1655967fe013afd29ff92014aa1749

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: 19bec5deed1655967fe013afd29ff92014aa1749
Ancestor: ed57ec421d050f904b97089466de8ae146506957
Author: markdoliner at pidgin.im
Date: 2007-10-26T00:13:18
Branch: im.pidgin.pidgin

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

ChangeLog: 

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

-------------- next part --------------
============================================================
--- libpurple/protocols/oscar/oscar.c	e160ab23c08622f9d2e91d31e61cecf581ed58cd
+++ libpurple/protocols/oscar/oscar.c	ae6804b2032800ac1d2a97a11770dc3988b54f66
@@ -4766,10 +4766,11 @@ static int purple_ssi_parseerr(OscarData
 
 	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);