# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1042329765 0
# Node ID 22ebfa41525a2b4faae514735d0602767f5937de
# Parent  bc125db09cd0a4aa47c7cad0e4f6a31a88981481
[gaim-migrate @ 4557]
This fixes a bug when moving buddies around within a group.

committer: Tailor Script <tailor@pidgin.im>

diff -r bc125db09cd0 -r 22ebfa41525a src/protocols/oscar/oscar.c
--- a/src/protocols/oscar/oscar.c	Sat Jan 11 22:22:50 2003 +0000
+++ b/src/protocols/oscar/oscar.c	Sun Jan 12 00:02:45 2003 +0000
@@ -4032,7 +4032,7 @@
 #ifndef NOSSI
 static void oscar_move_buddy(struct gaim_connection *gc, const char *name, const char *old_group, const char *new_group) {
 	struct oscar_data *od = (struct oscar_data *)gc->proto_data;
-	if (od->sess->ssi.received_data) {
+	if (od->sess->ssi.received_data && strcmp(old_group, new_group)) {
 		debug_printf("ssi: moving buddy %s from group %s to group %s\n", name, old_group, new_group);
 		aim_ssi_movebuddy(od->sess, od->conn, old_group, new_group, name);
 	}
diff -r bc125db09cd0 -r 22ebfa41525a src/protocols/oscar/ssi.c
--- a/src/protocols/oscar/ssi.c	Sat Jan 11 22:22:50 2003 +0000
+++ b/src/protocols/oscar/ssi.c	Sun Jan 12 00:02:45 2003 +0000
@@ -1134,10 +1134,6 @@
 	char *name;
 	aim_tlvlist_t *data;
 
-	if (snac->flags & 0x0001) {
-		/* XXX - Free all ssi data? */
-	}
-
 	fmtver = aimbs_get8(bs); /* Version of ssi data.  Should be 0x00 */
 	sess->ssi.numitems += aimbs_get16(bs); /* # of items in this SSI SNAC */
 
@@ -1159,7 +1155,7 @@
 	/* Read in the timestamp */
 	sess->ssi.timestamp = aimbs_get32(bs);
 
-	if (!(snac->flags & 0x0001)) {
+	if (snac->flags ^ 0x0001) {
 		/* Make a copy of the list */
 		struct aim_ssi_item *cur;
 		for (cur=sess->ssi.official; cur; cur=cur->next)