diff src/protocols/msn/slplink.c @ 11321:95fa774d216d

[gaim-migrate @ 13525] Kill off the conversation closed notices Fix for setting the ACK id on slpmsg ACKs which might improve things for other clients (see bug #1222320) Clean up some debugging stuff Add support for sending and receiving Nudges (Based on patch #1169352) Add an account action to go direct to a Hotmail Inbox committer: Tailor Script <tailor@pidgin.im>
author Stu Tomlinson <stu@nosnilmot.com>
date Sun, 21 Aug 2005 17:14:22 +0000
parents 93663df88ec4
children 2cb95478ef9c
line wrap: on
line diff
--- a/src/protocols/msn/slplink.c	Sun Aug 21 17:01:43 2005 +0000
+++ b/src/protocols/msn/slplink.c	Sun Aug 21 17:14:22 2005 +0000
@@ -384,6 +384,7 @@
 		msg->msnslp_header.session_id = slpmsg->session_id;
 		msg->msnslp_header.ack_id = slpmsg->ack_id;
 		msg->msnslp_header.ack_size = slpmsg->ack_size;
+		msg->msnslp_header.ack_sub_id = slpmsg->ack_sub_id;
 	}
 	else if (slpmsg->flags == 0x20 || slpmsg->flags == 0x1000030)
 	{
@@ -671,7 +672,7 @@
 	gsize size = 0;
 	MsnContextHeader header;
 	gchar *u8 = NULL;
-	guchar *base, *n;
+	guchar *base, *n, *ret;
 	gunichar2 *uni = NULL;
 	glong currentChar = 0;
 	glong uni_len = 0;
@@ -717,7 +718,9 @@
 	n += 4;
 
 	g_free(uni);
-	return gaim_base64_encode(base, len);
+	ret = gaim_base64_encode(base, len);
+	g_free(base);
+	return ret;
 }
 
 void