Changes in protocols/oscar/oscar.c [3e1de87:9cb9868]

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 *, ...);
@@ -558 +558 @@
         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;
@@ -1679 +1678 @@
 
         /* Maybe senderwarn and recverwarn should be user preferences... */
-        params->flags = 0x0000000b;
         params->maxmsglen = 8000;
         params->minmsginterval = 0;
@@ -2437 +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 )
 {
@@ -2482 +2461 @@
                 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) );
 }
 
@@ -2512 +2485 @@
         ret->get_status_string = oscar_get_status_string;
 
-        ret->send_typing = oscar_send_typing;
-
         my_protocol = ret;
 }