# HG changeset patch
# User Yoshiki Yazawa <yaz@cc.rim.or.jp>
# Date 1193735875 -32400
# Node ID b02853ac8466bebfd88f469afdbbe47b0e944ddc
# Parent  efd2924b3f90e5e2956d8c01f2967ccdcf2a610a
revise tuple_formatter_make_title_string()

diff -r efd2924b3f90 -r b02853ac8466 src/audacious/tuple_formatter.c
--- a/src/audacious/tuple_formatter.c	Tue Oct 30 17:27:06 2007 +0900
+++ b/src/audacious/tuple_formatter.c	Tue Oct 30 18:17:55 2007 +0900
@@ -24,6 +24,7 @@
 #include "config.h"
 #include "tuple.h"
 #include "tuple_formatter.h"
+#include "strings.h"
 
 /*
  * TUPLE_USE_COMPILER:
@@ -586,10 +587,11 @@
 
     if(!rv || !strcmp(rv, "")) {
         const gchar *file_name = tuple_get_string(tuple, FIELD_FILE_NAME, NULL);
+        gchar *realfn = g_filename_from_uri(file_name, NULL, NULL);
+
         g_free(rv);
-        rv = g_filename_from_uri(file_name, NULL, NULL);
-        if(!rv)
-            rv = g_strdup(file_name);
+        rv = str_to_utf8(realfn ? realfn : file_name);
+        g_free(realfn);
     }
 
     return rv;