bmp-home_etc.patch

   1 diff -Nur bmp-0.9.7.orig/beep/Makefile.am bmp-0.9.7/beep/Makefile.am
   2 --- bmp-0.9.7.orig/beep/Makefile.am     2004-07-06 05:10:47.000000000 +0000
   3 +++ bmp-0.9.7/beep/Makefile.am  2004-07-16 10:16:42.000000000 +0000
   4 @@ -12,7 +12,8 @@
   5         $(top_builddir)/libbeep/libbeep.la \
   6         @LTLIBINTL@ \
   7         @GNOMEVFS_LIBS@ \
   8 -       @GCONF_LIBS@
   9 +       @GCONF_LIBS@ \
  10 +       -lhome_etc
  11
  12  beep_CFLAGS = \
  13         @X_CFLAGS@ \
  14 diff -Nur bmp-0.9.7.orig/beep/main.c bmp-0.9.7/beep/main.c
  15 --- bmp-0.9.7.orig/beep/main.c  2004-07-08 02:57:36.000000000 +0000
  16 +++ bmp-0.9.7/beep/main.c       2004-07-16 10:16:42.000000000 +0000
  17 @@ -72,6 +72,7 @@
  18  #include "pixmaps.h"
  19  #include "beep_mini.xpm"
  20
  21 +#include <home_etc.h>
  22
  23  /* Translatable string for beep.desktop's comment field */
  24  const gchar *desktop_comment = N_("Beep Media Player");
  25 @@ -375,7 +376,7 @@
  26  static void
  27  bmp_init_paths(void)
  28  {
  29 -    bmp_user_dir = g_build_filename(g_get_home_dir(), BMP_RCPATH, NULL);
  30 +    bmp_user_dir = g_build_filename(_HEdir, BMP_RCPATH, NULL);
  31
  32      bmp_user_plugin_dir =
  33          g_build_filename(bmp_user_dir, BMP_USER_PLUGIN_DIR_BASENAME, NULL);
  34 diff -Nur bmp-0.9.7.orig/libbeep/Makefile.am bmp-0.9.7/libbeep/Makefile.am
  35 --- bmp-0.9.7.orig/libbeep/Makefile.am  2004-06-24 16:36:50.000000000 +0000
  36 +++ bmp-0.9.7/libbeep/Makefile.am       2004-07-16 10:16:42.000000000 +0000
  37 @@ -6,7 +6,7 @@
  38  lib_LTLIBRARIES = libbeep.la
  39
  40  libbeep_la_LDFLAGS = -export-dynamic -version-info $(LIBBEEP_MAJOR_VERSION):$(LIBBEEP_MINOR_VERSION):$(LIBBEEP_MICRO_VERSION)
  41 -libbeep_la_LIBADD = @GTK_LIBS@
  42 +libbeep_la_LIBADD = @GTK_LIBS@ -lhome_etc
  43  INCLUDES = @GTK_CFLAGS@ @GCONF_CFLAGS@ @GNOMEVFS_CFLAGS@ -I$(top_srcdir)/../intl -I$(top_srcdir)/..
  44
  45  if HAVE_GCONF
  46 diff -Nur bmp-0.9.7.orig/libbeep/configdb_rcfile.c bmp-0.9.7/libbeep/configdb_rcfile.c
  47 --- bmp-0.9.7.orig/libbeep/configdb_rcfile.c    2004-07-08 02:57:38.000000000 +0000
  48 +++ bmp-0.9.7/libbeep/configdb_rcfile.c 2004-07-16 10:18:06.000000000 +0000
  49 @@ -22,6 +22,7 @@
  50  #include <string.h>
  51  #include "rcfile.h"
  52
  53 +#include <home_etc.h>
  54
  55  #define RCFILE_DEFAULT_SECTION_NAME "beep"
  56
  57 @@ -40,8 +41,8 @@
  58      ConfigDb *db;
  59
  60      db = g_new(ConfigDb, 1);
  61 -    db->filename = g_build_filename(g_get_home_dir(), BMP_RCPATH,
  62 -                                    "config", NULL);
  63 +    db->filename = g_build_filename( _HEdir, BMP_RCPATH,
  64 +                                    "config", NULL);
  65      db->file = bmp_rcfile_open(db->filename);
  66      if (!db->file)
  67          db->file = bmp_rcfile_new();