From d70890e5cb90f0e63c40acf584c4734111c6048c Mon Sep 17 00:00:00 2001 Message-Id: From: Mark Wooding Date: Sun, 21 Oct 2001 21:58:44 +0000 Subject: [PATCH] Made SIGNAL-CONNECT a generic function Organization: Straylight/Edgeware From: espen --- glib/gcallback.lisp | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/glib/gcallback.lisp b/glib/gcallback.lisp index bf89435..928b2df 100644 --- a/glib/gcallback.lisp +++ b/glib/gcallback.lisp @@ -15,7 +15,7 @@ ;; License along with this library; if not, write to the Free Software ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -;; $Id: gcallback.lisp,v 1.3 2001/05/11 16:08:52 espen Exp $ +;; $Id: gcallback.lisp,v 1.4 2001/10/21 21:58:44 espen Exp $ (in-package "GLIB") @@ -50,7 +50,7 @@ (defun callback-trampoline (callback-id params return-value) (labels ((invoke-callback () (restart-case (unwind-protect - (let ((result (apply callback-function args))) + (let ((result (apply callback-function (reverse args)))) (when return-type (gvalue-set return-value result)))) @@ -137,14 +137,16 @@ (defbinding signal-handler-disconnect () nil (handler unsigned-int)) -(defun signal-connect (instance signal function &key after object) - (let ((callback - (cond - ((or (eq object t) (eq object instance)) function) - ((not object) - #'(lambda (&rest args) (apply function (cdr args)))) - (t - #'(lambda (&rest args) (apply function object (rest args))))))) - - (signal-connect-closure - instance signal (register-callback-function callback) :after after))) +(defmethod signal-connect ((gobject gobject) signal function &rest args &key after object) + (cond + ((or (eq object t) (eq object gobject)) function) + ((not object) + #'(lambda (&rest args) (apply function (cdr args)))) + (t + #'(lambda (&rest args) (apply function object (rest args)))))) + + +(defmethod signal-connect :around ((gobject gobject) signal function + &key after object) + (let ((callback-id (register-callback-function (call-next-method)))) + (signal-connect-closure gobject signal callback-id :after after))) -- [mdw]