From f8907f4e4ed306f07c28d285d2d46bd2b43ea19b Mon Sep 17 00:00:00 2001
From: Hugo Parente Lima <hugo.lima@openbossa.org>
Date: Thu, 8 Apr 2010 16:34:52 -0300
Subject: Fix bug#210, "Can't connect generic callable objects as a slot".
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reviewer: Bruno Araújo <bruno.araujo@openbossa.org>
Reviewer: Lauro Moura <lauro.neto@openbossa.org>
---
 PySide/QtCore/glue/qobject_connect.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'PySide/QtCore')

diff --git a/PySide/QtCore/glue/qobject_connect.cpp b/PySide/QtCore/glue/qobject_connect.cpp
index 16842a0a3..deeaa6a56 100644
--- a/PySide/QtCore/glue/qobject_connect.cpp
+++ b/PySide/QtCore/glue/qobject_connect.cpp
@@ -8,11 +8,10 @@ static bool getReceiver(PyObject *callback, QObject **receiver, PyObject **self)
         *self = PyCFunction_GET_SELF(callback);
         if (*self && SbkQObject_Check(*self))
             *receiver = Converter<QObject*>::toCpp(*self);
-    } else if (!PyFunction_Check(callback)) {
+    } else if (PyCallable_Check(callback)) {
+        // Ok, just a callable object
         *receiver = 0;
         *self = 0;
-        qWarning() << "Invalid callback object.";
-        return false;
     }
 
     bool usingGlobalReceiver = !*receiver;
-- 
cgit v1.2.3