summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Lortie <desrt@desrt.ca>2014-06-06 16:51:40 -0400
committerRyan Lortie <desrt@desrt.ca>2014-06-09 14:18:15 -0400
commit545b44444b365a4e3ba98ec71fab4f12293a229c (patch)
tree6c60b99b2b6899ec2b3e59361eb999cf61d468aa
parent91b9aef0c9988fcab6adb7be3af46953c1c558c9 (diff)
downloadglib-545b44444b365a4e3ba98ec71fab4f12293a229c.tar.gz
gtype: remove interface-after-init exceptions
A year ago, we tried to remove support for adding interfaces on already-initialised types. There were problems with the C++ and C# bindings at the time, so we added exceptions to give them a bit more time to catch up. It's already one cycle after when these exceptions were planned to be removed, so let's take them out now. https://bugzilla.gnome.org/show_bug.cgi?id=697229
-rw-r--r--gobject/gtype.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/gobject/gtype.c b/gobject/gtype.c
index f2356cafb..e33a61286 100644
--- a/gobject/gtype.c
+++ b/gobject/gtype.c
@@ -1007,12 +1007,7 @@ check_add_interface_L (GType instance_type,
{
g_warning ("attempting to add an interface (%s) to class (%s) after class_init",
NODE_NAME (iface), NODE_NAME (node));
-
- /* See https://bugzilla.gnome.org/show_bug.cgi?id=697229,
- * https://bugzilla.gnome.org/show_bug.cgi?id=687659
- */
- if (!g_str_has_prefix (NODE_NAME (node), "gtkmm__CustomObject_") && !strstr (NODE_NAME (node), "_gtksharp_"))
- return FALSE;
+ return FALSE;
}
tnode = lookup_type_node_I (NODE_PARENT_TYPE (iface));
if (NODE_PARENT_TYPE (tnode) && !type_lookup_iface_entry_L (node, tnode))