From: espen <espen>
Date: Mon, 25 Jun 2007 13:49:05 +0000 (+0000)
Subject: Added args to INVOKE-SOURCE-CALLBACK
X-Git-Tag: clg-0-93~110
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/commitdiff_plain/fd9bf5a683fbe4b6df1e6a36b0a30d434599a628

Added args to INVOKE-SOURCE-CALLBACK
---

diff --git a/glib/gcallback.lisp b/glib/gcallback.lisp
index a60b6e9..65b7783 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 @@ (defbinding source-remove () boolean
 (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")