luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-24 04:56:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '277-closure-docs' into 'master'

Browse Source 
gclosure: Clarify when destroy notifiers are called in documentation

Closes #277

See merge request GNOME/glib!246
This commit is contained in:
Emmanuele Bassi 2018-09-05 10:13:48 +00:00
commit 46c1a45dc1
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gobject/gclosure.c
View File

@ -556,7 +556,7 @@ g_closure_ref (GClosure *closure)
/** /**
* g_closure_invalidate: * g_closure_invalidate:
* @closure: GClosure to invalidate * @closure: #GClosure to invalidate
* *
* Sets a flag on the closure to indicate that its calling * Sets a flag on the closure to indicate that its calling
* environment has become invalid, and thus causes any future * environment has become invalid, and thus causes any future
@ -936,6 +936,8 @@ _g_closure_set_va_marshal (GClosure *closure,
* Creates a new closure which invokes @callback_func with @user_data as * Creates a new closure which invokes @callback_func with @user_data as
* the last parameter. * the last parameter.
* *
* @destroy_data will be called as a finalize notifier on the #GClosure.
*
* Returns: (transfer none): a floating reference to a new #GCClosure * Returns: (transfer none): a floating reference to a new #GCClosure
*/ */
GClosure* GClosure*
@ -964,6 +966,8 @@ g_cclosure_new (GCallback callback_func,
* Creates a new closure which invokes @callback_func with @user_data as * Creates a new closure which invokes @callback_func with @user_data as
* the first parameter. * the first parameter.
* *
* @destroy_data will be called as a finalize notifier on the #GClosure.
*
* Returns: (transfer none): a floating reference to a new #GCClosure * Returns: (transfer none): a floating reference to a new #GCClosure
*/ */
GClosure* GClosure*

4
gobject/gobject.c
View File

@ -4109,8 +4109,8 @@ destroy_closure_array (gpointer data)
/** /**
* g_object_watch_closure: * g_object_watch_closure:
* @object: GObject restricting lifetime of @closure * @object: #GObject restricting lifetime of @closure
* @closure: GClosure to watch * @closure: #GClosure to watch
* *
* This function essentially limits the life time of the @closure to * This function essentially limits the life time of the @closure to
* the life time of the object. That is, when the object is finalized, * the life time of the object. That is, when the object is finalized,