Mercurial > audlegacy
changeset 2312:e1a5a66fb9cc trunk
[svn] Added #ifdefs around $HOME/.audacious compatibility code
| author | js |
|---|---|
| date | Thu, 11 Jan 2007 05:47:16 -0800 |
| parents | 8216ff3deb90 |
| children | 3149d4b1a9a9 |
| files | ChangeLog configure.ac libaudacious/configdb_rcfile.c |
| diffstat | 3 files changed, 13 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Jan 10 05:19:46 2007 -0800 +++ b/ChangeLog Thu Jan 11 05:47:16 2007 -0800 @@ -1,3 +1,11 @@ +2007-01-10 13:19:46 +0000 William Pitcock <nenolod@sacredspiral.co.uk> + revision [3632] + - note that WAL (winamp "modern") skins are not supported + + trunk/README | 4 ++++ + 1 file changed, 4 insertions(+) + + 2007-01-10 13:14:52 +0000 William Pitcock <nenolod@sacredspiral.co.uk> revision [3630] - some more updates, e.g. IRC channel/mailing list/forums
--- a/configure.ac Wed Jan 10 05:19:46 2007 -0800 +++ b/configure.ac Thu Jan 11 05:47:16 2007 -0800 @@ -65,6 +65,7 @@ AC_DEFINE_UNQUOTED(BMP_RCPATH, "$rc_path", [Resource and configuration path for audacious relative to $HOME.] ) +AC_DEFINE(DOTAUDACIOUS_COMPAT, 1, [Enable compatibility for $HOME/.audacious]) AC_SUBST(BMP_RCPATH) AC_ARG_ENABLE(one-plugin-dir,
--- a/libaudacious/configdb_rcfile.c Wed Jan 10 05:19:46 2007 -0800 +++ b/libaudacious/configdb_rcfile.c Thu Jan 11 05:47:16 2007 -0800 @@ -50,6 +50,7 @@ db->file = bmp_rcfile_open(db->filename); +#ifdef DOTAUDACIOUS_COMPAT if (!db->file) { tmp = g_build_filename(g_get_home_dir(), BMP_RCPATH, "config", NULL); if (db->file = bmp_rcfile_open(tmp)) { @@ -57,9 +58,12 @@ db->filename = tmp; } } +#endif if (!db->file) { +#ifdef DOTAUDACIOUS_COMPAT g_free(tmp); +#endif db->file = bmp_rcfile_new(); }