diff options
| author | Ted Gould <ted@gould.cx> | 2010-04-16 10:50:54 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-04-16 10:50:54 -0500 |
| commit | bd3f67fa6f4e0806c43f1bfb6517dad71702fe7b (patch) | |
| tree | b2836812b90e4dc13b4fccf865a1958ad4a21144 | |
| parent | 209320abfce67eef832cfe30a8c24b9505cf9718 (diff) | |
| parent | 6085d46272fb067b475f433ecf5a5477dfa4e721 (diff) | |
| download | libdbusmenu-bd3f67fa6f4e0806c43f1bfb6517dad71702fe7b.tar.gz libdbusmenu-bd3f67fa6f4e0806c43f1bfb6517dad71702fe7b.tar.bz2 libdbusmenu-bd3f67fa6f4e0806c43f1bfb6517dad71702fe7b.zip | |
* Upstream Merge
* Decrementing refs when added to child menus
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | libdbusmenu-glib/client.c | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 028e2a5..a6557bd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libdbusmenu (0.2.9-0ubuntu2~ppa2~refs1) UNRELEASED; urgency=low + + * Upstream Merge + * Decrementing refs when added to child menus + + -- Ted Gould <ted@ubuntu.com> Fri, 16 Apr 2010 10:48:14 -0500 + libdbusmenu (0.2.9-0ubuntu2~ppa1) lucid; urgency=low * Upstream Merge diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c index d61b1ae..f5e7115 100644 --- a/libdbusmenu-glib/client.c +++ b/libdbusmenu-glib/client.c @@ -810,6 +810,7 @@ parse_layout_xml(DbusmenuClient * client, xmlNodePtr node, DbusmenuMenuitem * it dbusmenu_menuitem_child_delete(item, childmi); } dbusmenu_menuitem_child_add_position(item, newchildmi, position); + g_object_unref(newchildmi); } else { dbusmenu_menuitem_child_reorder(item, childmi, position); } @@ -847,9 +848,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); |