jyapayne/PySide
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Disconnect signals during the class destroy.

Browse source 
Fix bug #921.

Reviewer: Marcelo Lira <marcelo.lira@openbossa.org>
          Lauro Moura <lauro.neto@openbossa.org>
This commit is contained in:
Renato Filho 2011-07-15 19:00:33 -03:00 • committed by Hugo Parente Lima
commit 420cc076b3
2 changed files with 72 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

9
libpyside/pysideweakref.cpp
View file

@ -6,7 +6,7 @@ typedef struct {
PyObject_HEAD
/* Type-specific fields go here. */
PySideWeakRefFunction weakref_func;
void *user_data;
void* user_data;
} PySideCallableObject;
static PyObject* CallableObject_call(PyObject* callable_object, PyObject* args, PyObject* kw);
@ -36,13 +36,12 @@ static PyTypeObject PySideCallableObjectType = {
0, /* tp_doc */
};
static PyObject* CallableObject_call(PyObject* callable_object, PyObject* args, PyObject* kw)
{
PySideCallableObject* obj = (PySideCallableObject*)(callable_object);
obj->weakref_func(obj->user_data);
Py_XDECREF(PyTuple_GET_ITEM(args, 0)); //kill weak ref
Py_XDECREF(PyTuple_GET_ITEM(args, 0)); //kill weak ref object
Py_RETURN_NONE;
}
@ -68,12 +67,10 @@ PyObject* create(PyObject* obj, PySideWeakRefFunction func, void* userData)
return 0;
Py_DECREF(callable);
if (!weak)
return 0;
callable->weakref_func = func;
callable->user_data = userData;
return (PyObject*)callable;
return (PyObject*)weak;
}
} } //namespace