glib/gobject.meta: remove slot initargs before call-next-method in make-instance

[cl-gtk2.git] / glib / gobject.foreign-closures.lisp

diff --git a/glib/gobject.foreign-closures.lisp b/glib/gobject.foreign-closures.lisp
index bed6d45..1f87c70 100644 (file)
--- a/glib/gobject.foreign-closures.lisp
+++ b/glib/gobject.foreign-closures.lisp
@@ -9,6 +9,11 @@
   (declare (ignore data))
   (finalize-lisp-closure closure))
 
+(defun call-with-restarts (fn args)
+  (restart-case
+      (apply fn args)
+    (return-from-g-closure (&optional v) :report "Return value from closure" v)))
+
 (defcallback lisp-closure-marshal :void ((closure (:pointer lisp-closure))
                                          (return-value (:pointer g-value))
                                          (count-of-args :uint)
@@ -21,9 +26,9 @@
          (return-type (and (not (null-pointer-p return-value))
                            (gvalue-type return-value)))
          (fn (get-stable-pointer-value function-id))
-         (fn-result (apply fn args)))
+         (fn-result (call-with-restarts fn args)))
     (when return-type
-      (set-g-value return-value fn-result return-type))))
+      (set-g-value return-value fn-result return-type :g-value-init nil))))
 
 (defun parse-closure-arguments (count-of-args args)
   (loop