Stop signal/slot connection if is impossible to register that on object.

Created unit test for bug #442, #437.
Fixes bug #442.

Reviewer: Marcelo Lira <marcelo.lira@openbossa.org>
          Luciano Wolf <luciano.wolf@openbossa.org>

2 files changed, 8 insertions, 7 deletions

diff --git a/libpyside/qsignal.cpp b/libpyside/qsignal.cpp
index 23ee7ff25..31d30fca1 100644
--- a/libpyside/qsignal.cpp
+++ b/libpyside/qsignal.cpp
@@ -523,6 +523,8 @@ char* getTypeName(PyObject* type)
         return typeName;
     } else if (PyString_Check(type)) {
         return strdup(PyString_AS_STRING(type));
+    } else if (type == Py_None) {
+        return strdup("void");
     }
     return 0;
 }
@@ -537,7 +539,7 @@ char* signalBuildSignature(const char *name, const char *signature)
 char* signalParseSignature(PyObject *args)
 {
     char *signature = 0;
-    if (args && (PyString_Check(args) || (!PySequence_Check(args) && (args != Py_None))))
+    if (args && (PyString_Check(args) || !PySequence_Check(args)))
         return getTypeName(args);
 
     for(Py_ssize_t i = 0, i_max = PySequence_Size(args); i < i_max; i++) {
@@ -623,12 +625,11 @@ PyObject* signalNewFromMethod(PyObject* source, const QList<QMetaMethod>& method
         item->d = new PySideSignalInstanceDataPrivate;
         PySideSignalInstanceDataPrivate* selfPvt = item->d;
         selfPvt->source = source;
-        const char* cppSignature = m.signature();
+        QByteArray cppName(m.signature());
+        cppName = cppName.mid(0, cppName.indexOf('('));
         // separe SignalName
-        selfPvt->signalName = strdup(cppSignature);
-        char* endName = strchr(selfPvt->signalName, '(');
-        endName = '\0';
-        selfPvt->signature = strdup(cppSignature);
+        selfPvt->signalName = strdup(cppName.data());
+        selfPvt->signature = strdup(m.signature());
         selfPvt->homonymousMethod = 0;
         selfPvt->next = 0;
     }
diff --git a/libpyside/signalmanager.cpp b/libpyside/signalmanager.cpp
index 69c449272..53f6a4510 100644
--- a/libpyside/signalmanager.cpp
+++ b/libpyside/signalmanager.cpp
@@ -482,7 +482,7 @@ bool SignalManager::registerMetaMethod(QObject* source, const char* signature, Q
     if (methodIndex == -1) {
         Shiboken::SbkBaseWrapper* self = (Shiboken::SbkBaseWrapper*) Shiboken::BindingManager::instance().retrieveWrapper(source);
         if (!self->containsCppWrapper) {
-            qWarning() << "You can't add dynamic signals or slots on an object originated from C++.";
+            qWarning() << "Invalid Signal signature:" << signature;
             return false;
         } else {
             PySide::DynamicQMetaObject* dynMetaObj = reinterpret_cast<PySide::DynamicQMetaObject*>(const_cast<QMetaObject*>(metaObject));