# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1088115742 0
# Node ID f1fd56e835675be846bdf62ff746d4468fd671fc
# Parent  8c300181122a446481f194a64c0e8497f24a9d57
[gaim-migrate @ 10189]
Felipe Contreras fixed some bugs with our changes to the add_buddies
prpl thingy.

committer: Tailor Script <tailor@pidgin.im>

diff -r 8c300181122a -r f1fd56e83567 src/protocols/oscar/oscar.c
--- a/src/protocols/oscar/oscar.c	Thu Jun 24 22:09:22 2004 +0000
+++ b/src/protocols/oscar/oscar.c	Thu Jun 24 22:22:22 2004 +0000
@@ -5547,11 +5547,12 @@
 	int n=0;
 
 	while (buddies) {
+		GaimBuddy *buddy = buddies->data;
 		if (n > MSG_LEN - 18) {
 			aim_buddylist_set(od->sess, od->conn, buf);
 			n = 0;
 		}
-		n += g_snprintf(buf + n, sizeof(buf) - n, "%s&", (const char *)buddies->data);
+		n += g_snprintf(buf + n, sizeof(buf) - n, "%s&", buddy->name);
 		buddies = buddies->next;
 	}
 	aim_buddylist_set(od->sess, od->conn, buf);
diff -r 8c300181122a -r f1fd56e83567 src/server.c
--- a/src/server.c	Thu Jun 24 22:09:22 2004 +0000
+++ b/src/server.c	Thu Jun 24 22:22:22 2004 +0000
@@ -413,7 +413,7 @@
 		/* Make a list of what the groups each buddy is in */
 		for (cur = buddies; cur != NULL; cur = cur->next) {
 			GaimBlistNode *node = cur->data;
-			groups = g_list_append(groups, node->parent);
+			groups = g_list_append(groups, node->parent->parent);
 		}
 
 		if (prpl_info->add_buddies)
@@ -580,7 +580,7 @@
 			/* Make a list of what the groups each buddy is in */
 			for (cur = moved_buddies; cur != NULL; cur = cur->next) {
 				GaimBlistNode *node = cur->data;
-				groups = g_list_append(groups, node->parent);
+				groups = g_list_append(groups, node->parent->parent);
 			}
 
 			serv_remove_buddies(gc, moved_buddies, groups);