diff options
Diffstat (limited to 'gi')
| -rw-r--r-- | gi/overrides/GLib.py | 10 | ||||
| -rw-r--r-- | gi/pygi-source.c | 28 |
2 files changed, 8 insertions, 30 deletions
diff --git a/gi/overrides/GLib.py b/gi/overrides/GLib.py index 78d309b6..0425d50f 100644 --- a/gi/overrides/GLib.py +++ b/gi/overrides/GLib.py @@ -525,12 +525,16 @@ class Source(GLib.Source): def __del__(self): if hasattr(self, '__pygi_custom_source'): + # We destroy and finalize the box from here, as GLib might hold + # a reference (e.g. while the source is pending), delaying the + # finalize call until a later point. self.destroy() - # XXX: We have to unref the underlying source while the Python - # wrapper is still valid, so the source can call into the - # wrapper methods for the finalized callback. + self.finalize() self._clear_boxed() + def finalize(self): + pass + def set_callback(self, fn, user_data=None): if hasattr(self, '__pygi_custom_source'): # use our custom pygi_source_set_callback() if for a GSource object diff --git a/gi/pygi-source.c b/gi/pygi-source.c index c85386d7..5de8a381 100644 --- a/gi/pygi-source.c +++ b/gi/pygi-source.c @@ -149,38 +149,12 @@ source_dispatch(GSource *source, GSourceFunc callback, gpointer user_data) return ret; } -static void -source_finalize(GSource *source) -{ - PyGRealSource *pysource = (PyGRealSource *)source; - PyObject *func, *t; - PyGILState_STATE state; - - state = PyGILState_Ensure(); - - func = PyObject_GetAttrString(pysource->obj, "finalize"); - if (func) { - t = PyObject_CallObject(func, NULL); - Py_DECREF(func); - - if (t == NULL) { - PyErr_Print(); - } else { - Py_DECREF(t); - } - } else { - PyErr_Clear (); - } - - PyGILState_Release(state); -} - static GSourceFuncs pyg_source_funcs = { source_prepare, source_check, source_dispatch, - source_finalize + NULL }; /** |