# HG changeset patch
# User Tony Vroon <chainsaw@gentoo.org>
# Date 1184875171 -3600
# Node ID df5d07d7ca7c6b66c61c6db0927109fe691ebf24
# Parent  c198ae31bb74567140691e339fc74b637ec5451f
AdPlug database loading fix by Christian "Joker" Birchinger.

diff -r c198ae31bb74 -r df5d07d7ca7c src/adplug/adplug-xmms.cc
--- a/src/adplug/adplug-xmms.cc	Thu Jul 19 12:56:04 2007 -0500
+++ b/src/adplug/adplug-xmms.cc	Thu Jul 19 20:59:31 2007 +0100
@@ -1064,15 +1064,10 @@
 
     if (homedir)
     {
-      char *userdb =
-        (char *) malloc (strlen (homedir) + strlen (ADPLUG_CONFDIR) +
-                         strlen (ADPLUGDB_FILE) + 3);
-      strcpy (userdb, homedir);
-      strcat (userdb, "/" ADPLUG_CONFDIR "/");
-      strcat (userdb, ADPLUGDB_FILE);
+      std::string userdb;
+      userdb = "file://" + std::string(g_get_home_dir()) + "/" ADPLUG_CONFDIR "/" + ADPLUGDB_FILE;
       plr.db->load (userdb);    // load user's database
-      dbg_printf (" (userdb=\"%s\")", userdb);
-      free (userdb);
+      dbg_printf (" (userdb=\"%s\")", userdb.c_str());
     }
   }
   CAdPlug::set_database (plr.db);