[glib] gtype: interface-after-init exception for gtk#
- From: Ryan Lortie <ryanl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib] gtype: interface-after-init exception for gtk#
- Date: Thu, 4 Apr 2013 15:41:30 +0000 (UTC)
commit 96f7e6d70b7b7aa915e471d5ee5f5bc2a6637af9
Author: Ryan Lortie <desrt desrt ca>
Date: Thu Apr 4 11:12:42 2013 -0400
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
gobject/gtype.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/gobject/gtype.c b/gobject/gtype.c
index 1fd31e8..82534ca 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));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]