Mercurial > pidgin
diff libpurple/protocols/msn/directconn.h @ 30779:23b7b1b817c8
merge of '5af6a35c4c39341b79cc8d61c700da2b874b9b6b'
and 'b4a877b5d355860851acfe7ac186ba5d4f88d684'
| author | masca@cpw.pidgin.im |
|---|---|
| date | Sun, 06 Jun 2010 21:27:12 +0000 |
| parents | 7f564cf26ea3 62538a3f90f0 |
| children | 4481d04cda70 |
line wrap: on
line diff
--- a/libpurple/protocols/msn/directconn.h Wed Jun 02 20:51:24 2010 +0000 +++ b/libpurple/protocols/msn/directconn.h Sun Jun 06 21:27:12 2010 +0000 @@ -34,6 +34,7 @@ #include "slp.h" #include "slplink.h" #include "slpmsg.h" +#include "p2p.h" typedef enum { @@ -100,7 +101,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 *);