# HG changeset patch
# User nenolod
# Date 1155286131 25200
# Node ID a8a2ee855c1c6a7b83d54e6ebc61cf6a4be60fc8
# Parent  56e1da886c9f8e7a29f03597b78cc7a5c41da399
[svn] - unbork

diff -r 56e1da886c9f -r a8a2ee855c1c ChangeLog
--- a/ChangeLog	Fri Aug 11 01:32:02 2006 -0700
+++ b/ChangeLog	Fri Aug 11 01:48:51 2006 -0700
@@ -1,3 +1,12 @@
+2006-08-11 08:32:02 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [2060]
+  - remove unnecessary and crappy code
+  
+
+  Changes:        Modified:
+  +14 -96         trunk/Plugins/Container/xspf/xspf.c  
+
+
 2006-08-11 08:22:15 +0000  William Pitcock <nenolod@nenolod.net>
   revision [2058]
   - further cleanup
diff -r 56e1da886c9f -r a8a2ee855c1c Plugins/Container/xspf/xspf.c
--- a/Plugins/Container/xspf/xspf.c	Fri Aug 11 01:32:02 2006 -0700
+++ b/Plugins/Container/xspf/xspf.c	Fri Aug 11 01:48:51 2006 -0700
@@ -60,21 +60,33 @@
 
 	xpathCtx = xmlXPathNewContext(doc);
 	if (xpathCtx == NULL)
+	{
+		g_message("xpathCtx is NULL.");
 		return;
+	}
 
-	if (xmlXPathRegisterNs(xpathCtx, "xspf", "http://xspf.org/ns/0") != 0)
+	if (xmlXPathRegisterNs(xpathCtx, "xspf", "http://xspf.org/ns/0/") != 0)
+	{
+		g_message("Failed to register XSPF namespace.");
 		return;
+	}
 
 	/* TODO: what about xspf:artist, xspf:title, xspf:length? */
 	xpathObj = xmlXPathEvalExpression("//xspf:location", xpathCtx);
 	if (xpathObj == NULL)
+	{
+		g_message("XPath Expression failed to evaluate.");
 		return;
+	}
 
 	xmlXPathFreeContext(xpathCtx);
 
 	n = xpathObj->nodesetval;
 	if (n == NULL)
+	{
+		g_message("XPath Expression yielded no results.");
 		return;
+	}
 
 	for (i = 0; i < n->nodeNr && n->nodeTab[i]->children != NULL; i++)
 	{