# HG changeset patch
# User Elliott Sales de Andrade <qulogic@pidgin.im>
# Date 1238214924 0
# Node ID 33516a6221c0003efd9a272e304ac7a309f1f963
# Parent  511509fa0e020e1ca50b7c945339423aa2afcb57# Parent  7141cd06d437eb683b10246eebe453fa5a0b9977
merge of '72b4eba9246c31efe0760a9e5d1eeb0f87da2867'
     and 'e56cf6845a01cf20b06f80d6303da051b9566910'

diff -r 7141cd06d437 -r 33516a6221c0 libpurple/nat-pmp.c
--- a/libpurple/nat-pmp.c	Fri Mar 27 17:14:12 2009 +0000
+++ b/libpurple/nat-pmp.c	Sat Mar 28 04:35:24 2009 +0000
@@ -81,6 +81,8 @@
 struct _PurplePmpMapResponse {
 	guint8		version;
 	guint8		opcode;
+	guint16		resultcode;
+	guint32		epoch;
 	guint16		privateport;
 	guint16		publicport;
 	guint32		lifetime;
diff -r 7141cd06d437 -r 33516a6221c0 libpurple/ntlm.c
--- a/libpurple/ntlm.c	Fri Mar 27 17:14:12 2009 +0000
+++ b/libpurple/ntlm.c	Sat Mar 28 04:35:24 2009 +0000
@@ -59,9 +59,14 @@
 	guint8  protocol[8];     /* 'N', 'T', 'L', 'M', 'S', 'S', 'P', '\0'*/
 	guint32 type;            /* 0x00000002 */
 
+	short   msg_len1;        /* target name length */
+	short   msg_len2;        /* target name length */
+	guint32 msg_off;         /* target name offset (always 0x00000048) */
+
 	guint32 flags;           /* 0x00008201 */
 
 	guint8  nonce[8];        /* nonce */
+	guint8 context[8];
 };
 
 struct type3_message {
diff -r 7141cd06d437 -r 33516a6221c0 libpurple/protocols/myspace/myspace.c