X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=glib%2Fgobject.meta.lisp;h=e4fc5e3d8b8e1ed8b2710460a77f314a18f9f41d;hb=eee03aae86b30336ec34b468624e07adf2592b5e;hp=abeb0813c7a3cc62f018ad31482e3df3089a9fd9;hpb=6029c9c40cbafb85a4c8cfd07af8c7ca6b9b57fd;p=cl-gtk2.git

diff --git a/glib/gobject.meta.lisp b/glib/gobject.meta.lisp
index abeb081..e4fc5e3 100644
--- a/glib/gobject.meta.lisp
+++ b/glib/gobject.meta.lisp
@@ -22,12 +22,11 @@
             (warn "Type initializer for class '~A' (GType '~A') is invalid: foreign symbol '~A'"
                   (gobject-class-g-type-name class) (class-name class) (gobject-class-g-type-initializer class))
             (progn
-              (when (= +g-type-invalid+ type)
+              (when (g-type= +g-type-invalid+ type)
                 (warn "Declared GType name '~A' for class '~A' is invalid ('~A' returned 0)"
                       (gobject-class-g-type-name class) (class-name class)
                       (gobject-class-g-type-initializer class)))
-              (unless (string= (gobject-class-g-type-name class)
-                               (g-type-name type))
+              (unless (g-type= (gobject-class-g-type-name class) type)
                 (warn "Declared GType name '~A' for class '~A' does not match actual GType name '~A'"
                       (gobject-class-g-type-name class)
                       (class-name class)
@@ -207,7 +206,7 @@
 
 (defmethod slot-boundp-using-class ((class gobject-class) object (slot gobject-property-effective-slot-definition))
   (handler-case
-      (progn (g-object-property-type object (gobject-property-effective-slot-definition-g-property-name slot) :assert-readable t) t)
+      (progn (g-object-property-type (pointer object) (gobject-property-effective-slot-definition-g-property-name slot) :assert-readable t) t)
     (property-unreadable-error () nil)))
 
 (defmethod slot-value-using-class ((class gobject-class) object (slot gobject-property-effective-slot-definition))
@@ -221,10 +220,12 @@
                               new-value
                               (gobject-effective-slot-definition-g-property-type slot)))
 
+(defmethod slot-boundp-using-class ((class gobject-class) object (slot gobject-fn-effective-slot-definition))
+  (not (null (gobject-fn-effective-slot-definition-g-getter-fn slot))))
+
 (defmethod slot-value-using-class ((class gobject-class) object (slot gobject-fn-effective-slot-definition))
   (let ((fn (gobject-fn-effective-slot-definition-g-getter-fn slot)))
-    (when fn
-      (funcall fn object))))
+    (funcall fn object)))
 
 (defmethod (setf slot-value-using-class) (new-value (class gobject-class) object (slot gobject-fn-effective-slot-definition))
   (funcall (gobject-fn-effective-slot-definition-g-setter-fn slot) object new-value))