Mercurial > pidgin.yaz
diff libpurple/protocols/jabber/si.c @ 29675:ea0494a3a299
propagate from branch 'im.pidgin.pidgin' (head 81bb2e1582a2222b36e57c29ccb573dac27f2a44)
to branch 'im.pidgin.cpw.attention_ui' (head 6d0c340ea0021535d623146846cc275b0b6aa5ea)
| author | Marcus Lundblad <ml@update.uu.se> |
|---|---|
| date | Sat, 28 Mar 2009 16:59:30 +0000 |
| parents | 9407348dc714 58daeb191c10 |
| children |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/si.c Mon Mar 16 21:45:24 2009 +0000 +++ b/libpurple/protocols/jabber/si.c Sat Mar 28 16:59:30 2009 +0000 @@ -1662,23 +1662,22 @@ 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); + + xfer->data = jsx; - purple_xfer_set_filename(xfer, filename); - if(filesize > 0) - purple_xfer_set_size(xfer, filesize); + purple_xfer_set_filename(xfer, filename); + if(filesize > 0) + purple_xfer_set_size(xfer, filesize); - 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_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); - js->file_transfers = g_list_append(js->file_transfers, xfer); + js->file_transfers = g_list_append(js->file_transfers, xfer); - purple_xfer_request(xfer); - } + purple_xfer_request(xfer); } void