aboutsummaryrefslogtreecommitdiffstats
path: root/protocols/jabber/si.c
diff options
context:
space:
mode:
authorWilmer van der Gaast <wilmer@gaast.net>2010-08-24 13:19:52 +0100
committerWilmer van der Gaast <wilmer@gaast.net>2010-08-24 13:19:52 +0100
commitea728e661f521405c2883c70865d563750223770 (patch)
tree31ee3abe6715bf4b75a895eb35d76b2026d5efec /protocols/jabber/si.c
parent9b1d2d6fa7edb911e3dbcd8785aaa797ebb20d0a (diff)
parentbd599b9aeabee36ac6fdb379ca09aec27cce13a4 (diff)
Merging mainline.
Diffstat (limited to 'protocols/jabber/si.c')
-rw-r--r--protocols/jabber/si.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/protocols/jabber/si.c b/protocols/jabber/si.c
index 58c0e17f..4b0e57c4 100644
--- a/protocols/jabber/si.c
+++ b/protocols/jabber/si.c
@@ -261,6 +261,10 @@ int jabber_si_handle_request( struct im_connection *ic, struct xt_node *node, st
requestok = TRUE;
break;
}
+ else
+ {
+ c = c->next;
+ }
if ( !requestok )
imcb_log( ic, "WARNING: Unsupported file transfer request from %s", ini_jid);
@@ -372,7 +376,7 @@ void jabber_si_answer_request( file_transfer_t *ft ) {
static xt_status jabber_si_handle_response(struct im_connection *ic, struct xt_node *node, struct xt_node *orig )
{
struct xt_node *c, *d;
- char *ini_jid, *tgt_jid, *iq_id, *cmp;
+ char *ini_jid = NULL, *tgt_jid, *iq_id, *cmp;
GSList *tflist;
struct jabber_transfer *tf=NULL;
struct jabber_data *jd = ic->proto_data;