# HG changeset patch
# User yaz
# Date 1166882654 28800
# Node ID ab4c7ad1857c0fdfe7ab08c3c590d518ffbec629
# Parent  cc6a05baa1561c1fc2898c0034b5a37835d4e14b
[svn] - file_path should be dirname.

diff -r cc6a05baa156 -r ab4c7ad1857c ChangeLog
--- a/ChangeLog	Sat Dec 23 03:47:44 2006 -0800
+++ b/ChangeLog	Sat Dec 23 06:04:14 2006 -0800
@@ -1,3 +1,17 @@
+2006-12-23 11:47:44 +0000  Giacomo Lozito <james@develia.org>
+  revision [3415]
+  - added audacious stock icons; source files wanting to use them must include icons-stock.h; removed obsolete pixmaps.h
+  trunk/audacious/Makefile           |    4 
+  trunk/audacious/icons-csource.h    |  949 +++++++++++++++++++++++++++++++++++++
+  trunk/audacious/icons-stock.h      |   38 +
+  trunk/audacious/main.c             |   60 ++
+  trunk/audacious/mainwin.c          |    6 
+  trunk/audacious/pixmaps.h          |  949 -------------------------------------
+  trunk/audacious/playlist_manager.h |    7 
+  trunk/audacious/ui_playlist.c      |   60 +-
+  8 files changed, 1084 insertions(+), 989 deletions(-)
+
+
 2006-12-23 08:20:59 +0000  George Averill <nhjm449@gmail.com>
   revision [3413]
   - Correctly set the size of playlistwin_list on startup/etc.
diff -r cc6a05baa156 -r ab4c7ad1857c audacious/input.c
--- a/audacious/input.c	Sat Dec 23 03:47:44 2006 -0800
+++ b/audacious/input.c	Sat Dec 23 06:04:14 2006 -0800
@@ -538,7 +538,7 @@
 
         input->file_name = g_path_get_basename(tmp);
         input->file_ext = ext ? ext + 1 : NULL;
-        input->file_path = tmp;
+        input->file_path = g_path_get_dirname(tmp);
 
         if ((tmp = xmms_get_titlestring(xmms_get_gentitle_format(), input))) {
             (*title) = str_to_utf8(tmp);
@@ -587,7 +587,7 @@
 	input_get_song_info(filename, &input->track_name, &input->length);
         input->file_name = g_path_get_basename(tmp);
         input->file_ext = ext ? ext + 1 : NULL;
-        input->file_path = tmp;
+        input->file_path = g_path_get_dirname(tmp);
     }
 
     return input;