From 545b44444b365a4e3ba98ec71fab4f12293a229c Mon Sep 17 00:00:00 2001 From: Ryan Lortie Date: Fri, 6 Jun 2014 16:51:40 -0400 Subject: [PATCH] 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 --- gobject/gtype.c | 7 +------ 1 file changed, 1 insertion(+), 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))