diff options
| author | Paul Pogonyshev <pogonyshev@gmx.net> | 2008-03-02 00:05:03 +0000 |
|---|---|---|
| committer | Paul Pogonyshev <paulp@src.gnome.org> | 2008-03-02 00:05:03 +0000 |
| commit | c06b1b22b905e5c245a4f65782af2a04100956c7 (patch) | |
| tree | 0364a706260bd6f22b9a1a041750b7151882b956 | |
| parent | 5c3cc41b80176af0673ae7b4aca23ffb6cea41ac (diff) | |
| download | pygobject-c06b1b22b905e5c245a4f65782af2a04100956c7.tar.gz pygobject-c06b1b22b905e5c245a4f65782af2a04100956c7.tar.xz pygobject-c06b1b22b905e5c245a4f65782af2a04100956c7.zip | |
Never override customly set 'tp_new' and 'tp_alloc'.
2008-03-02 Paul Pogonyshev <pogonyshev@gmx.net>
* gobject/gobjectmodule.c (REGISTER_TYPE): Never override customly
set 'tp_new' and 'tp_alloc'.
svn path=/trunk/; revision=747
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | gobject/gobjectmodule.c | 6 |
2 files changed, 9 insertions, 2 deletions
@@ -1,3 +1,8 @@ +2008-03-02 Paul Pogonyshev <pogonyshev@gmx.net> + + * gobject/gobjectmodule.c (REGISTER_TYPE): Never override customly + set 'tp_new' and 'tp_alloc'. + 2008-02-01 Dan Winship <danw@gnome.org> * 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); |