Changeset 2379566


Ignore:
Timestamp:
2007-12-19T00:22:30Z (13 years ago)
Author:
kenobi <kenobi@…>
Branches:
master
Children:
0fbd3a6d
Parents:
eded1f7 (diff), de03374 (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:

merged:

Wilmer van der Gaast 2007-12-04 Fixing jabber_login/_logout for better (non-crashing) cleanup on early

File:
1 edited

Legend:

Unmodified
Added
Removed
  • protocols/jabber/jabber.c

    reded1f7 r2379566  
    7676        jd->username = g_strdup( acc->user );
    7777        jd->server = strchr( jd->username, '@' );
     78       
     79        jd->fd = jd->r_inpa = jd->w_inpa = -1;
    7880       
    7981        if( jd->server == NULL )
     
    232234        struct jabber_data *jd = ic->proto_data;
    233235       
    234         jabber_end_stream( ic );
     236        if( jd->fd >= 0 )
     237                jabber_end_stream( ic );
    235238       
    236239        while( ic->groupchats )
     
    250253                g_free( jd->txq );
    251254       
    252         g_hash_table_destroy( jd->node_cache );
     255        if( jd->node_cache )
     256                g_hash_table_destroy( jd->node_cache );
    253257       
    254258        xt_free( jd->xt );
Note: See TracChangeset for help on using the changeset viewer.