Changeset 9c8ae50 for protocols/oscar/oscar.c

Timestamp:

2005-11-19T15:24:46Z (18 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

cf13671

Parents:

cc9079e (diff), 2cdd8ce (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge Wilmer

File:

• protocols/oscar/oscar.c (modified) (6 diffs)

protocols/oscar/oscar.c

@@ -221 +221 @@
 static int gaim_ssi_parselist    (aim_session_t *, aim_frame_t *, ...);
 static int gaim_ssi_parseack     (aim_session_t *, aim_frame_t *, ...);
-
+static int gaim_parsemtn         (aim_session_t *, aim_frame_t *, ...);
 static int gaim_icqinfo          (aim_session_t *, aim_frame_t *, ...);
 static int gaim_parseaiminfo     (aim_session_t *, aim_frame_t *, ...);
@@ -556 +556 @@
         aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_SSI, AIM_CB_SSI_SRVACK, gaim_ssi_parseack, 0);
         aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_LOC, AIM_CB_LOC_USERINFO, gaim_parseaiminfo, 0);
+        aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_MSG, AIM_CB_MSG_MTN, gaim_parsemtn, 0);
 
         ((struct oscar_data *)gc->proto_data)->conn = bosconn;
@@ -1676 +1677 @@
 
         /* Maybe senderwarn and recverwarn should be user preferences... */
+        params->flags = 0x0000000b;
         params->maxmsglen = 8000;
         params->minmsginterval = 0;
@@ -2433 +2435 @@
 }
 
+int gaim_parsemtn(aim_session_t *sess, aim_frame_t *fr, ...)
+{
+        struct gaim_connection * gc = sess->aux_data;
+        va_list ap;
+        guint16 type1, type2;
+        char * sn;
+
+        va_start(ap, fr);
+        type1 = va_arg(ap, int);
+        sn = va_arg(ap, char*);
+        type2 = va_arg(ap, int);
+        va_end(ap);
+
+        if(type2 == 0x0001 || type2 == 0x0002)
+                serv_got_typing(gc, sn, 0);
+
+        return 1;
+}
+
 static char *oscar_get_status_string( struct gaim_connection *gc, int number )
 {
@@ -2459 +2480 @@
                 return( "Away" );
         }
+}
+
+int oscar_send_typing(struct gaim_connection *gc, char * who, int typing)
+{
+        struct oscar_data *od = gc->proto_data;
+        return( aim_im_sendmtn(od->sess, 1, who, typing ? 0x0002 : 0x0000) );
 }
 
@@ -2482 +2509 @@
         ret->cmp_buddynames = aim_sncmp;
         ret->get_status_string = oscar_get_status_string;
+        ret->send_typing = oscar_send_typing;
 
         register_protocol(ret);