diff options
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | libdbusmenu-glib/client.c | 5 |
2 files changed, 8 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog index 1324d15..eeb6d06 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +libdbusmenu (0.2.9-0ubuntu2~ppa2~refs4) UNRELEASED; urgency=low + + * Upstream merge + * Removing extra unref which allows us to not make an + extra ref. + + -- Ted Gould <ted@ubuntu.com> Fri, 16 Apr 2010 11:50:51 -0500 + libdbusmenu (0.2.9-0ubuntu2~ppa2~refs3) lucid; urgency=low * Upstream merge diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c index 910f9a1..c8706ac 100644 --- a/libdbusmenu-glib/client.c +++ b/libdbusmenu-glib/client.c @@ -749,8 +749,6 @@ parse_layout_xml(DbusmenuClient * client, xmlNodePtr node, DbusmenuMenuitem * it if (parent != NULL) { dbusmenu_menuitem_child_delete(parent, item); } - /* XXX: Should this be an unref? Who's reffing this that it exists without a parent? */ - g_object_unref(G_OBJECT(item)); item = NULL; } @@ -848,9 +846,6 @@ 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); |