# HG changeset patch
# User William Pitcock <nenolod@atheme-project.org>
# Date 1184611417 18000
# Node ID e91fddd8526d596b2286f3f2fa83a342e671c918
# Parent  030b956c73b2ffd0e16e5c634a0a5a704b043935# Parent  5973397c09f20b5a80ff4887cfefb8739975755b
Automated merge with ssh://hg.atheme.org//hg/audacious

diff -r 030b956c73b2 -r e91fddd8526d src/audacious/widgets/playlist_list.c
--- 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);