Fixes connecting signal to decorated slot.

Decorated methods on classes derived from QObject are not called when
connected to Qt signals because they get a name different from the
decorated method. To solve this decorated methods are registered as
global slots.

An unit test was added.

Reviewed by Hugo Parente <hugo.lima@openbossa.org>
Reviewed by Renato Araújo <renato.filho@openbossa.org>

1 files changed, 12 insertions, 1 deletions

diff --git a/PySide/QtCore/glue/qobject_connect.cpp b/PySide/QtCore/glue/qobject_connect.cpp
index 91c830abd..f6b0dce08 100644
--- a/PySide/QtCore/glue/qobject_connect.cpp
+++ b/PySide/QtCore/glue/qobject_connect.cpp
@@ -1,9 +1,20 @@
+static bool isDecorator(PyObject* method, PyObject* self)
+{
+    Shiboken::AutoDecRef methodName(PyObject_GetAttrString(method, "__name__"));
+    if (!PyObject_HasAttr(self, methodName))
+        return true;
+    Shiboken::AutoDecRef otherMethod(PyObject_GetAttr(self, methodName));
+    return otherMethod.object() != method;
+}
+
 static bool getReceiver(PyObject* callback, QObject** receiver, PyObject** self)
 {
+    bool forceGlobalReceiver = false;
     if (PyMethod_Check(callback)) {
         *self = PyMethod_GET_SELF(callback);
         if (Shiboken::Converter<QObject*>::checkType(*self))
             *receiver = Shiboken::Converter<QObject*>::toCpp(*self);
+        forceGlobalReceiver = isDecorator(callback, *self);
     } else if (PyCFunction_Check(callback)) {
         *self = PyCFunction_GET_SELF(callback);
         if (*self && Shiboken::Converter<QObject*>::checkType(*self))
@@ -14,7 +25,7 @@ static bool getReceiver(PyObject* callback, QObject** receiver, PyObject** self)
         *self = 0;
     }
 
-    bool usingGlobalReceiver = !*receiver;
+    bool usingGlobalReceiver = !*receiver || forceGlobalReceiver;
     if (usingGlobalReceiver) {
         PySide::SignalManager& signalManager = PySide::SignalManager::instance();
         *receiver = signalManager.globalReceiver();