[pygobject/invoke-rewrite] [gi-invoke-ng] backport closure passing from invoke

[John Palmieri <johnp src gnome org>]

commit 37b14b28a5f2aec16ac7f321efbf07e1403e9531
Author: John (J5) Palmieri <johnp redhat com>
Date:   Fri Mar 25 18:48:42 2011 -0400

    [gi-invoke-ng] backport closure passing from invoke

 gi/pygi-marshal.c |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)
---
diff --git a/gi/pygi-marshal.c b/gi/pygi-marshal.c
index cf737ae..d09cc01 100644
--- a/gi/pygi-marshal.c
+++ b/gi/pygi-marshal.c
@@ -1185,15 +1185,22 @@ _pygi_marshal_in_interface_struct (PyGIInvokeState   *state,
 
     if (iface_cache->g_type == G_TYPE_CLOSURE) {
         GClosure *closure;
-        if (!PyCallable_Check(py_arg)) {
+        GType object_gtype = pyg_type_from_object_strict (py_arg, FALSE);
+
+        if ( !(PyCallable_Check(py_arg) || 
+               g_type_is_a (object_gtype, G_TYPE_CLOSURE))) {
             PyErr_Format(PyExc_TypeError, "Must be callable, not %s",
                          py_arg->ob_type->tp_name);
             return FALSE;
         }
 
-        closure = pyg_closure_new(py_arg, NULL, NULL);
+        if (g_type_is_a (object_gtype, G_TYPE_CLOSURE))
+            closure = (GClosure *)pyg_boxed_get (py_arg, void);
+        else
+            closure = pyg_closure_new (py_arg, NULL, NULL);
+
         if (closure == NULL) {
-            PyErr_SetString(PyExc_RuntimeError, "PyObject conversion to GClosure failed");
+            PyErr_SetString (PyExc_RuntimeError, "PyObject conversion to GClosure failed");
             return FALSE;
         }