Mercurial > pidgin

changeset 30866:b682664bae30

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Get rid of the ack_sub_id field in the SlpMessage in favor of the one in the Header.
author masca@cpw.pidgin.im
date Thu, 05 Aug 2010 23:09:12 +0000
parents b785e4256a66
children 6b73ff4fcc69
files libpurple/protocols/msn/slplink.c libpurple/protocols/msn/slpmsg.c libpurple/protocols/msn/slpmsg.h
diffstat 3 files changed, 1 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/msn/slplink.c	Thu Aug 05 22:47:36 2010 +0000
+++ b/libpurple/protocols/msn/slplink.c	Thu Aug 05 23:09:12 2010 +0000
@@ -362,7 +362,6 @@
 	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 @@
 	}
 	else if (slpmsg->flags == 0x100)
 	{
-		slpmsg->header->ack_sub_id = slpmsg->ack_sub_id;
 		slpmsg->header->ack_size   = slpmsg->ack_size;
 	}
 
--- a/libpurple/protocols/msn/slpmsg.c	Thu Aug 05 22:47:36 2010 +0000
+++ b/libpurple/protocols/msn/slpmsg.c	Thu Aug 05 23:09:12 2010 +0000
@@ -246,7 +246,7 @@
 	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";
 
--- a/libpurple/protocols/msn/slpmsg.h	Thu Aug 05 22:47:36 2010 +0000
+++ b/libpurple/protocols/msn/slpmsg.h	Thu Aug 05 23:09:12 2010 +0000
@@ -49,7 +49,6 @@
 	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. */