X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/ad24278b30e474c5551a1d0443f5af17f2a0efee..f267f9a3332b27b33fa1b7fe3fc1736dfadc9612:/glib/gcallback.lisp

diff --git a/glib/gcallback.lisp b/glib/gcallback.lisp
index bedf0d4..27f6fbc 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.9 2004/10/27 14:58:59 espen Exp $
 
 (in-package "GLIB")
 
@@ -54,7 +54,7 @@
 		   (unwind-protect
 		       (let ((result (apply callback-function (reverse args))))
 			 (when return-type
-			   (gvalue-set (print return-value) result))))
+			   (gvalue-set return-value result))))
 		
 		 (continue nil :report "Return from callback function"
 		  (when return-type
@@ -159,18 +159,18 @@
   (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)
+"Connects a callback function to a signal for a particular object. If :OBJECT 
+ is T, the object connected to is passed as the first argument to the callback 
+ function, or if :OBJECT is any other non NIL value, it is passed as the first 
+ argument instead. If :AFTER is non NIL, the handler will be called after the 
+ default handler of the signal."
+  (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)))