# HG changeset patch
# User masca@cpw.pidgin.im
# Date 1281050209 0
# Node ID 6b73ff4fcc69a5f9d385c3dc009f333c6c2df335
# Parent  b682664bae303932eb64cf3e5d3a0a47bdb583c3
Get rid of the ack_size field in the SlpMessage in favor of the one in the Header. And do nothing if the released SlpMessage is an ACK or a 100 (DC Handshake).

diff -r b682664bae30 -r 6b73ff4fcc69 libpurple/protocols/msn/slplink.c
--- a/libpurple/protocols/msn/slplink.c	Thu Aug 05 23:09:12 2010 +0000
+++ b/libpurple/protocols/msn/slplink.c	Thu Aug 05 23:16:49 2010 +0000
@@ -359,10 +359,6 @@
 	{
 		slpmsg->header->ack_id = rand() % 0xFFFFFF00;
 	}
-	else if (slpmsg->flags == P2P_ACK)
-	{
-		slpmsg->header->ack_size = slpmsg->ack_size;
-	}
 	else if (slpmsg->flags == P2P_MSN_OBJ_DATA ||
 	         slpmsg->flags == (P2P_WML2009_COMP | P2P_MSN_OBJ_DATA) ||
 	         slpmsg->flags == P2P_FILE_DATA)
@@ -375,10 +371,6 @@
 		slpmsg->footer->value = slpcall->app_id;
 		slpmsg->header->ack_id = rand() % 0xFFFFFF00;
 	}
-	else if (slpmsg->flags == 0x100)
-	{
-		slpmsg->header->ack_size   = slpmsg->ack_size;
-	}
 
 	slpmsg->header->id = slpmsg->id;
 	slpmsg->header->flags = (guint32)slpmsg->flags;
diff -r b682664bae30 -r 6b73ff4fcc69 libpurple/protocols/msn/slpmsg.c
--- a/libpurple/protocols/msn/slpmsg.c	Thu Aug 05 23:09:12 2010 +0000
+++ b/libpurple/protocols/msn/slpmsg.c	Thu Aug 05 23:16:49 2010 +0000
@@ -247,7 +247,7 @@
 	slpmsg->flags      = P2P_ACK;
 	slpmsg->header->ack_id     = header->id;
 	slpmsg->header->ack_sub_id = header->ack_id;
-	slpmsg->ack_size   = header->total_size;
+	slpmsg->header->ack_size   = header->total_size;
 	slpmsg->info = "SLP ACK";
 
 	return slpmsg;
diff -r b682664bae30 -r 6b73ff4fcc69 libpurple/protocols/msn/slpmsg.h
--- a/libpurple/protocols/msn/slpmsg.h	Thu Aug 05 23:09:12 2010 +0000
+++ b/libpurple/protocols/msn/slpmsg.h	Thu Aug 05 23:16:49 2010 +0000
@@ -49,7 +49,6 @@
 	MsnP2PFooter *footer;
 
 	long id;
-	long long ack_size;
 
 	gboolean sip; /**< A flag that states if this is a SIP slp message. */
 	long flags;