Changeset 178e2f8 for protocols/yahoo


Ignore:
Timestamp:
2008-06-28T17:32:41Z (13 years ago)
Author:
Jelmer Vernooij <jelmer@…>
Branches:
master
Children:
47b571d
Parents:
2e0f24d (diff), e0f9170 (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:
2 edited

Legend:

Unmodified
Added
Removed
  • protocols/yahoo/libyahoo2.c

    r2e0f24d r178e2f8  
    379379
    380380/* call repeatedly to get the next one */
    381 /*
    382381static struct yahoo_input_data * find_input_by_id(int id)
    383382{
     
    390389        return NULL;
    391390}
    392 */
    393391
    394392static struct yahoo_input_data * find_input_by_id_and_webcam_user(int id, const char * who)
     
    795793{
    796794        struct yahoo_data *yd = find_conn_by_id(id);
     795       
    797796        if(!yd)
    798797                return;
     
    31643163
    31653164        LOG(("write callback: id=%d fd=%d data=%p", id, fd, data));
    3166         if(!yid || !yid->txqueues)
     3165        if(!yid || !yid->txqueues || !find_conn_by_id(id))
    31673166                return -2;
    31683167       
     
    38403839        }
    38413840
    3842        
    3843 /*      do {
     3841        do {
    38443842                yahoo_input_close(yid);
    3845         } while((yid = find_input_by_id(id)));*/
    3846        
     3843        } while((yid = find_input_by_id(id)));
    38473844}
    38483845
  • protocols/yahoo/yahoo.c

    r2e0f24d r178e2f8  
    163163        g_slist_free( yd->buddygroups );
    164164       
    165         if( yd->logged_in )
    166                 yahoo_logoff( yd->y2_id );
    167         else
    168                 yahoo_close( yd->y2_id );
     165        yahoo_logoff( yd->y2_id );
    169166       
    170167        g_free( yd );
     
    454451        struct byahoo_write_ready_data *d = data;
    455452       
    456         if( !byahoo_get_ic_by_id( d->id ) )
    457                 /* WTF doesn't libyahoo clean this up? */
    458                 return FALSE;
    459        
    460453        yahoo_write_ready( d->id, d->fd, d->data );
    461454       
Note: See TracChangeset for help on using the changeset viewer.