merge of '171a74c6fa72777e350ae8066ee08312ae9f4b91'

Sun, 10 May 2009 23:15:41 +0000

author
Paul Aurich <darkrain42@pidgin.im>
date
Sun, 10 May 2009 23:15:41 +0000
changeset 27090
ac7ff6ee0bee
parent 27089
171a74c6fa72 (current diff)
parent 27087
3e84afbb5159 (diff)
child 27091
329646e4b104

merge of '171a74c6fa72777e350ae8066ee08312ae9f4b91'
and '3e84afbb51592303d87ca0da25e0af9495502e46'

--- 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;
 	}
 

mercurial