From c06b1b22b905e5c245a4f65782af2a04100956c7 Mon Sep 17 00:00:00 2001 From: Paul Pogonyshev Date: Sun, 2 Mar 2008 00:05:03 +0000 Subject: Never override customly set 'tp_new' and 'tp_alloc'. 2008-03-02 Paul Pogonyshev * gobject/gobjectmodule.c (REGISTER_TYPE): Never override customly set 'tp_new' and 'tp_alloc'. svn path=/trunk/; revision=747 --- ChangeLog | 5 +++++ gobject/gobjectmodule.c | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 641b96c..6eb7f94 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-03-02 Paul Pogonyshev + + * gobject/gobjectmodule.c (REGISTER_TYPE): Never override customly + set 'tp_new' and 'tp_alloc'. + 2008-02-01 Dan Winship * pygobject-2.0.pc.in (defsdir): Add this so other bindings can diff --git a/gobject/gobjectmodule.c b/gobject/gobjectmodule.c index 755735f..00e3f0c 100644 --- a/gobject/gobjectmodule.c +++ b/gobject/gobjectmodule.c @@ -3542,8 +3542,10 @@ struct _PyGObject_Functions pygobject_api_functions = { #define REGISTER_TYPE(d, type, name) \ type.ob_type = &PyType_Type; \ - type.tp_alloc = PyType_GenericAlloc; \ - type.tp_new = PyType_GenericNew; \ + if (!type.tp_alloc) \ + type.tp_alloc = PyType_GenericAlloc; \ + if (!type.tp_new) \ + type.tp_new = PyType_GenericNew; \ if (PyType_Ready(&type)) \ return; \ PyDict_SetItemString(d, name, (PyObject *)&type); -- cgit