# HG changeset patch
# User masca@cpw.pidgin.im
# Date 1275601476 0
# Node ID c2e911eeffc9d52652deed5816556d8076318814
# Parent  4a8ebd7ed879cb3c573f28ebaa957a5302e3e69f
Drop MsnSlpFooter in favor of MsnP2pFooter.

diff -r 4a8ebd7ed879 -r c2e911eeffc9 libpurple/protocols/msn/msg.c
--- 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);
diff -r 4a8ebd7ed879 -r c2e911eeffc9 libpurple/protocols/msn/msg.h
--- 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;
diff -r 4a8ebd7ed879 -r c2e911eeffc9 libpurple/protocols/msn/p2p.h
--- 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 */