summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristophe Fergeau <teuf@gnome.org>2008-01-29 23:14:45 +0000
committerChristophe Fergeau <teuf@gnome.org>2008-01-29 23:14:45 +0000
commitbf5d0aa82d96704ea568f58beea99c71d5055825 (patch)
treedb2dc85d673c37ebe67b9ced7739836a7d64a721
parenta95b7fb74e7ef64b68a852e6307154133c5c9ee8 (diff)
downloadlibgpod-bf5d0aa82d96704ea568f58beea99c71d5055825.tar.gz
libgpod-bf5d0aa82d96704ea568f58beea99c71d5055825.tar.xz
libgpod-bf5d0aa82d96704ea568f58beea99c71d5055825.zip
Make sure we use '/' in filenames on ipod shuffles
git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1942 f01d2545-417e-4e96-918e-98f8d0dbbcb6
-rw-r--r--ChangeLog6
-rw-r--r--src/itdb_itunesdb.c4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index ae1365a..f19fc4a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2007-11-15 Christophe Fergeau <teuf@gnome.org>
+ * src/itdb_itunesdb.c: don't use itdb_filename_ipod2fs to generate
+ the filename to put on the shuffle since on windows that would use
+ \ as a path separator instead of the correct /
+
+2007-11-15 Christophe Fergeau <teuf@gnome.org>
+
* src/itdb_private.h:
* src/itdb_itunesdb.c: add itdb_file_set_contents to workaround a
rename issue on sshfs (existing files on the FS can't be
diff --git a/src/itdb_itunesdb.c b/src/itdb_itunesdb.c
index cb1b79e..72ddfc0 100644
--- a/src/itdb_itunesdb.c
+++ b/src/itdb_itunesdb.c
@@ -5365,9 +5365,9 @@ gboolean itdb_shuffle_write_file (Itdb_iTunesDB *itdb,
put24bint (cts, 0x200);
- /* shuffle uses forward slash separator, not colon */
path = g_strdup (tr->ipod_path);
- itdb_filename_ipod2fs (path);
+ /* shuffle uses forward slash separator, not colon */
+ g_strdelimit (path, ":", '/');
path_utf16 = g_utf8_to_utf16 (path, -1, NULL, &pathlen, NULL);
if (pathlen > 261) pathlen = 261;
fixup_little_utf16 (path_utf16);