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