diff options
author | Ted Gould <ted@gould.cx> | 2010-04-16 11:51:35 -0500 |
---|---|---|
committer | Ted Gould <ted@gould.cx> | 2010-04-16 11:51:35 -0500 |
commit | 1c207bd7a4e787a4d34b0815750ec52f3802584c (patch) | |
tree | dad19c5743372fc84f54bc8ae30e36324e4ec909 /libdbusmenu-glib/client.c | |
parent | 33fa3fd7eeed10107b96698d23a9e0fc8f03c2f8 (diff) | |
parent | 541193c9c95a4ee22286a9f43abf05741361f702 (diff) | |
download | libdbusmenu-1c207bd7a4e787a4d34b0815750ec52f3802584c.tar.gz libdbusmenu-1c207bd7a4e787a4d34b0815750ec52f3802584c.tar.bz2 libdbusmenu-1c207bd7a4e787a4d34b0815750ec52f3802584c.zip |
* Upstream merge
* Removing extra unref which allows us to not make an
extra ref.
Diffstat (limited to 'libdbusmenu-glib/client.c')
-rw-r--r-- | libdbusmenu-glib/client.c | 5 |
1 files changed, 0 insertions, 5 deletions
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); |