soc.2010.msn-tlc: e1054f08: Get rid of the ack_id field in the SlpMe...

[masca at cpw.pidgin.im]

----------------------------------------------------------------------
Revision: e1054f08a83cd8d39e5a11fcef26161d8d56cf4d
Parent:   f6d84b11bd9095bf43f54f60076e1ff78ca9bdb5
Author:   masca at cpw.pidgin.im
Date:     08/05/10 18:41:22
Branch:   im.pidgin.soc.2010.msn-tlc
URL: http://d.pidgin.im/viewmtn/revision/info/e1054f08a83cd8d39e5a11fcef26161d8d56cf4d

Changelog: 

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

Changes against parent f6d84b11bd9095bf43f54f60076e1ff78ca9bdb5

  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	ec6861e98466c74ebfac9fceb1989940f01c5492
+++ libpurple/protocols/msn/slplink.c	30c48be8392c685406e04fdf027c98e4229834fc
@@ -361,7 +361,6 @@ msn_slplink_release_slpmsg(MsnSlpLink *s
 	}
 	else if (slpmsg->flags == P2P_ACK)
 	{
-		slpmsg->header->ack_id = slpmsg->ack_id;
 		slpmsg->header->ack_size = slpmsg->ack_size;
 		slpmsg->header->ack_sub_id = slpmsg->ack_sub_id;
 	}
@@ -379,7 +378,6 @@ msn_slplink_release_slpmsg(MsnSlpLink *s
 	}
 	else if (slpmsg->flags == 0x100)
 	{
-		slpmsg->header->ack_id     = slpmsg->ack_id;
 		slpmsg->header->ack_sub_id = slpmsg->ack_sub_id;
 		slpmsg->header->ack_size   = slpmsg->ack_size;
 	}
============================================================
--- libpurple/protocols/msn/slpmsg.c	94b6f99e74593fd321aed9800ac84e711a1b3900
+++ libpurple/protocols/msn/slpmsg.c	09a484cec83584ac28823ed0f32b6010de5ec1ed
@@ -245,7 +245,7 @@ MsnSlpMessage *msn_slpmsg_ack_new(MsnP2P
 	slpmsg->header->session_id = header->session_id;
 	slpmsg->size       = header->total_size;
 	slpmsg->flags      = P2P_ACK;
-	slpmsg->ack_id     = header->id;
+	slpmsg->header->ack_id     = header->id;
 	slpmsg->ack_sub_id = header->ack_id;
 	slpmsg->ack_size   = header->total_size;
 	slpmsg->info = "SLP ACK";
============================================================
--- libpurple/protocols/msn/slpmsg.h	9eeaeb5d9d36d2d9d0fc24acd88dd2ab9bd489c1
+++ libpurple/protocols/msn/slpmsg.h	37b174b65d4067e1d51e6965cf152e492ddd3e2c
@@ -49,7 +49,6 @@ struct _MsnSlpMessage
 	MsnP2PFooter *footer;
 
 	long id;
-	long ack_id;
 	long ack_sub_id;
 	long long ack_size;