From: Andrea Zagli <azagli@libero.it>
Date: Sat, 5 Jan 2013 14:08:24 +0000 (+0100)
Subject: Solved problem of workspace not found.
X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=ec7f54a5e22a0156ed44af9a23c706c5da913eb1;p=libgapp

Solved problem of workspace not found.

Before use xpath must register every namespace.
---

diff --git a/src/service.c b/src/service.c
index a88df02..f599bfa 100644
--- a/src/service.c
+++ b/src/service.c
@@ -240,9 +240,12 @@ gapp_service_get_property (GObject *object, guint property_id, GValue *value, GP
 static void
 parse_xml (GappService *service)
 {
+	xmlNs *ns;
 	xmlXPathObject *xpresult;
 	xmlXPathContext *xpcontext;
 
+	gchar *prefix;
+
 	guint node;
 	guint nodes;
 
@@ -254,7 +257,31 @@ parse_xml (GappService *service)
 
 	/* searching workspaces */
 	xpcontext->node = priv->xroot;
-	xpresult = xmlXPathEvalExpression ((const xmlChar *)"child::workspace", xpcontext);
+
+	/* registering namespaces */
+	ns = priv->xroot->nsDef;
+	while (ns)
+		{
+			if (ns->prefix == NULL)
+				{
+					prefix = g_strdup ("xmlns");
+				}
+			else
+				{
+					prefix = g_strdup (ns->prefix);
+				}
+
+			if (xmlXPathRegisterNs (xpcontext, prefix, ns->href) != 0)
+				{
+					g_warning ("Error on registering namespaces.");
+				}
+
+			g_free (prefix);
+
+			ns = ns->next;
+		}
+
+	xpresult = xmlXPathEvalExpression ((const xmlChar *)"child::xmlns:workspace", xpcontext);
 	if (!xmlXPathNodeSetIsEmpty (xpresult->nodesetval))
 		{
 			nodes = xpresult->nodesetval->nodeNr;
diff --git a/src/workspace.c b/src/workspace.c
index d3065dd..dc4c031 100644
--- a/src/workspace.c
+++ b/src/workspace.c
@@ -180,11 +180,21 @@ const gchar
 *gapp_workspace_get_title (GappWorkspace *gapp_workspace)
 {
 	const gchar *ret;
+	AtomText *title;
+
+	ret = NULL;
 
 	g_object_get (G_OBJECT (gapp_workspace),
-	              "title", &ret,
+	              "title", &title,
 	              NULL);
 
+	if (title != NULL)
+		{
+			g_object_get (G_OBJECT (title),
+			              "text", &ret,
+			              NULL);
+		}
+
 	return ret;
 }