[pygobject/bilelmoussaoui/dispose] object: Allow overriding dispose implementation
- From: Bilal Elmoussaoui <bilelmoussaoui src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pygobject/bilelmoussaoui/dispose] object: Allow overriding dispose implementation
- Date: Tue, 26 Jul 2022 15:30:38 +0000 (UTC)
commit ee448366d28feed5cd9dbf47708a2c394be2b702
Author: Bilal Elmoussaoui <belmouss redhat com>
Date: Tue Feb 15 15:02:54 2022 +0100
object: Allow overriding dispose implementation
In GTK4 people are expected to unparent their custom GtkWidget
implementation
in the object's dispose method which is the main motivation behind this
patch
gi/gimodule.c | 37 +++++++++++++++++++++++++++++++++++++
tests/test_gobject.py | 10 ++++++++++
2 files changed, 47 insertions(+)
---
diff --git a/gi/gimodule.c b/gi/gimodule.c
index 766fd341..31325e03 100644
--- a/gi/gimodule.c
+++ b/gi/gimodule.c
@@ -937,6 +937,42 @@ pyg_object_set_property (GObject *object, guint property_id,
PyGILState_Release(state);
}
+static void
+pyg_object_dispose (GObject *object)
+{
+ PyObject *object_wrapper, *retval;
+ PyGILState_STATE state;
+ GObjectClass *parent_class = g_type_class_peek (g_type_parent (G_TYPE_FROM_INSTANCE (object)));
+ if (parent_class == NULL)
+ return;
+ state = PyGILState_Ensure();
+
+ object_wrapper = g_object_get_qdata(object, pygobject_wrapper_key);
+
+ if (object_wrapper)
+ Py_INCREF (object_wrapper);
+ else
+ object_wrapper = pygobject_new(object);
+
+ if (object_wrapper == NULL) {
+ PyGILState_Release(state);
+ return;
+ }
+ retval = PyObject_CallMethod(object_wrapper, "do_dispose", NULL);
+
+ // Chain up only if the object override dispose
+ if (retval) {
+ Py_DECREF(retval);
+ // Chain up the dispose call
+ if (parent_class->dispose) {
+ parent_class->dispose(object);
+ }
+ }
+ Py_DECREF(object_wrapper);
+
+ PyGILState_Release(state);
+}
+
static void
pyg_object_class_init(GObjectClass *class, PyObject *py_class)
{
@@ -945,6 +981,7 @@ pyg_object_class_init(GObjectClass *class, PyObject *py_class)
class->set_property = pyg_object_set_property;
class->get_property = pyg_object_get_property;
+ class->dispose = pyg_object_dispose;
/* install signals */
/* we look this up in the instance dictionary, so we don't
diff --git a/tests/test_gobject.py b/tests/test_gobject.py
index fbc3bb79..0ef3569f 100644
--- a/tests/test_gobject.py
+++ b/tests/test_gobject.py
@@ -775,6 +775,16 @@ class TestGValue(unittest.TestCase):
value = GObject.Value(GObject.TYPE_OBJECT, obj)
self.assertEqual(value.get_value(), obj)
+ def test_dispose_object(self):
+ class TestObject(GObject.Object):
+ def __init__(self):
+ self.child = "Some Child"
+ def do_dispose(self):
+ self.child = None
+ obj = TestObject()
+ obj.run_dispose()
+ self.assertEqual(obj.child, None)
+
def test_value_array(self):
value = GObject.Value(GObject.ValueArray)
self.assertEqual(value.g_type, GObject.type_from_name('GValueArray'))
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]