Changeset 4aa0f6b for dcc.c

Timestamp:

2010-06-07T14:31:07Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

56699f0

Parents:

0d9d53e (diff), 1fdb0a4 (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:

Merging killerbee stuff, bringing all the bleeding-edge stuff together.

File:

• dcc.c (modified) (9 diffs)

dcc.c

@@ -116 +116 @@
 
         /* watch */
-        df->watch_in = b_input_add( df->fd, GAIM_INPUT_READ, dccs_send_proto, df );
+        df->watch_in = b_input_add( df->fd, B_EV_IO_READ, dccs_send_proto, df );
 
         irc->file_transfers = g_slist_prepend( irc->file_transfers, file );
@@ -228 +228 @@
         file_transfer_t *file = df->ft;
         
-        if( ( cond & GAIM_INPUT_READ ) &&
+        if( ( cond & B_EV_IO_READ ) &&
             ( file->status & FT_STATUS_LISTENING ) )
         {       
@@ -248 +248 @@
 
                 /* reschedule for reading on new fd */
-                df->watch_in = b_input_add( fd, GAIM_INPUT_READ, dccs_send_proto, df );
+                df->watch_in = b_input_add( fd, B_EV_IO_READ, dccs_send_proto, df );
 
                 return FALSE;
         }
 
-        if( cond & GAIM_INPUT_READ ) 
+        if( cond & B_EV_IO_READ ) 
         {
                 int ret;
@@ -325 +325 @@
 
         /* watch */
-        df->watch_out = b_input_add( df->fd, GAIM_INPUT_WRITE, dccs_recv_proto, df );
+        df->watch_out = b_input_add( df->fd, B_EV_IO_WRITE, dccs_recv_proto, df );
         ft->write_request = dccs_recv_write_request;
 
@@ -338 +338 @@
         file_transfer_t *ft = df->ft;
 
-        if( ( cond & GAIM_INPUT_WRITE ) &&
+        if( ( cond & B_EV_IO_WRITE ) &&
             ( ft->status & FT_STATUS_CONNECTING ) )
         {
                 ft->status = FT_STATUS_TRANSFERRING;
 
-                //df->watch_in = b_input_add( df->fd, GAIM_INPUT_READ, dccs_recv_proto, df );
+                //df->watch_in = b_input_add( df->fd, B_EV_IO_READ, dccs_recv_proto, df );
 
                 df->watch_out = 0;
@@ -349 +349 @@
         }
 
-        if( cond & GAIM_INPUT_READ )
+        if( cond & B_EV_IO_READ )
         {
                 int ret, done;
@@ -406 +406 @@
                 return dcc_abort( df, "BUG: write_request() called while watching" );
 
-        df->watch_in = b_input_add( df->fd, GAIM_INPUT_READ, dccs_recv_proto, df );
+        df->watch_in = b_input_add( df->fd, B_EV_IO_READ, dccs_recv_proto, df );
 
         return TRUE;
@@ -449 +449 @@
 
         if( df->bytes_sent < df->ft->file_size )
-                df->watch_out = b_input_add( df->fd, GAIM_INPUT_WRITE, dccs_send_can_write, df );
+                df->watch_out = b_input_add( df->fd, B_EV_IO_WRITE, dccs_send_can_write, df );
 
         return TRUE;
@@ -565 +565 @@
         return NULL;
 }
-