C callbacks cleaned up and ported to new API

[clg] / glib / gerror.lisp

diff --git a/glib/gerror.lisp b/glib/gerror.lisp
index 08e66a5e56e475cd6fc621d169c2c5722f09be72..05bf4b56672b109eb97c4e95f90d77af5102192f 100644 (file)
--- a/glib/gerror.lisp
+++ b/glib/gerror.lisp
@@ -1,21 +1,26 @@
 ;; Common Lisp bindings for GTK+ v2.0
-;; Copyright (C) 2005 Espen S. Johnsen <espen@users.sf.net>
+;; Copyright 2005 Espen S. Johnsen <espen@users.sf.net>
 ;;
-;; This library is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU Lesser General Public
-;; License as published by the Free Software Foundation; either
-;; version 2 of the License, or (at your option) any later version.
+;; Permission is hereby granted, free of charge, to any person obtaining
+;; a copy of this software and associated documentation files (the
+;; "Software"), to deal in the Software without restriction, including
+;; without limitation the rights to use, copy, modify, merge, publish,
+;; distribute, sublicense, and/or sell copies of the Software, and to
+;; permit persons to whom the Software is furnished to do so, subject to
+;; the following conditions:
 ;;
-;; This library is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;; Lesser General Public License for more details.
+;; The above copyright notice and this permission notice shall be
+;; included in all copies or substantial portions of the Software.
 ;;
-;; You should have received a copy of the GNU Lesser General Public
-;; License along with this library; if not, write to the Free Software
-;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+;; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+;; EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+;; MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+;; IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+;; CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+;; 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.1 2005/02/14 00:39:39 espen Exp $
+;; $Id: gerror.lisp,v 1.4 2006/02/19 19:31:14 espen Exp $
 
 
 (in-package "GLIB")
@@ -60,6 +65,15 @@ (defun signal-gerror (gerror)
     (error condition :code (gerror-code gerror) :message (gerror-message gerror))))
 
 
+(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)))
+     (when gerror
+       (signal-gerror gerror))))
+
+ 
 ;;; Message logging
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
@@ -101,10 +115,8 @@ (define-condition debug-log-level (log-level)
 
 (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 
@@ -118,7 +130,8 @@ (defcallback log-handler (nil
     (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
@@ -129,6 +142,6 @@ (progn
   ;; 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))