Changeset 85d7b85 for protocols/yahoo/yahoo.c

Timestamp:

2008-04-02T14:22:57Z (16 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

f9dbc99

Parents:

875ad42 (diff), dd34575 (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 trunk.

File:

• protocols/yahoo/yahoo.c (modified) (32 diffs)

protocols/yahoo/yahoo.c

@@ -58 +58 @@
 {
         char *name;
-        struct conversation *c;
+        struct groupchat *c;
         int yid;
         YList *members;
-        struct gaim_connection *gc;
+        struct im_connection *ic;
 };
 
@@ -67 +67 @@
 static int byahoo_chat_id = 0;
 
-static char *byahoo_strip( char *in )
+static char *byahoo_strip( const char *in )
 {
         int len;
         
-        /* This should get rid of HTML tags at the beginning of the string. */
+        /* This should get rid of the markup noise at the beginning of the string. */
         while( *in )
         {
@@ -86 +86 @@
                 else if( strncmp( in, "\e[", 2 ) == 0 )
                 {
-                        char *s;
+                        const char *s;
                         
                         for( s = in + 2; *s && *s != 'm'; s ++ );
@@ -101 +101 @@
         }
         
-        /* This is supposed to get rid of the closing HTML tags at the end of the line. */
+        /* This is supposed to get rid of the noise at the end of the line. */
         len = strlen( in );
-        while( len > 0 && in[len-1] == '>' )
+        while( len > 0 && ( in[len-1] == '>' || in[len-1] == 'm' ) )
         {
                 int blen = len;
-                
-                len --;
-                while( len > 0 && ( in[len] != '<' || in[len+1] != '/' ) )
+                const char *search;
+                
+                if( in[len-1] == '>' )
+                        search = "</";
+                else
+                        search = "\e[";
+                
+                len -= 3;
+                while( len > 0 && strncmp( in + len, search, 2 ) != 0 )
                         len --;
                 
-                if( len == 0 && ( in[len] != '<' || in[len+1] != '/' ) )
+                if( len <= 0 && strncmp( in, search, 2 ) != 0 )
                 {
                         len = blen;
@@ -121 +127 @@
 }
 
-static void byahoo_login( struct aim_user *user )
-{
-        struct gaim_connection *gc = new_gaim_conn( user );
-        struct byahoo_data *yd = gc->proto_data = g_new0( struct byahoo_data, 1 );
+static void byahoo_init( account_t *acc )
+{
+        set_add( &acc->set, "mail_notifications", "false", set_eval_bool, acc );
+}
+
+static void byahoo_login( account_t *acc )
+{
+        struct im_connection *ic = imcb_new( acc );
+        struct byahoo_data *yd = ic->proto_data = g_new0( struct byahoo_data, 1 );
         
         yd->logged_in = FALSE;
         yd->current_status = YAHOO_STATUS_AVAILABLE;
         
-        set_login_progress( gc, 1, "Connecting" );
-        yd->y2_id = yahoo_init( user->username, user->password );
+        imcb_log( ic, "Connecting" );
+        yd->y2_id = yahoo_init( acc->user, acc->pass );
         yahoo_login( yd->y2_id, yd->current_status );
 }
 
-static void byahoo_close( struct gaim_connection *gc )
-{
-        struct byahoo_data *yd = (struct byahoo_data *) gc->proto_data;
+static void byahoo_logout( struct im_connection *ic )
+{
+        struct byahoo_data *yd = (struct byahoo_data *) ic->proto_data;
         GSList *l;
         
-        while( gc->conversations )
-                serv_got_chat_left( gc, gc->conversations->id );
+        while( ic->groupchats )
+                imcb_chat_free( ic->groupchats );
         
         for( l = yd->buddygroups; l; l = l->next )
@@ -160 +171 @@
 }
 
-static void byahoo_get_info(struct gaim_connection *gc, char *who) 
+static void byahoo_get_info(struct im_connection *ic, char *who) 
 {
         /* Just make an URL and let the user fetch the info */
-        serv_got_crap(gc, "%s\n%s: %s%s", _("User Info"), 
+        imcb_log(ic, "%s\n%s: %s%s", _("User Info"), 
                         _("For now, fetch yourself"), yahoo_get_profile_url(),
                         who);
 }
 
-static int byahoo_send_im( struct gaim_connection *gc, char *who, char *what, int len, int flags )
-{
-        struct byahoo_data *yd = gc->proto_data;
-        
-        yahoo_send_im( yd->y2_id, NULL, who, what, 1 );
+static int byahoo_buddy_msg( struct im_connection *ic, char *who, char *what, int flags )
+{
+        struct byahoo_data *yd = ic->proto_data;
+        
+        yahoo_send_im( yd->y2_id, NULL, who, what, 1, 0 );
         
         return 1;
 }
 
-static int byahoo_send_typing( struct gaim_connection *gc, char *who, int typing )
-{
-        struct byahoo_data *yd = gc->proto_data;
-        
-        yahoo_send_typing( yd->y2_id, NULL, who, typing );
+static int byahoo_send_typing( struct im_connection *ic, char *who, int typing )
+{
+        struct byahoo_data *yd = ic->proto_data;
+        
+        yahoo_send_typing( yd->y2_id, NULL, who, ( typing & OPT_TYPING ) != 0 );
         
         return 1;
 }
 
-static void byahoo_set_away( struct gaim_connection *gc, char *state, char *msg )
-{
-        struct byahoo_data *yd = (struct byahoo_data *) gc->proto_data;
-        
-        gc->away = NULL;
-        
-        if( msg )
+static void byahoo_set_away( struct im_connection *ic, char *state, char *msg )
+{
+        struct byahoo_data *yd = (struct byahoo_data *) ic->proto_data;
+        
+        ic->away = NULL;
+        
+        if( state && msg && g_strcasecmp( state, msg ) != 0 )
         {
                 yd->current_status = YAHOO_STATUS_CUSTOM;
-                gc->away = "";
-        }
-        if( state )
-        {
-                gc->away = "";
+                ic->away = "";
+        }
+        else if( state )
+        {
+                /* Set msg to NULL since (if it isn't NULL already) it's equal
+                   to state. msg must be empty if we want to use an existing
+                   away state. */
+                msg = NULL;
+                
+                ic->away = "";
                 if( g_strcasecmp( state, "Available" ) == 0 )
                 {
                         yd->current_status = YAHOO_STATUS_AVAILABLE;
-                        gc->away = NULL;
+                        ic->away = NULL;
                 }
                 else if( g_strcasecmp( state, "Be Right Back" ) == 0 )
@@ -229 +245 @@
                         yd->current_status = YAHOO_STATUS_AVAILABLE;
                         
-                        gc->away = NULL;
+                        ic->away = NULL;
                 }
         }
@@ -235 +251 @@
                 yd->current_status = YAHOO_STATUS_AVAILABLE;
         
-        if( yd->current_status == YAHOO_STATUS_INVISIBLE )
-                yahoo_set_away( yd->y2_id, yd->current_status, NULL, gc->away != NULL );
-        else
-                yahoo_set_away( yd->y2_id, yd->current_status, msg, gc->away != NULL );
-}
-
-static GList *byahoo_away_states( struct gaim_connection *gc )
+        yahoo_set_away( yd->y2_id, yd->current_status, msg, ic->away != NULL ? 2 : 0 );
+}
+
+static GList *byahoo_away_states( struct im_connection *ic )
 {
         GList *m = NULL;
@@ -261 +274 @@
 }
 
-static void byahoo_keepalive( struct gaim_connection *gc )
-{
-        struct byahoo_data *yd = gc->proto_data;
+static void byahoo_keepalive( struct im_connection *ic )
+{
+        struct byahoo_data *yd = ic->proto_data;
         
         yahoo_keepalive( yd->y2_id );
 }
 
-static void byahoo_add_buddy( struct gaim_connection *gc, char *who )
-{
-        struct byahoo_data *yd = (struct byahoo_data *) gc->proto_data;
-        
-        yahoo_add_buddy( yd->y2_id, who, BYAHOO_DEFAULT_GROUP );
-}
-
-static void byahoo_remove_buddy( struct gaim_connection *gc, char *who, char *group )
-{
-        struct byahoo_data *yd = (struct byahoo_data *) gc->proto_data;
+static void byahoo_add_buddy( struct im_connection *ic, char *who, char *group )
+{
+        struct byahoo_data *yd = (struct byahoo_data *) ic->proto_data;
+        
+        yahoo_add_buddy( yd->y2_id, who, group ? group : BYAHOO_DEFAULT_GROUP, NULL );
+}
+
+static void byahoo_remove_buddy( struct im_connection *ic, char *who, char *group )
+{
+        struct byahoo_data *yd = (struct byahoo_data *) ic->proto_data;
         GSList *bgl;
         
@@ -291 +304 @@
 }
 
-static char *byahoo_get_status_string( struct gaim_connection *gc, int stat )
-{
-        enum yahoo_status a = stat >> 1;
-        
-        switch (a)
-        {
-        case YAHOO_STATUS_BRB:
-                return "Be Right Back";
-        case YAHOO_STATUS_BUSY:
-                return "Busy";
-        case YAHOO_STATUS_NOTATHOME:
-                return "Not At Home";
-        case YAHOO_STATUS_NOTATDESK:
-                return "Not At Desk";
-        case YAHOO_STATUS_NOTINOFFICE:
-                return "Not In Office";
-        case YAHOO_STATUS_ONPHONE:
-                return "On Phone";
-        case YAHOO_STATUS_ONVACATION:
-                return "On Vacation";
-        case YAHOO_STATUS_OUTTOLUNCH:
-                return "Out To Lunch";
-        case YAHOO_STATUS_STEPPEDOUT:
-                return "Stepped Out";
-        case YAHOO_STATUS_INVISIBLE:
-                return "Invisible";
-        case YAHOO_STATUS_CUSTOM:
-                return "Away";
-        case YAHOO_STATUS_IDLE:
-                return "Idle";
-        case YAHOO_STATUS_OFFLINE:
-                return "Offline";
-        case YAHOO_STATUS_NOTIFY:
-                return "Notify";
-        default:
-                return "Away";
-        }
-}
-
-static int byahoo_chat_send( struct gaim_connection *gc, int id, char *message )
-{
-        struct byahoo_data *yd = (struct byahoo_data *) gc->proto_data;
-        struct conversation *c;
-        
-        for( c = gc->conversations; c && c->id != id; c = c->next );
-
+static void byahoo_chat_msg( struct groupchat *c, char *message, int flags )
+{
+        struct byahoo_data *yd = (struct byahoo_data *) c->ic->proto_data;
+        
         yahoo_conference_message( yd->y2_id, NULL, c->data, c->title, message, 1 );
-        
-        return( 0 );
-}
-
-static void byahoo_chat_invite( struct gaim_connection *gc, int id, char *msg, char *who )
-{
-        struct byahoo_data *yd = (struct byahoo_data *) gc->proto_data;
-        struct conversation *c;
-        
-        for( c = gc->conversations; c && c->id != id; c = c->next );
-        
-        yahoo_conference_invite( yd->y2_id, NULL, c->data, c->title, msg );
-}
-
-static void byahoo_chat_leave( struct gaim_connection *gc, int id )
-{
-        struct byahoo_data *yd = (struct byahoo_data *) gc->proto_data;
-        struct conversation *c;
-        
-        for( c = gc->conversations; c && c->id != id; c = c->next );
+}
+
+static void byahoo_chat_invite( struct groupchat *c, char *who, char *msg )
+{
+        struct byahoo_data *yd = (struct byahoo_data *) c->ic->proto_data;
+        
+        yahoo_conference_invite( yd->y2_id, NULL, c->data, c->title, msg ? msg : "" );
+}
+
+static void byahoo_chat_leave( struct groupchat *c )
+{
+        struct byahoo_data *yd = (struct byahoo_data *) c->ic->proto_data;
         
         yahoo_conference_logoff( yd->y2_id, NULL, c->data, c->title );
-        serv_got_chat_left( gc, c->id );
-}
-
-static int byahoo_chat_open( struct gaim_connection *gc, char *who )
-{
-        struct byahoo_data *yd = (struct byahoo_data *) gc->proto_data;
-        struct conversation *c;
+        imcb_chat_free( c );
+}
+
+static struct groupchat *byahoo_chat_with( struct im_connection *ic, char *who )
+{
+        struct byahoo_data *yd = (struct byahoo_data *) ic->proto_data;
+        struct groupchat *c;
         char *roomname;
         YList *members;
         
-        roomname = g_new0( char, strlen( gc->username ) + 16 );
-        g_snprintf( roomname, strlen( gc->username ) + 16, "%s-Bee-%d", gc->username, byahoo_chat_id );
-        
-        c = serv_got_joined_chat( gc, ++byahoo_chat_id, roomname );
-        add_chat_buddy( c, gc->username );
+        roomname = g_strdup_printf( "%s-Bee-%d", ic->acc->user, byahoo_chat_id );
+        
+        c = imcb_chat_new( ic, roomname );
+        imcb_chat_add_buddy( c, ic->acc->user );
         
         /* FIXME: Free this thing when the chat's destroyed. We can't *always*
@@ -385 +347 @@
         g_free( roomname );
         
-        return( 1 );
-}
-
-void byahoo_init( )
+        return c;
+}
+
+void byahoo_initmodule( )
 {
         struct prpl *ret = g_new0(struct prpl, 1);
         ret->name = "yahoo";
+        ret->init = byahoo_init;
         
         ret->login = byahoo_login;
-        ret->close = byahoo_close;
-        ret->send_im = byahoo_send_im;
+        ret->keepalive = byahoo_keepalive;
+        ret->logout = byahoo_logout;
+        
+        ret->buddy_msg = byahoo_buddy_msg;
         ret->get_info = byahoo_get_info;
         ret->away_states = byahoo_away_states;
         ret->set_away = byahoo_set_away;
-        ret->keepalive = byahoo_keepalive;
         ret->add_buddy = byahoo_add_buddy;
         ret->remove_buddy = byahoo_remove_buddy;
-        ret->get_status_string = byahoo_get_status_string;
         ret->send_typing = byahoo_send_typing;
         
-        ret->chat_send = byahoo_chat_send;
+        ret->chat_msg = byahoo_chat_msg;
         ret->chat_invite = byahoo_chat_invite;
         ret->chat_leave = byahoo_chat_leave;
-        ret->chat_open = byahoo_chat_open;
-        ret->cmp_buddynames = g_strcasecmp;
+        ret->chat_with = byahoo_chat_with;
+
+        ret->handle_cmp = g_strcasecmp;
         
         register_protocol(ret);
 }
 
-static struct gaim_connection *byahoo_get_gc_by_id( int id )
+static struct im_connection *byahoo_get_ic_by_id( int id )
 {
         GSList *l;
-        struct gaim_connection *gc;
+        struct im_connection *ic;
         struct byahoo_data *yd;
         
         for( l = get_connections(); l; l = l->next )
         {
-                gc = l->data;
-                yd = gc->proto_data;
-                
-                if( !strcmp(gc->prpl->name, "yahoo") && yd->y2_id == id )
-                        return( gc );
+                ic = l->data;
+                yd = ic->proto_data;
+                
+                if( strcmp( ic->acc->prpl->name, "yahoo" ) == 0 && yd->y2_id == id )
+                        return( ic );
         }
         
@@ -443 +407 @@
 };
 
-void byahoo_connect_callback( gpointer data, gint source, GaimInputCondition cond )
+void byahoo_connect_callback( gpointer data, gint source, b_input_condition cond )
 {
         struct byahoo_connect_callback_data *d = data;
         
-        if( !byahoo_get_gc_by_id( d->id ) )
+        if( !byahoo_get_ic_by_id( d->id ) )
         {
                 g_free( d );
@@ -465 +429 @@
 };
 
-void byahoo_read_ready_callback( gpointer data, gint source, GaimInputCondition cond )
+gboolean byahoo_read_ready_callback( gpointer data, gint source, b_input_condition cond )
 {
         struct byahoo_read_ready_data *d = data;
         
-        if( !byahoo_get_gc_by_id( d->id ) )
-        {
+        if( !byahoo_get_ic_by_id( d->id ) )
                 /* WTF doesn't libyahoo clean this up? */
-                ext_yahoo_remove_handler( d->id, d->tag );
-                return;
-        }
+                return FALSE;
         
         yahoo_read_ready( d->id, d->fd, d->data );
+        
+        return TRUE;
 }
 
@@ -487 +450 @@
 };
 
-void byahoo_write_ready_callback( gpointer data, gint source, GaimInputCondition cond )
+gboolean byahoo_write_ready_callback( gpointer data, gint source, b_input_condition cond )
 {
         struct byahoo_write_ready_data *d = data;
         
-        if( !byahoo_get_gc_by_id( d->id ) )
-        {
+        if( !byahoo_get_ic_by_id( d->id ) )
                 /* WTF doesn't libyahoo clean this up? */
-                ext_yahoo_remove_handler( d->id, d->tag );
-                return;
-        }
+                return FALSE;
         
         yahoo_write_ready( d->id, d->fd, d->data );
-}
-
-void ext_yahoo_login_response( int id, int succ, char *url )
-{
-        struct gaim_connection *gc = byahoo_get_gc_by_id( id );
+        
+        return FALSE;
+}
+
+void ext_yahoo_login_response( int id, int succ, const char *url )
+{
+        struct im_connection *ic = byahoo_get_ic_by_id( id );
         struct byahoo_data *yd = NULL;
         
-        if( gc == NULL )
+        if( ic == NULL )
         {
                 /* libyahoo2 seems to call this one twice when something
@@ -516 +478 @@
         }
         
-        yd = (struct byahoo_data *) gc->proto_data;
+        yd = (struct byahoo_data *) ic->proto_data;
         
         if( succ == YAHOO_LOGIN_OK )
         {
-                account_online( gc );
+                imcb_connected( ic );
                 
                 yd->logged_in = TRUE;
@@ -527 +489 @@
         {
                 char *errstr;
-                char *s;
+                int allow_reconnect = TRUE;
                 
                 yd->logged_in = FALSE;
@@ -540 +502 @@
                 {
                         errstr = "Logged in on a different machine or device";
-                        gc->wants_to_die = TRUE;
+                        allow_reconnect = FALSE;
                 }
                 else if( succ == YAHOO_LOGIN_SOCK )
@@ -548 +510 @@
                 
                 if( url && *url )
-                {
-                        s = g_malloc( strlen( "Error %d (%s). See %s for more information." ) + strlen( url ) + strlen( errstr ) + 16 );
-                        sprintf( s, "Error %d (%s). See %s for more information.", succ, errstr, url );
-                }
+                        imcb_error( ic, "Error %d (%s). See %s for more information.", succ, errstr, url );
                 else
-                {
-                        s = g_malloc( strlen( "Error %d (%s)" ) + strlen( errstr ) + 16 );
-                        sprintf( s, "Error %d (%s)", succ, errstr );
-                }
-                
-                if( yd->logged_in )
-                        hide_login_progress_error( gc, s );
-                else
-                        hide_login_progress( gc, s );
-                
-                g_free( s );
-                
-                signoff( gc );
+                        imcb_error( ic, "Error %d (%s)", succ, errstr );
+                
+                imc_logout( ic, allow_reconnect );
         }
 }
@@ -571 +520 @@
 void ext_yahoo_got_buddies( int id, YList *buds )
 {
-        struct gaim_connection *gc = byahoo_get_gc_by_id( id );
-        struct byahoo_data *yd = gc->proto_data;
+        struct im_connection *ic = byahoo_get_ic_by_id( id );
+        struct byahoo_data *yd = ic->proto_data;
         YList *bl = buds;
         
@@ -589 +538 @@
                 }
                 
-                add_buddy( gc, b->group, b->id, b->real_name );
+                imcb_add_buddy( ic, b->id, b->group );
+                imcb_rename_buddy( ic, b->id, b->real_name );
+                
                 bl = bl->next;
         }
@@ -606 +557 @@
 }
 
-void ext_yahoo_status_changed( int id, char *who, int stat, char *msg, int away )
-{
-        struct gaim_connection *gc = byahoo_get_gc_by_id( id );
-        
-        serv_got_update( gc, who, stat != YAHOO_STATUS_OFFLINE, 0, 0,
-                         ( stat == YAHOO_STATUS_IDLE ) ? away : 0,
-                         ( stat != YAHOO_STATUS_AVAILABLE ) | ( stat << 1 ), 0 );
-}
-
-void ext_yahoo_got_im( int id, char *who, char *msg, long tm, int stat, int utf8 )
-{
-        struct gaim_connection *gc = byahoo_get_gc_by_id( id );
-        char *m = byahoo_strip( msg );
-        
-        serv_got_im( gc, who, m, 0, 0, strlen( m ) );
-        g_free( m );
-}
-
-void ext_yahoo_got_file( int id, char *who, char *url, long expires, char *msg, char *fname, unsigned long fesize )
-{
-        struct gaim_connection *gc = byahoo_get_gc_by_id( id );
-        
-        serv_got_crap( gc, "Got a file transfer (file = %s) from %s. Ignoring for now due to lack of support.", fname, who );
-}
-
-void ext_yahoo_typing_notify( int id, char *who, int stat )
-{
-        struct gaim_connection *gc = byahoo_get_gc_by_id( id );
-        if (stat == 1) {
-                /* User is typing */
-                serv_got_typing( gc, who, 1, 1 );
-        }
-        else {
-                /* User stopped typing */
-                serv_got_typing( gc, who, 1, 0 );
-        }
-}
-
-void ext_yahoo_system_message( int id, char *msg )
-{
-        struct gaim_connection *gc = byahoo_get_gc_by_id( id );
-        
-        serv_got_crap( gc, "Yahoo! system message: %s", msg );
-}
-
-void ext_yahoo_webcam_invite( int id, char *from )
-{
-        struct gaim_connection *gc = byahoo_get_gc_by_id( id );
-        
-        serv_got_crap( gc, "Got a webcam invitation from %s. IRC+webcams is a no-no though...", from );
-}
-
-void ext_yahoo_error( int id, char *err, int fatal )
-{
-        struct gaim_connection *gc = byahoo_get_gc_by_id( id );
+void ext_yahoo_status_changed( int id, const char *who, int stat, const char *msg, int away, int idle, int mobile )
+{
+        struct im_connection *ic = byahoo_get_ic_by_id( id );
+        char *state_string = NULL;
+        int flags = OPT_LOGGED_IN;
+        
+        if( away )
+                flags |= OPT_AWAY;
+        
+        switch (stat)
+        {
+        case YAHOO_STATUS_BRB:
+                state_string = "Be Right Back";
+                break;
+        case YAHOO_STATUS_BUSY:
+                state_string = "Busy";
+                break;
+        case YAHOO_STATUS_NOTATHOME:
+                state_string = "Not At Home";
+                break;
+        case YAHOO_STATUS_NOTATDESK:
+                state_string = "Not At Desk";
+                break;
+        case YAHOO_STATUS_NOTINOFFICE:
+                state_string = "Not In Office";
+                break;
+        case YAHOO_STATUS_ONPHONE:
+                state_string = "On Phone";
+                break;
+        case YAHOO_STATUS_ONVACATION:
+                state_string = "On Vacation";
+                break;
+        case YAHOO_STATUS_OUTTOLUNCH:
+                state_string = "Out To Lunch";
+                break;
+        case YAHOO_STATUS_STEPPEDOUT:
+                state_string = "Stepped Out";
+                break;
+        case YAHOO_STATUS_INVISIBLE:
+                state_string = "Invisible";
+                break;
+        case YAHOO_STATUS_CUSTOM:
+                state_string = "Away";
+                break;
+        case YAHOO_STATUS_IDLE:
+                state_string = "Idle";
+                break;
+        case YAHOO_STATUS_OFFLINE:
+                state_string = "Offline";
+                flags = 0;
+                break;
+        case YAHOO_STATUS_NOTIFY:
+                state_string = "Notify";
+                break;
+        }
+        
+        imcb_buddy_status( ic, who, flags, state_string, msg );
+        
+        /* Not implemented yet...
+        if( stat == YAHOO_STATUS_IDLE )
+                imcb_buddy_times( ic, who, 0, away );
+        */
+}
+
+void ext_yahoo_got_im( int id, const char *me, const char *who, const char *msg, long tm, int stat, int utf8 )
+{
+        struct im_connection *ic = byahoo_get_ic_by_id( id );
+        char *m;
+        
+        if( msg )
+        {
+                m = byahoo_strip( msg );
+                imcb_buddy_msg( ic, (char*) who, (char*) m, 0, 0 );
+                g_free( m );
+        }
+}
+
+void ext_yahoo_got_file( int id,
+                         const char *ignored,
+                         const char *who, const char *url, long expires, const char *msg, const char *fname, unsigned long fesize )
+{
+        struct im_connection *ic = byahoo_get_ic_by_id( id );
+        
+        imcb_log( ic, "Got a file transfer (file = %s) from %s. Ignoring for now due to lack of support.", fname, who );
+}
+
+void ext_yahoo_typing_notify( int id, const char *ignored, const char *who, int stat )
+{
+        struct im_connection *ic = byahoo_get_ic_by_id( id );
+        
+        if( stat == 1 )
+                imcb_buddy_typing( ic, (char*) who, OPT_TYPING );
+        else
+                imcb_buddy_typing( ic, (char*) who, 0 );
+}
+
+void ext_yahoo_system_message( int id, const char *msg )
+{
+        struct im_connection *ic = byahoo_get_ic_by_id( id );
+        
+        imcb_log( ic, "Yahoo! system message: %s", msg );
+}
+
+void ext_yahoo_webcam_invite( int id, const char *ignored, const char *from )
+{
+        struct im_connection *ic = byahoo_get_ic_by_id( id );
+        
+        imcb_log( ic, "Got a webcam invitation from %s. IRC+webcams is a no-no though...", from );
+}
+
+void ext_yahoo_error( int id, const char *err, int fatal, int num )
+{
+        struct im_connection *ic = byahoo_get_ic_by_id( id );
+        
+        imcb_error( ic, "%s", err );
         
         if( fatal )
-        {
-                hide_login_progress_error( gc, err );
-                signoff( gc );
-        }
-        else
-        {
-                do_error_dialog( gc, err, "Yahoo! error" );
-        }
+                imc_logout( ic, TRUE );
 }
 
@@ -687 +691 @@
                 
                 inp->d = d;
-                d->tag = inp->h = gaim_input_add( fd, GAIM_INPUT_READ, (GaimInputFunction) byahoo_read_ready_callback, (gpointer) d );
+                d->tag = inp->h = b_input_add( fd, GAIM_INPUT_READ, (b_event_handler) byahoo_read_ready_callback, (gpointer) d );
         }
         else if( cond == YAHOO_INPUT_WRITE )
@@ -698 +702 @@
                 
                 inp->d = d;
-                d->tag = inp->h = gaim_input_add( fd, GAIM_INPUT_WRITE, (GaimInputFunction) byahoo_write_ready_callback, (gpointer) d );
+                d->tag = inp->h = b_input_add( fd, GAIM_INPUT_WRITE, (b_event_handler) byahoo_write_ready_callback, (gpointer) d );
         }
         else
@@ -729 +733 @@
         }
         
-        gaim_input_remove( tag );
-}
-
-int ext_yahoo_connect_async( int id, char *host, int port, yahoo_connect_callback callback, void *data )
+        b_event_remove( tag );
+}
+
+int ext_yahoo_connect_async( int id, const char *host, int port, yahoo_connect_callback callback, void *data )
 {
         struct byahoo_connect_callback_data *d;
@@ -738 +742 @@
         
         d = g_new0( struct byahoo_connect_callback_data, 1 );
-        if( ( fd = proxy_connect( host, port, (GaimInputFunction) byahoo_connect_callback, (gpointer) d ) ) < 0 )
+        if( ( fd = proxy_connect( host, port, (b_event_handler) byahoo_connect_callback, (gpointer) d ) ) < 0 )
         {
                 g_free( d );
@@ -753 +757 @@
 /* Because we don't want asynchronous connects in BitlBee, and because
    libyahoo doesn't seem to use this one anyway, this one is now defunct. */
-int ext_yahoo_connect(char *host, int port)
+int ext_yahoo_connect(const char *host, int port)
 {
 #if 0
@@ -796 +800 @@
 {
         yahoo_conference_logon( inv->yid, NULL, inv->members, inv->name );
-        add_chat_buddy( inv->c, inv->gc->username );
+        imcb_chat_add_buddy( inv->c, inv->ic->acc->user );
         g_free( inv->name );
         g_free( inv );
@@ -804 +808 @@
 {
         yahoo_conference_decline( inv->yid, NULL, inv->members, inv->name, "User rejected groupchat" );
-        serv_got_chat_left( inv->gc, inv->c->id );
+        imcb_chat_free( inv->c );
         g_free( inv->name );
         g_free( inv );
 }
 
-void ext_yahoo_got_conf_invite( int id, char *who, char *room, char *msg, YList *members )
-{
-        struct gaim_connection *gc = byahoo_get_gc_by_id( id );
+void ext_yahoo_got_conf_invite( int id, const char *ignored,
+                                const char *who, const char *room, const char *msg, YList *members )
+{
+        struct im_connection *ic = byahoo_get_ic_by_id( id );
         struct byahoo_conf_invitation *inv;
         char txt[1024];
@@ -819 +824 @@
         memset( inv, 0, sizeof( struct byahoo_conf_invitation ) );
         inv->name = g_strdup( room );
-        inv->c = serv_got_joined_chat( gc, ++byahoo_chat_id, room );
+        inv->c = imcb_chat_new( ic, (char*) room );
         inv->c->data = members;
         inv->yid = id;
         inv->members = members;
-        inv->gc = gc;
+        inv->ic = ic;
         
         for( m = members; m; m = m->next )
-                if( g_strcasecmp( m->data, gc->username ) != 0 )
-                        add_chat_buddy( inv->c, m->data );
+                if( g_strcasecmp( m->data, ic->acc->user ) != 0 )
+                        imcb_chat_add_buddy( inv->c, m->data );
         
         g_snprintf( txt, 1024, "Got an invitation to chatroom %s from %s: %s", room, who, msg );
         
-        do_ask_dialog( gc, txt, inv, byahoo_accept_conf, byahoo_reject_conf );
-}
-
-void ext_yahoo_conf_userdecline( int id, char *who, char *room, char *msg )
-{
-        struct gaim_connection *gc = byahoo_get_gc_by_id( id );
-        
-        serv_got_crap( gc, "Invite to chatroom %s rejected by %s: %s", room, who, msg );
-}
-
-void ext_yahoo_conf_userjoin( int id, char *who, char *room )
-{
-        struct gaim_connection *gc = byahoo_get_gc_by_id( id );
-        struct conversation *c;
-        
-        for( c = gc->conversations; c && strcmp( c->title, room ) != 0; c = c->next );
+        imcb_ask( ic, txt, inv, byahoo_accept_conf, byahoo_reject_conf );
+}
+
+void ext_yahoo_conf_userdecline( int id, const char *ignored, const char *who, const char *room, const char *msg )
+{
+        struct im_connection *ic = byahoo_get_ic_by_id( id );
+        
+        imcb_log( ic, "Invite to chatroom %s rejected by %s: %s", room, who, msg );
+}
+
+void ext_yahoo_conf_userjoin( int id, const char *ignored, const char *who, const char *room )
+{
+        struct im_connection *ic = byahoo_get_ic_by_id( id );
+        struct groupchat *c;
+        
+        for( c = ic->groupchats; c && strcmp( c->title, room ) != 0; c = c->next );
         
         if( c )
-                add_chat_buddy( c, who );
-}
-
-void ext_yahoo_conf_userleave( int id, char *who, char *room )
-{
-        struct gaim_connection *gc = byahoo_get_gc_by_id( id );
-        struct conversation *c;
-        
-        for( c = gc->conversations; c && strcmp( c->title, room ) != 0; c = c->next );
+                imcb_chat_add_buddy( c, (char*) who );
+}
+
+void ext_yahoo_conf_userleave( int id, const char *ignored, const char *who, const char *room )
+
+{
+        struct im_connection *ic = byahoo_get_ic_by_id( id );
+        struct groupchat *c;
+        
+        for( c = ic->groupchats; c && strcmp( c->title, room ) != 0; c = c->next );
         
         if( c )
-                remove_chat_buddy( c, who, "" );
-}
-
-void ext_yahoo_conf_message( int id, char *who, char *room, char *msg, int utf8 )
-{
-        struct gaim_connection *gc = byahoo_get_gc_by_id( id );
+                imcb_chat_remove_buddy( c, (char*) who, "" );
+}
+
+void ext_yahoo_conf_message( int id, const char *ignored, const char *who, const char *room, const char *msg, int utf8 )
+{
+        struct im_connection *ic = byahoo_get_ic_by_id( id );
         char *m = byahoo_strip( msg );
-        struct conversation *c;
-        
-        for( c = gc->conversations; c && strcmp( c->title, room ) != 0; c = c->next );
-        
-        serv_got_chat_in( gc, c ? c->id : 0, who, 0, m, 0 );
+        struct groupchat *c;
+        
+        for( c = ic->groupchats; c && strcmp( c->title, room ) != 0; c = c->next );
+        
+        if( c )
+                imcb_chat_msg( c, (char*) who, (char*) m, 0, 0 );
         g_free( m );
 }
 
-void ext_yahoo_chat_cat_xml( int id, char *xml )
-{
-}
-
-void ext_yahoo_chat_join( int id, char *room, char *topic, YList *members, int fd )
-{
-}
-
-void ext_yahoo_chat_userjoin( int id, char *room, struct yahoo_chat_member *who )
-{
-}
-
-void ext_yahoo_chat_userleave( int id, char *room, char *who )
-{
-}
-
-void ext_yahoo_chat_message( int id, char *who, char *room, char *msg, int msgtype, int utf8 )
-{
-}
-
-void ext_yahoo_chat_yahoologout( int id )
-{
-}
-
-void ext_yahoo_chat_yahooerror( int id )
-{
-}
-
-void ext_yahoo_contact_added( int id, char *myid, char *who, char *msg )
-{
-}
-
-void ext_yahoo_rejected( int id, char *who, char *msg )
-{
-}
-
-void ext_yahoo_game_notify( int id, char *who, int stat )
-{
-}
-
-void ext_yahoo_mail_notify( int id, char *from, char *subj, int cnt )
-{
-        struct gaim_connection *gc = byahoo_get_gc_by_id( id );
-        
-        if( from && subj )
-                serv_got_crap( gc, "Received e-mail message from %s with subject `%s'", from, subj );
+void ext_yahoo_chat_cat_xml( int id, const char *xml )
+{
+}
+
+void ext_yahoo_chat_join( int id, const char *who, const char *room, const char *topic, YList *members, int fd )
+{
+}
+
+void ext_yahoo_chat_userjoin( int id, const char *me, const char *room, struct yahoo_chat_member *who )
+{
+        free(who->id);
+        free(who->alias);
+        free(who->location);
+        free(who);
+}
+
+void ext_yahoo_chat_userleave( int id, const char *me, const char *room, const char *who )
+{
+}
+
+void ext_yahoo_chat_message( int id, const char *me, const char *who, const char *room, const char *msg, int msgtype, int utf8 )
+{
+}
+
+void ext_yahoo_chat_yahoologout( int id, const char *me )
+{
+}
+
+void ext_yahoo_chat_yahooerror( int id, const char *me )
+{
+}
+
+void ext_yahoo_contact_added( int id, const char *myid, const char *who, const char *msg )
+{
+        /* Groups schmoups. If I want to handle groups properly I can get the
+           buddy data from some internal libyahoo2 structure. */
+        imcb_add_buddy( byahoo_get_ic_by_id( id ), (char*) who, NULL );
+}
+
+void ext_yahoo_rejected( int id, const char *who, const char *msg )
+{
+}
+
+void ext_yahoo_game_notify( int id, const char *me, const char *who, int stat )
+{
+}
+
+void ext_yahoo_mail_notify( int id, const char *from, const char *subj, int cnt )
+{
+        struct im_connection *ic = byahoo_get_ic_by_id( id );
+        
+        if( !set_getbool( &ic->acc->set, "mail_notifications" ) )
+                ; /* The user doesn't care. */
+        else if( from && subj )
+                imcb_log( ic, "Received e-mail message from %s with subject `%s'", from, subj );
         else if( cnt > 0 )
-                serv_got_crap( gc, "Received %d new e-mails", cnt );
-}
-
-void ext_yahoo_webcam_invite_reply( int id, char *from, int accept )
-{
-}
-
-void ext_yahoo_webcam_closed( int id, char *who, int reason )
+                imcb_log( ic, "Received %d new e-mails", cnt );
+}
+
+void ext_yahoo_webcam_invite_reply( int id, const char *me, const char *from, int accept )
+{
+}
+
+void ext_yahoo_webcam_closed( int id, const char *who, int reason )
 {
 }
@@ -937 +953 @@
 }
 
-void ext_yahoo_webcam_viewer( int id, char *who, int connect )
+void ext_yahoo_webcam_viewer( int id, const char *who, int connect )
 {
 }
@@ -945 +961 @@
 }
 
-int ext_yahoo_log( char *fmt, ... )
+int ext_yahoo_log( const char *fmt, ... )
 {
         return( 0 );
@@ -953 +969 @@
 {
 }
+
+void ext_yahoo_got_ping( int id, const char *msg)
+{
+}
+
+void ext_yahoo_got_buddyicon (int id, const char *me, const char *who, const char *url, int checksum) {}
+void ext_yahoo_got_buddyicon_checksum (int id, const char *me,const char *who, int checksum) {}
+
+void ext_yahoo_got_buddyicon_request(int id, const char *me, const char *who){}
+void ext_yahoo_buddyicon_uploaded(int id, const char *url){}