Commit 85e9455f authored by Allison Karlitskaya's avatar Allison Karlitskaya
Browse files

Revert "GObject: prevent installing properties after init"

This reverts commit ddb0ce14.

Conflicts:
	gobject/gobject.c

https://bugzilla.gnome.org/show_bug.cgi?id=698614
parent 256305de
......@@ -540,9 +540,6 @@ g_object_class_install_property (GObjectClass *class,
if (CLASS_HAS_DERIVED_CLASS (class))
g_error ("Attempt to add property %s::%s to class after it was derived", G_OBJECT_CLASS_NAME (class), pspec->name);
if (!g_type_is_in_init (G_OBJECT_CLASS_TYPE (class)))
g_warning ("Attempt to add property %s::%s after class was initialised", G_OBJECT_CLASS_NAME (class), pspec->name);
class->flags |= CLASS_HAS_PROPS_FLAG;
g_return_if_fail (pspec->flags & (G_PARAM_READABLE | G_PARAM_WRITABLE));
......@@ -653,9 +650,6 @@ g_object_class_install_properties (GObjectClass *oclass,
g_error ("Attempt to add properties to %s after it was derived",
G_OBJECT_CLASS_NAME (oclass));
if (!g_type_is_in_init (G_OBJECT_CLASS_TYPE (oclass)))
g_warning ("Attempt to add properties to %s after it was initialised", G_OBJECT_CLASS_NAME (oclass));
oclass_type = G_OBJECT_CLASS_TYPE (oclass);
parent_type = g_type_parent (oclass_type);
......
......@@ -70,7 +70,6 @@ void _g_closure_invoke_va (GClosure *closure,
int n_params,
GType *param_types);
gboolean g_type_is_in_init (GType type);
G_END_DECLS
......
......@@ -4818,13 +4818,3 @@ g_type_ensure (GType type)
if (G_UNLIKELY (type == (GType)-1))
g_error ("can't happen");
}
gboolean
g_type_is_in_init (GType type)
{
TypeNode *node;
node = lookup_type_node_I (type);
return node->data->class.init_state != INITIALIZED;
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment