changeset 2575:9713b5a67cba trunk

[svn] - make directory drag-and-drop work again.
author nenolod
date Sun, 25 Feb 2007 17:55:30 -0800
parents 40407b7363f3
children 98d02ad44f3b
files ChangeLog src/audacious/build_stamp.c src/audacious/playlist.c src/audacious/vfs.c
diffstat 4 files changed, 23 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sun Feb 25 00:53:19 2007 -0800
+++ b/ChangeLog	Sun Feb 25 17:55:30 2007 -0800
@@ -1,3 +1,11 @@
+2007-02-25 08:53:19 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
+  revision [4158]
+  - enforce playback stop when clearing the playlist to load new files in. closes #808.
+  
+  trunk/src/audacious/main.c |    3 +++
+  1 file changed, 3 insertions(+)
+
+
 2007-02-25 08:43:25 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
   revision [4156]
   - update documentation
--- a/src/audacious/build_stamp.c	Sun Feb 25 00:53:19 2007 -0800
+++ b/src/audacious/build_stamp.c	Sun Feb 25 17:55:30 2007 -0800
@@ -1,2 +1,2 @@
 #include <glib.h>
-const gchar *svn_stamp = "20070225-4156";
+const gchar *svn_stamp = "20070225-4158";
--- a/src/audacious/playlist.c	Sun Feb 25 00:53:19 2007 -0800
+++ b/src/audacious/playlist.c	Sun Feb 25 17:55:30 2007 -0800
@@ -939,7 +939,7 @@
 
         decoded = g_strdup(string);
 
-        if (g_file_test(decoded, G_FILE_TEST_IS_DIR)) {
+        if (vfs_file_test(decoded, G_FILE_TEST_IS_DIR)) {
             i = playlist_ins_dir(playlist, decoded, pos, FALSE);
         }
         else {
--- a/src/audacious/vfs.c	Sun Feb 25 00:53:19 2007 -0800
+++ b/src/audacious/vfs.c	Sun Feb 25 17:55:30 2007 -0800
@@ -334,7 +334,19 @@
 gboolean
 vfs_file_test(const gchar * path, GFileTest test)
 {
-    return g_file_test(path, test);
+    gchar *path2;
+    gboolean ret;
+
+    if (strlen(path) > 5)
+        path2 = xmms_urldecode_plain(path + 5); /* skip file: */
+    else
+        path2 = g_strdup(path);
+
+    ret = g_file_test(path2, test);
+
+    g_free(path2);
+
+    return ret;
 }
 
 /**