[glibmm] Regenerate defs files.



commit af59f224dbf77593eca28322b37fc969e0acf3d2
Author: José Alburquerque <jaalburqu svn gnome org>
Date:   Mon Mar 15 13:09:10 2010 -0400

    	Regenerate defs files.
    
    	* gio/src/gio_enums.defs:
    	* gio/src/gio_methods.defs:
    	* glib/src/glib_enums.defs:
    	* glib/src/glib_functions.defs:
    	* glib/src/gmodule_enums.defs:
    	* glib/src/gmodule_functions.defs:
    	* glib/src/gobject_enums.defs:
    	* glib/src/gobject_functions.defs: Regenerate defs file, particularly
    	the enum defs file with the new enum generation tool.

 ChangeLog                       |   14 +
 gio/src/gio_enums.defs          |  372 ++++++++++--
 gio/src/gio_methods.defs        |   37 +-
 glib/src/glib_enums.defs        |  887 ++++++++++++++++++++++++++-
 glib/src/glib_functions.defs    | 1299 ++++++++++++++++++++++++++++++++++++++-
 glib/src/gmodule_enums.defs     |   10 +-
 glib/src/gmodule_functions.defs |    4 +
 glib/src/gobject_enums.defs     |   93 +++-
 glib/src/gobject_functions.defs |   59 ++-
 9 files changed, 2633 insertions(+), 142 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 08690f7..c426f75 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2010-03-15  José Alburquerque  <jaalburqu svn gnome org>
+
+	Regenerate defs files.
+
+	* gio/src/gio_enums.defs:
+	* gio/src/gio_methods.defs:
+	* glib/src/glib_enums.defs:
+	* glib/src/glib_functions.defs:
+	* glib/src/gmodule_enums.defs:
+	* glib/src/gmodule_functions.defs:
+	* glib/src/gobject_enums.defs:
+	* glib/src/gobject_functions.defs: Regenerate defs file, particularly
+	the enum defs file with the new enum generation tool.
+
 2010-03-10  David King  <davidk openismus com>
 
 	Reorder assignment to LDADD and giomm_ldadd in tests/Makefile.am
diff --git a/gio/src/gio_enums.defs b/gio/src/gio_enums.defs
index c58082a..2c2e4a0 100644
--- a/gio/src/gio_enums.defs
+++ b/gio/src/gio_enums.defs
@@ -1,25 +1,47 @@
 ;; From gioenums.h
 
+;; Original typedef:
+;; typedef enum {
+;;   G_APP_INFO_CREATE_NONE           = 0,         /*< nick=none >*/
+;;   G_APP_INFO_CREATE_NEEDS_TERMINAL = (1 << 0),  /*< nick=needs-terminal >*/
+;;   G_APP_INFO_CREATE_SUPPORTS_URIS  = (1 << 1)   /*< nick=supports-uris >*/
+;; } GAppInfoCreateFlags;
+
 (define-flags-extended AppInfoCreateFlags
   (in-module "G")
   (c-name "GAppInfoCreateFlags")
   (values
-    '("none" "G_APP_INFO_CREATE_NONE" "0")
-    '("needs-terminal" "G_APP_INFO_CREATE_NEEDS_TERMINAL" "1 << 0")
-    '("supports-uris" "G_APP_INFO_CREATE_SUPPORTS_URIS" "1 << 1")
+    '("none" "G_APP_INFO_CREATE_NONE" "0x0")
+    '("needs-terminal" "G_APP_INFO_CREATE_NEEDS_TERMINAL" "(1 << 0)")
+    '("supports-uris" "G_APP_INFO_CREATE_SUPPORTS_URIS" "(1 << 1)")
   )
 )
 
+;; Original typedef:
+;; typedef enum {
+;;   G_CONVERTER_NO_FLAGS     = 0,         /*< nick=none >*/
+;;   G_CONVERTER_INPUT_AT_END = (1 << 0),  /*< nick=input-at-end >*/
+;;   G_CONVERTER_FLUSH        = (1 << 1)   /*< nick=flush >*/
+;; } GConverterFlags;
+
 (define-flags-extended ConverterFlags
   (in-module "G")
   (c-name "GConverterFlags")
   (values
-    '("no-flags" "G_CONVERTER_NO_FLAGS" "0")
-    '("input-at-end" "G_CONVERTER_INPUT_AT_END" "1 << 0")
-    '("flush" "G_CONVERTER_FLUSH" "1 << 1")
+    '("no-flags" "G_CONVERTER_NO_FLAGS" "0x0")
+    '("input-at-end" "G_CONVERTER_INPUT_AT_END" "(1 << 0)")
+    '("flush" "G_CONVERTER_FLUSH" "(1 << 1)")
   )
 )
 
+;; Original typedef:
+;; typedef enum {
+;;   G_CONVERTER_ERROR     = 0,  /*< nick=error >*/
+;;   G_CONVERTER_CONVERTED = 1,  /*< nick=converted >*/
+;;   G_CONVERTER_FINISHED  = 2,  /*< nick=finished >*/
+;;   G_CONVERTER_FLUSHED   = 3   /*< nick=flushed >*/
+;; } GConverterResult;
+
 (define-enum-extended ConverterResult
   (in-module "G")
   (c-name "GConverterResult")
@@ -31,6 +53,13 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum {
+;;   G_DATA_STREAM_BYTE_ORDER_BIG_ENDIAN,
+;;   G_DATA_STREAM_BYTE_ORDER_LITTLE_ENDIAN,
+;;   G_DATA_STREAM_BYTE_ORDER_HOST_ENDIAN
+;; } GDataStreamByteOrder;
+
 (define-enum-extended DataStreamByteOrder
   (in-module "G")
   (c-name "GDataStreamByteOrder")
@@ -41,6 +70,14 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum {
+;;   G_DATA_STREAM_NEWLINE_TYPE_LF,
+;;   G_DATA_STREAM_NEWLINE_TYPE_CR,
+;;   G_DATA_STREAM_NEWLINE_TYPE_CR_LF,
+;;   G_DATA_STREAM_NEWLINE_TYPE_ANY
+;; } GDataStreamNewlineType;
+
 (define-enum-extended DataStreamNewlineType
   (in-module "G")
   (c-name "GDataStreamNewlineType")
@@ -52,6 +89,20 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum {
+;;   G_FILE_ATTRIBUTE_TYPE_INVALID = 0,
+;;   G_FILE_ATTRIBUTE_TYPE_STRING,
+;;   G_FILE_ATTRIBUTE_TYPE_BYTE_STRING, /* zero terminated string of non-zero bytes */
+;;   G_FILE_ATTRIBUTE_TYPE_BOOLEAN,
+;;   G_FILE_ATTRIBUTE_TYPE_UINT32,
+;;   G_FILE_ATTRIBUTE_TYPE_INT32,
+;;   G_FILE_ATTRIBUTE_TYPE_UINT64,
+;;   G_FILE_ATTRIBUTE_TYPE_INT64,
+;;   G_FILE_ATTRIBUTE_TYPE_OBJECT,
+;;   G_FILE_ATTRIBUTE_TYPE_STRINGV
+;; } GFileAttributeType;
+
 (define-enum-extended FileAttributeType
   (in-module "G")
   (c-name "GFileAttributeType")
@@ -69,16 +120,30 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum {
+;;   G_FILE_ATTRIBUTE_INFO_NONE            = 0,
+;;   G_FILE_ATTRIBUTE_INFO_COPY_WITH_FILE  = (1 << 0),
+;;   G_FILE_ATTRIBUTE_INFO_COPY_WHEN_MOVED = (1 << 1)
+;; } GFileAttributeInfoFlags;
+
 (define-flags-extended FileAttributeInfoFlags
   (in-module "G")
   (c-name "GFileAttributeInfoFlags")
   (values
-    '("none" "G_FILE_ATTRIBUTE_INFO_NONE" "0")
-    '("copy-with-file" "G_FILE_ATTRIBUTE_INFO_COPY_WITH_FILE" "1 << 0")
-    '("copy-when-moved" "G_FILE_ATTRIBUTE_INFO_COPY_WHEN_MOVED" "1 << 1")
+    '("none" "G_FILE_ATTRIBUTE_INFO_NONE" "0x0")
+    '("copy-with-file" "G_FILE_ATTRIBUTE_INFO_COPY_WITH_FILE" "(1 << 0)")
+    '("copy-when-moved" "G_FILE_ATTRIBUTE_INFO_COPY_WHEN_MOVED" "(1 << 1)")
   )
 )
 
+;; Original typedef:
+;; typedef enum {
+;;   G_FILE_ATTRIBUTE_STATUS_UNSET = 0,
+;;   G_FILE_ATTRIBUTE_STATUS_SET,
+;;   G_FILE_ATTRIBUTE_STATUS_ERROR_SETTING
+;; } GFileAttributeStatus;
+
 (define-enum-extended FileAttributeStatus
   (in-module "G")
   (c-name "GFileAttributeStatus")
@@ -89,50 +154,88 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum {
+;;   G_FILE_QUERY_INFO_NONE              = 0,
+;;   G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS = (1 << 0)   /*< nick=nofollow-symlinks >*/
+;; } GFileQueryInfoFlags;
+
 (define-flags-extended FileQueryInfoFlags
   (in-module "G")
   (c-name "GFileQueryInfoFlags")
   (values
-    '("none" "G_FILE_QUERY_INFO_NONE" "0")
-    '("nofollow-symlinks" "G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS" "1 << 0")
+    '("none" "G_FILE_QUERY_INFO_NONE" "0x0")
+    '("nofollow-symlinks" "G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS" "(1 << 0)")
   )
 )
 
+;; Original typedef:
+;; typedef enum {
+;;   G_FILE_CREATE_NONE    = 0,
+;;   G_FILE_CREATE_PRIVATE = (1 << 0),
+;;   G_FILE_CREATE_REPLACE_DESTINATION = (1 << 1)
+;; } GFileCreateFlags;
+
 (define-flags-extended FileCreateFlags
   (in-module "G")
   (c-name "GFileCreateFlags")
   (values
-    '("none" "G_FILE_CREATE_NONE" "0")
-    '("private" "G_FILE_CREATE_PRIVATE" "1 << 0")
-    '("replace-destination" "G_FILE_CREATE_REPLACE_DESTINATION" "1 << 1")
+    '("none" "G_FILE_CREATE_NONE" "0x0")
+    '("private" "G_FILE_CREATE_PRIVATE" "(1 << 0)")
+    '("replace-destination" "G_FILE_CREATE_REPLACE_DESTINATION" "(1 << 1)")
   )
 )
 
-(define-enum-extended MountMountFlags
+;; Original typedef:
+;; typedef enum {
+;;   G_MOUNT_MOUNT_NONE = 0
+;; } GMountMountFlags;
+
+(define-flags-extended MountMountFlags
   (in-module "G")
   (c-name "GMountMountFlags")
   (values
-    '("e" "G_MOUNT_MOUNT_NONE" "0")
+    '("none" "G_MOUNT_MOUNT_NONE" "0x0")
   )
 )
 
+;; Original typedef:
+;; typedef enum {
+;;   G_MOUNT_UNMOUNT_NONE  = 0,
+;;   G_MOUNT_UNMOUNT_FORCE = (1 << 0)
+;; } GMountUnmountFlags;
+
 (define-flags-extended MountUnmountFlags
   (in-module "G")
   (c-name "GMountUnmountFlags")
   (values
-    '("none" "G_MOUNT_UNMOUNT_NONE" "0")
-    '("force" "G_MOUNT_UNMOUNT_FORCE" "1 << 0")
+    '("none" "G_MOUNT_UNMOUNT_NONE" "0x0")
+    '("force" "G_MOUNT_UNMOUNT_FORCE" "(1 << 0)")
   )
 )
 
-(define-enum-extended DriveStartFlags
+;; Original typedef:
+;; typedef enum {
+;;   G_DRIVE_START_NONE = 0
+;; } GDriveStartFlags;
+
+(define-flags-extended DriveStartFlags
   (in-module "G")
   (c-name "GDriveStartFlags")
   (values
-    '("e" "G_DRIVE_START_NONE" "0")
+    '("none" "G_DRIVE_START_NONE" "0x0")
   )
 )
 
+;; Original typedef:
+;; typedef enum {
+;;   G_DRIVE_START_STOP_TYPE_UNKNOWN,
+;;   G_DRIVE_START_STOP_TYPE_SHUTDOWN,
+;;   G_DRIVE_START_STOP_TYPE_NETWORK,
+;;   G_DRIVE_START_STOP_TYPE_MULTIDISK,
+;;   G_DRIVE_START_STOP_TYPE_PASSWORD
+;; } GDriveStartStopType;
+
 (define-enum-extended DriveStartStopType
   (in-module "G")
   (c-name "GDriveStartStopType")
@@ -145,30 +248,59 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum {
+;;   G_FILE_COPY_NONE                 = 0,          /*< nick=none >*/
+;;   G_FILE_COPY_OVERWRITE            = (1 << 0),
+;;   G_FILE_COPY_BACKUP               = (1 << 1),
+;;   G_FILE_COPY_NOFOLLOW_SYMLINKS    = (1 << 2),
+;;   G_FILE_COPY_ALL_METADATA         = (1 << 3),
+;;   G_FILE_COPY_NO_FALLBACK_FOR_MOVE = (1 << 4),
+;;   G_FILE_COPY_TARGET_DEFAULT_PERMS = (1 << 5)
+;; } GFileCopyFlags;
+
 (define-flags-extended FileCopyFlags
   (in-module "G")
   (c-name "GFileCopyFlags")
   (values
-    '("none" "G_FILE_COPY_NONE" "0")
-    '("overwrite" "G_FILE_COPY_OVERWRITE" "1 << 0")
-    '("backup" "G_FILE_COPY_BACKUP" "1 << 1")
-    '("nofollow-symlinks" "G_FILE_COPY_NOFOLLOW_SYMLINKS" "1 << 2")
-    '("all-metadata" "G_FILE_COPY_ALL_METADATA" "1 << 3")
-    '("no-fallback-for-move" "G_FILE_COPY_NO_FALLBACK_FOR_MOVE" "1 << 4")
-    '("target-default-perms" "G_FILE_COPY_TARGET_DEFAULT_PERMS" "1 << 5")
+    '("none" "G_FILE_COPY_NONE" "0x0")
+    '("overwrite" "G_FILE_COPY_OVERWRITE" "(1 << 0)")
+    '("backup" "G_FILE_COPY_BACKUP" "(1 << 1)")
+    '("nofollow-symlinks" "G_FILE_COPY_NOFOLLOW_SYMLINKS" "(1 << 2)")
+    '("all-metadata" "G_FILE_COPY_ALL_METADATA" "(1 << 3)")
+    '("no-fallback-for-move" "G_FILE_COPY_NO_FALLBACK_FOR_MOVE" "(1 << 4)")
+    '("target-default-perms" "G_FILE_COPY_TARGET_DEFAULT_PERMS" "(1 << 5)")
   )
 )
 
+;; Original typedef:
+;; typedef enum {
+;;   G_FILE_MONITOR_NONE         = 0,
+;;   G_FILE_MONITOR_WATCH_MOUNTS = (1 << 0),
+;;   G_FILE_MONITOR_SEND_MOVED   = (1 << 1)
+;; } GFileMonitorFlags;
+
 (define-flags-extended FileMonitorFlags
   (in-module "G")
   (c-name "GFileMonitorFlags")
   (values
-    '("none" "G_FILE_MONITOR_NONE" "0")
-    '("watch-mounts" "G_FILE_MONITOR_WATCH_MOUNTS" "1 << 0")
-    '("send-moved" "G_FILE_MONITOR_SEND_MOVED" "1 << 1")
+    '("none" "G_FILE_MONITOR_NONE" "0x0")
+    '("watch-mounts" "G_FILE_MONITOR_WATCH_MOUNTS" "(1 << 0)")
+    '("send-moved" "G_FILE_MONITOR_SEND_MOVED" "(1 << 1)")
   )
 )
 
+;; Original typedef:
+;; typedef enum {
+;;   G_FILE_TYPE_UNKNOWN = 0,
+;;   G_FILE_TYPE_REGULAR,
+;;   G_FILE_TYPE_DIRECTORY,
+;;   G_FILE_TYPE_SYMBOLIC_LINK,
+;;   G_FILE_TYPE_SPECIAL, /* socket, fifo, blockdev, chardev */
+;;   G_FILE_TYPE_SHORTCUT,
+;;   G_FILE_TYPE_MOUNTABLE
+;; } GFileType;
+
 (define-enum-extended FileType
   (in-module "G")
   (c-name "GFileType")
@@ -183,6 +315,13 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum {
+;;   G_FILESYSTEM_PREVIEW_TYPE_IF_ALWAYS = 0,
+;;   G_FILESYSTEM_PREVIEW_TYPE_IF_LOCAL,
+;;   G_FILESYSTEM_PREVIEW_TYPE_NEVER
+;; } GFilesystemPreviewType;
+
 (define-enum-extended FilesystemPreviewType
   (in-module "G")
   (c-name "GFilesystemPreviewType")
@@ -193,6 +332,18 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum {
+;;   G_FILE_MONITOR_EVENT_CHANGED,
+;;   G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT,
+;;   G_FILE_MONITOR_EVENT_DELETED,
+;;   G_FILE_MONITOR_EVENT_CREATED,
+;;   G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED,
+;;   G_FILE_MONITOR_EVENT_PRE_UNMOUNT,
+;;   G_FILE_MONITOR_EVENT_UNMOUNTED,
+;;   G_FILE_MONITOR_EVENT_MOVED
+;; } GFileMonitorEvent;
+
 (define-enum-extended FileMonitorEvent
   (in-module "G")
   (c-name "GFileMonitorEvent")
@@ -208,6 +359,46 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum {
+;;   G_IO_ERROR_FAILED,
+;;   G_IO_ERROR_NOT_FOUND,
+;;   G_IO_ERROR_EXISTS,
+;;   G_IO_ERROR_IS_DIRECTORY,
+;;   G_IO_ERROR_NOT_DIRECTORY,
+;;   G_IO_ERROR_NOT_EMPTY,
+;;   G_IO_ERROR_NOT_REGULAR_FILE,
+;;   G_IO_ERROR_NOT_SYMBOLIC_LINK,
+;;   G_IO_ERROR_NOT_MOUNTABLE_FILE,
+;;   G_IO_ERROR_FILENAME_TOO_LONG,
+;;   G_IO_ERROR_INVALID_FILENAME,
+;;   G_IO_ERROR_TOO_MANY_LINKS,
+;;   G_IO_ERROR_NO_SPACE,
+;;   G_IO_ERROR_INVALID_ARGUMENT,
+;;   G_IO_ERROR_PERMISSION_DENIED,
+;;   G_IO_ERROR_NOT_SUPPORTED,
+;;   G_IO_ERROR_NOT_MOUNTED,
+;;   G_IO_ERROR_ALREADY_MOUNTED,
+;;   G_IO_ERROR_CLOSED,
+;;   G_IO_ERROR_CANCELLED,
+;;   G_IO_ERROR_PENDING,
+;;   G_IO_ERROR_READ_ONLY,
+;;   G_IO_ERROR_CANT_CREATE_BACKUP,
+;;   G_IO_ERROR_WRONG_ETAG,
+;;   G_IO_ERROR_TIMED_OUT,
+;;   G_IO_ERROR_WOULD_RECURSE,
+;;   G_IO_ERROR_BUSY,
+;;   G_IO_ERROR_WOULD_BLOCK,
+;;   G_IO_ERROR_HOST_NOT_FOUND,
+;;   G_IO_ERROR_WOULD_MERGE,
+;;   G_IO_ERROR_FAILED_HANDLED,
+;;   G_IO_ERROR_TOO_MANY_OPEN_FILES,
+;;   G_IO_ERROR_NOT_INITIALIZED,
+;;   G_IO_ERROR_ADDRESS_IN_USE,
+;;   G_IO_ERROR_PARTIAL_INPUT,
+;;   G_IO_ERROR_INVALID_DATA
+;; } GIOErrorEnum;
+
 (define-enum-extended IOErrorEnum
   (in-module "G")
   (c-name "GIOErrorEnum")
@@ -240,7 +431,6 @@
     '("would-recurse" "G_IO_ERROR_WOULD_RECURSE" "25")
     '("busy" "G_IO_ERROR_BUSY" "26")
     '("would-block" "G_IO_ERROR_WOULD_BLOCK" "27")
-    '("host-was-not-found" "G_IO_ERROR_HOST_WAS_NOT_FOUND" "28")
     '("host-not-found" "G_IO_ERROR_HOST_NOT_FOUND" "28")
     '("would-merge" "G_IO_ERROR_WOULD_MERGE" "29")
     '("failed-handled" "G_IO_ERROR_FAILED_HANDLED" "30")
@@ -252,18 +442,34 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum {
+;;   G_ASK_PASSWORD_NEED_PASSWORD       = (1 << 0),
+;;   G_ASK_PASSWORD_NEED_USERNAME       = (1 << 1),
+;;   G_ASK_PASSWORD_NEED_DOMAIN         = (1 << 2),
+;;   G_ASK_PASSWORD_SAVING_SUPPORTED    = (1 << 3),
+;;   G_ASK_PASSWORD_ANONYMOUS_SUPPORTED = (1 << 4)
+;; } GAskPasswordFlags;
+
 (define-flags-extended AskPasswordFlags
   (in-module "G")
   (c-name "GAskPasswordFlags")
   (values
-    '("need-password" "G_ASK_PASSWORD_NEED_PASSWORD" "1 << 0")
-    '("need-username" "G_ASK_PASSWORD_NEED_USERNAME" "1 << 1")
-    '("need-domain" "G_ASK_PASSWORD_NEED_DOMAIN" "1 << 2")
-    '("saving-supported" "G_ASK_PASSWORD_SAVING_SUPPORTED" "1 << 3")
-    '("anonymous-supported" "G_ASK_PASSWORD_ANONYMOUS_SUPPORTED" "1 << 4")
+    '("need-password" "G_ASK_PASSWORD_NEED_PASSWORD" "(1 << 0)")
+    '("need-username" "G_ASK_PASSWORD_NEED_USERNAME" "(1 << 1)")
+    '("need-domain" "G_ASK_PASSWORD_NEED_DOMAIN" "(1 << 2)")
+    '("saving-supported" "G_ASK_PASSWORD_SAVING_SUPPORTED" "(1 << 3)")
+    '("anonymous-supported" "G_ASK_PASSWORD_ANONYMOUS_SUPPORTED" "(1 << 4)")
   )
 )
 
+;; Original typedef:
+;; typedef enum {
+;;   G_PASSWORD_SAVE_NEVER,
+;;   G_PASSWORD_SAVE_FOR_SESSION,
+;;   G_PASSWORD_SAVE_PERMANENTLY
+;; } GPasswordSave;
+
 (define-enum-extended PasswordSave
   (in-module "G")
   (c-name "GPasswordSave")
@@ -274,6 +480,13 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum {
+;;   G_MOUNT_OPERATION_HANDLED,
+;;   G_MOUNT_OPERATION_ABORTED,
+;;   G_MOUNT_OPERATION_UNHANDLED
+;; } GMountOperationResult;
+
 (define-enum-extended MountOperationResult
   (in-module "G")
   (c-name "GMountOperationResult")
@@ -284,16 +497,31 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum {
+;;   G_OUTPUT_STREAM_SPLICE_NONE         = 0,
+;;   G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE = (1 << 0),
+;;   G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET = (1 << 1)
+;; } GOutputStreamSpliceFlags;
+
 (define-flags-extended OutputStreamSpliceFlags
   (in-module "G")
   (c-name "GOutputStreamSpliceFlags")
   (values
-    '("none" "G_OUTPUT_STREAM_SPLICE_NONE" "0")
-    '("close-source" "G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE" "1 << 0")
-    '("close-target" "G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET" "1 << 1")
+    '("none" "G_OUTPUT_STREAM_SPLICE_NONE" "0x0")
+    '("close-source" "G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE" "(1 << 0)")
+    '("close-target" "G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET" "(1 << 1)")
   )
 )
 
+;; Original typedef:
+;; typedef enum  {
+;;   G_EMBLEM_ORIGIN_UNKNOWN,
+;;   G_EMBLEM_ORIGIN_DEVICE,
+;;   G_EMBLEM_ORIGIN_LIVEMETADATA,
+;;   G_EMBLEM_ORIGIN_TAG
+;; } GEmblemOrigin;
+
 (define-enum-extended EmblemOrigin
   (in-module "G")
   (c-name "GEmblemOrigin")
@@ -305,6 +533,13 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum {
+;;   G_RESOLVER_ERROR_NOT_FOUND,
+;;   G_RESOLVER_ERROR_TEMPORARY_FAILURE,
+;;   G_RESOLVER_ERROR_INTERNAL
+;; } GResolverError;
+
 (define-enum-extended ResolverError
   (in-module "G")
   (c-name "GResolverError")
@@ -315,15 +550,36 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum {
+;;   G_SOCKET_FAMILY_INVALID,
+;; #ifdef GLIB_SYSDEF_AF_UNIX
+;;   G_SOCKET_FAMILY_UNIX = GLIB_SYSDEF_AF_UNIX,
+;; #endif
+;;   G_SOCKET_FAMILY_IPV4 = GLIB_SYSDEF_AF_INET,
+;;   G_SOCKET_FAMILY_IPV6 = GLIB_SYSDEF_AF_INET6
+;; } GSocketFamily;
+
 (define-enum-extended SocketFamily
   (in-module "G")
   (c-name "GSocketFamily")
   (values
     '("invalid" "G_SOCKET_FAMILY_INVALID" "0")
-    '("ipv6" "G_SOCKET_FAMILY_IPV6" "3")
+    '("unix" "G_SOCKET_FAMILY_UNIX" "GLIB_SYSDEF_AF_UNIX")
+    '("ipv4" "G_SOCKET_FAMILY_IPV4" "GLIB_SYSDEF_AF_INET")
+    '("ipv6" "G_SOCKET_FAMILY_IPV6" "GLIB_SYSDEF_AF_INET6")
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   G_SOCKET_TYPE_INVALID,
+;;   G_SOCKET_TYPE_STREAM,
+;;   G_SOCKET_TYPE_DATAGRAM,
+;;   G_SOCKET_TYPE_SEQPACKET
+;; } GSocketType;
+
 (define-enum-extended SocketType
   (in-module "G")
   (c-name "GSocketType")
@@ -335,17 +591,35 @@
   )
 )
 
-(define-enum-extended SocketMsgFlags
+;; Original typedef:
+;; typedef enum
+;; {
+;;   G_SOCKET_MSG_NONE,
+;;   G_SOCKET_MSG_OOB = GLIB_SYSDEF_MSG_OOB,
+;;   G_SOCKET_MSG_PEEK = GLIB_SYSDEF_MSG_PEEK,
+;;   G_SOCKET_MSG_DONTROUTE = GLIB_SYSDEF_MSG_DONTROUTE
+;; } GSocketMsgFlags;
+
+(define-flags-extended SocketMsgFlags
   (in-module "G")
   (c-name "GSocketMsgFlags")
   (values
-    '("none" "G_SOCKET_MSG_NONE" "0")
-    '("oob" "G_SOCKET_MSG_OOB" "#error")
-    '("peek" "G_SOCKET_MSG_PEEK" "#error")
-    '("dontroute" "G_SOCKET_MSG_DONTROUTE" "#error")
+    '("none" "G_SOCKET_MSG_NONE" "0x0")
+    '("oob" "G_SOCKET_MSG_OOB" "GLIB_SYSDEF_MSG_OOB")
+    '("peek" "G_SOCKET_MSG_PEEK" "GLIB_SYSDEF_MSG_PEEK")
+    '("dontroute" "G_SOCKET_MSG_DONTROUTE" "GLIB_SYSDEF_MSG_DONTROUTE")
   )
 )
 
+;; Original typedef:
+;; typedef enum {
+;;   G_SOCKET_PROTOCOL_UNKNOWN = -1,
+;;   G_SOCKET_PROTOCOL_DEFAULT = 0,
+;;   G_SOCKET_PROTOCOL_TCP     = 6,
+;;   G_SOCKET_PROTOCOL_UDP     = 17,
+;;   G_SOCKET_PROTOCOL_SCTP    = 132
+;; } GSocketProtocol;
+
 (define-enum-extended SocketProtocol
   (in-module "G")
   (c-name "GSocketProtocol")
@@ -358,6 +632,13 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum {
+;;   G_ZLIB_COMPRESSOR_FORMAT_ZLIB,
+;;   G_ZLIB_COMPRESSOR_FORMAT_GZIP,
+;;   G_ZLIB_COMPRESSOR_FORMAT_RAW
+;; } GZlibCompressorFormat;
+
 (define-enum-extended ZlibCompressorFormat
   (in-module "G")
   (c-name "GZlibCompressorFormat")
@@ -367,3 +648,4 @@
     '("raw" "G_ZLIB_COMPRESSOR_FORMAT_RAW" "2")
   )
 )
+
diff --git a/gio/src/gio_methods.defs b/gio/src/gio_methods.defs
index 18dd505..5c62d90 100644
--- a/gio/src/gio_methods.defs
+++ b/gio/src/gio_methods.defs
@@ -378,13 +378,6 @@
   (gtype-id "G_TYPE_TCP_CONNECTION")
 )
 
-(define-object Resolver
-  (in-module "GThreaded")
-  (parent "GResolver")
-  (c-name "GThreadedResolver")
-  (gtype-id "G_TYPE_THREADED_RESOLVER")
-)
-
 (define-object SocketService
   (in-module "GThreaded")
   (parent "GSocketService")
@@ -427,13 +420,6 @@
   (gtype-id "G_TYPE_UNIX_OUTPUT_STREAM")
 )
 
-(define-object Resolver
-  (in-module "GUnix")
-  (parent "GThreadedResolver")
-  (c-name "GUnixResolver")
-  (gtype-id "G_TYPE_UNIX_RESOLVER")
-)
-
 (define-object SocketAddress
   (in-module "GUnix")
   (parent "GSocketAddress")
@@ -468,13 +454,6 @@
   (gtype-id "G_TYPE_NATIVE_VOLUME_MONITOR")
 )
 
-(define-object 32Resolver
-  (in-module "GWin")
-  (parent "GThreadedResolver")
-  (c-name "GWin32Resolver")
-  (gtype-id "G_TYPE_WIN32_RESOLVER")
-)
-
 ;; Enumerations and flags ...
 
 (define-flags InfoCreateFlags
@@ -579,8 +558,8 @@
   (c-name "GFileQueryInfoFlags")
   (gtype-id "G_TYPE_FILE_QUERY_INFO_FLAGS")
   (values
-    '("none" "G_FILE_QUERY_INFO_NONE")
-    '("nofollow-symlinks" "G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS")
+    '("ne" "G_FILE_QUERY_INFO_NONE")
+    '("follow-symlinks" "G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS")
   )
 )
 
@@ -600,7 +579,7 @@
   (c-name "GMountMountFlags")
   (gtype-id "G_TYPE_MOUNT_MOUNT_FLAGS")
   (values
-    '("none" "G_MOUNT_MOUNT_NONE")
+    '("e" "G_MOUNT_MOUNT_NONE")
   )
 )
 
@@ -619,7 +598,7 @@
   (c-name "GDriveStartFlags")
   (gtype-id "G_TYPE_DRIVE_START_FLAGS")
   (values
-    '("none" "G_DRIVE_START_NONE")
+    '("e" "G_DRIVE_START_NONE")
   )
 )
 
@@ -822,10 +801,10 @@
   (c-name "GSocketFamily")
   (gtype-id "G_TYPE_SOCKET_FAMILY")
   (values
-    '("invalid" "G_SOCKET_FAMILY_INVALID")
-    '("unix" "G_SOCKET_FAMILY_UNIX")
-    '("ipv4" "G_SOCKET_FAMILY_IPV4")
-    '("ipv6" "G_SOCKET_FAMILY_IPV6")
+    '("g-socket-family-invalid" "G_SOCKET_FAMILY_INVALID")
+    '("#ifdef" "#ifdef")
+    '("#endif" "#endif")
+    '("g-socket-family-ipv6" "G_SOCKET_FAMILY_IPV6")
   )
 )
 
diff --git a/glib/src/glib_enums.defs b/glib/src/glib_enums.defs
index 8a27cbe..db84fb1 100644
--- a/glib/src/glib_enums.defs
+++ b/glib/src/glib_enums.defs
@@ -1,5 +1,18 @@
 ;; From gbookmarkfile.h
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   G_BOOKMARK_FILE_ERROR_INVALID_URI,
+;;   G_BOOKMARK_FILE_ERROR_INVALID_VALUE,
+;;   G_BOOKMARK_FILE_ERROR_APP_NOT_REGISTERED,
+;;   G_BOOKMARK_FILE_ERROR_URI_NOT_FOUND,
+;;   G_BOOKMARK_FILE_ERROR_READ,
+;;   G_BOOKMARK_FILE_ERROR_UNKNOWN_ENCODING,
+;;   G_BOOKMARK_FILE_ERROR_WRITE,
+;;   G_BOOKMARK_FILE_ERROR_FILE_NOT_FOUND
+;; } GBookmarkFileError;
+
 (define-enum-extended BookmarkFileError
   (in-module "G")
   (c-name "GBookmarkFileError")
@@ -17,6 +30,13 @@
 
 ;; From gbsearcharray.h
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   G_BSEARCH_ARRAY_ALIGN_POWER2  = 1 << 0, /* align memory to power2 sizes */
+;;   G_BSEARCH_ARRAY_AUTO_SHRINK  = 1 << 1   /* shrink array upon removal */
+;; } GBSearchArrayFlags;
+
 (define-flags-extended BSearchArrayFlags
   (in-module "G")
   (c-name "GBSearchArrayFlags")
@@ -28,6 +48,13 @@
 
 ;; From gchecksum.h
 
+;; Original typedef:
+;; typedef enum {
+;;   G_CHECKSUM_MD5,
+;;   G_CHECKSUM_SHA1,
+;;   G_CHECKSUM_SHA256
+;; } GChecksumType;
+
 (define-enum-extended ChecksumType
   (in-module "G")
   (c-name "GChecksumType")
@@ -40,6 +67,17 @@
 
 ;; From gconvert.h
 
+;; Original typedef:
+;; typedef enum 
+;; {
+;;   G_CONVERT_ERROR_NO_CONVERSION,
+;;   G_CONVERT_ERROR_ILLEGAL_SEQUENCE,
+;;   G_CONVERT_ERROR_FAILED,
+;;   G_CONVERT_ERROR_PARTIAL_INPUT,
+;;   G_CONVERT_ERROR_BAD_URI,
+;;   G_CONVERT_ERROR_NOT_ABSOLUTE_PATH
+;; } GConvertError;
+
 (define-enum-extended ConvertError
   (in-module "G")
   (c-name "GConvertError")
@@ -55,6 +93,14 @@
 
 ;; From gdate.h
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   G_DATE_DAY   = 0,
+;;   G_DATE_MONTH = 1,
+;;   G_DATE_YEAR  = 2
+;; } GDateDMY;
+
 (define-enum-extended DateDMY
   (in-module "G")
   (c-name "GDateDMY")
@@ -65,6 +111,19 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   G_DATE_BAD_WEEKDAY  = 0,
+;;   G_DATE_MONDAY       = 1,
+;;   G_DATE_TUESDAY      = 2,
+;;   G_DATE_WEDNESDAY    = 3,
+;;   G_DATE_THURSDAY     = 4,
+;;   G_DATE_FRIDAY       = 5,
+;;   G_DATE_SATURDAY     = 6,
+;;   G_DATE_SUNDAY       = 7
+;; } GDateWeekday;
+
 (define-enum-extended DateWeekday
   (in-module "G")
   (c-name "GDateWeekday")
@@ -80,6 +139,24 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   G_DATE_BAD_MONTH = 0,
+;;   G_DATE_JANUARY   = 1,
+;;   G_DATE_FEBRUARY  = 2,
+;;   G_DATE_MARCH     = 3,
+;;   G_DATE_APRIL     = 4,
+;;   G_DATE_MAY       = 5,
+;;   G_DATE_JUNE      = 6,
+;;   G_DATE_JULY      = 7,
+;;   G_DATE_AUGUST    = 8,
+;;   G_DATE_SEPTEMBER = 9,
+;;   G_DATE_OCTOBER   = 10,
+;;   G_DATE_NOVEMBER  = 11,
+;;   G_DATE_DECEMBER  = 12
+;; } GDateMonth;
+
 (define-enum-extended DateMonth
   (in-module "G")
   (c-name "GDateMonth")
@@ -102,6 +179,12 @@
 
 ;; From gdebug.h
 
+;; Original typedef:
+;; typedef enum {
+;;   G_DEBUG_FATAL_WARNINGS  = 1 << 0,
+;;   G_DEBUG_FATAL_CRITICALS = 1 << 1
+;; } GDebugFlag;
+
 (define-flags-extended DebugFlag
   (in-module "G")
   (c-name "GDebugFlag")
@@ -113,6 +196,36 @@
 
 ;; From gfileutils.h
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   G_FILE_ERROR_EXIST,
+;;   G_FILE_ERROR_ISDIR,
+;;   G_FILE_ERROR_ACCES,
+;;   G_FILE_ERROR_NAMETOOLONG,
+;;   G_FILE_ERROR_NOENT,
+;;   G_FILE_ERROR_NOTDIR,
+;;   G_FILE_ERROR_NXIO,
+;;   G_FILE_ERROR_NODEV,
+;;   G_FILE_ERROR_ROFS,
+;;   G_FILE_ERROR_TXTBSY,
+;;   G_FILE_ERROR_FAULT,
+;;   G_FILE_ERROR_LOOP,
+;;   G_FILE_ERROR_NOSPC,
+;;   G_FILE_ERROR_NOMEM,
+;;   G_FILE_ERROR_MFILE,
+;;   G_FILE_ERROR_NFILE,
+;;   G_FILE_ERROR_BADF,
+;;   G_FILE_ERROR_INVAL,
+;;   G_FILE_ERROR_PIPE,
+;;   G_FILE_ERROR_AGAIN,
+;;   G_FILE_ERROR_INTR,
+;;   G_FILE_ERROR_IO,
+;;   G_FILE_ERROR_PERM,
+;;   G_FILE_ERROR_NOSYS,
+;;   G_FILE_ERROR_FAILED
+;; } GFileError;
+
 (define-enum-extended FileError
   (in-module "G")
   (c-name "GFileError")
@@ -145,6 +258,16 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   G_FILE_TEST_IS_REGULAR    = 1 << 0,
+;;   G_FILE_TEST_IS_SYMLINK    = 1 << 1,
+;;   G_FILE_TEST_IS_DIR        = 1 << 2,
+;;   G_FILE_TEST_IS_EXECUTABLE = 1 << 3,
+;;   G_FILE_TEST_EXISTS        = 1 << 4
+;; } GFileTest;
+
 (define-flags-extended FileTest
   (in-module "G")
   (c-name "GFileTest")
@@ -159,6 +282,14 @@
 
 ;; From ghook.h
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   G_HOOK_FLAG_ACTIVE	    = 1 << 0,
+;;   G_HOOK_FLAG_IN_CALL	    = 1 << 1,
+;;   G_HOOK_FLAG_MASK	    = 0x0f
+;; } GHookFlagMask;
+
 (define-flags-extended HookFlagMask
   (in-module "G")
   (c-name "GHookFlagMask")
@@ -171,6 +302,15 @@
 
 ;; From giochannel.h
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   G_IO_ERROR_NONE,
+;;   G_IO_ERROR_AGAIN,
+;;   G_IO_ERROR_INVAL,
+;;   G_IO_ERROR_UNKNOWN
+;; } GIOError;
+
 (define-enum-extended IOError
   (in-module "G")
   (c-name "GIOError")
@@ -182,6 +322,22 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   /* Derived from errno */
+;;   G_IO_CHANNEL_ERROR_FBIG,
+;;   G_IO_CHANNEL_ERROR_INVAL,
+;;   G_IO_CHANNEL_ERROR_IO,
+;;   G_IO_CHANNEL_ERROR_ISDIR,
+;;   G_IO_CHANNEL_ERROR_NOSPC,
+;;   G_IO_CHANNEL_ERROR_NXIO,
+;;   G_IO_CHANNEL_ERROR_OVERFLOW,
+;;   G_IO_CHANNEL_ERROR_PIPE,
+;;   /* Other */
+;;   G_IO_CHANNEL_ERROR_FAILED
+;; } GIOChannelError;
+
 (define-enum-extended IOChannelError
   (in-module "G")
   (c-name "GIOChannelError")
@@ -198,6 +354,15 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   G_IO_STATUS_ERROR,
+;;   G_IO_STATUS_NORMAL,
+;;   G_IO_STATUS_EOF,
+;;   G_IO_STATUS_AGAIN
+;; } GIOStatus;
+
 (define-enum-extended IOStatus
   (in-module "G")
   (c-name "GIOStatus")
@@ -209,6 +374,14 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   G_SEEK_CUR,
+;;   G_SEEK_SET,
+;;   G_SEEK_END
+;; } GSeekType;
+
 (define-enum-extended SeekType
   (in-module "G")
   (c-name "GSeekType")
@@ -219,13 +392,43 @@
   )
 )
 
-(define-enum-extended IOCondition
+;; Original typedef:
+;; typedef enum
+;; {
+;;   G_IO_IN	GLIB_SYSDEF_POLLIN,
+;;   G_IO_OUT	GLIB_SYSDEF_POLLOUT,
+;;   G_IO_PRI	GLIB_SYSDEF_POLLPRI,
+;;   G_IO_ERR	GLIB_SYSDEF_POLLERR,
+;;   G_IO_HUP	GLIB_SYSDEF_POLLHUP,
+;;   G_IO_NVAL	GLIB_SYSDEF_POLLNVAL
+;; } GIOCondition;
+
+(define-flags-extended IOCondition
   (in-module "G")
   (c-name "GIOCondition")
   (values
+    '("in" "G_IO_IN" "GLIB_SYSDEF_POLLIN")
+    '("out" "G_IO_OUT" "GLIB_SYSDEF_POLLOUT")
+    '("pri" "G_IO_PRI" "GLIB_SYSDEF_POLLPRI")
+    '("err" "G_IO_ERR" "GLIB_SYSDEF_POLLERR")
+    '("hup" "G_IO_HUP" "GLIB_SYSDEF_POLLHUP")
+    '("nval" "G_IO_NVAL" "GLIB_SYSDEF_POLLNVAL")
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   G_IO_FLAG_APPEND = 1 << 0,
+;;   G_IO_FLAG_NONBLOCK = 1 << 1,
+;;   G_IO_FLAG_IS_READABLE = 1 << 2,	/* Read only flag */
+;;   G_IO_FLAG_IS_WRITEABLE = 1 << 3,	/* Read only flag */
+;;   G_IO_FLAG_IS_SEEKABLE = 1 << 4,	/* Read only flag */
+;;   G_IO_FLAG_MASK = (1 << 5) - 1,
+;;   G_IO_FLAG_GET_MASK = G_IO_FLAG_MASK,
+;;   G_IO_FLAG_SET_MASK = G_IO_FLAG_APPEND | G_IO_FLAG_NONBLOCK
+;; } GIOFlags;
+
 (define-flags-extended IOFlags
   (in-module "G")
   (c-name "GIOFlags")
@@ -235,13 +438,25 @@
     '("is-readable" "G_IO_FLAG_IS_READABLE" "1 << 2")
     '("is-writeable" "G_IO_FLAG_IS_WRITEABLE" "1 << 3")
     '("is-seekable" "G_IO_FLAG_IS_SEEKABLE" "1 << 4")
-    '("get-mask" "G_IO_FLAG_GET_MASK" "0x0")
-    '("set-mask" "G_IO_FLAG_SET_MASK" "0x1")
+    '("mask" "G_IO_FLAG_MASK" "(1 << 5) - 1")
+    '("get-mask" "G_IO_FLAG_GET_MASK" "0x1F")
+    '("set-mask" "G_IO_FLAG_SET_MASK" "0x3")
   )
 )
 
 ;; From gkeyfile.h
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   G_KEY_FILE_ERROR_UNKNOWN_ENCODING,
+;;   G_KEY_FILE_ERROR_PARSE,
+;;   G_KEY_FILE_ERROR_NOT_FOUND,
+;;   G_KEY_FILE_ERROR_KEY_NOT_FOUND,
+;;   G_KEY_FILE_ERROR_GROUP_NOT_FOUND,
+;;   G_KEY_FILE_ERROR_INVALID_VALUE
+;; } GKeyFileError;
+
 (define-enum-extended KeyFileError
   (in-module "G")
   (c-name "GKeyFileError")
@@ -255,11 +470,19 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   G_KEY_FILE_NONE              = 0,
+;;   G_KEY_FILE_KEEP_COMMENTS     = 1 << 0,
+;;   G_KEY_FILE_KEEP_TRANSLATIONS = 1 << 1
+;; } GKeyFileFlags;
+
 (define-flags-extended KeyFileFlags
   (in-module "G")
   (c-name "GKeyFileFlags")
   (values
-    '("none" "G_KEY_FILE_NONE" "0")
+    '("none" "G_KEY_FILE_NONE" "0x0")
     '("keep-comments" "G_KEY_FILE_KEEP_COMMENTS" "1 << 0")
     '("keep-translations" "G_KEY_FILE_KEEP_TRANSLATIONS" "1 << 1")
   )
@@ -267,6 +490,21 @@
 
 ;; From gmarkup.h
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   G_MARKUP_ERROR_BAD_UTF8,
+;;   G_MARKUP_ERROR_EMPTY,
+;;   G_MARKUP_ERROR_PARSE,
+;;   /* The following are primarily intended for specific GMarkupParser
+;;    * implementations to set.
+;;    */
+;;   G_MARKUP_ERROR_UNKNOWN_ELEMENT,
+;;   G_MARKUP_ERROR_UNKNOWN_ATTRIBUTE,
+;;   G_MARKUP_ERROR_INVALID_CONTENT,
+;;   G_MARKUP_ERROR_MISSING_ATTRIBUTE
+;; } GMarkupError;
+
 (define-enum-extended MarkupError
   (in-module "G")
   (c-name "GMarkupError")
@@ -281,6 +519,14 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   G_MARKUP_DO_NOT_USE_THIS_UNSUPPORTED_FLAG = 1 << 0,
+;;   G_MARKUP_TREAT_CDATA_AS_TEXT              = 1 << 1,
+;;   G_MARKUP_PREFIX_ERROR_POSITION            = 1 << 2
+;; } GMarkupParseFlags;
+
 (define-flags-extended MarkupParseFlags
   (in-module "G")
   (c-name "GMarkupParseFlags")
@@ -291,21 +537,51 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   G_MARKUP_COLLECT_INVALID,
+;;   G_MARKUP_COLLECT_STRING,
+;;   G_MARKUP_COLLECT_STRDUP,
+;;   G_MARKUP_COLLECT_BOOLEAN,
+;;   G_MARKUP_COLLECT_TRISTATE,
+;; 
+;;   G_MARKUP_COLLECT_OPTIONAL = (1 << 16)
+;; } GMarkupCollectType;
+
 (define-flags-extended MarkupCollectType
   (in-module "G")
   (c-name "GMarkupCollectType")
   (values
-    '("invalid" "G_MARKUP_COLLECT_INVALID" "0")
-    '("string" "G_MARKUP_COLLECT_STRING" "1")
-    '("strdup" "G_MARKUP_COLLECT_STRDUP" "2")
-    '("boolean" "G_MARKUP_COLLECT_BOOLEAN" "3")
-    '("tristate" "G_MARKUP_COLLECT_TRISTATE" "4")
-    '("optional" "G_MARKUP_COLLECT_OPTIONAL" "1 << 16")
+    '("invalid" "G_MARKUP_COLLECT_INVALID" "0x0")
+    '("string" "G_MARKUP_COLLECT_STRING" "0x1")
+    '("strdup" "G_MARKUP_COLLECT_STRDUP" "0x2")
+    '("boolean" "G_MARKUP_COLLECT_BOOLEAN" "0x3")
+    '("tristate" "G_MARKUP_COLLECT_TRISTATE" "0x4")
+    '("optional" "G_MARKUP_COLLECT_OPTIONAL" "(1 << 16)")
   )
 )
 
 ;; From gmessages.h
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   /* log flags */
+;;   G_LOG_FLAG_RECURSION          = 1 << 0,
+;;   G_LOG_FLAG_FATAL              = 1 << 1,
+;; 
+;;   /* GLib log levels */
+;;   G_LOG_LEVEL_ERROR             = 1 << 2,       /* always fatal */
+;;   G_LOG_LEVEL_CRITICAL          = 1 << 3,
+;;   G_LOG_LEVEL_WARNING           = 1 << 4,
+;;   G_LOG_LEVEL_MESSAGE           = 1 << 5,
+;;   G_LOG_LEVEL_INFO              = 1 << 6,
+;;   G_LOG_LEVEL_DEBUG             = 1 << 7,
+;; 
+;;   G_LOG_LEVEL_MASK              = ~(G_LOG_FLAG_RECURSION | G_LOG_FLAG_FATAL)
+;; } GLogLevelFlags;
+
 (define-flags-extended LogLevelFlags
   (in-module "G")
   (c-name "GLogLevelFlags")
@@ -318,25 +594,45 @@
     '("level-message" "G_LOG_LEVEL_MESSAGE" "1 << 5")
     '("level-info" "G_LOG_LEVEL_INFO" "1 << 6")
     '("level-debug" "G_LOG_LEVEL_DEBUG" "1 << 7")
-    '("level-mask" "G_LOG_LEVEL_MASK" "0xFFFFFFFE")
+    '("level-mask" "G_LOG_LEVEL_MASK" "0xFFFFFFFFFFFFFFFC")
   )
 )
 
 ;; From gnode.h
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   G_TRAVERSE_LEAVES     = 1 << 0,
+;;   G_TRAVERSE_NON_LEAVES = 1 << 1,
+;;   G_TRAVERSE_ALL        = G_TRAVERSE_LEAVES | G_TRAVERSE_NON_LEAVES,
+;;   G_TRAVERSE_MASK       = 0x03,
+;;   G_TRAVERSE_LEAFS      = G_TRAVERSE_LEAVES,
+;;   G_TRAVERSE_NON_LEAFS  = G_TRAVERSE_NON_LEAVES
+;; } GTraverseFlags;
+
 (define-flags-extended TraverseFlags
   (in-module "G")
   (c-name "GTraverseFlags")
   (values
     '("leaves" "G_TRAVERSE_LEAVES" "1 << 0")
     '("non-leaves" "G_TRAVERSE_NON_LEAVES" "1 << 1")
-    '("all" "G_TRAVERSE_ALL" "0x1")
+    '("all" "G_TRAVERSE_ALL" "0x3")
     '("mask" "G_TRAVERSE_MASK" "0x03")
     '("leafs" "G_TRAVERSE_LEAFS" "0x1")
     '("non-leafs" "G_TRAVERSE_NON_LEAFS" "0x2")
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   G_IN_ORDER,
+;;   G_PRE_ORDER,
+;;   G_POST_ORDER,
+;;   G_LEVEL_ORDER
+;; } GTraverseType;
+
 (define-enum-extended TraverseType
   (in-module "G")
   (c-name "GTraverseType")
@@ -350,6 +646,18 @@
 
 ;; From goption.h
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   G_OPTION_FLAG_HIDDEN		= 1 << 0,
+;;   G_OPTION_FLAG_IN_MAIN		= 1 << 1,
+;;   G_OPTION_FLAG_REVERSE		= 1 << 2,
+;;   G_OPTION_FLAG_NO_ARG		= 1 << 3,
+;;   G_OPTION_FLAG_FILENAME	= 1 << 4,
+;;   G_OPTION_FLAG_OPTIONAL_ARG    = 1 << 5,
+;;   G_OPTION_FLAG_NOALIAS	        = 1 << 6
+;; } GOptionFlags;
+
 (define-flags-extended OptionFlags
   (in-module "G")
   (c-name "GOptionFlags")
@@ -364,6 +672,20 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   G_OPTION_ARG_NONE,
+;;   G_OPTION_ARG_STRING,
+;;   G_OPTION_ARG_INT,
+;;   G_OPTION_ARG_CALLBACK,
+;;   G_OPTION_ARG_FILENAME,
+;;   G_OPTION_ARG_STRING_ARRAY,
+;;   G_OPTION_ARG_FILENAME_ARRAY,
+;;   G_OPTION_ARG_DOUBLE,
+;;   G_OPTION_ARG_INT64
+;; } GOptionArg;
+
 (define-enum-extended OptionArg
   (in-module "G")
   (c-name "GOptionArg")
@@ -380,6 +702,14 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   G_OPTION_ERROR_UNKNOWN_OPTION,
+;;   G_OPTION_ERROR_BAD_VALUE,
+;;   G_OPTION_ERROR_FAILED
+;; } GOptionError;
+
 (define-enum-extended OptionError
   (in-module "G")
   (c-name "GOptionError")
@@ -392,6 +722,55 @@
 
 ;; From gregex.h
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   G_REGEX_ERROR_COMPILE,
+;;   G_REGEX_ERROR_OPTIMIZE,
+;;   G_REGEX_ERROR_REPLACE,
+;;   G_REGEX_ERROR_MATCH,
+;;   G_REGEX_ERROR_INTERNAL,
+;; 
+;;   /* These are the error codes from PCRE + 100 */
+;;   G_REGEX_ERROR_STRAY_BACKSLASH = 101,
+;;   G_REGEX_ERROR_MISSING_CONTROL_CHAR = 102,
+;;   G_REGEX_ERROR_UNRECOGNIZED_ESCAPE = 103,
+;;   G_REGEX_ERROR_QUANTIFIERS_OUT_OF_ORDER = 104,
+;;   G_REGEX_ERROR_QUANTIFIER_TOO_BIG = 105,
+;;   G_REGEX_ERROR_UNTERMINATED_CHARACTER_CLASS = 106,
+;;   G_REGEX_ERROR_INVALID_ESCAPE_IN_CHARACTER_CLASS = 107,
+;;   G_REGEX_ERROR_RANGE_OUT_OF_ORDER = 108,
+;;   G_REGEX_ERROR_NOTHING_TO_REPEAT = 109,
+;;   G_REGEX_ERROR_UNRECOGNIZED_CHARACTER = 112,
+;;   G_REGEX_ERROR_POSIX_NAMED_CLASS_OUTSIDE_CLASS = 113,
+;;   G_REGEX_ERROR_UNMATCHED_PARENTHESIS = 114,
+;;   G_REGEX_ERROR_INEXISTENT_SUBPATTERN_REFERENCE = 115,
+;;   G_REGEX_ERROR_UNTERMINATED_COMMENT = 118,
+;;   G_REGEX_ERROR_EXPRESSION_TOO_LARGE = 120,
+;;   G_REGEX_ERROR_MEMORY_ERROR = 121,
+;;   G_REGEX_ERROR_VARIABLE_LENGTH_LOOKBEHIND = 125,
+;;   G_REGEX_ERROR_MALFORMED_CONDITION = 126,
+;;   G_REGEX_ERROR_TOO_MANY_CONDITIONAL_BRANCHES = 127,
+;;   G_REGEX_ERROR_ASSERTION_EXPECTED = 128,
+;;   G_REGEX_ERROR_UNKNOWN_POSIX_CLASS_NAME = 130,
+;;   G_REGEX_ERROR_POSIX_COLLATING_ELEMENTS_NOT_SUPPORTED = 131,
+;;   G_REGEX_ERROR_HEX_CODE_TOO_LARGE = 134,
+;;   G_REGEX_ERROR_INVALID_CONDITION = 135,
+;;   G_REGEX_ERROR_SINGLE_BYTE_MATCH_IN_LOOKBEHIND = 136,
+;;   G_REGEX_ERROR_INFINITE_LOOP = 140,
+;;   G_REGEX_ERROR_MISSING_SUBPATTERN_NAME_TERMINATOR = 142,
+;;   G_REGEX_ERROR_DUPLICATE_SUBPATTERN_NAME = 143,
+;;   G_REGEX_ERROR_MALFORMED_PROPERTY = 146,
+;;   G_REGEX_ERROR_UNKNOWN_PROPERTY = 147,
+;;   G_REGEX_ERROR_SUBPATTERN_NAME_TOO_LONG = 148,
+;;   G_REGEX_ERROR_TOO_MANY_SUBPATTERNS = 149,
+;;   G_REGEX_ERROR_INVALID_OCTAL_VALUE = 151,
+;;   G_REGEX_ERROR_TOO_MANY_BRANCHES_IN_DEFINE = 154,
+;;   G_REGEX_ERROR_DEFINE_REPETION = 155,
+;;   G_REGEX_ERROR_INCONSISTENT_NEWLINE_OPTIONS = 156,
+;;   G_REGEX_ERROR_MISSING_BACK_REFERENCE = 157
+;; } GRegexError;
+
 (define-enum-extended RegexError
   (in-module "G")
   (c-name "GRegexError")
@@ -441,6 +820,25 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   G_REGEX_CASELESS          = 1 << 0,
+;;   G_REGEX_MULTILINE         = 1 << 1,
+;;   G_REGEX_DOTALL            = 1 << 2,
+;;   G_REGEX_EXTENDED          = 1 << 3,
+;;   G_REGEX_ANCHORED          = 1 << 4,
+;;   G_REGEX_DOLLAR_ENDONLY    = 1 << 5,
+;;   G_REGEX_UNGREEDY          = 1 << 9,
+;;   G_REGEX_RAW               = 1 << 11,
+;;   G_REGEX_NO_AUTO_CAPTURE   = 1 << 12,
+;;   G_REGEX_OPTIMIZE          = 1 << 13,
+;;   G_REGEX_DUPNAMES          = 1 << 19,
+;;   G_REGEX_NEWLINE_CR        = 1 << 20,
+;;   G_REGEX_NEWLINE_LF        = 1 << 21,
+;;   G_REGEX_NEWLINE_CRLF      = G_REGEX_NEWLINE_CR | G_REGEX_NEWLINE_LF
+;; } GRegexCompileFlags;
+
 (define-flags-extended RegexCompileFlags
   (in-module "G")
   (c-name "GRegexCompileFlags")
@@ -458,10 +856,24 @@
     '("dupnames" "G_REGEX_DUPNAMES" "1 << 19")
     '("newline-cr" "G_REGEX_NEWLINE_CR" "1 << 20")
     '("newline-lf" "G_REGEX_NEWLINE_LF" "1 << 21")
-    '("newline-crlf" "G_REGEX_NEWLINE_CRLF" "0x100000")
+    '("newline-crlf" "G_REGEX_NEWLINE_CRLF" "0x300000")
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   G_REGEX_MATCH_ANCHORED      = 1 << 4,
+;;   G_REGEX_MATCH_NOTBOL        = 1 << 7,
+;;   G_REGEX_MATCH_NOTEOL        = 1 << 8,
+;;   G_REGEX_MATCH_NOTEMPTY      = 1 << 10,
+;;   G_REGEX_MATCH_PARTIAL       = 1 << 15,
+;;   G_REGEX_MATCH_NEWLINE_CR    = 1 << 20,
+;;   G_REGEX_MATCH_NEWLINE_LF    = 1 << 21,
+;;   G_REGEX_MATCH_NEWLINE_CRLF  = G_REGEX_MATCH_NEWLINE_CR | G_REGEX_MATCH_NEWLINE_LF,
+;;   G_REGEX_MATCH_NEWLINE_ANY   = 1 << 22
+;; } GRegexMatchFlags;
+
 (define-flags-extended RegexMatchFlags
   (in-module "G")
   (c-name "GRegexMatchFlags")
@@ -473,13 +885,26 @@
     '("partial" "G_REGEX_MATCH_PARTIAL" "1 << 15")
     '("newline-cr" "G_REGEX_MATCH_NEWLINE_CR" "1 << 20")
     '("newline-lf" "G_REGEX_MATCH_NEWLINE_LF" "1 << 21")
-    '("newline-crlf" "G_REGEX_MATCH_NEWLINE_CRLF" "0x100000")
+    '("newline-crlf" "G_REGEX_MATCH_NEWLINE_CRLF" "0x300000")
     '("newline-any" "G_REGEX_MATCH_NEWLINE_ANY" "1 << 22")
   )
 )
 
 ;; From gscanner.h
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   G_ERR_UNKNOWN,
+;;   G_ERR_UNEXP_EOF,
+;;   G_ERR_UNEXP_EOF_IN_STRING,
+;;   G_ERR_UNEXP_EOF_IN_COMMENT,
+;;   G_ERR_NON_DIGIT_IN_CONST,
+;;   G_ERR_DIGIT_RADIX,
+;;   G_ERR_FLOAT_RADIX,
+;;   G_ERR_FLOAT_MALFORMED
+;; } GErrorType;
+
 (define-enum-extended ErrorType
   (in-module "G")
   (c-name "GErrorType")
@@ -495,8 +920,84 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   G_TOKEN_EOF			=   0,
+;;   
+;;   G_TOKEN_LEFT_PAREN		= '(',
+;;   G_TOKEN_RIGHT_PAREN		= ')',
+;;   G_TOKEN_LEFT_CURLY		= '{',
+;;   G_TOKEN_RIGHT_CURLY		= '}',
+;;   G_TOKEN_LEFT_BRACE		= '[',
+;;   G_TOKEN_RIGHT_BRACE		= ']',
+;;   G_TOKEN_EQUAL_SIGN		= '=',
+;;   G_TOKEN_COMMA			= ',',
+;;   
+;;   G_TOKEN_NONE			= 256,
+;;   
+;;   G_TOKEN_ERROR,
+;;   
+;;   G_TOKEN_CHAR,
+;;   G_TOKEN_BINARY,
+;;   G_TOKEN_OCTAL,
+;;   G_TOKEN_INT,
+;;   G_TOKEN_HEX,
+;;   G_TOKEN_FLOAT,
+;;   G_TOKEN_STRING,
+;;   
+;;   G_TOKEN_SYMBOL,
+;;   G_TOKEN_IDENTIFIER,
+;;   G_TOKEN_IDENTIFIER_NULL,
+;;   
+;;   G_TOKEN_COMMENT_SINGLE,
+;;   G_TOKEN_COMMENT_MULTI,
+;;   G_TOKEN_LAST
+;; } GTokenType;
+
+(define-enum-extended TokenType
+  (in-module "G")
+  (c-name "GTokenType")
+  (values
+    '("eof" "G_TOKEN_EOF" "0")
+    '("left-paren" "G_TOKEN_LEFT_PAREN" "'('")
+    '("right-paren" "G_TOKEN_RIGHT_PAREN" "')'")
+    '("left-curly" "G_TOKEN_LEFT_CURLY" "'{'")
+    '("right-curly" "G_TOKEN_RIGHT_CURLY" "']'")
+    '("left-brace" "G_TOKEN_LEFT_BRACE" "'['")
+    '("right-brace" "G_TOKEN_RIGHT_BRACE" "']'")
+    '("equal-sign" "G_TOKEN_EQUAL_SIGN" "'='")
+    '("comma" "G_TOKEN_COMMA" "','")
+    '("none" "G_TOKEN_NONE" "256")
+    '("error" "G_TOKEN_ERROR" "257")
+    '("char" "G_TOKEN_CHAR" "258")
+    '("binary" "G_TOKEN_BINARY" "259")
+    '("octal" "G_TOKEN_OCTAL" "260")
+    '("int" "G_TOKEN_INT" "261")
+    '("hex" "G_TOKEN_HEX" "262")
+    '("float" "G_TOKEN_FLOAT" "263")
+    '("string" "G_TOKEN_STRING" "264")
+    '("symbol" "G_TOKEN_SYMBOL" "265")
+    '("identifier" "G_TOKEN_IDENTIFIER" "266")
+    '("identifier-null" "G_TOKEN_IDENTIFIER_NULL" "267")
+    '("comment-single" "G_TOKEN_COMMENT_SINGLE" "268")
+    '("comment-multi" "G_TOKEN_COMMENT_MULTI" "269")
+    '("last" "G_TOKEN_LAST" "270")
+  )
+)
+
 ;; From gshell.h
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   /* mismatched or otherwise mangled quoting */
+;;   G_SHELL_ERROR_BAD_QUOTING,
+;;   /* string to be parsed was empty */
+;;   G_SHELL_ERROR_EMPTY_STRING,
+;;   G_SHELL_ERROR_FAILED
+;; } GShellError;
+
 (define-enum-extended ShellError
   (in-module "G")
   (c-name "GShellError")
@@ -509,6 +1010,16 @@
 
 ;; From gslice.h
 
+;; Original typedef:
+;; typedef enum {
+;;   G_SLICE_CONFIG_ALWAYS_MALLOC = 1,
+;;   G_SLICE_CONFIG_BYPASS_MAGAZINES,
+;;   G_SLICE_CONFIG_WORKING_SET_MSECS,
+;;   G_SLICE_CONFIG_COLOR_INCREMENT,
+;;   G_SLICE_CONFIG_CHUNK_SIZES,
+;;   G_SLICE_CONFIG_CONTENTION_COUNTER
+;; } GSliceConfig;
+
 (define-enum-extended SliceConfig
   (in-module "G")
   (c-name "GSliceConfig")
@@ -524,6 +1035,33 @@
 
 ;; From gspawn.h
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   G_SPAWN_ERROR_FORK,   /* fork failed due to lack of memory */
+;;   G_SPAWN_ERROR_READ,   /* read or select on pipes failed */
+;;   G_SPAWN_ERROR_CHDIR,  /* changing to working dir failed */
+;;   G_SPAWN_ERROR_ACCES,  /* execv() returned EACCES */
+;;   G_SPAWN_ERROR_PERM,   /* execv() returned EPERM */
+;;   G_SPAWN_ERROR_2BIG,   /* execv() returned E2BIG */
+;;   G_SPAWN_ERROR_NOEXEC, /* execv() returned ENOEXEC */
+;;   G_SPAWN_ERROR_NAMETOOLONG, /* ""  "" ENAMETOOLONG */
+;;   G_SPAWN_ERROR_NOENT,       /* ""  "" ENOENT */
+;;   G_SPAWN_ERROR_NOMEM,       /* ""  "" ENOMEM */
+;;   G_SPAWN_ERROR_NOTDIR,      /* ""  "" ENOTDIR */
+;;   G_SPAWN_ERROR_LOOP,        /* ""  "" ELOOP   */
+;;   G_SPAWN_ERROR_TXTBUSY,     /* ""  "" ETXTBUSY */
+;;   G_SPAWN_ERROR_IO,          /* ""  "" EIO */
+;;   G_SPAWN_ERROR_NFILE,       /* ""  "" ENFILE */
+;;   G_SPAWN_ERROR_MFILE,       /* ""  "" EMFLE */
+;;   G_SPAWN_ERROR_INVAL,       /* ""  "" EINVAL */
+;;   G_SPAWN_ERROR_ISDIR,       /* ""  "" EISDIR */
+;;   G_SPAWN_ERROR_LIBBAD,      /* ""  "" ELIBBAD */
+;;   G_SPAWN_ERROR_FAILED       /* other fatal failure, error->message
+;;                               * should explain
+;;                               */
+;; } GSpawnError;
+
 (define-enum-extended SpawnError
   (in-module "G")
   (c-name "GSpawnError")
@@ -547,9 +1085,24 @@
     '("inval" "G_SPAWN_ERROR_INVAL" "16")
     '("isdir" "G_SPAWN_ERROR_ISDIR" "17")
     '("libbad" "G_SPAWN_ERROR_LIBBAD" "18")
+    '("failed" "G_SPAWN_ERROR_FAILED" "19")
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   G_SPAWN_LEAVE_DESCRIPTORS_OPEN = 1 << 0,
+;;   G_SPAWN_DO_NOT_REAP_CHILD      = 1 << 1,
+;;   /* look for argv[0] in the path i.e. use execvp() */
+;;   G_SPAWN_SEARCH_PATH            = 1 << 2,
+;;   /* Dump output to /dev/null */
+;;   G_SPAWN_STDOUT_TO_DEV_NULL     = 1 << 3,
+;;   G_SPAWN_STDERR_TO_DEV_NULL     = 1 << 4,
+;;   G_SPAWN_CHILD_INHERITS_STDIN   = 1 << 5,
+;;   G_SPAWN_FILE_AND_ARGV_ZERO     = 1 << 6
+;; } GSpawnFlags;
+
 (define-flags-extended SpawnFlags
   (in-module "G")
   (c-name "GSpawnFlags")
@@ -566,6 +1119,21 @@
 
 ;; From gstrfuncs.h
 
+;; Original typedef:
+;; typedef enum {
+;;   G_ASCII_ALNUM  = 1 << 0,
+;;   G_ASCII_ALPHA  = 1 << 1,
+;;   G_ASCII_CNTRL  = 1 << 2,
+;;   G_ASCII_DIGIT  = 1 << 3,
+;;   G_ASCII_GRAPH  = 1 << 4,
+;;   G_ASCII_LOWER  = 1 << 5,
+;;   G_ASCII_PRINT  = 1 << 6,
+;;   G_ASCII_PUNCT  = 1 << 7,
+;;   G_ASCII_SPACE  = 1 << 8,
+;;   G_ASCII_UPPER  = 1 << 9,
+;;   G_ASCII_XDIGIT = 1 << 10
+;; } GAsciiType;
+
 (define-flags-extended AsciiType
   (in-module "G")
   (c-name "GAsciiType")
@@ -586,6 +1154,13 @@
 
 ;; From gtestutils.h
 
+;; Original typedef:
+;; typedef enum {
+;;   G_TEST_TRAP_SILENCE_STDOUT    = 1 << 7,
+;;   G_TEST_TRAP_SILENCE_STDERR    = 1 << 8,
+;;   G_TEST_TRAP_INHERIT_STDIN     = 1 << 9
+;; } GTestTrapFlags;
+
 (define-flags-extended TestTrapFlags
   (in-module "G")
   (c-name "GTestTrapFlags")
@@ -596,6 +1171,20 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum {
+;;   G_TEST_LOG_NONE,
+;;   G_TEST_LOG_ERROR,             /* s:msg */
+;;   G_TEST_LOG_START_BINARY,      /* s:binaryname s:seed */
+;;   G_TEST_LOG_LIST_CASE,         /* s:testpath */
+;;   G_TEST_LOG_SKIP_CASE,         /* s:testpath */
+;;   G_TEST_LOG_START_CASE,        /* s:testpath */
+;;   G_TEST_LOG_STOP_CASE,         /* d:status d:nforks d:elapsed */
+;;   G_TEST_LOG_MIN_RESULT,        /* s:blurb d:result */
+;;   G_TEST_LOG_MAX_RESULT,        /* s:blurb d:result */
+;;   G_TEST_LOG_MESSAGE            /* s:blurb */
+;; } GTestLogType;
+
 (define-enum-extended TestLogType
   (in-module "G")
   (c-name "GTestLogType")
@@ -615,14 +1204,29 @@
 
 ;; From gthread.h
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   G_THREAD_ERROR_AGAIN /* Resource temporarily unavailable */
+;; } GThreadError;
+
 (define-enum-extended ThreadError
   (in-module "G")
   (c-name "GThreadError")
   (values
-    '("n" "G_THREAD_ERROR_AGAIN" "0")
+    '("again" "G_THREAD_ERROR_AGAIN" "0")
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   G_THREAD_PRIORITY_LOW,
+;;   G_THREAD_PRIORITY_NORMAL,
+;;   G_THREAD_PRIORITY_HIGH,
+;;   G_THREAD_PRIORITY_URGENT
+;; } GThreadPriority;
+
 (define-enum-extended ThreadPriority
   (in-module "G")
   (c-name "GThreadPriority")
@@ -634,6 +1238,14 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   G_ONCE_STATUS_NOTCALLED,
+;;   G_ONCE_STATUS_PROGRESS,
+;;   G_ONCE_STATUS_READY  
+;; } GOnceStatus;
+
 (define-enum-extended OnceStatus
   (in-module "G")
   (c-name "GOnceStatus")
@@ -646,6 +1258,41 @@
 
 ;; From gunicode.h
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   G_UNICODE_CONTROL,
+;;   G_UNICODE_FORMAT,
+;;   G_UNICODE_UNASSIGNED,
+;;   G_UNICODE_PRIVATE_USE,
+;;   G_UNICODE_SURROGATE,
+;;   G_UNICODE_LOWERCASE_LETTER,
+;;   G_UNICODE_MODIFIER_LETTER,
+;;   G_UNICODE_OTHER_LETTER,
+;;   G_UNICODE_TITLECASE_LETTER,
+;;   G_UNICODE_UPPERCASE_LETTER,
+;;   G_UNICODE_COMBINING_MARK,
+;;   G_UNICODE_ENCLOSING_MARK,
+;;   G_UNICODE_NON_SPACING_MARK,
+;;   G_UNICODE_DECIMAL_NUMBER,
+;;   G_UNICODE_LETTER_NUMBER,
+;;   G_UNICODE_OTHER_NUMBER,
+;;   G_UNICODE_CONNECT_PUNCTUATION,
+;;   G_UNICODE_DASH_PUNCTUATION,
+;;   G_UNICODE_CLOSE_PUNCTUATION,
+;;   G_UNICODE_FINAL_PUNCTUATION,
+;;   G_UNICODE_INITIAL_PUNCTUATION,
+;;   G_UNICODE_OTHER_PUNCTUATION,
+;;   G_UNICODE_OPEN_PUNCTUATION,
+;;   G_UNICODE_CURRENCY_SYMBOL,
+;;   G_UNICODE_MODIFIER_SYMBOL,
+;;   G_UNICODE_MATH_SYMBOL,
+;;   G_UNICODE_OTHER_SYMBOL,
+;;   G_UNICODE_LINE_SEPARATOR,
+;;   G_UNICODE_PARAGRAPH_SEPARATOR,
+;;   G_UNICODE_SPACE_SEPARATOR
+;; } GUnicodeType;
+
 (define-enum-extended UnicodeType
   (in-module "G")
   (c-name "GUnicodeType")
@@ -683,6 +1330,47 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   G_UNICODE_BREAK_MANDATORY,
+;;   G_UNICODE_BREAK_CARRIAGE_RETURN,
+;;   G_UNICODE_BREAK_LINE_FEED,
+;;   G_UNICODE_BREAK_COMBINING_MARK,
+;;   G_UNICODE_BREAK_SURROGATE,
+;;   G_UNICODE_BREAK_ZERO_WIDTH_SPACE,
+;;   G_UNICODE_BREAK_INSEPARABLE,
+;;   G_UNICODE_BREAK_NON_BREAKING_GLUE,
+;;   G_UNICODE_BREAK_CONTINGENT,
+;;   G_UNICODE_BREAK_SPACE,
+;;   G_UNICODE_BREAK_AFTER,
+;;   G_UNICODE_BREAK_BEFORE,
+;;   G_UNICODE_BREAK_BEFORE_AND_AFTER,
+;;   G_UNICODE_BREAK_HYPHEN,
+;;   G_UNICODE_BREAK_NON_STARTER,
+;;   G_UNICODE_BREAK_OPEN_PUNCTUATION,
+;;   G_UNICODE_BREAK_CLOSE_PUNCTUATION,
+;;   G_UNICODE_BREAK_QUOTATION,
+;;   G_UNICODE_BREAK_EXCLAMATION,
+;;   G_UNICODE_BREAK_IDEOGRAPHIC,
+;;   G_UNICODE_BREAK_NUMERIC,
+;;   G_UNICODE_BREAK_INFIX_SEPARATOR,
+;;   G_UNICODE_BREAK_SYMBOL,
+;;   G_UNICODE_BREAK_ALPHABETIC,
+;;   G_UNICODE_BREAK_PREFIX,
+;;   G_UNICODE_BREAK_POSTFIX,
+;;   G_UNICODE_BREAK_COMPLEX_CONTEXT,
+;;   G_UNICODE_BREAK_AMBIGUOUS,
+;;   G_UNICODE_BREAK_UNKNOWN,
+;;   G_UNICODE_BREAK_NEXT_LINE,
+;;   G_UNICODE_BREAK_WORD_JOINER,
+;;   G_UNICODE_BREAK_HANGUL_L_JAMO,
+;;   G_UNICODE_BREAK_HANGUL_V_JAMO,
+;;   G_UNICODE_BREAK_HANGUL_T_JAMO,
+;;   G_UNICODE_BREAK_HANGUL_LV_SYLLABLE,
+;;   G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE
+;; } GUnicodeBreakType;
+
 (define-enum-extended UnicodeBreakType
   (in-module "G")
   (c-name "GUnicodeBreakType")
@@ -726,6 +1414,98 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum 
+;; {                         /* ISO 15924 code */
+;;   G_UNICODE_SCRIPT_INVALID_CODE = -1,
+;;   G_UNICODE_SCRIPT_COMMON       = 0,   /* Zyyy */
+;;   G_UNICODE_SCRIPT_INHERITED,          /* Qaai */
+;;   G_UNICODE_SCRIPT_ARABIC,             /* Arab */
+;;   G_UNICODE_SCRIPT_ARMENIAN,           /* Armn */
+;;   G_UNICODE_SCRIPT_BENGALI,            /* Beng */
+;;   G_UNICODE_SCRIPT_BOPOMOFO,           /* Bopo */
+;;   G_UNICODE_SCRIPT_CHEROKEE,           /* Cher */
+;;   G_UNICODE_SCRIPT_COPTIC,             /* Qaac */
+;;   G_UNICODE_SCRIPT_CYRILLIC,           /* Cyrl (Cyrs) */
+;;   G_UNICODE_SCRIPT_DESERET,            /* Dsrt */
+;;   G_UNICODE_SCRIPT_DEVANAGARI,         /* Deva */
+;;   G_UNICODE_SCRIPT_ETHIOPIC,           /* Ethi */
+;;   G_UNICODE_SCRIPT_GEORGIAN,           /* Geor (Geon, Geoa) */
+;;   G_UNICODE_SCRIPT_GOTHIC,             /* Goth */
+;;   G_UNICODE_SCRIPT_GREEK,              /* Grek */
+;;   G_UNICODE_SCRIPT_GUJARATI,           /* Gujr */
+;;   G_UNICODE_SCRIPT_GURMUKHI,           /* Guru */
+;;   G_UNICODE_SCRIPT_HAN,                /* Hani */
+;;   G_UNICODE_SCRIPT_HANGUL,             /* Hang */
+;;   G_UNICODE_SCRIPT_HEBREW,             /* Hebr */
+;;   G_UNICODE_SCRIPT_HIRAGANA,           /* Hira */
+;;   G_UNICODE_SCRIPT_KANNADA,            /* Knda */
+;;   G_UNICODE_SCRIPT_KATAKANA,           /* Kana */
+;;   G_UNICODE_SCRIPT_KHMER,              /* Khmr */
+;;   G_UNICODE_SCRIPT_LAO,                /* Laoo */
+;;   G_UNICODE_SCRIPT_LATIN,              /* Latn (Latf, Latg) */
+;;   G_UNICODE_SCRIPT_MALAYALAM,          /* Mlym */
+;;   G_UNICODE_SCRIPT_MONGOLIAN,          /* Mong */
+;;   G_UNICODE_SCRIPT_MYANMAR,            /* Mymr */
+;;   G_UNICODE_SCRIPT_OGHAM,              /* Ogam */
+;;   G_UNICODE_SCRIPT_OLD_ITALIC,         /* Ital */
+;;   G_UNICODE_SCRIPT_ORIYA,              /* Orya */
+;;   G_UNICODE_SCRIPT_RUNIC,              /* Runr */
+;;   G_UNICODE_SCRIPT_SINHALA,            /* Sinh */
+;;   G_UNICODE_SCRIPT_SYRIAC,             /* Syrc (Syrj, Syrn, Syre) */
+;;   G_UNICODE_SCRIPT_TAMIL,              /* Taml */
+;;   G_UNICODE_SCRIPT_TELUGU,             /* Telu */
+;;   G_UNICODE_SCRIPT_THAANA,             /* Thaa */
+;;   G_UNICODE_SCRIPT_THAI,               /* Thai */
+;;   G_UNICODE_SCRIPT_TIBETAN,            /* Tibt */
+;;   G_UNICODE_SCRIPT_CANADIAN_ABORIGINAL, /* Cans */
+;;   G_UNICODE_SCRIPT_YI,                 /* Yiii */
+;;   G_UNICODE_SCRIPT_TAGALOG,            /* Tglg */
+;;   G_UNICODE_SCRIPT_HANUNOO,            /* Hano */
+;;   G_UNICODE_SCRIPT_BUHID,              /* Buhd */
+;;   G_UNICODE_SCRIPT_TAGBANWA,           /* Tagb */
+;; 
+;;   /* Unicode-4.0 additions */
+;;   G_UNICODE_SCRIPT_BRAILLE,            /* Brai */
+;;   G_UNICODE_SCRIPT_CYPRIOT,            /* Cprt */
+;;   G_UNICODE_SCRIPT_LIMBU,              /* Limb */
+;;   G_UNICODE_SCRIPT_OSMANYA,            /* Osma */
+;;   G_UNICODE_SCRIPT_SHAVIAN,            /* Shaw */
+;;   G_UNICODE_SCRIPT_LINEAR_B,           /* Linb */
+;;   G_UNICODE_SCRIPT_TAI_LE,             /* Tale */
+;;   G_UNICODE_SCRIPT_UGARITIC,           /* Ugar */
+;;       
+;;   /* Unicode-4.1 additions */
+;;   G_UNICODE_SCRIPT_NEW_TAI_LUE,        /* Talu */
+;;   G_UNICODE_SCRIPT_BUGINESE,           /* Bugi */
+;;   G_UNICODE_SCRIPT_GLAGOLITIC,         /* Glag */
+;;   G_UNICODE_SCRIPT_TIFINAGH,           /* Tfng */
+;;   G_UNICODE_SCRIPT_SYLOTI_NAGRI,       /* Sylo */
+;;   G_UNICODE_SCRIPT_OLD_PERSIAN,        /* Xpeo */
+;;   G_UNICODE_SCRIPT_KHAROSHTHI,         /* Khar */
+;; 
+;;   /* Unicode-5.0 additions */
+;;   G_UNICODE_SCRIPT_UNKNOWN,            /* Zzzz */
+;;   G_UNICODE_SCRIPT_BALINESE,           /* Bali */
+;;   G_UNICODE_SCRIPT_CUNEIFORM,          /* Xsux */
+;;   G_UNICODE_SCRIPT_PHOENICIAN,         /* Phnx */
+;;   G_UNICODE_SCRIPT_PHAGS_PA,           /* Phag */
+;;   G_UNICODE_SCRIPT_NKO,                /* Nkoo */
+;; 
+;;   /* Unicode-5.1 additions */
+;;   G_UNICODE_SCRIPT_KAYAH_LI,           /* Kali */
+;;   G_UNICODE_SCRIPT_LEPCHA,             /* Lepc */
+;;   G_UNICODE_SCRIPT_REJANG,             /* Rjng */
+;;   G_UNICODE_SCRIPT_SUNDANESE,          /* Sund */
+;;   G_UNICODE_SCRIPT_SAURASHTRA,         /* Saur */
+;;   G_UNICODE_SCRIPT_CHAM,               /* Cham */
+;;   G_UNICODE_SCRIPT_OL_CHIKI,           /* Olck */
+;;   G_UNICODE_SCRIPT_VAI,                /* Vaii */
+;;   G_UNICODE_SCRIPT_CARIAN,             /* Cari */
+;;   G_UNICODE_SCRIPT_LYCIAN,             /* Lyci */
+;;   G_UNICODE_SCRIPT_LYDIAN              /* Lydi */
+;; } GUnicodeScript;
+
 (define-enum-extended UnicodeScript
   (in-module "G")
   (c-name "GUnicodeScript")
@@ -812,12 +1592,24 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum {
+;;   G_NORMALIZE_DEFAULT,
+;;   G_NORMALIZE_NFD = G_NORMALIZE_DEFAULT,
+;;   G_NORMALIZE_DEFAULT_COMPOSE,
+;;   G_NORMALIZE_NFC = G_NORMALIZE_DEFAULT_COMPOSE,
+;;   G_NORMALIZE_ALL,
+;;   G_NORMALIZE_NFKD = G_NORMALIZE_ALL,
+;;   G_NORMALIZE_ALL_COMPOSE,
+;;   G_NORMALIZE_NFKC = G_NORMALIZE_ALL_COMPOSE
+;; } GNormalizeMode;
+
 (define-enum-extended NormalizeMode
   (in-module "G")
   (c-name "GNormalizeMode")
   (values
     '("default" "G_NORMALIZE_DEFAULT" "0")
-    '("nfd" "G_NORMALIZE_NFD" "#error")
+    '("nfd" "G_NORMALIZE_NFD" "0")
     '("default-compose" "G_NORMALIZE_DEFAULT_COMPOSE" "1")
     '("nfc" "G_NORMALIZE_NFC" "1")
     '("all" "G_NORMALIZE_ALL" "2")
@@ -829,6 +1621,20 @@
 
 ;; From gutils.h
 
+;; Original typedef:
+;; typedef enum {
+;;   G_USER_DIRECTORY_DESKTOP,
+;;   G_USER_DIRECTORY_DOCUMENTS,
+;;   G_USER_DIRECTORY_DOWNLOAD,
+;;   G_USER_DIRECTORY_MUSIC,
+;;   G_USER_DIRECTORY_PICTURES,
+;;   G_USER_DIRECTORY_PUBLIC_SHARE,
+;;   G_USER_DIRECTORY_TEMPLATES,
+;;   G_USER_DIRECTORY_VIDEOS,
+;; 
+;;   G_USER_N_DIRECTORIES
+;; } GUserDirectory;
+
 (define-enum-extended UserDirectory
   (in-module "G")
   (c-name "GUserDirectory")
@@ -846,3 +1652,52 @@
 )
 
 ;; From gvariant.h
+
+;; Original typedef:
+;; typedef enum
+;; {
+;;   G_VARIANT_CLASS_BOOLEAN       = 'b',
+;;   G_VARIANT_CLASS_BYTE          = 'y',
+;;   G_VARIANT_CLASS_INT16         = 'n',
+;;   G_VARIANT_CLASS_UINT16        = 'q',
+;;   G_VARIANT_CLASS_INT32         = 'i',
+;;   G_VARIANT_CLASS_UINT32        = 'u',
+;;   G_VARIANT_CLASS_INT64         = 'x',
+;;   G_VARIANT_CLASS_UINT64        = 't',
+;;   G_VARIANT_CLASS_HANDLE        = 'h',
+;;   G_VARIANT_CLASS_DOUBLE        = 'd',
+;;   G_VARIANT_CLASS_STRING        = 's',
+;;   G_VARIANT_CLASS_OBJECT_PATH   = 'o',
+;;   G_VARIANT_CLASS_SIGNATURE     = 'g',
+;;   G_VARIANT_CLASS_VARIANT       = 'v',
+;;   G_VARIANT_CLASS_MAYBE         = 'm',
+;;   G_VARIANT_CLASS_ARRAY         = 'a',
+;;   G_VARIANT_CLASS_TUPLE         = '(',
+;;   G_VARIANT_CLASS_DICT_ENTRY    = '{'
+;; } GVariantClass;
+
+(define-enum-extended VariantClass
+  (in-module "G")
+  (c-name "GVariantClass")
+  (values
+    '("boolean" "G_VARIANT_CLASS_BOOLEAN" "0")
+    '("byte" "G_VARIANT_CLASS_BYTE" "'y'")
+    '("int16" "G_VARIANT_CLASS_INT16" "'n'")
+    '("uint16" "G_VARIANT_CLASS_UINT16" "'q'")
+    '("int32" "G_VARIANT_CLASS_INT32" "'i'")
+    '("uint32" "G_VARIANT_CLASS_UINT32" "'u'")
+    '("int64" "G_VARIANT_CLASS_INT64" "'x'")
+    '("uint64" "G_VARIANT_CLASS_UINT64" "'t'")
+    '("handle" "G_VARIANT_CLASS_HANDLE" "'h'")
+    '("double" "G_VARIANT_CLASS_DOUBLE" "0")
+    '("string" "G_VARIANT_CLASS_STRING" "'s'")
+    '("object-path" "G_VARIANT_CLASS_OBJECT_PATH" "'o'")
+    '("signature" "G_VARIANT_CLASS_SIGNATURE" "'g'")
+    '("variant" "G_VARIANT_CLASS_VARIANT" "'v'")
+    '("maybe" "G_VARIANT_CLASS_MAYBE" "'m'")
+    '("array" "G_VARIANT_CLASS_ARRAY" "0")
+    '("tuple" "G_VARIANT_CLASS_TUPLE" "'('")
+    '("dict-entry" "G_VARIANT_CLASS_DICT_ENTRY" "'{'")
+  )
+)
+
diff --git a/glib/src/glib_functions.defs b/glib/src/glib_functions.defs
index 19e21a4..9767876 100644
--- a/glib/src/glib_functions.defs
+++ b/glib/src/glib_functions.defs
@@ -18,6 +18,16 @@
   )
 )
 
+(define-flags ArrayFlags
+  (in-module "GBSearch")
+  (c-name "GBSearchArrayFlags")
+  (gtype-id "G_TYPE_B_SEARCH_ARRAY_FLAGS")
+  (values
+    '("lign-power2" "G_BSEARCH_ARRAY_ALIGN_POWER2")
+    '("uto-shrink" "G_BSEARCH_ARRAY_AUTO_SHRINK")
+  )
+)
+
 (define-enum Type
   (in-module "GChecksum")
   (c-name "GChecksumType")
@@ -91,6 +101,16 @@
   )
 )
 
+(define-flags Flag
+  (in-module "GDebug")
+  (c-name "GDebugFlag")
+  (gtype-id "G_TYPE_DEBUG_FLAG")
+  (values
+    '("warnings" "G_DEBUG_FATAL_WARNINGS")
+    '("criticals" "G_DEBUG_FATAL_CRITICALS")
+  )
+)
+
 (define-enum Error
   (in-module "GFile")
   (c-name "GFileError")
@@ -607,7 +627,7 @@
   (c-name "GThreadError")
   (gtype-id "G_TYPE_THREAD_ERROR")
   (values
-    '("again" "G_THREAD_ERROR_AGAIN")
+    '("n" "G_THREAD_ERROR_AGAIN")
   )
 )
 
@@ -836,6 +856,36 @@
   )
 )
 
+(define-enum Class
+  (in-module "GVariant")
+  (c-name "GVariantClass")
+  (gtype-id "G_TYPE_VARIANT_CLASS")
+  (values
+    '("boolean" "G_VARIANT_CLASS_BOOLEAN")
+    '("byte" "G_VARIANT_CLASS_BYTE")
+    '("int16" "G_VARIANT_CLASS_INT16")
+    '("uint16" "G_VARIANT_CLASS_UINT16")
+    '("int32" "G_VARIANT_CLASS_INT32")
+    '("uint32" "G_VARIANT_CLASS_UINT32")
+    '("int64" "G_VARIANT_CLASS_INT64")
+    '("uint64" "G_VARIANT_CLASS_UINT64")
+    '("handle" "G_VARIANT_CLASS_HANDLE")
+    '("double" "G_VARIANT_CLASS_DOUBLE")
+    '("string" "G_VARIANT_CLASS_STRING")
+    '("object-path" "G_VARIANT_CLASS_OBJECT_PATH")
+    '("signature" "G_VARIANT_CLASS_SIGNATURE")
+    '("variant" "G_VARIANT_CLASS_VARIANT")
+    '("maybe" "G_VARIANT_CLASS_MAYBE")
+    '("array" "G_VARIANT_CLASS_ARRAY")
+    '("tuple" "G_VARIANT_CLASS_TUPLE")
+    '("dict-entry" "G_VARIANT_CLASS_DICT_ENTRY")
+  )
+)
+
+
+;; From galias.h
+
+
 
 ;; From galloca.h
 
@@ -1578,6 +1628,37 @@
 
 
 
+;; From gbitlock.h
+
+(define-function g_bit_lock
+  (c-name "g_bit_lock")
+  (return-type "none")
+  (parameters
+    '("volatile-gint*" "address")
+    '("gint" "lock_bit")
+  )
+)
+
+(define-function g_bit_trylock
+  (c-name "g_bit_trylock")
+  (return-type "gboolean")
+  (parameters
+    '("volatile-gint*" "address")
+    '("gint" "lock_bit")
+  )
+)
+
+(define-function g_bit_unlock
+  (c-name "g_bit_unlock")
+  (return-type "none")
+  (parameters
+    '("volatile-gint*" "address")
+    '("gint" "lock_bit")
+  )
+)
+
+
+
 ;; From gbookmarkfile.h
 
 (define-function g_bookmark_file_error_quark
@@ -1985,6 +2066,30 @@
 
 
 
+;; From gbsearcharray.h
+
+(define-function if
+  (c-name "if")
+  (return-type "else")
+  (parameters
+    '("cmp-<" "0")
+  )
+)
+
+(define-function MIN
+  (c-name "MIN")
+  (return-type "return")
+  (parameters
+    '("barray->n_nodes-+" "1")
+  )
+)
+
+
+
+;; From gbuffer.h
+
+
+
 ;; From gcache.h
 
 (define-function g_cache_new
@@ -2219,7 +2324,7 @@
   )
 )
 
-(define-method
+(define-method 
   (of-object "GIConv")
   (c-name "g_iconv")
   (return-type "gsize")
@@ -2513,6 +2618,10 @@
 
 
 
+;; From gdatasetprivate.h
+
+
+
 ;; From gdate.h
 
 (define-function g_date_new
@@ -2905,6 +3014,10 @@
 
 
 
+;; From gdebug.h
+
+
+
 ;; From gdir.h
 
 (define-function g_dir_open
@@ -4604,6 +4717,26 @@
 
 
 
+;; From glib.h
+
+
+
+;; From glibintl.h
+
+(define-function glib_gettext
+  (c-name "glib_gettext")
+  (return-type "const-gchar*")
+  (parameters
+    '("const-gchar*" "str")
+  )
+)
+
+
+
+;; From glib-object.h
+
+
+
 ;; From glist.h
 
 (define-function g_list_alloc
@@ -5598,6 +5731,14 @@
 
 ;; From gmem.h
 
+(define-function g_free
+  (c-name "g_free")
+  (return-type "none")
+  (parameters
+    '("gpointer" "mem")
+  )
+)
+
 (define-function g_malloc
   (c-name "g_malloc")
   (return-type "gpointer")
@@ -5623,14 +5764,6 @@
   )
 )
 
-(define-function g_free
-  (c-name "g_free")
-  (return-type "none")
-  (parameters
-    '("gpointer" "mem")
-  )
-)
-
 (define-function g_try_malloc
   (c-name "g_try_malloc")
   (return-type "gpointer")
@@ -5656,6 +5789,62 @@
   )
 )
 
+(define-function g_malloc_n
+  (c-name "g_malloc_n")
+  (return-type "gpointer")
+  (parameters
+    '("gsize" "n_blocks")
+    '("gsize" "n_block_bytes")
+  )
+)
+
+(define-function g_malloc0_n
+  (c-name "g_malloc0_n")
+  (return-type "gpointer")
+  (parameters
+    '("gsize" "n_blocks")
+    '("gsize" "n_block_bytes")
+  )
+)
+
+(define-function g_realloc_n
+  (c-name "g_realloc_n")
+  (return-type "gpointer")
+  (parameters
+    '("gpointer" "mem")
+    '("gsize" "n_blocks")
+    '("gsize" "n_block_bytes")
+  )
+)
+
+(define-function g_try_malloc_n
+  (c-name "g_try_malloc_n")
+  (return-type "gpointer")
+  (parameters
+    '("gsize" "n_blocks")
+    '("gsize" "n_block_bytes")
+  )
+)
+
+(define-function g_try_malloc0_n
+  (c-name "g_try_malloc0_n")
+  (return-type "gpointer")
+  (parameters
+    '("gsize" "n_blocks")
+    '("gsize" "n_block_bytes")
+  )
+)
+
+(define-function g_try_realloc_n
+  (c-name "g_try_realloc_n")
+  (return-type "gpointer")
+  (parameters
+    '("gpointer" "mem")
+    '("gsize" "n_blocks")
+    '("gsize" "n_block_bytes")
+  )
+)
+
 (define-function g_mem_set_vtable
   (c-name "g_mem_set_vtable")
   (return-type "none")
@@ -5910,6 +6099,10 @@
 
 
 
+;; From gmirroringtable.h
+
+
+
 ;; From gnode.h
 
 (define-function g_node_new
@@ -6522,6 +6715,10 @@
 
 
 
+;; From gprintfint.h
+
+
+
 ;; From gqsort.h
 
 (define-function g_qsort_with_data
@@ -7629,6 +7826,10 @@
 
 
 
+;; From gscripttable.h
+
+
+
 ;; From gsequence.h
 
 (define-function g_sequence_new
@@ -8481,6 +8682,24 @@
   (return-type "int")
   (parameters
     '("const-gchar*" "filename")
+    '("struct-_g_stat_struct*" "buf")
+  )
+)
+
+(define-function g_lstat
+  (c-name "g_lstat")
+  (return-type "int")
+  (parameters
+    '("const-gchar*" "filename")
+    '("struct-_g_stat_struct*" "buf")
+  )
+)
+
+(define-function g_stat
+  (c-name "g_stat")
+  (return-type "int")
+  (parameters
+    '("const-gchar*" "filename")
     '("struct-stat*" "buf")
   )
 )
@@ -9429,7 +9648,7 @@
   (return-type "none")
   (parameters
     '("const-char*" "testpath")
-    '("funcptr" "test_func")
+    '("void-(*" "test_func")
   )
 )
 
@@ -9439,7 +9658,7 @@
   (parameters
     '("const-char*" "testpath")
     '("gconstpointer" "test_data")
-    '("funcptr" "test_func")
+    '("void-(*" "test_func")
   )
 )
 
@@ -9554,7 +9773,7 @@
     '("const-char*" "test_name")
     '("gsize" "data_size")
     '("gconstpointer" "test_data")
-    '("funcptr" "data_setup")
+    '("void-(*" "data_setup")
   )
 )
 
@@ -9687,7 +9906,7 @@
     '("const-char*" "testpath")
     '("gsize" "data_size")
     '("gconstpointer" "test_data")
-    '("funcptr" "data_setup")
+    '("void-(*" "data_setup")
   )
 )
 
@@ -10105,6 +10324,15 @@
 
 
 
+;; From gthreadprivate.h
+
+(define-function g_thread_init_glib
+  (c-name "g_thread_init_glib")
+  (return-type "none")
+)
+
+
+
 ;; From gtimer.h
 
 (define-function g_timer_new
@@ -10342,6 +10570,14 @@
 
 
 
+;; From gunibreak.h
+
+
+
+;; From gunichartables.h
+
+
+
 ;; From gunicode.h
 
 (define-function g_get_charset
@@ -10817,6 +11053,18 @@
 
 
 
+;; From gunicodeprivate.h
+
+
+
+;; From gunicomp.h
+
+
+
+;; From gunidecomp.h
+
+
+
 ;; From gurifuncs.h
 
 (define-function g_uri_unescape_string
@@ -10931,24 +11179,6 @@
   (return-type "const-gchar*")
 )
 
-(define-function g_get_system_data_dirs
-  (c-name "g_get_system_data_dirs")
-  (return-type "const-gchar**")
-)
-
-(define-function g_win32_get_system_data_dirs_for_module
-  (c-name "g_win32_get_system_data_dirs_for_module")
-  (return-type "const-gchar**")
-  (parameters
-    '("funcptr" "address_of_function")
-  )
-)
-
-(define-function g_get_language_names
-  (c-name "g_get_language_names")
-  (return-type "const-gchar**")
-)
-
 (define-function g_get_user_special_dir
   (c-name "g_get_user_special_dir")
   (return-type "const-gchar*")
@@ -11081,6 +11311,14 @@
   )
 )
 
+(define-function atexit
+  (c-name "atexit")
+  (return-type "int")
+  (parameters
+    '("void" "(*")
+  )
+)
+
 (define-function g_find_program_in_path
   (c-name "g_find_program_in_path")
   (return-type "gchar*")
@@ -11101,6 +11339,1001 @@
 
 
 
+;; From gvariant-core.h
+
+
+
+;; From gvariant.h
+
+(define-method unref
+  (of-object "GVariant")
+  (c-name "g_variant_unref")
+  (return-type "none")
+)
+
+(define-method ref
+  (of-object "GVariant")
+  (c-name "g_variant_ref")
+  (return-type "GVariant*")
+)
+
+(define-method ref_sink
+  (of-object "GVariant")
+  (c-name "g_variant_ref_sink")
+  (return-type "GVariant*")
+)
+
+(define-method get_type
+  (of-object "GVariant")
+  (c-name "g_variant_get_type")
+  (return-type "const-GVariantType*")
+)
+
+(define-method get_type_string
+  (of-object "GVariant")
+  (c-name "g_variant_get_type_string")
+  (return-type "const-gchar*")
+)
+
+(define-method is_of_type
+  (of-object "GVariant")
+  (c-name "g_variant_is_of_type")
+  (return-type "gboolean")
+  (parameters
+    '("const-GVariantType*" "type")
+  )
+)
+
+(define-method is_container
+  (of-object "GVariant")
+  (c-name "g_variant_is_container")
+  (return-type "gboolean")
+)
+
+(define-method classify
+  (of-object "GVariant")
+  (c-name "g_variant_classify")
+  (return-type "GVariantClass")
+)
+
+(define-function g_variant_new_boolean
+  (c-name "g_variant_new_boolean")
+  (return-type "GVariant*")
+  (parameters
+    '("gboolean" "boolean")
+  )
+)
+
+(define-function g_variant_new_byte
+  (c-name "g_variant_new_byte")
+  (return-type "GVariant*")
+  (parameters
+    '("guchar" "byte")
+  )
+)
+
+(define-function g_variant_new_int16
+  (c-name "g_variant_new_int16")
+  (return-type "GVariant*")
+  (parameters
+    '("gint16" "int16")
+  )
+)
+
+(define-function g_variant_new_uint16
+  (c-name "g_variant_new_uint16")
+  (return-type "GVariant*")
+  (parameters
+    '("guint16" "uint16")
+  )
+)
+
+(define-function g_variant_new_int32
+  (c-name "g_variant_new_int32")
+  (return-type "GVariant*")
+  (parameters
+    '("gint32" "int32")
+  )
+)
+
+(define-function g_variant_new_uint32
+  (c-name "g_variant_new_uint32")
+  (return-type "GVariant*")
+  (parameters
+    '("guint32" "uint32")
+  )
+)
+
+(define-function g_variant_new_int64
+  (c-name "g_variant_new_int64")
+  (return-type "GVariant*")
+  (parameters
+    '("gint64" "int64")
+  )
+)
+
+(define-function g_variant_new_uint64
+  (c-name "g_variant_new_uint64")
+  (return-type "GVariant*")
+  (parameters
+    '("guint64" "uint64")
+  )
+)
+
+(define-function g_variant_new_handle
+  (c-name "g_variant_new_handle")
+  (return-type "GVariant*")
+  (parameters
+    '("gint32" "handle")
+  )
+)
+
+(define-function g_variant_new_double
+  (c-name "g_variant_new_double")
+  (return-type "GVariant*")
+  (parameters
+    '("gdouble" "floating")
+  )
+)
+
+(define-function g_variant_new_string
+  (c-name "g_variant_new_string")
+  (return-type "GVariant*")
+  (parameters
+    '("const-gchar*" "string")
+  )
+)
+
+(define-function g_variant_new_object_path
+  (c-name "g_variant_new_object_path")
+  (return-type "GVariant*")
+  (parameters
+    '("const-gchar*" "object_path")
+  )
+)
+
+(define-function g_variant_is_object_path
+  (c-name "g_variant_is_object_path")
+  (return-type "gboolean")
+  (parameters
+    '("const-gchar*" "string")
+  )
+)
+
+(define-function g_variant_new_signature
+  (c-name "g_variant_new_signature")
+  (return-type "GVariant*")
+  (parameters
+    '("const-gchar*" "signature")
+  )
+)
+
+(define-function g_variant_is_signature
+  (c-name "g_variant_is_signature")
+  (return-type "gboolean")
+  (parameters
+    '("const-gchar*" "string")
+  )
+)
+
+(define-method new_variant
+  (of-object "GVariant")
+  (c-name "g_variant_new_variant")
+  (return-type "GVariant*")
+)
+
+(define-function g_variant_new_strv
+  (c-name "g_variant_new_strv")
+  (return-type "GVariant*")
+  (parameters
+    '("const-gchar*-const*" "strv")
+    '("gssize" "length")
+  )
+)
+
+(define-method get_boolean
+  (of-object "GVariant")
+  (c-name "g_variant_get_boolean")
+  (return-type "gboolean")
+)
+
+(define-method get_byte
+  (of-object "GVariant")
+  (c-name "g_variant_get_byte")
+  (return-type "guchar")
+)
+
+(define-method get_int16
+  (of-object "GVariant")
+  (c-name "g_variant_get_int16")
+  (return-type "gint16")
+)
+
+(define-method get_uint16
+  (of-object "GVariant")
+  (c-name "g_variant_get_uint16")
+  (return-type "guint16")
+)
+
+(define-method get_int32
+  (of-object "GVariant")
+  (c-name "g_variant_get_int32")
+  (return-type "gint32")
+)
+
+(define-method get_uint32
+  (of-object "GVariant")
+  (c-name "g_variant_get_uint32")
+  (return-type "guint32")
+)
+
+(define-method get_int64
+  (of-object "GVariant")
+  (c-name "g_variant_get_int64")
+  (return-type "gint64")
+)
+
+(define-method get_uint64
+  (of-object "GVariant")
+  (c-name "g_variant_get_uint64")
+  (return-type "guint64")
+)
+
+(define-method get_handle
+  (of-object "GVariant")
+  (c-name "g_variant_get_handle")
+  (return-type "gint32")
+)
+
+(define-method get_double
+  (of-object "GVariant")
+  (c-name "g_variant_get_double")
+  (return-type "gdouble")
+)
+
+(define-method get_variant
+  (of-object "GVariant")
+  (c-name "g_variant_get_variant")
+  (return-type "GVariant*")
+)
+
+(define-method get_string
+  (of-object "GVariant")
+  (c-name "g_variant_get_string")
+  (return-type "const-gchar*")
+  (parameters
+    '("gsize*" "length")
+  )
+)
+
+(define-method dup_string
+  (of-object "GVariant")
+  (c-name "g_variant_dup_string")
+  (return-type "gchar*")
+  (parameters
+    '("gsize*" "length")
+  )
+)
+
+(define-method get_strv
+  (of-object "GVariant")
+  (c-name "g_variant_get_strv")
+  (return-type "const-gchar**")
+  (parameters
+    '("gsize*" "length")
+  )
+)
+
+(define-method dup_strv
+  (of-object "GVariant")
+  (c-name "g_variant_dup_strv")
+  (return-type "gchar**")
+  (parameters
+    '("gsize*" "length")
+  )
+)
+
+(define-function g_variant_new_maybe
+  (c-name "g_variant_new_maybe")
+  (return-type "GVariant*")
+  (parameters
+    '("const-GVariantType*" "child_type")
+    '("GVariant*" "child")
+  )
+)
+
+(define-function g_variant_new_array
+  (c-name "g_variant_new_array")
+  (return-type "GVariant*")
+  (parameters
+    '("const-GVariantType*" "child_type")
+    '("GVariant*-const*" "children")
+    '("gsize" "n_children")
+  )
+)
+
+(define-function g_variant_new_tuple
+  (c-name "g_variant_new_tuple")
+  (return-type "GVariant*")
+  (parameters
+    '("GVariant*-const*" "children")
+    '("gsize" "n_children")
+  )
+)
+
+(define-method new_dict_entry
+  (of-object "GVariant")
+  (c-name "g_variant_new_dict_entry")
+  (return-type "GVariant*")
+  (parameters
+    '("GVariant*" "value")
+  )
+)
+
+(define-method get_maybe
+  (of-object "GVariant")
+  (c-name "g_variant_get_maybe")
+  (return-type "GVariant*")
+)
+
+(define-method n_children
+  (of-object "GVariant")
+  (c-name "g_variant_n_children")
+  (return-type "gsize")
+)
+
+(define-method get_child
+  (of-object "GVariant")
+  (c-name "g_variant_get_child")
+  (return-type "none")
+  (parameters
+    '("gsize" "index_")
+    '("const-gchar*" "format_string")
+  )
+  (varargs #t)
+)
+
+(define-method get_child_value
+  (of-object "GVariant")
+  (c-name "g_variant_get_child_value")
+  (return-type "GVariant*")
+  (parameters
+    '("gsize" "index_")
+  )
+)
+
+(define-method get_fixed_array
+  (of-object "GVariant")
+  (c-name "g_variant_get_fixed_array")
+  (return-type "gconstpointer")
+  (parameters
+    '("gsize*" "n_elements")
+    '("gsize" "element_size")
+  )
+)
+
+(define-method get_size
+  (of-object "GVariant")
+  (c-name "g_variant_get_size")
+  (return-type "gsize")
+)
+
+(define-method get_data
+  (of-object "GVariant")
+  (c-name "g_variant_get_data")
+  (return-type "gconstpointer")
+)
+
+(define-method store
+  (of-object "GVariant")
+  (c-name "g_variant_store")
+  (return-type "none")
+  (parameters
+    '("gpointer" "data")
+  )
+)
+
+(define-method print
+  (of-object "GVariant")
+  (c-name "g_variant_print")
+  (return-type "gchar*")
+  (parameters
+    '("gboolean" "type_annotate")
+  )
+)
+
+(define-method print_string
+  (of-object "GVariant")
+  (c-name "g_variant_print_string")
+  (return-type "GString*")
+  (parameters
+    '("GString*" "string")
+    '("gboolean" "type_annotate")
+  )
+)
+
+(define-function g_variant_hash
+  (c-name "g_variant_hash")
+  (return-type "guint")
+  (parameters
+    '("gconstpointer" "value")
+  )
+)
+
+(define-function g_variant_equal
+  (c-name "g_variant_equal")
+  (return-type "gboolean")
+  (parameters
+    '("gconstpointer" "one")
+    '("gconstpointer" "two")
+  )
+)
+
+(define-method iter_new
+  (of-object "GVariant")
+  (c-name "g_variant_iter_new")
+  (return-type "GVariantIter*")
+)
+
+(define-method init
+  (of-object "GVariantIter")
+  (c-name "g_variant_iter_init")
+  (return-type "gsize")
+  (parameters
+    '("GVariant*" "value")
+  )
+)
+
+(define-method copy
+  (of-object "GVariantIter")
+  (c-name "g_variant_iter_copy")
+  (return-type "GVariantIter*")
+)
+
+(define-method n_children
+  (of-object "GVariantIter")
+  (c-name "g_variant_iter_n_children")
+  (return-type "gsize")
+)
+
+(define-method free
+  (of-object "GVariantIter")
+  (c-name "g_variant_iter_free")
+  (return-type "none")
+)
+
+(define-method next_value
+  (of-object "GVariantIter")
+  (c-name "g_variant_iter_next_value")
+  (return-type "GVariant*")
+)
+
+(define-method next
+  (of-object "GVariantIter")
+  (c-name "g_variant_iter_next")
+  (return-type "gboolean")
+  (parameters
+    '("const-gchar*" "format_string")
+  )
+  (varargs #t)
+)
+
+(define-method loop
+  (of-object "GVariantIter")
+  (c-name "g_variant_iter_loop")
+  (return-type "gboolean")
+  (parameters
+    '("const-gchar*" "format_string")
+  )
+  (varargs #t)
+)
+
+(define-function g_variant_builder_new
+  (c-name "g_variant_builder_new")
+  (is-constructor-of "GVariantBuilder")
+  (return-type "GVariantBuilder*")
+  (parameters
+    '("const-GVariantType*" "type")
+  )
+)
+
+(define-method unref
+  (of-object "GVariantBuilder")
+  (c-name "g_variant_builder_unref")
+  (return-type "none")
+)
+
+(define-method ref
+  (of-object "GVariantBuilder")
+  (c-name "g_variant_builder_ref")
+  (return-type "GVariantBuilder*")
+)
+
+(define-method init
+  (of-object "GVariantBuilder")
+  (c-name "g_variant_builder_init")
+  (return-type "none")
+  (parameters
+    '("const-GVariantType*" "type")
+  )
+)
+
+(define-method end
+  (of-object "GVariantBuilder")
+  (c-name "g_variant_builder_end")
+  (return-type "GVariant*")
+)
+
+(define-method clear
+  (of-object "GVariantBuilder")
+  (c-name "g_variant_builder_clear")
+  (return-type "none")
+)
+
+(define-method open
+  (of-object "GVariantBuilder")
+  (c-name "g_variant_builder_open")
+  (return-type "none")
+  (parameters
+    '("const-GVariantType*" "type")
+  )
+)
+
+(define-method close
+  (of-object "GVariantBuilder")
+  (c-name "g_variant_builder_close")
+  (return-type "none")
+)
+
+(define-method add_value
+  (of-object "GVariantBuilder")
+  (c-name "g_variant_builder_add_value")
+  (return-type "none")
+  (parameters
+    '("GVariant*" "value")
+  )
+)
+
+(define-method add
+  (of-object "GVariantBuilder")
+  (c-name "g_variant_builder_add")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "format_string")
+  )
+  (varargs #t)
+)
+
+(define-function g_variant_new
+  (c-name "g_variant_new")
+  (is-constructor-of "GVariant")
+  (return-type "GVariant*")
+  (parameters
+    '("const-gchar*" "format_string")
+  )
+  (varargs #t)
+)
+
+(define-method get
+  (of-object "GVariant")
+  (c-name "g_variant_get")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "format_string")
+  )
+  (varargs #t)
+)
+
+(define-function g_variant_new_va
+  (c-name "g_variant_new_va")
+  (return-type "GVariant*")
+  (parameters
+    '("const-gchar*" "format_string")
+    '("const-gchar**" "endptr")
+    '("va_list*" "app")
+  )
+)
+
+(define-method get_va
+  (of-object "GVariant")
+  (c-name "g_variant_get_va")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "format_string")
+    '("const-gchar**" "endptr")
+    '("va_list*" "app")
+  )
+)
+
+
+
+;; From gvariant-internal.h
+
+(define-function g_variant_format_string_scan
+  (c-name "g_variant_format_string_scan")
+  (return-type "gboolean")
+  (parameters
+    '("const-gchar*" "string")
+    '("const-gchar*" "limit")
+    '("const-gchar**" "endptr")
+  )
+)
+
+(define-function g_variant_format_string_scan_type
+  (c-name "g_variant_format_string_scan_type")
+  (return-type "GVariantType*")
+  (parameters
+    '("const-gchar*" "string")
+    '("const-gchar*" "limit")
+    '("const-gchar**" "endptr")
+  )
+)
+
+
+
+;; From gvariant-serialiser.h
+
+(define-method n_children
+  (of-object "GVariantSerialised")
+  (c-name "g_variant_serialised_n_children")
+  (return-type "gsize")
+)
+
+(define-method get_child
+  (of-object "GVariantSerialised")
+  (c-name "g_variant_serialised_get_child")
+  (return-type "GVariantSerialised")
+  (parameters
+    '("gsize" "index")
+  )
+)
+
+(define-function g_variant_serialiser_needed_size
+  (c-name "g_variant_serialiser_needed_size")
+  (return-type "gsize")
+  (parameters
+    '("GVariantTypeInfo*" "info")
+    '("GVariantSerialisedFiller" "gsv_filler")
+    '("const-gpointer*" "children")
+    '("gsize" "n_children")
+  )
+)
+
+(define-function g_variant_serialiser_serialise
+  (c-name "g_variant_serialiser_serialise")
+  (return-type "none")
+  (parameters
+    '("GVariantSerialised" "container")
+    '("GVariantSerialisedFiller" "gsv_filler")
+    '("const-gpointer*" "children")
+    '("gsize" "n_children")
+  )
+)
+
+(define-method is_normal
+  (of-object "GVariantSerialised")
+  (c-name "g_variant_serialised_is_normal")
+  (return-type "gboolean")
+)
+
+(define-method byteswap
+  (of-object "GVariantSerialised")
+  (c-name "g_variant_serialised_byteswap")
+  (return-type "none")
+)
+
+(define-function g_variant_serialiser_is_string
+  (c-name "g_variant_serialiser_is_string")
+  (return-type "gboolean")
+  (parameters
+    '("gconstpointer" "data")
+    '("gsize" "size")
+  )
+)
+
+(define-function g_variant_serialiser_is_object_path
+  (c-name "g_variant_serialiser_is_object_path")
+  (return-type "gboolean")
+  (parameters
+    '("gconstpointer" "data")
+    '("gsize" "size")
+  )
+)
+
+(define-function g_variant_serialiser_is_signature
+  (c-name "g_variant_serialiser_is_signature")
+  (return-type "gboolean")
+  (parameters
+    '("gconstpointer" "data")
+    '("gsize" "size")
+  )
+)
+
+
+
+;; From gvarianttype.h
+
+(define-function g_variant_type_string_is_valid
+  (c-name "g_variant_type_string_is_valid")
+  (return-type "gboolean")
+  (parameters
+    '("const-gchar*" "type_string")
+  )
+)
+
+(define-function g_variant_type_string_scan
+  (c-name "g_variant_type_string_scan")
+  (return-type "gboolean")
+  (parameters
+    '("const-gchar*" "string")
+    '("const-gchar*" "limit")
+    '("const-gchar**" "endptr")
+  )
+)
+
+(define-method free
+  (of-object "GVariantType")
+  (c-name "g_variant_type_free")
+  (return-type "none")
+)
+
+(define-method copy
+  (of-object "GVariantType")
+  (c-name "g_variant_type_copy")
+  (return-type "GVariantType*")
+)
+
+(define-function g_variant_type_new
+  (c-name "g_variant_type_new")
+  (is-constructor-of "GVariantType")
+  (return-type "GVariantType*")
+  (parameters
+    '("const-gchar*" "type_string")
+  )
+)
+
+(define-method get_string_length
+  (of-object "GVariantType")
+  (c-name "g_variant_type_get_string_length")
+  (return-type "gsize")
+)
+
+(define-method peek_string
+  (of-object "GVariantType")
+  (c-name "g_variant_type_peek_string")
+  (return-type "const-gchar*")
+)
+
+(define-method dup_string
+  (of-object "GVariantType")
+  (c-name "g_variant_type_dup_string")
+  (return-type "gchar*")
+)
+
+(define-method is_definite
+  (of-object "GVariantType")
+  (c-name "g_variant_type_is_definite")
+  (return-type "gboolean")
+)
+
+(define-method is_container
+  (of-object "GVariantType")
+  (c-name "g_variant_type_is_container")
+  (return-type "gboolean")
+)
+
+(define-method is_basic
+  (of-object "GVariantType")
+  (c-name "g_variant_type_is_basic")
+  (return-type "gboolean")
+)
+
+(define-method is_maybe
+  (of-object "GVariantType")
+  (c-name "g_variant_type_is_maybe")
+  (return-type "gboolean")
+)
+
+(define-method is_array
+  (of-object "GVariantType")
+  (c-name "g_variant_type_is_array")
+  (return-type "gboolean")
+)
+
+(define-method is_tuple
+  (of-object "GVariantType")
+  (c-name "g_variant_type_is_tuple")
+  (return-type "gboolean")
+)
+
+(define-method is_dict_entry
+  (of-object "GVariantType")
+  (c-name "g_variant_type_is_dict_entry")
+  (return-type "gboolean")
+)
+
+(define-method is_variant
+  (of-object "GVariantType")
+  (c-name "g_variant_type_is_variant")
+  (return-type "gboolean")
+)
+
+(define-function g_variant_type_hash
+  (c-name "g_variant_type_hash")
+  (return-type "guint")
+  (parameters
+    '("gconstpointer" "type")
+  )
+)
+
+(define-function g_variant_type_equal
+  (c-name "g_variant_type_equal")
+  (return-type "gboolean")
+  (parameters
+    '("gconstpointer" "type1")
+    '("gconstpointer" "type2")
+  )
+)
+
+(define-method is_subtype_of
+  (of-object "GVariantType")
+  (c-name "g_variant_type_is_subtype_of")
+  (return-type "gboolean")
+  (parameters
+    '("const-GVariantType*" "supertype")
+  )
+)
+
+(define-method element
+  (of-object "GVariantType")
+  (c-name "g_variant_type_element")
+  (return-type "const-GVariantType*")
+)
+
+(define-method first
+  (of-object "GVariantType")
+  (c-name "g_variant_type_first")
+  (return-type "const-GVariantType*")
+)
+
+(define-method next
+  (of-object "GVariantType")
+  (c-name "g_variant_type_next")
+  (return-type "const-GVariantType*")
+)
+
+(define-method n_items
+  (of-object "GVariantType")
+  (c-name "g_variant_type_n_items")
+  (return-type "gsize")
+)
+
+(define-method key
+  (of-object "GVariantType")
+  (c-name "g_variant_type_key")
+  (return-type "const-GVariantType*")
+)
+
+(define-method value
+  (of-object "GVariantType")
+  (c-name "g_variant_type_value")
+  (return-type "const-GVariantType*")
+)
+
+(define-method new_array
+  (of-object "GVariantType")
+  (c-name "g_variant_type_new_array")
+  (return-type "GVariantType*")
+)
+
+(define-method new_maybe
+  (of-object "GVariantType")
+  (c-name "g_variant_type_new_maybe")
+  (return-type "GVariantType*")
+)
+
+(define-function g_variant_type_new_tuple
+  (c-name "g_variant_type_new_tuple")
+  (return-type "GVariantType*")
+  (parameters
+    '("const-GVariantType*-const*" "items")
+    '("gint" "length")
+  )
+)
+
+(define-method new_dict_entry
+  (of-object "GVariantType")
+  (c-name "g_variant_type_new_dict_entry")
+  (return-type "GVariantType*")
+  (parameters
+    '("const-GVariantType*" "value")
+  )
+)
+
+(define-function g_variant_type_checked_
+  (c-name "g_variant_type_checked_")
+  (return-type "const-GVariantType*")
+  (parameters
+    '("const-gchar" "*")
+  )
+)
+
+
+
+;; From gvarianttypeinfo.h
+
+(define-method get_type_string
+  (of-object "GVariantTypeInfo")
+  (c-name "g_variant_type_info_get_type_string")
+  (return-type "const-gchar*")
+)
+
+(define-method query
+  (of-object "GVariantTypeInfo")
+  (c-name "g_variant_type_info_query")
+  (return-type "none")
+  (parameters
+    '("guint*" "alignment")
+    '("gsize*" "size")
+  )
+)
+
+(define-method element
+  (of-object "GVariantTypeInfo")
+  (c-name "g_variant_type_info_element")
+  (return-type "GVariantTypeInfo*")
+)
+
+(define-method query_element
+  (of-object "GVariantTypeInfo")
+  (c-name "g_variant_type_info_query_element")
+  (return-type "none")
+  (parameters
+    '("guint*" "alignment")
+    '("gsize*" "size")
+  )
+)
+
+(define-method n_members
+  (of-object "GVariantTypeInfo")
+  (c-name "g_variant_type_info_n_members")
+  (return-type "gsize")
+)
+
+(define-method member_info
+  (of-object "GVariantTypeInfo")
+  (c-name "g_variant_type_info_member_info")
+  (return-type "const-GVariantMemberInfo*")
+  (parameters
+    '("gsize" "index")
+  )
+)
+
+(define-method info_get
+  (of-object "GVariantType")
+  (c-name "g_variant_type_info_get")
+  (return-type "GVariantTypeInfo*")
+)
+
+(define-method ref
+  (of-object "GVariantTypeInfo")
+  (c-name "g_variant_type_info_ref")
+  (return-type "GVariantTypeInfo*")
+)
+
+(define-method unref
+  (of-object "GVariantTypeInfo")
+  (c-name "g_variant_type_info_unref")
+  (return-type "none")
+)
+
+(define-function g_variant_type_info_assert_no_infos
+  (c-name "g_variant_type_info_assert_no_infos")
+  (return-type "none")
+)
+
+
+
 ;; From gwin32.h
 
 (define-function g_win32_ftruncate
@@ -11164,3 +12397,5 @@
     '("const-gchar*" "utf8filename")
   )
 )
+
+
diff --git a/glib/src/gmodule_enums.defs b/glib/src/gmodule_enums.defs
index cf02bdd..a5b3fe3 100644
--- a/glib/src/gmodule_enums.defs
+++ b/glib/src/gmodule_enums.defs
@@ -1,4 +1,12 @@
-;; From /opt/gnome2/include/glib-2.0/gmodule.h
+;; From gmodule.h
+
+;; Original typedef:
+;; typedef enum
+;; {
+;;   G_MODULE_BIND_LAZY	= 1 << 0,
+;;   G_MODULE_BIND_LOCAL	= 1 << 1,
+;;   G_MODULE_BIND_MASK	= 0x03
+;; } GModuleFlags;
 
 (define-flags-extended ModuleFlags
   (in-module "G")
diff --git a/glib/src/gmodule_functions.defs b/glib/src/gmodule_functions.defs
index 853bd0b..29b4835 100644
--- a/glib/src/gmodule_functions.defs
+++ b/glib/src/gmodule_functions.defs
@@ -14,6 +14,10 @@
 )
 
 
+;; From gmoduleconf.h
+
+
+
 ;; From gmodule.h
 
 (define-function g_module_supported
diff --git a/glib/src/gobject_enums.defs b/glib/src/gobject_enums.defs
index 5d796e6..3985c26 100644
--- a/glib/src/gobject_enums.defs
+++ b/glib/src/gobject_enums.defs
@@ -1,4 +1,20 @@
-;; From /opt/gnome2/include/glib-2.0/gobject/gparam.h
+;; From gparam.h
+
+;; Original typedef:
+;; typedef enum
+;; {
+;;   G_PARAM_READABLE            = 1 << 0,
+;;   G_PARAM_WRITABLE            = 1 << 1,
+;;   G_PARAM_CONSTRUCT	      = 1 << 2,
+;;   G_PARAM_CONSTRUCT_ONLY      = 1 << 3,
+;;   G_PARAM_LAX_VALIDATION      = 1 << 4,
+;;   G_PARAM_STATIC_NAME	      = 1 << 5,
+;; #ifndef G_DISABLE_DEPRECATED
+;;   G_PARAM_PRIVATE	      = G_PARAM_STATIC_NAME,
+;; #endif
+;;   G_PARAM_STATIC_NICK	      = 1 << 6,
+;;   G_PARAM_STATIC_BLURB	      = 1 << 7
+;; } GParamFlags;
 
 (define-flags-extended ParamFlags
   (in-module "G")
@@ -10,11 +26,25 @@
     '("construct-only" "G_PARAM_CONSTRUCT_ONLY" "1 << 3")
     '("lax-validation" "G_PARAM_LAX_VALIDATION" "1 << 4")
     '("static-name" "G_PARAM_STATIC_NAME" "1 << 5")
+    '("private" "G_PARAM_PRIVATE" "0x20")
+    '("static-nick" "G_PARAM_STATIC_NICK" "1 << 6")
     '("static-blurb" "G_PARAM_STATIC_BLURB" "1 << 7")
   )
 )
 
-;; From /opt/gnome2/include/glib-2.0/gobject/gsignal.h
+;; From gsignal.h
+
+;; Original typedef:
+;; typedef enum
+;; {
+;;   G_SIGNAL_RUN_FIRST	= 1 << 0,
+;;   G_SIGNAL_RUN_LAST	= 1 << 1,
+;;   G_SIGNAL_RUN_CLEANUP	= 1 << 2,
+;;   G_SIGNAL_NO_RECURSE	= 1 << 3,
+;;   G_SIGNAL_DETAILED	= 1 << 4,
+;;   G_SIGNAL_ACTION	= 1 << 5,
+;;   G_SIGNAL_NO_HOOKS	= 1 << 6
+;; } GSignalFlags;
 
 (define-flags-extended SignalFlags
   (in-module "G")
@@ -30,6 +60,13 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   G_CONNECT_AFTER	= 1 << 0,
+;;   G_CONNECT_SWAPPED	= 1 << 1
+;; } GConnectFlags;
+
 (define-flags-extended ConnectFlags
   (in-module "G")
   (c-name "GConnectFlags")
@@ -39,6 +76,17 @@
   )
 )
 
+;; Original typedef:
+;; typedef enum
+;; {
+;;   G_SIGNAL_MATCH_ID	   = 1 << 0,
+;;   G_SIGNAL_MATCH_DETAIL	   = 1 << 1,
+;;   G_SIGNAL_MATCH_CLOSURE   = 1 << 2,
+;;   G_SIGNAL_MATCH_FUNC	   = 1 << 3,
+;;   G_SIGNAL_MATCH_DATA	   = 1 << 4,
+;;   G_SIGNAL_MATCH_UNBLOCKED = 1 << 5
+;; } GSignalMatchType;
+
 (define-flags-extended SignalMatchType
   (in-module "G")
   (c-name "GSignalMatchType")
@@ -52,36 +100,61 @@
   )
 )
 
-;; From /opt/gnome2/include/glib-2.0/gobject/gtype.h
+;; From gtype.h
+
+;; Original typedef:
+;; typedef enum	/*< skip >*/
+;; {
+;;   G_TYPE_DEBUG_NONE	= 0,
+;;   G_TYPE_DEBUG_OBJECTS	= 1 << 0,
+;;   G_TYPE_DEBUG_SIGNALS	= 1 << 1,
+;;   G_TYPE_DEBUG_MASK	= 0x03
+;; } GTypeDebugFlags;
 
 (define-flags-extended TypeDebugFlags
   (in-module "G")
   (c-name "GTypeDebugFlags")
   (values
-    '("none" "G_TYPE_DEBUG_NONE" "0")
+    '("none" "G_TYPE_DEBUG_NONE" "0x0")
     '("objects" "G_TYPE_DEBUG_OBJECTS" "1 << 0")
     '("signals" "G_TYPE_DEBUG_SIGNALS" "1 << 1")
     '("mask" "G_TYPE_DEBUG_MASK" "0x03")
   )
 )
 
+;; Original typedef:
+;; typedef enum    /*< skip >*/
+;; {
+;;   G_TYPE_FLAG_CLASSED           = (1 << 0),
+;;   G_TYPE_FLAG_INSTANTIATABLE    = (1 << 1),
+;;   G_TYPE_FLAG_DERIVABLE         = (1 << 2),
+;;   G_TYPE_FLAG_DEEP_DERIVABLE    = (1 << 3)
+;; } GTypeFundamentalFlags;
+
 (define-flags-extended TypeFundamentalFlags
   (in-module "G")
   (c-name "GTypeFundamentalFlags")
   (values
-    '("classed" "G_TYPE_FLAG_CLASSED" "1 << 0")
-    '("instantiatable" "G_TYPE_FLAG_INSTANTIATABLE" "1 << 1")
-    '("derivable" "G_TYPE_FLAG_DERIVABLE" "1 << 2")
-    '("deep-derivable" "G_TYPE_FLAG_DEEP_DERIVABLE" "1 << 3")
+    '("classed" "G_TYPE_FLAG_CLASSED" "(1 << 0)")
+    '("instantiatable" "G_TYPE_FLAG_INSTANTIATABLE" "(1 << 1)")
+    '("derivable" "G_TYPE_FLAG_DERIVABLE" "(1 << 2)")
+    '("deep-derivable" "G_TYPE_FLAG_DEEP_DERIVABLE" "(1 << 3)")
   )
 )
 
+;; Original typedef:
+;; typedef enum    /*< skip >*/
+;; {
+;;   G_TYPE_FLAG_ABSTRACT		= (1 << 4),
+;;   G_TYPE_FLAG_VALUE_ABSTRACT	= (1 << 5)
+;; } GTypeFlags;
+
 (define-flags-extended TypeFlags
   (in-module "G")
   (c-name "GTypeFlags")
   (values
-    '("abstract" "G_TYPE_FLAG_ABSTRACT" "1 << 4")
-    '("value-abstract" "G_TYPE_FLAG_VALUE_ABSTRACT" "1 << 5")
+    '("abstract" "G_TYPE_FLAG_ABSTRACT" "(1 << 4)")
+    '("value-abstract" "G_TYPE_FLAG_VALUE_ABSTRACT" "(1 << 5)")
   )
 )
 
diff --git a/glib/src/gobject_functions.defs b/glib/src/gobject_functions.defs
index 49a6c22..d017569 100644
--- a/glib/src/gobject_functions.defs
+++ b/glib/src/gobject_functions.defs
@@ -20,15 +20,15 @@
   (c-name "GParamFlags")
   (gtype-id "G_TYPE_PARAM_FLAGS")
   (values
-    '("readable" "G_PARAM_READABLE")
-    '("writable" "G_PARAM_WRITABLE")
-    '("construct" "G_PARAM_CONSTRUCT")
-    '("construct-only" "G_PARAM_CONSTRUCT_ONLY")
-    '("lax-validation" "G_PARAM_LAX_VALIDATION")
-    '("static-name" "G_PARAM_STATIC_NAME")
-    '("private" "G_PARAM_PRIVATE")
-    '("static-nick" "G_PARAM_STATIC_NICK")
-    '("static-blurb" "G_PARAM_STATIC_BLURB")
+    '("g-param-readable" "G_PARAM_READABLE")
+    '("g-param-writable" "G_PARAM_WRITABLE")
+    '("g-param-construct" "G_PARAM_CONSTRUCT")
+    '("g-param-construct-only" "G_PARAM_CONSTRUCT_ONLY")
+    '("g-param-lax-validation" "G_PARAM_LAX_VALIDATION")
+    '("g-param-static-name" "G_PARAM_STATIC_NAME")
+    '("#ifndef" "#ifndef")
+    '("#endif" "#endif")
+    '("g-param-static-blurb" "G_PARAM_STATIC_BLURB")
   )
 )
 
@@ -106,6 +106,10 @@
 )
 
 
+;; From gatomicarray.h
+
+
+
 ;; From gboxed.h
 
 (define-function g_boxed_copy
@@ -219,6 +223,31 @@
   (return-type "GType")
 )
 
+(define-function g_array_get_type
+  (c-name "g_array_get_type")
+  (return-type "GType")
+)
+
+(define-function g_byte_array_get_type
+  (c-name "g_byte_array_get_type")
+  (return-type "GType")
+)
+
+(define-function g_ptr_array_get_type
+  (c-name "g_ptr_array_get_type")
+  (return-type "GType")
+)
+
+(define-function g_variant_type_get_gtype
+  (c-name "g_variant_type_get_gtype")
+  (return-type "GType")
+)
+
+(define-function g_variant_get_gtype
+  (c-name "g_variant_get_gtype")
+  (return-type "GType")
+)
+
 (define-function g_regex_get_type
   (c-name "g_regex_get_type")
   (return-type "GType")
@@ -507,6 +536,10 @@
 
 
 
+;; From gobjectalias.h
+
+
+
 ;; From gobject.h
 
 (define-function g_initially_unowned_get_type
@@ -2551,6 +2584,10 @@
 
 
 
+;; From gtype-private.h
+
+
+
 ;; From gvaluearray.h
 
 (define-method get_nth
@@ -3004,3 +3041,7 @@
 )
 
 
+
+;; From stamp-gmarshal.h
+
+



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