From 3938273dfd085dc75f64ce44706cf508fd971099 Mon Sep 17 00:00:00 2001 From: "Gustavo J. A. M. Carneiro" Date: Sun, 27 Aug 2006 10:53:54 +0000 Subject: Bug 353039 – Failure in signal emission during do_set_property invoked from constructor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gobject/gobjectmodule.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'gobject/gobjectmodule.c') diff --git a/gobject/gobjectmodule.c b/gobject/gobjectmodule.c index dabff01..dde48b6 100644 --- a/gobject/gobjectmodule.c +++ b/gobject/gobjectmodule.c @@ -1173,8 +1173,9 @@ pygobject__g_instance_init(GTypeInstance *instance, wrapper = g_object_get_qdata(object, pygobject_wrapper_key); if (wrapper == NULL) { wrapper = pygobject_init_wrapper_get(); - if (wrapper) { - g_object_set_qdata(object, pygobject_wrapper_key, wrapper); + if (wrapper && ((PyGObject *) wrapper)->obj == NULL) { + ((PyGObject *) wrapper)->obj = object; + pygobject_register_wrapper(wrapper); } } pygobject_init_wrapper_set(NULL); @@ -3070,11 +3071,16 @@ pygobject_constructv(PyGObject *self, GParameter *parameters) { if (self->obj == NULL) { + GObject *obj; pygobject_init_wrapper_set((PyObject *) self); - self->obj = g_object_newv(pyg_type_from_object((PyObject *) self), - n_parameters, parameters); + obj = g_object_newv(pyg_type_from_object((PyObject *) self), + n_parameters, parameters); pygobject_init_wrapper_set(NULL); - pygobject_register_wrapper((PyObject *) self); + if (self->obj == NULL) { + self->obj = obj; + pygobject_sink(obj); + pygobject_register_wrapper((PyObject *) self); + } } else { int i; for (i = 0; i < n_parameters; ++i) -- cgit