diff src/protocols/oscar/family_advert.c @ 13592:6519aeb66b31

[gaim-migrate @ 15978] Holy cow this is crazy. 34 files changed, 5760 insertions(+), 8517 deletions(-) * Non-blocking I/O for all of oscar. That includes normal FLAP connections as well as file transfers and direct IM. * Kick-ass file transfer and direct IM. Either party can request the connection. Gaim will try both the "public" IP and the "client" IP. It'll fall back to transferring through a proxy if that fails. Should be relatively few memleaks (I didn't have a lot of confidence in the non-memleakiness of the old code). And the code is reasonably generic, so it shouldn't be too much work to add voice chat. This might still be a LITTLE buggy, but it shouldn't be too bad. If anything, file transfer will be more buggy than direct IM. And sending a file will be more buggy than receiving a file. Bug reports with a series of steps to reproduce are welcome. * I merged OscarData and aim_session_t * Somewhere between 50 and 100 hours of work. committer: Tailor Script <[e-mail]>

--- a/src/protocols/oscar/family_advert.c	Fri Apr 07 01:05:48 2006 +0000
+++ b/src/protocols/oscar/family_advert.c	Fri Apr 07 05:10:56 2006 +0000
@@ -25,17 +25,17 @@
 
 #include "oscar.h"
 
-faim_export int aim_ads_requestads(OscarSession *sess, OscarConnection *conn)
+int aim_ads_requestads(OscarData *od, FlapConnection *conn)
 {
-	return aim_genericreq_n(sess, conn, 0x0005, 0x0002);
+	return aim_genericreq_n(od, conn, 0x0005, 0x0002);
 }
 
-static int snachandler(OscarSession *sess, aim_module_t *mod, FlapFrame *rx, aim_modsnac_t *snac, ByteStream *bs)
+static int snachandler(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame *rx, aim_modsnac_t *snac, ByteStream *bs)
 {
 	return 0;
 }
 
-faim_internal int adverts_modfirst(OscarSession *sess, aim_module_t *mod)
+int adverts_modfirst(OscarData *od, aim_module_t *mod)
 {
 
 	mod->family = 0x0005;