diff src/protocols/oscar/rxhandlers.c @ 7806:c86f075b269a

[gaim-migrate @ 8453] I modified some of the libfaim connection stuff. I dunno, it seems cleaner this way. I like to be comfortable with what's going on. It's possible that FT and DC won't work now (although, they should), but I'll get to making them suck less pretty soon. Also upgraded the Doxyfile to 1 version newer. It mostly just moved some things around, but also removed the CGI_BLEH lines from the end. committer: Tailor Script <[e-mail]>

--- a/src/protocols/oscar/rxhandlers.c	Mon Dec 08 04:58:07 2003 +0000
+++ b/src/protocols/oscar/rxhandlers.c	Mon Dec 08 05:41:04 2003 +0000
@@ -370,21 +370,21 @@
 	maxf = sizeof(literals) / sizeof(literals[0]);
 	maxs = sizeof(literals[0]) / sizeof(literals[0][0]);
 
-	if (frame->hdr.flap.type == 0x02) {
+	if (frame->hdr.flap.channel == 0x02) {
 
 		family = aimbs_get16(&frame->data);
 		subtype = aimbs_get16(&frame->data);
 		
 		if ((family < maxf) && (subtype+1 < maxs) && (literals[family][subtype] != NULL))
-			faimdprintf(sess, 0, "bleck: channel %s: null handler for %04x/%04x (%s)\n", channels[frame->hdr.flap.type], family, subtype, literals[family][subtype+1]);
+			faimdprintf(sess, 0, "bleck: channel %s: null handler for %04x/%04x (%s)\n", channels[frame->hdr.flap.channel], family, subtype, literals[family][subtype+1]);
 		else
-			faimdprintf(sess, 0, "bleck: channel %s: null handler for %04x/%04x (no literal)\n", channels[frame->hdr.flap.type], family, subtype);
+			faimdprintf(sess, 0, "bleck: channel %s: null handler for %04x/%04x (no literal)\n", channels[frame->hdr.flap.channel], family, subtype);
 	} else {
 
-		if (frame->hdr.flap.type <= maxchannels)
-			faimdprintf(sess, 0, "bleck: channel %s (0x%02x)\n", channels[frame->hdr.flap.type], frame->hdr.flap.type);
+		if (frame->hdr.flap.channel <= maxchannels)
+			faimdprintf(sess, 0, "bleck: channel %s (0x%02x)\n", channels[frame->hdr.flap.channel], frame->hdr.flap.channel);
 		else
-			faimdprintf(sess, 0, "bleck: unknown channel 0x%02x\n", frame->hdr.flap.type);
+			faimdprintf(sess, 0, "bleck: unknown channel 0x%02x\n", frame->hdr.flap.channel);
 
 	}
 		
@@ -517,19 +517,19 @@
 			continue;
 
 		if (cur->hdrtype == AIM_FRAMETYPE_FLAP) {
-			if (cur->hdr.flap.type == 0x01) {
+			if (cur->hdr.flap.channel == 0x01) {
 				cur->handled = aim_callhandler_noparam(sess, cur->conn, AIM_CB_FAM_SPECIAL, AIM_CB_SPECIAL_FLAPVER, cur); /* XXX use consumenonsnac */
 				continue;
 
-			} else if (cur->hdr.flap.type == 0x02) {
+			} else if (cur->hdr.flap.channel == 0x02) {
 				if ((cur->handled = consumesnac(sess, cur)))
 					continue;
 
-			} else if (cur->hdr.flap.type == 0x04) {
+			} else if (cur->hdr.flap.channel == 0x04) {
 				cur->handled = negchan_middle(sess, cur);
 				continue;
 
-			} else if (cur->hdr.flap.type == 0x05) {
+			} else if (cur->hdr.flap.channel == 0x05) {
 
 			}