# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1241995273 0
# Node ID 10d92c213d0f8f97a504b929f063b90a4cd6fe21
# Parent  ef61a2b746bda982e4882ee06875241a098c1a40# Parent  c69a2e88fee32fc2ff3a441bf919f9714c88304b
merge of 'a543de79fc730fb1a32056d0da5abe0044ed9533'
     and 'bbeb29e959037b31d07ee20b3d7554c3e82bf826'

diff -r ef61a2b746bd -r 10d92c213d0f libpurple/protocols/msn/slplink.c
--- a/libpurple/protocols/msn/slplink.c	Sun May 10 22:29:28 2009 +0000
+++ b/libpurple/protocols/msn/slplink.c	Sun May 10 22:41:13 2009 +0000
@@ -683,9 +683,9 @@
 		size = st.st_size;
 
 	if(!file_name) {
-		base = g_path_get_basename(file_path);
-		u8 = purple_utf8_try_convert(base);
-		g_free(base);
+		gchar *basename = g_path_get_basename(file_path);
+		u8 = purple_utf8_try_convert(basename);
+		g_free(basename);
 		file_name = u8;
 	}