From 34c336c496a5eb1ef2ed5517963eae2982075d6c Mon Sep 17 00:00:00 2001 From: espen Date: Mon, 25 Jun 2007 13:49:05 +0000 Subject: [PATCH] Added args to INVOKE-SOURCE-CALLBACK --- glib/gcallback.lisp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/glib/gcallback.lisp b/glib/gcallback.lisp index 0f7baf2..9e2c8fc 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.44 2007-06-20 10:21:54 espen Exp $ +;; $Id: gcallback.lisp,v 1.45 2007-06-25 13:49:05 espen Exp $ (in-package "GLIB") @@ -121,14 +121,14 @@ (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)) +(defun invoke-source-callback (callback-id &rest args) + (restart-case (apply (find-user-data callback-id) args) (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)))) + (apply #'invoke-source-callback callback-id args)))) (defbinding (timeout-add "g_timeout_add_full") -- 2.11.0