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

diff --git a/glib/gcallback.lisp b/glib/gcallback.lisp
index 14ac0fb..28acd48 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.10 2004-10-30 19:26:02 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
@@ -68,16 +68,6 @@
 		  (invoke-callback)))))
       (invoke-callback))))
 
-(defun after-gc-hook ()
-  (setf
-   (extern-alien "callback_trampoline" system-area-pointer)
-   (make-pointer (kernel:get-lisp-obj-address #'callback-trampoline))
-   (extern-alien "destroy_user_data" system-area-pointer)
-   (make-pointer (kernel:get-lisp-obj-address #'destroy-user-data))))
-
-(pushnew 'after-gc-hook ext:*after-gc-hooks*)
-(after-gc-hook)
-
 
 ;;;; Timeouts and idle functions
 
@@ -159,18 +149,41 @@
   (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 ((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)))
 
 
-(defmethod signal-connect :around ((gobject gobject) signal function
-				   &key after object)
-  (declare (ignore object))
-  (let ((callback-id (make-callback-closure (call-next-method))))
-    (signal-connect-closure gobject signal callback-id :after after)))
+;;; Message logging
+
+;; TODO: define and signal conditions based on log-level
+(defun log-handler (domain log-level message)
+  (declare (ignore log-level))
+  (error "~A: ~A" domain message))
+
+
+;;;
+
+(defun after-gc-hook ()
+  (setf
+   (extern-alien "callback_trampoline" system-area-pointer)
+   (make-pointer (kernel:get-lisp-obj-address #'callback-trampoline))
+   (extern-alien "destroy_user_data" system-area-pointer)
+   (make-pointer (kernel:get-lisp-obj-address #'destroy-user-data))
+   (extern-alien "log_handler" system-area-pointer)
+   (make-pointer (kernel:get-lisp-obj-address #'log-handler))))
+
+(pushnew 'after-gc-hook ext:*after-gc-hooks*)
+(after-gc-hook)