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

Merge branch 'instantiatable' into 'master'

Browse Source 
gobject: Standardise on the term ‘instantiatable’

See merge request GNOME/glib!1735
This commit is contained in:
Sebastian Dröge
2020-11-13 15:29:07 +00:00
parent e4721dfff5 4f2b1e250d
commit ddef9ba2f8
9 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gobject/gtype.c
View File

@@ -2169,7 +2169,7 @@ type_class_init_Wm (TypeNode *node,
TypeNode *bnode, *pnode;
guint i;
/* Accessing data->class will work for instantiable types
/* Accessing data->class will work for instantiatable types
* too because ClassData is a subset of InstanceData
*/
g_assert (node->is_classed && node->data &&
@@ -2868,12 +2868,12 @@ g_type_register_dynamic (GType parent_type,
/**
* g_type_add_interface_static:
* @instance_type: #GType value of an instantiable type
* @instance_type: #GType value of an instantiatable type
* @interface_type: #GType value of an interface type
* @info: #GInterfaceInfo structure for this
* (@instance_type, @interface_type) combination
*
* Adds @interface_type to the static @instantiable_type.
* Adds @interface_type to the static @instance_type.
* The information contained in the #GInterfaceInfo structure
* pointed to by @info is used to manage the relationship.
*/
@@ -2905,11 +2905,11 @@ g_type_add_interface_static (GType instance_type,
/**
* g_type_add_interface_dynamic:
* @instance_type: #GType value of an instantiable type
* @instance_type: #GType value of an instantiatable type
* @interface_type: #GType value of an interface type
* @plugin: #GTypePlugin structure to retrieve the #GInterfaceInfo from
*
* Adds @interface_type to the dynamic @instantiable_type. The information
* Adds @interface_type to the dynamic @instance_type. The information
* contained in the #GTypePlugin structure pointed to by @plugin
* is used to manage the relationship.
*/