diff libpurple/protocols/jabber/si.c @ 27754:754a82f1371b

half baked fixes for file transfer.
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Mon, 17 Dec 2007 08:20:42 +0000
parents ae8a9f2866bd
children e9cf897bd873
line wrap: on
line diff
--- a/libpurple/protocols/jabber/si.c	Mon Dec 17 07:48:27 2007 +0000
+++ b/libpurple/protocols/jabber/si.c	Mon Dec 17 08:20:42 2007 +0000
@@ -897,17 +897,17 @@
 	JabberIq *iq;
 	xmlnode *si, *file, *feature, *x, *field, *option, *value;
 	char buf[32];
+    gchar *f1 = NULL, *f2 = NULL;
+    size_t dummy;
 
-//	xfer->filename = g_path_get_basename(xfer->local_filename);
-	{ /* yaz */
-		guchar *tmp;
-		size_t dummy;
-		tmp = botch_utf(xfer->filename, strlen(xfer->filename), &dummy);
-		if(tmp){
-			purple_xfer_set_filename(xfer, (char *)tmp);
-			g_free(tmp);
-		}
-	}
+    /* yaz */
+    f1 = g_filename_display_basename(xfer->local_filename);
+    f2 = botch_utf(f1, strlen(f1), &dummy);
+    if(f2){
+        purple_xfer_set_filename(xfer, (char *)f2);
+    }
+    g_free(f1); f1 = NULL;
+    g_free(f2); f2 = NULL;
 
 	iq = jabber_iq_new(jsx->js, JABBER_IQ_SET);
 	xmlnode_set_attrib(iq->node, "to", xfer->who);