-(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 &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)))