audacious-home_etc.patch

   1 diff -urN audacious-1.2.2/audacious/main.c audacious-1.2.2.new/audacious/main.c
   2 --- audacious-1.2.2/audacious/main.c    2006-11-12 10:55:56.000000000 +0100
   3 +++ audacious-1.2.2.new/audacious/main.c        2006-11-19 12:57:09.000000000 +0100
   4 @@ -476,7 +476,7 @@
   5  static void
   6  bmp_init_paths(void)
   7  {
   8 -    bmp_paths[BMP_PATH_USER_DIR] = g_build_filename(g_get_home_dir(), BMP_RCPATH, NULL);
   9 +    bmp_paths[BMP_PATH_USER_DIR] = g_build_filename(_HEdir, BMP_RCPATH, NULL);
  10
  11      bmp_paths[BMP_PATH_USER_PLUGIN_DIR] = USER_PATH(BMP_USER_PLUGIN_DIR_BASENAME);
  12      bmp_paths[BMP_PATH_USER_SKIN_DIR] = USER_PATH(BMP_SKIN_DIR_BASENAME);
  13 diff -urN audacious-1.2.2/audacious/Makefile audacious-1.2.2.new/audacious/Makefile
  14 --- audacious-1.2.2/audacious/Makefile  2006-10-30 23:03:15.000000000 +0100
  15 +++ audacious-1.2.2.new/audacious/Makefile      2006-11-19 12:58:09.000000000 +0100
  16 @@ -16,6 +16,7 @@
  17         $(CHARDET_LIBS) \
  18         $(GTK_LIBS)      \
  19         $(LIBGLADE_LIBS) \
  20 +       -lhome_etc \
  21         ./widgets/libwidgets.a
  22
  23  CFLAGS += \
  24 diff -urN audacious-1.2.2/libaudacious/configdb.h audacious-1.2.2.new/libaudacious/configdb.h
  25 --- audacious-1.2.2/libaudacious/configdb.h     2005-10-24 12:06:47.000000000 +0200
  26 +++ audacious-1.2.2.new/libaudacious/configdb.h 2006-11-19 12:54:41.000000000 +0100
  27 @@ -2,7 +2,7 @@
  28  #define CONFIGDB_H
  29
  30  #include <glib.h>
  31 -
  32 +#include <home_etc.h>
  33
  34  typedef struct _ConfigDb ConfigDb;
  35
  36 diff -urN audacious-1.2.2/libaudacious/configdb_rcfile.c audacious-1.2.2.new/libaudacious/configdb_rcfile.c
  37 --- audacious-1.2.2/libaudacious/configdb_rcfile.c      2006-08-03 01:00:13.000000000 +0200
  38 +++ audacious-1.2.2.new/libaudacious/configdb_rcfile.c  2006-11-19 12:54:18.000000000 +0100
  39 @@ -40,7 +40,7 @@
  40      ConfigDb *db;
  41
  42      db = g_new(ConfigDb, 1);
  43 -    db->filename = g_build_filename(g_get_home_dir(), BMP_RCPATH,
  44 +    db->filename = g_build_filename(_HEdir, BMP_RCPATH,
  45                                      "config", NULL);
  46      db->file = bmp_rcfile_open(db->filename);
  47      if (!db->file)
  48 diff -urN audacious-1.2.2/libaudacious/configdb_xmlfile.c audacious-1.2.2.new/libaudacious/configdb_xmlfile.c
  49 --- audacious-1.2.2/libaudacious/configdb_xmlfile.c     2006-08-03 01:00:13.000000000 +0200
  50 +++ audacious-1.2.2.new/libaudacious/configdb_xmlfile.c 2006-11-19 12:54:58.000000000 +0100
  51 @@ -38,7 +38,7 @@
  52      GError *err = NULL;
  53
  54      db = g_new(ConfigDb, 1);
  55 -    db->filename = g_build_filename(g_get_home_dir(), BMP_RCPATH,
  56 +    db->filename = g_build_filename(_HEdir, BMP_RCPATH,
  57                                      "preferences.xml", NULL);
  58      bmp_xml_document_load(&db->file, db->filename, &err);
  59      if (!db->file)
  60 diff -urN audacious-1.2.2/libaudacious/Makefile audacious-1.2.2.new/libaudacious/Makefile
  61 --- audacious-1.2.2/libaudacious/Makefile       2006-11-06 09:15:43.000000000 +0100
  62 +++ audacious-1.2.2.new/libaudacious/Makefile   2006-11-19 12:55:57.000000000 +0100
  63 @@ -10,7 +10,8 @@
  64
  65  LIBADD = \
  66         $(GTK_LIBS)      \
  67 -       $(GCONF_LIBS)
  68 +       $(GCONF_LIBS) \
  69 +       -lhome_etc
  70
  71  CFLAGS += $(PICFLAGS) \
  72         $(GTK_CFLAGS)        \