summaryrefslogtreecommitdiff
path: root/libpurple/protocols/jabber/si.c
diff options
context:
space:
mode:
Diffstat (limited to 'libpurple/protocols/jabber/si.c')
-rw-r--r--libpurple/protocols/jabber/si.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/libpurple/protocols/jabber/si.c b/libpurple/protocols/jabber/si.c
index d4560a09ec..d5e050569f 100644
--- a/libpurple/protocols/jabber/si.c
+++ b/libpurple/protocols/jabber/si.c
@@ -1096,6 +1096,7 @@ jabber_si_xfer_ibb_send_data(JabberIBBSession *sess)
"jabber_si_xfer_ibb_send_data: error reading from file\n");
purple_xfer_cancel_local(xfer);
}
+ g_free(data);
}
static void
@@ -1661,23 +1662,22 @@ void jabber_si_parse(JabberStream *js, xmlnode *packet)
jsx->iq_id = g_strdup(xmlnode_get_attrib(packet, "id"));
xfer = purple_xfer_new(js->gc->account, PURPLE_XFER_RECEIVE, from);
- if (xfer)
- {
- xfer->data = jsx;
+ g_return_if_fail(xfer != NULL);
- purple_xfer_set_filename(xfer, filename);
- if(filesize > 0)
- purple_xfer_set_size(xfer, filesize);
+ xfer->data = jsx;
- purple_xfer_set_init_fnc(xfer, jabber_si_xfer_init);
- purple_xfer_set_request_denied_fnc(xfer, jabber_si_xfer_request_denied);
- purple_xfer_set_cancel_recv_fnc(xfer, jabber_si_xfer_cancel_recv);
- purple_xfer_set_end_fnc(xfer, jabber_si_xfer_end);
+ purple_xfer_set_filename(xfer, filename);
+ if(filesize > 0)
+ purple_xfer_set_size(xfer, filesize);
- js->file_transfers = g_list_append(js->file_transfers, xfer);
+ purple_xfer_set_init_fnc(xfer, jabber_si_xfer_init);
+ purple_xfer_set_request_denied_fnc(xfer, jabber_si_xfer_request_denied);
+ purple_xfer_set_cancel_recv_fnc(xfer, jabber_si_xfer_cancel_recv);
+ purple_xfer_set_end_fnc(xfer, jabber_si_xfer_end);
- purple_xfer_request(xfer);
- }
+ js->file_transfers = g_list_append(js->file_transfers, xfer);
+
+ purple_xfer_request(xfer);
}
void