Mercurial > pidgin.yaz
comparison 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 |
comparison
equal
deleted
inserted
replaced
29674:9407348dc714 | 29675:ea0494a3a299 |
---|---|
1660 jsx->js = js; | 1660 jsx->js = js; |
1661 jsx->stream_id = g_strdup(stream_id); | 1661 jsx->stream_id = g_strdup(stream_id); |
1662 jsx->iq_id = g_strdup(xmlnode_get_attrib(packet, "id")); | 1662 jsx->iq_id = g_strdup(xmlnode_get_attrib(packet, "id")); |
1663 | 1663 |
1664 xfer = purple_xfer_new(js->gc->account, PURPLE_XFER_RECEIVE, from); | 1664 xfer = purple_xfer_new(js->gc->account, PURPLE_XFER_RECEIVE, from); |
1665 if (xfer) | 1665 g_return_if_fail(xfer != NULL); |
1666 { | 1666 |
1667 xfer->data = jsx; | 1667 xfer->data = jsx; |
1668 | 1668 |
1669 purple_xfer_set_filename(xfer, filename); | 1669 purple_xfer_set_filename(xfer, filename); |
1670 if(filesize > 0) | 1670 if(filesize > 0) |
1671 purple_xfer_set_size(xfer, filesize); | 1671 purple_xfer_set_size(xfer, filesize); |
1672 | 1672 |
1673 purple_xfer_set_init_fnc(xfer, jabber_si_xfer_init); | 1673 purple_xfer_set_init_fnc(xfer, jabber_si_xfer_init); |
1674 purple_xfer_set_request_denied_fnc(xfer, jabber_si_xfer_request_denied); | 1674 purple_xfer_set_request_denied_fnc(xfer, jabber_si_xfer_request_denied); |
1675 purple_xfer_set_cancel_recv_fnc(xfer, jabber_si_xfer_cancel_recv); | 1675 purple_xfer_set_cancel_recv_fnc(xfer, jabber_si_xfer_cancel_recv); |
1676 purple_xfer_set_end_fnc(xfer, jabber_si_xfer_end); | 1676 purple_xfer_set_end_fnc(xfer, jabber_si_xfer_end); |
1677 | 1677 |
1678 js->file_transfers = g_list_append(js->file_transfers, xfer); | 1678 js->file_transfers = g_list_append(js->file_transfers, xfer); |
1679 | 1679 |
1680 purple_xfer_request(xfer); | 1680 purple_xfer_request(xfer); |
1681 } | |
1682 } | 1681 } |
1683 | 1682 |
1684 void | 1683 void |
1685 jabber_si_init(void) | 1684 jabber_si_init(void) |
1686 { | 1685 { |