gir-repository r18 - in trunk: . gir



Author: johan
Date: Wed Aug 13 21:27:11 2008
New Revision: 18
URL: http://svn.gnome.org/viewvc/gir-repository?rev=18&view=rev

Log:
2008-08-13  Johan Dahlin  <johan gnome org>

    * gir/Makefile.am:
    * gir/glib-2.0.gir:
    * gir/gobject-2.0.gir:
    Regenerate



Modified:
   trunk/ChangeLog
   trunk/gir/Makefile.am
   trunk/gir/glib-2.0.gir
   trunk/gir/gobject-2.0.gir

Modified: trunk/gir/Makefile.am
==============================================================================
--- trunk/gir/Makefile.am	(original)
+++ trunk/gir/Makefile.am	Wed Aug 13 21:27:11 2008
@@ -14,14 +14,15 @@
 GIRSOURCES += glib-2.0.gir
 
 # gobject
+GOBJECT_LIBDIR=`pkg-config --variable=libdir gobject-2.0`
 gobject-2.0.gir:
 	$(G_IR_SCANNER) -v --namespace GObject \
 	    --output $@ \
 	    --strip-prefix=g \
             --include=glib-2.0.gir \
 	    -I$(GLIB_INCLUDEDIR) \
-		-I$(GLIB_LIBDIR)/glib-2.0/include \
-		-DGOBJECT_COMPILATION \
+	    -I$(GLIB_LIBDIR)/glib-2.0/include \
+	    -DGOBJECT_COMPILATION \
             --pkg glib-2.0 \
 	    $(GLIB_INCLUDEDIR)/gobject/*.h
 GIRSOURCES += gobject-2.0.gir

Modified: trunk/gir/glib-2.0.gir
==============================================================================
--- trunk/gir/glib-2.0.gir	(original)
+++ trunk/gir/glib-2.0.gir	Wed Aug 13 21:27:11 2008
@@ -3,6 +3,26 @@
             xmlns:c="http://www.gtk.org/introspection/c/1.0";
             xmlns:glib="http://www.gtk.org/introspection/glib/1.0";>
   <namespace name="GLib">
+    <alias name="gchar" target="char"/>
+    <alias name="gshort" target="short"/>
+    <alias name="glong" target="long"/>
+    <alias name="gint" target="int"/>
+    <alias name="gboolean" target="gint"/>
+    <alias name="guchar" target="unsigned"/>
+    <alias name="gushort" target="unsigned"/>
+    <alias name="gulong" target="unsigned"/>
+    <alias name="guint" target="unsigned"/>
+    <alias name="gfloat" target="float"/>
+    <alias name="gdouble" target="double"/>
+    <alias name="GDoubleIEEE754" target="_GDoubleIEEE754"/>
+    <alias name="GFloatIEEE754" target="_GFloatIEEE754"/>
+    <alias name="GQuark" target="guint32"/>
+    <alias name="GTime" target="gint32"/>
+    <alias name="GDateYear" target="guint16"/>
+    <alias name="GDateDay" target="guint8"/>
+    <alias name="gunichar" target="guint32"/>
+    <alias name="gunichar2" target="guint16"/>
+    <alias name="GTokenValue" target="_GTokenValue"/>
     <callback name="GCompareFunc">
       <return-value>
         <type name="int32" c:type="gint"/>
@@ -139,7 +159,7 @@
     </record>
     <record name="GByteArray" c:type="_GByteArray">
       <field name="data">
-        <type name="guint8*" c:type="guint8*"/>
+        <type name="guint8" c:type="guint8*"/>
       </field>
       <field name="len">
         <type name="uint32" c:type="guint"/>
@@ -147,7 +167,7 @@
     </record>
     <record name="GPtrArray" c:type="_GPtrArray">
       <field name="pdata">
-        <type name="gpointer*" c:type="gpointer*"/>
+        <type name="gpointer" c:type="gpointer*"/>
       </field>
       <field name="len">
         <type name="uint32" c:type="guint"/>
@@ -155,7 +175,7 @@
     </record>
     <function name="array_new" c:identifier="g_array_new">
       <return-value>
-        <type name="GArray*" c:type="GArray*"/>
+        <type name="GArray" c:type="GArray*"/>
       </return-value>
       <parameters>
         <parameter name="zero_terminated">
@@ -171,7 +191,7 @@
     </function>
     <function name="array_sized_new" c:identifier="g_array_sized_new">
       <return-value>
-        <type name="GArray*" c:type="GArray*"/>
+        <type name="GArray" c:type="GArray*"/>
       </return-value>
       <parameters>
         <parameter name="zero_terminated">
@@ -203,7 +223,7 @@
     </function>
     <function name="array_append_vals" c:identifier="g_array_append_vals">
       <return-value>
-        <type name="GArray*" c:type="GArray*"/>
+        <type name="GArray" c:type="GArray*"/>
       </return-value>
       <parameters>
         <parameter name="array">
@@ -219,7 +239,7 @@
     </function>
     <function name="array_prepend_vals" c:identifier="g_array_prepend_vals">
       <return-value>
-        <type name="GArray*" c:type="GArray*"/>
+        <type name="GArray" c:type="GArray*"/>
       </return-value>
       <parameters>
         <parameter name="array">
@@ -235,7 +255,7 @@
     </function>
     <function name="array_insert_vals" c:identifier="g_array_insert_vals">
       <return-value>
-        <type name="GArray*" c:type="GArray*"/>
+        <type name="GArray" c:type="GArray*"/>
       </return-value>
       <parameters>
         <parameter name="array">
@@ -254,7 +274,7 @@
     </function>
     <function name="array_set_size" c:identifier="g_array_set_size">
       <return-value>
-        <type name="GArray*" c:type="GArray*"/>
+        <type name="GArray" c:type="GArray*"/>
       </return-value>
       <parameters>
         <parameter name="array">
@@ -267,7 +287,7 @@
     </function>
     <function name="array_remove_index" c:identifier="g_array_remove_index">
       <return-value>
-        <type name="GArray*" c:type="GArray*"/>
+        <type name="GArray" c:type="GArray*"/>
       </return-value>
       <parameters>
         <parameter name="array">
@@ -281,7 +301,7 @@
     <function name="array_remove_index_fast"
               c:identifier="g_array_remove_index_fast">
       <return-value>
-        <type name="GArray*" c:type="GArray*"/>
+        <type name="GArray" c:type="GArray*"/>
       </return-value>
       <parameters>
         <parameter name="array">
@@ -294,7 +314,7 @@
     </function>
     <function name="array_remove_range" c:identifier="g_array_remove_range">
       <return-value>
-        <type name="GArray*" c:type="GArray*"/>
+        <type name="GArray" c:type="GArray*"/>
       </return-value>
       <parameters>
         <parameter name="array">
@@ -340,12 +360,12 @@
     </function>
     <function name="ptr_array_new" c:identifier="g_ptr_array_new">
       <return-value>
-        <type name="GPtrArray*" c:type="GPtrArray*"/>
+        <type name="GPtrArray" c:type="GPtrArray*"/>
       </return-value>
     </function>
     <function name="ptr_array_sized_new" c:identifier="g_ptr_array_sized_new">
       <return-value>
-        <type name="GPtrArray*" c:type="GPtrArray*"/>
+        <type name="GPtrArray" c:type="GPtrArray*"/>
       </return-value>
       <parameters>
         <parameter name="reserved_size">
@@ -355,7 +375,7 @@
     </function>
     <function name="ptr_array_free" c:identifier="g_ptr_array_free">
       <return-value>
-        <type name="gpointer*" c:type="gpointer*"/>
+        <type name="gpointer" c:type="gpointer*"/>
       </return-value>
       <parameters>
         <parameter name="array">
@@ -512,13 +532,13 @@
     </function>
     <function name="byte_array_new" c:identifier="g_byte_array_new">
       <return-value>
-        <type name="GByteArray*" c:type="GByteArray*"/>
+        <type name="GByteArray" c:type="GByteArray*"/>
       </return-value>
     </function>
     <function name="byte_array_sized_new"
               c:identifier="g_byte_array_sized_new">
       <return-value>
-        <type name="GByteArray*" c:type="GByteArray*"/>
+        <type name="GByteArray" c:type="GByteArray*"/>
       </return-value>
       <parameters>
         <parameter name="reserved_size">
@@ -528,7 +548,7 @@
     </function>
     <function name="byte_array_free" c:identifier="g_byte_array_free">
       <return-value>
-        <type name="guint8*" c:type="guint8*"/>
+        <type name="guint8" c:type="guint8*"/>
       </return-value>
       <parameters>
         <parameter name="array">
@@ -541,7 +561,7 @@
     </function>
     <function name="byte_array_append" c:identifier="g_byte_array_append">
       <return-value>
-        <type name="GByteArray*" c:type="GByteArray*"/>
+        <type name="GByteArray" c:type="GByteArray*"/>
       </return-value>
       <parameters>
         <parameter name="array">
@@ -557,7 +577,7 @@
     </function>
     <function name="byte_array_prepend" c:identifier="g_byte_array_prepend">
       <return-value>
-        <type name="GByteArray*" c:type="GByteArray*"/>
+        <type name="GByteArray" c:type="GByteArray*"/>
       </return-value>
       <parameters>
         <parameter name="array">
@@ -573,7 +593,7 @@
     </function>
     <function name="byte_array_set_size" c:identifier="g_byte_array_set_size">
       <return-value>
-        <type name="GByteArray*" c:type="GByteArray*"/>
+        <type name="GByteArray" c:type="GByteArray*"/>
       </return-value>
       <parameters>
         <parameter name="array">
@@ -587,7 +607,7 @@
     <function name="byte_array_remove_index"
               c:identifier="g_byte_array_remove_index">
       <return-value>
-        <type name="GByteArray*" c:type="GByteArray*"/>
+        <type name="GByteArray" c:type="GByteArray*"/>
       </return-value>
       <parameters>
         <parameter name="array">
@@ -601,7 +621,7 @@
     <function name="byte_array_remove_index_fast"
               c:identifier="g_byte_array_remove_index_fast">
       <return-value>
-        <type name="GByteArray*" c:type="GByteArray*"/>
+        <type name="GByteArray" c:type="GByteArray*"/>
       </return-value>
       <parameters>
         <parameter name="array">
@@ -615,7 +635,7 @@
     <function name="byte_array_remove_range"
               c:identifier="g_byte_array_remove_range">
       <return-value>
-        <type name="GByteArray*" c:type="GByteArray*"/>
+        <type name="GByteArray" c:type="GByteArray*"/>
       </return-value>
       <parameters>
         <parameter name="array">
@@ -735,7 +755,7 @@
     </record>
     <function name="error_new" c:identifier="g_error_new">
       <return-value>
-        <type name="GError*" c:type="GError*"/>
+        <type name="GError" c:type="GError*"/>
       </return-value>
       <parameters>
         <parameter name="domain">
@@ -751,7 +771,7 @@
     </function>
     <function name="error_new_literal" c:identifier="g_error_new_literal">
       <return-value>
-        <type name="GError*" c:type="GError*"/>
+        <type name="GError" c:type="GError*"/>
       </return-value>
       <parameters>
         <parameter name="domain">
@@ -777,7 +797,7 @@
     </function>
     <function name="error_copy" c:identifier="g_error_copy">
       <return-value>
-        <type name="GError*" c:type="GError*"/>
+        <type name="GError" c:type="GError*"/>
       </return-value>
       <parameters>
         <parameter name="error">
@@ -967,18 +987,18 @@
     <function name="get_system_data_dirs"
               c:identifier="g_get_system_data_dirs">
       <return-value>
-        <type name="gchar**" c:type="gchar**"/>
+        <type name="gchar" c:type="gchar**"/>
       </return-value>
     </function>
     <function name="get_system_config_dirs"
               c:identifier="g_get_system_config_dirs">
       <return-value>
-        <type name="gchar**" c:type="gchar**"/>
+        <type name="gchar" c:type="gchar**"/>
       </return-value>
     </function>
     <function name="get_language_names" c:identifier="g_get_language_names">
       <return-value>
-        <type name="gchar**" c:type="gchar**"/>
+        <type name="gchar" c:type="gchar**"/>
       </return-value>
     </function>
     <enumeration name="guserdirectory" c:type="GUserDirectory">
@@ -1182,7 +1202,7 @@
     </function>
     <function name="listenv" c:identifier="g_listenv">
       <return-value>
-        <type name="gchar**" c:type="gchar**"/>
+        <type name="gchar" c:type="gchar**"/>
       </return-value>
     </function>
     <function name="g_getenv_nomalloc" c:identifier="_g_getenv_nomalloc">
@@ -1263,7 +1283,7 @@
     <record name="TrashStack" c:type="GTrashStack"/>
     <record name="GTrashStack" c:type="_GTrashStack">
       <field name="next">
-        <type name="GTrashStack*" c:type="GTrashStack*"/>
+        <type name="GTrashStack" c:type="GTrashStack*"/>
       </field>
     </record>
     <function name="trash_stack_push" c:identifier="g_trash_stack_push">
@@ -1483,7 +1503,7 @@
     <record name="GThreadFunctions" c:type="_GThreadFunctions">
       <callback name="mutex_new">
         <return-value>
-          <type name="GMutex*" c:type="GMutex*"/>
+          <type name="GMutex" c:type="GMutex*"/>
         </return-value>
       </callback>
       <callback name="mutex_lock">
@@ -1492,7 +1512,7 @@
         </return-value>
         <parameters>
           <parameter name="mutex">
-            <type name="GMutex*" c:type="GMutex*"/>
+            <type name="GMutex" c:type="GMutex*"/>
           </parameter>
         </parameters>
       </callback>
@@ -1502,7 +1522,7 @@
         </return-value>
         <parameters>
           <parameter name="mutex">
-            <type name="GMutex*" c:type="GMutex*"/>
+            <type name="GMutex" c:type="GMutex*"/>
           </parameter>
         </parameters>
       </callback>
@@ -1512,7 +1532,7 @@
         </return-value>
         <parameters>
           <parameter name="mutex">
-            <type name="GMutex*" c:type="GMutex*"/>
+            <type name="GMutex" c:type="GMutex*"/>
           </parameter>
         </parameters>
       </callback>
@@ -1522,13 +1542,13 @@
         </return-value>
         <parameters>
           <parameter name="mutex">
-            <type name="GMutex*" c:type="GMutex*"/>
+            <type name="GMutex" c:type="GMutex*"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="cond_new">
         <return-value>
-          <type name="GCond*" c:type="GCond*"/>
+          <type name="GCond" c:type="GCond*"/>
         </return-value>
       </callback>
       <callback name="cond_signal">
@@ -1537,7 +1557,7 @@
         </return-value>
         <parameters>
           <parameter name="cond">
-            <type name="GCond*" c:type="GCond*"/>
+            <type name="GCond" c:type="GCond*"/>
           </parameter>
         </parameters>
       </callback>
@@ -1547,7 +1567,7 @@
         </return-value>
         <parameters>
           <parameter name="cond">
-            <type name="GCond*" c:type="GCond*"/>
+            <type name="GCond" c:type="GCond*"/>
           </parameter>
         </parameters>
       </callback>
@@ -1557,10 +1577,10 @@
         </return-value>
         <parameters>
           <parameter name="cond">
-            <type name="GCond*" c:type="GCond*"/>
+            <type name="GCond" c:type="GCond*"/>
           </parameter>
           <parameter name="mutex">
-            <type name="GMutex*" c:type="GMutex*"/>
+            <type name="GMutex" c:type="GMutex*"/>
           </parameter>
         </parameters>
       </callback>
@@ -1570,13 +1590,13 @@
         </return-value>
         <parameters>
           <parameter name="cond">
-            <type name="GCond*" c:type="GCond*"/>
+            <type name="GCond" c:type="GCond*"/>
           </parameter>
           <parameter name="mutex">
-            <type name="GMutex*" c:type="GMutex*"/>
+            <type name="GMutex" c:type="GMutex*"/>
           </parameter>
           <parameter name="end_time">
-            <type name="GTimeVal*" c:type="GTimeVal*"/>
+            <type name="GTimeVal" c:type="GTimeVal*"/>
           </parameter>
         </parameters>
       </callback>
@@ -1586,13 +1606,13 @@
         </return-value>
         <parameters>
           <parameter name="cond">
-            <type name="GCond*" c:type="GCond*"/>
+            <type name="GCond" c:type="GCond*"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="private_new">
         <return-value>
-          <type name="GPrivate*" c:type="GPrivate*"/>
+          <type name="GPrivate" c:type="GPrivate*"/>
         </return-value>
         <parameters>
           <parameter name="destructor">
@@ -1606,7 +1626,7 @@
         </return-value>
         <parameters>
           <parameter name="private_key">
-            <type name="GPrivate*" c:type="GPrivate*"/>
+            <type name="GPrivate" c:type="GPrivate*"/>
           </parameter>
         </parameters>
       </callback>
@@ -1616,7 +1636,7 @@
         </return-value>
         <parameters>
           <parameter name="private_key">
-            <type name="GPrivate*" c:type="GPrivate*"/>
+            <type name="GPrivate" c:type="GPrivate*"/>
           </parameter>
           <parameter name="data">
             <type name="any" c:type="gpointer"/>
@@ -1650,7 +1670,7 @@
             <type name="any" c:type="gpointer"/>
           </parameter>
           <parameter name="error">
-            <type name="GError**" c:type="GError**"/>
+            <type name="GError" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
@@ -1735,7 +1755,7 @@
     <function name="static_mutex_get_mutex_impl"
               c:identifier="g_static_mutex_get_mutex_impl">
       <return-value>
-        <type name="GMutex*" c:type="GMutex*"/>
+        <type name="GMutex" c:type="GMutex*"/>
       </return-value>
       <parameters>
         <parameter name="mutex">
@@ -1745,7 +1765,7 @@
     </function>
     <function name="thread_create_full" c:identifier="g_thread_create_full">
       <return-value>
-        <type name="GThread*" c:type="GThread*"/>
+        <type name="GThread" c:type="GThread*"/>
       </return-value>
       <parameters>
         <parameter name="func">
@@ -1773,7 +1793,7 @@
     </function>
     <function name="thread_self" c:identifier="g_thread_self">
       <return-value>
-        <type name="GThread*" c:type="GThread*"/>
+        <type name="GThread" c:type="GThread*"/>
       </return-value>
     </function>
     <function name="thread_exit" c:identifier="g_thread_exit">
@@ -1978,10 +1998,10 @@
         <type name="GStaticMutex" c:type="GStaticMutex"/>
       </field>
       <field name="read_cond">
-        <type name="GCond*" c:type="GCond*"/>
+        <type name="GCond" c:type="GCond*"/>
       </field>
       <field name="write_cond">
-        <type name="GCond*" c:type="GCond*"/>
+        <type name="GCond" c:type="GCond*"/>
       </field>
       <field name="read_counter">
         <type name="uint32" c:type="guint"/>
@@ -2171,13 +2191,13 @@
     <record name="AsyncQueue" c:type="GAsyncQueue"/>
     <function name="async_queue_new" c:identifier="g_async_queue_new">
       <return-value>
-        <type name="GAsyncQueue*" c:type="GAsyncQueue*"/>
+        <type name="GAsyncQueue" c:type="GAsyncQueue*"/>
       </return-value>
     </function>
     <function name="async_queue_new_full"
               c:identifier="g_async_queue_new_full">
       <return-value>
-        <type name="GAsyncQueue*" c:type="GAsyncQueue*"/>
+        <type name="GAsyncQueue" c:type="GAsyncQueue*"/>
       </return-value>
       <parameters>
         <parameter name="item_free_func">
@@ -2207,7 +2227,7 @@
     </function>
     <function name="async_queue_ref" c:identifier="g_async_queue_ref">
       <return-value>
-        <type name="GAsyncQueue*" c:type="GAsyncQueue*"/>
+        <type name="GAsyncQueue" c:type="GAsyncQueue*"/>
       </return-value>
       <parameters>
         <parameter name="queue">
@@ -2441,7 +2461,7 @@
     <function name="g_async_queue_get_mutex"
               c:identifier="_g_async_queue_get_mutex">
       <return-value>
-        <type name="GMutex*" c:type="GMutex*"/>
+        <type name="GMutex" c:type="GMutex*"/>
       </return-value>
       <parameters>
         <parameter name="queue">
@@ -2551,7 +2571,7 @@
     </function>
     <function name="base64_decode" c:identifier="g_base64_decode">
       <return-value>
-        <type name="guchar*" c:type="guchar*"/>
+        <type name="guchar" c:type="guchar*"/>
       </return-value>
       <parameters>
         <parameter name="text">
@@ -2597,7 +2617,7 @@
     <record name="BookmarkFile" c:type="GBookmarkFile"/>
     <function name="bookmark_file_new" c:identifier="g_bookmark_file_new">
       <return-value>
-        <type name="GBookmarkFile*" c:type="GBookmarkFile*"/>
+        <type name="GBookmarkFile" c:type="GBookmarkFile*"/>
       </return-value>
     </function>
     <function name="bookmark_file_free" c:identifier="g_bookmark_file_free">
@@ -2863,7 +2883,7 @@
     <function name="bookmark_file_get_groups"
               c:identifier="g_bookmark_file_get_groups">
       <return-value>
-        <type name="gchar**" c:type="gchar**"/>
+        <type name="gchar" c:type="gchar**"/>
       </return-value>
       <parameters>
         <parameter name="bookmark">
@@ -2923,7 +2943,7 @@
     <function name="bookmark_file_get_applications"
               c:identifier="g_bookmark_file_get_applications">
       <return-value>
-        <type name="gchar**" c:type="gchar**"/>
+        <type name="gchar" c:type="gchar**"/>
       </return-value>
       <parameters>
         <parameter name="bookmark">
@@ -3205,7 +3225,7 @@
     <function name="bookmark_file_get_uris"
               c:identifier="g_bookmark_file_get_uris">
       <return-value>
-        <type name="gchar**" c:type="gchar**"/>
+        <type name="gchar" c:type="gchar**"/>
       </return-value>
       <parameters>
         <parameter name="bookmark">
@@ -3402,7 +3422,7 @@
     <function name="slice_get_config_state"
               c:identifier="g_slice_get_config_state">
       <return-value>
-        <type name="gint64*" c:type="gint64*"/>
+        <type name="gint64" c:type="gint64*"/>
       </return-value>
       <parameters>
         <parameter name="ckey">
@@ -3589,7 +3609,7 @@
     <record name="MemChunk" c:type="GMemChunk"/>
     <function name="mem_chunk_new" c:identifier="g_mem_chunk_new">
       <return-value>
-        <type name="GMemChunk*" c:type="GMemChunk*"/>
+        <type name="GMemChunk" c:type="GMemChunk*"/>
       </return-value>
       <parameters>
         <parameter name="name">
@@ -3691,7 +3711,7 @@
     </function>
     <function name="allocator_new" c:identifier="g_allocator_new">
       <return-value>
-        <type name="GAllocator*" c:type="GAllocator*"/>
+        <type name="GAllocator" c:type="GAllocator*"/>
       </return-value>
       <parameters>
         <parameter name="name">
@@ -3718,15 +3738,15 @@
         <type name="any" c:type="gpointer"/>
       </field>
       <field name="next">
-        <type name="GList*" c:type="GList*"/>
+        <type name="GList" c:type="GList*"/>
       </field>
       <field name="prev">
-        <type name="GList*" c:type="GList*"/>
+        <type name="GList" c:type="GList*"/>
       </field>
     </record>
     <function name="list_alloc" c:identifier="g_list_alloc">
       <return-value>
-        <type name="GList*" c:type="GList*"/>
+        <type name="GList" c:type="GList*"/>
       </return-value>
     </function>
     <function name="list_free" c:identifier="g_list_free">
@@ -3751,7 +3771,7 @@
     </function>
     <function name="list_append" c:identifier="g_list_append">
       <return-value>
-        <type name="GList*" c:type="GList*"/>
+        <type name="GList" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
@@ -3764,7 +3784,7 @@
     </function>
     <function name="list_prepend" c:identifier="g_list_prepend">
       <return-value>
-        <type name="GList*" c:type="GList*"/>
+        <type name="GList" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
@@ -3777,7 +3797,7 @@
     </function>
     <function name="list_insert" c:identifier="g_list_insert">
       <return-value>
-        <type name="GList*" c:type="GList*"/>
+        <type name="GList" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
@@ -3793,7 +3813,7 @@
     </function>
     <function name="list_insert_sorted" c:identifier="g_list_insert_sorted">
       <return-value>
-        <type name="GList*" c:type="GList*"/>
+        <type name="GList" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
@@ -3810,7 +3830,7 @@
     <function name="list_insert_sorted_with_data"
               c:identifier="g_list_insert_sorted_with_data">
       <return-value>
-        <type name="GList*" c:type="GList*"/>
+        <type name="GList" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
@@ -3829,7 +3849,7 @@
     </function>
     <function name="list_insert_before" c:identifier="g_list_insert_before">
       <return-value>
-        <type name="GList*" c:type="GList*"/>
+        <type name="GList" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
@@ -3845,7 +3865,7 @@
     </function>
     <function name="list_concat" c:identifier="g_list_concat">
       <return-value>
-        <type name="GList*" c:type="GList*"/>
+        <type name="GList" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="list1">
@@ -3858,7 +3878,7 @@
     </function>
     <function name="list_remove" c:identifier="g_list_remove">
       <return-value>
-        <type name="GList*" c:type="GList*"/>
+        <type name="GList" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
@@ -3871,7 +3891,7 @@
     </function>
     <function name="list_remove_all" c:identifier="g_list_remove_all">
       <return-value>
-        <type name="GList*" c:type="GList*"/>
+        <type name="GList" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
@@ -3884,7 +3904,7 @@
     </function>
     <function name="list_remove_link" c:identifier="g_list_remove_link">
       <return-value>
-        <type name="GList*" c:type="GList*"/>
+        <type name="GList" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
@@ -3897,7 +3917,7 @@
     </function>
     <function name="list_delete_link" c:identifier="g_list_delete_link">
       <return-value>
-        <type name="GList*" c:type="GList*"/>
+        <type name="GList" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
@@ -3910,7 +3930,7 @@
     </function>
     <function name="list_reverse" c:identifier="g_list_reverse">
       <return-value>
-        <type name="GList*" c:type="GList*"/>
+        <type name="GList" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
@@ -3920,7 +3940,7 @@
     </function>
     <function name="list_copy" c:identifier="g_list_copy">
       <return-value>
-        <type name="GList*" c:type="GList*"/>
+        <type name="GList" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
@@ -3930,7 +3950,7 @@
     </function>
     <function name="list_nth" c:identifier="g_list_nth">
       <return-value>
-        <type name="GList*" c:type="GList*"/>
+        <type name="GList" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
@@ -3943,7 +3963,7 @@
     </function>
     <function name="list_nth_prev" c:identifier="g_list_nth_prev">
       <return-value>
-        <type name="GList*" c:type="GList*"/>
+        <type name="GList" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
@@ -3956,7 +3976,7 @@
     </function>
     <function name="list_find" c:identifier="g_list_find">
       <return-value>
-        <type name="GList*" c:type="GList*"/>
+        <type name="GList" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
@@ -3969,7 +3989,7 @@
     </function>
     <function name="list_find_custom" c:identifier="g_list_find_custom">
       <return-value>
-        <type name="GList*" c:type="GList*"/>
+        <type name="GList" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
@@ -4011,7 +4031,7 @@
     </function>
     <function name="list_last" c:identifier="g_list_last">
       <return-value>
-        <type name="GList*" c:type="GList*"/>
+        <type name="GList" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
@@ -4021,7 +4041,7 @@
     </function>
     <function name="list_first" c:identifier="g_list_first">
       <return-value>
-        <type name="GList*" c:type="GList*"/>
+        <type name="GList" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
@@ -4057,7 +4077,7 @@
     </function>
     <function name="list_sort" c:identifier="g_list_sort">
       <return-value>
-        <type name="GList*" c:type="GList*"/>
+        <type name="GList" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
@@ -4070,7 +4090,7 @@
     </function>
     <function name="list_sort_with_data" c:identifier="g_list_sort_with_data">
       <return-value>
-        <type name="GList*" c:type="GList*"/>
+        <type name="GList" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
@@ -4145,7 +4165,7 @@
     </callback>
     <function name="cache_new" c:identifier="g_cache_new">
       <return-value>
-        <type name="GCache*" c:type="GCache*"/>
+        <type name="GCache" c:type="GCache*"/>
       </return-value>
       <parameters>
         <parameter name="value_new_func">
@@ -4258,7 +4278,7 @@
     </function>
     <function name="checksum_new" c:identifier="g_checksum_new">
       <return-value>
-        <type name="GChecksum*" c:type="GChecksum*"/>
+        <type name="GChecksum" c:type="GChecksum*"/>
       </return-value>
       <parameters>
         <parameter name="checksum_type">
@@ -4278,7 +4298,7 @@
     </function>
     <function name="checksum_copy" c:identifier="g_checksum_copy">
       <return-value>
-        <type name="GChecksum*" c:type="GChecksum*"/>
+        <type name="GChecksum" c:type="GChecksum*"/>
       </return-value>
       <parameters>
         <parameter name="checksum">
@@ -4401,7 +4421,7 @@
     </callback>
     <record name="GCompletion" c:type="_GCompletion">
       <field name="items">
-        <type name="GList*" c:type="GList*"/>
+        <type name="GList" c:type="GList*"/>
       </field>
       <field name="func">
         <type name="GCompletionFunc" c:type="GCompletionFunc"/>
@@ -4410,7 +4430,7 @@
         <type name="string" c:type="gchar*"/>
       </field>
       <field name="cache">
-        <type name="GList*" c:type="GList*"/>
+        <type name="GList" c:type="GList*"/>
       </field>
       <field name="strncmp_func">
         <type name="GCompletionStrncmpFunc" c:type="GCompletionStrncmpFunc"/>
@@ -4418,7 +4438,7 @@
     </record>
     <function name="completion_new" c:identifier="g_completion_new">
       <return-value>
-        <type name="GCompletion*" c:type="GCompletion*"/>
+        <type name="GCompletion" c:type="GCompletion*"/>
       </return-value>
       <parameters>
         <parameter name="func">
@@ -4467,7 +4487,7 @@
     </function>
     <function name="completion_complete" c:identifier="g_completion_complete">
       <return-value>
-        <type name="GList*" c:type="GList*"/>
+        <type name="GList" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="cmp">
@@ -4484,7 +4504,7 @@
     <function name="completion_complete_utf8"
               c:identifier="g_completion_complete_utf8">
       <return-value>
-        <type name="GList*" c:type="GList*"/>
+        <type name="GList" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="cmp">
@@ -4831,7 +4851,7 @@
     <function name="uri_list_extract_uris"
               c:identifier="g_uri_list_extract_uris">
       <return-value>
-        <type name="gchar**" c:type="gchar**"/>
+        <type name="gchar" c:type="gchar**"/>
       </return-value>
       <parameters>
         <parameter name="uri_list">
@@ -5103,12 +5123,12 @@
     </record>
     <function name="date_new" c:identifier="g_date_new">
       <return-value>
-        <type name="GDate*" c:type="GDate*"/>
+        <type name="GDate" c:type="GDate*"/>
       </return-value>
     </function>
     <function name="date_new_dmy" c:identifier="g_date_new_dmy">
       <return-value>
-        <type name="GDate*" c:type="GDate*"/>
+        <type name="GDate" c:type="GDate*"/>
       </return-value>
       <parameters>
         <parameter name="day">
@@ -5124,7 +5144,7 @@
     </function>
     <function name="date_new_julian" c:identifier="g_date_new_julian">
       <return-value>
-        <type name="GDate*" c:type="GDate*"/>
+        <type name="GDate" c:type="GDate*"/>
       </return-value>
       <parameters>
         <parameter name="julian_day">
@@ -5685,7 +5705,7 @@
     <record name="Dir" c:type="GDir"/>
     <function name="dir_open" c:identifier="g_dir_open">
       <return-value>
-        <type name="GDir*" c:type="GDir*"/>
+        <type name="GDir" c:type="GDir*"/>
       </return-value>
       <parameters>
         <parameter name="path">
@@ -5987,7 +6007,7 @@
     </record>
     <function name="hash_table_new" c:identifier="g_hash_table_new">
       <return-value>
-        <type name="GHashTable*" c:type="GHashTable*"/>
+        <type name="GHashTable" c:type="GHashTable*"/>
       </return-value>
       <parameters>
         <parameter name="hash_func">
@@ -6000,7 +6020,7 @@
     </function>
     <function name="hash_table_new_full" c:identifier="g_hash_table_new_full">
       <return-value>
-        <type name="GHashTable*" c:type="GHashTable*"/>
+        <type name="GHashTable" c:type="GHashTable*"/>
       </return-value>
       <parameters>
         <parameter name="hash_func">
@@ -6218,7 +6238,7 @@
     </function>
     <function name="hash_table_get_keys" c:identifier="g_hash_table_get_keys">
       <return-value>
-        <type name="GList*" c:type="GList*"/>
+        <type name="GList" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="hash_table">
@@ -6229,7 +6249,7 @@
     <function name="hash_table_get_values"
               c:identifier="g_hash_table_get_values">
       <return-value>
-        <type name="GList*" c:type="GList*"/>
+        <type name="GList" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="hash_table">
@@ -6271,7 +6291,7 @@
     <function name="hash_table_iter_get_hash_table"
               c:identifier="g_hash_table_iter_get_hash_table">
       <return-value>
-        <type name="GHashTable*" c:type="GHashTable*"/>
+        <type name="GHashTable" c:type="GHashTable*"/>
       </return-value>
       <parameters>
         <parameter name="iter">
@@ -6303,7 +6323,7 @@
     </function>
     <function name="hash_table_ref" c:identifier="g_hash_table_ref">
       <return-value>
-        <type name="GHashTable*" c:type="GHashTable*"/>
+        <type name="GHashTable" c:type="GHashTable*"/>
       </return-value>
       <parameters>
         <parameter name="hash_table">
@@ -6398,10 +6418,10 @@
       </return-value>
       <parameters>
         <parameter name="new_hook">
-          <type name="GHook*" c:type="GHook*"/>
+          <type name="GHook" c:type="GHook*"/>
         </parameter>
         <parameter name="sibling">
-          <type name="GHook*" c:type="GHook*"/>
+          <type name="GHook" c:type="GHook*"/>
         </parameter>
       </parameters>
     </callback>
@@ -6411,7 +6431,7 @@
       </return-value>
       <parameters>
         <parameter name="hook">
-          <type name="GHook*" c:type="GHook*"/>
+          <type name="GHook" c:type="GHook*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
@@ -6424,7 +6444,7 @@
       </return-value>
       <parameters>
         <parameter name="hook">
-          <type name="GHook*" c:type="GHook*"/>
+          <type name="GHook" c:type="GHook*"/>
         </parameter>
         <parameter name="marshal_data">
           <type name="any" c:type="gpointer"/>
@@ -6437,7 +6457,7 @@
       </return-value>
       <parameters>
         <parameter name="hook">
-          <type name="GHook*" c:type="GHook*"/>
+          <type name="GHook" c:type="GHook*"/>
         </parameter>
         <parameter name="marshal_data">
           <type name="any" c:type="gpointer"/>
@@ -6470,10 +6490,10 @@
       </return-value>
       <parameters>
         <parameter name="hook_list">
-          <type name="GHookList*" c:type="GHookList*"/>
+          <type name="GHookList" c:type="GHookList*"/>
         </parameter>
         <parameter name="hook">
-          <type name="GHook*" c:type="GHook*"/>
+          <type name="GHook" c:type="GHook*"/>
         </parameter>
       </parameters>
     </callback>
@@ -6493,7 +6513,7 @@
         <type name="uint32" c:type="guint"/>
       </field>
       <field name="hooks">
-        <type name="GHook*" c:type="GHook*"/>
+        <type name="GHook" c:type="GHook*"/>
       </field>
       <field name="dummy3">
         <type name="any" c:type="gpointer"/>
@@ -6510,10 +6530,10 @@
         <type name="any" c:type="gpointer"/>
       </field>
       <field name="next">
-        <type name="GHook*" c:type="GHook*"/>
+        <type name="GHook" c:type="GHook*"/>
       </field>
       <field name="prev">
-        <type name="GHook*" c:type="GHook*"/>
+        <type name="GHook" c:type="GHook*"/>
       </field>
       <field name="ref_count">
         <type name="uint32" c:type="guint"/>
@@ -6556,7 +6576,7 @@
     </function>
     <function name="hook_alloc" c:identifier="g_hook_alloc">
       <return-value>
-        <type name="GHook*" c:type="GHook*"/>
+        <type name="GHook" c:type="GHook*"/>
       </return-value>
       <parameters>
         <parameter name="hook_list">
@@ -6579,7 +6599,7 @@
     </function>
     <function name="hook_ref" c:identifier="g_hook_ref">
       <return-value>
-        <type name="GHook*" c:type="GHook*"/>
+        <type name="GHook" c:type="GHook*"/>
       </return-value>
       <parameters>
         <parameter name="hook_list">
@@ -6676,7 +6696,7 @@
     </function>
     <function name="hook_get" c:identifier="g_hook_get">
       <return-value>
-        <type name="GHook*" c:type="GHook*"/>
+        <type name="GHook" c:type="GHook*"/>
       </return-value>
       <parameters>
         <parameter name="hook_list">
@@ -6689,7 +6709,7 @@
     </function>
     <function name="hook_find" c:identifier="g_hook_find">
       <return-value>
-        <type name="GHook*" c:type="GHook*"/>
+        <type name="GHook" c:type="GHook*"/>
       </return-value>
       <parameters>
         <parameter name="hook_list">
@@ -6708,7 +6728,7 @@
     </function>
     <function name="hook_find_data" c:identifier="g_hook_find_data">
       <return-value>
-        <type name="GHook*" c:type="GHook*"/>
+        <type name="GHook" c:type="GHook*"/>
       </return-value>
       <parameters>
         <parameter name="hook_list">
@@ -6724,7 +6744,7 @@
     </function>
     <function name="hook_find_func" c:identifier="g_hook_find_func">
       <return-value>
-        <type name="GHook*" c:type="GHook*"/>
+        <type name="GHook" c:type="GHook*"/>
       </return-value>
       <parameters>
         <parameter name="hook_list">
@@ -6740,7 +6760,7 @@
     </function>
     <function name="hook_find_func_data" c:identifier="g_hook_find_func_data">
       <return-value>
-        <type name="GHook*" c:type="GHook*"/>
+        <type name="GHook" c:type="GHook*"/>
       </return-value>
       <parameters>
         <parameter name="hook_list">
@@ -6759,7 +6779,7 @@
     </function>
     <function name="hook_first_valid" c:identifier="g_hook_first_valid">
       <return-value>
-        <type name="GHook*" c:type="GHook*"/>
+        <type name="GHook" c:type="GHook*"/>
       </return-value>
       <parameters>
         <parameter name="hook_list">
@@ -6772,7 +6792,7 @@
     </function>
     <function name="hook_next_valid" c:identifier="g_hook_next_valid">
       <return-value>
-        <type name="GHook*" c:type="GHook*"/>
+        <type name="GHook" c:type="GHook*"/>
       </return-value>
       <parameters>
         <parameter name="hook_list">
@@ -6871,12 +6891,12 @@
         <type name="any" c:type="gpointer"/>
       </field>
       <field name="next">
-        <type name="GSList*" c:type="GSList*"/>
+        <type name="GSList" c:type="GSList*"/>
       </field>
     </record>
     <function name="slist_alloc" c:identifier="g_slist_alloc">
       <return-value>
-        <type name="GSList*" c:type="GSList*"/>
+        <type name="GSList" c:type="GSList*"/>
       </return-value>
     </function>
     <function name="slist_free" c:identifier="g_slist_free">
@@ -6901,7 +6921,7 @@
     </function>
     <function name="slist_append" c:identifier="g_slist_append">
       <return-value>
-        <type name="GSList*" c:type="GSList*"/>
+        <type name="GSList" c:type="GSList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
@@ -6914,7 +6934,7 @@
     </function>
     <function name="slist_prepend" c:identifier="g_slist_prepend">
       <return-value>
-        <type name="GSList*" c:type="GSList*"/>
+        <type name="GSList" c:type="GSList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
@@ -6927,7 +6947,7 @@
     </function>
     <function name="slist_insert" c:identifier="g_slist_insert">
       <return-value>
-        <type name="GSList*" c:type="GSList*"/>
+        <type name="GSList" c:type="GSList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
@@ -6943,7 +6963,7 @@
     </function>
     <function name="slist_insert_sorted" c:identifier="g_slist_insert_sorted">
       <return-value>
-        <type name="GSList*" c:type="GSList*"/>
+        <type name="GSList" c:type="GSList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
@@ -6960,7 +6980,7 @@
     <function name="slist_insert_sorted_with_data"
               c:identifier="g_slist_insert_sorted_with_data">
       <return-value>
-        <type name="GSList*" c:type="GSList*"/>
+        <type name="GSList" c:type="GSList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
@@ -6979,7 +6999,7 @@
     </function>
     <function name="slist_insert_before" c:identifier="g_slist_insert_before">
       <return-value>
-        <type name="GSList*" c:type="GSList*"/>
+        <type name="GSList" c:type="GSList*"/>
       </return-value>
       <parameters>
         <parameter name="slist">
@@ -6995,7 +7015,7 @@
     </function>
     <function name="slist_concat" c:identifier="g_slist_concat">
       <return-value>
-        <type name="GSList*" c:type="GSList*"/>
+        <type name="GSList" c:type="GSList*"/>
       </return-value>
       <parameters>
         <parameter name="list1">
@@ -7008,7 +7028,7 @@
     </function>
     <function name="slist_remove" c:identifier="g_slist_remove">
       <return-value>
-        <type name="GSList*" c:type="GSList*"/>
+        <type name="GSList" c:type="GSList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
@@ -7021,7 +7041,7 @@
     </function>
     <function name="slist_remove_all" c:identifier="g_slist_remove_all">
       <return-value>
-        <type name="GSList*" c:type="GSList*"/>
+        <type name="GSList" c:type="GSList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
@@ -7034,7 +7054,7 @@
     </function>
     <function name="slist_remove_link" c:identifier="g_slist_remove_link">
       <return-value>
-        <type name="GSList*" c:type="GSList*"/>
+        <type name="GSList" c:type="GSList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
@@ -7047,7 +7067,7 @@
     </function>
     <function name="slist_delete_link" c:identifier="g_slist_delete_link">
       <return-value>
-        <type name="GSList*" c:type="GSList*"/>
+        <type name="GSList" c:type="GSList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
@@ -7060,7 +7080,7 @@
     </function>
     <function name="slist_reverse" c:identifier="g_slist_reverse">
       <return-value>
-        <type name="GSList*" c:type="GSList*"/>
+        <type name="GSList" c:type="GSList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
@@ -7070,7 +7090,7 @@
     </function>
     <function name="slist_copy" c:identifier="g_slist_copy">
       <return-value>
-        <type name="GSList*" c:type="GSList*"/>
+        <type name="GSList" c:type="GSList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
@@ -7080,7 +7100,7 @@
     </function>
     <function name="slist_nth" c:identifier="g_slist_nth">
       <return-value>
-        <type name="GSList*" c:type="GSList*"/>
+        <type name="GSList" c:type="GSList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
@@ -7093,7 +7113,7 @@
     </function>
     <function name="slist_find" c:identifier="g_slist_find">
       <return-value>
-        <type name="GSList*" c:type="GSList*"/>
+        <type name="GSList" c:type="GSList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
@@ -7106,7 +7126,7 @@
     </function>
     <function name="slist_find_custom" c:identifier="g_slist_find_custom">
       <return-value>
-        <type name="GSList*" c:type="GSList*"/>
+        <type name="GSList" c:type="GSList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
@@ -7148,7 +7168,7 @@
     </function>
     <function name="slist_last" c:identifier="g_slist_last">
       <return-value>
-        <type name="GSList*" c:type="GSList*"/>
+        <type name="GSList" c:type="GSList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
@@ -7184,7 +7204,7 @@
     </function>
     <function name="slist_sort" c:identifier="g_slist_sort">
       <return-value>
-        <type name="GSList*" c:type="GSList*"/>
+        <type name="GSList" c:type="GSList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
@@ -7198,7 +7218,7 @@
     <function name="slist_sort_with_data"
               c:identifier="g_slist_sort_with_data">
       <return-value>
-        <type name="GSList*" c:type="GSList*"/>
+        <type name="GSList" c:type="GSList*"/>
       </return-value>
       <parameters>
         <parameter name="list">
@@ -7277,16 +7297,16 @@
         <type name="any" c:type="gpointer"/>
       </field>
       <field name="callback_funcs">
-        <type name="GSourceCallbackFuncs*" c:type="GSourceCallbackFuncs*"/>
+        <type name="GSourceCallbackFuncs" c:type="GSourceCallbackFuncs*"/>
       </field>
       <field name="source_funcs">
-        <type name="GSourceFuncs*" c:type="GSourceFuncs*"/>
+        <type name="GSourceFuncs" c:type="GSourceFuncs*"/>
       </field>
       <field name="ref_count">
         <type name="uint32" c:type="guint"/>
       </field>
       <field name="context">
-        <type name="GMainContext*" c:type="GMainContext*"/>
+        <type name="GMainContext" c:type="GMainContext*"/>
       </field>
       <field name="priority">
         <type name="int32" c:type="gint"/>
@@ -7298,13 +7318,13 @@
         <type name="uint32" c:type="guint"/>
       </field>
       <field name="poll_fds">
-        <type name="GSList*" c:type="GSList*"/>
+        <type name="GSList" c:type="GSList*"/>
       </field>
       <field name="prev">
-        <type name="GSource*" c:type="GSource*"/>
+        <type name="GSource" c:type="GSource*"/>
       </field>
       <field name="next">
-        <type name="GSource*" c:type="GSource*"/>
+        <type name="GSource" c:type="GSource*"/>
       </field>
       <field name="reserved1">
         <type name="any" c:type="gpointer"/>
@@ -7343,13 +7363,13 @@
             <type name="any" c:type="gpointer"/>
           </parameter>
           <parameter name="source">
-            <type name="GSource*" c:type="GSource*"/>
+            <type name="GSource" c:type="GSource*"/>
           </parameter>
           <parameter name="func">
-            <type name="GSourceFunc*" c:type="GSourceFunc*"/>
+            <type name="GSourceFunc" c:type="GSourceFunc*"/>
           </parameter>
           <parameter name="data">
-            <type name="gpointer*" c:type="gpointer*"/>
+            <type name="gpointer" c:type="gpointer*"/>
           </parameter>
         </parameters>
       </callback>
@@ -7366,10 +7386,10 @@
         </return-value>
         <parameters>
           <parameter name="source">
-            <type name="GSource*" c:type="GSource*"/>
+            <type name="GSource" c:type="GSource*"/>
           </parameter>
           <parameter name="timeout_">
-            <type name="gint*" c:type="gint*"/>
+            <type name="gint" c:type="gint*"/>
           </parameter>
         </parameters>
       </callback>
@@ -7379,7 +7399,7 @@
         </return-value>
         <parameters>
           <parameter name="source">
-            <type name="GSource*" c:type="GSource*"/>
+            <type name="GSource" c:type="GSource*"/>
           </parameter>
         </parameters>
       </callback>
@@ -7389,7 +7409,7 @@
         </return-value>
         <parameters>
           <parameter name="source">
-            <type name="GSource*" c:type="GSource*"/>
+            <type name="GSource" c:type="GSource*"/>
           </parameter>
           <parameter name="callback">
             <type name="GSourceFunc" c:type="GSourceFunc"/>
@@ -7405,7 +7425,7 @@
         </return-value>
         <parameters>
           <parameter name="source">
-            <type name="GSource*" c:type="GSource*"/>
+            <type name="GSource" c:type="GSource*"/>
           </parameter>
         </parameters>
       </callback>
@@ -7423,7 +7443,7 @@
       </return-value>
       <parameters>
         <parameter name="ufds">
-          <type name="GPollFD*" c:type="GPollFD*"/>
+          <type name="GPollFD" c:type="GPollFD*"/>
         </parameter>
         <parameter name="nfsd">
           <type name="uint32" c:type="guint"/>
@@ -7446,12 +7466,12 @@
     </record>
     <function name="main_context_new" c:identifier="g_main_context_new">
       <return-value>
-        <type name="GMainContext*" c:type="GMainContext*"/>
+        <type name="GMainContext" c:type="GMainContext*"/>
       </return-value>
     </function>
     <function name="main_context_ref" c:identifier="g_main_context_ref">
       <return-value>
-        <type name="GMainContext*" c:type="GMainContext*"/>
+        <type name="GMainContext" c:type="GMainContext*"/>
       </return-value>
       <parameters>
         <parameter name="context">
@@ -7472,7 +7492,7 @@
     <function name="main_context_default"
               c:identifier="g_main_context_default">
       <return-value>
-        <type name="GMainContext*" c:type="GMainContext*"/>
+        <type name="GMainContext" c:type="GMainContext*"/>
       </return-value>
     </function>
     <function name="main_context_iteration"
@@ -7503,7 +7523,7 @@
     <function name="main_context_find_source_by_id"
               c:identifier="g_main_context_find_source_by_id">
       <return-value>
-        <type name="GSource*" c:type="GSource*"/>
+        <type name="GSource" c:type="GSource*"/>
       </return-value>
       <parameters>
         <parameter name="context">
@@ -7517,7 +7537,7 @@
     <function name="main_context_find_source_by_user_data"
               c:identifier="g_main_context_find_source_by_user_data">
       <return-value>
-        <type name="GSource*" c:type="GSource*"/>
+        <type name="GSource" c:type="GSource*"/>
       </return-value>
       <parameters>
         <parameter name="context">
@@ -7531,7 +7551,7 @@
     <function name="main_context_find_source_by_funcs_user_data"
               c:identifier="g_main_context_find_source_by_funcs_user_data">
       <return-value>
-        <type name="GSource*" c:type="GSource*"/>
+        <type name="GSource" c:type="GSource*"/>
       </return-value>
       <parameters>
         <parameter name="context">
@@ -7733,12 +7753,12 @@
     </function>
     <function name="main_current_source" c:identifier="g_main_current_source">
       <return-value>
-        <type name="GSource*" c:type="GSource*"/>
+        <type name="GSource" c:type="GSource*"/>
       </return-value>
     </function>
     <function name="main_loop_new" c:identifier="g_main_loop_new">
       <return-value>
-        <type name="GMainLoop*" c:type="GMainLoop*"/>
+        <type name="GMainLoop" c:type="GMainLoop*"/>
       </return-value>
       <parameters>
         <parameter name="context">
@@ -7771,7 +7791,7 @@
     </function>
     <function name="main_loop_ref" c:identifier="g_main_loop_ref">
       <return-value>
-        <type name="GMainLoop*" c:type="GMainLoop*"/>
+        <type name="GMainLoop" c:type="GMainLoop*"/>
       </return-value>
       <parameters>
         <parameter name="loop">
@@ -7803,7 +7823,7 @@
     <function name="main_loop_get_context"
               c:identifier="g_main_loop_get_context">
       <return-value>
-        <type name="GMainContext*" c:type="GMainContext*"/>
+        <type name="GMainContext" c:type="GMainContext*"/>
       </return-value>
       <parameters>
         <parameter name="loop">
@@ -7813,7 +7833,7 @@
     </function>
     <function name="source_new" c:identifier="g_source_new">
       <return-value>
-        <type name="GSource*" c:type="GSource*"/>
+        <type name="GSource" c:type="GSource*"/>
       </return-value>
       <parameters>
         <parameter name="source_funcs">
@@ -7826,7 +7846,7 @@
     </function>
     <function name="source_ref" c:identifier="g_source_ref">
       <return-value>
-        <type name="GSource*" c:type="GSource*"/>
+        <type name="GSource" c:type="GSource*"/>
       </return-value>
       <parameters>
         <parameter name="source">
@@ -7927,7 +7947,7 @@
     </function>
     <function name="source_get_context" c:identifier="g_source_get_context">
       <return-value>
-        <type name="GMainContext*" c:type="GMainContext*"/>
+        <type name="GMainContext" c:type="GMainContext*"/>
       </return-value>
       <parameters>
         <parameter name="source">
@@ -8036,13 +8056,13 @@
     </function>
     <function name="idle_source_new" c:identifier="g_idle_source_new">
       <return-value>
-        <type name="GSource*" c:type="GSource*"/>
+        <type name="GSource" c:type="GSource*"/>
       </return-value>
     </function>
     <function name="child_watch_source_new"
               c:identifier="g_child_watch_source_new">
       <return-value>
-        <type name="GSource*" c:type="GSource*"/>
+        <type name="GSource" c:type="GSource*"/>
       </return-value>
       <parameters>
         <parameter name="pid">
@@ -8052,7 +8072,7 @@
     </function>
     <function name="timeout_source_new" c:identifier="g_timeout_source_new">
       <return-value>
-        <type name="GSource*" c:type="GSource*"/>
+        <type name="GSource" c:type="GSource*"/>
       </return-value>
       <parameters>
         <parameter name="interval">
@@ -8063,7 +8083,7 @@
     <function name="timeout_source_new_seconds"
               c:identifier="g_timeout_source_new_seconds">
       <return-value>
-        <type name="GSource*" c:type="GSource*"/>
+        <type name="GSource" c:type="GSource*"/>
       </return-value>
       <parameters>
         <parameter name="interval">
@@ -8942,7 +8962,7 @@
     <function name="unicode_canonical_decomposition"
               c:identifier="g_unicode_canonical_decomposition">
       <return-value>
-        <type name="gunichar*" c:type="gunichar*"/>
+        <type name="gunichar" c:type="gunichar*"/>
       </return-value>
       <parameters>
         <parameter name="ch">
@@ -9117,7 +9137,7 @@
     </function>
     <function name="utf8_to_utf16" c:identifier="g_utf8_to_utf16">
       <return-value>
-        <type name="gunichar2*" c:type="gunichar2*"/>
+        <type name="gunichar2" c:type="gunichar2*"/>
       </return-value>
       <parameters>
         <parameter name="str">
@@ -9139,7 +9159,7 @@
     </function>
     <function name="utf8_to_ucs4" c:identifier="g_utf8_to_ucs4">
       <return-value>
-        <type name="gunichar*" c:type="gunichar*"/>
+        <type name="gunichar" c:type="gunichar*"/>
       </return-value>
       <parameters>
         <parameter name="str">
@@ -9161,7 +9181,7 @@
     </function>
     <function name="utf8_to_ucs4_fast" c:identifier="g_utf8_to_ucs4_fast">
       <return-value>
-        <type name="gunichar*" c:type="gunichar*"/>
+        <type name="gunichar" c:type="gunichar*"/>
       </return-value>
       <parameters>
         <parameter name="str">
@@ -9177,7 +9197,7 @@
     </function>
     <function name="utf16_to_ucs4" c:identifier="g_utf16_to_ucs4">
       <return-value>
-        <type name="gunichar*" c:type="gunichar*"/>
+        <type name="gunichar" c:type="gunichar*"/>
       </return-value>
       <parameters>
         <parameter name="str">
@@ -9221,7 +9241,7 @@
     </function>
     <function name="ucs4_to_utf16" c:identifier="g_ucs4_to_utf16">
       <return-value>
-        <type name="gunichar2*" c:type="gunichar2*"/>
+        <type name="gunichar2" c:type="gunichar2*"/>
       </return-value>
       <parameters>
         <parameter name="str">
@@ -9460,7 +9480,7 @@
     </record>
     <function name="string_chunk_new" c:identifier="g_string_chunk_new">
       <return-value>
-        <type name="GStringChunk*" c:type="GStringChunk*"/>
+        <type name="GStringChunk" c:type="GStringChunk*"/>
       </return-value>
       <parameters>
         <parameter name="size">
@@ -9534,7 +9554,7 @@
     </function>
     <function name="string_new" c:identifier="g_string_new">
       <return-value>
-        <type name="GString*" c:type="GString*"/>
+        <type name="GString" c:type="GString*"/>
       </return-value>
       <parameters>
         <parameter name="init">
@@ -9544,7 +9564,7 @@
     </function>
     <function name="string_new_len" c:identifier="g_string_new_len">
       <return-value>
-        <type name="GString*" c:type="GString*"/>
+        <type name="GString" c:type="GString*"/>
       </return-value>
       <parameters>
         <parameter name="init">
@@ -9557,7 +9577,7 @@
     </function>
     <function name="string_sized_new" c:identifier="g_string_sized_new">
       <return-value>
-        <type name="GString*" c:type="GString*"/>
+        <type name="GString" c:type="GString*"/>
       </return-value>
       <parameters>
         <parameter name="dfl_size">
@@ -9603,7 +9623,7 @@
     </function>
     <function name="string_assign" c:identifier="g_string_assign">
       <return-value>
-        <type name="GString*" c:type="GString*"/>
+        <type name="GString" c:type="GString*"/>
       </return-value>
       <parameters>
         <parameter name="string">
@@ -9616,7 +9636,7 @@
     </function>
     <function name="string_truncate" c:identifier="g_string_truncate">
       <return-value>
-        <type name="GString*" c:type="GString*"/>
+        <type name="GString" c:type="GString*"/>
       </return-value>
       <parameters>
         <parameter name="string">
@@ -9629,7 +9649,7 @@
     </function>
     <function name="string_set_size" c:identifier="g_string_set_size">
       <return-value>
-        <type name="GString*" c:type="GString*"/>
+        <type name="GString" c:type="GString*"/>
       </return-value>
       <parameters>
         <parameter name="string">
@@ -9642,7 +9662,7 @@
     </function>
     <function name="string_insert_len" c:identifier="g_string_insert_len">
       <return-value>
-        <type name="GString*" c:type="GString*"/>
+        <type name="GString" c:type="GString*"/>
       </return-value>
       <parameters>
         <parameter name="string">
@@ -9661,7 +9681,7 @@
     </function>
     <function name="string_append" c:identifier="g_string_append">
       <return-value>
-        <type name="GString*" c:type="GString*"/>
+        <type name="GString" c:type="GString*"/>
       </return-value>
       <parameters>
         <parameter name="string">
@@ -9674,7 +9694,7 @@
     </function>
     <function name="string_append_len" c:identifier="g_string_append_len">
       <return-value>
-        <type name="GString*" c:type="GString*"/>
+        <type name="GString" c:type="GString*"/>
       </return-value>
       <parameters>
         <parameter name="string">
@@ -9690,7 +9710,7 @@
     </function>
     <function name="string_append_c" c:identifier="g_string_append_c">
       <return-value>
-        <type name="GString*" c:type="GString*"/>
+        <type name="GString" c:type="GString*"/>
       </return-value>
       <parameters>
         <parameter name="string">
@@ -9704,7 +9724,7 @@
     <function name="string_append_unichar"
               c:identifier="g_string_append_unichar">
       <return-value>
-        <type name="GString*" c:type="GString*"/>
+        <type name="GString" c:type="GString*"/>
       </return-value>
       <parameters>
         <parameter name="string">
@@ -9717,7 +9737,7 @@
     </function>
     <function name="string_prepend" c:identifier="g_string_prepend">
       <return-value>
-        <type name="GString*" c:type="GString*"/>
+        <type name="GString" c:type="GString*"/>
       </return-value>
       <parameters>
         <parameter name="string">
@@ -9730,7 +9750,7 @@
     </function>
     <function name="string_prepend_c" c:identifier="g_string_prepend_c">
       <return-value>
-        <type name="GString*" c:type="GString*"/>
+        <type name="GString" c:type="GString*"/>
       </return-value>
       <parameters>
         <parameter name="string">
@@ -9744,7 +9764,7 @@
     <function name="string_prepend_unichar"
               c:identifier="g_string_prepend_unichar">
       <return-value>
-        <type name="GString*" c:type="GString*"/>
+        <type name="GString" c:type="GString*"/>
       </return-value>
       <parameters>
         <parameter name="string">
@@ -9757,7 +9777,7 @@
     </function>
     <function name="string_prepend_len" c:identifier="g_string_prepend_len">
       <return-value>
-        <type name="GString*" c:type="GString*"/>
+        <type name="GString" c:type="GString*"/>
       </return-value>
       <parameters>
         <parameter name="string">
@@ -9773,7 +9793,7 @@
     </function>
     <function name="string_insert" c:identifier="g_string_insert">
       <return-value>
-        <type name="GString*" c:type="GString*"/>
+        <type name="GString" c:type="GString*"/>
       </return-value>
       <parameters>
         <parameter name="string">
@@ -9789,7 +9809,7 @@
     </function>
     <function name="string_insert_c" c:identifier="g_string_insert_c">
       <return-value>
-        <type name="GString*" c:type="GString*"/>
+        <type name="GString" c:type="GString*"/>
       </return-value>
       <parameters>
         <parameter name="string">
@@ -9806,7 +9826,7 @@
     <function name="string_insert_unichar"
               c:identifier="g_string_insert_unichar">
       <return-value>
-        <type name="GString*" c:type="GString*"/>
+        <type name="GString" c:type="GString*"/>
       </return-value>
       <parameters>
         <parameter name="string">
@@ -9822,7 +9842,7 @@
     </function>
     <function name="string_overwrite" c:identifier="g_string_overwrite">
       <return-value>
-        <type name="GString*" c:type="GString*"/>
+        <type name="GString" c:type="GString*"/>
       </return-value>
       <parameters>
         <parameter name="string">
@@ -9839,7 +9859,7 @@
     <function name="string_overwrite_len"
               c:identifier="g_string_overwrite_len">
       <return-value>
-        <type name="GString*" c:type="GString*"/>
+        <type name="GString" c:type="GString*"/>
       </return-value>
       <parameters>
         <parameter name="string">
@@ -9858,7 +9878,7 @@
     </function>
     <function name="string_erase" c:identifier="g_string_erase">
       <return-value>
-        <type name="GString*" c:type="GString*"/>
+        <type name="GString" c:type="GString*"/>
       </return-value>
       <parameters>
         <parameter name="string">
@@ -9874,7 +9894,7 @@
     </function>
     <function name="string_ascii_down" c:identifier="g_string_ascii_down">
       <return-value>
-        <type name="GString*" c:type="GString*"/>
+        <type name="GString" c:type="GString*"/>
       </return-value>
       <parameters>
         <parameter name="string">
@@ -9884,7 +9904,7 @@
     </function>
     <function name="string_ascii_up" c:identifier="g_string_ascii_up">
       <return-value>
-        <type name="GString*" c:type="GString*"/>
+        <type name="GString" c:type="GString*"/>
       </return-value>
       <parameters>
         <parameter name="string">
@@ -9955,7 +9975,7 @@
     <function name="string_append_uri_escaped"
               c:identifier="g_string_append_uri_escaped">
       <return-value>
-        <type name="GString*" c:type="GString*"/>
+        <type name="GString" c:type="GString*"/>
       </return-value>
       <parameters>
         <parameter name="string">
@@ -9974,7 +9994,7 @@
     </function>
     <function name="string_down" c:identifier="g_string_down">
       <return-value>
-        <type name="GString*" c:type="GString*"/>
+        <type name="GString" c:type="GString*"/>
       </return-value>
       <parameters>
         <parameter name="string">
@@ -9984,7 +10004,7 @@
     </function>
     <function name="string_up" c:identifier="g_string_up">
       <return-value>
-        <type name="GString*" c:type="GString*"/>
+        <type name="GString" c:type="GString*"/>
       </return-value>
       <parameters>
         <parameter name="string">
@@ -10061,7 +10081,7 @@
         <type name="int32" c:type="gint"/>
       </field>
       <field name="funcs">
-        <type name="GIOFuncs*" c:type="GIOFuncs*"/>
+        <type name="GIOFuncs" c:type="GIOFuncs*"/>
       </field>
       <field name="encoding">
         <type name="string" c:type="gchar*"/>
@@ -10082,13 +10102,13 @@
         <type name="size" c:type="gsize"/>
       </field>
       <field name="read_buf">
-        <type name="GString*" c:type="GString*"/>
+        <type name="GString" c:type="GString*"/>
       </field>
       <field name="encoded_read_buf">
-        <type name="GString*" c:type="GString*"/>
+        <type name="GString" c:type="GString*"/>
       </field>
       <field name="write_buf">
-        <type name="GString*" c:type="GString*"/>
+        <type name="GString" c:type="GString*"/>
       </field>
       <field name="partial_write_buf">
         <type name="gchar" c:type="gchar"/>
@@ -10124,7 +10144,7 @@
       </return-value>
       <parameters>
         <parameter name="source">
-          <type name="GIOChannel*" c:type="GIOChannel*"/>
+          <type name="GIOChannel" c:type="GIOChannel*"/>
         </parameter>
         <parameter name="condition">
           <type name="GIOCondition" c:type="GIOCondition"/>
@@ -10141,7 +10161,7 @@
         </return-value>
         <parameters>
           <parameter name="channel">
-            <type name="GIOChannel*" c:type="GIOChannel*"/>
+            <type name="GIOChannel" c:type="GIOChannel*"/>
           </parameter>
           <parameter name="buf">
             <type name="string" c:type="gchar*"/>
@@ -10150,10 +10170,10 @@
             <type name="size" c:type="gsize"/>
           </parameter>
           <parameter name="bytes_read">
-            <type name="gsize*" c:type="gsize*"/>
+            <type name="gsize" c:type="gsize*"/>
           </parameter>
           <parameter name="err">
-            <type name="GError**" c:type="GError**"/>
+            <type name="GError" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
@@ -10163,7 +10183,7 @@
         </return-value>
         <parameters>
           <parameter name="channel">
-            <type name="GIOChannel*" c:type="GIOChannel*"/>
+            <type name="GIOChannel" c:type="GIOChannel*"/>
           </parameter>
           <parameter name="buf">
             <type name="string" c:type="gchar*"/>
@@ -10172,10 +10192,10 @@
             <type name="size" c:type="gsize"/>
           </parameter>
           <parameter name="bytes_written">
-            <type name="gsize*" c:type="gsize*"/>
+            <type name="gsize" c:type="gsize*"/>
           </parameter>
           <parameter name="err">
-            <type name="GError**" c:type="GError**"/>
+            <type name="GError" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
@@ -10185,7 +10205,7 @@
         </return-value>
         <parameters>
           <parameter name="channel">
-            <type name="GIOChannel*" c:type="GIOChannel*"/>
+            <type name="GIOChannel" c:type="GIOChannel*"/>
           </parameter>
           <parameter name="offset">
             <type name="gint64" c:type="gint64"/>
@@ -10194,7 +10214,7 @@
             <type name="GSeekType" c:type="GSeekType"/>
           </parameter>
           <parameter name="err">
-            <type name="GError**" c:type="GError**"/>
+            <type name="GError" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
@@ -10204,20 +10224,20 @@
         </return-value>
         <parameters>
           <parameter name="channel">
-            <type name="GIOChannel*" c:type="GIOChannel*"/>
+            <type name="GIOChannel" c:type="GIOChannel*"/>
           </parameter>
           <parameter name="err">
-            <type name="GError**" c:type="GError**"/>
+            <type name="GError" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
       <callback name="io_create_watch">
         <return-value>
-          <type name="GSource*" c:type="GSource*"/>
+          <type name="GSource" c:type="GSource*"/>
         </return-value>
         <parameters>
           <parameter name="channel">
-            <type name="GIOChannel*" c:type="GIOChannel*"/>
+            <type name="GIOChannel" c:type="GIOChannel*"/>
           </parameter>
           <parameter name="condition">
             <type name="GIOCondition" c:type="GIOCondition"/>
@@ -10230,7 +10250,7 @@
         </return-value>
         <parameters>
           <parameter name="channel">
-            <type name="GIOChannel*" c:type="GIOChannel*"/>
+            <type name="GIOChannel" c:type="GIOChannel*"/>
           </parameter>
         </parameters>
       </callback>
@@ -10240,13 +10260,13 @@
         </return-value>
         <parameters>
           <parameter name="channel">
-            <type name="GIOChannel*" c:type="GIOChannel*"/>
+            <type name="GIOChannel" c:type="GIOChannel*"/>
           </parameter>
           <parameter name="flags">
             <type name="GIOFlags" c:type="GIOFlags"/>
           </parameter>
           <parameter name="err">
-            <type name="GError**" c:type="GError**"/>
+            <type name="GError" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
@@ -10256,7 +10276,7 @@
         </return-value>
         <parameters>
           <parameter name="channel">
-            <type name="GIOChannel*" c:type="GIOChannel*"/>
+            <type name="GIOChannel" c:type="GIOChannel*"/>
           </parameter>
         </parameters>
       </callback>
@@ -10273,7 +10293,7 @@
     </function>
     <function name="io_channel_ref" c:identifier="g_io_channel_ref">
       <return-value>
-        <type name="GIOChannel*" c:type="GIOChannel*"/>
+        <type name="GIOChannel" c:type="GIOChannel*"/>
       </return-value>
       <parameters>
         <parameter name="channel">
@@ -10398,7 +10418,7 @@
     </function>
     <function name="io_create_watch" c:identifier="g_io_create_watch">
       <return-value>
-        <type name="GSource*" c:type="GSource*"/>
+        <type name="GSource" c:type="GSource*"/>
       </return-value>
       <parameters>
         <parameter name="channel">
@@ -10779,7 +10799,7 @@
     </function>
     <function name="io_channel_new_file" c:identifier="g_io_channel_new_file">
       <return-value>
-        <type name="GIOChannel*" c:type="GIOChannel*"/>
+        <type name="GIOChannel" c:type="GIOChannel*"/>
       </return-value>
       <parameters>
         <parameter name="filename">
@@ -10812,7 +10832,7 @@
     </function>
     <function name="io_channel_unix_new" c:identifier="g_io_channel_unix_new">
       <return-value>
-        <type name="GIOChannel*" c:type="GIOChannel*"/>
+        <type name="GIOChannel" c:type="GIOChannel*"/>
       </return-value>
       <parameters>
         <parameter name="fd">
@@ -10867,7 +10887,7 @@
     </enumeration>
     <function name="key_file_new" c:identifier="g_key_file_new">
       <return-value>
-        <type name="GKeyFile*" c:type="GKeyFile*"/>
+        <type name="GKeyFile" c:type="GKeyFile*"/>
       </return-value>
     </function>
     <function name="key_file_free" c:identifier="g_key_file_free">
@@ -11015,7 +11035,7 @@
     </function>
     <function name="key_file_get_groups" c:identifier="g_key_file_get_groups">
       <return-value>
-        <type name="gchar**" c:type="gchar**"/>
+        <type name="gchar" c:type="gchar**"/>
       </return-value>
       <parameters>
         <parameter name="key_file">
@@ -11028,7 +11048,7 @@
     </function>
     <function name="key_file_get_keys" c:identifier="g_key_file_get_keys">
       <return-value>
-        <type name="gchar**" c:type="gchar**"/>
+        <type name="gchar" c:type="gchar**"/>
       </return-value>
       <parameters>
         <parameter name="key_file">
@@ -11320,7 +11340,7 @@
     <function name="key_file_get_string_list"
               c:identifier="g_key_file_get_string_list">
       <return-value>
-        <type name="gchar**" c:type="gchar**"/>
+        <type name="gchar" c:type="gchar**"/>
       </return-value>
       <parameters>
         <parameter name="key_file">
@@ -11366,7 +11386,7 @@
     <function name="key_file_get_locale_string_list"
               c:identifier="g_key_file_get_locale_string_list">
       <return-value>
-        <type name="gchar**" c:type="gchar**"/>
+        <type name="gchar" c:type="gchar**"/>
       </return-value>
       <parameters>
         <parameter name="key_file">
@@ -11418,7 +11438,7 @@
     <function name="key_file_get_boolean_list"
               c:identifier="g_key_file_get_boolean_list">
       <return-value>
-        <type name="gboolean*" c:type="gboolean*"/>
+        <type name="gboolean" c:type="gboolean*"/>
       </return-value>
       <parameters>
         <parameter name="key_file">
@@ -11464,7 +11484,7 @@
     <function name="key_file_get_integer_list"
               c:identifier="g_key_file_get_integer_list">
       <return-value>
-        <type name="gint*" c:type="gint*"/>
+        <type name="gint" c:type="gint*"/>
       </return-value>
       <parameters>
         <parameter name="key_file">
@@ -11510,7 +11530,7 @@
     <function name="key_file_get_double_list"
               c:identifier="g_key_file_get_double_list">
       <return-value>
-        <type name="gdouble*" c:type="gdouble*"/>
+        <type name="gdouble" c:type="gdouble*"/>
       </return-value>
       <parameters>
         <parameter name="key_file">
@@ -11655,7 +11675,7 @@
     <record name="MappedFile" c:type="GMappedFile"/>
     <function name="mapped_file_new" c:identifier="g_mapped_file_new">
       <return-value>
-        <type name="GMappedFile*" c:type="GMappedFile*"/>
+        <type name="GMappedFile" c:type="GMappedFile*"/>
       </return-value>
       <parameters>
         <parameter name="filename">
@@ -11745,22 +11765,22 @@
         </return-value>
         <parameters>
           <parameter name="context">
-            <type name="GMarkupParseContext*" c:type="GMarkupParseContext*"/>
+            <type name="GMarkupParseContext" c:type="GMarkupParseContext*"/>
           </parameter>
           <parameter name="element_name">
             <type name="string" c:type="gchar*"/>
           </parameter>
           <parameter name="attribute_names">
-            <type name="gchar**" c:type="gchar**"/>
+            <type name="gchar" c:type="gchar**"/>
           </parameter>
           <parameter name="attribute_values">
-            <type name="gchar**" c:type="gchar**"/>
+            <type name="gchar" c:type="gchar**"/>
           </parameter>
           <parameter name="user_data">
             <type name="any" c:type="gpointer"/>
           </parameter>
           <parameter name="error">
-            <type name="GError**" c:type="GError**"/>
+            <type name="GError" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
@@ -11770,7 +11790,7 @@
         </return-value>
         <parameters>
           <parameter name="context">
-            <type name="GMarkupParseContext*" c:type="GMarkupParseContext*"/>
+            <type name="GMarkupParseContext" c:type="GMarkupParseContext*"/>
           </parameter>
           <parameter name="element_name">
             <type name="string" c:type="gchar*"/>
@@ -11779,7 +11799,7 @@
             <type name="any" c:type="gpointer"/>
           </parameter>
           <parameter name="error">
-            <type name="GError**" c:type="GError**"/>
+            <type name="GError" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
@@ -11789,7 +11809,7 @@
         </return-value>
         <parameters>
           <parameter name="context">
-            <type name="GMarkupParseContext*" c:type="GMarkupParseContext*"/>
+            <type name="GMarkupParseContext" c:type="GMarkupParseContext*"/>
           </parameter>
           <parameter name="text">
             <type name="string" c:type="gchar*"/>
@@ -11801,7 +11821,7 @@
             <type name="any" c:type="gpointer"/>
           </parameter>
           <parameter name="error">
-            <type name="GError**" c:type="GError**"/>
+            <type name="GError" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
@@ -11811,7 +11831,7 @@
         </return-value>
         <parameters>
           <parameter name="context">
-            <type name="GMarkupParseContext*" c:type="GMarkupParseContext*"/>
+            <type name="GMarkupParseContext" c:type="GMarkupParseContext*"/>
           </parameter>
           <parameter name="passthrough_text">
             <type name="string" c:type="gchar*"/>
@@ -11823,7 +11843,7 @@
             <type name="any" c:type="gpointer"/>
           </parameter>
           <parameter name="error">
-            <type name="GError**" c:type="GError**"/>
+            <type name="GError" c:type="GError**"/>
           </parameter>
         </parameters>
       </callback>
@@ -11833,10 +11853,10 @@
         </return-value>
         <parameters>
           <parameter name="context">
-            <type name="GMarkupParseContext*" c:type="GMarkupParseContext*"/>
+            <type name="GMarkupParseContext" c:type="GMarkupParseContext*"/>
           </parameter>
           <parameter name="error">
-            <type name="GError*" c:type="GError*"/>
+            <type name="GError" c:type="GError*"/>
           </parameter>
           <parameter name="user_data">
             <type name="any" c:type="gpointer"/>
@@ -11847,7 +11867,7 @@
     <function name="markup_parse_context_new"
               c:identifier="g_markup_parse_context_new">
       <return-value>
-        <type name="GMarkupParseContext*" c:type="GMarkupParseContext*"/>
+        <type name="GMarkupParseContext" c:type="GMarkupParseContext*"/>
       </return-value>
       <parameters>
         <parameter name="parser">
@@ -11951,7 +11971,7 @@
     <function name="markup_parse_context_get_element_stack"
               c:identifier="g_markup_parse_context_get_element_stack">
       <return-value>
-        <type name="GSList*" c:type="GSList*"/>
+        <type name="GSList" c:type="GSList*"/>
       </return-value>
       <parameters>
         <parameter name="context">
@@ -11976,6 +11996,17 @@
         </parameter>
       </parameters>
     </function>
+    <function name="markup_parse_context_get_user_data"
+              c:identifier="g_markup_parse_context_get_user_data">
+      <return-value>
+        <type name="any" c:type="gpointer"/>
+      </return-value>
+      <parameters>
+        <parameter name="context">
+          <type name="GMarkupParseContext" c:type="GMarkupParseContext*"/>
+        </parameter>
+      </parameters>
+    </function>
     <function name="markup_escape_text" c:identifier="g_markup_escape_text">
       <return-value>
         <type name="string" c:type="gchar*"/>
@@ -12381,7 +12412,7 @@
       </return-value>
       <parameters>
         <parameter name="node">
-          <type name="GNode*" c:type="GNode*"/>
+          <type name="GNode" c:type="GNode*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
@@ -12394,7 +12425,7 @@
       </return-value>
       <parameters>
         <parameter name="node">
-          <type name="GNode*" c:type="GNode*"/>
+          <type name="GNode" c:type="GNode*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
@@ -12419,21 +12450,21 @@
         <type name="any" c:type="gpointer"/>
       </field>
       <field name="next">
-        <type name="GNode*" c:type="GNode*"/>
+        <type name="GNode" c:type="GNode*"/>
       </field>
       <field name="prev">
-        <type name="GNode*" c:type="GNode*"/>
+        <type name="GNode" c:type="GNode*"/>
       </field>
       <field name="parent">
-        <type name="GNode*" c:type="GNode*"/>
+        <type name="GNode" c:type="GNode*"/>
       </field>
       <field name="children">
-        <type name="GNode*" c:type="GNode*"/>
+        <type name="GNode" c:type="GNode*"/>
       </field>
     </record>
     <function name="node_new" c:identifier="g_node_new">
       <return-value>
-        <type name="GNode*" c:type="GNode*"/>
+        <type name="GNode" c:type="GNode*"/>
       </return-value>
       <parameters>
         <parameter name="data">
@@ -12463,7 +12494,7 @@
     </function>
     <function name="node_copy_deep" c:identifier="g_node_copy_deep">
       <return-value>
-        <type name="GNode*" c:type="GNode*"/>
+        <type name="GNode" c:type="GNode*"/>
       </return-value>
       <parameters>
         <parameter name="node">
@@ -12479,7 +12510,7 @@
     </function>
     <function name="node_copy" c:identifier="g_node_copy">
       <return-value>
-        <type name="GNode*" c:type="GNode*"/>
+        <type name="GNode" c:type="GNode*"/>
       </return-value>
       <parameters>
         <parameter name="node">
@@ -12489,7 +12520,7 @@
     </function>
     <function name="node_insert" c:identifier="g_node_insert">
       <return-value>
-        <type name="GNode*" c:type="GNode*"/>
+        <type name="GNode" c:type="GNode*"/>
       </return-value>
       <parameters>
         <parameter name="parent">
@@ -12505,7 +12536,7 @@
     </function>
     <function name="node_insert_before" c:identifier="g_node_insert_before">
       <return-value>
-        <type name="GNode*" c:type="GNode*"/>
+        <type name="GNode" c:type="GNode*"/>
       </return-value>
       <parameters>
         <parameter name="parent">
@@ -12521,7 +12552,7 @@
     </function>
     <function name="node_insert_after" c:identifier="g_node_insert_after">
       <return-value>
-        <type name="GNode*" c:type="GNode*"/>
+        <type name="GNode" c:type="GNode*"/>
       </return-value>
       <parameters>
         <parameter name="parent">
@@ -12537,7 +12568,7 @@
     </function>
     <function name="node_prepend" c:identifier="g_node_prepend">
       <return-value>
-        <type name="GNode*" c:type="GNode*"/>
+        <type name="GNode" c:type="GNode*"/>
       </return-value>
       <parameters>
         <parameter name="parent">
@@ -12563,7 +12594,7 @@
     </function>
     <function name="node_get_root" c:identifier="g_node_get_root">
       <return-value>
-        <type name="GNode*" c:type="GNode*"/>
+        <type name="GNode" c:type="GNode*"/>
       </return-value>
       <parameters>
         <parameter name="node">
@@ -12596,7 +12627,7 @@
     </function>
     <function name="node_find" c:identifier="g_node_find">
       <return-value>
-        <type name="GNode*" c:type="GNode*"/>
+        <type name="GNode" c:type="GNode*"/>
       </return-value>
       <parameters>
         <parameter name="root">
@@ -12691,7 +12722,7 @@
     </function>
     <function name="node_nth_child" c:identifier="g_node_nth_child">
       <return-value>
-        <type name="GNode*" c:type="GNode*"/>
+        <type name="GNode" c:type="GNode*"/>
       </return-value>
       <parameters>
         <parameter name="node">
@@ -12704,7 +12735,7 @@
     </function>
     <function name="node_last_child" c:identifier="g_node_last_child">
       <return-value>
-        <type name="GNode*" c:type="GNode*"/>
+        <type name="GNode" c:type="GNode*"/>
       </return-value>
       <parameters>
         <parameter name="node">
@@ -12714,7 +12745,7 @@
     </function>
     <function name="node_find_child" c:identifier="g_node_find_child">
       <return-value>
-        <type name="GNode*" c:type="GNode*"/>
+        <type name="GNode" c:type="GNode*"/>
       </return-value>
       <parameters>
         <parameter name="node">
@@ -12756,7 +12787,7 @@
     </function>
     <function name="node_first_sibling" c:identifier="g_node_first_sibling">
       <return-value>
-        <type name="GNode*" c:type="GNode*"/>
+        <type name="GNode" c:type="GNode*"/>
       </return-value>
       <parameters>
         <parameter name="node">
@@ -12766,7 +12797,7 @@
     </function>
     <function name="node_last_sibling" c:identifier="g_node_last_sibling">
       <return-value>
-        <type name="GNode*" c:type="GNode*"/>
+        <type name="GNode" c:type="GNode*"/>
       </return-value>
       <parameters>
         <parameter name="node">
@@ -12839,7 +12870,7 @@
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="error">
-          <type name="GError**" c:type="GError**"/>
+          <type name="GError" c:type="GError**"/>
         </parameter>
       </parameters>
     </callback>
@@ -12849,16 +12880,16 @@
       </return-value>
       <parameters>
         <parameter name="context">
-          <type name="GOptionContext*" c:type="GOptionContext*"/>
+          <type name="GOptionContext" c:type="GOptionContext*"/>
         </parameter>
         <parameter name="group">
-          <type name="GOptionGroup*" c:type="GOptionGroup*"/>
+          <type name="GOptionGroup" c:type="GOptionGroup*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="error">
-          <type name="GError**" c:type="GError**"/>
+          <type name="GError" c:type="GError**"/>
         </parameter>
       </parameters>
     </callback>
@@ -12868,16 +12899,16 @@
       </return-value>
       <parameters>
         <parameter name="context">
-          <type name="GOptionContext*" c:type="GOptionContext*"/>
+          <type name="GOptionContext" c:type="GOptionContext*"/>
         </parameter>
         <parameter name="group">
-          <type name="GOptionGroup*" c:type="GOptionGroup*"/>
+          <type name="GOptionGroup" c:type="GOptionGroup*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="error">
-          <type name="GError**" c:type="GError**"/>
+          <type name="GError" c:type="GError**"/>
         </parameter>
       </parameters>
     </callback>
@@ -12920,7 +12951,7 @@
     </record>
     <function name="option_context_new" c:identifier="g_option_context_new">
       <return-value>
-        <type name="GOptionContext*" c:type="GOptionContext*"/>
+        <type name="GOptionContext" c:type="GOptionContext*"/>
       </return-value>
       <parameters>
         <parameter name="parameter_string">
@@ -13140,7 +13171,7 @@
     <function name="option_context_get_main_group"
               c:identifier="g_option_context_get_main_group">
       <return-value>
-        <type name="GOptionGroup*" c:type="GOptionGroup*"/>
+        <type name="GOptionGroup" c:type="GOptionGroup*"/>
       </return-value>
       <parameters>
         <parameter name="context">
@@ -13167,7 +13198,7 @@
     </function>
     <function name="option_group_new" c:identifier="g_option_group_new">
       <return-value>
-        <type name="GOptionGroup*" c:type="GOptionGroup*"/>
+        <type name="GOptionGroup" c:type="GOptionGroup*"/>
       </return-value>
       <parameters>
         <parameter name="name">
@@ -13279,7 +13310,7 @@
     <record name="PatternSpec" c:type="GPatternSpec"/>
     <function name="pattern_spec_new" c:identifier="g_pattern_spec_new">
       <return-value>
-        <type name="GPatternSpec*" c:type="GPatternSpec*"/>
+        <type name="GPatternSpec" c:type="GPatternSpec*"/>
       </return-value>
       <parameters>
         <parameter name="pattern">
@@ -13393,10 +13424,10 @@
     <record name="Queue" c:type="GQueue"/>
     <record name="GQueue" c:type="_GQueue">
       <field name="head">
-        <type name="GList*" c:type="GList*"/>
+        <type name="GList" c:type="GList*"/>
       </field>
       <field name="tail">
-        <type name="GList*" c:type="GList*"/>
+        <type name="GList" c:type="GList*"/>
       </field>
       <field name="length">
         <type name="uint32" c:type="guint"/>
@@ -13404,7 +13435,7 @@
     </record>
     <function name="queue_new" c:identifier="g_queue_new">
       <return-value>
-        <type name="GQueue*" c:type="GQueue*"/>
+        <type name="GQueue" c:type="GQueue*"/>
       </return-value>
     </function>
     <function name="queue_free" c:identifier="g_queue_free">
@@ -13469,7 +13500,7 @@
     </function>
     <function name="queue_copy" c:identifier="g_queue_copy">
       <return-value>
-        <type name="GQueue*" c:type="GQueue*"/>
+        <type name="GQueue" c:type="GQueue*"/>
       </return-value>
       <parameters>
         <parameter name="queue">
@@ -13495,7 +13526,7 @@
     </function>
     <function name="queue_find" c:identifier="g_queue_find">
       <return-value>
-        <type name="GList*" c:type="GList*"/>
+        <type name="GList" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="queue">
@@ -13508,7 +13539,7 @@
     </function>
     <function name="queue_find_custom" c:identifier="g_queue_find_custom">
       <return-value>
-        <type name="GList*" c:type="GList*"/>
+        <type name="GList" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="queue">
@@ -13782,7 +13813,7 @@
     </function>
     <function name="queue_pop_head_link" c:identifier="g_queue_pop_head_link">
       <return-value>
-        <type name="GList*" c:type="GList*"/>
+        <type name="GList" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="queue">
@@ -13792,7 +13823,7 @@
     </function>
     <function name="queue_pop_tail_link" c:identifier="g_queue_pop_tail_link">
       <return-value>
-        <type name="GList*" c:type="GList*"/>
+        <type name="GList" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="queue">
@@ -13802,7 +13833,7 @@
     </function>
     <function name="queue_pop_nth_link" c:identifier="g_queue_pop_nth_link">
       <return-value>
-        <type name="GList*" c:type="GList*"/>
+        <type name="GList" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="queue">
@@ -13816,7 +13847,7 @@
     <function name="queue_peek_head_link"
               c:identifier="g_queue_peek_head_link">
       <return-value>
-        <type name="GList*" c:type="GList*"/>
+        <type name="GList" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="queue">
@@ -13827,7 +13858,7 @@
     <function name="queue_peek_tail_link"
               c:identifier="g_queue_peek_tail_link">
       <return-value>
-        <type name="GList*" c:type="GList*"/>
+        <type name="GList" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="queue">
@@ -13837,7 +13868,7 @@
     </function>
     <function name="queue_peek_nth_link" c:identifier="g_queue_peek_nth_link">
       <return-value>
-        <type name="GList*" c:type="GList*"/>
+        <type name="GList" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="queue">
@@ -13890,7 +13921,7 @@
     <record name="Rand" c:type="GRand"/>
     <function name="rand_new_with_seed" c:identifier="g_rand_new_with_seed">
       <return-value>
-        <type name="GRand*" c:type="GRand*"/>
+        <type name="GRand" c:type="GRand*"/>
       </return-value>
       <parameters>
         <parameter name="seed">
@@ -13901,7 +13932,7 @@
     <function name="rand_new_with_seed_array"
               c:identifier="g_rand_new_with_seed_array">
       <return-value>
-        <type name="GRand*" c:type="GRand*"/>
+        <type name="GRand" c:type="GRand*"/>
       </return-value>
       <parameters>
         <parameter name="seed">
@@ -13914,7 +13945,7 @@
     </function>
     <function name="rand_new" c:identifier="g_rand_new">
       <return-value>
-        <type name="GRand*" c:type="GRand*"/>
+        <type name="GRand" c:type="GRand*"/>
       </return-value>
     </function>
     <function name="rand_free" c:identifier="g_rand_free">
@@ -13929,7 +13960,7 @@
     </function>
     <function name="rand_copy" c:identifier="g_rand_copy">
       <return-value>
-        <type name="GRand*" c:type="GRand*"/>
+        <type name="GRand" c:type="GRand*"/>
       </return-value>
       <parameters>
         <parameter name="rand_">
@@ -14073,7 +14104,7 @@
     </record>
     <function name="relation_new" c:identifier="g_relation_new">
       <return-value>
-        <type name="GRelation*" c:type="GRelation*"/>
+        <type name="GRelation" c:type="GRelation*"/>
       </return-value>
       <parameters>
         <parameter name="fields">
@@ -14138,7 +14169,7 @@
     </function>
     <function name="relation_select" c:identifier="g_relation_select">
       <return-value>
-        <type name="GTuples*" c:type="GTuples*"/>
+        <type name="GTuples" c:type="GTuples*"/>
       </return-value>
       <parameters>
         <parameter name="relation">
@@ -14400,10 +14431,10 @@
       </return-value>
       <parameters>
         <parameter name="match_info">
-          <type name="GMatchInfo*" c:type="GMatchInfo*"/>
+          <type name="GMatchInfo" c:type="GMatchInfo*"/>
         </parameter>
         <parameter name="result">
-          <type name="GString*" c:type="GString*"/>
+          <type name="GString" c:type="GString*"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>
@@ -14412,7 +14443,7 @@
     </callback>
     <function name="regex_new" c:identifier="g_regex_new">
       <return-value>
-        <type name="GRegex*" c:type="GRegex*"/>
+        <type name="GRegex" c:type="GRegex*"/>
       </return-value>
       <parameters>
         <parameter name="pattern">
@@ -14431,7 +14462,7 @@
     </function>
     <function name="regex_ref" c:identifier="g_regex_ref">
       <return-value>
-        <type name="GRegex*" c:type="GRegex*"/>
+        <type name="GRegex" c:type="GRegex*"/>
       </return-value>
       <parameters>
         <parameter name="regex">
@@ -14624,7 +14655,7 @@
     </function>
     <function name="regex_split_simple" c:identifier="g_regex_split_simple">
       <return-value>
-        <type name="gchar**" c:type="gchar**"/>
+        <type name="gchar" c:type="gchar**"/>
       </return-value>
       <parameters>
         <parameter name="pattern">
@@ -14643,7 +14674,7 @@
     </function>
     <function name="regex_split" c:identifier="g_regex_split">
       <return-value>
-        <type name="gchar**" c:type="gchar**"/>
+        <type name="gchar" c:type="gchar**"/>
       </return-value>
       <parameters>
         <parameter name="regex">
@@ -14659,7 +14690,7 @@
     </function>
     <function name="regex_split_full" c:identifier="g_regex_split_full">
       <return-value>
-        <type name="gchar**" c:type="gchar**"/>
+        <type name="gchar" c:type="gchar**"/>
       </return-value>
       <parameters>
         <parameter name="regex">
@@ -14793,7 +14824,7 @@
     <function name="match_info_get_regex"
               c:identifier="g_match_info_get_regex">
       <return-value>
-        <type name="GRegex*" c:type="GRegex*"/>
+        <type name="GRegex" c:type="GRegex*"/>
       </return-value>
       <parameters>
         <parameter name="match_info">
@@ -14954,7 +14985,7 @@
     <function name="match_info_fetch_all"
               c:identifier="g_match_info_fetch_all">
       <return-value>
-        <type name="gchar**" c:type="gchar**"/>
+        <type name="gchar" c:type="gchar**"/>
       </return-value>
       <parameters>
         <parameter name="match_info">
@@ -14970,7 +15001,7 @@
       </return-value>
       <parameters>
         <parameter name="scanner">
-          <type name="GScanner*" c:type="GScanner*"/>
+          <type name="GScanner" c:type="GScanner*"/>
         </parameter>
         <parameter name="message">
           <type name="string" c:type="gchar*"/>
@@ -15127,10 +15158,10 @@
         <type name="string" c:type="gchar*"/>
       </field>
       <field name="qdata">
-        <type name="GData*" c:type="GData*"/>
+        <type name="GData" c:type="GData*"/>
       </field>
       <field name="config">
-        <type name="GScannerConfig*" c:type="GScannerConfig*"/>
+        <type name="GScannerConfig" c:type="GScannerConfig*"/>
       </field>
       <field name="token">
         <type name="GTokenType" c:type="GTokenType"/>
@@ -15157,7 +15188,7 @@
         <type name="uint32" c:type="guint"/>
       </field>
       <field name="symbol_table">
-        <type name="GHashTable*" c:type="GHashTable*"/>
+        <type name="GHashTable" c:type="GHashTable*"/>
       </field>
       <field name="input_fd">
         <type name="int32" c:type="gint"/>
@@ -15180,7 +15211,7 @@
     </record>
     <function name="scanner_new" c:identifier="g_scanner_new">
       <return-value>
-        <type name="GScanner*" c:type="GScanner*"/>
+        <type name="GScanner" c:type="GScanner*"/>
       </return-value>
       <parameters>
         <parameter name="config_templ">
@@ -15474,10 +15505,10 @@
       </return-value>
       <parameters>
         <parameter name="a">
-          <type name="GSequenceIter*" c:type="GSequenceIter*"/>
+          <type name="GSequenceIter" c:type="GSequenceIter*"/>
         </parameter>
         <parameter name="b">
-          <type name="GSequenceIter*" c:type="GSequenceIter*"/>
+          <type name="GSequenceIter" c:type="GSequenceIter*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
@@ -15486,7 +15517,7 @@
     </callback>
     <function name="sequence_new" c:identifier="g_sequence_new">
       <return-value>
-        <type name="GSequence*" c:type="GSequence*"/>
+        <type name="GSequence" c:type="GSequence*"/>
       </return-value>
       <parameters>
         <parameter name="data_destroy">
@@ -15586,7 +15617,7 @@
     <function name="sequence_get_begin_iter"
               c:identifier="g_sequence_get_begin_iter">
       <return-value>
-        <type name="GSequenceIter*" c:type="GSequenceIter*"/>
+        <type name="GSequenceIter" c:type="GSequenceIter*"/>
       </return-value>
       <parameters>
         <parameter name="seq">
@@ -15597,7 +15628,7 @@
     <function name="sequence_get_end_iter"
               c:identifier="g_sequence_get_end_iter">
       <return-value>
-        <type name="GSequenceIter*" c:type="GSequenceIter*"/>
+        <type name="GSequenceIter" c:type="GSequenceIter*"/>
       </return-value>
       <parameters>
         <parameter name="seq">
@@ -15608,7 +15639,7 @@
     <function name="sequence_get_iter_at_pos"
               c:identifier="g_sequence_get_iter_at_pos">
       <return-value>
-        <type name="GSequenceIter*" c:type="GSequenceIter*"/>
+        <type name="GSequenceIter" c:type="GSequenceIter*"/>
       </return-value>
       <parameters>
         <parameter name="seq">
@@ -15621,7 +15652,7 @@
     </function>
     <function name="sequence_append" c:identifier="g_sequence_append">
       <return-value>
-        <type name="GSequenceIter*" c:type="GSequenceIter*"/>
+        <type name="GSequenceIter" c:type="GSequenceIter*"/>
       </return-value>
       <parameters>
         <parameter name="seq">
@@ -15634,7 +15665,7 @@
     </function>
     <function name="sequence_prepend" c:identifier="g_sequence_prepend">
       <return-value>
-        <type name="GSequenceIter*" c:type="GSequenceIter*"/>
+        <type name="GSequenceIter" c:type="GSequenceIter*"/>
       </return-value>
       <parameters>
         <parameter name="seq">
@@ -15648,7 +15679,7 @@
     <function name="sequence_insert_before"
               c:identifier="g_sequence_insert_before">
       <return-value>
-        <type name="GSequenceIter*" c:type="GSequenceIter*"/>
+        <type name="GSequenceIter" c:type="GSequenceIter*"/>
       </return-value>
       <parameters>
         <parameter name="iter">
@@ -15688,7 +15719,7 @@
     <function name="sequence_insert_sorted"
               c:identifier="g_sequence_insert_sorted">
       <return-value>
-        <type name="GSequenceIter*" c:type="GSequenceIter*"/>
+        <type name="GSequenceIter" c:type="GSequenceIter*"/>
       </return-value>
       <parameters>
         <parameter name="seq">
@@ -15708,7 +15739,7 @@
     <function name="sequence_insert_sorted_iter"
               c:identifier="g_sequence_insert_sorted_iter">
       <return-value>
-        <type name="GSequenceIter*" c:type="GSequenceIter*"/>
+        <type name="GSequenceIter" c:type="GSequenceIter*"/>
       </return-value>
       <parameters>
         <parameter name="seq">
@@ -15803,7 +15834,7 @@
     </function>
     <function name="sequence_search" c:identifier="g_sequence_search">
       <return-value>
-        <type name="GSequenceIter*" c:type="GSequenceIter*"/>
+        <type name="GSequenceIter" c:type="GSequenceIter*"/>
       </return-value>
       <parameters>
         <parameter name="seq">
@@ -15823,7 +15854,7 @@
     <function name="sequence_search_iter"
               c:identifier="g_sequence_search_iter">
       <return-value>
-        <type name="GSequenceIter*" c:type="GSequenceIter*"/>
+        <type name="GSequenceIter" c:type="GSequenceIter*"/>
       </return-value>
       <parameters>
         <parameter name="seq">
@@ -15888,7 +15919,7 @@
     </function>
     <function name="sequence_iter_next" c:identifier="g_sequence_iter_next">
       <return-value>
-        <type name="GSequenceIter*" c:type="GSequenceIter*"/>
+        <type name="GSequenceIter" c:type="GSequenceIter*"/>
       </return-value>
       <parameters>
         <parameter name="iter">
@@ -15898,7 +15929,7 @@
     </function>
     <function name="sequence_iter_prev" c:identifier="g_sequence_iter_prev">
       <return-value>
-        <type name="GSequenceIter*" c:type="GSequenceIter*"/>
+        <type name="GSequenceIter" c:type="GSequenceIter*"/>
       </return-value>
       <parameters>
         <parameter name="iter">
@@ -15919,7 +15950,7 @@
     </function>
     <function name="sequence_iter_move" c:identifier="g_sequence_iter_move">
       <return-value>
-        <type name="GSequenceIter*" c:type="GSequenceIter*"/>
+        <type name="GSequenceIter" c:type="GSequenceIter*"/>
       </return-value>
       <parameters>
         <parameter name="iter">
@@ -15933,7 +15964,7 @@
     <function name="sequence_iter_get_sequence"
               c:identifier="g_sequence_iter_get_sequence">
       <return-value>
-        <type name="GSequence*" c:type="GSequence*"/>
+        <type name="GSequence" c:type="GSequence*"/>
       </return-value>
       <parameters>
         <parameter name="iter">
@@ -15958,7 +15989,7 @@
     <function name="sequence_range_get_midpoint"
               c:identifier="g_sequence_range_get_midpoint">
       <return-value>
-        <type name="GSequenceIter*" c:type="GSequenceIter*"/>
+        <type name="GSequenceIter" c:type="GSequenceIter*"/>
       </return-value>
       <parameters>
         <parameter name="begin">
@@ -16795,7 +16826,7 @@
     </function>
     <function name="strsplit" c:identifier="g_strsplit">
       <return-value>
-        <type name="gchar**" c:type="gchar**"/>
+        <type name="gchar" c:type="gchar**"/>
       </return-value>
       <parameters>
         <parameter name="string">
@@ -16811,7 +16842,7 @@
     </function>
     <function name="strsplit_set" c:identifier="g_strsplit_set">
       <return-value>
-        <type name="gchar**" c:type="gchar**"/>
+        <type name="gchar" c:type="gchar**"/>
       </return-value>
       <parameters>
         <parameter name="string">
@@ -16850,7 +16881,7 @@
     </function>
     <function name="strdupv" c:identifier="g_strdupv">
       <return-value>
-        <type name="gchar**" c:type="gchar**"/>
+        <type name="gchar" c:type="gchar**"/>
       </return-value>
       <parameters>
         <parameter name="str_array">
@@ -17191,7 +17222,7 @@
     </function>
     <function name="test_create_case" c:identifier="g_test_create_case">
       <return-value>
-        <type name="GTestCase*" c:type="GTestCase*"/>
+        <type name="GTestCase" c:type="GTestCase*"/>
       </return-value>
       <parameters>
         <parameter name="test_name">
@@ -17216,7 +17247,7 @@
     </function>
     <function name="test_create_suite" c:identifier="g_test_create_suite">
       <return-value>
-        <type name="GTestSuite*" c:type="GTestSuite*"/>
+        <type name="GTestSuite" c:type="GTestSuite*"/>
       </return-value>
       <parameters>
         <parameter name="suite_name">
@@ -17226,7 +17257,7 @@
     </function>
     <function name="test_get_root" c:identifier="g_test_get_root">
       <return-value>
-        <type name="GTestSuite*" c:type="GTestSuite*"/>
+        <type name="GTestSuite" c:type="GTestSuite*"/>
       </return-value>
     </function>
     <function name="test_suite_add" c:identifier="g_test_suite_add">
@@ -17464,7 +17495,7 @@
     </function>
     <function name="test_log_buffer_new" c:identifier="g_test_log_buffer_new">
       <return-value>
-        <type name="GTestLogBuffer*" c:type="GTestLogBuffer*"/>
+        <type name="GTestLogBuffer" c:type="GTestLogBuffer*"/>
       </return-value>
     </function>
     <function name="test_log_buffer_free"
@@ -17497,7 +17528,7 @@
     </function>
     <function name="test_log_buffer_pop" c:identifier="g_test_log_buffer_pop">
       <return-value>
-        <type name="GTestLogMsg*" c:type="GTestLogMsg*"/>
+        <type name="GTestLogMsg" c:type="GTestLogMsg*"/>
       </return-value>
       <parameters>
         <parameter name="tbuffer">
@@ -17529,7 +17560,7 @@
     </record>
     <function name="thread_pool_new" c:identifier="g_thread_pool_new">
       <return-value>
-        <type name="GThreadPool*" c:type="GThreadPool*"/>
+        <type name="GThreadPool" c:type="GThreadPool*"/>
       </return-value>
       <parameters>
         <parameter name="func">
@@ -17697,7 +17728,7 @@
     <record name="Timer" c:type="GTimer"/>
     <function name="timer_new" c:identifier="g_timer_new">
       <return-value>
-        <type name="GTimer*" c:type="GTimer*"/>
+        <type name="GTimer" c:type="GTimer*"/>
       </return-value>
     </function>
     <function name="timer_destroy" c:identifier="g_timer_destroy">
@@ -17829,7 +17860,7 @@
     </callback>
     <function name="tree_new" c:identifier="g_tree_new">
       <return-value>
-        <type name="GTree*" c:type="GTree*"/>
+        <type name="GTree" c:type="GTree*"/>
       </return-value>
       <parameters>
         <parameter name="key_compare_func">
@@ -17839,7 +17870,7 @@
     </function>
     <function name="tree_new_with_data" c:identifier="g_tree_new_with_data">
       <return-value>
-        <type name="GTree*" c:type="GTree*"/>
+        <type name="GTree" c:type="GTree*"/>
       </return-value>
       <parameters>
         <parameter name="key_compare_func">
@@ -17852,7 +17883,7 @@
     </function>
     <function name="tree_new_full" c:identifier="g_tree_new_full">
       <return-value>
-        <type name="GTree*" c:type="GTree*"/>
+        <type name="GTree" c:type="GTree*"/>
       </return-value>
       <parameters>
         <parameter name="key_compare_func">

Modified: trunk/gir/gobject-2.0.gir
==============================================================================
--- trunk/gir/gobject-2.0.gir	(original)
+++ trunk/gir/gobject-2.0.gir	Wed Aug 13 21:27:11 2008
@@ -3,6 +3,9 @@
             xmlns:c="http://www.gtk.org/introspection/c/1.0";
             xmlns:glib="http://www.gtk.org/introspection/glib/1.0";>
   <namespace name="GObject">
+    <alias name="GType" target="gsize"/>
+    <alias name="GTypeCValue" target="_GTypeCValue"/>
+    <alias name="GSignalCMarshaller" target="GClosureMarshal"/>
     <record name="Value" c:type="GValue"/>
     <record name="TypePlugin" c:type="GTypePlugin"/>
     <record name="TypeInstance" c:type="GTypeInstance"/>
@@ -13,7 +16,7 @@
     <record name="TypeQuery" c:type="GTypeQuery"/>
     <record name="GTypeInstance" c:type="_GTypeInstance">
       <field name="g_class">
-        <type name="GTypeClass*" c:type="GTypeClass*"/>
+        <type name="GTypeClass" c:type="GTypeClass*"/>
       </field>
     </record>
     <record name="GTypeQuery" c:type="_GTypeQuery">
@@ -239,7 +242,7 @@
     </function>
     <function name="type_children" c:identifier="g_type_children">
       <return-value>
-        <type name="GType*" c:type="GType*"/>
+        <type name="GType" c:type="GType*"/>
       </return-value>
       <parameters>
         <parameter name="type">
@@ -252,7 +255,7 @@
     </function>
     <function name="type_interfaces" c:identifier="g_type_interfaces">
       <return-value>
-        <type name="GType*" c:type="GType*"/>
+        <type name="GType" c:type="GType*"/>
       </return-value>
       <parameters>
         <parameter name="type">
@@ -357,7 +360,7 @@
       </return-value>
       <parameters>
         <parameter name="instance">
-          <type name="GTypeInstance*" c:type="GTypeInstance*"/>
+          <type name="GTypeInstance" c:type="GTypeInstance*"/>
         </parameter>
         <parameter name="g_class">
           <type name="any" c:type="gpointer"/>
@@ -399,7 +402,7 @@
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="g_class">
-          <type name="GTypeClass*" c:type="GTypeClass*"/>
+          <type name="GTypeClass" c:type="GTypeClass*"/>
         </parameter>
       </parameters>
     </callback>
@@ -463,7 +466,7 @@
         <type name="GInstanceInitFunc" c:type="GInstanceInitFunc"/>
       </field>
       <field name="value_table">
-        <type name="GTypeValueTable*" c:type="GTypeValueTable*"/>
+        <type name="GTypeValueTable" c:type="GTypeValueTable*"/>
       </field>
     </record>
     <record name="GTypeFundamentalInfo" c:type="_GTypeFundamentalInfo">
@@ -489,7 +492,7 @@
         </return-value>
         <parameters>
           <parameter name="value">
-            <type name="GValue*" c:type="GValue*"/>
+            <type name="GValue" c:type="GValue*"/>
           </parameter>
         </parameters>
       </callback>
@@ -499,7 +502,7 @@
         </return-value>
         <parameters>
           <parameter name="value">
-            <type name="GValue*" c:type="GValue*"/>
+            <type name="GValue" c:type="GValue*"/>
           </parameter>
         </parameters>
       </callback>
@@ -509,10 +512,10 @@
         </return-value>
         <parameters>
           <parameter name="src_value">
-            <type name="GValue*" c:type="GValue*"/>
+            <type name="GValue" c:type="GValue*"/>
           </parameter>
           <parameter name="dest_value">
-            <type name="GValue*" c:type="GValue*"/>
+            <type name="GValue" c:type="GValue*"/>
           </parameter>
         </parameters>
       </callback>
@@ -522,7 +525,7 @@
         </return-value>
         <parameters>
           <parameter name="value">
-            <type name="GValue*" c:type="GValue*"/>
+            <type name="GValue" c:type="GValue*"/>
           </parameter>
         </parameters>
       </callback>
@@ -535,13 +538,13 @@
         </return-value>
         <parameters>
           <parameter name="value">
-            <type name="GValue*" c:type="GValue*"/>
+            <type name="GValue" c:type="GValue*"/>
           </parameter>
           <parameter name="n_collect_values">
             <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="collect_values">
-            <type name="GTypeCValue*" c:type="GTypeCValue*"/>
+            <type name="GTypeCValue" c:type="GTypeCValue*"/>
           </parameter>
           <parameter name="collect_flags">
             <type name="uint32" c:type="guint"/>
@@ -557,13 +560,13 @@
         </return-value>
         <parameters>
           <parameter name="value">
-            <type name="GValue*" c:type="GValue*"/>
+            <type name="GValue" c:type="GValue*"/>
           </parameter>
           <parameter name="n_collect_values">
             <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="collect_values">
-            <type name="GTypeCValue*" c:type="GTypeCValue*"/>
+            <type name="GTypeCValue" c:type="GTypeCValue*"/>
           </parameter>
           <parameter name="collect_flags">
             <type name="uint32" c:type="guint"/>
@@ -714,7 +717,7 @@
     <function name="type_interface_prerequisites"
               c:identifier="g_type_interface_prerequisites">
       <return-value>
-        <type name="GType*" c:type="GType*"/>
+        <type name="GType" c:type="GType*"/>
       </return-value>
       <parameters>
         <parameter name="interface_type">
@@ -755,7 +758,7 @@
     </function>
     <function name="type_get_plugin" c:identifier="g_type_get_plugin">
       <return-value>
-        <type name="GTypePlugin*" c:type="GTypePlugin*"/>
+        <type name="GTypePlugin" c:type="GTypePlugin*"/>
       </return-value>
       <parameters>
         <parameter name="type">
@@ -766,7 +769,7 @@
     <function name="type_interface_get_plugin"
               c:identifier="g_type_interface_get_plugin">
       <return-value>
-        <type name="GTypePlugin*" c:type="GTypePlugin*"/>
+        <type name="GTypePlugin" c:type="GTypePlugin*"/>
       </return-value>
       <parameters>
         <parameter name="instance_type">
@@ -796,7 +799,7 @@
     <function name="type_create_instance"
               c:identifier="g_type_create_instance">
       <return-value>
-        <type name="GTypeInstance*" c:type="GTypeInstance*"/>
+        <type name="GTypeInstance" c:type="GTypeInstance*"/>
       </return-value>
       <parameters>
         <parameter name="type">
@@ -886,7 +889,7 @@
     <function name="type_value_table_peek"
               c:identifier="g_type_value_table_peek">
       <return-value>
-        <type name="GTypeValueTable*" c:type="GTypeValueTable*"/>
+        <type name="GTypeValueTable" c:type="GTypeValueTable*"/>
       </return-value>
       <parameters>
         <parameter name="type">
@@ -907,7 +910,7 @@
     <function name="type_check_instance_cast"
               c:identifier="g_type_check_instance_cast">
       <return-value>
-        <type name="GTypeInstance*" c:type="GTypeInstance*"/>
+        <type name="GTypeInstance" c:type="GTypeInstance*"/>
       </return-value>
       <parameters>
         <parameter name="instance">
@@ -935,7 +938,7 @@
     <function name="type_check_class_cast"
               c:identifier="g_type_check_class_cast">
       <return-value>
-        <type name="GTypeClass*" c:type="GTypeClass*"/>
+        <type name="GTypeClass" c:type="GTypeClass*"/>
       </return-value>
       <parameters>
         <parameter name="g_class">
@@ -1271,7 +1274,7 @@
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="closure">
-          <type name="GClosure*" c:type="GClosure*"/>
+          <type name="GClosure" c:type="GClosure*"/>
         </parameter>
       </parameters>
     </callback>
@@ -1281,16 +1284,16 @@
       </return-value>
       <parameters>
         <parameter name="closure">
-          <type name="GClosure*" c:type="GClosure*"/>
+          <type name="GClosure" c:type="GClosure*"/>
         </parameter>
         <parameter name="return_value">
-          <type name="GValue*" c:type="GValue*"/>
+          <type name="GValue" c:type="GValue*"/>
         </parameter>
         <parameter name="n_param_values">
           <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="param_values">
-          <type name="GValue*" c:type="GValue*"/>
+          <type name="GValue" c:type="GValue*"/>
         </parameter>
         <parameter name="invocation_hint">
           <type name="any" c:type="gpointer"/>
@@ -1346,16 +1349,16 @@
         </return-value>
         <parameters>
           <parameter name="closure">
-            <type name="GClosure*" c:type="GClosure*"/>
+            <type name="GClosure" c:type="GClosure*"/>
           </parameter>
           <parameter name="return_value">
-            <type name="GValue*" c:type="GValue*"/>
+            <type name="GValue" c:type="GValue*"/>
           </parameter>
           <parameter name="n_param_values">
             <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="param_values">
-            <type name="GValue*" c:type="GValue*"/>
+            <type name="GValue" c:type="GValue*"/>
           </parameter>
           <parameter name="invocation_hint">
             <type name="any" c:type="gpointer"/>
@@ -1369,7 +1372,7 @@
         <type name="any" c:type="gpointer"/>
       </field>
       <field name="notifiers">
-        <type name="GClosureNotifyData*" c:type="GClosureNotifyData*"/>
+        <type name="GClosureNotifyData" c:type="GClosureNotifyData*"/>
       </field>
     </record>
     <record name="GCClosure" c:type="_GCClosure">
@@ -1382,7 +1385,7 @@
     </record>
     <function name="cclosure_new" c:identifier="g_cclosure_new">
       <return-value>
-        <type name="GClosure*" c:type="GClosure*"/>
+        <type name="GClosure" c:type="GClosure*"/>
       </return-value>
       <parameters>
         <parameter name="callback_func">
@@ -1398,7 +1401,7 @@
     </function>
     <function name="cclosure_new_swap" c:identifier="g_cclosure_new_swap">
       <return-value>
-        <type name="GClosure*" c:type="GClosure*"/>
+        <type name="GClosure" c:type="GClosure*"/>
       </return-value>
       <parameters>
         <parameter name="callback_func">
@@ -1415,7 +1418,7 @@
     <function name="signal_type_cclosure_new"
               c:identifier="g_signal_type_cclosure_new">
       <return-value>
-        <type name="GClosure*" c:type="GClosure*"/>
+        <type name="GClosure" c:type="GClosure*"/>
       </return-value>
       <parameters>
         <parameter name="itype">
@@ -1428,7 +1431,7 @@
     </function>
     <function name="closure_ref" c:identifier="g_closure_ref">
       <return-value>
-        <type name="GClosure*" c:type="GClosure*"/>
+        <type name="GClosure" c:type="GClosure*"/>
       </return-value>
       <parameters>
         <parameter name="closure">
@@ -1458,7 +1461,7 @@
     </function>
     <function name="closure_new_simple" c:identifier="g_closure_new_simple">
       <return-value>
-        <type name="GClosure*" c:type="GClosure*"/>
+        <type name="GClosure" c:type="GClosure*"/>
       </return-value>
       <parameters>
         <parameter name="sizeof_closure">
@@ -1648,7 +1651,7 @@
     </record>
     <function name="enum_get_value" c:identifier="g_enum_get_value">
       <return-value>
-        <type name="GEnumValue*" c:type="GEnumValue*"/>
+        <type name="GEnumValue" c:type="GEnumValue*"/>
       </return-value>
       <parameters>
         <parameter name="enum_class">
@@ -1662,7 +1665,7 @@
     <function name="enum_get_value_by_name"
               c:identifier="g_enum_get_value_by_name">
       <return-value>
-        <type name="GEnumValue*" c:type="GEnumValue*"/>
+        <type name="GEnumValue" c:type="GEnumValue*"/>
       </return-value>
       <parameters>
         <parameter name="enum_class">
@@ -1676,7 +1679,7 @@
     <function name="enum_get_value_by_nick"
               c:identifier="g_enum_get_value_by_nick">
       <return-value>
-        <type name="GEnumValue*" c:type="GEnumValue*"/>
+        <type name="GEnumValue" c:type="GEnumValue*"/>
       </return-value>
       <parameters>
         <parameter name="enum_class">
@@ -1690,7 +1693,7 @@
     <function name="flags_get_first_value"
               c:identifier="g_flags_get_first_value">
       <return-value>
-        <type name="GFlagsValue*" c:type="GFlagsValue*"/>
+        <type name="GFlagsValue" c:type="GFlagsValue*"/>
       </return-value>
       <parameters>
         <parameter name="flags_class">
@@ -1704,7 +1707,7 @@
     <function name="flags_get_value_by_name"
               c:identifier="g_flags_get_value_by_name">
       <return-value>
-        <type name="GFlagsValue*" c:type="GFlagsValue*"/>
+        <type name="GFlagsValue" c:type="GFlagsValue*"/>
       </return-value>
       <parameters>
         <parameter name="flags_class">
@@ -1718,7 +1721,7 @@
     <function name="flags_get_value_by_nick"
               c:identifier="g_flags_get_value_by_nick">
       <return-value>
-        <type name="GFlagsValue*" c:type="GFlagsValue*"/>
+        <type name="GFlagsValue" c:type="GFlagsValue*"/>
       </return-value>
       <parameters>
         <parameter name="flags_class">
@@ -2363,10 +2366,10 @@
       </return-value>
       <parameters>
         <parameter name="src_value">
-          <type name="GValue*" c:type="GValue*"/>
+          <type name="GValue" c:type="GValue*"/>
         </parameter>
         <parameter name="dest_value">
-          <type name="GValue*" c:type="GValue*"/>
+          <type name="GValue" c:type="GValue*"/>
         </parameter>
       </parameters>
     </callback>
@@ -2380,7 +2383,7 @@
     </record>
     <function name="value_init" c:identifier="g_value_init">
       <return-value>
-        <type name="GValue*" c:type="GValue*"/>
+        <type name="GValue" c:type="GValue*"/>
       </return-value>
       <parameters>
         <parameter name="value">
@@ -2406,7 +2409,7 @@
     </function>
     <function name="value_reset" c:identifier="g_value_reset">
       <return-value>
-        <type name="GValue*" c:type="GValue*"/>
+        <type name="GValue" c:type="GValue*"/>
       </return-value>
       <parameters>
         <parameter name="value">
@@ -2562,7 +2565,7 @@
         <type name="string" c:type="gchar*"/>
       </field>
       <field name="qdata">
-        <type name="GData*" c:type="GData*"/>
+        <type name="GData" c:type="GData*"/>
       </field>
       <field name="ref_count">
         <type name="uint32" c:type="guint"/>
@@ -2579,7 +2582,7 @@
         </return-value>
         <parameters>
           <parameter name="pspec">
-            <type name="GParamSpec*" c:type="GParamSpec*"/>
+            <type name="GParamSpec" c:type="GParamSpec*"/>
           </parameter>
         </parameters>
       </callback>
@@ -2589,10 +2592,10 @@
         </return-value>
         <parameters>
           <parameter name="pspec">
-            <type name="GParamSpec*" c:type="GParamSpec*"/>
+            <type name="GParamSpec" c:type="GParamSpec*"/>
           </parameter>
           <parameter name="value">
-            <type name="GValue*" c:type="GValue*"/>
+            <type name="GValue" c:type="GValue*"/>
           </parameter>
         </parameters>
       </callback>
@@ -2602,10 +2605,10 @@
         </return-value>
         <parameters>
           <parameter name="pspec">
-            <type name="GParamSpec*" c:type="GParamSpec*"/>
+            <type name="GParamSpec" c:type="GParamSpec*"/>
           </parameter>
           <parameter name="value">
-            <type name="GValue*" c:type="GValue*"/>
+            <type name="GValue" c:type="GValue*"/>
           </parameter>
         </parameters>
       </callback>
@@ -2615,13 +2618,13 @@
         </return-value>
         <parameters>
           <parameter name="pspec">
-            <type name="GParamSpec*" c:type="GParamSpec*"/>
+            <type name="GParamSpec" c:type="GParamSpec*"/>
           </parameter>
           <parameter name="value1">
-            <type name="GValue*" c:type="GValue*"/>
+            <type name="GValue" c:type="GValue*"/>
           </parameter>
           <parameter name="value2">
-            <type name="GValue*" c:type="GValue*"/>
+            <type name="GValue" c:type="GValue*"/>
           </parameter>
         </parameters>
       </callback>
@@ -2639,7 +2642,7 @@
     </record>
     <function name="param_spec_ref" c:identifier="g_param_spec_ref">
       <return-value>
-        <type name="GParamSpec*" c:type="GParamSpec*"/>
+        <type name="GParamSpec" c:type="GParamSpec*"/>
       </return-value>
       <parameters>
         <parameter name="pspec">
@@ -2669,7 +2672,7 @@
     </function>
     <function name="param_spec_ref_sink" c:identifier="g_param_spec_ref_sink">
       <return-value>
-        <type name="GParamSpec*" c:type="GParamSpec*"/>
+        <type name="GParamSpec" c:type="GParamSpec*"/>
       </return-value>
       <parameters>
         <parameter name="pspec">
@@ -2724,7 +2727,7 @@
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="destroy">
-          <type name="GDestroyNotify" c:type="GDestroyNotify"/>
+          <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
         </parameter>
       </parameters>
     </function>
@@ -2745,7 +2748,7 @@
     <function name="param_spec_get_redirect_target"
               c:identifier="g_param_spec_get_redirect_target">
       <return-value>
-        <type name="GParamSpec*" c:type="GParamSpec*"/>
+        <type name="GParamSpec" c:type="GParamSpec*"/>
       </return-value>
       <parameters>
         <parameter name="pspec">
@@ -2876,7 +2879,7 @@
     </function>
     <function name="value_get_param" c:identifier="g_value_get_param">
       <return-value>
-        <type name="GParamSpec*" c:type="GParamSpec*"/>
+        <type name="GParamSpec" c:type="GParamSpec*"/>
       </return-value>
       <parameters>
         <parameter name="value">
@@ -2886,7 +2889,7 @@
     </function>
     <function name="value_dup_param" c:identifier="g_value_dup_param">
       <return-value>
-        <type name="GParamSpec*" c:type="GParamSpec*"/>
+        <type name="GParamSpec" c:type="GParamSpec*"/>
       </return-value>
       <parameters>
         <parameter name="value">
@@ -2935,7 +2938,7 @@
         </return-value>
         <parameters>
           <parameter name="pspec">
-            <type name="GParamSpec*" c:type="GParamSpec*"/>
+            <type name="GParamSpec" c:type="GParamSpec*"/>
           </parameter>
         </parameters>
       </callback>
@@ -2948,7 +2951,7 @@
         </return-value>
         <parameters>
           <parameter name="pspec">
-            <type name="GParamSpec*" c:type="GParamSpec*"/>
+            <type name="GParamSpec" c:type="GParamSpec*"/>
           </parameter>
         </parameters>
       </callback>
@@ -2958,10 +2961,10 @@
         </return-value>
         <parameters>
           <parameter name="pspec">
-            <type name="GParamSpec*" c:type="GParamSpec*"/>
+            <type name="GParamSpec" c:type="GParamSpec*"/>
           </parameter>
           <parameter name="value">
-            <type name="GValue*" c:type="GValue*"/>
+            <type name="GValue" c:type="GValue*"/>
           </parameter>
         </parameters>
       </callback>
@@ -2971,10 +2974,10 @@
         </return-value>
         <parameters>
           <parameter name="pspec">
-            <type name="GParamSpec*" c:type="GParamSpec*"/>
+            <type name="GParamSpec" c:type="GParamSpec*"/>
           </parameter>
           <parameter name="value">
-            <type name="GValue*" c:type="GValue*"/>
+            <type name="GValue" c:type="GValue*"/>
           </parameter>
         </parameters>
       </callback>
@@ -2984,13 +2987,13 @@
         </return-value>
         <parameters>
           <parameter name="pspec">
-            <type name="GParamSpec*" c:type="GParamSpec*"/>
+            <type name="GParamSpec" c:type="GParamSpec*"/>
           </parameter>
           <parameter name="value1">
-            <type name="GValue*" c:type="GValue*"/>
+            <type name="GValue" c:type="GValue*"/>
           </parameter>
           <parameter name="value2">
-            <type name="GValue*" c:type="GValue*"/>
+            <type name="GValue" c:type="GValue*"/>
           </parameter>
         </parameters>
       </callback>
@@ -3050,7 +3053,7 @@
     </function>
     <function name="param_spec_pool_new" c:identifier="g_param_spec_pool_new">
       <return-value>
-        <type name="GParamSpecPool*" c:type="GParamSpecPool*"/>
+        <type name="GParamSpecPool" c:type="GParamSpecPool*"/>
       </return-value>
       <parameters>
         <parameter name="type_prefixing">
@@ -3092,7 +3095,7 @@
     <function name="param_spec_pool_lookup"
               c:identifier="g_param_spec_pool_lookup">
       <return-value>
-        <type name="GParamSpec*" c:type="GParamSpec*"/>
+        <type name="GParamSpec" c:type="GParamSpec*"/>
       </return-value>
       <parameters>
         <parameter name="pool">
@@ -3112,7 +3115,7 @@
     <function name="param_spec_pool_list_owned"
               c:identifier="g_param_spec_pool_list_owned">
       <return-value>
-        <type name="GList*" c:type="GList*"/>
+        <type name="GList" c:type="GList*"/>
       </return-value>
       <parameters>
         <parameter name="pool">
@@ -3126,7 +3129,7 @@
     <function name="param_spec_pool_list"
               c:identifier="g_param_spec_pool_list">
       <return-value>
-        <type name="GParamSpec**" c:type="GParamSpec**"/>
+        <type name="GParamSpec" c:type="GParamSpec**"/>
       </return-value>
       <parameters>
         <parameter name="pool">
@@ -3148,13 +3151,13 @@
       </return-value>
       <parameters>
         <parameter name="ihint">
-          <type name="GSignalInvocationHint*" c:type="GSignalInvocationHint*"/>
+          <type name="GSignalInvocationHint" c:type="GSignalInvocationHint*"/>
         </parameter>
         <parameter name="n_param_values">
           <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="param_values">
-          <type name="GValue*" c:type="GValue*"/>
+          <type name="GValue" c:type="GValue*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
@@ -3167,13 +3170,13 @@
       </return-value>
       <parameters>
         <parameter name="ihint">
-          <type name="GSignalInvocationHint*" c:type="GSignalInvocationHint*"/>
+          <type name="GSignalInvocationHint" c:type="GSignalInvocationHint*"/>
         </parameter>
         <parameter name="return_accu">
-          <type name="GValue*" c:type="GValue*"/>
+          <type name="GValue" c:type="GValue*"/>
         </parameter>
         <parameter name="handler_return">
-          <type name="GValue*" c:type="GValue*"/>
+          <type name="GValue" c:type="GValue*"/>
         </parameter>
         <parameter name="data">
           <type name="any" c:type="gpointer"/>
@@ -3236,7 +3239,7 @@
         <type name="uint32" c:type="guint"/>
       </field>
       <field name="param_types">
-        <type name="GType*" c:type="GType*"/>
+        <type name="GType" c:type="GType*"/>
       </field>
     </record>
     <function name="signal_newv" c:identifier="g_signal_newv">
@@ -3487,7 +3490,7 @@
     </function>
     <function name="signal_list_ids" c:identifier="g_signal_list_ids">
       <return-value>
-        <type name="guint*" c:type="guint*"/>
+        <type name="guint" c:type="guint*"/>
       </return-value>
       <parameters>
         <parameter name="itype">
@@ -3523,7 +3526,7 @@
     <function name="signal_get_invocation_hint"
               c:identifier="g_signal_get_invocation_hint">
       <return-value>
-        <type name="GSignalInvocationHint*" c:type="GSignalInvocationHint*"/>
+        <type name="GSignalInvocationHint" c:type="GSignalInvocationHint*"/>
       </return-value>
       <parameters>
         <parameter name="instance">
@@ -3581,7 +3584,7 @@
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="data_destroy">
-          <type name="GDestroyNotify" c:type="GDestroyNotify"/>
+          <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
         </parameter>
       </parameters>
     </function>
@@ -3958,86 +3961,13 @@
         </parameter>
       </parameters>
     </function>
-    <record name="Object" c:type="GObject"/>
-    <record name="InitiallyUnowned" c:type="GInitiallyUnowned"/>
-    <record name="ObjectConstructParam" c:type="GObjectConstructParam"/>
-    <callback name="GObjectGetPropertyFunc">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="object">
-          <type name="GObject*" c:type="GObject*"/>
-        </parameter>
-        <parameter name="property_id">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="value">
-          <type name="GValue*" c:type="GValue*"/>
-        </parameter>
-        <parameter name="pspec">
-          <type name="GParamSpec*" c:type="GParamSpec*"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <callback name="GObjectSetPropertyFunc">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="object">
-          <type name="GObject*" c:type="GObject*"/>
-        </parameter>
-        <parameter name="property_id">
-          <type name="uint32" c:type="guint"/>
-        </parameter>
-        <parameter name="value">
-          <type name="GValue*" c:type="GValue*"/>
-        </parameter>
-        <parameter name="pspec">
-          <type name="GParamSpec*" c:type="GParamSpec*"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <callback name="GObjectFinalizeFunc">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="object">
-          <type name="GObject*" c:type="GObject*"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <callback name="GWeakNotify">
-      <return-value>
-        <type name="none" c:type="void"/>
-      </return-value>
-      <parameters>
-        <parameter name="data">
-          <type name="any" c:type="gpointer"/>
-        </parameter>
-        <parameter name="where_the_object_was">
-          <type name="GObject*" c:type="GObject*"/>
-        </parameter>
-      </parameters>
-    </callback>
-    <record name="GObject" c:type="_GObject">
-      <field name="g_type_instance">
-        <type name="GTypeInstance" c:type="GTypeInstance"/>
-      </field>
-      <field name="ref_count">
-        <type name="uint32" c:type="guint"/>
-      </field>
-      <field name="qdata">
-        <type name="GData*" c:type="GData*"/>
-      </field>
+    <class name="Object" c:type="GObject" glib:type-name="GObject">
       <field name="construct_properties">
-        <type name="GSList*" c:type="GSList*"/>
+        <type name="GSList" c:type="GSList*"/>
       </field>
       <callback name="constructor">
         <return-value>
-          <type name="GObject*" c:type="GObject*"/>
+          <type name="Object" c:type="GObject*"/>
         </return-value>
         <parameters>
           <parameter name="type">
@@ -4047,7 +3977,7 @@
             <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="construct_properties">
-            <type name="GObjectConstructParam*"
+            <type name="GObjectConstructParam"
                   c:type="GObjectConstructParam*"/>
           </parameter>
         </parameters>
@@ -4058,16 +3988,16 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GObject*" c:type="GObject*"/>
+            <type name="Object" c:type="GObject*"/>
           </parameter>
           <parameter name="property_id">
             <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="value">
-            <type name="GValue*" c:type="GValue*"/>
+            <type name="GValue" c:type="GValue*"/>
           </parameter>
           <parameter name="pspec">
-            <type name="GParamSpec*" c:type="GParamSpec*"/>
+            <type name="GParamSpec" c:type="GParamSpec*"/>
           </parameter>
         </parameters>
       </callback>
@@ -4077,16 +4007,16 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GObject*" c:type="GObject*"/>
+            <type name="Object" c:type="GObject*"/>
           </parameter>
           <parameter name="property_id">
             <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="value">
-            <type name="GValue*" c:type="GValue*"/>
+            <type name="GValue" c:type="GValue*"/>
           </parameter>
           <parameter name="pspec">
-            <type name="GParamSpec*" c:type="GParamSpec*"/>
+            <type name="GParamSpec" c:type="GParamSpec*"/>
           </parameter>
         </parameters>
       </callback>
@@ -4096,7 +4026,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GObject*" c:type="GObject*"/>
+            <type name="Object" c:type="GObject*"/>
           </parameter>
         </parameters>
       </callback>
@@ -4106,7 +4036,7 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GObject*" c:type="GObject*"/>
+            <type name="Object" c:type="GObject*"/>
           </parameter>
         </parameters>
       </callback>
@@ -4116,13 +4046,13 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GObject*" c:type="GObject*"/>
+            <type name="Object" c:type="GObject*"/>
           </parameter>
           <parameter name="n_pspecs">
             <type name="uint32" c:type="guint"/>
           </parameter>
           <parameter name="pspecs">
-            <type name="GParamSpec**" c:type="GParamSpec**"/>
+            <type name="GParamSpec" c:type="GParamSpec**"/>
           </parameter>
         </parameters>
       </callback>
@@ -4132,10 +4062,10 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GObject*" c:type="GObject*"/>
+            <type name="Object" c:type="GObject*"/>
           </parameter>
           <parameter name="pspec">
-            <type name="GParamSpec*" c:type="GParamSpec*"/>
+            <type name="GParamSpec" c:type="GParamSpec*"/>
           </parameter>
         </parameters>
       </callback>
@@ -4145,20 +4075,118 @@
         </return-value>
         <parameters>
           <parameter name="object">
-            <type name="GObject*" c:type="GObject*"/>
+            <type name="Object" c:type="GObject*"/>
           </parameter>
         </parameters>
       </callback>
       <field name="pdummy">
         <type name="any" c:type="gpointer"/>
       </field>
+      <glib:signal name="notify">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="GParam" c:type="GParam"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+    </class>
+    <class name="InitiallyUnowned"
+           c:type="GInitiallyUnowned"
+           parent="GObject"
+           glib:type-name="GInitiallyUnowned">
+      <glib:signal name="notify">
+        <return-value>
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="object">
+            <type name="GParam" c:type="GParam"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
+    </class>
+    <record name="ObjectConstructParam" c:type="GObjectConstructParam"/>
+    <callback name="GObjectGetPropertyFunc">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="object">
+          <type name="Object" c:type="GObject*"/>
+        </parameter>
+        <parameter name="property_id">
+          <type name="uint32" c:type="guint"/>
+        </parameter>
+        <parameter name="value">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="pspec">
+          <type name="GParamSpec" c:type="GParamSpec*"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <callback name="GObjectSetPropertyFunc">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="object">
+          <type name="Object" c:type="GObject*"/>
+        </parameter>
+        <parameter name="property_id">
+          <type name="uint32" c:type="guint"/>
+        </parameter>
+        <parameter name="value">
+          <type name="GValue" c:type="GValue*"/>
+        </parameter>
+        <parameter name="pspec">
+          <type name="GParamSpec" c:type="GParamSpec*"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <callback name="GObjectFinalizeFunc">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="object">
+          <type name="Object" c:type="GObject*"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <callback name="GWeakNotify">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="data">
+          <type name="any" c:type="gpointer"/>
+        </parameter>
+        <parameter name="where_the_object_was">
+          <type name="Object" c:type="GObject*"/>
+        </parameter>
+      </parameters>
+    </callback>
+    <record name="GObject" c:type="_GObject">
+      <field name="g_type_instance">
+        <type name="GTypeInstance" c:type="GTypeInstance"/>
+      </field>
+      <field name="ref_count">
+        <type name="uint32" c:type="guint"/>
+      </field>
+      <field name="qdata">
+        <type name="GData" c:type="GData*"/>
+      </field>
     </record>
     <record name="GObjectConstructParam" c:type="_GObjectConstructParam">
       <field name="pspec">
-        <type name="GParamSpec*" c:type="GParamSpec*"/>
+        <type name="GParamSpec" c:type="GParamSpec*"/>
       </field>
       <field name="value">
-        <type name="GValue*" c:type="GValue*"/>
+        <type name="GValue" c:type="GValue*"/>
       </field>
     </record>
     <function name="initially_unowned_get_type"
@@ -4187,7 +4215,7 @@
     <function name="object_class_find_property"
               c:identifier="g_object_class_find_property">
       <return-value>
-        <type name="GParamSpec*" c:type="GParamSpec*"/>
+        <type name="GParamSpec" c:type="GParamSpec*"/>
       </return-value>
       <parameters>
         <parameter name="oclass">
@@ -4201,7 +4229,7 @@
     <function name="object_class_list_properties"
               c:identifier="g_object_class_list_properties">
       <return-value>
-        <type name="GParamSpec**" c:type="GParamSpec**"/>
+        <type name="GParamSpec" c:type="GParamSpec**"/>
       </return-value>
       <parameters>
         <parameter name="oclass">
@@ -4246,7 +4274,7 @@
     <function name="object_interface_find_property"
               c:identifier="g_object_interface_find_property">
       <return-value>
-        <type name="GParamSpec*" c:type="GParamSpec*"/>
+        <type name="GParamSpec" c:type="GParamSpec*"/>
       </return-value>
       <parameters>
         <parameter name="g_iface">
@@ -4260,7 +4288,7 @@
     <function name="object_interface_list_properties"
               c:identifier="g_object_interface_list_properties">
       <return-value>
-        <type name="GParamSpec**" c:type="GParamSpec**"/>
+        <type name="GParamSpec" c:type="GParamSpec**"/>
       </return-value>
       <parameters>
         <parameter name="g_iface">
@@ -4302,7 +4330,7 @@
     </function>
     <function name="object_new_valist" c:identifier="g_object_new_valist">
       <return-value>
-        <type name="GObject*" c:type="GObject*"/>
+        <type name="Object" c:type="GObject*"/>
       </return-value>
       <parameters>
         <parameter name="object_type">
@@ -4374,7 +4402,7 @@
       </return-value>
       <parameters>
         <parameter name="object">
-          <type name="GObject" c:type="GObject*"/>
+          <type name="Object" c:type="GObject*"/>
         </parameter>
         <parameter name="first_property_name">
           <type name="string" c:type="gchar*"/>
@@ -4390,7 +4418,7 @@
       </return-value>
       <parameters>
         <parameter name="object">
-          <type name="GObject" c:type="GObject*"/>
+          <type name="Object" c:type="GObject*"/>
         </parameter>
         <parameter name="first_property_name">
           <type name="string" c:type="gchar*"/>
@@ -4406,7 +4434,7 @@
       </return-value>
       <parameters>
         <parameter name="object">
-          <type name="GObject" c:type="GObject*"/>
+          <type name="Object" c:type="GObject*"/>
         </parameter>
         <parameter name="property_name">
           <type name="string" c:type="gchar*"/>
@@ -4422,7 +4450,7 @@
       </return-value>
       <parameters>
         <parameter name="object">
-          <type name="GObject" c:type="GObject*"/>
+          <type name="Object" c:type="GObject*"/>
         </parameter>
         <parameter name="property_name">
           <type name="string" c:type="gchar*"/>
@@ -4439,7 +4467,7 @@
       </return-value>
       <parameters>
         <parameter name="object">
-          <type name="GObject" c:type="GObject*"/>
+          <type name="Object" c:type="GObject*"/>
         </parameter>
       </parameters>
     </function>
@@ -4449,7 +4477,7 @@
       </return-value>
       <parameters>
         <parameter name="object">
-          <type name="GObject" c:type="GObject*"/>
+          <type name="Object" c:type="GObject*"/>
         </parameter>
         <parameter name="property_name">
           <type name="string" c:type="gchar*"/>
@@ -4462,7 +4490,7 @@
       </return-value>
       <parameters>
         <parameter name="object">
-          <type name="GObject" c:type="GObject*"/>
+          <type name="Object" c:type="GObject*"/>
         </parameter>
       </parameters>
     </function>
@@ -4512,7 +4540,7 @@
       </return-value>
       <parameters>
         <parameter name="object">
-          <type name="GObject" c:type="GObject*"/>
+          <type name="Object" c:type="GObject*"/>
         </parameter>
         <parameter name="notify">
           <type name="GWeakNotify" c:type="GWeakNotify"/>
@@ -4528,7 +4556,7 @@
       </return-value>
       <parameters>
         <parameter name="object">
-          <type name="GObject" c:type="GObject*"/>
+          <type name="Object" c:type="GObject*"/>
         </parameter>
         <parameter name="notify">
           <type name="GWeakNotify" c:type="GWeakNotify"/>
@@ -4545,7 +4573,7 @@
       </return-value>
       <parameters>
         <parameter name="object">
-          <type name="GObject" c:type="GObject*"/>
+          <type name="Object" c:type="GObject*"/>
         </parameter>
         <parameter name="weak_pointer_location">
           <type name="gpointer" c:type="gpointer*"/>
@@ -4559,7 +4587,7 @@
       </return-value>
       <parameters>
         <parameter name="object">
-          <type name="GObject" c:type="GObject*"/>
+          <type name="Object" c:type="GObject*"/>
         </parameter>
         <parameter name="weak_pointer_location">
           <type name="gpointer" c:type="gpointer*"/>
@@ -4575,7 +4603,7 @@
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="object">
-          <type name="GObject*" c:type="GObject*"/>
+          <type name="Object" c:type="GObject*"/>
         </parameter>
         <parameter name="is_last_ref">
           <type name="boolean" c:type="gboolean"/>
@@ -4589,7 +4617,7 @@
       </return-value>
       <parameters>
         <parameter name="object">
-          <type name="GObject" c:type="GObject*"/>
+          <type name="Object" c:type="GObject*"/>
         </parameter>
         <parameter name="notify">
           <type name="GToggleNotify" c:type="GToggleNotify"/>
@@ -4606,7 +4634,7 @@
       </return-value>
       <parameters>
         <parameter name="object">
-          <type name="GObject" c:type="GObject*"/>
+          <type name="Object" c:type="GObject*"/>
         </parameter>
         <parameter name="notify">
           <type name="GToggleNotify" c:type="GToggleNotify"/>
@@ -4622,7 +4650,7 @@
       </return-value>
       <parameters>
         <parameter name="object">
-          <type name="GObject" c:type="GObject*"/>
+          <type name="Object" c:type="GObject*"/>
         </parameter>
         <parameter name="quark">
           <type name="GQuark" c:type="GQuark"/>
@@ -4635,7 +4663,7 @@
       </return-value>
       <parameters>
         <parameter name="object">
-          <type name="GObject" c:type="GObject*"/>
+          <type name="Object" c:type="GObject*"/>
         </parameter>
         <parameter name="quark">
           <type name="GQuark" c:type="GQuark"/>
@@ -4652,7 +4680,7 @@
       </return-value>
       <parameters>
         <parameter name="object">
-          <type name="GObject" c:type="GObject*"/>
+          <type name="Object" c:type="GObject*"/>
         </parameter>
         <parameter name="quark">
           <type name="GQuark" c:type="GQuark"/>
@@ -4661,7 +4689,7 @@
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="destroy">
-          <type name="GDestroyNotify" c:type="GDestroyNotify"/>
+          <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
         </parameter>
       </parameters>
     </function>
@@ -4671,7 +4699,7 @@
       </return-value>
       <parameters>
         <parameter name="object">
-          <type name="GObject" c:type="GObject*"/>
+          <type name="Object" c:type="GObject*"/>
         </parameter>
         <parameter name="quark">
           <type name="GQuark" c:type="GQuark"/>
@@ -4684,7 +4712,7 @@
       </return-value>
       <parameters>
         <parameter name="object">
-          <type name="GObject" c:type="GObject*"/>
+          <type name="Object" c:type="GObject*"/>
         </parameter>
         <parameter name="key">
           <type name="string" c:type="gchar*"/>
@@ -4697,7 +4725,7 @@
       </return-value>
       <parameters>
         <parameter name="object">
-          <type name="GObject" c:type="GObject*"/>
+          <type name="Object" c:type="GObject*"/>
         </parameter>
         <parameter name="key">
           <type name="string" c:type="gchar*"/>
@@ -4714,7 +4742,7 @@
       </return-value>
       <parameters>
         <parameter name="object">
-          <type name="GObject" c:type="GObject*"/>
+          <type name="Object" c:type="GObject*"/>
         </parameter>
         <parameter name="key">
           <type name="string" c:type="gchar*"/>
@@ -4723,7 +4751,7 @@
           <type name="any" c:type="gpointer"/>
         </parameter>
         <parameter name="destroy">
-          <type name="GDestroyNotify" c:type="GDestroyNotify"/>
+          <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
         </parameter>
       </parameters>
     </function>
@@ -4733,7 +4761,7 @@
       </return-value>
       <parameters>
         <parameter name="object">
-          <type name="GObject" c:type="GObject*"/>
+          <type name="Object" c:type="GObject*"/>
         </parameter>
         <parameter name="key">
           <type name="string" c:type="gchar*"/>
@@ -4747,7 +4775,7 @@
       </return-value>
       <parameters>
         <parameter name="object">
-          <type name="GObject" c:type="GObject*"/>
+          <type name="Object" c:type="GObject*"/>
         </parameter>
         <parameter name="closure">
           <type name="GClosure" c:type="GClosure*"/>
@@ -4756,41 +4784,41 @@
     </function>
     <function name="cclosure_new_object" c:identifier="g_cclosure_new_object">
       <return-value>
-        <type name="GClosure*" c:type="GClosure*"/>
+        <type name="GClosure" c:type="GClosure*"/>
       </return-value>
       <parameters>
         <parameter name="callback_func">
           <type name="GCallback" c:type="GCallback"/>
         </parameter>
         <parameter name="object">
-          <type name="GObject" c:type="GObject*"/>
+          <type name="Object" c:type="GObject*"/>
         </parameter>
       </parameters>
     </function>
     <function name="cclosure_new_object_swap"
               c:identifier="g_cclosure_new_object_swap">
       <return-value>
-        <type name="GClosure*" c:type="GClosure*"/>
+        <type name="GClosure" c:type="GClosure*"/>
       </return-value>
       <parameters>
         <parameter name="callback_func">
           <type name="GCallback" c:type="GCallback"/>
         </parameter>
         <parameter name="object">
-          <type name="GObject" c:type="GObject*"/>
+          <type name="Object" c:type="GObject*"/>
         </parameter>
       </parameters>
     </function>
     <function name="closure_new_object" c:identifier="g_closure_new_object">
       <return-value>
-        <type name="GClosure*" c:type="GClosure*"/>
+        <type name="GClosure" c:type="GClosure*"/>
       </return-value>
       <parameters>
         <parameter name="sizeof_closure">
           <type name="uint32" c:type="guint"/>
         </parameter>
         <parameter name="object">
-          <type name="GObject" c:type="GObject*"/>
+          <type name="Object" c:type="GObject*"/>
         </parameter>
       </parameters>
     </function>
@@ -4857,7 +4885,7 @@
       </return-value>
       <parameters>
         <parameter name="object">
-          <type name="GObject" c:type="GObject*"/>
+          <type name="Object" c:type="GObject*"/>
         </parameter>
       </parameters>
     </function>
@@ -4867,7 +4895,7 @@
       </return-value>
       <parameters>
         <parameter name="object">
-          <type name="GObject" c:type="GObject*"/>
+          <type name="Object" c:type="GObject*"/>
         </parameter>
       </parameters>
     </function>
@@ -5067,7 +5095,7 @@
         <type name="GParamSpec" c:type="GParamSpec"/>
       </field>
       <field name="enum_class">
-        <type name="GEnumClass*" c:type="GEnumClass*"/>
+        <type name="GEnumClass" c:type="GEnumClass*"/>
       </field>
       <field name="default_value">
         <type name="int32" c:type="gint"/>
@@ -5078,7 +5106,7 @@
         <type name="GParamSpec" c:type="GParamSpec"/>
       </field>
       <field name="flags_class">
-        <type name="GFlagsClass*" c:type="GFlagsClass*"/>
+        <type name="GFlagsClass" c:type="GFlagsClass*"/>
       </field>
       <field name="default_value">
         <type name="uint32" c:type="guint"/>
@@ -5161,7 +5189,7 @@
         <type name="GParamSpec" c:type="GParamSpec"/>
       </field>
       <field name="element_spec">
-        <type name="GParamSpec*" c:type="GParamSpec*"/>
+        <type name="GParamSpec" c:type="GParamSpec*"/>
       </field>
       <field name="fixed_n_elements">
         <type name="uint32" c:type="guint"/>
@@ -5177,7 +5205,7 @@
         <type name="GParamSpec" c:type="GParamSpec"/>
       </field>
       <field name="overridden">
-        <type name="GParamSpec*" c:type="GParamSpec*"/>
+        <type name="GParamSpec" c:type="GParamSpec*"/>
       </field>
     </record>
     <record name="GParamSpecGType" c:type="_GParamSpecGType">
@@ -5190,7 +5218,7 @@
     </record>
     <function name="param_spec_char" c:identifier="g_param_spec_char">
       <return-value>
-        <type name="GParamSpec*" c:type="GParamSpec*"/>
+        <type name="GParamSpec" c:type="GParamSpec*"/>
       </return-value>
       <parameters>
         <parameter name="name">
@@ -5218,7 +5246,7 @@
     </function>
     <function name="param_spec_uchar" c:identifier="g_param_spec_uchar">
       <return-value>
-        <type name="GParamSpec*" c:type="GParamSpec*"/>
+        <type name="GParamSpec" c:type="GParamSpec*"/>
       </return-value>
       <parameters>
         <parameter name="name">
@@ -5246,7 +5274,7 @@
     </function>
     <function name="param_spec_boolean" c:identifier="g_param_spec_boolean">
       <return-value>
-        <type name="GParamSpec*" c:type="GParamSpec*"/>
+        <type name="GParamSpec" c:type="GParamSpec*"/>
       </return-value>
       <parameters>
         <parameter name="name">
@@ -5268,7 +5296,7 @@
     </function>
     <function name="param_spec_int" c:identifier="g_param_spec_int">
       <return-value>
-        <type name="GParamSpec*" c:type="GParamSpec*"/>
+        <type name="GParamSpec" c:type="GParamSpec*"/>
       </return-value>
       <parameters>
         <parameter name="name">
@@ -5296,7 +5324,7 @@
     </function>
     <function name="param_spec_uint" c:identifier="g_param_spec_uint">
       <return-value>
-        <type name="GParamSpec*" c:type="GParamSpec*"/>
+        <type name="GParamSpec" c:type="GParamSpec*"/>
       </return-value>
       <parameters>
         <parameter name="name">
@@ -5324,7 +5352,7 @@
     </function>
     <function name="param_spec_long" c:identifier="g_param_spec_long">
       <return-value>
-        <type name="GParamSpec*" c:type="GParamSpec*"/>
+        <type name="GParamSpec" c:type="GParamSpec*"/>
       </return-value>
       <parameters>
         <parameter name="name">
@@ -5352,7 +5380,7 @@
     </function>
     <function name="param_spec_ulong" c:identifier="g_param_spec_ulong">
       <return-value>
-        <type name="GParamSpec*" c:type="GParamSpec*"/>
+        <type name="GParamSpec" c:type="GParamSpec*"/>
       </return-value>
       <parameters>
         <parameter name="name">
@@ -5380,7 +5408,7 @@
     </function>
     <function name="param_spec_int64" c:identifier="g_param_spec_int64">
       <return-value>
-        <type name="GParamSpec*" c:type="GParamSpec*"/>
+        <type name="GParamSpec" c:type="GParamSpec*"/>
       </return-value>
       <parameters>
         <parameter name="name">
@@ -5408,7 +5436,7 @@
     </function>
     <function name="param_spec_uint64" c:identifier="g_param_spec_uint64">
       <return-value>
-        <type name="GParamSpec*" c:type="GParamSpec*"/>
+        <type name="GParamSpec" c:type="GParamSpec*"/>
       </return-value>
       <parameters>
         <parameter name="name">
@@ -5436,7 +5464,7 @@
     </function>
     <function name="param_spec_unichar" c:identifier="g_param_spec_unichar">
       <return-value>
-        <type name="GParamSpec*" c:type="GParamSpec*"/>
+        <type name="GParamSpec" c:type="GParamSpec*"/>
       </return-value>
       <parameters>
         <parameter name="name">
@@ -5458,7 +5486,7 @@
     </function>
     <function name="param_spec_enum" c:identifier="g_param_spec_enum">
       <return-value>
-        <type name="GParamSpec*" c:type="GParamSpec*"/>
+        <type name="GParamSpec" c:type="GParamSpec*"/>
       </return-value>
       <parameters>
         <parameter name="name">
@@ -5483,7 +5511,7 @@
     </function>
     <function name="param_spec_flags" c:identifier="g_param_spec_flags">
       <return-value>
-        <type name="GParamSpec*" c:type="GParamSpec*"/>
+        <type name="GParamSpec" c:type="GParamSpec*"/>
       </return-value>
       <parameters>
         <parameter name="name">
@@ -5508,7 +5536,7 @@
     </function>
     <function name="param_spec_float" c:identifier="g_param_spec_float">
       <return-value>
-        <type name="GParamSpec*" c:type="GParamSpec*"/>
+        <type name="GParamSpec" c:type="GParamSpec*"/>
       </return-value>
       <parameters>
         <parameter name="name">
@@ -5536,7 +5564,7 @@
     </function>
     <function name="param_spec_double" c:identifier="g_param_spec_double">
       <return-value>
-        <type name="GParamSpec*" c:type="GParamSpec*"/>
+        <type name="GParamSpec" c:type="GParamSpec*"/>
       </return-value>
       <parameters>
         <parameter name="name">
@@ -5564,7 +5592,7 @@
     </function>
     <function name="param_spec_string" c:identifier="g_param_spec_string">
       <return-value>
-        <type name="GParamSpec*" c:type="GParamSpec*"/>
+        <type name="GParamSpec" c:type="GParamSpec*"/>
       </return-value>
       <parameters>
         <parameter name="name">
@@ -5586,7 +5614,7 @@
     </function>
     <function name="param_spec_param" c:identifier="g_param_spec_param">
       <return-value>
-        <type name="GParamSpec*" c:type="GParamSpec*"/>
+        <type name="GParamSpec" c:type="GParamSpec*"/>
       </return-value>
       <parameters>
         <parameter name="name">
@@ -5608,7 +5636,7 @@
     </function>
     <function name="param_spec_boxed" c:identifier="g_param_spec_boxed">
       <return-value>
-        <type name="GParamSpec*" c:type="GParamSpec*"/>
+        <type name="GParamSpec" c:type="GParamSpec*"/>
       </return-value>
       <parameters>
         <parameter name="name">
@@ -5630,7 +5658,7 @@
     </function>
     <function name="param_spec_pointer" c:identifier="g_param_spec_pointer">
       <return-value>
-        <type name="GParamSpec*" c:type="GParamSpec*"/>
+        <type name="GParamSpec" c:type="GParamSpec*"/>
       </return-value>
       <parameters>
         <parameter name="name">
@@ -5650,7 +5678,7 @@
     <function name="param_spec_value_array"
               c:identifier="g_param_spec_value_array">
       <return-value>
-        <type name="GParamSpec*" c:type="GParamSpec*"/>
+        <type name="GParamSpec" c:type="GParamSpec*"/>
       </return-value>
       <parameters>
         <parameter name="name">
@@ -5672,7 +5700,7 @@
     </function>
     <function name="param_spec_object" c:identifier="g_param_spec_object">
       <return-value>
-        <type name="GParamSpec*" c:type="GParamSpec*"/>
+        <type name="GParamSpec" c:type="GParamSpec*"/>
       </return-value>
       <parameters>
         <parameter name="name">
@@ -5694,7 +5722,7 @@
     </function>
     <function name="param_spec_override" c:identifier="g_param_spec_override">
       <return-value>
-        <type name="GParamSpec*" c:type="GParamSpec*"/>
+        <type name="GParamSpec" c:type="GParamSpec*"/>
       </return-value>
       <parameters>
         <parameter name="name">
@@ -5707,7 +5735,7 @@
     </function>
     <function name="param_spec_gtype" c:identifier="g_param_spec_gtype">
       <return-value>
-        <type name="GParamSpec*" c:type="GParamSpec*"/>
+        <type name="GParamSpec" c:type="GParamSpec*"/>
       </return-value>
       <parameters>
         <parameter name="name">
@@ -5754,16 +5782,16 @@
     <record name="TypeModule" c:type="GTypeModule"/>
     <record name="GTypeModule" c:type="_GTypeModule">
       <field name="parent_instance">
-        <type name="GObject" c:type="GObject"/>
+        <type name="Object" c:type="GObject"/>
       </field>
       <field name="use_count">
         <type name="uint32" c:type="guint"/>
       </field>
       <field name="type_infos">
-        <type name="GSList*" c:type="GSList*"/>
+        <type name="GSList" c:type="GSList*"/>
       </field>
       <field name="interface_infos">
-        <type name="GSList*" c:type="GSList*"/>
+        <type name="GSList" c:type="GSList*"/>
       </field>
       <field name="name">
         <type name="string" c:type="gchar*"/>
@@ -5774,7 +5802,7 @@
         </return-value>
         <parameters>
           <parameter name="module">
-            <type name="GTypeModule*" c:type="GTypeModule*"/>
+            <type name="GTypeModule" c:type="GTypeModule*"/>
           </parameter>
         </parameters>
       </callback>
@@ -5784,7 +5812,7 @@
         </return-value>
         <parameters>
           <parameter name="module">
-            <type name="GTypeModule*" c:type="GTypeModule*"/>
+            <type name="GTypeModule" c:type="GTypeModule*"/>
           </parameter>
         </parameters>
       </callback>
@@ -5932,7 +5960,7 @@
       </return-value>
       <parameters>
         <parameter name="plugin">
-          <type name="GTypePlugin*" c:type="GTypePlugin*"/>
+          <type name="GTypePlugin" c:type="GTypePlugin*"/>
         </parameter>
       </parameters>
     </callback>
@@ -5942,7 +5970,7 @@
       </return-value>
       <parameters>
         <parameter name="plugin">
-          <type name="GTypePlugin*" c:type="GTypePlugin*"/>
+          <type name="GTypePlugin" c:type="GTypePlugin*"/>
         </parameter>
       </parameters>
     </callback>
@@ -5952,16 +5980,16 @@
       </return-value>
       <parameters>
         <parameter name="plugin">
-          <type name="GTypePlugin*" c:type="GTypePlugin*"/>
+          <type name="GTypePlugin" c:type="GTypePlugin*"/>
         </parameter>
         <parameter name="g_type">
           <type name="GType" c:type="GType"/>
         </parameter>
         <parameter name="info">
-          <type name="GTypeInfo*" c:type="GTypeInfo*"/>
+          <type name="GTypeInfo" c:type="GTypeInfo*"/>
         </parameter>
         <parameter name="value_table">
-          <type name="GTypeValueTable*" c:type="GTypeValueTable*"/>
+          <type name="GTypeValueTable" c:type="GTypeValueTable*"/>
         </parameter>
       </parameters>
     </callback>
@@ -5971,7 +5999,7 @@
       </return-value>
       <parameters>
         <parameter name="plugin">
-          <type name="GTypePlugin*" c:type="GTypePlugin*"/>
+          <type name="GTypePlugin" c:type="GTypePlugin*"/>
         </parameter>
         <parameter name="instance_type">
           <type name="GType" c:type="GType"/>
@@ -5980,7 +6008,7 @@
           <type name="GType" c:type="GType"/>
         </parameter>
         <parameter name="info">
-          <type name="GInterfaceInfo*" c:type="GInterfaceInfo*"/>
+          <type name="GInterfaceInfo" c:type="GInterfaceInfo*"/>
         </parameter>
       </parameters>
     </callback>
@@ -6056,7 +6084,7 @@
         <type name="uint32" c:type="guint"/>
       </field>
       <field name="values">
-        <type name="GValue*" c:type="GValue*"/>
+        <type name="GValue" c:type="GValue*"/>
       </field>
       <field name="n_prealloced">
         <type name="uint32" c:type="guint"/>
@@ -6064,7 +6092,7 @@
     </record>
     <function name="value_array_get_nth" c:identifier="g_value_array_get_nth">
       <return-value>
-        <type name="GValue*" c:type="GValue*"/>
+        <type name="GValue" c:type="GValue*"/>
       </return-value>
       <parameters>
         <parameter name="value_array">
@@ -6077,7 +6105,7 @@
     </function>
     <function name="value_array_new" c:identifier="g_value_array_new">
       <return-value>
-        <type name="GValueArray*" c:type="GValueArray*"/>
+        <type name="GValueArray" c:type="GValueArray*"/>
       </return-value>
       <parameters>
         <parameter name="n_prealloced">
@@ -6097,7 +6125,7 @@
     </function>
     <function name="value_array_copy" c:identifier="g_value_array_copy">
       <return-value>
-        <type name="GValueArray*" c:type="GValueArray*"/>
+        <type name="GValueArray" c:type="GValueArray*"/>
       </return-value>
       <parameters>
         <parameter name="value_array">
@@ -6107,7 +6135,7 @@
     </function>
     <function name="value_array_prepend" c:identifier="g_value_array_prepend">
       <return-value>
-        <type name="GValueArray*" c:type="GValueArray*"/>
+        <type name="GValueArray" c:type="GValueArray*"/>
       </return-value>
       <parameters>
         <parameter name="value_array">
@@ -6120,7 +6148,7 @@
     </function>
     <function name="value_array_append" c:identifier="g_value_array_append">
       <return-value>
-        <type name="GValueArray*" c:type="GValueArray*"/>
+        <type name="GValueArray" c:type="GValueArray*"/>
       </return-value>
       <parameters>
         <parameter name="value_array">
@@ -6133,7 +6161,7 @@
     </function>
     <function name="value_array_insert" c:identifier="g_value_array_insert">
       <return-value>
-        <type name="GValueArray*" c:type="GValueArray*"/>
+        <type name="GValueArray" c:type="GValueArray*"/>
       </return-value>
       <parameters>
         <parameter name="value_array">
@@ -6149,7 +6177,7 @@
     </function>
     <function name="value_array_remove" c:identifier="g_value_array_remove">
       <return-value>
-        <type name="GValueArray*" c:type="GValueArray*"/>
+        <type name="GValueArray" c:type="GValueArray*"/>
       </return-value>
       <parameters>
         <parameter name="value_array">
@@ -6162,28 +6190,28 @@
     </function>
     <function name="value_array_sort" c:identifier="g_value_array_sort">
       <return-value>
-        <type name="GValueArray*" c:type="GValueArray*"/>
+        <type name="GValueArray" c:type="GValueArray*"/>
       </return-value>
       <parameters>
         <parameter name="value_array">
           <type name="GValueArray" c:type="GValueArray*"/>
         </parameter>
         <parameter name="compare_func">
-          <type name="GCompareFunc" c:type="GCompareFunc"/>
+          <type name="GLib.GCompareFunc" c:type="GCompareFunc"/>
         </parameter>
       </parameters>
     </function>
     <function name="value_array_sort_with_data"
               c:identifier="g_value_array_sort_with_data">
       <return-value>
-        <type name="GValueArray*" c:type="GValueArray*"/>
+        <type name="GValueArray" c:type="GValueArray*"/>
       </return-value>
       <parameters>
         <parameter name="value_array">
           <type name="GValueArray" c:type="GValueArray*"/>
         </parameter>
         <parameter name="compare_func">
-          <type name="GCompareDataFunc" c:type="GCompareDataFunc"/>
+          <type name="GLib.GCompareDataFunc" c:type="GCompareDataFunc"/>
         </parameter>
         <parameter name="user_data">
           <type name="any" c:type="gpointer"/>



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]