audacious-home_etc.patch

   1 diff -burNp audacious-2.1/src/audacious/configdb.h audacious-2.1-dud/src/audacious/configdb.h
   2 --- audacious-2.1/src/audacious/configdb.h      2009-07-07 00:39:12.000000000 +0200
   3 +++ audacious-2.1-dud/src/audacious/configdb.h  2009-08-23 12:50:48.874454861 +0200
   4 @@ -3,6 +3,7 @@
   5
   6  #include <glib.h>
   7  #include <libmcs/mcs.h>
   8 +#include <home_etc.h>
   9
  10  G_BEGIN_DECLS
  11
  12 diff -burNp audacious-2.1/src/audacious/main.c audacious-2.1-dud/src/audacious/main.c
  13 --- audacious-2.1/src/audacious/main.c  2009-07-07 00:39:12.000000000 +0200
  14 +++ audacious-2.1-dud/src/audacious/main.c      2009-08-23 12:52:28.224445099 +0200
  15 @@ -127,9 +127,9 @@
  16      gchar *xdg_data_home;
  17      gchar *xdg_cache_home;
  18
  19 -    xdg_config_home = (getenv("XDG_CONFIG_HOME") == NULL ? g_build_filename(g_get_home_dir(), ".config", NULL) : g_strdup(getenv("XDG_CONFIG_HOME")));
  20 -    xdg_data_home = (getenv("XDG_DATA_HOME") == NULL ? g_build_filename(g_get_home_dir(), ".local", "share", NULL) : g_strdup(getenv("XDG_DATA_HOME")));
  21 -    xdg_cache_home = (getenv("XDG_CACHE_HOME") == NULL ? g_build_filename(g_get_home_dir(), ".cache", NULL) : g_strdup(getenv("XDG_CACHE_HOME")));
  22 +    xdg_config_home = (getenv("XDG_CONFIG_HOME") == NULL ? g_build_filename(_HEdir, ".config", NULL) : g_strdup(getenv("XDG_CONFIG_HOME")));
  23 +    xdg_data_home = (getenv("XDG_DATA_HOME") == NULL ? g_build_filename(_HEdir,  ".local", "share", NULL) : g_strdup(getenv("XDG_DATA_HOME")));
  24 +    xdg_cache_home = (getenv("XDG_CACHE_HOME") == NULL ? g_build_filename(_HEdir,  ".cache", NULL) : g_strdup(getenv("XDG_CACHE_HOME")));
  25
  26      aud_paths[BMP_PATH_USER_DIR] = g_build_filename(xdg_config_home, "audacious", NULL);
  27      aud_paths[BMP_PATH_USER_SKIN_DIR] = g_build_filename(xdg_data_home, "audacious", "Skins", NULL);
  28 diff -burNp audacious-2.1/src/audacious/Makefile audacious-2.1-dud/src/audacious/Makefile
  29 --- audacious-2.1/src/audacious/Makefile        2009-07-07 00:39:12.000000000 +0200
  30 +++ audacious-2.1-dud/src/audacious/Makefile    2009-08-23 12:50:22.564458775 +0200
  31 @@ -168,6 +168,7 @@ LIBS += ${LDADD}                                            \
  32                 ${DBUS_LIBS}                                    \
  33                 ${MOWGLI_LIBS}                                  \
  34                 ${LIBMCS_LIBS}                                  \
  35 +               -lhome_etc                                      \
  36                 ${REGEX_LIBS}
  37
  38  LDFLAGS += ${PROG_IMPLIB_LDFLAGS} ${AUDLDFLAGS}
  39 diff -burNp audacious-2.1/src/audacious/util.c audacious-2.1-dud/src/audacious/util.c
  40 --- audacious-2.1/src/audacious/util.c  2009-07-07 00:39:12.000000000 +0200
  41 +++ audacious-2.1-dud/src/audacious/util.c      2009-08-23 12:53:44.297770774 +0200
  42 @@ -32,6 +32,7 @@
  43  #include "util.h"
  44
  45  #include <glib.h>
  46 +#include <home_etc.h>
  47  #include <glib/gi18n.h>
  48  #include <gtk/gtk.h>
  49  #include <stdlib.h>
  50 @@ -932,7 +933,7 @@ util_get_localdir(void)
  51    gchar *tmp;
  52
  53    if ( (tmp = getenv("XDG_CONFIG_HOME")) == NULL )
  54 -    datadir = g_build_filename( g_get_home_dir() , ".config" , "audacious" ,  NULL );
  55 +    datadir = g_build_filename( _HEdir , ".config" , "audacious" ,  NULL );
  56    else
  57      datadir = g_build_filename( tmp , "audacious" , NULL );
  58