aboutsummaryrefslogtreecommitdiffstats
path: root/libpyside
diff options
context:
space:
mode:
authorLuciano Wolf <luciano.wolf@openbossa.org>2010-05-17 19:46:12 -0300
committerRenato Filho <renato.filho@openbossa.org>2010-05-17 19:55:19 -0300
commitb7df2f1c0ca771caad27c0fe896e5657f589f05c (patch)
tree162320dccd7f2cbf02ed3448359cf1c533e4e376 /libpyside
parent40d67b2892039fabc41bf7a23c0ee7f95310367f (diff)
Fix signal initializer.
Reviewer: Hugo Parente Lima <hugo.lima@openbossa.org>, Luciano Wolf <luciano.wolf@openbossa.org>
Diffstat (limited to 'libpyside')
-rw-r--r--libpyside/qsignal.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libpyside/qsignal.cpp b/libpyside/qsignal.cpp
index 0d24bec40..811db9bcb 100644
--- a/libpyside/qsignal.cpp
+++ b/libpyside/qsignal.cpp
@@ -228,7 +228,7 @@ char* signal_parse_signature(PyObject *args)
{
char *signature = 0;
- if (args && !PySequence_Check(args) && (args != Py_None && args))
+ if (args && (PyString_Check(args) || (!PySequence_Check(args) && (args != Py_None))))
return signal_get_type_name(args);
for(Py_ssize_t i = 0, i_max = PySequence_Size(args); i < i_max; i++) {
@@ -282,7 +282,7 @@ int signal_init(PyObject* self, PyObject* args, PyObject* kwds)
for(Py_ssize_t i = 0, i_max = PyTuple_Size(args); i < i_max; i++) {
PyObject *arg = PyTuple_GET_ITEM(args, i);
- if (PySequence_Check(arg)) {
+ if (PySequence_Check(arg) && !PyString_Check(arg)) {
tupledArgs = true;
signal_append_signature(data, signal_parse_signature(arg));
}