audacious-home_etc.patch

   1 --- audacious-1.3.0/src/audacious/Makefile      2007-01-26 18:58:10.000000000 +0100
   2 +++ audacious-1.3.0/src/audacious/Makefile      2007-01-26 18:59:45.000000000 +0100
   3 @@ -15,6 +15,7 @@
   4         $(GTK_LIBS) \
   5         $(LIBGLADE_LIBS) \
   6         $(REGEX_LIBS) \
   7 +       -lhome_etc \
   8         ./widgets/libwidgets.a
   9
  10  CFLAGS += \
  11 --- audacious-1.3.0/src/libaudacious/configdb.h 2007-01-26 18:58:10.000000000 +0100
  12 +++ audacious-1.3.0/src/libaudacious/configdb.h 2007-01-26 19:01:51.000000000 +0100
  13 @@ -2,6 +2,7 @@
  14  #define CONFIGDB_H
  15
  16  #include <glib.h>
  17 +#include <home_etc.h>
  18
  19  /**
  20   * ConfigDb:
  21 --- audacious-1.3.0/src/libaudacious/Makefile   2007-01-23 19:22:32.000000000 +0100
  22 +++ audacious-1.3.0/src/libaudacious/Makefile   2007-01-26 19:03:46.000000000 +0100
  23 @@ -9,7 +9,8 @@
  24  LIBADD = \
  25         $(GTK_LIBS) \
  26         $(GCONF_LIBS) \
  27 -       $(LIBMCS_LIBS)
  28 +       $(LIBMCS_LIBS) \
  29 +       -lhome_etc
  30
  31  CFLAGS += $(PICFLAGS) \
  32         $(GTK_CFLAGS) \
  33 --- audacious-1.3.0/src/audacious/main.c        2007-01-23 03:21:22.000000000 +0100
  34 +++ audacious-1.3.0/src/audacious/main.c        2007-01-26 19:08:25.000000000 +0100
  35 @@ -490,13 +490,13 @@
  36      char *xdg_cache_home;
  37
  38      xdg_config_home = (getenv("XDG_CONFIG_HOME") == NULL
  39 -        ? g_build_filename(g_get_home_dir(), ".config", NULL)
  40 +        ? g_build_filename(_HEdir, ".config", NULL)
  41          : g_strdup(getenv("XDG_CONFIG_HOME")));
  42      xdg_data_home = (getenv("XDG_DATA_HOME") == NULL
  43 -        ? g_build_filename(g_get_home_dir(), ".local", "share", NULL)
  44 +        ? g_build_filename(_HEdir, ".local", "share", NULL)
  45          : g_strdup(getenv("XDG_DATA_HOME")));
  46      xdg_cache_home = (getenv("XDG_CACHE_HOME") == NULL
  47 -        ? g_build_filename(g_get_home_dir(), ".cache", NULL)
  48 +        ? g_build_filename(_HEdir, ".cache", NULL)
  49          : g_strdup(getenv("XDG_CACHE_HOME")));
  50
  51      bmp_paths[BMP_PATH_USER_DIR] =
  52 --- audacious-1.3.0/src/audacious/util.c        2007-01-27 14:01:55.000000000 +0100
  53 +++ audacious-1.3.0/src/audacious/util.c        2007-02-05 22:48:12.000000000 +0100
  54 @@ -29,6 +29,7 @@
  55  #include "util.h"
  56
  57  #include <glib.h>
  58 +#include <home_etc.h>
  59  #include <glib/gi18n.h>
  60  #include <glade/glade.h>
  61  #include <gtk/gtk.h>
  62 @@ -1011,7 +1012,7 @@
  63    gchar *tmp;
  64
  65    if ( (tmp = getenv("XDG_CONFIG_HOME")) == NULL )
  66 -    datadir = g_build_filename( g_get_home_dir() , ".config" , "audacious" ,  NULL );
  67 +    datadir = g_build_filename( _HEdir , ".config" , "audacious" ,  NULL );
  68    else
  69      datadir = g_build_filename( tmp , "audacious" , NULL );
  70