# HG changeset patch
# User Elliott Sales de Andrade <qulogic@pidgin.im>
# Date 1249357977 0
# Node ID 6ef1f49d6b6c6e41140e5a9dd8fee8023ffb02d3
# Parent  bf7039a638b70541bb1ea3927decacd4767ea86f# Parent  1e02e65ce301493ee63fe5a6e8eeaeccab58edea
merge of '4687f2ad1aa97d621e389533af53704e6066f35a'
     and 'de6bbf227459900b7451907360f092dfb33df8d6'

diff -r 1e02e65ce301 -r 6ef1f49d6b6c libpurple/protocols/msn/slp.c
--- a/libpurple/protocols/msn/slp.c	Tue Aug 04 02:14:46 2009 +0000
+++ b/libpurple/protocols/msn/slp.c	Tue Aug 04 03:52:57 2009 +0000
@@ -341,8 +341,8 @@
 			bin = (char *)purple_base64_decode(context, &bin_len);
 			file_size = GUINT32_FROM_LE(*(gsize *)(bin + 8));
 
-			file_name = g_convert(bin + 20, -1, "UTF-8", "UTF-16LE",
-			                      NULL, NULL, NULL);
+			file_name = g_convert(bin + 20, MAX_FILE_NAME_LEN, "UTF-8", "UTF-16LE",
+			                      NULL, NULL, &error);
 
 			g_free(bin);
 
diff -r 1e02e65ce301 -r 6ef1f49d6b6c libpurple/protocols/msn/slpcall.c
--- a/libpurple/protocols/msn/slpcall.c	Tue Aug 04 02:14:46 2009 +0000
+++ b/libpurple/protocols/msn/slpcall.c	Tue Aug 04 03:52:57 2009 +0000
@@ -209,7 +209,7 @@
 			gsize bytes_read, bytes_written;
 
 			body_str = g_convert((const gchar *)body, body_len / 2,
-			                     "UTF-8", "UTF16-LE",
+			                     "UTF-8", "UTF-16LE",
 			                     &bytes_read, &bytes_written, &error);
 			body_len -= bytes_read + 2;
 			body += bytes_read + 2;