X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=glib%2Fgobject.ffi.lisp;h=cb745284483d417c73ad34aa75f8a1de17bcc04a;hb=96aa7293addaacdfe29ce32e60e2feac7df6ffce;hp=319939d7edb42941f05ed59fbf852556eb4961c5;hpb=ddaa0292b675c0336e20dfcca1ce3c7dcfc8ccee;p=cl-gtk2.git

diff --git a/glib/gobject.ffi.lisp b/glib/gobject.ffi.lisp
index 319939d..cb74528 100644
--- a/glib/gobject.ffi.lisp
+++ b/glib/gobject.ffi.lisp
@@ -18,34 +18,6 @@ Example:
 
 (at-init () (%g-type-init))
 
-(defcfun (g-type-name "g_type_name") :string
-  "Returns the name of a GType.@see{g-type-from-name}
-
-Example:
-@pre{
-\(g-type-from-name \"GtkLabel\")
-=> 7151952
-\(g-type-name 7151952)
-=> \"GtkLabel\"
-}
-@arg[type]{GType designator (see @class{g-type-designator})}
-@return{a string}"
-  (type g-type-designator))
-
-(defcfun (g-type-from-name "g_type_from_name") g-type
-  "Returns the numeric identifier of a GType by its name. @see{g-type-name}
-
-Example:
-@pre{
-\(g-type-from-name \"GtkLabel\")
-=> 7151952
-\(g-type-name 7151952)
-=> \"GtkLabel\"
-}
-@arg[name]{a string - name of GType}
-@return{an integer}"
-  (name :string))
-
 (defcfun g-type-parent g-type-designator
   "Returns the parent of a GType. @see{g-type-chilren}
 
@@ -125,11 +97,11 @@ Example:
   (n-interfaces (:pointer :uint)))
 
 (defcstruct g-type-interface
-  (:type g-type)
-  (:instance-type g-type))
+  (:type g-type-designator)
+  (:instance-type g-type-designator))
 
 (defcstruct g-type-class
-  (:type g-type))
+  (:type g-type-designator))
 
 (defcstruct g-type-instance
   (:class (:pointer g-type-class)))
@@ -147,7 +119,7 @@ Example:
   (:value-table :pointer))
 
 (defcstruct g-type-query
-  (:type g-type)
+  (:type g-type-designator)
   (:type-name (:string :free-from-foreign nil))
   (:class-size :uint)
   (:instance-size :uint))
@@ -214,8 +186,8 @@ Example:
   (:type-instance g-type-instance)
   (:name (:string :free-from-foreign nil :free-to-foreign nil))
   (:flags g-param-flags)
-  (:value-type g-type)
-  (:owner-type g-type))
+  (:value-type g-type-designator)
+  (:owner-type g-type-designator))
 
 (defcunion g-value-data
   (:int :int)
@@ -229,7 +201,7 @@ Example:
   (:pointer :pointer))
 
 (defcstruct g-value
-  (:type g-type)
+  (:type g-type-designator)
   (:data g-value-data :count 2))
 
 (defcstruct g-object-construct-param
@@ -366,11 +338,11 @@ Example:
 
 (defcstruct g-param-spec-g-type
   (:parent-instance g-param-spec)
-  (:types-root g-type))
+  (:types-root g-type-designator))
 
 (defcstruct g-param-spec-class
   (:type-class g-type-class)
-  (:value-type g-type)
+  (:value-type g-type-designator)
   (:finalize :pointer)
   (:value-set-default :pointer)
   (:value-validate :pointer)
@@ -956,7 +928,7 @@ Example:
 
 (defcfun g-signal-lookup :uint
   (name :string)
-  (type g-type))
+  (type g-type-designator))
 
 (defbitfield g-signal-flags
   :run-first :run-last :run-cleanup :no-recurse :detailed :action :no-hooks)
@@ -964,19 +936,26 @@ Example:
 (defcstruct g-signal-query
   (:signal-id :uint)
   (:signal-name :string)
-  (:owner-type g-type)
+  (:owner-type g-type-designator)
   (:signal-flags g-signal-flags)
-  (:return-type g-type)
+  (:return-type (g-type-designator :mangled-p t))
   (:n-params :uint)
-  (:param-types (:pointer g-type)))
+  (:param-types (:pointer (g-type-designator :mangled-p t))))
 
 (defcfun g-signal-query :void
   (signal-id :uint)
   (query (:pointer g-signal-query)))
 
-(defcstruct lisp-closure
-  (:parent-instance g-closure)
-  (:function-id :pointer))
+(defcfun g-signal-list-ids (:pointer :uint)
+  (type g-type-designator)
+  (n-ids (:pointer :uint)))
+
+(defcfun g-signal-parse-name :boolean
+  (detailed-signal :string)
+  (owner-type g-type-designator)
+  (signal-id-ptr (:pointer :uint))
+  (detail-ptr (:pointer g-quark))
+  (force-detail-quark :boolean))
 
 (defcstruct g-object-struct
   (:type-instance g-type-instance)