X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=glib%2Fgobject.package.lisp;h=64e87648d8253e83b3993459ca63c41d9a68556c;hb=7bca05f5d857c03b74eafd7c0c85495dfe3330ff;hp=8299b0289e0800548850a664e31da8253a972b1f;hpb=0ce3b369dfbc04edeffdc8f0d2d85ccffcc467ec;p=cl-gtk2.git

diff --git a/glib/gobject.package.lisp b/glib/gobject.package.lisp
index 8299b02..64e8764 100644
--- a/glib/gobject.package.lisp
+++ b/glib/gobject.package.lisp
@@ -1,9 +1,9 @@
 (defpackage :gobject
-  (:use :cl :glib :cffi :tg :bordeaux-threads :iter :closer-mop :gobject.ffi)
-  #+(or clozure-common-lisp openmcl) (:shadowing-import-from :closer-mop #:defgeneric #:ensure-generic-function #:standard-generic-function)
+  (:use :c2cl :glib :cffi :tg :bordeaux-threads :iter :closer-mop :gobject.ffi)
   (:export #:g-type
-           #:g-type-string
-           #:g-type-numeric
+           #:gtype
+           #:gtype-name
+           #:gtype-id
            #:g-type-children
            #:g-type-parent
            #:g-type-designator
@@ -72,8 +72,6 @@
            #:g-object
            #:pointer
            #:g-type-from-object
-           #:g-type-name
-           #:g-type-from-name
            #:g-signal-connect
            #:define-g-object-class
            #:g-initially-unowned
@@ -126,7 +124,6 @@
            #:g-type-interfaces
            #:g-type-interface-prerequisites
            #:g-type-name
-           #:g-type-from-name
            #:g-type
            #:g-type-children
            #:g-type-parent