diff src/protocols/oscar/email.c @ 7167:6d3d8f11e765

[gaim-migrate @ 7734] I, uh, renamed some functions in libfaim. Functions that every file uses. A lot. So it looks like I did a lot of work, but I didn't. Yeah, in a typical work I actually only do about 15 minutes of real work. committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Sun, 05 Oct 2003 23:50:40 +0000
parents 237ad253dd34
children ad243bc63184
line wrap: on
line diff
--- a/src/protocols/oscar/email.c	Sun Oct 05 22:41:29 2003 +0000
+++ b/src/protocols/oscar/email.c	Sun Oct 05 23:50:40 2003 +0000
@@ -104,9 +104,9 @@
 	new->cookie8 = cookie8;
 	new->cookie16 = cookie16;
 
-	tlvlist = aim_readtlvchain_num(bs, aimbs_get16(bs));
+	tlvlist = aim_tlvlist_readnum(bs, aimbs_get16(bs));
 
-	tmp = aim_gettlv16(tlvlist, 0x0080, 1);
+	tmp = aim_tlv_get16(tlvlist, 0x0080, 1);
 	if (tmp) {
 		if (new->nummsgs < tmp)
 			havenewmail = 1;
@@ -117,18 +117,18 @@
 		havenewmail = 1;
 		new->nummsgs++; /* We know we have at least 1 new email */
 	}
-	new->url = aim_gettlv_str(tlvlist, 0x0007, 1);
-	if (!(new->unread = aim_gettlv8(tlvlist, 0x0081, 1))) {
+	new->url = aim_tlv_getstr(tlvlist, 0x0007, 1);
+	if (!(new->unread = aim_tlv_get8(tlvlist, 0x0081, 1))) {
 		havenewmail = 0;
 		new->nummsgs = 0;
 	}
-	new->domain = aim_gettlv_str(tlvlist, 0x0082, 1);
-	new->flag = aim_gettlv16(tlvlist, 0x0084, 1);
+	new->domain = aim_tlv_getstr(tlvlist, 0x0082, 1);
+	new->flag = aim_tlv_get16(tlvlist, 0x0084, 1);
 
 	if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype)))
 		ret = userfunc(sess, rx, new, havenewmail);
 
-	aim_freetlvchain(&tlvlist);
+	aim_tlvlist_free(&tlvlist);
 
 	return ret;
 }