← Back to team overview

ayatana-commits team mailing list archive

[Merge] lp:~ted/dbusmenu/take-unref into lp:dbusmenu

 

Ted Gould has proposed merging lp:~ted/dbusmenu/take-unref into lp:dbusmenu.

Requested reviews:
  DBus Menu Team (dbusmenu-team)

For more details, see:
https://code.launchpad.net/~ted/dbusmenu/take-unref/+merge/48629

take_children() shouldn't unref as the caller wouldn't get a chance to use the items if this was the last ref.
-- 
https://code.launchpad.net/~ted/dbusmenu/take-unref/+merge/48629
Your team ayatana-commits is subscribed to branch lp:dbusmenu.
=== modified file 'libdbusmenu-glib/menuitem.c'
--- libdbusmenu-glib/menuitem.c	2011-01-21 19:27:26 +0000
+++ libdbusmenu-glib/menuitem.c	2011-02-04 17:04:53 +0000
@@ -547,7 +547,6 @@
 	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 @@
 	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)


Follow ups