Changes required by SBCL 0.9.10

[clg] / glib / gobject.lisp

diff --git a/glib/gobject.lisp b/glib/gobject.lisp
index 24104337abd2491729f7adbd123e502fe9daf63e..bf5040aa88aaed0c57c27b93fddc35b636424db5 100644 (file)
--- a/glib/gobject.lisp
+++ b/glib/gobject.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: gobject.lisp,v 1.48 2006/02/19 19:31:14 espen Exp $
+;; $Id: gobject.lisp,v 1.51 2006/03/03 10:01:01 espen Exp $
 
 (in-package "GLIB")
 
@@ -66,6 +66,7 @@ (defbinding %object-unref () nil
 (progn
   (define-callback toggle-ref-callback nil
       ((data pointer) (location pointer) (last-ref-p boolean))
+    (declare (ignore data))
     #+debug-ref-counting
     (if last-ref-p
        (format t "Object at 0x~8,'0X has no foreign references~%" (sap-int location))
@@ -74,12 +75,12 @@   (define-callback toggle-ref-callback nil
        (cache-instance (find-cached-instance location) t)
       (cache-instance (find-cached-instance location) nil)))
 
-  (defbinding %object-add-toggle-ref () pointer
+  (defbinding %object-add-toggle-ref (location) pointer
     (location pointer)
     (toggle-ref-callback callback)
     (nil null))
 
-  (defbinding %object-remove-toggle-ref () pointer
+  (defbinding %object-remove-toggle-ref (location) pointer
     (location pointer)
     (toggle-ref-callback callback)
     (nil null)))
@@ -97,7 +98,7 @@ (progn
   (define-callback weak-ref-callback nil ((data pointer) (location pointer))
     (format t "Object at 0x~8,'0X being finalized~%" (sap-int location)))
   
-  (defbinding %object-weak-ref () pointer
+  (defbinding %object-weak-ref (location) pointer
     (location pointer)
     (weak-ref-callback callback)
     (nil null)))
@@ -215,7 +216,6 @@ (defmethod shared-initialize :after ((class gobject-class) names &rest initargs)
     (setf (slot-value class 'instance-slots-p) t)))
 
 
-
 ;;;; Super class for all classes in the GObject type hierarchy
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
@@ -225,6 +225,9 @@   (defclass gobject (ginstance)
     (:metaclass gobject-class)
     (:gtype "GObject")))
 
+(define-type-method callback-from-alien-form ((type gobject) form)
+  (from-alien-form type form))
+
 #+debug-ref-counting
 (defmethod print-object ((instance gobject) stream)
   (print-unreadable-object (instance stream :type t :identity nil)
@@ -554,16 +557,17 @@ (register-derivable-type 'gobject "GObject" 'expand-gobject-type 'gobject-depend
 ;;; Pseudo type for gobject instances which have their reference count
 ;;; increased by the returning function
 
-(defmethod alien-type ((type (eql 'referenced)) &rest args)
-  (declare (ignore type args))
-  (alien-type 'gobject))
+(deftype referenced (type) type)
 
-(defmethod from-alien-form (form (type (eql 'referenced)) &rest args)
+(define-type-method alien-type ((type referenced))
   (declare (ignore type))
-  (destructuring-bind (type) args
+  (alien-type 'gobject))
+
+(define-type-method from-alien-form ((type referenced) form)
+  (let ((class (second (type-expand-to 'referenced type))))
     (if (subtypep type 'gobject)
        (let ((instance (make-symbol "INSTANCE")))
-         `(let ((,instance ,(from-alien-form form type)))
+         `(let ((,instance ,(from-alien-form class form)))
             (when ,instance
               (%object-unref (foreign-location ,instance)))
             ,instance))