soc.2010.msn-tlc: 36afe910: Get rid of the ack_sub_id field in the S...

[masca at cpw.pidgin.im]

----------------------------------------------------------------------
Revision: 36afe910b277239a707ff3a0e9ced376aaa91240
Parent:   e207f388642a31ee0e6f74bfc25fc1c874b6aaf1
Author:   masca at cpw.pidgin.im
Date:     08/05/10 19:09:12
Branch:   im.pidgin.soc.2010.msn-tlc
URL: http://d.pidgin.im/viewmtn/revision/info/36afe910b277239a707ff3a0e9ced376aaa91240

Changelog: 

Get rid of the ack_sub_id field in the SlpMessage in favor of the one in the Header.

Changes against parent e207f388642a31ee0e6f74bfc25fc1c874b6aaf1

  patched  libpurple/protocols/msn/slplink.c
  patched  libpurple/protocols/msn/slpmsg.c
  patched  libpurple/protocols/msn/slpmsg.h

-------------- next part --------------
============================================================
--- libpurple/protocols/msn/slplink.c	30c48be8392c685406e04fdf027c98e4229834fc
+++ libpurple/protocols/msn/slplink.c	8e69f46acd19e685a1ef3dc5935533a2f992e4b9
@@ -362,7 +362,6 @@ msn_slplink_release_slpmsg(MsnSlpLink *s
 	else if (slpmsg->flags == P2P_ACK)
 	{
 		slpmsg->header->ack_size = slpmsg->ack_size;
-		slpmsg->header->ack_sub_id = slpmsg->ack_sub_id;
 	}
 	else if (slpmsg->flags == P2P_MSN_OBJ_DATA ||
 	         slpmsg->flags == (P2P_WML2009_COMP | P2P_MSN_OBJ_DATA) ||
@@ -378,7 +377,6 @@ msn_slplink_release_slpmsg(MsnSlpLink *s
 	}
 	else if (slpmsg->flags == 0x100)
 	{
-		slpmsg->header->ack_sub_id = slpmsg->ack_sub_id;
 		slpmsg->header->ack_size   = slpmsg->ack_size;
 	}
 
============================================================
--- libpurple/protocols/msn/slpmsg.c	a5ee74ea0391f7057264ec23391f149398d44827
+++ libpurple/protocols/msn/slpmsg.c	8d3331404e0f902da3062658906ac2d6d945db97
@@ -246,7 +246,7 @@ MsnSlpMessage *msn_slpmsg_ack_new(MsnP2P
 	slpmsg->size       = header->total_size;
 	slpmsg->flags      = P2P_ACK;
 	slpmsg->header->ack_id     = header->id;
-	slpmsg->ack_sub_id = header->ack_id;
+	slpmsg->header->ack_sub_id = header->ack_id;
 	slpmsg->ack_size   = header->total_size;
 	slpmsg->info = "SLP ACK";
 
============================================================
--- libpurple/protocols/msn/slpmsg.h	37b174b65d4067e1d51e6965cf152e492ddd3e2c
+++ libpurple/protocols/msn/slpmsg.h	f83e2fa18d8eb77f73909fe4c9319520bb007682
@@ -49,7 +49,6 @@ struct _MsnSlpMessage
 	MsnP2PFooter *footer;
 
 	long id;
-	long ack_sub_id;
 	long long ack_size;
 
 	gboolean sip; /**< A flag that states if this is a SIP slp message. */