X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/dfa4f31424800fdb6fb63514121b9cc893269276..73383a9efec7360f61b9ef544fdba3db61b2dd10:/glib/ginterface.lisp diff --git a/glib/ginterface.lisp b/glib/ginterface.lisp index b9a42b5..81b5cb4 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.9 2005-03-06 17:26:23 espen Exp $ +;; $Id: ginterface.lisp,v 1.11 2005-03-11 19:13:05 espen Exp $ (in-package "GLIB") @@ -56,10 +56,14 @@ (defmethod compute-effective-slot-definition-initargs ((class ginterface-class) (defmethod shared-initialize ((class ginterface-class) names &key name gtype) (declare (ignore names)) - (let ((class-name (or name (class-name class)))) - (unless (find-type-number class-name) - (register-type class-name - (or (first gtype) (default-type-init-name class-name))))) + (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) + ) (call-next-method)) @@ -142,7 +146,7 @@ (defun expand-ginterface-type (type forward-p options &rest args) ,(unless forward-p (slot-definitions class (query-object-interface-properties type) slots)) (:metaclass ginterface-class) - (:gtype ,(find-type-init-function type))))) + (:gtype ,(register-type-as type))))) (defun ginterface-dependencies (type) (delete-duplicates