6 files changed, 12 insertions, 11 deletions
diff --git a/src/input/input_cdda.c b/src/input/input_cdda.c
index 0b7f854e2..31bc51bc2 100644
--- a/src/input/input_cdda.c
+++ b/src/input/input_cdda.c
@@ -1483,7 +1483,7 @@ static void _cdda_parse_cddb_info (cdda_input_plugin_t *this, char *buffer, char
 static int _cdda_load_cached_cddb_infos(cdda_input_plugin_t *this) {
   DIR  *dir;
 
-  const char *const xdg_cache_home = xdgCacheHome(this->stream->xine->basedir_handle);
+  const char *const xdg_cache_home = xdgCacheHome(&this->stream->xine->basedir_handle);
 
   if(this == NULL)
     return 0;
@@ -1545,7 +1545,7 @@ static void _cdda_save_cached_cddb_infos(cdda_input_plugin_t *this, char *fileco
   FILE  *fd;
   char *cfile;
 
-  const char *const xdg_cache_home = xdgCacheHome(this->stream->xine->basedir_handle);
+  const char *const xdg_cache_home = xdgCacheHome(&this->stream->xine->basedir_handle);
 
   if((this == NULL) || (filecontent == NULL))
     return;
diff --git a/src/input/input_dvb.c b/src/input/input_dvb.c
index 5b8afef92..a045276d5 100644
--- a/src/input/input_dvb.c
+++ b/src/input/input_dvb.c
@@ -887,7 +887,7 @@ static channel_t *load_channels(xine_t *xine, xine_stream_t *stream, int *num_ch
   int        num_alloc = 0;
   struct stat st;
 
-  snprintf(filename, BUFSIZE, "%s/"PACKAGE"/channels.conf", xdgConfigHome(xine->basedir_handle));
+  snprintf(filename, BUFSIZE, "%s/"PACKAGE"/channels.conf", xdgConfigHome(&xine->basedir_handle));
 
   f = fopen(filename, "r");
   if (!f) {
diff --git a/src/libw32dll/wine/registry.c b/src/libw32dll/wine/registry.c
index 20c21888d..b12974416 100644
--- a/src/libw32dll/wine/registry.c
+++ b/src/libw32dll/wine/registry.c
@@ -303,8 +303,9 @@ static struct reg_value* insert_reg_value(int handle, const char* name, int type
 
 static void init_registry(void)
 {
-	xdgHandle tmph = xdgAllocHandle();
-	const char *const xdg_cache_home = xdgCacheHome(tmph);
+	xdgHandle tmph;
+	xdgInitHandle(&tmph);
+	const char *const xdg_cache_home = xdgCacheHome(&tmph);
 
 	TRACE("Initializing registry\n");
 	// can't be free-ed - it's static and probably thread
@@ -318,7 +319,7 @@ static void init_registry(void)
 	insert_handle(HKEY_LOCAL_MACHINE, "HKLM");
 	insert_handle(HKEY_CURRENT_USER, "HKCU");
 
-	xdgFreeHandle(tmph);
+	xdgWipeHandle(&tmph);
 }
 
 #if 0
diff --git a/src/xine-engine/load_plugins.c b/src/xine-engine/load_plugins.c
index 3fdd65d93..3aa3eedbb 100644
--- a/src/xine-engine/load_plugins.c
+++ b/src/xine-engine/load_plugins.c
@@ -1149,7 +1149,7 @@ static void load_plugin_list(xine_t *this, FILE *fp, xine_sarray_t *plugins) {
  *      http://standards.freedesktop.org/basedir-spec/latest/index.html
  */
 static char *catalog_filename(xine_t *this, int createdir) {
-  const char *const xdg_cache_home = xdgCacheHome(this->basedir_handle);
+  const char *const xdg_cache_home = xdgCacheHome(&this->basedir_handle);
   char *cachefile = NULL;
 
   cachefile = xine_xmalloc( strlen(xdg_cache_home) + sizeof("/"PACKAGE"/plugins.cache") );
diff --git a/src/xine-engine/osd.c b/src/xine-engine/osd.c
index 73fe76a0a..a2d2806ec 100644
--- a/src/xine-engine/osd.c
+++ b/src/xine-engine/osd.c
@@ -1030,7 +1030,7 @@ static int osd_lookup_fontconfig( osd_object_t *osd, const char *const fontname,
  *      http://standards.freedesktop.org/basedir-spec/latest/index.html
  */
 static int osd_lookup_xdg( osd_object_t *osd, const char *const fontname ) {
-  const char *const *data_dirs = xdgSearchableDataDirectories(osd->renderer->stream->xine->basedir_handle);
+  const char *const *data_dirs = xdgSearchableDataDirectories(&osd->renderer->stream->xine->basedir_handle);
 
   /* try load font from current directory or from an absolute path */
   if ( FT_New_Face(osd->ft2->library, fontname, 0, &osd->ft2->face) == FT_Err_Ok )
@@ -1815,7 +1815,7 @@ osd_renderer_t *_x_osd_renderer_init( xine_stream_t *stream ) {
    * load available fonts
    */
   {
-    const char *const *data_dirs = xdgSearchableDataDirectories(stream->xine->basedir_handle);
+    const char *const *data_dirs = xdgSearchableDataDirectories(&stream->xine->basedir_handle);
     if ( data_dirs )
       while( (*data_dirs) && *(*data_dirs) ) {
 	/* sizeof("") takes care of the final NUL byte */
diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c
index 8162598aa..5689337da 100644
--- a/src/xine-engine/xine.c
+++ b/src/xine-engine/xine.c
@@ -1608,7 +1608,7 @@ void xine_exit (xine_t *this) {
   WSACleanup();
 #endif
 
-  xdgFreeHandle(this->basedir_handle);
+  xdgWipeHandle(&this->basedir_handle);
 
   free (this);
 }
@@ -1737,7 +1737,7 @@ void xine_init (xine_t *this) {
 						 "extension", NULL};
 
   /* First of all, initialise libxdg-basedir as it's used by plugins. */
-  this->basedir_handle = xdgAllocHandle();
+  xdgInitHandle(&this->basedir_handle);
 
   /*
    * locks