From 99f90ceb215313ca0e34510f7a080339f48e12ce Mon Sep 17 00:00:00 2001 From: Johan Dahlin Date: Sun, 27 Jul 2008 10:07:55 +0000 Subject: Use the Py_TYPE macro everywhere. 2008-07-27 Johan Dahlin * glib/pyglib-python-compat.h: * gobject/gobjectmodule.c (pyg_object_new), (pyg__install_metaclass): * gobject/pygboxed.c (pyg_boxed_dealloc), (pyg_boxed_init), (pyg_register_boxed): * gobject/pygenum.c (pyg_enum_reduce): * gobject/pyginterface.c (pyg_interface_init), (pyg_register_interface): * gobject/pygobject.c (pygobject_get_inst_data), (pygobject_register_class), (pygobject_new_with_interfaces), (pygobject_dealloc), (pygobject_repr), (pygobject_emit), (pygobject_chain_from_overridden), (pygobject_weak_ref_notify): * gobject/pygparamspec.c (pygobject_paramspec_register_types): * gobject/pygpointer.c (pyg_pointer_dealloc), (pyg_pointer_init), (pyg_register_pointer): * gobject/pygtype.c (pyg_type_from_object), (pyg_value_array_from_pyobject), (pyg_value_from_pyobject), (pyg_object_descr_doc_get): Use the Py_TYPE macro everywhere. svn path=/trunk/; revision=886 --- gobject/gobjectmodule.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gobject/gobjectmodule.c') diff --git a/gobject/gobjectmodule.c b/gobject/gobjectmodule.c index 7fb9154..a95aede 100644 --- a/gobject/gobjectmodule.c +++ b/gobject/gobjectmodule.c @@ -1715,7 +1715,7 @@ pyg_object_new (PyGObject *self, PyObject *args, PyObject *kwargs) value, pspec) < 0) { PyErr_Format(PyExc_TypeError, "could not convert value for property `%s' from %s to %s", - key_str, value->ob_type->tp_name, + key_str, Py_TYPE(value)->tp_name, g_type_name(G_PARAM_SPEC_VALUE_TYPE(pspec))); goto cleanup; } @@ -1944,7 +1944,9 @@ pyg__install_metaclass(PyObject *dummy, PyTypeObject *metaclass) Py_INCREF(metaclass); PyGObject_MetaType = metaclass; Py_INCREF(metaclass); - PyGObject_Type.ob_type = metaclass; + + Py_TYPE(&PyGObject_Type) = metaclass; + Py_INCREF(Py_None); return Py_None; } -- cgit