Changeset c2fb3809 for protocols/yahoo


Ignore:
Timestamp:
2007-04-15T22:39:35Z (14 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
84b045d
Parents:
cd4723c
Message:

Cleaned up struct im_connection. No more username/password stuff since
it's in acc too. wants_to_die is now an argument to imc_logout().

File:
1 edited

Legend:

Unmodified
Added
Removed
  • protocols/yahoo/yahoo.c

    rcd4723c rc2fb3809  
    361361        YList *members;
    362362       
    363         roomname = g_new0( char, strlen( ic->username ) + 16 );
    364         g_snprintf( roomname, strlen( ic->username ) + 16, "%s-Bee-%d", ic->username, byahoo_chat_id );
     363        roomname = g_strdup_printf( "%s-Bee-%d", ic->acc->user, byahoo_chat_id );
    365364       
    366365        c = serv_got_joined_chat( ic, roomname );
    367         add_chat_buddy( c, ic->username );
     366        add_chat_buddy( c, ic->acc->user );
    368367       
    369368        /* FIXME: Free this thing when the chat's destroyed. We can't *always*
     
    518517        {
    519518                char *errstr;
     519                int allow_reconnect = TRUE;
    520520               
    521521                yd->logged_in = FALSE;
     
    530530                {
    531531                        errstr = "Logged in on a different machine or device";
    532                         ic->wants_to_die = TRUE;
     532                        allow_reconnect = FALSE;
    533533                }
    534534                else if( succ == YAHOO_LOGIN_SOCK )
     
    542542                        imc_error( ic, "Error %d (%s)", succ, errstr );
    543543               
    544                 imc_logout( ic );
     544                imc_logout( ic, allow_reconnect );
    545545        }
    546546}
     
    642642       
    643643        if( fatal )
    644                 imc_logout( ic );
     644                imc_logout( ic, TRUE );
    645645}
    646646
     
    768768{
    769769        yahoo_conference_logon( inv->yid, NULL, inv->members, inv->name );
    770         add_chat_buddy( inv->c, inv->ic->username );
     770        add_chat_buddy( inv->c, inv->ic->acc->user );
    771771        g_free( inv->name );
    772772        g_free( inv );
     
    798798       
    799799        for( m = members; m; m = m->next )
    800                 if( g_strcasecmp( m->data, ic->username ) != 0 )
     800                if( g_strcasecmp( m->data, ic->acc->user ) != 0 )
    801801                        add_chat_buddy( inv->c, m->data );
    802802       
Note: See TracChangeset for help on using the changeset viewer.