Ignore:
Timestamp:
2008-08-04T14:21:49Z (14 years ago)
Author:
ulim <a.sporto+bee@…>
Branches:
master
Children:
8661caa
Parents:
8a90001
Message:

moved some stuff around in preperation for MSN merge.

  • both ends (proto&dcc) need to finish a transfer now for it to be finished
  • moved throughput calc. and some messages to dcc (no need to implement in protocols)
File:
1 edited

Legend:

Unmodified
Added
Removed
  • protocols/jabber/si.c

    r8a90001 r4ac647d  
    5454}
    5555
    56 /* file_transfer finished() callback */
    57 void jabber_si_finished( file_transfer_t *ft )
    58 {
    59         struct jabber_transfer *tf = ft->data;
    60         time_t diff = time( NULL ) - ft->started ? : 1;
    61 
    62         imcb_log( tf->ic, "File %s transferred successfully at %d kb/s!" , ft->file_name, (int) ( ft->bytes_transferred / 1024 / diff ) );
    63 }
    64 
    6556/* file_transfer canceled() callback */
    6657void jabber_si_canceled( file_transfer_t *ft, char *reason )
     
    177168        tf->ft->data = tf;
    178169        tf->ft->free = jabber_si_free_transfer;
    179         tf->ft->finished = jabber_si_finished;
    180170        tf->bud = bud;
    181171        ft->write = jabber_bs_send_write;
     
    302292        /* Request is fine. */
    303293
    304         imcb_log( ic, "File transfer request from %s for %s (%zd kb). ", xt_find_attr( node, "from" ), name, size/1024 );
    305 
    306         imcb_log( ic, "Accept the file transfer if you'd like the file. If you don't, issue the 'transfers reject' command.");
    307 
    308294        tf = g_new0( struct jabber_transfer, 1 );
    309295
     
    318304        tf->ft->accept = jabber_si_answer_request;
    319305        tf->ft->free = jabber_si_free_transfer;
    320         tf->ft->finished = jabber_si_finished;
    321306        tf->ft->canceled = jabber_si_canceled;
    322307
Note: See TracChangeset for help on using the changeset viewer.