diff options
| author | James Henstridge <james@daa.com.au> | 2000-10-25 03:03:52 +0000 |
|---|---|---|
| committer | James Henstridge <jamesh@src.gnome.org> | 2000-10-25 03:03:52 +0000 |
| commit | 49e156afc373ed9302d5ac17278078bc8d848115 (patch) | |
| tree | 3951d228d08433bc6804dc64360f0e25acda7ce8 | |
| parent | 27bbc38e2210e0bf24d54cef027f6b316b069802 (diff) | |
| download | pygobject-49e156afc373ed9302d5ac17278078bc8d848115.tar.gz pygobject-49e156afc373ed9302d5ac17278078bc8d848115.tar.xz pygobject-49e156afc373ed9302d5ac17278078bc8d848115.zip | |
add a field just to test pygobject_getattro. It isn't working quite
2000-10-25 James Henstridge <james@daa.com.au>
* gtk/gtk.defs (Bin): add a field just to test pygobject_getattro.
It isn't working quite properly at the moment though :(
* gobjectmodule.c (check_bases): class->bases is a tuple -- not a
list.
(check_bases): check if class->bases != NULL before using it :(
* gtk/gtk.defs: comment out new tree widget stuff at hp and owen's
suggestion.
* gtk/__init__.py: import gobject here as well to prevent weirdness.
* gtk/gtk.defs: more updates, adding (is-constructor-of ...) and
(default "...") clauses.
* gtk/gtk.override (_wrap_gtk_button_new): handle the accel_group
argument, and try to create a stock button if possible.
| -rw-r--r-- | gobject/gobjectmodule.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/gobject/gobjectmodule.c b/gobject/gobjectmodule.c index 3171e6b..07628af 100644 --- a/gobject/gobjectmodule.c +++ b/gobject/gobjectmodule.c @@ -375,7 +375,6 @@ pygobject_dealloc(PyGObject *self) static PyObject * check_bases(PyGObject *self, PyExtensionClass *class, char *attr) { - guint i, len; PyObject *ret; if (class->tp_getattr) { @@ -385,14 +384,17 @@ check_bases(PyGObject *self, PyExtensionClass *class, char *attr) else PyErr_Clear(); } - len = PyList_Size(class->bases); - for (i = 0; i < len; i++) { - PyExtensionClass *base = (PyExtensionClass *)PyList_GetItem( + if (class->bases) { + guint i, len = PyTuple_Size(class->bases); + + for (i = 0; i < len; i++) { + PyExtensionClass *base = (PyExtensionClass *)PyTuple_GetItem( class->bases, i); - ret = check_bases(self, base, attr); - if (ret) - return ret; + ret = check_bases(self, base, attr); + if (ret) + return ret; + } } return NULL; } |