Changeset 8661caa for protocols/yahoo/libyahoo2.c

Timestamp:

2008-08-04T14:45:24Z (16 years ago)

Author:

ulim <a.sporto+bee@…>

Branches:

master

Children:

87f525e

Parents:

4ac647d (diff), 718e05f (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 in upstream r410.

Only conflict was the correction of jabber normalization which I had already done.

File:

• protocols/yahoo/libyahoo2.c (modified) (6 diffs)

protocols/yahoo/libyahoo2.c

@@ -69 +69 @@
 #ifdef __MINGW32__
 # include <winsock2.h>
-# define write(a,b,c) send(a,b,c,0)
-# define read(a,b,c)  recv(a,b,c,0)
 #endif
 
@@ -381 +379 @@
 
 /* call repeatedly to get the next one */
-/*
 static struct yahoo_input_data * find_input_by_id(int id)
 {
@@ -392 +389 @@
         return NULL;
 }
-*/
 
 static struct yahoo_input_data * find_input_by_id_and_webcam_user(int id, const char * who)
@@ -797 +793 @@
 {
         struct yahoo_data *yd = find_conn_by_id(id);
+        
         if(!yd)
                 return;
@@ -3166 +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;
         
@@ -3842 +3839 @@
         }
 
-        
-/*      do {
+        do {
                 yahoo_input_close(yid);
-        } while((yid = find_input_by_id(id)));*/
-        
+        } while((yid = find_input_by_id(id)));
 }