3 files changed, 5 insertions, 5 deletions
diff --git a/src/xine-engine/load_plugins.c b/src/xine-engine/load_plugins.c
index bbb131c86..f5db64bc0 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