changeset 3086:5973397c09f2

branch merge
author Yoshiki Yazawa <yaz@cc.rim.or.jp>
date Tue, 17 Jul 2007 03:38:32 +0900
parents e75fc3c056e6 (diff) 20830a69b5f5 (current diff)
children e91fddd8526d
files
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/audacious/widgets/playlist_list.c	Mon Jul 16 13:32:18 2007 -0500
+++ b/src/audacious/widgets/playlist_list.c	Tue Jul 17 03:38:32 2007 +0900
@@ -491,9 +491,10 @@
            strings should be kept properly. */
 
         if (!entry->title) {
-            gchar *basename = g_path_get_basename(entry->filename);
+            gchar *realfn = g_filename_from_uri(entry->filename, NULL, NULL);
+            gchar *basename = g_path_get_basename(realfn ? realfn : entry->filename);
             title = filename_to_utf8(basename);
-            g_free(basename);
+            g_free(basename); g_free(realfn);
         }
         else
             title = str_to_utf8(entry->title);