X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=glib%2Fgobject.meta.lisp;h=adcb9d8b319c5049a2d01460e8ab1451fbb75857;hb=140e8f22e7a58c7b1eef05124b2929e73388c5f6;hp=36599d714549148152267c9ae5ea4f48824923b9;hpb=f552247edf212838f83fa57800531fcc4a9c5df8;p=cl-gtk2.git diff --git a/glib/gobject.meta.lisp b/glib/gobject.meta.lisp index 36599d7..adcb9d8 100644 --- a/glib/gobject.meta.lisp +++ b/glib/gobject.meta.lisp @@ -19,21 +19,21 @@ (let* ((initializer-fn-ptr (foreign-symbol-pointer (gobject-class-g-type-initializer class))) (type (when initializer-fn-ptr (foreign-funcall-pointer initializer-fn-ptr nil - g-type)))) + g-type-designator)))) (if (null initializer-fn-ptr) (warn "Type initializer for class '~A' (GType '~A') is invalid: foreign symbol '~A'" (gobject-class-direct-g-type-name class) (class-name class) (gobject-class-g-type-initializer class)) (progn - (when (g-type= +g-type-invalid+ type) + (when (eq (gtype +g-type-invalid+) type) (warn "Declared GType name '~A' for class '~A' is invalid ('~A' returned 0)" (gobject-class-direct-g-type-name class) (class-name class) (gobject-class-g-type-initializer class))) - (unless (g-type= (gobject-class-direct-g-type-name class) type) + (unless (eq (gtype (gobject-class-direct-g-type-name class)) type) (warn "Declared GType name '~A' for class '~A' does not match actual GType name '~A'" (gobject-class-direct-g-type-name class) (class-name class) - (g-type-name type)))))) - (unless (g-type-from-name (gobject-class-direct-g-type-name class)) + (gtype-name type)))))) + (unless (gtype (gobject-class-direct-g-type-name class)) (warn "Declared GType name '~A' for class '~A' is invalid (g_type_name returned 0)" (gobject-class-direct-g-type-name class) (class-name class)))))