# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1241997341 0
# Node ID fd92e7beb84041e0b712a04189824911e8b12c3e
# Parent  f924c19ad9c28792cad3583b1653fef11c1dd93d# Parent  10d92c213d0f8f97a504b929f063b90a4cd6fe21
merge of '19b202a7eff53542a31f52433aa8bc17649f8b3d'
     and 'f692c258ca8f5dabfcf69ca9b2578e7bad37bdd0'

diff -r f924c19ad9c2 -r fd92e7beb840 libpurple/protocols/msn/slplink.c
--- a/libpurple/protocols/msn/slplink.c	Sun May 10 23:13:31 2009 +0000
+++ b/libpurple/protocols/msn/slplink.c	Sun May 10 23:15:41 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;
 	}