soc.2010.msn-tlc: a00534e6: This bit must be migrated too.

masca at cpw.pidgin.im masca at cpw.pidgin.im
Mon Jun 21 03:16:43 EDT 2010


-----------------------------------------------------------------
Revision: a00534e649cfe73cc560f4317893664325a4fee2
Ancestor: 122d679002c0937d01d43cc58d5ce34e42d09ca5
Author: masca at cpw.pidgin.im
Date: 2010-06-17T18:04:42
Branch: im.pidgin.soc.2010.msn-tlc
URL: http://d.pidgin.im/viewmtn/revision/info/a00534e649cfe73cc560f4317893664325a4fee2

Modified files:
        libpurple/protocols/msn/directconn.c
        libpurple/protocols/msn/directconn.h

ChangeLog: 

This bit must be migrated too.

-------------- next part --------------
============================================================
--- libpurple/protocols/msn/directconn.c	5f23e41e40e01a3ae2e44ccfd08ba1165b8f13a8
+++ libpurple/protocols/msn/directconn.c	25bec9e8e688043a2de2d0918dbadf0d4ffa043d
@@ -343,7 +343,7 @@ msn_dc_fallback_to_sb(MsnDirectConn *dc)
 		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 @@ msn_dc_enqueue_part(MsnDirectConn *dc, M
 	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);
 }
============================================================
--- libpurple/protocols/msn/directconn.h	17da80547ba777b2b104986e3751365a068efe96
+++ libpurple/protocols/msn/directconn.h	ce7a53ef577c22c2e8506ee6d011c109058a60a2
@@ -73,6 +73,7 @@ struct _MsnDirectConnPacket {
 
 	void        (*sent_cb)(struct _MsnDirectConnPacket*);
 	MsnMessage  *msg;
+	MsnSlpMessagePart *part;
 };
 
 struct _MsnDirectConn
@@ -128,8 +129,10 @@ struct _MsnDirectConn
 /*
  * 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);
 


More information about the Commits mailing list