X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/b7c49e0c03879ad0af9fcfd0910357290f32d35a..0aef7aaac0868dce7a5d3acc38824600943c235b:/glib/gcallback.lisp

diff --git a/glib/gcallback.lisp b/glib/gcallback.lisp
index 79d3413..0f7baf2 100644
--- a/glib/gcallback.lisp
+++ b/glib/gcallback.lisp
@@ -20,7 +20,7 @@
 ;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 ;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-;; $Id: gcallback.lisp,v 1.42 2007-05-10 20:25:09 espen Exp $
+;; $Id: gcallback.lisp,v 1.44 2007-06-20 10:21:54 espen Exp $
 
 (in-package "GLIB")
 
@@ -87,7 +87,7 @@
     (signal-handler-block instance handler-id)
     (unwind-protect
 	(restart-case (apply #'invoke-callback callback-id nil args)
-	  (abort () :report "Disconnect and exit signal handler"
+	  (disconnect () :report "Disconnect and exit signal handler"
 	    (when (signal-handler-is-connected-p instance handler-id)
 	      (signal-handler-disconnect instance handler-id))
 	    (values nil t))))
@@ -118,8 +118,18 @@
 (defbinding source-remove () boolean
   (tag unsigned-int))
 
-(define-callback source-callback-marshal nil ((callback-id unsigned-int))
-  (callback-trampoline #'invoke-callback callback-id 0 nil))
+(define-callback source-callback-marshal boolean ((callback-id unsigned-int))
+  (invoke-source-callback callback-id))
+
+(defun invoke-source-callback (callback-id)
+  (restart-case (funcall (find-user-data callback-id))
+    (remove () :report "Exit and remove source callback"
+      nil)
+    (continue () :report "Return from source callback"
+      t)
+    (re-invoke nil :report "Re-invoke source callback"
+      (invoke-source-callback callback-id))))
+
 
 (defbinding (timeout-add "g_timeout_add_full")
     (interval function &optional (priority +priority-default+)) unsigned-int 
@@ -473,7 +483,7 @@ function."
 	   (params (allocate-memory (* n-params +gvalue-size+))))
       #'(lambda (detail object &rest args)
  	  (unless (= (length args) (1- n-params))
- 	    (error "Invalid number of arguments: ~A" (+ 2 (length args))))
+ 	    (error "Invalid number of arguments in emmision of signal ~A: ~A" signal-id (length args)))
 	  (unwind-protect
 	      (loop
 	       for arg in (cons object args)