- Timestamp:
- 2010-06-05T23:21:02Z (14 years ago)
- Branches:
- master
- Children:
- 1fdb0a4
- Parents:
- 3ab1d31 (diff), e774815 (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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
dcc.c
r3ab1d31 rb308cf9 154 154 155 155 /* watch */ 156 df->watch_in = b_input_add( df->fd, GAIM_INPUT_READ, dccs_send_proto, df );156 df->watch_in = b_input_add( df->fd, B_EV_IO_READ, dccs_send_proto, df ); 157 157 158 158 df->ic->irc->file_transfers = g_slist_prepend( df->ic->irc->file_transfers, file ); … … 267 267 file_transfer_t *file = df->ft; 268 268 269 if( ( cond & GAIM_INPUT_READ ) &&269 if( ( cond & B_EV_IO_READ ) && 270 270 ( file->status & FT_STATUS_LISTENING ) ) 271 271 { … … 287 287 288 288 /* reschedule for reading on new fd */ 289 df->watch_in = b_input_add( fd, GAIM_INPUT_READ, dccs_send_proto, df );289 df->watch_in = b_input_add( fd, B_EV_IO_READ, dccs_send_proto, df ); 290 290 291 291 return FALSE; 292 292 } 293 293 294 if( cond & GAIM_INPUT_READ )294 if( cond & B_EV_IO_READ ) 295 295 { 296 296 int ret; … … 364 364 365 365 /* watch */ 366 df->watch_out = b_input_add( df->fd, GAIM_INPUT_WRITE, dccs_recv_proto, df );366 df->watch_out = b_input_add( df->fd, B_EV_IO_WRITE, dccs_recv_proto, df ); 367 367 ft->write_request = dccs_recv_write_request; 368 368 … … 377 377 file_transfer_t *ft = df->ft; 378 378 379 if( ( cond & GAIM_INPUT_WRITE ) &&379 if( ( cond & B_EV_IO_WRITE ) && 380 380 ( ft->status & FT_STATUS_CONNECTING ) ) 381 381 { 382 382 ft->status = FT_STATUS_TRANSFERRING; 383 383 384 //df->watch_in = b_input_add( df->fd, GAIM_INPUT_READ, dccs_recv_proto, df );384 //df->watch_in = b_input_add( df->fd, B_EV_IO_READ, dccs_recv_proto, df ); 385 385 386 386 df->watch_out = 0; … … 388 388 } 389 389 390 if( cond & GAIM_INPUT_READ )390 if( cond & B_EV_IO_READ ) 391 391 { 392 392 int ret, done; … … 445 445 return dcc_abort( df, "BUG: write_request() called while watching" ); 446 446 447 df->watch_in = b_input_add( df->fd, GAIM_INPUT_READ, dccs_recv_proto, df );447 df->watch_in = b_input_add( df->fd, B_EV_IO_READ, dccs_recv_proto, df ); 448 448 449 449 return TRUE; … … 488 488 489 489 if( df->bytes_sent < df->ft->file_size ) 490 df->watch_out = b_input_add( df->fd, GAIM_INPUT_WRITE, dccs_send_can_write, df );490 df->watch_out = b_input_add( df->fd, B_EV_IO_WRITE, dccs_send_can_write, df ); 491 491 492 492 return TRUE;
Note: See TracChangeset
for help on using the changeset viewer.