Changeset 178e2f8 for protocols/yahoo

Timestamp:

2008-06-28T17:32:41Z (16 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:

• libyahoo2.c (modified) (5 diffs)
• yahoo.c (modified) (2 diffs)

protocols/yahoo/libyahoo2.c

@@ -379 +379 @@
 
 /* call repeatedly to get the next one */
-/*
 static struct yahoo_input_data * find_input_by_id(int id)
 {
@@ -390 +389 @@
         return NULL;
 }
-*/
 
 static struct yahoo_input_data * find_input_by_id_and_webcam_user(int id, const char * who)
@@ -795 +793 @@
 {
         struct yahoo_data *yd = find_conn_by_id(id);
+        
         if(!yd)
                 return;
@@ -3164 +3163 @@
 
         LOG(("write callback: id=%d fd=%d data=%p", id, fd, data));
-        if(!yid || !yid->txqueues)
+        if(!yid || !yid->txqueues || !find_conn_by_id(id))
                 return -2;
         
@@ -3840 +3839 @@
         }
 
-        
-/*      do {
+        do {
                 yahoo_input_close(yid);
-        } while((yid = find_input_by_id(id)));*/
-        
+        } while((yid = find_input_by_id(id)));
 }
 

protocols/yahoo/yahoo.c

@@ -163 +163 @@
         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 );
@@ -454 +451 @@
         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 );