Mercurial > audlegacy
changeset 2512:3a1fc6f7c187 trunk
[svn] - unbreak relative path support. closes #791.
| author | nenolod |
|---|---|
| date | Mon, 12 Feb 2007 14:26:29 -0800 |
| parents | 0197fb284f79 |
| children | 1e6d2d719876 |
| files | ChangeLog src/audacious/build_stamp.c src/audacious/main.c |
| diffstat | 3 files changed, 26 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Feb 12 12:51:11 2007 -0800 +++ b/ChangeLog Mon Feb 12 14:26:29 2007 -0800 @@ -1,3 +1,13 @@ +2007-02-12 20:51:11 +0000 William Pitcock <nenolod@sacredspiral.co.uk> + revision [4032] + - add Catalan translation file. Closes #786. + + trunk/po/LINGUAS | 1 + trunk/po/ca.po | 2153 +++++++++++++++++++++++++++++++++++++++ + trunk/src/audacious/ui_credits.c | 3 + 3 files changed, 2157 insertions(+) + + 2007-02-12 20:41:51 +0000 William Pitcock <nenolod@sacredspiral.co.uk> revision [4030] - only strip the subsong identifier if it is really a valid subsong identifier. closes #792.
--- a/src/audacious/build_stamp.c Mon Feb 12 12:51:11 2007 -0800 +++ b/src/audacious/build_stamp.c Mon Feb 12 14:26:29 2007 -0800 @@ -1,2 +1,2 @@ #include <glib.h> -const gchar *svn_stamp = "20070212-4030"; +const gchar *svn_stamp = "20070212-4032";
--- a/src/audacious/main.c Mon Feb 12 12:51:11 2007 -0800 +++ b/src/audacious/main.c Mon Feb 12 14:26:29 2007 -0800 @@ -871,15 +871,23 @@ for (i = 0; filenames[i] != NULL; i++) { + gchar *filename; + gchar *current_dir = g_get_current_dir(); + + if (filenames[i][0] == '/' || strstr(filenames[i], "://")) + filename = g_strdup(filenames[i]); + else + filename = g_build_filename(current_dir, filenames[i], NULL); + if (options->load_skins) { - xmms_remote_set_skin(session, filenames[i]); - skin_install_skin(filenames[i]); + xmms_remote_set_skin(session, filename); + skin_install_skin(filename); } else { if (options->enqueue_to_temp) - xmms_remote_playlist_enqueue_to_temp(session, filenames[i]); + xmms_remote_playlist_enqueue_to_temp(session, filename); if (options->enqueue && options->play) pos = xmms_remote_get_playlist_length(session); @@ -887,7 +895,7 @@ if (!options->enqueue) xmms_remote_playlist_clear(session); - xmms_remote_playlist_add_url_string(session, filenames[i]); + xmms_remote_playlist_add_url_string(session, filename); if (options->enqueue && options->play && xmms_remote_get_playlist_length(session) > pos) @@ -896,6 +904,9 @@ if (!options->enqueue) xmms_remote_play(session); } + + g_free(filename); + g_free(current_dir); } g_strfreev(filenames);