diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2010-04-11 16:37:06 +0200 |
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2010-04-11 16:37:06 +0200 |
| commit | 17a6ee93f4fbefe8b4356d884fdd95f4e72ce8cc (patch) | |
| tree | 7f710dd5f451c3ea3a0c5b404ca7b7aad053c263 /protocols/jabber/si.c | |
| parent | 1f92a5851e0e3b1730e940980f2b0122c506c724 (diff) | |
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.
Diffstat (limited to 'protocols/jabber/si.c')
| -rw-r--r-- | protocols/jabber/si.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/protocols/jabber/si.c b/protocols/jabber/si.c index bfb64f11..58c0e17f 100644 --- a/protocols/jabber/si.c +++ b/protocols/jabber/si.c @@ -90,11 +90,11 @@ int jabber_si_check_features( struct jabber_transfer *tf, GSList *features ) { } if( !foundft ) - imcb_file_canceled( tf->ft, "Buddy's client doesn't feature file transfers" ); + imcb_file_canceled( tf->ic, tf->ft, "Buddy's client doesn't feature file transfers" ); else if( !foundbt ) - imcb_file_canceled( tf->ft, "Buddy's client doesn't feature byte streams (required)" ); + imcb_file_canceled( tf->ic, tf->ft, "Buddy's client doesn't feature byte streams (required)" ); else if( !foundsi ) - imcb_file_canceled( tf->ft, "Buddy's client doesn't feature stream initiation (required)" ); + imcb_file_canceled( tf->ic, tf->ft, "Buddy's client doesn't feature stream initiation (required)" ); return foundft && foundbt && foundsi; } @@ -108,7 +108,7 @@ void jabber_si_transfer_start( struct jabber_transfer *tf ) { jabber_si_send_request( tf->ic, tf->bud->full_jid, tf ); /* and start the receive logic */ - imcb_file_recv_start( tf->ft ); + imcb_file_recv_start( tf->ic, tf->ft ); } @@ -155,7 +155,7 @@ void jabber_si_transfer_request( struct im_connection *ic, file_transfer_t *ft, if( bud == NULL ) { - imcb_file_canceled( ft, "Couldn't find buddy (BUG?)" ); + imcb_file_canceled( ic, ft, "Couldn't find buddy (BUG?)" ); return; } |