X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/112ac1d33aa8f9b7f3d2f9542d15431f152b1d35..58ed74395e06d538219f88da13268408be35f8f8:/glib/ginterface.lisp

diff --git a/glib/ginterface.lisp b/glib/ginterface.lisp
index 00fe5fb..4ec9dd7 100644
--- a/glib/ginterface.lisp
+++ b/glib/ginterface.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: ginterface.lisp,v 1.12 2005-04-23 16:48:50 espen Exp $
+;; $Id: ginterface.lisp,v 1.16 2006-02-28 00:11:24 espen Exp $
 
 (in-package "GLIB")
 
@@ -48,27 +48,26 @@
     (t (call-next-method))))
 
 (defmethod compute-effective-slot-definition-initargs ((class ginterface-class) direct-slotds)
-  (if (eq (most-specific-slot-value direct-slotds 'allocation) :property)
+  (if (eq (slot-definition-allocation (first direct-slotds)) :property)
       (nconc 
        (list :pname (signal-name-to-string 
 		     (most-specific-slot-value direct-slotds 'pname))
 	     :readable (most-specific-slot-value direct-slotds 'readable)
 	     :writable (most-specific-slot-value direct-slotds 'writable)
-	     :construct (most-specific-slot-value direct-slotds 'construct))
+	     :construct-only (most-specific-slot-value direct-slotds 'construct))
        (call-next-method))
     (call-next-method)))
 
 
 (defmethod shared-initialize ((class ginterface-class) names &key name gtype)
   (declare (ignore names))
-  (let* ((class-name (or name (class-name class)))
+  (let* ((class-name (or name (class-name class)))	 
 	 (type-number
 	  (or
 	   (find-type-number class-name)
 	   (register-type class-name 
 	    (or (first gtype) (default-type-init-name class-name))))))
-;    (type-default-interface-ref type-number)
-    )
+    (type-default-interface-ref type-number))
   (call-next-method))
 
 
@@ -76,40 +75,40 @@
   (subtypep (class-name super) 'ginterface))
 
 
-(defmethod alien-type ((class ginterface-class) &rest args)
-  (declare (ignore class args))
+(define-type-method alien-type ((type ginterface))
+  (declare (ignore type))
   (alien-type 'gobject))
 
-(defmethod size-of ((class ginterface-class) &rest args)
-  (declare (ignore class args))
+(define-type-method size-of ((type ginterface))
+  (declare (ignore type))
   (size-of 'gobject))
 
-(defmethod from-alien-form (location (class ginterface-class) &rest args)
-  (declare (ignore class args))
-  (from-alien-form location 'gobject))
+(define-type-method from-alien-form ((type ginterface) location)
+  (declare (ignore type))
+  (from-alien-form 'gobject location))
 
-(defmethod from-alien-function ((class ginterface-class) &rest args)
-  (declare (ignore class args))
+(define-type-method from-alien-function ((type ginterface))
+  (declare (ignore type))
   (from-alien-function 'gobject))
 
-(defmethod to-alien-form (instance (class ginterface-class) &rest args)
-  (declare (ignore class args))
-  (to-alien-form instance 'gobject))
+(define-type-method to-alien-form ((type ginterface) instance)
+  (declare (ignore type))
+  (to-alien-form 'gobject instance))
 
-(defmethod to-alien-function ((class ginterface-class) &rest args)
-  (declare (ignore class args))
+(define-type-method to-alien-function ((type ginterface))
+  (declare (ignore type))
   (to-alien-function 'gobject))
 
-(defmethod reader-function ((class ginterface-class) &rest args)
-  (declare (ignore class args))
+(define-type-method reader-function ((type ginterface))
+  (declare (ignore type))
   (reader-function 'gobject))
 
-(defmethod writer-function ((class ginterface-class) &rest args)
-  (declare (ignore class args))
+(define-type-method writer-function ((type ginterface))
+  (declare (ignore type))
   (writer-function 'gobject))
 
-(defmethod destroy-function ((class ginterface-class) &rest args)
-  (declare (ignore class args))
+(define-type-method destroy-function ((type ginterface))
+  (declare (ignore type))
   (destroy-function 'gobject))
 
 
@@ -119,8 +118,8 @@
 (defbinding type-default-interface-ref (type) pointer
   ((find-type-number type t) type-number))
 
-(defbinding type-default-interface-unref (type) nil
-  ((find-type-number type t) type-number))
+(defbinding type-default-interface-unref () nil
+  (iface pointer))
 
 (defbinding type-default-interface-peek (type) pointer
   ((find-type-number type t) type-number))
@@ -139,8 +138,7 @@
 	     (unwind-protect
 		 (%map-params array length type-number inherited-p)
 	       (deallocate-memory array))))
-;      (type-default-interface-unref type-number)
-      )))
+      (type-default-interface-unref iface))))
 
 
 (defun expand-ginterface-type (type forward-p options &rest args)