# HG changeset patch
# User giacomo
# Date 1168893525 28800
# Node ID c18fd1befd1f4cad4e39822474bcaad4524115a6
# Parent  7385182ae4b8b9db2d18ffbc1a99b8dbe62b24d5
[svn] - added audacious_get_localdir() in util.c/h, returns a string with the full path of audacious local datadir

diff -r 7385182ae4b8 -r c18fd1befd1f ChangeLog
--- a/ChangeLog	Mon Jan 15 12:02:09 2007 -0800
+++ b/ChangeLog	Mon Jan 15 12:38:45 2007 -0800
@@ -1,3 +1,13 @@
+2007-01-15 20:02:09 +0000  Giacomo Lozito <james@develia.org>
+  revision [952]
+  - add missing config.h inclusion for wavpack, null and metronom plugin
+  trunk/src/metronom/metronom.c    |    5 +++--
+  trunk/src/null/null.c            |    1 +
+  trunk/src/wavpack/libwavpack.cxx |    1 +
+  trunk/src/wavpack/ui.cxx         |    1 +
+  4 files changed, 6 insertions(+), 2 deletions(-)
+
+
 2007-01-15 19:54:32 +0000  Giacomo Lozito <james@develia.org>
   revision [950]
   - added status icon plugin (written from scratch, with code from gtk 2.10)
diff -r 7385182ae4b8 -r c18fd1befd1f src/evdev-plug/ed_common.h
--- a/src/evdev-plug/ed_common.h	Mon Jan 15 12:02:09 2007 -0800
+++ b/src/evdev-plug/ed_common.h	Mon Jan 15 12:38:45 2007 -0800
@@ -33,7 +33,6 @@
 #define ED_VERSION_PLUGIN "0.1beta"
 #define ED_VERSION_CONFIG "0"
 
-#define PLAYER_LOCALRC_DIR ".audacious"
 #define PLAYER_LOCALRC_FILE "evdev-plug.conf"
 
 #endif /* !_I_ED_COMMON_H */
diff -r 7385182ae4b8 -r c18fd1befd1f src/evdev-plug/ed_internals.c
--- a/src/evdev-plug/ed_internals.c	Mon Jan 15 12:02:09 2007 -0800
+++ b/src/evdev-plug/ed_internals.c	Mon Jan 15 12:38:45 2007 -0800
@@ -24,6 +24,7 @@
 #include "ed_bindings_store.h"
 #include "ed_common.h"
 
+#include <audacious/util.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <linux/input.h>
@@ -470,10 +471,12 @@
   gchar **device_names = NULL;
   gsize device_names_num = 0;
   gchar *config_pathfilename = NULL;
+  gchar *config_datadir = NULL;
   gint i = 0;
 
-  config_pathfilename = g_strjoin( "" , g_get_home_dir() ,
-    "/" PLAYER_LOCALRC_DIR "/" PLAYER_LOCALRC_FILE , NULL );
+  config_datadir = (gchar*)audacious_get_localdir();
+  config_pathfilename = g_build_filename( config_datadir , PLAYER_LOCALRC_FILE , NULL );
+  g_free( config_datadir );
   keyfile = g_key_file_new();
   is_loaded = g_key_file_load_from_file( keyfile , config_pathfilename , G_KEY_FILE_NONE , NULL );
   g_free( config_pathfilename );
@@ -561,11 +564,13 @@
   gchar **device_names = NULL;
   gsize device_names_num = 0;
   gchar *config_pathfilename = NULL;
+  gchar *config_datadir = NULL;
   GList *system_devices_list = NULL;
   gint i = 0;
 
-  config_pathfilename = g_strjoin( "" , g_get_home_dir() ,
-    "/" PLAYER_LOCALRC_DIR "/" PLAYER_LOCALRC_FILE , NULL );
+  config_datadir = (gchar*)audacious_get_localdir();
+  config_pathfilename = g_build_filename( config_datadir , PLAYER_LOCALRC_FILE , NULL );
+  g_free( config_datadir );
   keyfile = g_key_file_new();
   is_loaded = g_key_file_load_from_file( keyfile , config_pathfilename , G_KEY_FILE_NONE , NULL );
   g_free( config_pathfilename );
@@ -793,9 +798,11 @@
   gsize keyfile_str_len = 0;
   GIOChannel *iochan;
   gchar *config_pathfilename = NULL;
+  gchar *config_datadir = NULL;
 
-  config_pathfilename = g_strjoin( "" , g_get_home_dir() ,
-    "/" PLAYER_LOCALRC_DIR "/" PLAYER_LOCALRC_FILE , NULL );
+  config_datadir = (gchar*)audacious_get_localdir();
+  config_pathfilename = g_build_filename( config_datadir , PLAYER_LOCALRC_FILE , NULL );
+  g_free( config_datadir );
 
   keyfile = g_key_file_new();