diff src/protocols/napster/napster.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/napster/napster.c	Tue Jun 15 01:17:16 2004 +0000
+++ b/src/protocols/napster/napster.c	Tue Jun 15 02:37:27 2004 +0000
@@ -141,24 +141,25 @@
 }
 
 /* 207 - MSG_CLIENT_ADD_HOTLIST */
-static void nap_add_buddy(GaimConnection *gc, const char *name, GaimGroup *group)
+static void nap_add_buddy(GaimConnection *gc, GaimBuddy *buddy, GaimGroup *group)
 {
-	nap_write_packet(gc, 207, "%s", name);
+	nap_write_packet(gc, 207, "%s", buddy->name);
 }
 
 /* 208 - MSG_CLIENT_ADD_HOTLIST_SEQ */
-static void nap_add_buddies(GaimConnection *gc, GList *buddies)
+static void nap_add_buddies(GaimConnection *gc, GList *buddies, GList *groups)
 {
 	while (buddies) {
-		nap_write_packet(gc, 208, "%s", (char *)buddies->data);
-		buddies = buddies -> next;
+		GaimBuddy *buddy = buddies->data;
+		nap_write_packet(gc, 208, "%s", buddy->name);
+		buddies = buddies->next;
 	}
 }
 
 /* 303 - MSG_CLIENT_REMOVE_HOTLIST */
-static void nap_remove_buddy(GaimConnection *gc, const char *name, const char *group)
+static void nap_remove_buddy(GaimConnection *gc, GaimBuddy *buddy, GaimGroup *group)
 {
-	nap_write_packet(gc, 303, "%s", name);
+	nap_write_packet(gc, 303, "%s", buddy->name);
 }
 
 /* 400 - MSG_CLIENT_JOIN */