# HG changeset patch
# User js
# Date 1168523236 28800
# Node ID e1a5a66fb9cce0d681a5d4a1aa3c9225a1b852dc
# Parent  8216ff3deb90361ede779cc77a76686770a5c17c
[svn] Added #ifdefs around $HOME/.audacious compatibility code

diff -r 8216ff3deb90 -r e1a5a66fb9cc ChangeLog
--- 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
diff -r 8216ff3deb90 -r e1a5a66fb9cc configure.ac
--- 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,
diff -r 8216ff3deb90 -r e1a5a66fb9cc libaudacious/configdb_rcfile.c
--- 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();
     }