Mercurial > pidgin.yaz
comparison libpurple/protocols/jabber/si.c @ 32767:2ec94166be43
On the way to hiding the PurpleConnection struct.
* Added purple_connection_get_flags() and purple_connection_set_flags()
* Use purple_connection_ accessor functions.
author | andrew.victor@mxit.com |
---|---|
date | Tue, 18 Oct 2011 18:47:48 +0000 |
parents | e164f7815b52 |
children | fb5b5f6cf111 |
comparison
equal
deleted
inserted
replaced
32766:ea2b621fd3ba | 32767:2ec94166be43 |
---|---|
1559 | 1559 |
1560 purple_request_fields_add_group(fields, group); | 1560 purple_request_fields_add_group(fields, group); |
1561 | 1561 |
1562 purple_request_fields(jsx->js->gc, _("Select a Resource"), msg, NULL, fields, | 1562 purple_request_fields(jsx->js->gc, _("Select a Resource"), msg, NULL, fields, |
1563 _("Send File"), G_CALLBACK(resource_select_ok_cb), _("Cancel"), G_CALLBACK(resource_select_cancel_cb), | 1563 _("Send File"), G_CALLBACK(resource_select_ok_cb), _("Cancel"), G_CALLBACK(resource_select_cancel_cb), |
1564 jsx->js->gc->account, purple_xfer_get_remote_user(xfer), NULL, xfer); | 1564 purple_connection_get_account(jsx->js->gc), purple_xfer_get_remote_user(xfer), NULL, xfer); |
1565 | 1565 |
1566 g_free(msg); | 1566 g_free(msg); |
1567 } | 1567 } |
1568 | 1568 |
1569 g_list_free(resources); | 1569 g_list_free(resources); |
1615 PurpleXfer *xfer; | 1615 PurpleXfer *xfer; |
1616 JabberSIXfer *jsx; | 1616 JabberSIXfer *jsx; |
1617 | 1617 |
1618 js = purple_connection_get_protocol_data(gc); | 1618 js = purple_connection_get_protocol_data(gc); |
1619 | 1619 |
1620 xfer = purple_xfer_new(gc->account, PURPLE_XFER_SEND, who); | 1620 xfer = purple_xfer_new(purple_connection_get_account(gc), PURPLE_XFER_SEND, who); |
1621 if (xfer) | 1621 if (xfer) |
1622 { | 1622 { |
1623 jsx = g_new0(JabberSIXfer, 1); | 1623 jsx = g_new0(JabberSIXfer, 1); |
1624 purple_xfer_set_protocol_data(xfer, jsx); | 1624 purple_xfer_set_protocol_data(xfer, jsx); |
1625 jsx->js = js; | 1625 jsx->js = js; |
1741 | 1741 |
1742 jsx->js = js; | 1742 jsx->js = js; |
1743 jsx->stream_id = g_strdup(stream_id); | 1743 jsx->stream_id = g_strdup(stream_id); |
1744 jsx->iq_id = g_strdup(id); | 1744 jsx->iq_id = g_strdup(id); |
1745 | 1745 |
1746 xfer = purple_xfer_new(js->gc->account, PURPLE_XFER_RECEIVE, from); | 1746 xfer = purple_xfer_new(purple_connection_get_account(js->gc), PURPLE_XFER_RECEIVE, from); |
1747 g_return_if_fail(xfer != NULL); | 1747 g_return_if_fail(xfer != NULL); |
1748 | 1748 |
1749 purple_xfer_set_protocol_data(xfer, jsx); | 1749 purple_xfer_set_protocol_data(xfer, jsx); |
1750 | 1750 |
1751 purple_xfer_set_filename(xfer, filename); | 1751 purple_xfer_set_filename(xfer, filename); |