Mercurial > pidgin
comparison 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 <tailor@pidgin.im>
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Tue, 15 Jun 2004 02:37:27 +0000 |
parents | 3f6d795d67d5 |
children | b3bda982996b |
comparison
equal
deleted
inserted
replaced
9284:fe0291162312 | 9285:7a8aa87164ae |
---|---|
139 | 139 |
140 return 1; | 140 return 1; |
141 } | 141 } |
142 | 142 |
143 /* 207 - MSG_CLIENT_ADD_HOTLIST */ | 143 /* 207 - MSG_CLIENT_ADD_HOTLIST */ |
144 static void nap_add_buddy(GaimConnection *gc, const char *name, GaimGroup *group) | 144 static void nap_add_buddy(GaimConnection *gc, GaimBuddy *buddy, GaimGroup *group) |
145 { | 145 { |
146 nap_write_packet(gc, 207, "%s", name); | 146 nap_write_packet(gc, 207, "%s", buddy->name); |
147 } | 147 } |
148 | 148 |
149 /* 208 - MSG_CLIENT_ADD_HOTLIST_SEQ */ | 149 /* 208 - MSG_CLIENT_ADD_HOTLIST_SEQ */ |
150 static void nap_add_buddies(GaimConnection *gc, GList *buddies) | 150 static void nap_add_buddies(GaimConnection *gc, GList *buddies, GList *groups) |
151 { | 151 { |
152 while (buddies) { | 152 while (buddies) { |
153 nap_write_packet(gc, 208, "%s", (char *)buddies->data); | 153 GaimBuddy *buddy = buddies->data; |
154 buddies = buddies -> next; | 154 nap_write_packet(gc, 208, "%s", buddy->name); |
155 buddies = buddies->next; | |
155 } | 156 } |
156 } | 157 } |
157 | 158 |
158 /* 303 - MSG_CLIENT_REMOVE_HOTLIST */ | 159 /* 303 - MSG_CLIENT_REMOVE_HOTLIST */ |
159 static void nap_remove_buddy(GaimConnection *gc, const char *name, const char *group) | 160 static void nap_remove_buddy(GaimConnection *gc, GaimBuddy *buddy, GaimGroup *group) |
160 { | 161 { |
161 nap_write_packet(gc, 303, "%s", name); | 162 nap_write_packet(gc, 303, "%s", buddy->name); |
162 } | 163 } |
163 | 164 |
164 /* 400 - MSG_CLIENT_JOIN */ | 165 /* 400 - MSG_CLIENT_JOIN */ |
165 static void nap_join_chat(GaimConnection *gc, GHashTable *data) | 166 static void nap_join_chat(GaimConnection *gc, GHashTable *data) |
166 { | 167 { |