-diff -urN audacious-1.2.2/audacious/main.c audacious-1.2.2.new/audacious/main.c
---- audacious-1.2.2/audacious/main.c 2006-11-12 10:55:56.000000000 +0100
-+++ audacious-1.2.2.new/audacious/main.c 2006-11-19 12:57:09.000000000 +0100
-@@ -476,7 +476,7 @@
- static void
- bmp_init_paths(void)
- {
-- bmp_paths[BMP_PATH_USER_DIR] = g_build_filename(g_get_home_dir(), BMP_RCPATH, NULL);
-+ bmp_paths[BMP_PATH_USER_DIR] = g_build_filename(_HEdir, BMP_RCPATH, NULL);
-
- bmp_paths[BMP_PATH_USER_PLUGIN_DIR] = USER_PATH(BMP_USER_PLUGIN_DIR_BASENAME);
- bmp_paths[BMP_PATH_USER_SKIN_DIR] = USER_PATH(BMP_SKIN_DIR_BASENAME);
-diff -urN audacious-1.2.2/audacious/Makefile audacious-1.2.2.new/audacious/Makefile
---- audacious-1.2.2/audacious/Makefile 2006-10-30 23:03:15.000000000 +0100
-+++ audacious-1.2.2.new/audacious/Makefile 2006-11-19 12:58:09.000000000 +0100
-@@ -16,6 +16,7 @@
- $(CHARDET_LIBS) \
- $(GTK_LIBS) \
- $(LIBGLADE_LIBS) \
-+ -lhome_etc \
- ./widgets/libwidgets.a
-
- CFLAGS += \
-diff -urN audacious-1.2.2/libaudacious/configdb.h audacious-1.2.2.new/libaudacious/configdb.h
---- audacious-1.2.2/libaudacious/configdb.h 2005-10-24 12:06:47.000000000 +0200
-+++ audacious-1.2.2.new/libaudacious/configdb.h 2006-11-19 12:54:41.000000000 +0100
-@@ -2,7 +2,7 @@
- #define CONFIGDB_H
+diff -burNp audacious-2.1/src/audacious/configdb.h audacious-2.1-dud/src/audacious/configdb.h
+--- audacious-2.1/src/audacious/configdb.h 2009-07-07 00:39:12.000000000 +0200
++++ audacious-2.1-dud/src/audacious/configdb.h 2009-08-23 12:50:48.874454861 +0200
+@@ -3,6 +3,7 @@
#include <glib.h>
--
+ #include <libmcs/mcs.h>
+#include <home_etc.h>
- typedef struct _ConfigDb ConfigDb;
-
-diff -urN audacious-1.2.2/libaudacious/configdb_rcfile.c audacious-1.2.2.new/libaudacious/configdb_rcfile.c
---- audacious-1.2.2/libaudacious/configdb_rcfile.c 2006-08-03 01:00:13.000000000 +0200
-+++ audacious-1.2.2.new/libaudacious/configdb_rcfile.c 2006-11-19 12:54:18.000000000 +0100
-@@ -40,7 +40,7 @@
- ConfigDb *db;
-
- db = g_new(ConfigDb, 1);
-- db->filename = g_build_filename(g_get_home_dir(), BMP_RCPATH,
-+ db->filename = g_build_filename(_HEdir, BMP_RCPATH,
- "config", NULL);
- db->file = bmp_rcfile_open(db->filename);
- if (!db->file)
-diff -urN audacious-1.2.2/libaudacious/configdb_xmlfile.c audacious-1.2.2.new/libaudacious/configdb_xmlfile.c
---- audacious-1.2.2/libaudacious/configdb_xmlfile.c 2006-08-03 01:00:13.000000000 +0200
-+++ audacious-1.2.2.new/libaudacious/configdb_xmlfile.c 2006-11-19 12:54:58.000000000 +0100
-@@ -38,7 +38,7 @@
- GError *err = NULL;
+ G_BEGIN_DECLS
+
+diff -burNp audacious-2.1/src/audacious/main.c audacious-2.1-dud/src/audacious/main.c
+--- audacious-2.1/src/audacious/main.c 2009-07-07 00:39:12.000000000 +0200
++++ audacious-2.1-dud/src/audacious/main.c 2009-08-23 12:52:28.224445099 +0200
+@@ -137,13 +137,13 @@ aud_init_paths()
+ char *xdg_cache_home;
+
+ xdg_config_home = (getenv("XDG_CONFIG_HOME") == NULL
+- ? g_build_filename(g_get_home_dir(), ".config", NULL)
++ ? g_build_filename(_HEdir, ".config", NULL)
+ : g_strdup(getenv("XDG_CONFIG_HOME")));
+ xdg_data_home = (getenv("XDG_DATA_HOME") == NULL
+- ? g_build_filename(g_get_home_dir(), ".local", "share", NULL)
++ ? g_build_filename(_HEdir, ".local", "share", NULL)
+ : g_strdup(getenv("XDG_DATA_HOME")));
+ xdg_cache_home = (getenv("XDG_CACHE_HOME") == NULL
+- ? g_build_filename(g_get_home_dir(), ".cache", NULL)
++ ? g_build_filename(_HEdir, ".cache", NULL)
+ : g_strdup(getenv("XDG_CACHE_HOME")));
+
+ aud_paths[BMP_PATH_USER_DIR] =
+diff -burNp audacious-2.1/src/audacious/Makefile audacious-2.1-dud/src/audacious/Makefile
+--- audacious-2.1/src/audacious/Makefile 2009-07-07 00:39:12.000000000 +0200
++++ audacious-2.1-dud/src/audacious/Makefile 2009-08-23 12:50:22.564458775 +0200
+@@ -168,6 +168,7 @@ LIBS += ${LDADD} \
+ ${DBUS_LIBS} \
+ ${MOWGLI_LIBS} \
+ ${LIBMCS_LIBS} \
++ -lhome_etc \
+ ${REGEX_LIBS}
+
+ LDFLAGS += ${PROG_IMPLIB_LDFLAGS} ${AUDLDFLAGS}
+diff -burNp audacious-2.1/src/audacious/util.c audacious-2.1-dud/src/audacious/util.c
+--- audacious-2.1/src/audacious/util.c 2009-07-07 00:39:12.000000000 +0200
++++ audacious-2.1-dud/src/audacious/util.c 2009-08-23 12:53:44.297770774 +0200
+@@ -32,6 +32,7 @@
+ #include "util.h"
- db = g_new(ConfigDb, 1);
-- db->filename = g_build_filename(g_get_home_dir(), BMP_RCPATH,
-+ db->filename = g_build_filename(_HEdir, BMP_RCPATH,
- "preferences.xml", NULL);
- bmp_xml_document_load(&db->file, db->filename, &err);
- if (!db->file)
-diff -urN audacious-1.2.2/libaudacious/Makefile audacious-1.2.2.new/libaudacious/Makefile
---- audacious-1.2.2/libaudacious/Makefile 2006-11-06 09:15:43.000000000 +0100
-+++ audacious-1.2.2.new/libaudacious/Makefile 2006-11-19 12:55:57.000000000 +0100
-@@ -10,7 +10,8 @@
-
- LIBADD = \
- $(GTK_LIBS) \
-- $(GCONF_LIBS)
-+ $(GCONF_LIBS) \
-+ -lhome_etc
+ #include <glib.h>
++#include <home_etc.h>
+ #include <glib/gi18n.h>
+ #include <gtk/gtk.h>
+ #include <stdlib.h>
+@@ -932,7 +933,7 @@ util_get_localdir(void)
+ gchar *tmp;
+
+ if ( (tmp = getenv("XDG_CONFIG_HOME")) == NULL )
+- datadir = g_build_filename( g_get_home_dir() , ".config" , "audacious" , NULL );
++ datadir = g_build_filename( _HEdir , ".config" , "audacious" , NULL );
+ else
+ datadir = g_build_filename( tmp , "audacious" , NULL );
- CFLAGS += $(PICFLAGS) \
- $(GTK_CFLAGS) \
projects / packages / audacious.git / blobdiff