diff src/evdev-plug/ed_internals.c @ 435:c18fd1befd1f trunk

[svn] - added audacious_get_localdir() in util.c/h, returns a string with the full path of audacious local datadir

--- 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();