summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Dahlin <johan@src.gnome.org>2005-07-30 15:03:16 +0000
committerJohan Dahlin <johan@src.gnome.org>2005-07-30 15:03:16 +0000
commit0d54861f5d02c6632994d799414b68363923bc94 (patch)
treeb07dc78d2d09534726808e933e9fa0b73fd2f121
parentda3f23c74c828acbbeaaa6891f2a245d9379dde3 (diff)
downloadpygobject-0d54861f5d02c6632994d799414b68363923bc94.tar.gz
pygobject-0d54861f5d02c6632994d799414b68363923bc94.tar.xz
pygobject-0d54861f5d02c6632994d799414b68363923bc94.zip
Don't register PyObject unconditionally, fixes #303797 (Yevgen Muntyan)
* gobject/gobjectmodule.c (initgobject): Don't register PyObject unconditionally, fixes #303797 (Yevgen Muntyan)
-rw-r--r--gobject/gobjectmodule.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/gobject/gobjectmodule.c b/gobject/gobjectmodule.c
index 002d117..1bcd221 100644
--- a/gobject/gobjectmodule.c
+++ b/gobject/gobjectmodule.c
@@ -2713,9 +2713,10 @@ initgobject(void)
REGISTER_TYPE(d, PyGTypeWrapper_Type, "GType");
- PY_TYPE_OBJECT = g_boxed_type_register_static("PyObject",
- pyobject_copy,
- pyobject_free);
+ if (!PY_TYPE_OBJECT)
+ PY_TYPE_OBJECT = g_boxed_type_register_static("PyObject",
+ pyobject_copy,
+ pyobject_free);
gerror_exc = PyErr_NewException("gobject.GError", PyExc_RuntimeError,NULL);
PyDict_SetItemString(d, "GError", gerror_exc);