Changeset cf02dd6 for libfaim/email.c

Timestamp:

Dec 10, 2003, 3:20:45 PM (20 years ago)

Author:

James M. Kretchmar <kretch@mit.edu>

Branches:

master, barnowl_perlaim, debian, owl, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

b1fe407

Parents:

8c46404

Message:

*** empty log message ***

File:

• libfaim/email.c (modified) (5 diffs)

libfaim/email.c

@@ -19 +19 @@
  * @return Return 0 if no errors, otherwise return the error number.
  */
-faim_export int aim_email_sendcookies(aim_session_t *sess, aim_conn_t *conn)
-{
+faim_export int aim_email_sendcookies(aim_session_t *sess)
+{
+        aim_conn_t *conn;
         aim_frame_t *fr;
         aim_snacid_t snacid;
 
-        if (!sess || !conn)
+        if (!sess || !(conn = aim_conn_findbygroup(sess, AIM_CB_FAM_EML)))
                 return -EINVAL;
 
@@ -81 +82 @@
         fu8_t *cookie8, *cookie16;
         int tmp, havenewmail = 0; /* Used to tell the client we have _new_ mail */
+
+        char *alertitle = NULL, *alerturl = NULL;
 
         cookie8 = aimbs_getraw(bs, 8); /* Possibly the code used to log you in to mail? */
@@ -105 +108 @@
         new->cookie16 = cookie16;
 
-        tlvlist = aim_readtlvchain_num(bs, aimbs_get16(bs));
-
-        tmp = aim_gettlv16(tlvlist, 0x0080, 1);
+        tlvlist = aim_tlvlist_readnum(bs, aimbs_get16(bs));
+
+        tmp = aim_tlv_get16(tlvlist, 0x0080, 1);
         if (tmp) {
                 if (new->nummsgs < tmp)
@@ -118 +121 @@
                 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);
+
+        alertitle = aim_tlv_getstr(tlvlist, 0x0005, 1);
+        alerturl  = aim_tlv_getstr(tlvlist, 0x000d, 1);
+        
         if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype)))
-                ret = userfunc(sess, rx, new, havenewmail);
-
-        aim_freetlvchain(&tlvlist);
+                ret = userfunc(sess, rx, new, havenewmail, alertitle, (alerturl ? alerturl + 2 : NULL));
+
+        aim_tlvlist_free(&tlvlist);
+
+        free(alertitle);
+        free(alerturl);
 
         return ret;
@@ -141 +150 @@
  * @return Return 0 if no errors, otherwise return the error number.
  */
-faim_export int aim_email_activate(aim_session_t *sess, aim_conn_t *conn)
-{
+faim_export int aim_email_activate(aim_session_t *sess)
+{
+        aim_conn_t *conn;
         aim_frame_t *fr;
         aim_snacid_t snacid;
 
-        if (!sess || !conn)
+        if (!sess || !(conn = aim_conn_findbygroup(sess, AIM_CB_FAM_EML)))
                 return -EINVAL;