Mercurial > pidgin

changeset 16807:f7466b0379e8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Mark Doliner <mark@kingant.net>
date Thu, 03 May 2007 08:34:53 +0000
parents 10f175539cfe
children 422bcef3154c
files libpurple/protocols/oscar/family_feedbag.c
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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;
 					}