diff options
| author | Ryan Lortie <desrt@desrt.ca> | 2013-04-04 11:12:42 -0400 |
|---|---|---|
| committer | Ryan Lortie <desrt@desrt.ca> | 2013-04-04 11:41:19 -0400 |
| commit | 96f7e6d70b7b7aa915e471d5ee5f5bc2a6637af9 (patch) | |
| tree | 2307765276490f65fc79ecd3ab204faba259cdca | |
| parent | c5307e4cba67fadf1749c9a5c127bf1000c1dc89 (diff) | |
| download | glib-96f7e6d70b7b7aa915e471d5ee5f5bc2a6637af9.tar.gz | |
gtype: interface-after-init exception for gtk#
gtk# also has a problem with the new interface-after-init restriction
that nobody noticed until now. Add an exception for them as well so
that they have a cycle or so to sort things out.
https://bugzilla.gnome.org/show_bug.cgi?id=687659
| -rw-r--r-- | gobject/gtype.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gobject/gtype.c b/gobject/gtype.c index 1fd31e87d..82534caec 100644 --- a/gobject/gtype.c +++ b/gobject/gtype.c @@ -1007,8 +1007,10 @@ 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 */ - if (!g_str_has_prefix (NODE_NAME (node), "gtkmm__CustomObject_")) + /* 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; } tnode = lookup_type_node_I (NODE_PARENT_TYPE (iface)); |