changeset 2580:48288757d7c7 trunk

[svn] - fix a regression introduced by the DnD fix.
author nenolod
date Mon, 26 Feb 2007 03:36:09 -0800
parents 364714f2d555
children 83afa9e1ac64
files ChangeLog src/audacious/build_stamp.c src/audacious/playlist.c src/audacious/vfs.c
diffstat 4 files changed, 16 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Feb 26 01:14:48 2007 -0800
+++ b/ChangeLog	Mon Feb 26 03:36:09 2007 -0800
@@ -1,3 +1,12 @@
+2007-02-26 09:14:48 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
+  revision [4168]
+  - urldecode playlist paths
+  
+  trunk/src/audacious/playlist.c |   47 ++++++++++++++++++++++++++++++++++++++-
+  trunk/src/audacious/vfs.c      |   49 +++++++++++++++++++++++++++++++++++++----
+  2 files changed, 91 insertions(+), 5 deletions(-)
+
+
 2007-02-26 06:41:59 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
   revision [4166]
   - change the order that hints are processed in.
--- a/src/audacious/build_stamp.c	Mon Feb 26 01:14:48 2007 -0800
+++ b/src/audacious/build_stamp.c	Mon Feb 26 03:36:09 2007 -0800
@@ -1,2 +1,2 @@
 #include <glib.h>
-const gchar *svn_stamp = "20070226-4166";
+const gchar *svn_stamp = "20070226-4168";
--- a/src/audacious/playlist.c	Mon Feb 26 01:14:48 2007 -0800
+++ b/src/audacious/playlist.c	Mon Feb 26 03:36:09 2007 -0800
@@ -932,6 +932,9 @@
     GHashTable *htab;
     gchar *path2 = _playlist_urldecode_basic_path(path);
 
+    if (path2 == NULL)
+        path2 = g_strdup(path);
+
     htab = g_hash_table_new(devino_hash, devino_compare);
 
     list = playlist_dir_find_files(path2, background, htab);
--- a/src/audacious/vfs.c	Mon Feb 26 01:14:48 2007 -0800
+++ b/src/audacious/vfs.c	Mon Feb 26 03:36:09 2007 -0800
@@ -383,6 +383,9 @@
 
     path2 = _vfs_urldecode_basic_path(path);
 
+    if (path2 == NULL)
+        path2 = g_strdup(path);
+
     ret = g_file_test(path2, test);
 
     g_free(path2);