# HG changeset patch # User Mark Doliner # Date 1238146467 0 # Node ID 58daeb191c102e055dc8b17d7329c098f8f2ef3d # Parent 5c6cf6d1e65f0bc7e9d01f0e7b076251dc47a8c8 purple_xfer_new only returns NULL if an assertion fails, so we should do a similar assertion check here instead of if(xfer). The rest of the changes here are just removing indentation diff -r 5c6cf6d1e65f -r 58daeb191c10 libpurple/protocols/jabber/si.c --- a/libpurple/protocols/jabber/si.c Fri Mar 27 09:29:22 2009 +0000 +++ b/libpurple/protocols/jabber/si.c Fri Mar 27 09:34:27 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