X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/4a64c16d900f59a4e6b1ac57fc8658f6faabbcfc..348f82de73817cdaaa2ef8ee45a287af492c696a:/glib/gtype.lisp

diff --git a/glib/gtype.lisp b/glib/gtype.lisp
index 2498302..0637c0b 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.40 2006-02-06 11:52:24 espen Exp $
+;; $Id: gtype.lisp,v 1.42 2006-02-06 22:58:35 espen Exp $
 
 (in-package "GLIB")
 
@@ -69,7 +69,8 @@
 (defmethod reader-function ((type (eql 'gtype)) &rest args)
   (declare (ignore type args))
   (let ((reader (reader-function 'type-number)))
-    #'(lambda (location &optional (offset 0))
+    #'(lambda (location &optional (offset 0) weak-p)
+	(declare (ignore weak-p))
 	(type-from-number (funcall reader location offset)))))
 
 
@@ -295,10 +296,17 @@
 	 (type-number
 	  (or 
 	   (find-type-number class-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))
+	   (let ((type-number
+		  (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))))
+	     (type-class-ref type-number)
+	     type-number))))
+    (when (and
+	   (supertype type-number) 
+	   (not (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))))
 
@@ -358,7 +366,8 @@
 
 (defmethod reader-function ((class ginstance-class) &rest args)
   (declare (ignore args))
-  #'(lambda (location &optional (offset 0))
+  #'(lambda (location &optional (offset 0) weak-p)
+      (declare (ignore weak-p))
       (ensure-proxy-instance class (sap-ref-sap location offset))))