changeset 4636:f6204058f034

Automated merge with ssh://hg.atheme.org//hg/audacious
author Matti Hamalainen <ccr@tnsp.org>
date Fri, 13 Jun 2008 05:03:11 +0300
parents 1e3d9707ae50 (current diff) ca64cd387021 (diff)
children 8510e7d242f0
files
diffstat 1 files changed, 2 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/audacious/main.c	Thu Jun 12 14:04:51 2008 +0900
+++ b/src/audacious/main.c	Fri Jun 13 05:03:11 2008 +0300
@@ -563,22 +563,17 @@
 load_extra_playlist(const gchar * path, const gchar * basename,
         gpointer def)
 {
-    const gchar *title;
-    Playlist *playlist;
-    Playlist *deflist;
+    Playlist *playlist, *deflist = (Playlist *)def;
 
-    deflist = (Playlist *)def;
     playlist = playlist_new();
     if (!playlist) {
-        g_warning("Couldn't create new playlist\n");
+        g_warning("Couldn't create new playlist for %s / %s\n", path, basename);
         return FALSE;
     }
 
     playlist_add_playlist(playlist);
     playlist_load(playlist, path);
 
-    title = playlist_get_current_name(playlist);
-
     return FALSE; /* keep loading other playlists */
 }