# HG changeset patch
# User Elliott Sales de Andrade <qulogic@pidgin.im>
# Date 1249359574 0
# Node ID 79630bfee621d08503cf6bbd0283b6105a0745ee
# Parent  769142e728ec643646c3022061a48782e529f0be# Parent  2d7931a8ee84dfcc88cafb6b9365c3f53e737f7a
merge of '3dba2c274943bbb9eb35dbbf06b9053d9c195933'
     and 'aacbe07782ea562b3fd3b7cd615f22041e73f3e6'

diff -r 2d7931a8ee84 -r 79630bfee621 libpurple/protocols/msn/slp.c
--- a/libpurple/protocols/msn/slp.c	Tue Aug 04 04:04:21 2009 +0000
+++ b/libpurple/protocols/msn/slp.c	Tue Aug 04 04:19:34 2009 +0000
@@ -342,7 +342,7 @@
 			file_size = GUINT32_FROM_LE(*(gsize *)(bin + 8));
 
 			file_name = g_convert(bin + 20, MAX_FILE_NAME_LEN, "UTF-8", "UTF-16LE",
-			                      NULL, NULL, &error);
+			                      NULL, NULL, NULL);
 
 			g_free(bin);