Changeset e8c8d00 for protocols

Timestamp:

2010-03-17T15:15:19Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

60e4df3

Parents:

1c3008a (diff), f9928cb (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:

Merging mainline.

Location:

protocols

Files:

• jabber/io.c (modified) (3 diffs)
• jabber/iq.c (modified) (2 diffs)
• jabber/jabber.c (modified) (4 diffs)
• jabber/jabber.h (modified) (2 diffs)
• jabber/jabber_util.c (modified) (3 diffs)
• jabber/presence.c (modified) (3 diffs)
• msn/msn.c (modified) (3 diffs)
• msn/msn.h (modified) (3 diffs)
• msn/msn_util.c (modified) (2 diffs)
• msn/ns.c (modified) (5 diffs)
• msn/tables.c (modified) (3 diffs)
• nogaim.c (modified) (16 diffs)
• nogaim.h (modified) (6 diffs)
• oscar/oscar.c (modified) (6 diffs)
• yahoo/libyahoo2.c (modified) (12 diffs)
• yahoo/yahoo.c (modified) (5 diffs)
• yahoo/yahoo2_types.h (modified) (2 diffs)

protocols/jabber/io.c

@@ -375 +375 @@
         
         if( ( c = xt_find_node( node->children, "bind" ) ) )
-        {
-                reply = xt_new_node( "bind", NULL, xt_new_node( "resource", set_getstr( &ic->acc->set, "resource" ), NULL ) );
-                xt_add_attr( reply, "xmlns", XMLNS_BIND );
-                reply = jabber_make_packet( "iq", "set", NULL, reply );
-                jabber_cache_add( ic, reply, jabber_pkt_bind_sess );
-                
-                if( !jabber_write_packet( ic, reply ) )
-                        return XT_ABORT;
-                
-                jd->flags |= JFLAG_WAIT_BIND;
-        }
+                jd->flags |= JFLAG_WANT_BIND;
         
         if( ( c = xt_find_node( node->children, "session" ) ) )
-        {
-                reply = xt_new_node( "session", NULL, NULL );
-                xt_add_attr( reply, "xmlns", XMLNS_SESSION );
-                reply = jabber_make_packet( "iq", "set", NULL, reply );
-                jabber_cache_add( ic, reply, jabber_pkt_bind_sess );
-                
-                if( !jabber_write_packet( ic, reply ) )
-                        return XT_ABORT;
-                
-                jd->flags |= JFLAG_WAIT_SESSION;
-        }
-        
-        /* This flag is already set if we authenticated via SASL, so now
-           we can resume the session in the new stream, if we don't have
-           to bind/initialize the session. */
-        if( jd->flags & JFLAG_AUTHENTICATED && ( jd->flags & ( JFLAG_WAIT_BIND | JFLAG_WAIT_SESSION ) ) == 0 )
-        {
-                if( !jabber_get_roster( ic ) )
-                        return XT_ABORT;
-        }
+                jd->flags |= JFLAG_WANT_SESSION;
+        
+        if( jd->flags & JFLAG_AUTHENTICATED )
+                return jabber_pkt_bind_sess( ic, NULL, NULL );
         
         return XT_HANDLED;
@@ -441 +415 @@
         imcb_log( ic, "Converting stream to TLS" );
         
+        jd->flags |= JFLAG_STARTTLS_DONE;
         jd->ssl = ssl_starttls( jd->fd, jabber_connected_ssl, ic );
         
@@ -531 +506 @@
                 jd->r_inpa = b_input_add( jd->fd, GAIM_INPUT_READ, jabber_read_callback, ic );
         
-        greet = g_strdup_printf( "<?xml version='1.0' ?>"
-                                 "<stream:stream to=\"%s\" xmlns=\"jabber:client\" "
-                                  "xmlns:stream=\"http://etherx.jabber.org/streams\" version=\"1.0\">", jd->server );
+        greet = g_strdup_printf( "%s<stream:stream to=\"%s\" xmlns=\"jabber:client\" "
+                                  "xmlns:stream=\"http://etherx.jabber.org/streams\" version=\"1.0\">", 
+                                  ( jd->flags & JFLAG_STARTTLS_DONE ) ? "" : "<?xml version='1.0' ?>",
+                                  jd->server );
         
         st = jabber_write( ic, greet, strlen( greet ) );

protocols/jabber/iq.c

@@ -310 +310 @@
 {
         struct jabber_data *jd = ic->proto_data;
-        struct xt_node *c;
+        struct xt_node *c, *reply = NULL;
         char *s;
         
-        if( ( c = xt_find_node( node->children, "bind" ) ) )
+        if( node && ( c = xt_find_node( node->children, "bind" ) ) )
         {
                 c = xt_find_node( c->children, "jid" );
@@ -319 +319 @@
                     strcmp( s + 1, set_getstr( &ic->acc->set, "resource" ) ) != 0 )
                         imcb_log( ic, "Server changed session resource string to `%s'", s + 1 );
-                
-                jd->flags &= ~JFLAG_WAIT_BIND;
-        }
-        else
-        {
-                jd->flags &= ~JFLAG_WAIT_SESSION;
-        }
-        
-        if( ( jd->flags & ( JFLAG_WAIT_BIND | JFLAG_WAIT_SESSION ) ) == 0 )
+        }
+        
+        if( jd->flags & JFLAG_WANT_BIND )
+        {
+                reply = xt_new_node( "bind", NULL, xt_new_node( "resource", set_getstr( &ic->acc->set, "resource" ), NULL ) );
+                xt_add_attr( reply, "xmlns", XMLNS_BIND );
+                jd->flags &= ~JFLAG_WANT_BIND;
+        }
+        else if( jd->flags & JFLAG_WANT_SESSION )
+        {
+                reply = xt_new_node( "session", NULL, NULL );
+                xt_add_attr( reply, "xmlns", XMLNS_SESSION );
+                jd->flags &= ~JFLAG_WANT_SESSION;
+        }
+        
+        if( reply != NULL )
+        {
+                reply = jabber_make_packet( "iq", "set", NULL, reply );
+                jabber_cache_add( ic, reply, jabber_pkt_bind_sess );
+                
+                if( !jabber_write_packet( ic, reply ) )
+                        return XT_ABORT;
+        }
+        else if( ( jd->flags & ( JFLAG_WANT_BIND | JFLAG_WANT_SESSION ) ) == 0 )
         {
                 if( !jabber_get_roster( ic ) )

protocols/jabber/jabber.c

@@ -69 +69 @@
         s->flags |= ACC_SET_OFFLINE_ONLY;
         
-        s = set_add( &acc->set, "resource_select", "priority", NULL, acc );
+        s = set_add( &acc->set, "resource_select", "activity", NULL, acc );
         
         s = set_add( &acc->set, "server", NULL, set_eval_account, acc );
@@ -82 +82 @@
         s = set_add( &acc->set, "xmlconsole", "false", set_eval_bool, acc );
         s->flags |= ACC_SET_OFFLINE_ONLY;
+        
+        acc->flags |= ACC_FLAG_AWAY_MESSAGE | ACC_FLAG_STATUS_MESSAGE;
 }
 
@@ -378 +380 @@
         while( bud )
         {
-                imcb_log( ic, "Buddy %s (%d) information:\nAway state: %s\nAway message: %s",
-                                   bud->full_jid, bud->priority,
-                                   bud->away_state ? bud->away_state->full_name : "(none)",
-                                   bud->away_message ? : "(none)" );
+                imcb_log( ic, "Buddy %s (%d) information:", bud->full_jid, bud->priority );
+                if( bud->away_state )
+                        imcb_log( ic, "Away state: %s", bud->away_state->full_name );
+                imcb_log( ic, "Status message: %s", bud->away_message ? : "(none)" );
+                
                 bud = bud->next;
         }
@@ -391 +394 @@
 {
         struct jabber_data *jd = ic->proto_data;
-        struct jabber_away_state *state;
-        
-        /* Save all this info. We need it, for example, when changing the priority setting. */
-        state = (void *) jabber_away_state_by_name( state_txt );
-        jd->away_state = state ? state : (void *) jabber_away_state_list; /* Fall back to "Away" if necessary. */
+        
+        /* state_txt == NULL -> Not away.
+           Unknown state -> fall back to the first defined away state. */
+        jd->away_state = state_txt ? jabber_away_state_by_name( state_txt )
+                         ? : jabber_away_state_list : NULL;
+        
         g_free( jd->away_message );
         jd->away_message = ( message && *message ) ? g_strdup( message ) : NULL;

protocols/jabber/jabber.h

@@ -40 +40 @@
         JFLAG_STREAM_RESTART = 4,       /* Set when we want to restart the stream (after
                                            SASL or TLS). */
-        JFLAG_WAIT_SESSION = 8,         /* Set if we sent a <session> tag and need a reply
+        JFLAG_WANT_SESSION = 8,         /* Set if the server wants a <session/> tag
                                            before we continue. */
-        JFLAG_WAIT_BIND = 16,           /* ... for <bind> tag. */
+        JFLAG_WANT_BIND = 16,           /* ... for <bind> tag. */
         JFLAG_WANT_TYPING = 32,         /* Set if we ever sent a typing notification, this
                                            activates all XEP-85 related code. */
         JFLAG_XMLCONSOLE = 64,          /* If the user added an xmlconsole buddy. */
+        JFLAG_STARTTLS_DONE = 128,      /* If a plaintext session was converted to TLS. */
 } jabber_flags_t;
 
@@ -92 +93 @@
         /* After changing one of these two (or the priority setting), call
            presence_send_update() to inform the server about the changes. */
-        struct jabber_away_state *away_state;
+        const struct jabber_away_state *away_state;
         char *away_message;
         

protocols/jabber/jabber_util.c

@@ -232 +232 @@
 {
         { "away",  "Away" },
-        { "chat",  "Free for Chat" },
+        { "chat",  "Free for Chat" },   /* WTF actually uses this? */
         { "dnd",   "Do not Disturb" },
         { "xa",    "Extended Away" },
-        { "",      "Online" },
         { "",      NULL }
 };
@@ -242 +241 @@
 {
         int i;
+        
+        if( code == NULL )
+                return NULL;
         
         for( i = 0; jabber_away_state_list[i].full_name; i ++ )
@@ -253 +255 @@
 {
         int i;
+        
+        if( name == NULL )
+                return NULL;
         
         for( i = 0; jabber_away_state_list[i].full_name; i ++ )

protocols/jabber/presence.c

@@ -190 +190 @@
                 int is_away = 0;
 
-                if( send_presence->away_state && !( *send_presence->away_state->code == 0 ||
-                    strcmp( send_presence->away_state->code, "chat" ) == 0 ) )
+                if( send_presence->away_state &&
+                    strcmp( send_presence->away_state->code, "chat" ) != 0 )
                         is_away = OPT_AWAY;
 
                 imcb_buddy_status( ic, send_presence->bare_jid, OPT_LOGGED_IN | is_away,
-                                   ( is_away && send_presence->away_state ) ?
-                                   send_presence->away_state->full_name : NULL,
+                                   is_away ? send_presence->away_state->full_name : NULL,
                                    send_presence->away_message );
         }
@@ -209 +208 @@
         struct jabber_data *jd = ic->proto_data;
         struct xt_node *node, *cap;
-        char *show = jd->away_state->code;
-        char *status = jd->away_message;
         struct groupchat *c;
         int st;
@@ -216 +213 @@
         node = jabber_make_packet( "presence", NULL, NULL, NULL );
         xt_add_child( node, xt_new_node( "priority", set_getstr( &ic->acc->set, "priority" ), NULL ) );
-        if( show && *show )
-                xt_add_child( node, xt_new_node( "show", show, NULL ) );
-        if( status )
-                xt_add_child( node, xt_new_node( "status", status, NULL ) );
+        if( jd->away_state )
+                xt_add_child( node, xt_new_node( "show", jd->away_state->code, NULL ) );
+        if( jd->away_message )
+                xt_add_child( node, xt_new_node( "status", jd->away_message, NULL ) );
         
         /* This makes the packet slightly bigger, but clients interested in

protocols/msn/msn.c

@@ -26 +26 @@
 #include "nogaim.h"
 #include "msn.h"
+
+int msn_chat_id;
+GSList *msn_connections;
+GSList *msn_switchboards;
 
 static char *msn_set_display_name( set_t *set, char *value );
@@ -143 +147 @@
         
         if( l == NULL )
-                for( i = 0; msn_away_state_list[i].number > -1; i ++ )
-                        l = g_list_append( l, (void*) msn_away_state_list[i].name );
+                for( i = 0; *msn_away_state_list[i].code; i ++ )
+                        if( *msn_away_state_list[i].name )
+                                l = g_list_append( l, (void*) msn_away_state_list[i].name );
         
         return l;
@@ -153 +158 @@
         char buf[1024];
         struct msn_data *md = ic->proto_data;
-        const struct msn_away_state *st;
-        
-        if( strcmp( state, GAIM_AWAY_CUSTOM ) == 0 )
-                st = msn_away_state_by_name( "Away" );
+        
+        if( state )
+                md->away_state = msn_away_state_by_name( state ) ? :
+                                 msn_away_state_list + 1;
         else
-                st = msn_away_state_by_name( state );
-        
-        if( !st ) st = msn_away_state_list;
-        md->away_state = st;
-        
-        g_snprintf( buf, sizeof( buf ), "CHG %d %s\r\n", ++md->trId, st->code );
+                md->away_state = msn_away_state_list;
+        
+        g_snprintf( buf, sizeof( buf ), "CHG %d %s\r\n", ++md->trId, md->away_state->code );
         msn_write( ic, buf, strlen( buf ) );
 }

protocols/msn/msn.h

@@ -98 +98 @@
 struct msn_away_state
 {
-        int number;
         char code[4];
         char name[16];
@@ -137 +136 @@
 #define STATUS_SB_CHAT_SPARE    8       /* Same, but also for groupchats (not used yet). */
 
-int msn_chat_id;
+extern int msn_chat_id;
 extern const struct msn_away_state msn_away_state_list[];
 extern const struct msn_status_code msn_status_code_list[];
@@ -146 +145 @@
    connection), the callback should check whether it's still listed here
    before doing *anything* else. */
-GSList *msn_connections;
-GSList *msn_switchboards;
+extern GSList *msn_connections;
+extern GSList *msn_switchboards;
 
 /* ns.c */

protocols/msn/msn_util.c

@@ -171 +171 @@
                 
                 /* End of headers? */
-                if( strncmp( text + i - 2, "\n\n", 2 ) == 0 ||
-                    strncmp( text + i - 4, "\r\n\r\n", 4 ) == 0 ||
-                    strncmp( text + i - 2, "\r\r", 2 ) == 0 )
+                if( ( i >= 4 && strncmp( text + i - 4, "\r\n\r\n", 4 ) == 0 ) ||
+                    ( i >= 2 && ( strncmp( text + i - 2, "\n\n", 2 ) == 0 ||   
+                                  strncmp( text + i - 2, "\r\r", 2 ) == 0 ) ) )
                 {
                         break;
@@ -374 +374 @@
         *list = NULL;
         
-        imcb_log( ic, ret->str );
+        imcb_log( ic, "%s", ret->str );
         g_string_free( ret, TRUE );
 }

protocols/msn/ns.c

@@ -229 +229 @@
                         }
                 }
-                else if( num_parts == 7 && strcmp( cmd[2], "OK" ) == 0 )
+                else if( num_parts >= 7 && strcmp( cmd[2], "OK" ) == 0 )
                 {
                         set_t *s;
                         
-                        http_decode( cmd[4] );
-                        
-                        strncpy( ic->displayname, cmd[4], sizeof( ic->displayname ) );
-                        ic->displayname[sizeof(ic->displayname)-1] = 0;
-                        
-                        if( ( s = set_find( &ic->acc->set, "display_name" ) ) )
-                        {
-                                g_free( s->value );
-                                s->value = g_strdup( cmd[4] );
+                        if( num_parts == 7 )
+                        {
+                                http_decode( cmd[4] );
+                                
+                                strncpy( ic->displayname, cmd[4], sizeof( ic->displayname ) );
+                                ic->displayname[sizeof(ic->displayname)-1] = 0;
+                                
+                                if( ( s = set_find( &ic->acc->set, "display_name" ) ) )
+                                {
+                                        g_free( s->value );
+                                        s->value = g_strdup( cmd[4] );
+                                }
+                        }
+                        else
+                        {
+                                imcb_log( ic, "Warning: Friendly name in server response was corrupted" );
                         }
                         
@@ -420 +427 @@
                 {
                         /* FIXME: Warn/Bomb about unknown away state? */
-                        st = msn_away_state_list;
-                }
-                
-                imcb_buddy_status( ic, cmd[3], OPT_LOGGED_IN |
-                                   ( st->number ? OPT_AWAY : 0 ), st->name, NULL );
+                        st = msn_away_state_list + 1;
+                }
+                
+                imcb_buddy_status( ic, cmd[3], OPT_LOGGED_IN | 
+                                   ( st != msn_away_state_list ? OPT_AWAY : 0 ),
+                                   st->name, NULL );
         }
         else if( strcmp( cmd[0], "FLN" ) == 0 )
@@ -449 +457 @@
                 {
                         /* FIXME: Warn/Bomb about unknown away state? */
-                        st = msn_away_state_list;
-                }
-                
-                imcb_buddy_status( ic, cmd[2], OPT_LOGGED_IN |
-                                   ( st->number ? OPT_AWAY : 0 ), st->name, NULL );
+                        st = msn_away_state_list + 1;
+                }
+                
+                imcb_buddy_status( ic, cmd[2], OPT_LOGGED_IN | 
+                                   ( st != msn_away_state_list ? OPT_AWAY : 0 ),
+                                   st->name, NULL );
         }
         else if( strcmp( cmd[0], "RNG" ) == 0 )
@@ -663 +672 @@
                                 }
                                 
-                                if( arg1 ) g_free( arg1 );
-                                if( mtype ) g_free( mtype );
+                                g_free( arg1 );
+                                g_free( mtype );
                         }
                         else if( g_strncasecmp( ct, "text/x-msmsgsprofile", 20 ) == 0 )
@@ -672 +681 @@
                         else if( g_strncasecmp( ct, "text/x-msmsgsinitialemailnotification", 37 ) == 0 )
                         {
-                                char *inbox = msn_findheader( body, "Inbox-Unread:", blen );
-                                char *folders = msn_findheader( body, "Folders-Unread:", blen );
-                                
-                                if( inbox && folders && set_getbool( &ic->acc->set, "mail_notifications" ) )
+                                if( set_getbool( &ic->acc->set, "mail_notifications" ) )
                                 {
-                                        imcb_log( ic, "INBOX contains %s new messages, plus %s messages in other folders.", inbox, folders );
+                                        char *inbox = msn_findheader( body, "Inbox-Unread:", blen );
+                                        char *folders = msn_findheader( body, "Folders-Unread:", blen );
+
+                                        if( inbox && folders )
+                                                imcb_log( ic, "INBOX contains %s new messages, plus %s messages in other folders.", inbox, folders );
+                                        
+                                        g_free( inbox );
+                                        g_free( folders );
                                 }
-                                
-                                g_free( inbox );
-                                g_free( folders );
                         }
                         else if( g_strncasecmp( ct, "text/x-msmsgsemailnotification", 30 ) == 0 )
                         {
-                                char *from = msn_findheader( body, "From-Addr:", blen );
-                                char *fromname = msn_findheader( body, "From:", blen );
-                                
-                                if( from && fromname && set_getbool( &ic->acc->set, "mail_notifications" ) )
+                                if( set_getbool( &ic->acc->set, "mail_notifications" ) )
                                 {
-                                        imcb_log( ic, "Received an e-mail message from %s <%s>.", fromname, from );
+                                        char *from = msn_findheader( body, "From-Addr:", blen );
+                                        char *fromname = msn_findheader( body, "From:", blen );
+                                        
+                                        if( from && fromname )
+                                                imcb_log( ic, "Received an e-mail message from %s <%s>.", fromname, from );
+
+                                        g_free( from );
+                                        g_free( fromname );
                                 }
                         }

protocols/msn/tables.c

@@ -29 +29 @@
 const struct msn_away_state msn_away_state_list[] =
 {
-        {  0, "NLN", "Available" },
-        {  1, "BSY", "Busy" },
-        {  3, "IDL", "Idle" },
-        {  5, "BRB", "Be Right Back" },
-        {  7, "AWY", "Away" },
-        {  9, "PHN", "On the Phone" },
-        { 11, "LUN", "Out to Lunch" },
-        { 13, "HDN", "Hidden" },
-        { -1, "",    "" }
+        { "NLN", "" },
+        { "AWY", "Away" },
+        { "BSY", "Busy" },
+        { "IDL", "Idle" },
+        { "BRB", "Be Right Back" },
+        { "PHN", "On the Phone" },
+        { "LUN", "Out to Lunch" },
+        { "HDN", "Hidden" },
+        { "",    "" }
 };
-
-const struct msn_away_state *msn_away_state_by_number( int number )
-{
-        int i;
-        
-        for( i = 0; msn_away_state_list[i].number > -1; i ++ )
-                if( msn_away_state_list[i].number == number )
-                        return( msn_away_state_list + i );
-        
-        return( NULL );
-}
 
 const struct msn_away_state *msn_away_state_by_code( char *code )
@@ -55 +44 @@
         int i;
         
-        for( i = 0; msn_away_state_list[i].number > -1; i ++ )
+        for( i = 0; *msn_away_state_list[i].code; i ++ )
                 if( g_strcasecmp( msn_away_state_list[i].code, code ) == 0 )
                         return( msn_away_state_list + i );
         
-        return( NULL );
+        return NULL;
 }
 
@@ -66 +55 @@
         int i;
         
-        for( i = 0; msn_away_state_list[i].number > -1; i ++ )
+        for( i = 0; *msn_away_state_list[i].code; i ++ )
                 if( g_strcasecmp( msn_away_state_list[i].name, name ) == 0 )
                         return( msn_away_state_list + i );
         
-        return( NULL );
+        return NULL;
 }
 

protocols/nogaim.c

@@ -2 +2 @@
   * BitlBee -- An IRC to other IM-networks gateway                     *
   *                                                                    *
-  * Copyright 2002-2006 Wilmer van der Gaast and others                *
+  * Copyright 2002-2010 Wilmer van der Gaast and others                *
   \********************************************************************/
 
@@ -98 +98 @@
 void register_protocol (struct prpl *p)
 {
-        protocols = g_list_append(protocols, p);
+        int i;
+        gboolean refused = global.conf->protocols != NULL;
+ 
+        for (i = 0; global.conf->protocols && global.conf->protocols[i]; i++)
+        {
+                if (g_strcasecmp(p->name, global.conf->protocols[i]) == 0)
+                        refused = FALSE;
+        }
+
+        if (refused)
+                log_message(LOGLVL_WARNING, "Protocol %s disabled\n", p->name);
+        else
+                protocols = g_list_append(protocols, p);
 }
 
@@ -268 +280 @@
         ic->flags |= OPT_LOGGED_IN;
         
-        /* Also necessary when we're not away, at least for some of the
-           protocols. */
-        imc_set_away( ic, u->away );
+        /* Necessary to send initial presence status, even if we're not away. */
+        imc_away_send_update( ic );
         
         /* Apparently we're connected successfully, so reset the
@@ -372 +383 @@
 /* list.c */
 
-void imcb_add_buddy( struct im_connection *ic, char *handle, char *group )
+void imcb_add_buddy( struct im_connection *ic, const char *handle, const char *group )
 {
         user_t *u;
@@ -446 +457 @@
 }
 
-void imcb_rename_buddy( struct im_connection *ic, char *handle, char *realname )
+void imcb_rename_buddy( struct im_connection *ic, const char *handle, const char *realname )
 {
         user_t *u = user_findhandle( ic, handle );
+        char *set;
         
         if( !u || !realname ) return;
@@ -461 +473 @@
                         imcb_log( ic, "User `%s' changed name to `%s'", u->nick, u->realname );
         }
-}
-
-void imcb_remove_buddy( struct im_connection *ic, char *handle, char *group )
+        
+        set = set_getstr( &ic->acc->set, "nick_source" );
+        if( strcmp( set, "handle" ) != 0 )
+        {
+                char *name = g_strdup( realname );
+                
+                if( strcmp( set, "first_name" ) == 0 )
+                {
+                        int i;
+                        for( i = 0; name[i] && !isspace( name[i] ); i ++ ) {}
+                        name[i] = '\0';
+                }
+                
+                imcb_buddy_nick_hint( ic, handle, name );
+                
+                g_free( name );
+        }
+}
+
+void imcb_remove_buddy( struct im_connection *ic, const char *handle, char *group )
 {
         user_t *u;
@@ -473 +502 @@
 /* Mainly meant for ICQ (and now also for Jabber conferences) to allow IM
    modules to suggest a nickname for a handle. */
-void imcb_buddy_nick_hint( struct im_connection *ic, char *handle, char *nick )
+void imcb_buddy_nick_hint( struct im_connection *ic, const char *handle, const char *nick )
 {
         user_t *u = user_findhandle( ic, handle );
@@ -618 +647 @@
         oo = u->online;
         
-        if( u->away )
-        {
-                g_free( u->away );
-                u->away = NULL;
-        }
+        g_free( u->away );
+        g_free( u->status_msg );
+        u->away = u->status_msg = NULL;
         
         if( ( flags & OPT_LOGGED_IN ) && !u->online )
@@ -660 +687 @@
                 }
         }
-        /* else waste_any_state_information_for_now(); */
+        else
+        {
+                u->status_msg = g_strdup( message );
+        }
         
         /* LISPy... */
@@ -685 +715 @@
 }
 
-void imcb_buddy_msg( struct im_connection *ic, char *handle, char *msg, uint32_t flags, time_t sent_at )
+void imcb_buddy_msg( struct im_connection *ic, const char *handle, char *msg, uint32_t flags, time_t sent_at )
 {
         irc_t *irc = ic->irc;
@@ -818 +848 @@
 }
 
-void imcb_chat_msg( struct groupchat *c, char *who, char *msg, uint32_t flags, time_t sent_at )
+void imcb_chat_msg( struct groupchat *c, const char *who, char *msg, uint32_t flags, time_t sent_at )
 {
         struct im_connection *ic = c->ic;
@@ -890 +920 @@
 /* buddy_chat.c */
 
-void imcb_chat_add_buddy( struct groupchat *b, char *handle )
+void imcb_chat_add_buddy( struct groupchat *b, const char *handle )
 {
         user_t *u = user_findhandle( b->ic, handle );
@@ -925 +955 @@
 
 /* This function is one BIG hack... :-( EREWRITE */
-void imcb_chat_remove_buddy( struct groupchat *b, char *handle, char *reason )
+void imcb_chat_remove_buddy( struct groupchat *b, const char *handle, const char *reason )
 {
         user_t *u;
@@ -1070 +1100 @@
 }
 
-static char *imc_away_alias_find( GList *gcm, char *away );
-
-int imc_set_away( struct im_connection *ic, char *away )
-{
-        GList *m, *ms;
-        char *s;
-        
-        if( !away ) away = "";
-        ms = m = ic->acc->prpl->away_states( ic );
-        
-        while( m )
-        {
-                if( *away )
-                {
-                        if( g_strncasecmp( m->data, away, strlen( m->data ) ) == 0 )
-                                break;
-                }
-                else
-                {
-                        if( g_strcasecmp( m->data, "Available" ) == 0 )
-                                break;
-                        if( g_strcasecmp( m->data, "Online" ) == 0 )
-                                break;
-                }
-                m = m->next;
-        }
-        
-        if( m )
-        {
-                ic->acc->prpl->set_away( ic, m->data, *away ? away : NULL );
-        }
-        else
-        {
-                s = imc_away_alias_find( ms, away );
-                if( s )
-                {
-                        ic->acc->prpl->set_away( ic, s, away );
-                        if( set_getbool( &ic->irc->set, "debug" ) )
-                                imcb_log( ic, "Setting away state to %s", s );
-                }
-                else
-                        ic->acc->prpl->set_away( ic, GAIM_AWAY_CUSTOM, away );
-        }
-        
-        return( 1 );
+static char *imc_away_state_find( GList *gcm, char *away, char **message );
+
+int imc_away_send_update( struct im_connection *ic )
+{
+        char *away, *msg = NULL;
+        
+        away = set_getstr( &ic->acc->set, "away" ) ?
+             : set_getstr( &ic->irc->set, "away" );
+        if( away && *away )
+        {
+                GList *m = ic->acc->prpl->away_states( ic );
+                msg = ic->acc->flags & ACC_FLAG_AWAY_MESSAGE ? away : NULL;
+                away = imc_away_state_find( m, away, &msg ) ? : m->data;
+        }
+        else if( ic->acc->flags & ACC_FLAG_STATUS_MESSAGE )
+        {
+                away = NULL;
+                msg = set_getstr( &ic->acc->set, "status" ) ?
+                    : set_getstr( &ic->irc->set, "status" );
+        }
+        
+        ic->acc->prpl->set_away( ic, away, msg );
+        
+        return 1;
 }
 
@@ -1129 +1138 @@
 };
 
-static char *imc_away_alias_find( GList *gcm, char *away )
+static char *imc_away_state_find( GList *gcm, char *away, char **message )
 {
         GList *m;
         int i, j;
         
+        for( m = gcm; m; m = m->next )
+                if( g_strncasecmp( m->data, away, strlen( m->data ) ) == 0 )
+                {
+                        /* At least the Yahoo! module works better if message
+                           contains no data unless it adds something to what
+                           we have in state already. */
+                        if( strlen( m->data ) == strlen( away ) )
+                                *message = NULL;
+                        
+                        return m->data;
+                }
+        
         for( i = 0; *imc_away_alias_list[i]; i ++ )
         {
+                int keep_message;
+                
                 for( j = 0; imc_away_alias_list[i][j]; j ++ )
                         if( g_strncasecmp( away, imc_away_alias_list[i][j], strlen( imc_away_alias_list[i][j] ) ) == 0 )
+                        {
+                                keep_message = strlen( away ) != strlen( imc_away_alias_list[i][j] );
                                 break;
+                        }
                 
                 if( !imc_away_alias_list[i][j] )        /* If we reach the end, this row */
@@ -1146 +1172 @@
                 for( j = 0; imc_away_alias_list[i][j]; j ++ )
                 {
-                        m = gcm;
-                        while( m )
-                        {
+                        for( m = gcm; m; m = m->next )
                                 if( g_strcasecmp( imc_away_alias_list[i][j], m->data ) == 0 )
-                                        return( imc_away_alias_list[i][j] );
-                                m = m->next;
-                        }
-                }
-        }
-        
-        return( NULL );
+                                {
+                                        if( !keep_message )
+                                                *message = NULL;
+                                        
+                                        return imc_away_alias_list[i][j];
+                                }
+                }
+                
+                /* No need to look further, apparently this state doesn't
+                   have any good alias for this protocol. */
+                break;
+        }
+        
+        return NULL;
 }
 

protocols/nogaim.h

@@ -51 +51 @@
 
 #define WEBSITE "http://www.bitlbee.org/"
-#define GAIM_AWAY_CUSTOM "Custom"
 
 /* Sharing flags between all kinds of things. I just hope I won't hit any
@@ -220 +219 @@
         
         /* You can tell what away states your protocol supports, so that
-         * BitlBee will try to map the IRC away reasons to them, or use
-         * GAIM_AWAY_CUSTOM when calling skype_set_away(). */
+         * BitlBee will try to map the IRC away reasons to them. If your
+         * protocol doesn't have any, just return one generic "Away". */
         GList *(* away_states)(struct im_connection *ic);
         
@@ -281 +280 @@
  * user, usually after a login, or if the user added a buddy and the IM
  * server confirms that the add was successful. Don't forget to do this! */
-G_MODULE_EXPORT void imcb_add_buddy( struct im_connection *ic, char *handle, char *group );
-G_MODULE_EXPORT void imcb_remove_buddy( struct im_connection *ic, char *handle, char *group );
+G_MODULE_EXPORT void imcb_add_buddy( struct im_connection *ic, const char *handle, const char *group );
+G_MODULE_EXPORT void imcb_remove_buddy( struct im_connection *ic, const char *handle, char *group );
 G_MODULE_EXPORT struct buddy *imcb_find_buddy( struct im_connection *ic, char *handle );
-G_MODULE_EXPORT void imcb_rename_buddy( struct im_connection *ic, char *handle, char *realname );
-G_MODULE_EXPORT void imcb_buddy_nick_hint( struct im_connection *ic, char *handle, char *nick );
+G_MODULE_EXPORT void imcb_rename_buddy( struct im_connection *ic, const char *handle, const char *realname );
+G_MODULE_EXPORT void imcb_buddy_nick_hint( struct im_connection *ic, const char *handle, const char *nick );
 
 /* Buddy activity */
@@ -295 +294 @@
 /* Not implemented yet! */ G_MODULE_EXPORT void imcb_buddy_times( struct im_connection *ic, const char *handle, time_t login, time_t idle );
 /* Call when a handle says something. 'flags' and 'sent_at may be just 0. */
-G_MODULE_EXPORT void imcb_buddy_msg( struct im_connection *ic, char *handle, char *msg, uint32_t flags, time_t sent_at );
+G_MODULE_EXPORT void imcb_buddy_msg( struct im_connection *ic, const char *handle, char *msg, uint32_t flags, time_t sent_at );
 G_MODULE_EXPORT void imcb_buddy_typing( struct im_connection *ic, char *handle, uint32_t flags );
 G_MODULE_EXPORT void imcb_clean_handle( struct im_connection *ic, char *handle );
@@ -308 +307 @@
  *   user, too. */
 G_MODULE_EXPORT struct groupchat *imcb_chat_new( struct im_connection *ic, const char *handle );
-G_MODULE_EXPORT void imcb_chat_add_buddy( struct groupchat *b, char *handle );
+G_MODULE_EXPORT void imcb_chat_add_buddy( struct groupchat *b, const char *handle );
 /* To remove a handle from a group chat. Reason can be NULL. */
-G_MODULE_EXPORT void imcb_chat_remove_buddy( struct groupchat *b, char *handle, char *reason );
+G_MODULE_EXPORT void imcb_chat_remove_buddy( struct groupchat *b, const char *handle, const char *reason );
 /* To tell BitlBee 'who' said 'msg' in 'c'. 'flags' and 'sent_at' can be 0. */
-G_MODULE_EXPORT void imcb_chat_msg( struct groupchat *c, char *who, char *msg, uint32_t flags, time_t sent_at );
+G_MODULE_EXPORT void imcb_chat_msg( struct groupchat *c, const char *who, char *msg, uint32_t flags, time_t sent_at );
 /* System messages specific to a groupchat, so they can be displayed in the right context. */
 G_MODULE_EXPORT void imcb_chat_log( struct groupchat *c, char *format, ... ) G_GNUC_PRINTF( 2, 3 );
@@ -320 +319 @@
 
 /* Actions, or whatever. */
-int imc_set_away( struct im_connection *ic, char *away );
+int imc_away_send_update( struct im_connection *ic );
 int imc_buddy_msg( struct im_connection *ic, char *handle, char *msg, int flags );
 int imc_chat_msg( struct groupchat *c, char *msg, int flags );

protocols/oscar/oscar.c

@@ -380 +380 @@
                 s->flags |= ACC_SET_OFFLINE_ONLY;
         }
+        
+        acc->flags |= ACC_FLAG_AWAY_MESSAGE;
 }
 
@@ -1952 +1954 @@
 static void oscar_set_away_aim(struct im_connection *ic, struct oscar_data *od, const char *state, const char *message)
 {
+        if (state == NULL)
+                state = "";
 
         if (!g_strcasecmp(state, _("Visible"))) {
@@ -1959 +1963 @@
                 aim_setextstatus(od->sess, od->conn, AIM_ICQ_STATE_INVISIBLE);
                 return;
-        } /* else... */
+        } else if (message == NULL) {
+                message = state;
+        }
 
         if (od->rights.maxawaymsglen == 0)
@@ -2002 +2008 @@
         }
 
-        if (!g_strcasecmp(state, "Online")) {
+        if (state == NULL) {
                 aim_setextstatus(od->sess, od->conn, AIM_ICQ_STATE_NORMAL);
         } else if (!g_strcasecmp(state, "Away")) {
@@ -2027 +2033 @@
                 aim_setextstatus(od->sess, od->conn, AIM_ICQ_STATE_INVISIBLE);
                 ic->away = g_strdup(msg);
-        } else if (!g_strcasecmp(state, GAIM_AWAY_CUSTOM)) {
+        } else {
                 if (no_message) {
                         aim_setextstatus(od->sess, od->conn, AIM_ICQ_STATE_NORMAL);
@@ -2276 +2282 @@
 {
         struct oscar_data *od = ic->proto_data;
-        GList *m = NULL;
-
-        if (!od->icq)
-                return g_list_append(m, GAIM_AWAY_CUSTOM);
-
-        m = g_list_append(m, "Online");
-        m = g_list_append(m, "Away");
-        m = g_list_append(m, "Do Not Disturb");
-        m = g_list_append(m, "Not Available");
-        m = g_list_append(m, "Occupied");
-        m = g_list_append(m, "Free For Chat");
-        m = g_list_append(m, "Invisible");
-
-        return m;
+
+        if (od->icq) {
+                static GList *m = NULL;
+                m = g_list_append(m, "Away");
+                m = g_list_append(m, "Do Not Disturb");
+                m = g_list_append(m, "Not Available");
+                m = g_list_append(m, "Occupied");
+                m = g_list_append(m, "Free For Chat");
+                m = g_list_append(m, "Invisible");
+                return m;
+        } else {
+                static GList *m = NULL;
+                m = g_list_append(m, "Away");
+                return m;
+        }
 }
 

protocols/yahoo/libyahoo2.c

@@ -855 +855 @@
 }
 
-static YList * bud_str2list(char *rawlist)
-{
-        YList * l = NULL;
-
-        char **lines;
-        char **split;
-        char **buddies;
-        char **tmp, **bud;
-
-        lines = y_strsplit(rawlist, "\n", -1);
-        for (tmp = lines; *tmp; tmp++) {
-                struct yahoo_buddy *newbud;
-
-                split = y_strsplit(*tmp, ":", 2);
-                if (!split)
-                        continue;
-                if (!split[0] || !split[1]) {
-                        y_strfreev(split);
-                        continue;
-                }
-                buddies = y_strsplit(split[1], ",", -1);
-
-                for (bud = buddies; bud && *bud; bud++) {
-                        newbud = y_new0(struct yahoo_buddy, 1);
-                        newbud->id = strdup(*bud);
-                        newbud->group = strdup(split[0]);
-
-                        if(y_list_find_custom(l, newbud, is_same_bud)) {
-                                FREE(newbud->id);
-                                FREE(newbud->group);
-                                FREE(newbud);
-                                continue;
-                        }
-
-                        newbud->real_name = NULL;
-
-                        l = y_list_append(l, newbud);
-
-                        NOTICE(("Added buddy %s to group %s", newbud->id, newbud->group));
-                }
-
-                y_strfreev(buddies);
-                y_strfreev(split);
-        }
-        y_strfreev(lines);
-
-        return l;
-}
-
 static char * getcookie(char *rawcookie)
 {
@@ -1360 +1311 @@
 }
 
-
-static void yahoo_process_status(struct yahoo_input_data *yid, struct yahoo_packet *pkt)
+static void yahoo_process_status(struct yahoo_input_data *yid,
+        struct yahoo_packet *pkt)
 {
         YList *l;
         struct yahoo_data *yd = yid->yd;
 
-        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;
+        struct yahoo_process_status_entry *u;
 
         YList *users = 0;
-        
+
         if (pkt->service == YAHOO_SERVICE_LOGOFF && pkt->status == -1) {
-                YAHOO_CALLBACK(ext_yahoo_login_response)(yd->client_id, YAHOO_LOGIN_DUPL, NULL);
-                return;
-        }
+                YAHOO_CALLBACK(ext_yahoo_login_response) (yd->client_id,
+                        YAHOO_LOGIN_DUPL, NULL);
+                return;
+        }
+
+        /* Status updates may be spread accross multiple packets and not
+           even on buddy boundaries, so keeping some state is important.
+           So, continue where we left off, and only add a user entry to
+           the list once it's complete (301-315 End buddy). */
+        u = yd->half_user;
 
         for (l = pkt->hash; l; l = l->next) {
@@ -1399 +1337 @@
 
                 switch (pair->key) {
-                case 0: /* we won't actually do anything with this */
+                case 300:       /* Begin buddy */
+                        if (!strcmp(pair->value, "315") && !u) {
+                                u = yd->half_user = y_new0(struct yahoo_process_status_entry, 1);
+                        }
+                        break;
+                case 301:       /* End buddy */
+                        if (!strcmp(pair->value, "315") && u) {
+                                /* Sometimes user info comes in an odd format with no
+                                   "begin buddy" but *with* an "end buddy". Don't add
+                                   it twice. */
+                                if (!y_list_find(users, u))
+                                        users = y_list_prepend(users, u);
+                                u = yd->half_user = NULL;
+                        }
+                        break;
+                case 0: /* we won't actually do anything with this */
                         NOTICE(("key %d:%s", pair->key, pair->value));
                         break;
-                case 1: /* we don't get the full buddy list here. */
+                case 1: /* we don't get the full buddy list here. */
                         if (!yd->logged_in) {
-                                yd->logged_in = TRUE;
-                                if(yd->current_status < 0)
+                                yd->logged_in = 1;
+                                if (yd->current_status < 0)
                                         yd->current_status = yd->initial_status;
-                                YAHOO_CALLBACK(ext_yahoo_login_response)(yd->client_id, YAHOO_LOGIN_OK, NULL);
+                                YAHOO_CALLBACK(ext_yahoo_login_response) (yd->
+                                        client_id, YAHOO_LOGIN_OK, NULL);
                         }
                         break;
-                case 8: /* how many online buddies we have */
+                case 8: /* how many online buddies we have */
                         NOTICE(("key %d:%s", pair->key, pair->value));
                         break;
-                case 7: /* the current buddy */
-                        u = y_new0(struct user, 1);
+                case 7: /* the current buddy */
+                        if (!u) {
+                                /* This will only happen in case of a single level message */
+                                u = y_new0(struct yahoo_process_status_entry, 1);
+                                users = y_list_prepend(users, u);
+                        }
                         u->name = pair->value;
-                        users = y_list_prepend(users, u);
-                        break;
-                case 10: /* state */
-                        ((struct user*)users->data)->state = strtol(pair->value, NULL, 10);
-                        break;
-                case 19: /* custom status message */
-                        ((struct user*)users->data)->msg = pair->value;
-                        break;
-                case 47: /* is it an away message or not */
-                        ((struct user*)users->data)->away = atoi(pair->value);
-                        break;
-                case 137: /* seconds idle */
-                        ((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? */
-                        ((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 */
+                        break;
+                case 10:        /* state */
+                        u->state = strtol(pair->value, NULL, 10);
+                        break;
+                case 19:        /* custom status message */
+                        u->msg = pair->value;
+                        break;
+                case 47:        /* is it an away message or not. Not applicable for YMSG16 anymore */
+                        u->away = atoi(pair->value);
+                        break;
+                case 137:       /* seconds idle */
+                        u->idle = atoi(pair->value);
+                        break;
+                case 11:        /* this is the buddy's session id */
+                        u->buddy_session = atoi(pair->value);
+                        break;
+                case 17:        /* in chat? */
+                        u->f17 = atoi(pair->value);
+                        break;
+                case 13:        /* bitmask, bit 0 = pager, bit 1 = chat, bit 2 = game */
+                        u->flags = atoi(pair->value);
+                        break;
+                case 60:        /* SMS -> 1 MOBILE USER */
                         /* sometimes going offline makes this 2, but invisible never sends it */
-                        ((struct user*)users->data)->mobile = atoi(pair->value);
+                        u->mobile = atoi(pair->value);
                         break;
                 case 138:
-                        ((struct user*)users->data)->f138 = atoi(pair->value);
+                        u->f138 = atoi(pair->value);
                         break;
                 case 184:
-                        ((struct user*)users->data)->f184 = pair->value;
+                        u->f184 = pair->value;
                         break;
                 case 192:
-                        ((struct user*)users->data)->f192 = atoi(pair->value);
+                        u->f192 = atoi(pair->value);
                         break;
                 case 10001:
-                        ((struct user*)users->data)->f10001 = atoi(pair->value);
+                        u->f10001 = atoi(pair->value);
                         break;
                 case 10002:
-                        ((struct user*)users->data)->f10002 = atoi(pair->value);
+                        u->f10002 = atoi(pair->value);
                         break;
                 case 198:
-                        ((struct user*)users->data)->f198 = atoi(pair->value);
+                        u->f198 = atoi(pair->value);
                         break;
                 case 197:
-                        ((struct user*)users->data)->f197 = pair->value;
+                        u->f197 = pair->value;
                         break;
                 case 205:
-                        ((struct user*)users->data)->f205 = pair->value;
+                        u->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, E_CUSTOM);
+                        u->f213 = atoi(pair->value);
+                        break;
+                case 16:        /* Custom error message */
+                        YAHOO_CALLBACK(ext_yahoo_error) (yd->client_id,
+                                pair->value, 0, E_CUSTOM);
                         break;
                 default:
-                        WARNING(("unknown status key %d:%s", pair->key, pair->value));
-                        break;
-                }
-        }
-        
+                        WARNING(("unknown status key %d:%s", pair->key,
+                                        pair->value));
+                        break;
+                }
+        }
+
         while (users) {
                 YList *t = users;
-                struct user *u = users->data;
+                struct yahoo_process_status_entry *u = users->data;
 
                 if (u->name != NULL) {
-                        if (pkt->service == YAHOO_SERVICE_LOGOFF) { /* || u->flags == 0) { Not in YMSG16 */
-                                YAHOO_CALLBACK(ext_yahoo_status_changed)(yd->client_id, u->name, YAHOO_STATUS_OFFLINE, NULL, 1, 0, 0);
+                        if (pkt->service ==
+                                YAHOO_SERVICE_LOGOFF
+                                /*|| u->flags == 0 No flags for YMSG16 */ ) {
+                                YAHOO_CALLBACK(ext_yahoo_status_changed) (yd->
+                                        client_id, u->name,
+                                        YAHOO_STATUS_OFFLINE, NULL, 1, 0, 0);
                         } else {
                                 /* Key 47 always seems to be 1 for YMSG16 */
-                                if(!u->state)
+                                if (!u->state)
                                         u->away = 0;
                                 else
                                         u->away = 1;
 
-                                YAHOO_CALLBACK(ext_yahoo_status_changed)(yd->client_id, u->name, u->state, u->msg, u->away, u->idle, u->mobile);
+                                YAHOO_CALLBACK(ext_yahoo_status_changed) (yd->
+                                        client_id, u->name, u->state, u->msg,
+                                        u->away, u->idle, u->mobile);
                         }
                 }
@@ -1503 +1468 @@
 }
 
-static void yahoo_process_buddy_list(struct yahoo_input_data *yid, struct yahoo_packet *pkt)
+static void yahoo_process_buddy_list(struct yahoo_input_data *yid,
+        struct yahoo_packet *pkt)
 {
         struct yahoo_data *yd = yid->yd;
@@ -1515 +1481 @@
                 struct yahoo_pair *pair = l->data;
 
-                switch(pair->key) {
+                switch (pair->key) {
                 case 300:
                 case 301:
                 case 302:
+                        break;  /* Separators. Our logic does not need them */
                 case 303:
-                        if ( 315 == atoi(pair->value) )
+                        if (318 == atoi(pair->value))
                                 last_packet = 1;
                         break;
                 case 65:
-                        g_free(cur_group);
                         cur_group = strdup(pair->value);
                         break;
@@ -1530 +1496 @@
                         newbud = y_new0(struct yahoo_buddy, 1);
                         newbud->id = strdup(pair->value);
-                        if(cur_group)
+                        if (cur_group)
                                 newbud->group = strdup(cur_group);
-                        else {
-                                struct yahoo_buddy *lastbud = (struct yahoo_buddy *)y_list_nth(
-                                                                yd->buddies, y_list_length(yd->buddies)-1)->data;
+                        else if (yd->buddies) {
+                                struct yahoo_buddy *lastbud =
+                                        (struct yahoo_buddy *)y_list_nth(yd->
+                                        buddies,
+                                        y_list_length(yd->buddies) - 1)->data;
                                 newbud->group = strdup(lastbud->group);
-                        }
+                        } else
+                                newbud->group = strdup("Buddies");
 
                         yd->buddies = y_list_append(yd->buddies, newbud);
@@ -1543 +1512 @@
                 }
         }
-        
-        g_free(cur_group);
 
         /* we could be getting multiple packets here */
-        if (last_packet)
-                return;
-
-        YAHOO_CALLBACK(ext_yahoo_got_buddies)(yd->client_id, yd->buddies);
-
-        /*** We login at the very end of the packet communication */
+        if (pkt->hash && !last_packet)
+                return;
+
+        YAHOO_CALLBACK(ext_yahoo_got_buddies) (yd->client_id, yd->buddies);
+
+        /* Logged in */
         if (!yd->logged_in) {
-                yd->logged_in = TRUE;
-                if(yd->current_status < 0)
+                yd->logged_in = 1;
+                if (yd->current_status < 0)
                         yd->current_status = yd->initial_status;
-                YAHOO_CALLBACK(ext_yahoo_login_response)(yd->client_id, YAHOO_LOGIN_OK, NULL);
-        }
-}
-
-static void yahoo_process_list(struct yahoo_input_data *yid, struct yahoo_packet *pkt)
+                YAHOO_CALLBACK(ext_yahoo_login_response) (yd->client_id,
+                        YAHOO_LOGIN_OK, NULL);
+
+                /*
+                yahoo_set_away(yd->client_id, yd->initial_status, NULL,
+                        (yd->initial_status == YAHOO_STATUS_AVAILABLE) ? 0 : 1);
+
+                yahoo_get_yab(yd->client_id);
+                */
+        }
+
+}
+
+static void yahoo_process_list(struct yahoo_input_data *yid,
+        struct yahoo_packet *pkt)
 {
         struct yahoo_data *yd = yid->yd;
         YList *l;
 
-        if (!yd->logged_in) {
-                yd->logged_in = TRUE;
-                if(yd->current_status < 0)
-                        yd->current_status = yd->initial_status;
-                YAHOO_CALLBACK(ext_yahoo_login_response)(yd->client_id, YAHOO_LOGIN_OK, NULL);
-        }
-
+        /* we could be getting multiple packets here */
         for (l = pkt->hash; l; l = l->next) {
                 struct yahoo_pair *pair = l->data;
 
-                switch(pair->key) {
-                case 87: /* buddies */
-                        if(!yd->rawbuddylist)
-                                yd->rawbuddylist = strdup(pair->value);
-                        else {
-                                yd->rawbuddylist = y_string_append(yd->rawbuddylist, pair->value);
+                switch (pair->key) {
+                case 89:        /* identities */
+                        {
+                                char **identities =
+                                        y_strsplit(pair->value, ",", -1);
+                                int i;
+                                for (i = 0; identities[i]; i++)
+                                        yd->identities =
+                                                y_list_append(yd->identities,
+                                                strdup(identities[i]));
+                                y_strfreev(identities);
                         }
-                        break;
-
-                case 88: /* ignore list */
-                        if(!yd->ignorelist)
-                                yd->ignorelist = strdup("Ignore:");
-                        yd->ignorelist = y_string_append(yd->ignorelist, pair->value);
-                        break;
-
-                case 89: /* identities */
-                        {
-                        char **identities = y_strsplit(pair->value, ",", -1);
-                        int i;
-                        for(i=0; identities[i]; i++)
-                                yd->identities = y_list_append(yd->identities, 
-                                                strdup(identities[i]));
-                        y_strfreev(identities);
-                        }
-                        YAHOO_CALLBACK(ext_yahoo_got_identities)(yd->client_id, yd->identities);
-                        break;
-                case 59: /* cookies */
-                        if(yd->ignorelist) {
-                                yd->ignore = bud_str2list(yd->ignorelist);
-                                FREE(yd->ignorelist);
-                                YAHOO_CALLBACK(ext_yahoo_got_ignore)(yd->client_id, yd->ignore);
-                        }
-                        if(yd->rawbuddylist) {
-                                yd->buddies = bud_str2list(yd->rawbuddylist);
-                                FREE(yd->rawbuddylist);
-                                YAHOO_CALLBACK(ext_yahoo_got_buddies)(yd->client_id, yd->buddies);
-                        }
-
-                        if(pair->value[0]=='Y') {
+                        YAHOO_CALLBACK(ext_yahoo_got_identities) (yd->client_id,
+                                yd->identities);
+                        break;
+                case 59:        /* cookies */
+                        if (pair->value[0] == 'Y') {
                                 FREE(yd->cookie_y);
                                 FREE(yd->login_cookie);
@@ -1621 +1570 @@
                                 yd->login_cookie = getlcookie(yd->cookie_y);
 
-                        } else if(pair->value[0]=='T') {
+                        } else if (pair->value[0] == 'T') {
                                 FREE(yd->cookie_t);
                                 yd->cookie_t = getcookie(pair->value);
 
-                        } else if(pair->value[0]=='C') {
+                        } else if (pair->value[0] == 'C') {
                                 FREE(yd->cookie_c);
                                 yd->cookie_c = getcookie(pair->value);
-                        } 
-
-                        if(yd->cookie_y && yd->cookie_t)
-                                YAHOO_CALLBACK(ext_yahoo_got_cookies)(yd->client_id);
-
-                        break;
-                case 3: /* my id */
-                case 90: /* 1 */
-                case 100: /* 0 */
-                case 101: /* NULL */
-                case 102: /* NULL */
-                case 93: /* 86400/1440 */
-                        break;
-                }
-        }
+                        }
+
+                        break;
+                case 3: /* my id */
+                case 90:        /* 1 */
+                case 100:       /* 0 */
+                case 101:       /* NULL */
+                case 102:       /* NULL */
+                case 93:        /* 86400/1440 */
+                        break;
+                }
+        }
+
+        if (yd->cookie_y && yd->cookie_t)       /* We don't get cookie_c anymore */
+                YAHOO_CALLBACK(ext_yahoo_got_cookies) (yd->client_id);
 }
 
@@ -2393 +2342 @@
 {
         struct yahoo_https_auth_data *had = req->data;
-        struct yahoo_input_data *yid = had->yid;
-        struct yahoo_data *yd = yid->yd;
+        struct yahoo_input_data *yid;
+        struct yahoo_data *yd;
         int st;
+        
+        if (y_list_find(inputs, had->yid) == NULL)
+                return;
+        
+        yid = had->yid;
+        yd = yid->yd;
         
         if (req->status_code != 200) {
@@ -2436 +2391 @@
 {
         struct yahoo_https_auth_data *had = req->data;
-        struct yahoo_input_data *yid = had->yid;
-        struct yahoo_data *yd = yid->yd;
+        struct yahoo_input_data *yid;
+        struct yahoo_data *yd;
         struct yahoo_packet *pack;
-        char *crumb;
+        char *crumb = NULL;
         int st;
+        
+        if (y_list_find(inputs, had->yid) == NULL)
+                return;
+        
+        yid = had->yid;
+        yd = yid->yd;
         
         md5_byte_t result[16];
@@ -4080 +4041 @@
 
         yd = yid->yd;
-
         old_status = yd->current_status;
-
-        if (msg && strncmp(msg,"Invisible",9)) {
-                yd->current_status = YAHOO_STATUS_CUSTOM;
-        } else {
-                yd->current_status = state;
-        }
+        yd->current_status = state;
 
         /* Thank you libpurple :) */
@@ -4102 +4057 @@
         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);
-        } else {
-                yahoo_packet_hash(pkt, 19, "");
-        }
-        
+        yahoo_packet_hash(pkt, 19, msg && state == YAHOO_STATUS_CUSTOM ? msg : "");
         yahoo_packet_hash(pkt, 47, (away == 2)? "2": (away) ?"1":"0");
-
         yahoo_send_packet(yid, pkt, 0);
         yahoo_packet_free(pkt);

protocols/yahoo/yahoo.c

@@ -130 +130 @@
 {
         set_add( &acc->set, "mail_notifications", "false", set_eval_bool, acc );
+        
+        acc->flags |= ACC_FLAG_AWAY_MESSAGE | ACC_FLAG_STATUS_MESSAGE;
 }
 
@@ -197 +199 @@
 {
         struct byahoo_data *yd = (struct byahoo_data *) ic->proto_data;
-        char *away;
-        
-        away = NULL;
-        
-        if( state && msg && g_strcasecmp( state, msg ) != 0 )
-        {
-                yd->current_status = YAHOO_STATUS_CUSTOM;
-                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;
-                
-                away = "";
-                if( g_strcasecmp( state, "Available" ) == 0 )
-                {
-                        yd->current_status = YAHOO_STATUS_AVAILABLE;
-                        away = NULL;
-                }
-                else if( g_strcasecmp( state, "Be Right Back" ) == 0 )
+        
+        if( state && msg == NULL )
+        {
+                /* Use these states only if msg doesn't contain additional
+                   info since away messages are only supported with CUSTOM. */
+                if( g_strcasecmp( state, "Be Right Back" ) == 0 )
                         yd->current_status = YAHOO_STATUS_BRB;
                 else if( g_strcasecmp( state, "Busy" ) == 0 )
@@ -239 +224 @@
                 else if( g_strcasecmp( state, "Invisible" ) == 0 )
                         yd->current_status = YAHOO_STATUS_INVISIBLE;
-                else if( g_strcasecmp( state, GAIM_AWAY_CUSTOM ) == 0 )
-                {
-                        yd->current_status = YAHOO_STATUS_AVAILABLE;
-                        
-                        away = NULL;
-                }
-        }
+                else
+                        yd->current_status = YAHOO_STATUS_CUSTOM;
+        }
+        else if( msg )
+                yd->current_status = YAHOO_STATUS_CUSTOM;
         else
                 yd->current_status = YAHOO_STATUS_AVAILABLE;
         
-        yahoo_set_away( yd->y2_id, yd->current_status, msg, away != NULL ? 2 : 0 );
+        yahoo_set_away( yd->y2_id, yd->current_status, msg, state ? 2 : 0 );
 }
 
@@ -258 +241 @@
         if( m == NULL )
         {
-                m = g_list_append( m, "Available" );
                 m = g_list_append( m, "Be Right Back" );
                 m = g_list_append( m, "Busy" );
@@ -269 +251 @@
                 m = g_list_append( m, "Stepped Out" );
                 m = g_list_append( m, "Invisible" );
-                m = g_list_append( m, GAIM_AWAY_CUSTOM );
         }
         

protocols/yahoo/yahoo2_types.h

@@ -196 +196 @@
 
         void  *server_settings;
+        
+        struct yahoo_process_status_entry *half_user;
 };
 
@@ -261 +263 @@
 };
 
+struct yahoo_process_status_entry {
+        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 */
+};
+
 #ifdef __cplusplus
 }