diff options
| author | John Ehresman <jpe@src.gnome.org> | 2005-08-24 18:51:38 +0000 |
|---|---|---|
| committer | John Ehresman <jpe@src.gnome.org> | 2005-08-24 18:51:38 +0000 |
| commit | 844ff2b73c9f2529d65a5ca2e8b863549886e36e (patch) | |
| tree | 0417952ca1b4df31232f7b77361f137f9acf051d | |
| parent | a470e9c67a35ef7fbd6b6243a4a99f06ace39d1b (diff) | |
| download | pygobject-844ff2b73c9f2529d65a5ca2e8b863549886e36e.tar.gz pygobject-844ff2b73c9f2529d65a5ca2e8b863549886e36e.tar.xz pygobject-844ff2b73c9f2529d65a5ca2e8b863549886e36e.zip | |
Added sources so gobject module will compile, fixed enable/disable threadPYGTK_2_7_4
* setup.py: Added sources so gobject module will compile, fixed
enable/disable thread support, and changed default so thread
support is enabled unless --disable-threading is specified
* gobject/gobjectmodule.c, gobject/pygobject.c: Set
PyGObject_MetaType.tp_base in module initialization to keep
VC++ happy
| -rw-r--r-- | gobject/gobjectmodule.c | 1 | ||||
| -rw-r--r-- | gobject/pygobject.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/gobject/gobjectmodule.c b/gobject/gobjectmodule.c index 68a10ac..c6420ab 100644 --- a/gobject/gobjectmodule.c +++ b/gobject/gobjectmodule.c @@ -2717,6 +2717,7 @@ initgobject(void) gerror_exc = PyErr_NewException("gobject.GError", PyExc_RuntimeError,NULL); PyDict_SetItemString(d, "GError", gerror_exc); + PyGObject_MetaType.tp_base = &PyType_Type; PyGObject_MetaType.tp_traverse = PyType_Type.tp_traverse; PyGObject_MetaType.tp_clear = PyType_Type.tp_clear; PyGObject_MetaType.tp_is_gc = PyType_Type.tp_is_gc; diff --git a/gobject/pygobject.c b/gobject/pygobject.c index a7b1a33..957df39 100644 --- a/gobject/pygobject.c +++ b/gobject/pygobject.c @@ -1685,7 +1685,7 @@ PyTypeObject PyGObject_MetaType = { 0, /* tp_methods */ 0, /* tp_members */ 0, /* tp_getset */ - &PyType_Type, /* tp_base */ + NULL, /* tp_base */ (PyObject *)0, /* tp_dict */ 0, /* tp_descr_get */ 0, /* tp_descr_set */ |