Changeset 85d7b85 for protocols/yahoo

Timestamp:

2008-04-02T14:22:57Z (17 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.

Location:

protocols/yahoo

Files:

• Makefile (modified) (1 diff)
• libyahoo2.c (modified) (54 diffs)
• yahoo.c (modified) (32 diffs)
• yahoo2.h (modified) (3 diffs)
• yahoo2_callbacks.h (modified) (48 diffs)
• yahoo2_types.h (modified) (6 diffs)
• yahoo_util.c (modified) (2 diffs)

protocols/yahoo/Makefile

@@ -17 +17 @@
 # [SH] Phony targets
 all: yahoo_mod.o
+check: all
+lcov: check
+gcov: 
+        gcov *.c
 
 .PHONY: all clean distclean

protocols/yahoo/libyahoo2.c

@@ -74 +74 @@
 #include <ctype.h>
 
-#include "sha.h"
+#include "sha1.h"
 #include "md5.h"
 #include "yahoo2.h"
@@ -88 +88 @@
 #endif
 
+#include "base64.h"
+
 #ifdef USE_STRUCT_CALLBACKS
 struct yahoo_callbacks *yc=NULL;
@@ -100 +102 @@
 #define YAHOO_CALLBACK(x)       x
 #endif
+
+static int yahoo_send_data(int fd, void *data, int len);
 
 int yahoo_log_message(char * fmt, ...)
@@ -200 +204 @@
         YAHOO_SERVICE_CHATLOGOUT = 0xa0,
         YAHOO_SERVICE_CHATPING,
-        YAHOO_SERVICE_COMMENT = 0xa8
+        YAHOO_SERVICE_COMMENT = 0xa8,
+        YAHOO_SERVICE_STEALTH = 0xb9,
+        YAHOO_SERVICE_PICTURE_CHECKSUM = 0xbd,
+        YAHOO_SERVICE_PICTURE = 0xbe,
+        YAHOO_SERVICE_PICTURE_UPDATE = 0xc1,
+        YAHOO_SERVICE_PICTURE_UPLOAD = 0xc2
 };
 
@@ -693 +702 @@
 }
 
-static char base64digits[] =    "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-                                "abcdefghijklmnopqrstuvwxyz"
-                                "0123456789._";
+/* raw bytes in quasi-big-endian order to base 64 string (NUL-terminated) */
 static void to_y64(unsigned char *out, const unsigned char *in, int inlen)
-/* raw bytes in quasi-big-endian order to base 64 string (NUL-terminated) */
-{
-        for (; inlen >= 3; inlen -= 3)
-                {
-                        *out++ = base64digits[in[0] >> 2];
-                        *out++ = base64digits[((in[0]<<4) & 0x30) | (in[1]>>4)];
-                        *out++ = base64digits[((in[1]<<2) & 0x3c) | (in[2]>>6)];
-                        *out++ = base64digits[in[2] & 0x3f];
-                        in += 3;
-                }
-        if (inlen > 0)
-                {
-                        unsigned char fragment;
-
-                        *out++ = base64digits[in[0] >> 2];
-                        fragment = (in[0] << 4) & 0x30;
-                        if (inlen > 1)
-                                fragment |= in[1] >> 4;
-                        *out++ = base64digits[fragment];
-                        *out++ = (inlen < 2) ? '-' 
-                                        : base64digits[(in[1] << 2) & 0x3c];
-                        *out++ = '-';
-                }
-        *out = '\0';
+{
+        base64_encode_real(in, inlen, out, "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789._-");
 }
 
@@ -750 +735 @@
 
         memcpy(data + pos, "YMSG", 4); pos += 4;
-        pos += yahoo_put16(data + pos, 0x0a00);
+        pos += yahoo_put16(data + pos, 0x000c);
         pos += yahoo_put16(data + pos, 0x0000);
         pos += yahoo_put16(data + pos, pktlen + extra_pad);
@@ -761 +746 @@
         yahoo_packet_dump(data, len);
         
+        if( yid->type == YAHOO_CONNECTION_FT )
+                yahoo_send_data(yid->fd, data, len);
+        else
         yahoo_add_to_send_queue(yid, data, len);
         FREE(data);
@@ -946 +934 @@
         char *msg = NULL;
         char *from = NULL;
+        char *to = NULL;
         int stat = 0;
         int accept = 0;
@@ -954 +943 @@
                 if (pair->key == 4)
                         from = pair->value;
+                if (pair->key == 5)
+                        to = pair->value;
                 if (pair->key == 49)
                         msg = pair->value;
@@ -971 +962 @@
         
         if (!strncasecmp(msg, "TYPING", strlen("TYPING"))) 
-                YAHOO_CALLBACK(ext_yahoo_typing_notify)(yd->client_id, from, stat);
+                YAHOO_CALLBACK(ext_yahoo_typing_notify)(yd->client_id, to, from, stat);
         else if (!strncasecmp(msg, "GAME", strlen("GAME"))) 
-                YAHOO_CALLBACK(ext_yahoo_game_notify)(yd->client_id, from, stat);
+                YAHOO_CALLBACK(ext_yahoo_game_notify)(yd->client_id, to, from, stat);
         else if (!strncasecmp(msg, "WEBCAMINVITE", strlen("WEBCAMINVITE"))) 
         {
                 if (!strcmp(ind, " ")) {
-                        YAHOO_CALLBACK(ext_yahoo_webcam_invite)(yd->client_id, from);
+                        YAHOO_CALLBACK(ext_yahoo_webcam_invite)(yd->client_id, to, from);
                 } else {
                         accept = atoi(ind);
@@ -983 +974 @@
                         if (accept < 0)
                                 accept = 0;
-                        YAHOO_CALLBACK(ext_yahoo_webcam_invite_reply)(yd->client_id, from, accept);
+                        YAHOO_CALLBACK(ext_yahoo_webcam_invite_reply)(yd->client_id, to, from, accept);
                 }
         }
@@ -1042 +1033 @@
         }
         if(url && from)
-                YAHOO_CALLBACK(ext_yahoo_got_file)(yd->client_id, from, url, expires, msg, filename, filesize);
+                YAHOO_CALLBACK(ext_yahoo_got_file)(yd->client_id, to, from, url, expires, msg, filename, filesize);
 
 }
@@ -1116 +1107 @@
                         ;
                 else if(members)
-                        YAHOO_CALLBACK(ext_yahoo_got_conf_invite)(yd->client_id, host, room, msg, members);
+                        YAHOO_CALLBACK(ext_yahoo_got_conf_invite)(yd->client_id, id, host, room, msg, members);
                 else if(msg)
-                        YAHOO_CALLBACK(ext_yahoo_error)(yd->client_id, msg, 0);
+                        YAHOO_CALLBACK(ext_yahoo_error)(yd->client_id, msg, 0, E_CONFNOTAVAIL);
                 break;
         case YAHOO_SERVICE_CONFADDINVITE:
@@ -1124 +1115 @@
                         ;
                 else
-                        YAHOO_CALLBACK(ext_yahoo_got_conf_invite)(yd->client_id, host, room, msg, members);
+                        YAHOO_CALLBACK(ext_yahoo_got_conf_invite)(yd->client_id, id, host, room, msg, members);
                 break;
         case YAHOO_SERVICE_CONFDECLINE:
                 if(who)
-                        YAHOO_CALLBACK(ext_yahoo_conf_userdecline)(yd->client_id, who, room, msg);
+                        YAHOO_CALLBACK(ext_yahoo_conf_userdecline)(yd->client_id, id, who, room, msg);
                 break;
         case YAHOO_SERVICE_CONFLOGON:
                 if(who)
-                        YAHOO_CALLBACK(ext_yahoo_conf_userjoin)(yd->client_id, who, room);
+                        YAHOO_CALLBACK(ext_yahoo_conf_userjoin)(yd->client_id, id, who, room);
                 break;
         case YAHOO_SERVICE_CONFLOGOFF:
                 if(who)
-                        YAHOO_CALLBACK(ext_yahoo_conf_userleave)(yd->client_id, who, room);
+                        YAHOO_CALLBACK(ext_yahoo_conf_userleave)(yd->client_id, id, who, room);
                 break;
         case YAHOO_SERVICE_CONFMSG:
                 if(who)
-                        YAHOO_CALLBACK(ext_yahoo_conf_message)(yd->client_id, who, room, msg, utf8);
+                        YAHOO_CALLBACK(ext_yahoo_conf_message)(yd->client_id, id, who, room, msg, utf8);
                 break;
         }
@@ -1148 +1139 @@
 {
         char *msg = NULL;
+        char *id = NULL;
         char *who = NULL;
         char *room = NULL;
@@ -1164 +1156 @@
                 struct yahoo_pair *pair = l->data;
 
+                if (pair->key == 1) {
+                        /* My identity */
+                        id = pair->value;
+                }
+
                 if (pair->key == 104) {
                         /* Room name */
@@ -1238 +1235 @@
         if(!room) {
                 if (pkt->service == YAHOO_SERVICE_CHATLOGOUT) { /* yahoo originated chat logout */
-                        YAHOO_CALLBACK(ext_yahoo_chat_yahoologout)(yid->yd->client_id);
+                        YAHOO_CALLBACK(ext_yahoo_chat_yahoologout)(yid->yd->client_id, id);
                         return ;
                 }
                 if (pkt->service == YAHOO_SERVICE_COMMENT && chaterr)  {
-                        YAHOO_CALLBACK(ext_yahoo_chat_yahooerror)(yid->yd->client_id);
-                        return ;
+                        YAHOO_CALLBACK(ext_yahoo_chat_yahooerror)(yid->yd->client_id, id);
+                        return;
                 }
 
@@ -1256 +1253 @@
                 }
                 if(firstjoin && members) {
-                        YAHOO_CALLBACK(ext_yahoo_chat_join)(yid->yd->client_id, room, topic, members, yid->fd);
+                        YAHOO_CALLBACK(ext_yahoo_chat_join)(yid->yd->client_id, id, room, topic, members, yid->fd);
                 } else if(who) {
                         if(y_list_length(members) != 1) {
@@ -1265 +1262 @@
                                 YList *n = members->next;
                                 currentmember = members->data;
-                                YAHOO_CALLBACK(ext_yahoo_chat_userjoin)(yid->yd->client_id, room, currentmember);
+                                YAHOO_CALLBACK(ext_yahoo_chat_userjoin)(yid->yd->client_id, id, room, currentmember);
                                 y_list_free_1(members);
                                 members=n;
@@ -1273 +1270 @@
         case YAHOO_SERVICE_CHATEXIT:
                 if(who) {
-                        YAHOO_CALLBACK(ext_yahoo_chat_userleave)(yid->yd->client_id, room, who);
+                        YAHOO_CALLBACK(ext_yahoo_chat_userleave)(yid->yd->client_id, id, room, who);
                 }
                 break;
         case YAHOO_SERVICE_COMMENT:
                 if(who) {
-                        YAHOO_CALLBACK(ext_yahoo_chat_message)(yid->yd->client_id, who, room, msg, msgtype, utf8);
+                        YAHOO_CALLBACK(ext_yahoo_chat_message)(yid->yd->client_id, id, who, room, msg, msgtype, utf8);
                 }
                 break;
@@ -1337 +1334 @@
                         YAHOO_CALLBACK(ext_yahoo_system_message)(yd->client_id, message->msg);
                 } else if (pkt->status <= 2 || pkt->status == 5) {
-                        YAHOO_CALLBACK(ext_yahoo_got_im)(yd->client_id, message->from, message->msg, message->tm, pkt->status, message->utf8);
+                        YAHOO_CALLBACK(ext_yahoo_got_im)(yd->client_id, message->to, message->from, message->msg, message->tm, pkt->status, message->utf8);
                 } else if (pkt->status == 0xffffffff) {
-                        YAHOO_CALLBACK(ext_yahoo_error)(yd->client_id, message->msg, 0);
+                        YAHOO_CALLBACK(ext_yahoo_error)(yd->client_id, message->msg, 0, E_SYSTEM);
                 }
                 free(message);
@@ -1352 +1349 @@
         YList *l;
         struct yahoo_data *yd = yid->yd;
-        char *name = NULL;
-        int state = 0;
-        int away = 0;
-        int idle = 0;
-        char *msg = NULL;
+
+        struct user
+        {
+                char *name;     /* 7    name */
+                int   state;    /* 10   state */
+                int   flags;    /* 13   flags, bit 0 = pager, bit 1 = chat, bit 2 = game */
+                int   mobile;   /* 60   mobile */
+                char *msg;      /* 19   custom status message */
+                int   away;     /* 47   away (or invisible)*/
+                int   buddy_session;    /* 11   state */
+                int   f17;      /* 17   in chat? then what about flags? */
+                int   idle;     /* 137  seconds idle */
+                int   f138;     /* 138  state */
+                char *f184;     /* 184  state */
+                int   f192;     /* 192  state */
+                int   f10001;   /* 10001        state */
+                int   f10002;   /* 10002        state */
+                int   f198;     /* 198  state */
+                char *f197;     /* 197  state */
+                char *f205;     /* 205  state */
+                int   f213;     /* 213  state */
+        } *u;
+
+        YList *users = 0;
         
-        if(pkt->service == YAHOO_SERVICE_LOGOFF && pkt->status == -1) {
+        if (pkt->service == YAHOO_SERVICE_LOGOFF && pkt->status == -1) {
                 YAHOO_CALLBACK(ext_yahoo_login_response)(yd->client_id, YAHOO_LOGIN_DUPL, NULL);
                 return;
@@ -1382 +1398 @@
                         break;
                 case 7: /* the current buddy */
-                        name = pair->value;
+                        u = y_new0(struct user, 1);
+                        u->name = pair->value;
+                        users = y_list_prepend(users, u);
                         break;
                 case 10: /* state */
-                        state = strtol(pair->value, NULL, 10);
+                        ((struct user*)users->data)->state = strtol(pair->value, NULL, 10);
                         break;
                 case 19: /* custom status message */
-                        msg = pair->value;
+                        ((struct user*)users->data)->msg = pair->value;
                         break;
                 case 47: /* is it an away message or not */
-                        away = atoi(pair->value);
+                        ((struct user*)users->data)->away = atoi(pair->value);
                         break;
                 case 137: /* seconds idle */
-                        idle = atoi(pair->value);
-                        break;
-                case 11: /* what is this? */
-                        NOTICE(("key %d:%s", pair->key, pair->value));
+                        ((struct user*)users->data)->idle = atoi(pair->value);
+                        break;
+                case 11: /* this is the buddy's session id */
+                        ((struct user*)users->data)->buddy_session = atoi(pair->value);
                         break;
                 case 17: /* in chat? */
-                        break;
-                case 13: /* in pager? */
-                        if (pkt->service == YAHOO_SERVICE_LOGOFF || strtol(pair->value, NULL, 10) == 0) {
-                                YAHOO_CALLBACK(ext_yahoo_status_changed)(yd->client_id, name, YAHOO_STATUS_OFFLINE, NULL, 1);
-                                break;
-                        }
-                        if (state == YAHOO_STATUS_AVAILABLE) {
-                                YAHOO_CALLBACK(ext_yahoo_status_changed)(yd->client_id, name, state, NULL, 0);
-                        } else if (state == YAHOO_STATUS_CUSTOM) {
-                                YAHOO_CALLBACK(ext_yahoo_status_changed)(yd->client_id, name, state, msg, away);
-                        } else {
-                                YAHOO_CALLBACK(ext_yahoo_status_changed)(yd->client_id, name, state, NULL, idle);
-                        }
-
-                        break;
-                case 60: 
+                        ((struct user*)users->data)->f17 = atoi(pair->value);
+                        break;
+                case 13: /* bitmask, bit 0 = pager, bit 1 = chat, bit 2 = game */
+                        ((struct user*)users->data)->flags = atoi(pair->value);
+                        break;
+                case 60: /* SMS -> 1 MOBILE USER */
                         /* sometimes going offline makes this 2, but invisible never sends it */
-                        NOTICE(("key %d:%s", pair->key, pair->value));
-                         break;
+                        ((struct user*)users->data)->mobile = atoi(pair->value);
+                        break;
+                case 138:
+                        ((struct user*)users->data)->f138 = atoi(pair->value);
+                        break;
+                case 184:
+                        ((struct user*)users->data)->f184 = pair->value;
+                        break;
+                case 192:
+                        ((struct user*)users->data)->f192 = atoi(pair->value);
+                        break;
+                case 10001:
+                        ((struct user*)users->data)->f10001 = atoi(pair->value);
+                        break;
+                case 10002:
+                        ((struct user*)users->data)->f10002 = atoi(pair->value);
+                        break;
+                case 198:
+                        ((struct user*)users->data)->f198 = atoi(pair->value);
+                        break;
+                case 197:
+                        ((struct user*)users->data)->f197 = pair->value;
+                        break;
+                case 205:
+                        ((struct user*)users->data)->f205 = pair->value;
+                        break;
+                case 213:
+                        ((struct user*)users->data)->f213 = atoi(pair->value);
+                        break;
                 case 16: /* Custom error message */
-                        YAHOO_CALLBACK(ext_yahoo_error)(yd->client_id, pair->value, 0);
+                        YAHOO_CALLBACK(ext_yahoo_error)(yd->client_id, pair->value, 0, E_CUSTOM);
                         break;
                 default:
@@ -1426 +1461 @@
                         break;
                 }
+        }
+        
+        while (users) {
+                YList *t = users;
+                struct user *u = users->data;
+
+                if (u->name != NULL) {
+                        if (pkt->service == YAHOO_SERVICE_LOGOFF || u->flags == 0) {
+                                YAHOO_CALLBACK(ext_yahoo_status_changed)(yd->client_id, u->name, YAHOO_STATUS_OFFLINE, NULL, 1, 0, 0);
+                        } else {
+                                YAHOO_CALLBACK(ext_yahoo_status_changed)(yd->client_id, u->name, u->state, u->msg, u->away, u->idle, u->mobile);
+                        }
+                }
+
+                users = y_list_remove_link(users, users);
+                y_list_free_1(t);
+                FREE(u);
         }
 }
@@ -1530 +1582 @@
         yahoo_packet_free(pkt);
 
+}
+
+static void yahoo_process_picture_checksum( struct yahoo_input_data *yid, struct yahoo_packet *pkt)
+{
+        struct yahoo_data *yd = yid->yd;
+        char *from = NULL;
+        char *to = NULL;
+        int checksum = 0;
+        YList *l;
+
+        for(l = pkt->hash; l; l = l->next)
+        {
+                struct yahoo_pair *pair = l->data;
+
+                switch(pair->key)
+                {
+                        case 1:
+                        case 4:
+                                from = pair->value;
+                        case 5:
+                                to = pair->value;
+                                break;
+                        case 212:
+                                break;
+                        case 192:
+                                checksum = atoi( pair->value );
+                                break;
+                }
+        }
+
+        YAHOO_CALLBACK(ext_yahoo_got_buddyicon_checksum)(yd->client_id,to,from,checksum);
+}
+
+static void yahoo_process_picture(struct yahoo_input_data *yid, struct yahoo_packet *pkt)
+{
+        struct yahoo_data *yd = yid->yd;
+        char *url = NULL;
+        char *from = NULL;
+        char *to = NULL;
+        int status = 0;
+        int checksum = 0;
+        YList *l;
+        
+        for(l = pkt->hash; l; l = l->next)
+        {
+                struct yahoo_pair *pair = l->data;
+
+                switch(pair->key)
+                {
+                case 1:
+                case 4:         /* sender */
+                        from = pair->value;
+                        break;
+                case 5:         /* we */
+                        to = pair->value;
+                        break;
+                case 13:                /* request / sending */
+                        status = atoi( pair->value );
+                        break;
+                case 20:                /* url */
+                        url = pair->value;
+                        break;
+                case 192:       /*checksum */
+                        checksum = atoi( pair->value );
+                        break;
+                }
+        }
+
+        switch( status )
+        {
+                case 1: /* this is a request, ignore for now */
+                        YAHOO_CALLBACK(ext_yahoo_got_buddyicon_request)(yd->client_id, to, from);
+                        break;
+                case 2: /* this is cool - we get a picture :) */
+                        YAHOO_CALLBACK(ext_yahoo_got_buddyicon)(yd->client_id,to, from, url, checksum);
+                        break;
+        }
+}
+
+static void yahoo_process_picture_upload(struct yahoo_input_data *yid, struct yahoo_packet *pkt)
+{
+        struct yahoo_data *yd = yid->yd;
+        YList *l;
+        char *url = NULL;
+
+        if ( pkt->status != 1 )
+                return;         /* something went wrong */
+        
+        for(l = pkt->hash; l; l = l->next)
+        {
+                struct yahoo_pair *pair = l->data;
+
+                switch(pair->key)
+                {
+                        case 5:         /* we */
+                                break;
+                        case 20:                /* url */
+                                url = pair->value;
+                                break;
+                        case 27:                /* local filename */
+                                break;
+                        case 38:                /* time */
+                                break;
+                }
+        }
+
+        YAHOO_CALLBACK(ext_yahoo_buddyicon_uploaded)(yd->client_id, url);
 }
 
@@ -1659 +1818 @@
         md5_state_t        ctx;
 
-        SHA_CTX            ctx1;
-        SHA_CTX            ctx2;
+        sha1_state_t       ctx1;
+        sha1_state_t       ctx2;
 
         char *alphabet1 = "FBZDWAGHrJTLMNOPpRSKUVEXYChImkwQ";
@@ -1716 +1875 @@
         magic_ptr = (unsigned char *)seed;
 
-        while (*magic_ptr != (int)NULL) {
+        while (*magic_ptr != 0) {
                 char *loc;
 
@@ -1895 +2054 @@
                 memset(&(pass_hash_xor2[cnt]), 0x5c, 64-cnt);
 
-        shaInit(&ctx1);
-        shaInit(&ctx2);
+        sha1_init(&ctx1);
+        sha1_init(&ctx2);
 
         /* The first context gets the password hash XORed 
@@ -1903 +2062 @@
          * challenge. */
 
-        shaUpdate(&ctx1, pass_hash_xor1, 64);
+        sha1_append(&ctx1, pass_hash_xor1, 64);
         if (j >= 3 )
-                ctx1.sizeLo = 0x1ff;
-        shaUpdate(&ctx1, magic_key_char, 4);
-        shaFinal(&ctx1, digest1);
+                ctx1.Length_Low = 0x1ff;
+        sha1_append(&ctx1, magic_key_char, 4);
+        sha1_finish(&ctx1, digest1);
 
          /* The second context gets the password hash XORed 
@@ -1913 +2072 @@
           * of the first context. */
 
-        shaUpdate(&ctx2, pass_hash_xor2, 64);
-        shaUpdate(&ctx2, digest1, 20);
-        shaFinal(&ctx2, digest2);
+        sha1_append(&ctx2, pass_hash_xor2, 64);
+        sha1_append(&ctx2, digest1, 20);
+        sha1_finish(&ctx2, digest2);
 
         /* Now that we have digest2, use it to fetch 
@@ -1986 +2145 @@
                 memset(&(crypt_hash_xor2[cnt]), 0x5c, 64-cnt);
 
-        shaInit(&ctx1);
-        shaInit(&ctx2);
+        sha1_init(&ctx1);
+        sha1_init(&ctx2);
 
         /* The first context gets the password hash XORed 
@@ -1994 +2153 @@
          * challenge. */
 
-        shaUpdate(&ctx1, crypt_hash_xor1, 64);
+        sha1_append(&ctx1, crypt_hash_xor1, 64);
         if (j >= 3 )
-                ctx1.sizeLo = 0x1ff;
-        shaUpdate(&ctx1, magic_key_char, 4);
-        shaFinal(&ctx1, digest1);
+                ctx1.Length_Low = 0x1ff;
+        sha1_append(&ctx1, magic_key_char, 4);
+        sha1_finish(&ctx1, digest1);
 
         /* The second context gets the password hash XORed 
@@ -2004 +2163 @@
          * of the first context. */
 
-        shaUpdate(&ctx2, crypt_hash_xor2, 64);
-        shaUpdate(&ctx2, digest1, 20);
-        shaFinal(&ctx2, digest2);
+        sha1_append(&ctx2, crypt_hash_xor2, 64);
+        sha1_append(&ctx2, digest1, 20);
+        sha1_finish(&ctx2, digest2);
 
         /* Now that we have digest2, use it to fetch 
@@ -2174 +2333 @@
         int online = FALSE;
         int away = 0;
+        int idle = 0;
+        int mobile = 0;
 
         YList *l;
@@ -2195 +2356 @@
                 else if (pair->key == 47)
                         away = strtol(pair->value, NULL, 10);
+                else if (pair->key == 137)
+                        idle = strtol(pair->value, NULL, 10);
+                else if (pair->key == 60)
+                        mobile = strtol(pair->value, NULL, 10);
+                
         }
 
@@ -2200 +2366 @@
                 YAHOO_CALLBACK(ext_yahoo_contact_added)(yd->client_id, id, who, msg);
         else if (name)
-                YAHOO_CALLBACK(ext_yahoo_status_changed)(yd->client_id, name, state, msg, away);
+                YAHOO_CALLBACK(ext_yahoo_status_changed)(yd->client_id, name, state, msg, away, idle, mobile);
         else if(pkt->status == 0x07)
                 YAHOO_CALLBACK(ext_yahoo_rejected)(yd->client_id, who, msg);
@@ -2235 +2401 @@
                 where = "Unknown";
 
-        bud = y_new0(struct yahoo_buddy, 1);
-        bud->id = strdup(who);
-        bud->group = strdup(where);
-        bud->real_name = NULL;
-
-        yd->buddies = y_list_append(yd->buddies, bud);
+        /* status: 0 == Successful, 1 == Error (does not exist), 2 == Already in list */
+        if( status == 0 ) {
+                bud = y_new0(struct yahoo_buddy, 1);
+                bud->id = strdup(who);
+                bud->group = strdup(where);
+                bud->real_name = NULL;
+                
+                yd->buddies = y_list_append(yd->buddies, bud);
+                
+                /* Possibly called already, but at least the call above doesn't
+                   seem to happen every time (not anytime I tried). */
+                YAHOO_CALLBACK(ext_yahoo_contact_added)(yd->client_id, me, who, NULL);
+        }
 
 /*      YAHOO_CALLBACK(ext_yahoo_status_changed)(yd->client_id, who, status, NULL, (status==YAHOO_STATUS_AVAILABLE?0:1)); */
@@ -2328 +2501 @@
 
 /*      if(status)
-                YAHOO_CALLBACK(ext_yahoo_error)(yd->client_id, status, who, 0);
+                YAHOO_CALLBACK(ext_yahoo_error)(yd->client_id, who, 0, status);
 */      
 }
@@ -2352 +2525 @@
         }
 
-        NOTICE(("got voice chat invite from %s in %s", who, room));
+        NOTICE(("got voice chat invite from %s in %s to identity %s", who, room, me));
         /* 
          * send: s:0 1:me 5:who 57:room 13:1
@@ -2362 +2535 @@
          * rejr: s:4 5:who 10:99 19:-1617114599
          */
+}
+
+static void yahoo_process_ping(struct yahoo_input_data *yid, struct yahoo_packet *pkt)
+{
+        char *errormsg = NULL;
+        
+        YList *l;
+        for (l = pkt->hash; l; l = l->next) {
+                struct yahoo_pair *pair = l->data;
+                if (pair->key == 16)
+                        errormsg = pair->value;
+        }
+        
+        NOTICE(("got ping packet"));
+        YAHOO_CALLBACK(ext_yahoo_got_ping)(yid->yd->client_id, errormsg);
 }
 
@@ -2539 +2727 @@
                 yahoo_process_webcam_key(yid, pkt);
                 break;
+        case YAHOO_SERVICE_PING:
+                yahoo_process_ping(yid, pkt);
+                break;
         case YAHOO_SERVICE_IDLE:
         case YAHOO_SERVICE_MAILSTAT:
@@ -2546 +2737 @@
         case YAHOO_SERVICE_ADDIDENT:
         case YAHOO_SERVICE_ADDIGNORE:
-        case YAHOO_SERVICE_PING:
         case YAHOO_SERVICE_GOTGROUPRENAME:
         case YAHOO_SERVICE_GROUPRENAME:
@@ -2558 +2748 @@
                 yahoo_dump_unhandled(pkt);
                 break;
+        case YAHOO_SERVICE_PICTURE:
+                yahoo_process_picture(yid, pkt);
+                break;
+        case YAHOO_SERVICE_PICTURE_CHECKSUM:
+                yahoo_process_picture_checksum(yid, pkt);
+                break;
+        case YAHOO_SERVICE_PICTURE_UPLOAD:
+                yahoo_process_picture_upload(yid, pkt);
+                break;  
         default:
                 WARNING(("unknown service 0x%02x", pkt->service));
@@ -3150 +3349 @@
                                         break;
                                 case 5: 
-                                        if(cp != "\005")
+                                        if(strcmp(cp, "5") != 0)
                                                 yct->location = cp;
                                         k = 0;
@@ -3367 +3566 @@
 
                 if(yid->type == YAHOO_CONNECTION_PAGER) {
-                        YAHOO_CALLBACK(ext_yahoo_login_response)(yid->yd->client_id, YAHOO_LOGIN_SOCK, NULL);
+                        YAHOO_CALLBACK(ext_yahoo_error)(yid->yd->client_id, "Connection closed by server", 1, E_CONNECTION);
                 }
 
@@ -3515 +3714 @@
 }
 
-void yahoo_send_im(int id, const char *from, const char *who, const char *what, int utf8)
+void yahoo_send_im(int id, const char *from, const char *who, const char *what, int utf8, int picture)
 {
         struct yahoo_input_data *yid = find_input_by_id_and_type(id, YAHOO_CONNECTION_PAGER);
         struct yahoo_packet *pkt = NULL;
         struct yahoo_data *yd;
+        char pic_str[10];
 
         if(!yid)
@@ -3528 +3728 @@
         pkt = yahoo_packet_new(YAHOO_SERVICE_MESSAGE, YAHOO_STATUS_OFFLINE, yd->session_id);
 
+        snprintf(pic_str, sizeof(pic_str), "%d", picture);
+        
         if(from && strcmp(from, yd->user))
                 yahoo_packet_hash(pkt, 0, yd->user);
@@ -3539 +3741 @@
         yahoo_packet_hash(pkt, 63, ";0");       /* imvironment name; or ;0 */
         yahoo_packet_hash(pkt, 64, "0");
+        yahoo_packet_hash(pkt, 206, pic_str);
 
 
@@ -3591 +3794 @@
         else
                 service = YAHOO_SERVICE_ISAWAY;
-        pkt = yahoo_packet_new(service, yd->current_status, yd->session_id);
-        snprintf(s, sizeof(s), "%d", yd->current_status);
-        yahoo_packet_hash(pkt, 10, s);
-        if (yd->current_status == YAHOO_STATUS_CUSTOM) {
-                yahoo_packet_hash(pkt, 19, msg);
-                yahoo_packet_hash(pkt, 47, away?"1":"0");
+         
+        if ((away == 2) && (yd->current_status == YAHOO_STATUS_AVAILABLE)) {
+                pkt = yahoo_packet_new(YAHOO_SERVICE_ISAWAY, YAHOO_STATUS_BRB, yd->session_id);
+                yahoo_packet_hash(pkt, 10, "999");
+                yahoo_packet_hash(pkt, 47, "2");
+        }else {
+                pkt = yahoo_packet_new(service, YAHOO_STATUS_AVAILABLE, yd->session_id);
+                snprintf(s, sizeof(s), "%d", yd->current_status);
+                yahoo_packet_hash(pkt, 10, s);
+                if (yd->current_status == YAHOO_STATUS_CUSTOM) {
+                        yahoo_packet_hash(pkt, 19, msg);
+                        yahoo_packet_hash(pkt, 47, (away == 2)? "2": (away) ?"1":"0");
+                } else {
+                        yahoo_packet_hash(pkt, 47, (away == 2)? "2": (away) ?"1":"0");
+                }
+                
+                
+                
         }
 
@@ -3837 +4052 @@
 }
 
-void yahoo_add_buddy(int id, const char *who, const char *group)
+void yahoo_add_buddy(int id, const char *who, const char *group, const char *msg)
 {
         struct yahoo_input_data *yid = find_input_by_id_and_type(id, YAHOO_CONNECTION_PAGER);
@@ -3854 +4069 @@
         yahoo_packet_hash(pkt, 7, who);
         yahoo_packet_hash(pkt, 65, group);
+        if (msg != NULL) /* add message/request "it's me add me" */
+                yahoo_packet_hash(pkt, 14, msg);
         yahoo_send_packet(yid, pkt, 0);
         yahoo_packet_free(pkt);
@@ -3915 +4132 @@
         yahoo_packet_hash(pkt, 7, who);
         yahoo_packet_hash(pkt, 13, unignore?"2":"1");
+        yahoo_send_packet(yid, pkt, 0);
+        yahoo_packet_free(pkt);
+}
+
+void yahoo_stealth_buddy(int id, const char *who, int unstealth)
+{
+        struct yahoo_input_data *yid = find_input_by_id_and_type(id, YAHOO_CONNECTION_PAGER);
+        struct yahoo_data *yd;
+        struct yahoo_packet *pkt;
+
+        if(!yid)
+                return;
+        yd = yid->yd;
+
+        if (!yd->logged_in)
+                return;
+
+        pkt = yahoo_packet_new(YAHOO_SERVICE_STEALTH, YAHOO_STATUS_AVAILABLE, yd->session_id);
+        yahoo_packet_hash(pkt, 1, yd->user);
+        yahoo_packet_hash(pkt, 7, who);
+        yahoo_packet_hash(pkt, 31, unstealth?"2":"1");
+        yahoo_packet_hash(pkt, 13, "2");
         yahoo_send_packet(yid, pkt, 0);
         yahoo_packet_free(pkt);
@@ -4222 +4461 @@
         yahoo_packet_hash(pkt, 1, (from?from:yd->user));
 
+        yahoo_send_packet(yid, pkt, 0);
+
+        yahoo_packet_free(pkt);
+}
+
+void yahoo_buddyicon_request(int id, const char *who)
+{
+        struct yahoo_input_data *yid = find_input_by_id_and_type(id, YAHOO_CONNECTION_PAGER);
+        struct yahoo_data *yd;
+        struct yahoo_packet *pkt;
+
+        if( !yid )
+                return;
+
+        yd = yid->yd;
+        
+        pkt = yahoo_packet_new(YAHOO_SERVICE_PICTURE, YAHOO_STATUS_AVAILABLE, 0);
+        yahoo_packet_hash(pkt, 4, yd->user);
+        yahoo_packet_hash(pkt, 5, who);
+        yahoo_packet_hash(pkt, 13, "1");
+        yahoo_send_packet(yid, pkt, 0);
+
+        yahoo_packet_free(pkt);
+}
+
+void yahoo_send_picture_info(int id, const char *who, const char *url, int checksum)
+{
+        struct yahoo_input_data *yid = find_input_by_id_and_type(id, YAHOO_CONNECTION_PAGER);
+        struct yahoo_data *yd;
+        struct yahoo_packet *pkt;
+        char checksum_str[10];
+
+        if( !yid )
+                return;
+
+        yd = yid->yd;
+
+        snprintf(checksum_str, sizeof(checksum_str), "%d", checksum);
+
+        pkt = yahoo_packet_new(YAHOO_SERVICE_PICTURE, YAHOO_STATUS_AVAILABLE, 0);
+        yahoo_packet_hash(pkt, 1, yd->user);
+        yahoo_packet_hash(pkt, 4, yd->user);
+        yahoo_packet_hash(pkt, 5, who);
+        yahoo_packet_hash(pkt, 13, "2");
+        yahoo_packet_hash(pkt, 20, url);
+        yahoo_packet_hash(pkt, 192, checksum_str);
+        yahoo_send_packet(yid, pkt, 0);
+
+        yahoo_packet_free(pkt);
+}
+
+void yahoo_send_picture_update(int id, const char *who, int type)
+{
+        struct yahoo_input_data *yid = find_input_by_id_and_type(id, YAHOO_CONNECTION_PAGER);
+        struct yahoo_data *yd;
+        struct yahoo_packet *pkt;
+        char type_str[10];
+
+        if( !yid )
+                return;
+
+        yd = yid->yd;
+
+        snprintf(type_str, sizeof(type_str), "%d", type);
+
+        pkt = yahoo_packet_new(YAHOO_SERVICE_PICTURE_UPDATE, YAHOO_STATUS_AVAILABLE, 0);
+        yahoo_packet_hash(pkt, 1, yd->user);
+        yahoo_packet_hash(pkt, 5, who);
+        yahoo_packet_hash(pkt, 206, type_str);
+        yahoo_send_packet(yid, pkt, 0);
+
+        yahoo_packet_free(pkt);
+}
+
+void yahoo_send_picture_checksum(int id, const char *who, int checksum)
+{
+        struct yahoo_input_data *yid = find_input_by_id_and_type(id, YAHOO_CONNECTION_PAGER);
+        struct yahoo_data *yd;
+        struct yahoo_packet *pkt;
+        char checksum_str[10];
+
+        if( !yid )
+                return;
+
+        yd = yid->yd;
+        
+        snprintf(checksum_str, sizeof(checksum_str), "%d", checksum);
+
+        pkt = yahoo_packet_new(YAHOO_SERVICE_PICTURE_CHECKSUM, YAHOO_STATUS_AVAILABLE, 0);
+        yahoo_packet_hash(pkt, 1, yd->user);
+        if( who != 0 )
+                yahoo_packet_hash(pkt, 5, who);
+        yahoo_packet_hash(pkt, 192, checksum_str);
+        yahoo_packet_hash(pkt, 212, "1");
         yahoo_send_packet(yid, pkt, 0);
 
@@ -4430 +4763 @@
 };
 
+static void _yahoo_send_picture_connected(int id, int fd, int error, void *data)
+{
+        struct yahoo_input_data *yid = find_input_by_id_and_type(id, YAHOO_CONNECTION_FT);
+        struct send_file_data *sfd = data;
+        struct yahoo_packet *pkt = sfd->pkt;
+        unsigned char buff[1024];
+
+        if(fd <= 0) {
+                sfd->callback(id, fd, error, sfd->user_data);
+                FREE(sfd);
+                yahoo_packet_free(pkt);
+                inputs = y_list_remove(inputs, yid);
+                FREE(yid);
+                return;
+        }
+
+        yid->fd = fd;
+        yahoo_send_packet(yid, pkt, 8);
+        yahoo_packet_free(pkt);
+
+        snprintf((char *)buff, sizeof(buff), "29");
+        buff[2] = 0xc0;
+        buff[3] = 0x80;
+        
+        write(yid->fd, buff, 4);
+
+        /*      YAHOO_CALLBACK(ext_yahoo_add_handler)(nyd->fd, YAHOO_INPUT_READ); */
+
+        sfd->callback(id, fd, error, sfd->user_data);
+        FREE(sfd);
+        inputs = y_list_remove(inputs, yid);
+        /*
+        while(yahoo_tcp_readline(buff, sizeof(buff), nyd->fd) > 0) {
+        if(!strcmp(buff, ""))
+        break;
+}
+
+        */
+        yahoo_input_close(yid);
+}
+
+void yahoo_send_picture(int id, const char *name, unsigned long size,
+                                                        yahoo_get_fd_callback callback, void *data)
+{
+        struct yahoo_data *yd = find_conn_by_id(id);
+        struct yahoo_input_data *yid;
+        struct yahoo_server_settings *yss;
+        struct yahoo_packet *pkt = NULL;
+        char size_str[10];
+        char expire_str[10];
+        long content_length=0;
+        unsigned char buff[1024];
+        char url[255];
+        struct send_file_data *sfd;
+
+        if(!yd)
+                return;
+
+        yss = yd->server_settings;
+
+        yid = y_new0(struct yahoo_input_data, 1);
+        yid->yd = yd;
+        yid->type = YAHOO_CONNECTION_FT;
+
+        pkt = yahoo_packet_new(YAHOO_SERVICE_PICTURE_UPLOAD, YAHOO_STATUS_AVAILABLE, yd->session_id);
+
+        snprintf(size_str, sizeof(size_str), "%ld", size);
+        snprintf(expire_str, sizeof(expire_str), "%ld", (long)604800);
+
+        yahoo_packet_hash(pkt, 0, yd->user);
+        yahoo_packet_hash(pkt, 1, yd->user);
+        yahoo_packet_hash(pkt, 14, "");
+        yahoo_packet_hash(pkt, 27, name);
+        yahoo_packet_hash(pkt, 28, size_str);
+        yahoo_packet_hash(pkt, 38, expire_str);
+        
+
+        content_length = YAHOO_PACKET_HDRLEN + yahoo_packet_length(pkt);
+
+        snprintf(url, sizeof(url), "http://%s:%d/notifyft",
+                                yss->filetransfer_host, yss->filetransfer_port);
+        snprintf((char *)buff, sizeof(buff), "Y=%s; T=%s",
+                                 yd->cookie_y, yd->cookie_t);
+        inputs = y_list_prepend(inputs, yid);
+
+        sfd = y_new0(struct send_file_data, 1);
+        sfd->pkt = pkt;
+        sfd->callback = callback;
+        sfd->user_data = data;
+        yahoo_http_post(yid->yd->client_id, url, (char *)buff, content_length+4+size,
+                                                _yahoo_send_picture_connected, sfd);
+}
+
 static void _yahoo_send_file_connected(int id, int fd, int error, void *data)
 {

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){}

protocols/yahoo/yahoo2.h

@@ -120 +120 @@
 /* from is the identity you're sending from.  if NULL, the default is used */
 /* utf8 is whether msg is a utf8 string or not. */
-void yahoo_send_im(int id, const char *from, const char *who, const char *msg, int utf8);
+void yahoo_send_im(int id, const char *from, const char *who, const char *msg, int utf8, int picture);
 /* if type is true, send typing notice, else send stopped typing notice */
 void yahoo_send_typing(int id, const char *from, const char *who, int typ);
@@ -128 +128 @@
 void yahoo_set_away(int id, enum yahoo_status state, const char *msg, int away);
 
-void yahoo_add_buddy(int id, const char *who, const char *group);
+void yahoo_add_buddy(int id, const char *who, const char *group, const char *msg);
 void yahoo_remove_buddy(int id, const char *who, const char *group);
 void yahoo_reject_buddy(int id, const char *who, const char *msg);
+void yahoo_stealth_buddy(int id, const char *who, int unstealth);
 /* if unignore is true, unignore, else ignore */
 void yahoo_ignore_buddy(int id, const char *who, int unignore);
@@ -214 +215 @@
 const char  * yahoo_get_profile_url( void );
 
+void yahoo_buddyicon_request(int id, const char *who);
+
 #include "yahoo_httplib.h"
 

protocols/yahoo/yahoo2_callbacks.h

@@ -29 +29 @@
  * declared in this file and defined in libyahoo2.c
  */
-
 
 
@@ -67 +66 @@
 
 
-
 /*
  * The following functions need to be implemented in the client
@@ -96 +94 @@
  *      url  - url to reactivate account if locked
  */
-void YAHOO_CALLBACK_TYPE(ext_yahoo_login_response)(int id, int succ, char *url);
-
-
+void YAHOO_CALLBACK_TYPE(ext_yahoo_login_response)(int id, int succ, const char *url);
 
 
@@ -111 +107 @@
 
 
-
-
 /*
  * Name: ext_yahoo_got_ignore
@@ -123 +117 @@
 
 
-
-
-
 /*
  * Name: ext_yahoo_got_identities
@@ -136 +127 @@
 
 
-
-
-
 /*
  * Name: ext_yahoo_got_cookies
@@ -148 +136 @@
 
 
+/*
+ * Name: ext_yahoo_got_ping
+ *      Called when the ping packet is received from the server
+ * Params:
+ *      id   - the id that identifies the server connection
+ *  errormsg - optional error message
+ */
+void YAHOO_CALLBACK_TYPE(ext_yahoo_got_ping)(int id, const char *errormsg);
 
 
@@ -159 +155 @@
  *      msg  - the message if stat == YAHOO_STATUS_CUSTOM
  *      away - whether the contact is away or not (YAHOO_STATUS_CUSTOM)
- *             for YAHOO_STATUS_IDLE, this is the number of seconds he is idle
- */
-void YAHOO_CALLBACK_TYPE(ext_yahoo_status_changed)(int id, char *who, int stat, char *msg, int away);
-
-
+ *      idle - this is the number of seconds he is idle [if he is idle]
+ *      mobile - this is set for mobile users/buddies
+ *      TODO: add support for pager, chat, and game states
+ */
+void YAHOO_CALLBACK_TYPE(ext_yahoo_status_changed)(int id, const char *who, int stat, const char *msg, int away, int idle, int mobile);
 
 
@@ -171 +167 @@
  * Params:
  *      id   - the id that identifies the server connection
+ *      me   - the identity the message was sent to
  *      who  - the handle of the remote user
  *      msg  - the message - NULL if stat == 2
@@ -180 +177 @@
  *      utf8 - whether the message is encoded as utf8 or not
  */
-void YAHOO_CALLBACK_TYPE(ext_yahoo_got_im)(int id, char *who, char *msg, long tm, int stat, int utf8);
-
-
+void YAHOO_CALLBACK_TYPE(ext_yahoo_got_im)(int id, const char *me, const char *who, const char *msg, long tm, int stat, int utf8);
 
 
@@ -190 +185 @@
  * Params:
  *      id   - the id that identifies the server connection
+ *      me   - the identity the invitation was sent to
  *      who  - the user inviting you
  *      room - the room to join
@@ -195 +191 @@
  *      members - the initial members of the conference (null terminated list)
  */
-void YAHOO_CALLBACK_TYPE(ext_yahoo_got_conf_invite)(int id, char *who, char *room, char *msg, YList *members);
-
-
+void YAHOO_CALLBACK_TYPE(ext_yahoo_got_conf_invite)(int id, const char *me, const char *who, const char *room, const char *msg, YList *members);
 
 
@@ -205 +199 @@
  * Params:
  *      id   - the id that identifies the server connection
+ *      me   - the identity in the conference
  *      who  - the user who has declined
  *      room - the room
  *      msg  - the declining message
  */
-void YAHOO_CALLBACK_TYPE(ext_yahoo_conf_userdecline)(int id, char *who, char *room, char *msg);
-
-
+void YAHOO_CALLBACK_TYPE(ext_yahoo_conf_userdecline)(int id, const char *me, const char *who, const char *room, const char *msg);
 
 
@@ -219 +212 @@
  * Params:
  *      id   - the id that identifies the server connection
+ *      me   - the identity in the conference
  *      who  - the user who has joined
  *      room - the room joined
  */
-void YAHOO_CALLBACK_TYPE(ext_yahoo_conf_userjoin)(int id, char *who, char *room);
-
-
+void YAHOO_CALLBACK_TYPE(ext_yahoo_conf_userjoin)(int id, const char *me, const char *who, const char *room);
 
 
@@ -232 +224 @@
  * Params:
  *      id   - the id that identifies the server connection
+ *      me   - the identity in the conference
  *      who  - the user who has left
  *      room - the room left
  */
-void YAHOO_CALLBACK_TYPE(ext_yahoo_conf_userleave)(int id, char *who, char *room);
-
-
-
-
+void YAHOO_CALLBACK_TYPE(ext_yahoo_conf_userleave)(int id, const char *me, const char *who, const char *room);
 
 
 /*
  * Name: ext_yahoo_chat_cat_xml
- *      Called when joining the chatroom.
+ *      Called when ?
  * Params:
  *      id      - the id that identifies the server connection
- *      room    - the room joined, used in all other chat calls, freed by 
- *                library after call
- *      topic   - the topic of the room, freed by library after call
- *      members - the initial members of the chatroom (null terminated YList of 
- *                yahoo_chat_member's) Must be freed by the client
- */
-void YAHOO_CALLBACK_TYPE(ext_yahoo_chat_cat_xml)(int id, char *xml);
-
-
-
-
-
+ *      xml     - ?
+ */
+void YAHOO_CALLBACK_TYPE(ext_yahoo_chat_cat_xml)(int id, const char *xml);
 
 
@@ -266 +246 @@
  * Params:
  *      id      - the id that identifies the server connection
+ *      me   - the identity in the chatroom
  *      room    - the room joined, used in all other chat calls, freed by 
  *                library after call
@@ -273 +254 @@
  *      fd      - the socket where the connection is coming from (for tracking)
  */
-void YAHOO_CALLBACK_TYPE(ext_yahoo_chat_join)(int id, char *room, char *topic, YList *members, int fd);
-
-
-
-
+void YAHOO_CALLBACK_TYPE(ext_yahoo_chat_join)(int id, const char *me, const char *room, const char *topic, YList *members, int fd);
 
 
@@ -285 +262 @@
  * Params:
  *      id   - the id that identifies the server connection
+ *      me   - the identity in the chatroom
  *      room - the room joined
  *      who  - the user who has joined, Must be freed by the client
  */
-void YAHOO_CALLBACK_TYPE(ext_yahoo_chat_userjoin)(int id, char *room, struct yahoo_chat_member *who);
-
-
+void YAHOO_CALLBACK_TYPE(ext_yahoo_chat_userjoin)(int id, const char *me, const char *room, struct yahoo_chat_member *who);
 
 
@@ -298 +274 @@
  * Params:
  *      id   - the id that identifies the server connection
+ *      me   - the identity in the chatroom
  *      room - the room left
  *      who  - the user who has left (Just the User ID)
  */
-void YAHOO_CALLBACK_TYPE(ext_yahoo_chat_userleave)(int id, char *room, char *who);
-
-
+void YAHOO_CALLBACK_TYPE(ext_yahoo_chat_userleave)(int id, const char *me, const char *room, const char *who);
 
 
@@ -311 +286 @@
  * Params:
  *      id   - the id that identifies the server connection
+ *      me   - the identity in the chatroom
  *      room - the room
  *      who  - the user who messaged (Just the user id)
@@ -318 +294 @@
  *      utf8 - whether the message is utf8 encoded or not
  */
-void YAHOO_CALLBACK_TYPE(ext_yahoo_chat_message)(int id, char *who, char *room, char *msg, int msgtype, int utf8);
+void YAHOO_CALLBACK_TYPE(ext_yahoo_chat_message)(int id, const char *me, const char *who, const char *room, const char *msg, int msgtype, int utf8);
+
 
 /*
@@ -329 +306 @@
  * Params:
  *      id   - the id that identifies this connection
+ *      me   - the identity in the chatroom
  * Returns:
  *      nothing.
  */
-void YAHOO_CALLBACK_TYPE(ext_yahoo_chat_yahoologout)(int id);
+void YAHOO_CALLBACK_TYPE(ext_yahoo_chat_yahoologout)(int id, const char *me);
+
 
 /*
@@ -344 +323 @@
  * Params:
  *      id   - the id that identifies this connection
+ *      me   - the identity in the chatroom
  * Returns:
  *      nothing.
  */
-
-void YAHOO_CALLBACK_TYPE(ext_yahoo_chat_yahooerror)(int id);
+void YAHOO_CALLBACK_TYPE(ext_yahoo_chat_yahooerror)(int id, const char *me);
+
 
 /*
@@ -355 +335 @@
  * Params:
  *      id   - the id that identifies the server connection
+ *      me   - the identity the conf message was sent to
  *      who  - the user who messaged
  *      room - the room
@@ -360 +341 @@
  *      utf8 - whether the message is utf8 encoded or not
  */
-void YAHOO_CALLBACK_TYPE(ext_yahoo_conf_message)(int id, char *who, char *room, char *msg, int utf8);
-
-
+void YAHOO_CALLBACK_TYPE(ext_yahoo_conf_message)(int id, const char *me, const char *who, const char *room, const char *msg, int utf8);
 
 
@@ -370 +349 @@
  * Params:
  *      id   - the id that identifies the server connection
+ *      me   - the identity the file was sent to
  *      who  - the user who sent the file
  *      url  - the file url
@@ -377 +357 @@
  *      fsize- the file size if direct transfer
  */
-void YAHOO_CALLBACK_TYPE(ext_yahoo_got_file)(int id, char *who, char *url, long expires, char *msg, char *fname, unsigned long fesize);
-
-
+void YAHOO_CALLBACK_TYPE(ext_yahoo_got_file)(int id, const char *me, const char *who, const char *url, long expires, const char *msg, const char *fname, unsigned long fesize);
 
 
@@ -391 +369 @@
  *      msg  - any message sent
  */
-void YAHOO_CALLBACK_TYPE(ext_yahoo_contact_added)(int id, char *myid, char *who, char *msg);
-
-
+void YAHOO_CALLBACK_TYPE(ext_yahoo_contact_added)(int id, const char *myid, const char *who, const char *msg);
 
 
@@ -404 +380 @@
  *      msg  - any message sent
  */
-void YAHOO_CALLBACK_TYPE(ext_yahoo_rejected)(int id, char *who, char *msg);
-
-
+void YAHOO_CALLBACK_TYPE(ext_yahoo_rejected)(int id, const char *who, const char *msg);
 
 
@@ -414 +388 @@
  * Params:
  *      id   - the id that identifies the server connection
+ *      me   - the handle of the identity the notification is sent to
  *      who  - the handle of the remote user
  *      stat - 1 if typing, 0 if stopped typing
  */
-void YAHOO_CALLBACK_TYPE(ext_yahoo_typing_notify)(int id, char *who, int stat);
-
-
+void YAHOO_CALLBACK_TYPE(ext_yahoo_typing_notify)(int id, const char *me, const char *who, int stat);
 
 
@@ -427 +400 @@
  * Params:
  *      id   - the id that identifies the server connection
+ *      me   - the handle of the identity the notification is sent to
  *      who  - the handle of the remote user
  *      stat - 1 if game, 0 if stopped gaming
  */
-void YAHOO_CALLBACK_TYPE(ext_yahoo_game_notify)(int id, char *who, int stat);
-
-
+void YAHOO_CALLBACK_TYPE(ext_yahoo_game_notify)(int id, const char *me, const char *who, int stat);
 
 
@@ -444 +416 @@
  *      cnt  - mail count - 0 if new mail notification
  */
-void YAHOO_CALLBACK_TYPE(ext_yahoo_mail_notify)(int id, char *from, char *subj, int cnt);
-
-
+void YAHOO_CALLBACK_TYPE(ext_yahoo_mail_notify)(int id, const char *from, const char *subj, int cnt);
 
 
@@ -456 +426 @@
  *      msg  - the message
  */
-void YAHOO_CALLBACK_TYPE(ext_yahoo_system_message)(int id, char *msg);
-
-
-
-
-
-
-
-
-
-
+void YAHOO_CALLBACK_TYPE(ext_yahoo_system_message)(int id, const char *msg);
+
+/*
+ * Name: ext_yahoo_got_buddyicon
+ *      Buddy icon received
+ * Params:
+ *      id - the id that identifies the server connection
+ *      me - the handle of the identity the notification is sent to
+ *      who - the person the buddy icon is for
+ *      url - the url to use to load the icon
+ *      checksum - the checksum of the icon content
+ */
+void YAHOO_CALLBACK_TYPE(ext_yahoo_got_buddyicon)(int id, const char *me, const char *who, const char *url, int checksum);
+
+/*
+ * Name: ext_yahoo_got_buddyicon_checksum
+ *      Buddy icon checksum received
+ * Params:
+ *      id - the id that identifies the server connection
+ *      me - the handle of the identity the notification is sent to
+ *      who - the yahoo id of the buddy icon checksum is for
+ *      checksum - the checksum of the icon content
+ */
+void YAHOO_CALLBACK_TYPE(ext_yahoo_got_buddyicon_checksum)(int id, const char *me,const char *who, int checksum);
+
+/*
+ * Name: ext_yahoo_got_buddyicon_request
+ *      Buddy icon request received
+ * Params:
+ *      id - the id that identifies the server connection
+ *      me - the handle of the identity the notification is sent to
+ *      who - the yahoo id of the buddy that requested the buddy icon
+ */
+void YAHOO_CALLBACK_TYPE(ext_yahoo_got_buddyicon_request)(int id, const char *me, const char *who);
+
+/*
+ * Name: ext_yahoo_got_buddyicon_request
+ *      Buddy icon request received
+ * Params:
+ *      id - the id that identifies the server connection
+ *      url - remote url, the uploaded buddy icon can be fetched from
+ */
+void YAHOO_CALLBACK_TYPE(ext_yahoo_buddyicon_uploaded)(int id, const char *url);
 
 /*
@@ -496 +498 @@
 
 
-
-
 /*
  * Name: ext_yahoo_webcam_invite
@@ -503 +503 @@
  * Params:
  *      id   - the id that identifies the server connection
+ *      me   - identity the invitation is to
  *      from - who the invitation is from
  */
-void YAHOO_CALLBACK_TYPE(ext_yahoo_webcam_invite)(int id, char *from);
-
-
+void YAHOO_CALLBACK_TYPE(ext_yahoo_webcam_invite)(int id, const char *me, const char *from);
 
 
@@ -515 +514 @@
  * Params:
  *      id   - the id that identifies the server connection
+ *      me   - identity the invitation response is to
  *      from - who the invitation response is from
  *      accept - 0 (decline), 1 (accept)
  */
-void YAHOO_CALLBACK_TYPE(ext_yahoo_webcam_invite_reply)(int id, char *from, int accept);
-
+void YAHOO_CALLBACK_TYPE(ext_yahoo_webcam_invite_reply)(int id, const char *me, const char *from, int accept);
 
 
@@ -534 +533 @@
  *               4 = user does not have webcam online
  */
-void YAHOO_CALLBACK_TYPE(ext_yahoo_webcam_closed)(int id, char *who, int reason);
+void YAHOO_CALLBACK_TYPE(ext_yahoo_webcam_closed)(int id, const char *who, int reason);
 
 
@@ -552 +551 @@
 
 
-
 /*
  * Name: ext_yahoo_error
@@ -560 +558 @@
  *      err  - the error message
  *      fatal- whether this error is fatal to the connection or not
- */
-void YAHOO_CALLBACK_TYPE(ext_yahoo_error)(int id, char *err, int fatal);
-
-
+ *      num  - Which error is this
+ */
+void YAHOO_CALLBACK_TYPE(ext_yahoo_error)(int id, const char *err, int fatal, int num);
 
 
@@ -574 +571 @@
  *      connect - 0=disconnect 1=connect 2=request
  */
-void YAHOO_CALLBACK_TYPE(ext_yahoo_webcam_viewer)(int id, char *who, int connect);
-
-
+void YAHOO_CALLBACK_TYPE(ext_yahoo_webcam_viewer)(int id, const char *who, int connect);
 
 
@@ -587 +582 @@
  */
 void YAHOO_CALLBACK_TYPE(ext_yahoo_webcam_data_request)(int id, int send);
-
-
 
 
@@ -599 +592 @@
  *      0
  */
-int YAHOO_CALLBACK_TYPE(ext_yahoo_log)(char *fmt, ...);
-
-
-
-
-
-
+int YAHOO_CALLBACK_TYPE(ext_yahoo_log)(const char *fmt, ...);
 
 
@@ -624 +611 @@
 
 
-
-
 /*
  * Name: ext_yahoo_remove_handler
@@ -634 +619 @@
  */
 void YAHOO_CALLBACK_TYPE(ext_yahoo_remove_handler)(int id, int tag);
-
-
-
 
 
@@ -648 +630 @@
  *      a unix file descriptor to the socket
  */
-int YAHOO_CALLBACK_TYPE(ext_yahoo_connect)(char *host, int port);
-
-
-
-
-
-
+int YAHOO_CALLBACK_TYPE(ext_yahoo_connect)(const char *host, int port);
 
 
@@ -675 +651 @@
  *      a unix file descriptor to the socket
  */
-int YAHOO_CALLBACK_TYPE(ext_yahoo_connect_async)(int id, char *host, int port, 
+int YAHOO_CALLBACK_TYPE(ext_yahoo_connect_async)(int id, const char *host, int port, 
                 yahoo_connect_callback callback, void *callback_data);
 
@@ -686 +662 @@
  */
 void yahoo_register_callbacks(struct yahoo_callbacks * tyc);
-        
+
 #undef YAHOO_CALLBACK_TYPE
 
@@ -696 +672 @@
 
 #endif
+

protocols/yahoo/yahoo2_types.h

@@ -30 +30 @@
 
 enum yahoo_status {
+        YAHOO_STATUS_DISCONNECTED = -1,
         YAHOO_STATUS_AVAILABLE = 0,
         YAHOO_STATUS_BRB,
@@ -43 +44 @@
         YAHOO_STATUS_CUSTOM = 99,
         YAHOO_STATUS_IDLE = 999,
+        YAHOO_STATUS_WEBLOGIN = 0x5a55aa55,
         YAHOO_STATUS_OFFLINE = 0x5a55aa56, /* don't ask */
-        YAHOO_STATUS_NOTIFY = 0x16
+        YAHOO_STATUS_NOTIFY = 0x16 /* TYPING */
 };
 #define YAHOO_STATUS_GAME       0x2             /* Games don't fit into the regular status model */
@@ -50 +52 @@
 enum yahoo_login_status {
         YAHOO_LOGIN_OK = 0,
+        YAHOO_LOGIN_LOGOFF = 2,
         YAHOO_LOGIN_UNAME = 3,
         YAHOO_LOGIN_PASSWD = 13,
@@ -58 +61 @@
 
 enum yahoo_error {
+        E_UNKNOWN = -1,
+        E_CONNECTION = -2,
+        E_SYSTEM = -3,
         E_CUSTOM = 0,
 
@@ -79 +85 @@
 };
 
+#define YAHOO_PROTO_VER 0x000b
 
 /* Yahoo style/color directives */
@@ -116 +123 @@
 };
 
+enum yahoo_stealth_visibility_type {
+        YAHOO_STEALTH_DEFAULT = 0,
+        YAHOO_STEALTH_ONLINE,
+        YAHOO_STEALTH_PERM_OFFLINE
+};
+
 /* chat member attribs */
 #define YAHOO_CHAT_MALE 0x8000

protocols/yahoo/yahoo_util.c

@@ -69 +69 @@
         int i=0;
         int l = strlen(sep);
-        if(nelem < 0) {
+        if(nelem <= 0) {
                 char * s;
                 nelem=0;
-                for(s=strstr(str, sep); s; s=strstr(s+l, sep),nelem++)
-                        ;
-                if(strcmp(str+strlen(str)-l, sep))
-                        nelem++;
+                if (*str) {
+                        for(s=strstr(str, sep); s; s=strstr(s+l, sep),nelem++)
+                                ;
+                        if(strcmp(str+strlen(str)-l, sep))
+                                nelem++;
+                }
         }
 
@@ -87 +89 @@
         }
 
-        if(i<nelem) /* str didn't end with sep */
+        if(i<nelem && *str) /* str didn't end with sep, and str isn't empty */
                 vector[i++] = strdup(p);