Mercurial > pidgin.yaz
changeset 31204:c2e911eeffc9
Drop MsnSlpFooter in favor of MsnP2pFooter.
| author | masca@cpw.pidgin.im |
|---|---|
| date | Thu, 03 Jun 2010 21:44:36 +0000 |
| parents | 4a8ebd7ed879 |
| children | e5e712cf9f7e |
| files | libpurple/protocols/msn/msg.c libpurple/protocols/msn/msg.h libpurple/protocols/msn/p2p.h |
| diffstat | 3 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/msn/msg.c Thu Jun 03 21:41:43 2010 +0000 +++ b/libpurple/protocols/msn/msg.c Thu Jun 03 21:44:36 2010 +0000 @@ -299,7 +299,7 @@ !strcmp(content_type, "application/x-msnmsgrp2p")) { MsnP2PBinaryHeader header; - MsnSlpFooter footer; + MsnP2PFooter footer; int body_len; if (payload_len - (tmp - tmp_base) < sizeof(header)) { @@ -476,7 +476,7 @@ if (msg->msnslp_message) { MsnP2PBinaryHeader header; - MsnSlpFooter footer; + MsnP2PFooter footer; header.session_id = GUINT32_TO_LE(msg->msnslp_header.session_id); header.id = GUINT32_TO_LE(msg->msnslp_header.id);
--- a/libpurple/protocols/msn/msg.h Thu Jun 03 21:41:43 2010 +0000 +++ b/libpurple/protocols/msn/msg.h Thu Jun 03 21:44:36 2010 +0000 @@ -68,11 +68,6 @@ #define MSG_OIM_BODY_DEM "\n\n" #define MSG_OIM_LINE_DEM "\n" -typedef struct -{ - guint32 value; -} MsnSlpFooter; - /** * A message. */ @@ -95,7 +90,7 @@ guint received_chunks; /**< How many chunks we've received so far */ MsnP2PBinaryHeader msnslp_header; - MsnSlpFooter msnslp_footer; + MsnP2PFooter msnslp_footer; GHashTable *header_table; GList *header_list;
--- a/libpurple/protocols/msn/p2p.h Thu Jun 03 21:41:43 2010 +0000 +++ b/libpurple/protocols/msn/p2p.h Thu Jun 03 21:44:36 2010 +0000 @@ -18,6 +18,11 @@ } MsnP2PBinaryHeader; #pragma pack(pop) +typedef struct +{ + guint32 value; +} MsnP2PFooter; + typedef enum { P2P_NO_FLAG = 0x0, /**< No flags specified */