# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1213322591 -10800
# Node ID f6204058f034b5e1000c47d3aa56a1de343eb17b
# Parent  1e3d9707ae500055753fb53b687a58a0f150a58f# Parent  ca64cd3870216a218998f9e72b7bab11146428d5
Automated merge with ssh://hg.atheme.org//hg/audacious

diff -r 1e3d9707ae50 -r f6204058f034 src/audacious/main.c
--- 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 */
 }