# HG changeset patch
# User js
# Date 1168709615 28800
# Node ID ac9f4d42d848cc8366d00935e0dd8c8f3583c10c
# Parent  49d285f6008b2e06d2b51e7aa2a6f39c99e7004b
[svn] Remove old shit.

diff -r 49d285f6008b -r ac9f4d42d848 ChangeLog
--- a/ChangeLog	Sat Jan 13 09:19:52 2007 -0800
+++ b/ChangeLog	Sat Jan 13 09:33:35 2007 -0800
@@ -1,3 +1,12 @@
+2007-01-13 17:19:52 +0000  Jonathan Schleifer <js@h3c.de>
+  revision [3644]
+  Full support for XDG basedir added. The old config doesn't get automatically converted yet.
+  trunk/src/audacious/main.c            |   66 +++++++++++++++++++++++-----------
+  trunk/src/audacious/main.h            |   12 ------
+  trunk/src/audacious/ui_skinselector.c |    4 +-
+  3 files changed, 48 insertions(+), 34 deletions(-)
+
+
 2007-01-12 20:33:07 +0000  Jonathan Schleifer <js@h3c.de>
   revision [3642]
   Same for -pipe.
diff -r 49d285f6008b -r ac9f4d42d848 configure.ac
--- a/configure.ac	Sat Jan 13 09:19:52 2007 -0800
+++ b/configure.ac	Sat Jan 13 09:33:35 2007 -0800
@@ -60,14 +60,13 @@
 AC_PATH_PROG(BEEP_PATH, audacious, no)
 
 AC_ARG_WITH(rc-path,
-    [  --with-rc-path=path                 Resource and configuration path for audacious relative to $HOME.],
+    [  --with-rc-path=path                 Resource and configuration path for audacious relative to $HOME. (deprecated, use XDG)],
     [rc_path=$withval],
     [rc_path=.audacious]
 )
 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 49d285f6008b -r ac9f4d42d848 src/libaudacious/configdb_rcfile.c
--- a/src/libaudacious/configdb_rcfile.c	Sat Jan 13 09:19:52 2007 -0800
+++ b/src/libaudacious/configdb_rcfile.c	Sat Jan 13 09:33:35 2007 -0800
@@ -51,22 +51,8 @@
 
     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)) {
-            g_free(db->filename);
-            db->filename = tmp;
-        }
-    }
-#endif
-
-    if (!db->file) {
-#ifdef DOTAUDACIOUS_COMPAT
-        g_free(tmp);
-#endif
+    if (!db->file)
         db->file = bmp_rcfile_new();
-    }
 
     db->dirty = FALSE;