aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog7
-rw-r--r--libdbusmenu-glib/client.c3
2 files changed, 10 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index f1cd8a4..c1e26a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libdbusmenu (0.2.9-0ubuntu2~ppa2~refs2) lucid; urgency=low
+
+ * Upstream merge
+ * Trying reffing the root still.
+
+ -- Ted Gould <ted@ubuntu.com> Fri, 16 Apr 2010 11:09:30 -0500
+
libdbusmenu (0.2.9-0ubuntu2~ppa2~refs1) lucid; urgency=low
* Upstream Merge
diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c
index f5e7115..910f9a1 100644
--- a/libdbusmenu-glib/client.c
+++ b/libdbusmenu-glib/client.c
@@ -848,6 +848,9 @@ parse_layout (DbusmenuClient * client, const gchar * layout)
xmlNodePtr root = xmlDocGetRootElement(xmldoc);
DbusmenuMenuitem * oldroot = priv->root;
+ if (oldroot != NULL) {
+ g_object_ref(oldroot);
+ }
priv->root = parse_layout_xml(client, root, priv->root, NULL, priv->menuproxy);
xmlFreeDoc(xmldoc);