X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/fb278f4f10350ad92eba1b06100a70f0ebb50914..6c55b6c45a4096e7ecc359184d345206c9462639:/glib/gcallback.lisp diff --git a/glib/gcallback.lisp b/glib/gcallback.lisp index 14ac0fb..b872c4a 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.7 2002-03-24 12:52:11 espen Exp $ +;; $Id: gcallback.lisp,v 1.8 2002-03-24 15:43:16 espen Exp $ (in-package "GLIB") @@ -159,18 +159,13 @@ (defbinding signal-handler-disconnect () nil (handler unsigned-int)) -(defmethod signal-connect ((gobject gobject) signal function &rest args &key after object) - (declare (ignore signal args after)) - (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) - (declare (ignore object)) - (let ((callback-id (make-callback-closure (call-next-method)))) +(defmethod signal-connect ((gobject gobject) signal function &key after object) + (let ((callback-id + (make-callback-closure + (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)))))))) (signal-connect-closure gobject signal callback-id :after after)))