soc.2010.msn-tlc: 6827410a: Chang member name so it is compatible wi...

[masca at cpw.pidgin.im]

-----------------------------------------------------------------
Revision: 6827410a0577c6802d9cd3bbd3360a64f11c4acd
Ancestor: daa1c9055c681df9e6c617eda9894c771c22df1d
Author: masca at cpw.pidgin.im
Date: 2010-06-03T21:18:53
Branch: im.pidgin.soc.2010.msn-tlc
URL: http://d.pidgin.im/viewmtn/revision/info/6827410a0577c6802d9cd3bbd3360a64f11c4acd

Modified files:
        libpurple/protocols/msn/directconn.c
        libpurple/protocols/msn/p2p.h

ChangeLog: 

Chang member name so it is compatible with MsnSlpHeader struct names.

-------------- next part --------------
============================================================
--- libpurple/protocols/msn/directconn.c	5ab855487f6413d8c511e123b3d61acc3c41ceee
+++ libpurple/protocols/msn/directconn.c	a42bdcc1c535ab6f7d212214c050f34924bf47be
@@ -350,13 +350,13 @@ msn_dc_parse_binary_header(MsnDirectConn
 	context = (MsnP2PBinaryHeader *)(dc->in_buffer + 4);
 
 	h->session_id = GUINT32_FROM_LE(context->session_id);
-	h->id = GUINT32_FROM_LE(context->seq_id);
+	h->id = GUINT32_FROM_LE(context->id);
 	h->offset = GUINT64_FROM_LE(context->offset);
 	h->total_size = GUINT64_FROM_LE(context->total_size);
 	h->length = GUINT32_FROM_LE(context->length);
 	h->flags = GUINT32_FROM_LE(context->flags);
 	h->ack_id = GUINT32_FROM_LE(context->ack_id);
-	h->ack_sub_id = GUINT32_FROM_LE(context->ack_uid);
+	h->ack_sub_id = GUINT32_FROM_LE(context->ack_sub_id);
 	h->ack_size = GUINT64_FROM_LE(context->ack_size);
 }
 
@@ -370,13 +370,13 @@ msn_dc_serialize_binary_header(MsnDirect
 	h = &dc->header;
 
 	bin_header.session_id = GUINT32_TO_LE(h->session_id);
-	bin_header.seq_id = GUINT32_TO_LE(h->id);
+	bin_header.id = GUINT32_TO_LE(h->id);
 	bin_header.offset = GUINT64_TO_LE(h->offset);
 	bin_header.total_size = GUINT64_TO_LE(h->total_size);
 	bin_header.length = GUINT32_TO_LE(h->length);
 	bin_header.flags = GUINT32_TO_LE(h->flags);
 	bin_header.ack_id = GUINT32_TO_LE(h->ack_id);
-	bin_header.ack_uid = GUINT32_TO_LE(h->ack_sub_id);
+	bin_header.ack_sub_id = GUINT32_TO_LE(h->ack_sub_id);
 	bin_header.ack_size = GUINT64_TO_LE(h->ack_size);
 
 	return (const gchar *)&bin_header;
============================================================
--- libpurple/protocols/msn/p2p.h	88736c70817e5617d91b67125abc2ceec45962fd
+++ libpurple/protocols/msn/p2p.h	9fa1d84a98dd65bd40296be9250f4460ed252aa6
@@ -6,13 +6,13 @@ typedef struct {
 #pragma pack(push,1)
 typedef struct {
 	guint32 session_id;
-	guint32 seq_id;
+	guint32 id;
 	guint64 offset;
 	guint64 total_size;
 	guint32 length;
 	guint32 flags;
 	guint32 ack_id;
-	guint32 ack_uid;
+	guint32 ack_sub_id;
 	guint64 ack_size;
 /*	guint8  body[1]; */
 } MsnP2PBinaryHeader;