soc.2010.msn-tlc: 59e73b2d: Drop MsnSlpFooter in favor of MsnP2pFoot...

[masca at cpw.pidgin.im]

-----------------------------------------------------------------
Revision: 59e73b2dc4289a910a495d7b3093684eea2b46b9
Ancestor: 9f062bc3f58c9172313bf9bd0f8641b1fb8aec8b
Author: masca at cpw.pidgin.im
Date: 2010-06-03T21:44:36
Branch: im.pidgin.soc.2010.msn-tlc
URL: http://d.pidgin.im/viewmtn/revision/info/59e73b2dc4289a910a495d7b3093684eea2b46b9

Modified files:
        libpurple/protocols/msn/msg.c libpurple/protocols/msn/msg.h
        libpurple/protocols/msn/p2p.h

ChangeLog: 

Drop MsnSlpFooter in favor of MsnP2pFooter.

-------------- next part --------------
============================================================
--- libpurple/protocols/msn/msg.c	6f86c4b9b3b4879d26c03d3317baebc29368f675
+++ libpurple/protocols/msn/msg.c	3b7c8045bb937838073ce3d4aa5f806eb1b28e6e
@@ -299,7 +299,7 @@ msn_message_parse_payload(MsnMessage *ms
 		!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 @@ msn_message_gen_payload(MsnMessage *msg,
 	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);
============================================================
--- libpurple/protocols/msn/msg.h	6dd6b7f37f2bf09eab4183d9b518b24d5650d69f
+++ libpurple/protocols/msn/msg.h	12d4829a7efc0f9abf29a473ad1ac7ebe8671301
@@ -68,11 +68,6 @@ typedef void (*MsnMsgCb)(MsnMessage *, v
 #define MSG_OIM_BODY_DEM	"\n\n"
 #define MSG_OIM_LINE_DEM	"\n"
 
-typedef struct
-{
-	guint32 value;
-} MsnSlpFooter;
-
 /**
  * A message.
  */
@@ -95,7 +90,7 @@ struct _MsnMessage
 	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;
============================================================
--- libpurple/protocols/msn/p2p.h	9fa1d84a98dd65bd40296be9250f4460ed252aa6
+++ libpurple/protocols/msn/p2p.h	5a952a7acef5c34ff5d7e16e8793ca9c7602aa91
@@ -18,6 +18,11 @@ typedef struct {
 } MsnP2PBinaryHeader;
 #pragma pack(pop)
 
+typedef struct
+{
+	guint32 value;
+} MsnP2PFooter;
+
 typedef enum
 {
 	P2P_NO_FLAG         = 0x0,        /**< No flags specified */