X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/21299acfbcc5b6ae8e0a7bc2a26c7f55bdfbcb0b..c046c2f653233b4e09830f672159ae205f59c6f6:/glib/ginterface.lisp?ds=sidebyside

diff --git a/glib/ginterface.lisp b/glib/ginterface.lisp
index dcf74c6..64cc0b6 100644
--- a/glib/ginterface.lisp
+++ b/glib/ginterface.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: ginterface.lisp,v 1.8 2005-02-10 00:20:02 espen Exp $
+;; $Id: ginterface.lisp,v 1.10 2005-03-11 10:56:58 espen Exp $
 
 (in-package "GLIB")
 
@@ -54,14 +54,15 @@
     (call-next-method)))
 
 
-(defmethod shared-initialize ((class ginterface-class) names
-			      &rest initargs &key name alien-name)
-  (declare (ignore initargs names))
+(defmethod shared-initialize ((class ginterface-class) names &key name gtype)
+  (declare (ignore names))
   (let* ((class-name (or name (class-name class)))
 	 (type-number
-	  (find-type-number
-	   (or (first alien-name) (default-alien-type-name class-name)) t)))
-    (register-type class-name 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))
   (call-next-method))
 
 
@@ -144,7 +145,7 @@
        ,(unless forward-p
 	  (slot-definitions class (query-object-interface-properties type) slots))
       (:metaclass ginterface-class)
-      (:alien-name ,(find-type-name type)))))
+      (:gtype ,(register-type-as type)))))
 
 (defun ginterface-dependencies (type)
   (delete-duplicates