--- a/finch/libgnt/pygnt/gntmodule.c Sat Jul 28 11:30:54 2007 +0000 +++ b/finch/libgnt/pygnt/gntmodule.c Sat Jul 28 20:21:48 2007 +0000 @@ -1,62 +1,5 @@ #include <pygobject.h> -/* {{{ Wrapper for gpointer */ - -typedef struct { - PyObject_HEAD - PyGPointer *data; -} mygpointer; - -static PyObject * -mygpointer_new(PyTypeObject *type, PyObject *args, PyObject *kwds) -{ - mygpointer *self = (mygpointer*)type->tp_alloc(type, 0); - self->data = NULL; - return (PyObject*)self; -} - -static const PyMethodDef mygpointer_methods[] = { - /*{"value", (PyCFunction)get_value, METH_NOARGS, NULL},*/ - {NULL, NULL, 0, NULL} -}; - -static int -mygpointer_init(mygpointer *self, PyObject *args, PyObject *kwds) -{ - static char *kwlist[] = {"data", NULL}; - PyObject *data = NULL; - - if (!PyArg_ParseTupleAndKeywords(args, kwds, "|O", kwlist, - &data)) - return -1; - - Py_INCREF(data); - Py_DECREF(self->data); - self->data = data; - - return 0; -} - -static PyTypeObject mygpointer_type = { - PyObject_HEAD_INIT(&PyType_Type) - .tp_name = "gpointer", - .tp_basicsize = sizeof(mygpointer), - .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, - .tp_doc = "gpointer stuff", - .tp_members = NULL, - .tp_init = mygpointer_init, - .tp_new = mygpointer_new, - .tp_methods = mygpointer_methods -}; - -PyObject *create_mygpointer(gpointer data) -{ - mygpointer *p = mygpointer_new(&mygpointer_type, NULL, NULL); - p->data = data; - return (PyObject *)p; -} -/* }}} Wrapper for gpointer */ - void gnt_register_classes (PyObject *d); extern PyMethodDef gnt_functions[]; @@ -67,9 +10,6 @@ init_pygobject (); - if (PyType_Ready(&mygpointer_type) < 0) - return; - m = Py_InitModule ("gnt", gnt_functions); d = PyModule_GetDict (m);