Changeset 52df5df for protocols/yahoo

Timestamp:

2008-06-14T01:19:12Z (16 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

5ec4129

Parents:

b6cd9e9

Message:

This seems to fix the Yahoo! logoff code. I have no idea why this was broken
(on purpose) in libyahoo2, but this fix seems to work and at least Valgrind
is still happy. And I actually see myself log off now, and the fd is actually
cleaned up properly.

Location:

protocols/yahoo

Files:

• libyahoo2.c (modified) (5 diffs)
• yahoo.c (modified) (1 diff)

protocols/yahoo/libyahoo2.c

@@ -381 +381 @@
 
 /* call repeatedly to get the next one */
-/*
 static struct yahoo_input_data * find_input_by_id(int id)
 {
@@ -392 +391 @@
         return NULL;
 }
-*/
 
 static struct yahoo_input_data * find_input_by_id_and_webcam_user(int id, const char * who)
@@ -797 +795 @@
 {
         struct yahoo_data *yd = find_conn_by_id(id);
+        
         if(!yd)
                 return;
@@ -3166 +3165 @@
 
         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;
         
@@ -3842 +3841 @@
         }
 
-        
-/*      do {
+        do {
                 yahoo_input_close(yid);
-        } while((yid = find_input_by_id(id)));*/
-        
+        } while((yid = find_input_by_id(id)));
 }
 

protocols/yahoo/yahoo.c

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