Mercurial > pidgin.yaz
changeset 31242:0678ad30aa65
This bit must be migrated too.
| author | masca@cpw.pidgin.im |
|---|---|
| date | Thu, 17 Jun 2010 18:04:42 +0000 |
| parents | 9a916d3ac643 |
| children | dfada77da5cb |
| files | libpurple/protocols/msn/directconn.c libpurple/protocols/msn/directconn.h |
| diffstat | 2 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/msn/directconn.c Wed Jun 16 22:18:22 2010 +0000 +++ b/libpurple/protocols/msn/directconn.c Thu Jun 17 18:04:42 2010 +0000 @@ -343,7 +343,7 @@ if (queue) { while (!g_queue_is_empty(queue)) { MsnDirectConnPacket *p = g_queue_pop_head(queue); - msn_slplink_send_msg(slplink, p->msg); + msn_slplink_send_msgpart(slplink, p->part); msn_dc_destroy_packet(p); } g_queue_free(queue); @@ -570,6 +570,7 @@ memcpy(p->data + P2P_PACKET_HEADER_SIZE, part->buffer, part->size); p->sent_cb = msn_dc_send_packet_cb; + p->part = part; msn_dc_enqueue_packet(dc, p); }
--- a/libpurple/protocols/msn/directconn.h Wed Jun 16 22:18:22 2010 +0000 +++ b/libpurple/protocols/msn/directconn.h Thu Jun 17 18:04:42 2010 +0000 @@ -73,6 +73,7 @@ void (*sent_cb)(struct _MsnDirectConnPacket*); MsnMessage *msg; + MsnSlpMessagePart *part; }; struct _MsnDirectConn @@ -128,8 +129,10 @@ /* * Queues an MSN message to be sent via direct connection. */ +#if 0 void msn_dc_enqueue_msg(MsnDirectConn *dc, MsnMessage *msg); +#endif void msn_dc_enqueue_part(MsnDirectConn *dc, MsnSlpMessagePart *part);