X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/b4a94e209931fdae387a11090159e96e42417fee..46e84256e0168f49ac84c3460bf9486e6bdfe001:/glib/gerror.lisp

diff --git a/glib/gerror.lisp b/glib/gerror.lisp
index c8cbd23..5e0f56d 100644
--- a/glib/gerror.lisp
+++ b/glib/gerror.lisp
@@ -20,7 +20,7 @@
 ;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 ;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-;; $Id: gerror.lisp,v 1.3 2006-02-13 20:03:29 espen Exp $
+;; $Id: gerror.lisp,v 1.5 2006-02-26 15:30:01 espen Exp $
 
 
 (in-package "GLIB")
@@ -67,9 +67,9 @@
 
 (deftype gerror-signal () 'gerror)
 
-(defmethod from-alien-form (gerror (type (eql 'gerror-signal)) &rest args)
-  (declare (ignore type args))
-  `(let ((gerror ,(from-alien-form gerror 'gerror)))
+(define-type-method from-alien-form ((type gerror-signal) gerror)
+  (declare (ignore type))
+  `(let ((gerror ,(from-alien-form 'gerror gerror)))
      (when gerror
        (signal-gerror gerror))))
 
@@ -115,10 +115,8 @@
 
 (defparameter *fatal-log-levels* '(error-log-level critical-log-level))
 
-(defcallback log-handler (nil 
-			   (domain (copy-of string))
-			   (log-level log-levels)
-			   (message (copy-of string)))
+(define-callback log-handler nil 
+    ((domain string) (log-level log-levels) (message string))
   (let ((fatal-p (or
 		  (find :fatal log-level)
 		  (some 
@@ -132,7 +130,8 @@
     (funcall (if fatal-p #'error #'warn) condition
      :domain domain :message message)))
 
-(setf (extern-alien "log_handler" system-area-pointer) (callback log-handler))
+(setf (extern-alien "log_handler" system-area-pointer) 
+ (callback-address log-handler))
 
 
 #+glib2.6
@@ -143,6 +142,6 @@
   ;; abort (SIGABORT being signaled). To make things even worse, SBCL
   ;; doesn't handle SIGABRT at all.
   (defbinding %log-set-default-handler () pointer
-    ((callback log-handler) pointer)
+    ((progn log-handler) callback)
     (nil null))
   (%log-set-default-handler))