diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-06-28 19:32:41 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-06-28 19:32:41 +0200 |
| commit | 178e2f8f71e5ebd4501f455c874f816b9ba19ade (patch) | |
| tree | 8185c7ed827ca1cea4fac1431e9d8a2eeff86fa3 /protocols/yahoo/yahoo.c | |
| parent | 2e0f24d00b85c617400413bb2d179fd1028420c4 (diff) | |
| parent | e0f9170849e9c4aaa679f86703a60686d36607bb (diff) | |
Merge trunk.
Diffstat (limited to 'protocols/yahoo/yahoo.c')
| -rw-r--r-- | protocols/yahoo/yahoo.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/protocols/yahoo/yahoo.c b/protocols/yahoo/yahoo.c index ab30df4d..197d76a1 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; |