# HG changeset patch
# User Elliott Sales de Andrade <qulogic@pidgin.im>
# Date 1249012380 0
# Node ID 6c9c6123b942915a500f6246c50578ce493df77a
# Parent  46a6465491ac363a258b6eff674a042411ad4c76
Using g_convert instead of g_utf16_to_utf8 means we don't need to go
through the whole buffer converting it first.

diff -r 46a6465491ac -r 6c9c6123b942 libpurple/protocols/msn/slp.c
--- a/libpurple/protocols/msn/slp.c	Fri Jul 31 03:27:47 2009 +0000
+++ b/libpurple/protocols/msn/slp.c	Fri Jul 31 03:53:00 2009 +0000
@@ -324,7 +324,6 @@
 		gsize bin_len;
 		guint32 file_size;
 		char *file_name;
-		gunichar2 *uni_name;
 
 		account = slpcall->slplink->session->account;
 
@@ -342,14 +341,8 @@
 			bin = (char *)purple_base64_decode(context, &bin_len);
 			file_size = GUINT32_FROM_LE(*(gsize *)(bin + 8));
 
-			uni_name = (gunichar2 *)(bin + 20);
-			while(*uni_name != 0 && ((char *)uni_name - (bin + 20)) < MAX_FILE_NAME_LEN) {
-				*uni_name = GUINT16_FROM_LE(*uni_name);
-				uni_name++;
-			}
-
-			file_name = g_utf16_to_utf8((const gunichar2 *)(bin + 20), -1,
-										NULL, NULL, NULL);
+			file_name = g_convert(bin + 20, -1, "UTF-16LE", "UTF-8",
+			                      NULL, NULL, NULL);
 
 			g_free(bin);