Ignore:
Timestamp:
2010-04-11T14:37:06Z (11 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
a87e6ba
Parents:
1f92a58
Message:

Including DCC stuff again, with a wonderful extra layer of abstraction.
Some hooks are missing so sending files doesn't work yet. Receiving also
still seems to have some issues. On the plus side, at least the MSN/Jabber
modules work again.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • protocols/jabber/s5bytestream.c

    r1f92a58 r17a6ee9  
    566566        xt_free_node( reply );
    567567
    568         imcb_file_canceled( tf->ft, "couldn't connect to any streamhosts" );
     568        imcb_file_canceled( tf->ic, tf->ft, "couldn't connect to any streamhosts" );
    569569
    570570        bt->tf->watch_in = 0;
     
    603603               
    604604        if( !jabber_write_packet( tf->ic, reply ) )
    605                 imcb_file_canceled( tf->ft, "Error transmitting bytestream response" );
     605                imcb_file_canceled( tf->ic, tf->ft, "Error transmitting bytestream response" );
    606606        xt_free_node( reply );
    607607}
     
    643643
    644644        if( tf->bytesread >= tf->ft->file_size )
    645                 imcb_file_finished( tf->ft );
     645                imcb_file_finished( tf->ic, tf->ft );
    646646
    647647        tf->ft->write( tf->ft, tf->ft->buffer, ret );   
     
    659659        if( tf->watch_in )
    660660        {
    661                 imcb_file_canceled( ft, "BUG in jabber file transfer: write_request called when already watching for input" );
     661                imcb_file_canceled( tf->ic, ft, "BUG in jabber file transfer: write_request called when already watching for input" );
    662662                return FALSE;
    663663        }
     
    705705
    706706        if( tf->byteswritten >= ft->file_size )
    707                 imcb_file_finished( ft );
     707                imcb_file_finished( tf->ic, ft );
    708708        else
    709709                bt->tf->watch_out = b_input_add( tf->fd, GAIM_INPUT_WRITE, jabber_bs_send_can_write, bt );
     
    10051005
    10061006        if( !jabber_write_packet( tf->ic, iq ) )
    1007                 imcb_file_canceled( tf->ft, "Error transmitting bytestream request" );
     1007                imcb_file_canceled( tf->ic, tf->ft, "Error transmitting bytestream request" );
    10081008        return TRUE;
    10091009}
     
    10201020
    10211021        if( jd->streamhosts==NULL ) /* we're done here unless we have a proxy to try */
    1022                 imcb_file_canceled( tf->ft, error );
     1022                imcb_file_canceled( tf->ic, tf->ft, error );
    10231023
    10241024        /* MUST always return FALSE! */
Note: See TracChangeset for help on using the changeset viewer.