changeset 3088:e91fddd8526d

Automated merge with ssh://hg.atheme.org//hg/audacious
author William Pitcock <nenolod@atheme-project.org>
date Mon, 16 Jul 2007 13:43:37 -0500
parents 030b956c73b2 (current diff) 5973397c09f2 (diff)
children f40b8491a812
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:43:27 2007 -0500
+++ b/src/audacious/widgets/playlist_list.c	Mon Jul 16 13:43:37 2007 -0500
@@ -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);