diff options
| author | Johan Dahlin <johan@src.gnome.org> | 2006-07-25 22:27:48 +0000 |
|---|---|---|
| committer | Johan Dahlin <johan@src.gnome.org> | 2006-07-25 22:27:48 +0000 |
| commit | 263a8954ef973fb94aafa7c0df039681dbb12d1f (patch) | |
| tree | 12e0b49a2c776acd2ff089ceaaebad20c33ea0a5 /gobject | |
| parent | 9b642f26cf275d1b3c1418c87e394526a66da3a6 (diff) | |
| download | pygobject-263a8954ef973fb94aafa7c0df039681dbb12d1f.tar.gz pygobject-263a8954ef973fb94aafa7c0df039681dbb12d1f.tar.xz pygobject-263a8954ef973fb94aafa7c0df039681dbb12d1f.zip | |
Fix 3 ! problems caused by refactoring
Diffstat (limited to 'gobject')
| -rw-r--r-- | gobject/pygobject.h | 46 |
1 files changed, 24 insertions, 22 deletions
diff --git a/gobject/pygobject.h b/gobject/pygobject.h index 6d82d34..fd9b832 100644 --- a/gobject/pygobject.h +++ b/gobject/pygobject.h @@ -293,28 +293,30 @@ struct _PyGObject_Functions *_PyGObject_API; } \ } G_STMT_END -#define init_pygobject_check(major, minor, micro) G_STMT_START { \ - init_pygobject(); \ - PyObject *gobject = PyImport_ImportModule("gobject"); \ - version = PyDict_GetItemString(mdict, "pygobject_version"); \ - if (!version) \ - version = PyDict_GetItemString(mdict, "pygtk_version"); \ - if (!version) { \ - PyErr_SetString(PyExc_ImportError, \ - "PyGObject version too old"); \ - return; \ - } \ - if (!PyArg_ParseTuple(version, "iii", \ - &found_major, &found_minor, &found_micro)) \ - return; \ - if (major > found_major || minor > found_minor || \ - micro > found_micro) { \ - PyErr_Format(PyExc_ImportError, \ - "PyGObject version too old, %d.%d.%d is required, " \ - "found %d.%d.%d.", major, minor, micro, \ - found_major, found_minor, found_micro); \ - return; \ - } \ +#define init_pygobject_check(major, minor, micro) G_STMT_START { \ + init_pygobject(); \ + PyObject *gobject = PyImport_ImportModule("gobject"); \ + PyObject *mdict = PyModule_GetDict(gobject); \ + PyObject *version = PyDict_GetItemString(mdict, "pygobject_version"); \ + int found_major, found_minor, found_micro; \ + if (!version) \ + version = PyDict_GetItemString(mdict, "pygtk_version"); \ + if (!version) { \ + PyErr_SetString(PyExc_ImportError, \ + "PyGObject version too old"); \ + return; \ + } \ + if (!PyArg_ParseTuple(version, "iii", \ + &found_major, &found_minor, &found_micro)) \ + return; \ + if (major > found_major || minor > found_minor || \ + micro > found_micro) { \ + PyErr_Format(PyExc_ImportError, \ + "PyGObject version too old, %d.%d.%d is required, " \ + "found %d.%d.%d.", major, minor, micro, \ + found_major, found_minor, found_micro); \ + return; \ + } \ } G_STMT_END #endif /* !_INSIDE_PYGOBJECT_ */ |