From 29e7e02e7f006cde4a5f142fe656ac6936fd6976 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 16 Apr 2009 17:19:51 -0500 Subject: A couple of debug strings and then making it so that if there is a root menu, it's at the root of the XML data instead of having a root wrapped around it. --- libdbusmenu-glib/server.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'libdbusmenu-glib') diff --git a/libdbusmenu-glib/server.c b/libdbusmenu-glib/server.c index cd2ab5c..13eb240 100644 --- a/libdbusmenu-glib/server.c +++ b/libdbusmenu-glib/server.c @@ -173,6 +173,7 @@ static void xmlarray_foreach_free (gpointer arrayentry, gpointer userdata) { if (arrayentry != NULL) { + /* g_debug("Freeing pointer: %s", (gchar *)arrayentry); */ g_free(arrayentry); } @@ -193,16 +194,17 @@ get_property (GObject * obj, guint id, GValue * value, GParamSpec * pspec) break; case PROP_LAYOUT: { GPtrArray * xmlarray = g_ptr_array_new(); - g_ptr_array_add(xmlarray, g_strdup("")); - if (priv->root != NULL) { + if (priv->root == NULL) { + g_ptr_array_add(xmlarray, g_strdup("")); + } else { dbusmenu_menuitem_buildxml(priv->root, xmlarray); } - g_ptr_array_add(xmlarray, g_strdup("")); g_ptr_array_add(xmlarray, NULL); /* build string */ - gchar * finalstring = g_strjoinv("\n", (gchar **)xmlarray->pdata); + gchar * finalstring = g_strjoinv("", (gchar **)xmlarray->pdata); g_value_take_string(value, finalstring); + /* g_debug("Final string: %s", finalstring); */ g_ptr_array_foreach(xmlarray, xmlarray_foreach_free, NULL); g_ptr_array_free(xmlarray, TRUE); -- cgit v1.2.3