diff options
author | Benjamin Otte <otte@redhat.com> | 2019-11-26 00:52:03 +0100 |
---|---|---|
committer | Benjamin Otte <otte@redhat.com> | 2019-11-26 00:54:15 +0100 |
commit | 276e927fd476dadb7cdd5e34dc6be6182a6f9b09 (patch) | |
tree | a0111459ef645aef421e72fcdf9c44beb0398e7a /gobject/gtype.c | |
parent | 5899c61ed2b4be3f02d0382d6fb0d1fc1bb7bc98 (diff) | |
download | glib-276e927fd476dadb7cdd5e34dc6be6182a6f9b09.tar.gz |
Revert last 4 commits
This reverts commits:
5899c61ed2b4be3f02d0382d6fb0d1fc1bb7bc98
e994d4535270b233c4ed5c62e0055fe20c9ab1c6
eb20dec144765d255928fb3e0df960b09af5904d
ebec0dd359eb3a3dc5dbf8ac533a7d89cfc72267
which wer accidentally pushed to master instead of a branch
Diffstat (limited to 'gobject/gtype.c')
-rw-r--r-- | gobject/gtype.c | 47 |
1 files changed, 1 insertions, 46 deletions
diff --git a/gobject/gtype.c b/gobject/gtype.c index 94b3667bc..b5ef2d11e 100644 --- a/gobject/gtype.c +++ b/gobject/gtype.c @@ -1689,51 +1689,6 @@ g_type_interface_prerequisites (GType interface_type, } } -/** - * g_type_interface_instantiable_prerequisite: - * @interface_type: an interface type - * - * Returns the instantiable prerequisite of an interface type. - * - * If the interface type has no instantiable prerequisite, 0 is returned. - * - * Since: 2.64 - * - * Returns: the instantiable prerequisite type or 0 if none - **/ -GType -g_type_interface_instantiable_prerequisite (GType interface_type) -{ - TypeNode *inode = NULL; - TypeNode *iface; - guint i; - - g_return_val_if_fail (G_TYPE_IS_INTERFACE (interface_type), G_TYPE_INVALID); - - iface = lookup_type_node_I (interface_type); - if (iface == NULL) - return 0; - - G_READ_LOCK (&type_rw_lock); - - for (i = 0; i < IFACE_NODE_N_PREREQUISITES (iface); i++) - { - GType prerequisite = IFACE_NODE_PREREQUISITES (iface)[i]; - TypeNode *node = lookup_type_node_I (prerequisite); - if (node->is_instantiatable) - { - if (!inode || type_node_is_a_L (node, inode)) - inode = node; - } - } - - G_READ_UNLOCK (&type_rw_lock); - - if (inode) - return NODE_TYPE (inode); - else - return 0; -} static IFaceHolder* type_iface_peek_holder_L (TypeNode *iface, @@ -3452,7 +3407,7 @@ g_type_depth (GType type) * @root_type: immediate parent of the returned type * * Given a @leaf_type and a @root_type which is contained in its - * ancestry, return the type that @root_type is the immediate parent + * anchestry, return the type that @root_type is the immediate parent * of. In other words, this function determines the type that is * derived directly from @root_type which is also a base class of * @leaf_type. Given a root type and a leaf type, this function can |