aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKen VanDine <ken.vandine@canonical.com>2011-02-04 12:31:03 -0500
committerKen VanDine <ken.vandine@canonical.com>2011-02-04 12:31:03 -0500
commit51f85685a52252a359ec3c540df2401e084481d6 (patch)
tree2b4e0225aac07d892e4991c4a1ec86d11277a3b0
parentb6041448e47c4a6e5a3d2f5bbca42771ac59006b (diff)
parent3548a02da37917e95564dfda60e97870274a53fa (diff)
downloadlibdbusmenu-51f85685a52252a359ec3c540df2401e084481d6.tar.gz
libdbusmenu-51f85685a52252a359ec3c540df2401e084481d6.tar.bz2
libdbusmenu-51f85685a52252a359ec3c540df2401e084481d6.zip
releasing version 0.3.96-0ubuntu2
-rw-r--r--debian/changelog8
-rw-r--r--libdbusmenu-glib/menuitem.c4
2 files changed, 10 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 5cec75c..d276818 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libdbusmenu (0.3.96-0ubuntu2) natty; urgency=low
+
+ * libdbusmenu-glib/menuitem.c
+ - take_children() shouldn't unref as the caller wouldn't get a chance
+ to use the items if this was the last ref.
+
+ -- Ken VanDine <ken.vandine@canonical.com> Fri, 04 Feb 2011 12:18:13 -0500
+
libdbusmenu (0.3.96-0ubuntu1) natty; urgency=low
* New upstream release.
diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c
index b40195c..159463b 100644
--- a/libdbusmenu-glib/menuitem.c
+++ b/libdbusmenu-glib/menuitem.c
@@ -547,7 +547,6 @@ take_children_signal (gpointer data, gpointer user_data)
g_debug("Menuitem %d (%s) signalling child removed %d (%s)", ID(user_data), LABEL(user_data), ID(data), LABEL(data));
#endif
g_signal_emit(G_OBJECT(user_data), signals[CHILD_REMOVED], 0, DBUSMENU_MENUITEM(data), TRUE);
- g_object_unref(G_OBJECT(data));
return;
}
@@ -561,7 +560,8 @@ take_children_signal (gpointer data, gpointer user_data)
on the children it has taken. A lot of responsibility involved
in taking children.
- Return value: A #GList of pointers to #DbusmenuMenuitem objects.
+ Return value: (transfer full) (array) (element-type Dbusmenu.Menuitem)
+ A #GList of pointers to #DbusmenuMenuitem objects.
*/
GList *
dbusmenu_menuitem_take_children (DbusmenuMenuitem * mi)