X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/92a07e637d009189bcadeae5d1ef9e9634c8d9ec..6497583aa07c62a5cfc5b9149f2e0ae813b596a4:/glib/gtype.lisp

diff --git a/glib/gtype.lisp b/glib/gtype.lisp
index 783a6a7..6b9d31e 100644
--- a/glib/gtype.lisp
+++ b/glib/gtype.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: gtype.lisp,v 1.35 2006-02-01 17:46:11 espen Exp $
+;; $Id: gtype.lisp,v 1.37 2006-02-02 17:56:09 espen Exp $
 
 (in-package "GLIB")
 
@@ -171,7 +171,7 @@
 	type
       (let ((name (find-foreign-type-name type-number)))
 	(cond
-	 ((and name (type-number-from-glib-name name nil))
+	 ((and name (not (= (type-number-from-glib-name name nil) type-number)))
 	  ;; This is a hack because GdkEvent seems to be registered
 	  ;; multiple times
 	  (type-from-number (type-number-from-glib-name name)))
@@ -279,19 +279,22 @@
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (defclass ginstance-class (proxy-class)
-    ()))
+    ((gtype :initarg :gtype :initform nil :reader ginstance-class-gtype))))
 
 
-(defmethod shared-initialize :after ((class ginstance-class) names &key name gtype)
-  (let* ((class-name (or name (class-name class)))
+(defmethod finalize-inheritance ((class ginstance-class))
+  (call-next-method)
+  (let* ((class-name (class-name class))
 	 (super (most-specific-proxy-superclass class))
-	 (foreign-name (or (first gtype) (default-type-init-name class-name)))
-	 (type-number 
+	 (gtype (or 
+		 (first (ginstance-class-gtype class))
+		 (default-alien-type-name class-name)))
+	 (type-number
 	  (or 
 	   (find-type-number class-name)
-	   (if (type-number-from-glib-name foreign-name nil)
-	       (register-type class-name foreign-name)
-	     (register-new-type class-name (class-name super) foreign-name)))))
+	   (if (or (symbolp gtype) (type-number-from-glib-name gtype nil))
+	       (register-type class-name gtype)
+	     (register-new-type class-name (class-name super) gtype)))))
     (unless (eq (class-name super) (supertype type-number))
       (warn "~A is the super type for ~A in the gobject type system."
        (supertype type-number) class-name))