Changeset 4ac647d for protocols/jabber/si.c

Timestamp:

2008-08-04T14:21:49Z (16 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:

• protocols/jabber/si.c (modified) (4 diffs)

protocols/jabber/si.c

@@ -54 +54 @@
 }
 
-/* file_transfer finished() callback */
-void jabber_si_finished( file_transfer_t *ft )
-{
-        struct jabber_transfer *tf = ft->data;
-        time_t diff = time( NULL ) - ft->started ? : 1;
-
-        imcb_log( tf->ic, "File %s transferred successfully at %d kb/s!" , ft->file_name, (int) ( ft->bytes_transferred / 1024 / diff ) );
-}
-
 /* file_transfer canceled() callback */
 void jabber_si_canceled( file_transfer_t *ft, char *reason )
@@ -177 +168 @@
         tf->ft->data = tf;
         tf->ft->free = jabber_si_free_transfer;
-        tf->ft->finished = jabber_si_finished;
         tf->bud = bud;
         ft->write = jabber_bs_send_write;
@@ -302 +292 @@
         /* Request is fine. */
 
-        imcb_log( ic, "File transfer request from %s for %s (%zd kb). ", xt_find_attr( node, "from" ), name, size/1024 );
-
-        imcb_log( ic, "Accept the file transfer if you'd like the file. If you don't, issue the 'transfers reject' command.");
-
         tf = g_new0( struct jabber_transfer, 1 );
 
@@ -318 +304 @@
         tf->ft->accept = jabber_si_answer_request;
         tf->ft->free = jabber_si_free_transfer;
-        tf->ft->finished = jabber_si_finished;
         tf->ft->canceled = jabber_si_canceled;