diff src/protocols/oscar/family_popup.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_popup.c	Fri Apr 07 01:05:48 2006 +0000
+++ b/src/protocols/oscar/family_popup.c	Fri Apr 07 05:10:56 2006 +0000
@@ -33,7 +33,8 @@
  * The message is probably HTML.
  *
  */
-static int parsepopup(OscarSession *sess, aim_module_t *mod, FlapFrame *rx, aim_modsnac_t *snac, ByteStream *bs)
+static int
+parsepopup(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame *frame, aim_modsnac_t *snac, ByteStream *bs)
 {
 	aim_rxcallback_t userfunc;
 	aim_tlvlist_t *tl;
@@ -49,8 +50,8 @@
 	height = aim_tlv_get16(tl, 0x0004, 1);
 	delay = aim_tlv_get16(tl, 0x0005, 1);
 
-	if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype)))
-		ret = userfunc(sess, rx, msg, url, width, height, delay);
+	if ((userfunc = aim_callhandler(od, snac->family, snac->subtype)))
+		ret = userfunc(od, conn, frame, msg, url, width, height, delay);
 
 	aim_tlvlist_free(&tl);
 	free(msg);
@@ -59,18 +60,18 @@
 	return ret;
 }
 
-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 *frame, aim_modsnac_t *snac, ByteStream *bs)
 {
-
 	if (snac->subtype == 0x0002)
-		return parsepopup(sess, mod, rx, snac, bs);
+		return parsepopup(od, conn, mod, frame, snac, bs);
 
 	return 0;
 }
 
-faim_internal int popups_modfirst(OscarSession *sess, aim_module_t *mod)
+int
+popups_modfirst(OscarData *od, aim_module_t *mod)
 {
-
 	mod->family = 0x0008;
 	mod->version = 0x0001;
 	mod->toolid = 0x0104;