# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1178181293 0
# Node ID f7466b0379e86631910f0fa64ff6f1496ba7506e
# Parent  10f175539cfe5d26faf722acc9d20ac418351e46
This is ugly and probably not a "correct" fix, but it seems to fix
the "could not add buddy 1" problem for Kevin's account.  Kevin,
I'm done fiddling with your ICQ account now, thanks immensely for
letting me use it!

To anyone: Let me know if you see the problem again after this
checkin.

diff -r 10f175539cfe -r f7466b0379e8 libpurple/protocols/oscar/family_feedbag.c
--- a/libpurple/protocols/oscar/family_feedbag.c	Thu May 03 07:55:32 2007 +0000
+++ b/libpurple/protocols/oscar/family_feedbag.c	Thu May 03 08:34:53 2007 +0000
@@ -139,13 +139,13 @@
 					}
 			} while (exists);
 		}
-	} else if (new->gid == 0x0000) {
+	} else if (type == AIM_SSI_TYPE_ICONINFO) {
 		if (new->bid == 0xFFFF) {
 			do {
 				new->bid += 0x0001;
 				exists = FALSE;
 				for (cur = *list; cur != NULL; cur = cur->next)
-					if (((cur->bid == new->bid) && (cur->gid == new->gid)) || (cur->gid == new->bid)) {
+					if ((cur->bid >= new->bid) || (cur->gid >= new->bid)) {
 						exists = TRUE;
 						break;
 					}