diff options
| author | ulim <a.sporto+bee@gmail.com> | 2008-08-04 16:45:24 +0200 |
|---|---|---|
| committer | ulim <a.sporto+bee@gmail.com> | 2008-08-04 16:45:24 +0200 |
| commit | 8661caad555f4306cf36ee37979a7637b05d5cd4 (patch) | |
| tree | 7e4a7c3d6a700610dd31d109508b07caa3253902 /protocols/yahoo/yahoo.c | |
| parent | 4ac647dbcef152bebde7209f7c9cbbf8a5e0fc37 (diff) | |
| parent | 718e05f842c1af043eb4efded8b0afe429377f70 (diff) | |
merged in upstream r410.
Only conflict was the correction of jabber normalization which I had already done.
Diffstat (limited to 'protocols/yahoo/yahoo.c')
| -rw-r--r-- | protocols/yahoo/yahoo.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/protocols/yahoo/yahoo.c b/protocols/yahoo/yahoo.c index ab30df4d..8d9e95d8 100644 --- a/protocols/yahoo/yahoo.c +++ b/protocols/yahoo/yahoo.c @@ -162,10 +162,7 @@ static void byahoo_logout( struct im_connection *ic ) } g_slist_free( yd->buddygroups ); - if( yd->logged_in ) - yahoo_logoff( yd->y2_id ); - else - yahoo_close( yd->y2_id ); + yahoo_logoff( yd->y2_id ); g_free( yd ); } @@ -453,10 +450,6 @@ gboolean byahoo_write_ready_callback( gpointer data, gint source, b_input_condit { struct byahoo_write_ready_data *d = data; - if( !byahoo_get_ic_by_id( d->id ) ) - /* WTF doesn't libyahoo clean this up? */ - return FALSE; - yahoo_write_ready( d->id, d->fd, d->data ); return FALSE; @@ -671,9 +664,6 @@ 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 ) - imc_logout( ic, TRUE ); } /* TODO: Clear up the mess of inp and d structures */ |