diff src/protocols/icq/gaim_icq.c @ 9285:7a8aa87164ae

[gaim-migrate @ 10088] Ok I'm done. This started out as shx's patch to make add/remove buddy/buddies take GaimBuddy and GaimGroup's in various places. I think his diff was like 2000 lines and mine is like 5000. I tried to clean up blist.c a bit and make it more uniform. There are some more g_return_if_fail() checks. Removed some code that was deprecated--it's probably been long enough. Removed some #include <multi.h>'s. Make blist.xml saving happen on a timer, like prefs.xml and accounts.xml. Sorry if this doesn't merge cleanly with whatever you're doing. People should really test this a lot. committer: Tailor Script <[e-mail]>

--- a/src/protocols/icq/gaim_icq.c	Tue Jun 15 01:17:16 2004 +0000
+++ b/src/protocols/icq/gaim_icq.c	Tue Jun 15 02:37:27 2004 +0000
@@ -376,18 +376,19 @@
 	icq_KeepAlive(id->link);
 }
 
-static void icq_add_buddy(struct gaim_connection *gc, const char *who) {
+static void icq_add_buddy(struct gaim_connection *gc, GaimBuddy *buddy) {
 	struct icq_data *id = (struct icq_data *)gc->proto_data;
-	icq_ContactAdd(id->link, atol(who));
-	icq_ContactSetVis(id->link, atol(who), TRUE);
+	icq_ContactAdd(id->link, atol(buddy->name));
+	icq_ContactSetVis(id->link, atol(buddy->name), TRUE);
 }
 
-static void icq_add_buddies(struct gaim_connection *gc, GList *whos) {
+static void icq_add_buddies(struct gaim_connection *gc, GList *buddies) {
 	struct icq_data *id = (struct icq_data *)gc->proto_data;
-	while (whos) {
-		icq_ContactAdd(id->link, atol(whos->data));
-		icq_ContactSetVis(id->link, atol(whos->data), TRUE);
-		whos = whos->next;
+	while (buddies) {
+		Gaimbuddy *buddy = buddies->data;
+		icq_ContactAdd(id->link, atol(buddy->name));
+		icq_ContactSetVis(id->link, atol(buddy->name), TRUE);
+		buddies = buddies->next;
 	}
 }