diff libpurple/protocols/msn/directconn.h @ 31292:47b6eda87723

propagate from branch 'im.pidgin.pidgin' (head 07d0765c444a097af45c2650f54323afb900a07b) to branch 'im.pidgin.soc.2010.msn-tlc' (head f3998422a4724ab424e4e2328f58fc0504856557)

--- a/libpurple/protocols/msn/directconn.h	Mon Jul 19 18:25:47 2010 +0000
+++ b/libpurple/protocols/msn/directconn.h	Mon Jul 19 21:11:32 2010 +0000
@@ -30,10 +30,13 @@
 #include "proxy.h"
 #include "circbuffer.h"
 
-#include "msg.h"
 #include "slp.h"
 #include "slplink.h"
 #include "slpmsg.h"
+#include "slpmsg_part.h"
+#include "p2p.h"
+
+#define MSN_DCCONN_MAX_SIZE 1352
 
 typedef enum
 {
@@ -68,7 +71,7 @@
 	guchar      *data;
 
 	void        (*sent_cb)(struct _MsnDirectConnPacket*);
-	MsnMessage  *msg;
+	MsnSlpMessagePart *part;
 };
 
 struct _MsnDirectConn
@@ -100,7 +103,7 @@
 	GQueue  *out_queue; /**< The outgoing packet queue */
 	int     msg_pos;    /**< The position of next byte to be sent in the actual packet */
 
-	MsnSlpHeader    header; /**< SLP header for parsing / serializing */
+	MsnP2PHeader    header; /**< SLP header for parsing / serializing */
 
 	/** The callback used for sending information to the peer about the opened socket */
 	void (*send_connection_info_msg_cb)(MsnDirectConn *);
@@ -124,8 +127,12 @@
 /*
  * 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);
 
 /*
  * Creates, initializes, and returns a new MsnDirectConn structure.