[glibmm/glibmm-gir-gmmproc: 4/4] gmmproc: used new python generators in enums gen_scripts.



commit db33153ce98a936fff332553f92b24a0790011f8
Author: Marcin Kolny <marcin kolny gmail com>
Date:   Tue Oct 14 00:26:38 2014 +0200

    gmmproc: used new python generators in enums gen_scripts.
    
        * gio/src/gio_enums.defs:
        * glib/src/glib_enums.defs:
        * glib/src/gmodule_enums.defs:
        * glib/src/gobject_enums.defs: regenerated enum defs files.
        * tools/gen_scripts/gio_generate_enums.sh:
        * tools/gen_scripts/glib_generate_enums.sh: used new generators in
          gen_scripts.

 gio/src/gio_enums.defs                   | 1745 ++++++++------------------
 glib/src/glib_enums.defs                 | 2016 ++++++++----------------------
 glib/src/gmodule_enums.defs              |   16 +-
 glib/src/gobject_enums.defs              |  202 +---
 tools/gen_scripts/gio_generate_enums.sh  |    6 +-
 tools/gen_scripts/glib_generate_enums.sh |   11 +-
 6 files changed, 1081 insertions(+), 2915 deletions(-)
---
diff --git a/gio/src/gio_enums.defs b/gio/src/gio_enums.defs
index 3e08b5f..8fc0fd2 100644
--- a/gio/src/gio_enums.defs
+++ b/gio/src/gio_enums.defs
@@ -1,72 +1,80 @@
-;; From gdbusauthmechanism.h
-
-;; Original typedef:
-;; typedef enum {
-;;   G_DBUS_AUTH_MECHANISM_STATE_INVALID,
-;;   G_DBUS_AUTH_MECHANISM_STATE_WAITING_FOR_DATA,
-;;   G_DBUS_AUTH_MECHANISM_STATE_HAVE_DATA_TO_SEND,
-;;   G_DBUS_AUTH_MECHANISM_STATE_REJECTED,
-;;   G_DBUS_AUTH_MECHANISM_STATE_ACCEPTED,
-;; } GDBusAuthMechanismState;
+(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")
+    '("supports_uris" "G_APP_INFO_CREATE_SUPPORTS_URIS" "2")
+    '("supports_startup_notification" "G_APP_INFO_CREATE_SUPPORTS_STARTUP_NOTIFICATION" "4")
+  )
+)
 
-(define-enum-extended DBusAuthMechanismState
+(define-flags-extended ApplicationFlags
   (in-module "G")
-  (c-name "GDBusAuthMechanismState")
+  (c-name "GApplicationFlags")
   (values
-    '("invalid" "G_DBUS_AUTH_MECHANISM_STATE_INVALID" "0")
-    '("waiting-for-data" "G_DBUS_AUTH_MECHANISM_STATE_WAITING_FOR_DATA" "1")
-    '("have-data-to-send" "G_DBUS_AUTH_MECHANISM_STATE_HAVE_DATA_TO_SEND" "2")
-    '("rejected" "G_DBUS_AUTH_MECHANISM_STATE_REJECTED" "3")
-    '("accepted" "G_DBUS_AUTH_MECHANISM_STATE_ACCEPTED" "4")
+    '("flags_none" "G_APPLICATION_FLAGS_NONE" "0")
+    '("is_service" "G_APPLICATION_IS_SERVICE" "1")
+    '("is_launcher" "G_APPLICATION_IS_LAUNCHER" "2")
+    '("handles_open" "G_APPLICATION_HANDLES_OPEN" "4")
+    '("handles_command_line" "G_APPLICATION_HANDLES_COMMAND_LINE" "8")
+    '("send_environment" "G_APPLICATION_SEND_ENVIRONMENT" "16")
+    '("non_unique" "G_APPLICATION_NON_UNIQUE" "32")
   )
 )
 
-;; From gioenums.h
+(define-flags-extended AskPasswordFlags
+  (in-module "G")
+  (c-name "GAskPasswordFlags")
+  (values
+    '("need_password" "G_ASK_PASSWORD_NEED_PASSWORD" "1")
+    '("need_username" "G_ASK_PASSWORD_NEED_USERNAME" "2")
+    '("need_domain" "G_ASK_PASSWORD_NEED_DOMAIN" "4")
+    '("saving_supported" "G_ASK_PASSWORD_SAVING_SUPPORTED" "8")
+    '("anonymous_supported" "G_ASK_PASSWORD_ANONYMOUS_SUPPORTED" "16")
+  )
+)
 
-;; 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 >*/
-;;   G_APP_INFO_CREATE_SUPPORTS_STARTUP_NOTIFICATION  = (1 << 2)   /*< nick=supports-startup-notification >*/
-;; } GAppInfoCreateFlags;
+(define-flags-extended BusNameOwnerFlags
+  (in-module "G")
+  (c-name "GBusNameOwnerFlags")
+  (values
+    '("none" "G_BUS_NAME_OWNER_FLAGS_NONE" "0")
+    '("allow_replacement" "G_BUS_NAME_OWNER_FLAGS_ALLOW_REPLACEMENT" "1")
+    '("replace" "G_BUS_NAME_OWNER_FLAGS_REPLACE" "2")
+  )
+)
 
-(define-flags-extended AppInfoCreateFlags
+(define-flags-extended BusNameWatcherFlags
   (in-module "G")
-  (c-name "GAppInfoCreateFlags")
+  (c-name "GBusNameWatcherFlags")
   (values
-    '("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)")
-    '("supports-startup-notification" "G_APP_INFO_CREATE_SUPPORTS_STARTUP_NOTIFICATION" "(1 << 2)")
+    '("none" "G_BUS_NAME_WATCHER_FLAGS_NONE" "0")
+    '("auto_start" "G_BUS_NAME_WATCHER_FLAGS_AUTO_START" "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-enum-extended BusType
+  (in-module "G")
+  (c-name "GBusType")
+  (values
+    '("starter" "G_BUS_TYPE_STARTER" "-1")
+    '("none" "G_BUS_TYPE_NONE" "0")
+    '("system" "G_BUS_TYPE_SYSTEM" "1")
+    '("session" "G_BUS_TYPE_SESSION" "2")
+  )
+)
 
 (define-flags-extended ConverterFlags
   (in-module "G")
   (c-name "GConverterFlags")
   (values
-    '("no-flags" "G_CONVERTER_NO_FLAGS" "0x0")
-    '("input-at-end" "G_CONVERTER_INPUT_AT_END" "(1 << 0)")
-    '("flush" "G_CONVERTER_FLUSH" "(1 << 1)")
+    '("none" "G_CONVERTER_NO_FLAGS" "0")
+    '("input_at_end" "G_CONVERTER_INPUT_AT_END" "1")
+    '("flush" "G_CONVERTER_FLUSH" "2")
   )
 )
 
-;; 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")
@@ -78,534 +86,271 @@
   )
 )
 
-;; 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
+(define-enum-extended CredentialsType
   (in-module "G")
-  (c-name "GDataStreamByteOrder")
+  (c-name "GCredentialsType")
   (values
-    '("big-endian" "G_DATA_STREAM_BYTE_ORDER_BIG_ENDIAN" "0")
-    '("little-endian" "G_DATA_STREAM_BYTE_ORDER_LITTLE_ENDIAN" "1")
-    '("host-endian" "G_DATA_STREAM_BYTE_ORDER_HOST_ENDIAN" "2")
+    '("invalid" "G_CREDENTIALS_TYPE_INVALID" "0")
+    '("linux_ucred" "G_CREDENTIALS_TYPE_LINUX_UCRED" "1")
+    '("freebsd_cmsgcred" "G_CREDENTIALS_TYPE_FREEBSD_CMSGCRED" "2")
+    '("openbsd_sockpeercred" "G_CREDENTIALS_TYPE_OPENBSD_SOCKPEERCRED" "3")
+    '("solaris_ucred" "G_CREDENTIALS_TYPE_SOLARIS_UCRED" "4")
+    '("netbsd_unpcbid" "G_CREDENTIALS_TYPE_NETBSD_UNPCBID" "5")
   )
 )
 
-;; 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
+(define-flags-extended DBusCallFlags
   (in-module "G")
-  (c-name "GDataStreamNewlineType")
+  (c-name "GDBusCallFlags")
   (values
-    '("lf" "G_DATA_STREAM_NEWLINE_TYPE_LF" "0")
-    '("cr" "G_DATA_STREAM_NEWLINE_TYPE_CR" "1")
-    '("cr-lf" "G_DATA_STREAM_NEWLINE_TYPE_CR_LF" "2")
-    '("any" "G_DATA_STREAM_NEWLINE_TYPE_ANY" "3")
+    '("none" "G_DBUS_CALL_FLAGS_NONE" "0")
+    '("no_auto_start" "G_DBUS_CALL_FLAGS_NO_AUTO_START" "1")
   )
 )
 
-;; 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
+(define-flags-extended DBusCapabilityFlags
   (in-module "G")
-  (c-name "GFileAttributeType")
+  (c-name "GDBusCapabilityFlags")
   (values
-    '("invalid" "G_FILE_ATTRIBUTE_TYPE_INVALID" "0")
-    '("string" "G_FILE_ATTRIBUTE_TYPE_STRING" "1")
-    '("byte-string" "G_FILE_ATTRIBUTE_TYPE_BYTE_STRING" "2")
-    '("boolean" "G_FILE_ATTRIBUTE_TYPE_BOOLEAN" "3")
-    '("uint32" "G_FILE_ATTRIBUTE_TYPE_UINT32" "4")
-    '("int32" "G_FILE_ATTRIBUTE_TYPE_INT32" "5")
-    '("uint64" "G_FILE_ATTRIBUTE_TYPE_UINT64" "6")
-    '("int64" "G_FILE_ATTRIBUTE_TYPE_INT64" "7")
-    '("object" "G_FILE_ATTRIBUTE_TYPE_OBJECT" "8")
-    '("stringv" "G_FILE_ATTRIBUTE_TYPE_STRINGV" "9")
+    '("none" "G_DBUS_CAPABILITY_FLAGS_NONE" "0")
+    '("unix_fd_passing" "G_DBUS_CAPABILITY_FLAGS_UNIX_FD_PASSING" "1")
   )
 )
 
-;; 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
+(define-flags-extended DBusConnectionFlags
   (in-module "G")
-  (c-name "GFileAttributeInfoFlags")
+  (c-name "GDBusConnectionFlags")
   (values
-    '("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)")
+    '("none" "G_DBUS_CONNECTION_FLAGS_NONE" "0")
+    '("authentication_client" "G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_CLIENT" "1")
+    '("authentication_server" "G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_SERVER" "2")
+    '("authentication_allow_anonymous" "G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_ALLOW_ANONYMOUS" "4")
+    '("message_bus_connection" "G_DBUS_CONNECTION_FLAGS_MESSAGE_BUS_CONNECTION" "8")
+    '("delay_message_processing" "G_DBUS_CONNECTION_FLAGS_DELAY_MESSAGE_PROCESSING" "16")
   )
 )
 
-;; 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
+(define-enum-extended DBusError
   (in-module "G")
-  (c-name "GFileAttributeStatus")
+  (c-name "GDBusError")
   (values
-    '("unset" "G_FILE_ATTRIBUTE_STATUS_UNSET" "0")
-    '("set" "G_FILE_ATTRIBUTE_STATUS_SET" "1")
-    '("error-setting" "G_FILE_ATTRIBUTE_STATUS_ERROR_SETTING" "2")
+    '("failed" "G_DBUS_ERROR_FAILED" "0")
+    '("no_memory" "G_DBUS_ERROR_NO_MEMORY" "1")
+    '("service_unknown" "G_DBUS_ERROR_SERVICE_UNKNOWN" "2")
+    '("name_has_no_owner" "G_DBUS_ERROR_NAME_HAS_NO_OWNER" "3")
+    '("no_reply" "G_DBUS_ERROR_NO_REPLY" "4")
+    '("io_error" "G_DBUS_ERROR_IO_ERROR" "5")
+    '("bad_address" "G_DBUS_ERROR_BAD_ADDRESS" "6")
+    '("not_supported" "G_DBUS_ERROR_NOT_SUPPORTED" "7")
+    '("limits_exceeded" "G_DBUS_ERROR_LIMITS_EXCEEDED" "8")
+    '("access_denied" "G_DBUS_ERROR_ACCESS_DENIED" "9")
+    '("auth_failed" "G_DBUS_ERROR_AUTH_FAILED" "10")
+    '("no_server" "G_DBUS_ERROR_NO_SERVER" "11")
+    '("timeout" "G_DBUS_ERROR_TIMEOUT" "12")
+    '("no_network" "G_DBUS_ERROR_NO_NETWORK" "13")
+    '("address_in_use" "G_DBUS_ERROR_ADDRESS_IN_USE" "14")
+    '("disconnected" "G_DBUS_ERROR_DISCONNECTED" "15")
+    '("invalid_args" "G_DBUS_ERROR_INVALID_ARGS" "16")
+    '("file_not_found" "G_DBUS_ERROR_FILE_NOT_FOUND" "17")
+    '("file_exists" "G_DBUS_ERROR_FILE_EXISTS" "18")
+    '("unknown_method" "G_DBUS_ERROR_UNKNOWN_METHOD" "19")
+    '("timed_out" "G_DBUS_ERROR_TIMED_OUT" "20")
+    '("match_rule_not_found" "G_DBUS_ERROR_MATCH_RULE_NOT_FOUND" "21")
+    '("match_rule_invalid" "G_DBUS_ERROR_MATCH_RULE_INVALID" "22")
+    '("spawn_exec_failed" "G_DBUS_ERROR_SPAWN_EXEC_FAILED" "23")
+    '("spawn_fork_failed" "G_DBUS_ERROR_SPAWN_FORK_FAILED" "24")
+    '("spawn_child_exited" "G_DBUS_ERROR_SPAWN_CHILD_EXITED" "25")
+    '("spawn_child_signaled" "G_DBUS_ERROR_SPAWN_CHILD_SIGNALED" "26")
+    '("spawn_failed" "G_DBUS_ERROR_SPAWN_FAILED" "27")
+    '("spawn_setup_failed" "G_DBUS_ERROR_SPAWN_SETUP_FAILED" "28")
+    '("spawn_config_invalid" "G_DBUS_ERROR_SPAWN_CONFIG_INVALID" "29")
+    '("spawn_service_invalid" "G_DBUS_ERROR_SPAWN_SERVICE_INVALID" "30")
+    '("spawn_service_not_found" "G_DBUS_ERROR_SPAWN_SERVICE_NOT_FOUND" "31")
+    '("spawn_permissions_invalid" "G_DBUS_ERROR_SPAWN_PERMISSIONS_INVALID" "32")
+    '("spawn_file_invalid" "G_DBUS_ERROR_SPAWN_FILE_INVALID" "33")
+    '("spawn_no_memory" "G_DBUS_ERROR_SPAWN_NO_MEMORY" "34")
+    '("unix_process_id_unknown" "G_DBUS_ERROR_UNIX_PROCESS_ID_UNKNOWN" "35")
+    '("invalid_signature" "G_DBUS_ERROR_INVALID_SIGNATURE" "36")
+    '("invalid_file_content" "G_DBUS_ERROR_INVALID_FILE_CONTENT" "37")
+    '("selinux_security_context_unknown" "G_DBUS_ERROR_SELINUX_SECURITY_CONTEXT_UNKNOWN" "38")
+    '("adt_audit_data_unknown" "G_DBUS_ERROR_ADT_AUDIT_DATA_UNKNOWN" "39")
+    '("object_path_in_use" "G_DBUS_ERROR_OBJECT_PATH_IN_USE" "40")
+    '("unknown_object" "G_DBUS_ERROR_UNKNOWN_OBJECT" "41")
+    '("unknown_interface" "G_DBUS_ERROR_UNKNOWN_INTERFACE" "42")
+    '("unknown_property" "G_DBUS_ERROR_UNKNOWN_PROPERTY" "43")
+    '("property_read_only" "G_DBUS_ERROR_PROPERTY_READ_ONLY" "44")
   )
 )
 
-;; 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
+(define-flags-extended DBusInterfaceSkeletonFlags
   (in-module "G")
-  (c-name "GFileQueryInfoFlags")
+  (c-name "GDBusInterfaceSkeletonFlags")
   (values
-    '("none" "G_FILE_QUERY_INFO_NONE" "0x0")
-    '("nofollow-symlinks" "G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS" "(1 << 0)")
+    '("none" "G_DBUS_INTERFACE_SKELETON_FLAGS_NONE" "0")
+    '("handle_method_invocations_in_thread" 
"G_DBUS_INTERFACE_SKELETON_FLAGS_HANDLE_METHOD_INVOCATIONS_IN_THREAD" "1")
   )
 )
 
-;; 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
+(define-enum-extended DBusMessageByteOrder
   (in-module "G")
-  (c-name "GFileCreateFlags")
+  (c-name "GDBusMessageByteOrder")
   (values
-    '("none" "G_FILE_CREATE_NONE" "0x0")
-    '("private" "G_FILE_CREATE_PRIVATE" "(1 << 0)")
-    '("replace-destination" "G_FILE_CREATE_REPLACE_DESTINATION" "(1 << 1)")
+    '("big_endian" "G_DBUS_MESSAGE_BYTE_ORDER_BIG_ENDIAN" "66")
+    '("little_endian" "G_DBUS_MESSAGE_BYTE_ORDER_LITTLE_ENDIAN" "108")
   )
 )
 
-;; Original typedef:
-;; typedef enum {
-;;   G_FILE_MEASURE_NONE                 = 0,
-;;   G_FILE_MEASURE_REPORT_ANY_ERROR     = (1 << 1),
-;;   G_FILE_MEASURE_APPARENT_SIZE        = (1 << 2),
-;;   G_FILE_MEASURE_NO_XDEV              = (1 << 3)
-;; } GFileMeasureFlags;
-
-(define-flags-extended FileMeasureFlags
+(define-flags-extended DBusMessageFlags
   (in-module "G")
-  (c-name "GFileMeasureFlags")
+  (c-name "GDBusMessageFlags")
   (values
-    '("none" "G_FILE_MEASURE_NONE" "0x0")
-    '("report-any-error" "G_FILE_MEASURE_REPORT_ANY_ERROR" "(1 << 1)")
-    '("apparent-size" "G_FILE_MEASURE_APPARENT_SIZE" "(1 << 2)")
-    '("no-xdev" "G_FILE_MEASURE_NO_XDEV" "(1 << 3)")
+    '("none" "G_DBUS_MESSAGE_FLAGS_NONE" "0")
+    '("no_reply_expected" "G_DBUS_MESSAGE_FLAGS_NO_REPLY_EXPECTED" "1")
+    '("no_auto_start" "G_DBUS_MESSAGE_FLAGS_NO_AUTO_START" "2")
   )
 )
 
-;; Original typedef:
-;; typedef enum /*< flags >*/ {
-;;   G_MOUNT_MOUNT_NONE = 0
-;; } GMountMountFlags;
-
-(define-flags-extended MountMountFlags
+(define-enum-extended DBusMessageHeaderField
   (in-module "G")
-  (c-name "GMountMountFlags")
+  (c-name "GDBusMessageHeaderField")
   (values
-    '("none" "G_MOUNT_MOUNT_NONE" "0x0")
+    '("invalid" "G_DBUS_MESSAGE_HEADER_FIELD_INVALID" "0")
+    '("path" "G_DBUS_MESSAGE_HEADER_FIELD_PATH" "1")
+    '("interface" "G_DBUS_MESSAGE_HEADER_FIELD_INTERFACE" "2")
+    '("member" "G_DBUS_MESSAGE_HEADER_FIELD_MEMBER" "3")
+    '("error_name" "G_DBUS_MESSAGE_HEADER_FIELD_ERROR_NAME" "4")
+    '("reply_serial" "G_DBUS_MESSAGE_HEADER_FIELD_REPLY_SERIAL" "5")
+    '("destination" "G_DBUS_MESSAGE_HEADER_FIELD_DESTINATION" "6")
+    '("sender" "G_DBUS_MESSAGE_HEADER_FIELD_SENDER" "7")
+    '("signature" "G_DBUS_MESSAGE_HEADER_FIELD_SIGNATURE" "8")
+    '("num_unix_fds" "G_DBUS_MESSAGE_HEADER_FIELD_NUM_UNIX_FDS" "9")
   )
 )
 
-;; Original typedef:
-;; typedef enum {
-;;   G_MOUNT_UNMOUNT_NONE  = 0,
-;;   G_MOUNT_UNMOUNT_FORCE = (1 << 0)
-;; } GMountUnmountFlags;
-
-(define-flags-extended MountUnmountFlags
+(define-enum-extended DBusMessageType
   (in-module "G")
-  (c-name "GMountUnmountFlags")
+  (c-name "GDBusMessageType")
   (values
-    '("none" "G_MOUNT_UNMOUNT_NONE" "0x0")
-    '("force" "G_MOUNT_UNMOUNT_FORCE" "(1 << 0)")
+    '("invalid" "G_DBUS_MESSAGE_TYPE_INVALID" "0")
+    '("method_call" "G_DBUS_MESSAGE_TYPE_METHOD_CALL" "1")
+    '("method_return" "G_DBUS_MESSAGE_TYPE_METHOD_RETURN" "2")
+    '("error" "G_DBUS_MESSAGE_TYPE_ERROR" "3")
+    '("signal" "G_DBUS_MESSAGE_TYPE_SIGNAL" "4")
   )
 )
 
-;; Original typedef:
-;; typedef enum /*< flags >*/ {
-;;   G_DRIVE_START_NONE = 0
-;; } GDriveStartFlags;
-
-(define-flags-extended DriveStartFlags
+(define-flags-extended DBusObjectManagerClientFlags
   (in-module "G")
-  (c-name "GDriveStartFlags")
+  (c-name "GDBusObjectManagerClientFlags")
   (values
-    '("none" "G_DRIVE_START_NONE" "0x0")
+    '("none" "G_DBUS_OBJECT_MANAGER_CLIENT_FLAGS_NONE" "0")
+    '("do_not_auto_start" "G_DBUS_OBJECT_MANAGER_CLIENT_FLAGS_DO_NOT_AUTO_START" "1")
   )
 )
 
-;; 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
+(define-flags-extended DBusPropertyInfoFlags
   (in-module "G")
-  (c-name "GDriveStartStopType")
+  (c-name "GDBusPropertyInfoFlags")
   (values
-    '("unknown" "G_DRIVE_START_STOP_TYPE_UNKNOWN" "0")
-    '("shutdown" "G_DRIVE_START_STOP_TYPE_SHUTDOWN" "1")
-    '("network" "G_DRIVE_START_STOP_TYPE_NETWORK" "2")
-    '("multidisk" "G_DRIVE_START_STOP_TYPE_MULTIDISK" "3")
-    '("password" "G_DRIVE_START_STOP_TYPE_PASSWORD" "4")
+    '("none" "G_DBUS_PROPERTY_INFO_FLAGS_NONE" "0")
+    '("readable" "G_DBUS_PROPERTY_INFO_FLAGS_READABLE" "1")
+    '("writable" "G_DBUS_PROPERTY_INFO_FLAGS_WRITABLE" "2")
   )
 )
 
-;; 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
+(define-flags-extended DBusProxyFlags
   (in-module "G")
-  (c-name "GFileCopyFlags")
+  (c-name "GDBusProxyFlags")
   (values
-    '("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)")
+    '("none" "G_DBUS_PROXY_FLAGS_NONE" "0")
+    '("do_not_load_properties" "G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES" "1")
+    '("do_not_connect_signals" "G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS" "2")
+    '("do_not_auto_start" "G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START" "4")
+    '("get_invalidated_properties" "G_DBUS_PROXY_FLAGS_GET_INVALIDATED_PROPERTIES" "8")
+    '("do_not_auto_start_at_construction" "G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START_AT_CONSTRUCTION" "16")
   )
 )
 
-;; Original typedef:
-;; typedef enum {
-;;   G_FILE_MONITOR_NONE             = 0,
-;;   G_FILE_MONITOR_WATCH_MOUNTS     = (1 << 0),
-;;   G_FILE_MONITOR_SEND_MOVED       = (1 << 1),
-;;   G_FILE_MONITOR_WATCH_HARD_LINKS = (1 << 2)
-;; } GFileMonitorFlags;
-
-(define-flags-extended FileMonitorFlags
+(define-flags-extended DBusSendMessageFlags
   (in-module "G")
-  (c-name "GFileMonitorFlags")
+  (c-name "GDBusSendMessageFlags")
   (values
-    '("none" "G_FILE_MONITOR_NONE" "0x0")
-    '("watch-mounts" "G_FILE_MONITOR_WATCH_MOUNTS" "(1 << 0)")
-    '("send-moved" "G_FILE_MONITOR_SEND_MOVED" "(1 << 1)")
-    '("watch-hard-links" "G_FILE_MONITOR_WATCH_HARD_LINKS" "(1 << 2)")
+    '("none" "G_DBUS_SEND_MESSAGE_FLAGS_NONE" "0")
+    '("preserve_serial" "G_DBUS_SEND_MESSAGE_FLAGS_PRESERVE_SERIAL" "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")
-  (values
-    '("unknown" "G_FILE_TYPE_UNKNOWN" "0")
-    '("regular" "G_FILE_TYPE_REGULAR" "1")
-    '("directory" "G_FILE_TYPE_DIRECTORY" "2")
-    '("symbolic-link" "G_FILE_TYPE_SYMBOLIC_LINK" "3")
-    '("special" "G_FILE_TYPE_SPECIAL" "4")
-    '("shortcut" "G_FILE_TYPE_SHORTCUT" "5")
-    '("mountable" "G_FILE_TYPE_MOUNTABLE" "6")
-  )
-)
-
-;; 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
+(define-flags-extended DBusServerFlags
   (in-module "G")
-  (c-name "GFilesystemPreviewType")
+  (c-name "GDBusServerFlags")
   (values
-    '("if-always" "G_FILESYSTEM_PREVIEW_TYPE_IF_ALWAYS" "0")
-    '("if-local" "G_FILESYSTEM_PREVIEW_TYPE_IF_LOCAL" "1")
-    '("never" "G_FILESYSTEM_PREVIEW_TYPE_NEVER" "2")
+    '("none" "G_DBUS_SERVER_FLAGS_NONE" "0")
+    '("run_in_thread" "G_DBUS_SERVER_FLAGS_RUN_IN_THREAD" "1")
+    '("authentication_allow_anonymous" "G_DBUS_SERVER_FLAGS_AUTHENTICATION_ALLOW_ANONYMOUS" "2")
   )
 )
 
-;; 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
+(define-flags-extended DBusSignalFlags
   (in-module "G")
-  (c-name "GFileMonitorEvent")
+  (c-name "GDBusSignalFlags")
   (values
-    '("changed" "G_FILE_MONITOR_EVENT_CHANGED" "0")
-    '("changes-done-hint" "G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT" "1")
-    '("deleted" "G_FILE_MONITOR_EVENT_DELETED" "2")
-    '("created" "G_FILE_MONITOR_EVENT_CREATED" "3")
-    '("attribute-changed" "G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED" "4")
-    '("pre-unmount" "G_FILE_MONITOR_EVENT_PRE_UNMOUNT" "5")
-    '("unmounted" "G_FILE_MONITOR_EVENT_UNMOUNTED" "6")
-    '("moved" "G_FILE_MONITOR_EVENT_MOVED" "7")
+    '("none" "G_DBUS_SIGNAL_FLAGS_NONE" "0")
+    '("no_match_rule" "G_DBUS_SIGNAL_FLAGS_NO_MATCH_RULE" "1")
+    '("match_arg0_namespace" "G_DBUS_SIGNAL_FLAGS_MATCH_ARG0_NAMESPACE" "2")
+    '("match_arg0_path" "G_DBUS_SIGNAL_FLAGS_MATCH_ARG0_PATH" "4")
   )
 )
 
-;; 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,
-;;   G_IO_ERROR_DBUS_ERROR,
-;;   G_IO_ERROR_HOST_UNREACHABLE,
-;;   G_IO_ERROR_NETWORK_UNREACHABLE,
-;;   G_IO_ERROR_CONNECTION_REFUSED,
-;;   G_IO_ERROR_PROXY_FAILED,
-;;   G_IO_ERROR_PROXY_AUTH_FAILED,
-;;   G_IO_ERROR_PROXY_NEED_AUTH,
-;;   G_IO_ERROR_PROXY_NOT_ALLOWED,
-;;   G_IO_ERROR_BROKEN_PIPE
-;; } GIOErrorEnum;
-
-(define-enum-extended IOErrorEnum
-  (in-module "G")
-  (c-name "GIOErrorEnum")
-  (values
-    '("failed" "G_IO_ERROR_FAILED" "0")
-    '("not-found" "G_IO_ERROR_NOT_FOUND" "1")
-    '("exists" "G_IO_ERROR_EXISTS" "2")
-    '("is-directory" "G_IO_ERROR_IS_DIRECTORY" "3")
-    '("not-directory" "G_IO_ERROR_NOT_DIRECTORY" "4")
-    '("not-empty" "G_IO_ERROR_NOT_EMPTY" "5")
-    '("not-regular-file" "G_IO_ERROR_NOT_REGULAR_FILE" "6")
-    '("not-symbolic-link" "G_IO_ERROR_NOT_SYMBOLIC_LINK" "7")
-    '("not-mountable-file" "G_IO_ERROR_NOT_MOUNTABLE_FILE" "8")
-    '("filename-too-long" "G_IO_ERROR_FILENAME_TOO_LONG" "9")
-    '("invalid-filename" "G_IO_ERROR_INVALID_FILENAME" "10")
-    '("too-many-links" "G_IO_ERROR_TOO_MANY_LINKS" "11")
-    '("no-space" "G_IO_ERROR_NO_SPACE" "12")
-    '("invalid-argument" "G_IO_ERROR_INVALID_ARGUMENT" "13")
-    '("permission-denied" "G_IO_ERROR_PERMISSION_DENIED" "14")
-    '("not-supported" "G_IO_ERROR_NOT_SUPPORTED" "15")
-    '("not-mounted" "G_IO_ERROR_NOT_MOUNTED" "16")
-    '("already-mounted" "G_IO_ERROR_ALREADY_MOUNTED" "17")
-    '("closed" "G_IO_ERROR_CLOSED" "18")
-    '("cancelled" "G_IO_ERROR_CANCELLED" "19")
-    '("pending" "G_IO_ERROR_PENDING" "20")
-    '("read-only" "G_IO_ERROR_READ_ONLY" "21")
-    '("cant-create-backup" "G_IO_ERROR_CANT_CREATE_BACKUP" "22")
-    '("wrong-etag" "G_IO_ERROR_WRONG_ETAG" "23")
-    '("timed-out" "G_IO_ERROR_TIMED_OUT" "24")
-    '("would-recurse" "G_IO_ERROR_WOULD_RECURSE" "25")
-    '("busy" "G_IO_ERROR_BUSY" "26")
-    '("would-block" "G_IO_ERROR_WOULD_BLOCK" "27")
-    '("host-not-found" "G_IO_ERROR_HOST_NOT_FOUND" "28")
-    '("host-not-found" "G_IO_ERROR_HOST_WAS_NOT_FOUND" "28")
-    '("would-merge" "G_IO_ERROR_WOULD_MERGE" "29")
-    '("failed-handled" "G_IO_ERROR_FAILED_HANDLED" "30")
-    '("too-many-open-files" "G_IO_ERROR_TOO_MANY_OPEN_FILES" "31")
-    '("not-initialized" "G_IO_ERROR_NOT_INITIALIZED" "32")
-    '("address-in-use" "G_IO_ERROR_ADDRESS_IN_USE" "33")
-    '("partial-input" "G_IO_ERROR_PARTIAL_INPUT" "34")
-    '("invalid-data" "G_IO_ERROR_INVALID_DATA" "35")
-    '("dbus-error" "G_IO_ERROR_DBUS_ERROR" "36")
-    '("host-unreachable" "G_IO_ERROR_HOST_UNREACHABLE" "37")
-    '("network-unreachable" "G_IO_ERROR_NETWORK_UNREACHABLE" "38")
-    '("connection-refused" "G_IO_ERROR_CONNECTION_REFUSED" "39")
-    '("proxy-failed" "G_IO_ERROR_PROXY_FAILED" "40")
-    '("proxy-auth-failed" "G_IO_ERROR_PROXY_AUTH_FAILED" "41")
-    '("proxy-need-auth" "G_IO_ERROR_PROXY_NEED_AUTH" "42")
-    '("proxy-not-allowed" "G_IO_ERROR_PROXY_NOT_ALLOWED" "43")
-    '("broken-pipe" "G_IO_ERROR_BROKEN_PIPE" "44")
-  )
-)
-
-;; 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
+(define-flags-extended DBusSubtreeFlags
   (in-module "G")
-  (c-name "GAskPasswordFlags")
+  (c-name "GDBusSubtreeFlags")
   (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)")
+    '("none" "G_DBUS_SUBTREE_FLAGS_NONE" "0")
+    '("dispatch_to_unenumerated_nodes" "G_DBUS_SUBTREE_FLAGS_DISPATCH_TO_UNENUMERATED_NODES" "1")
   )
 )
 
-;; Original typedef:
-;; typedef enum {
-;;   G_PASSWORD_SAVE_NEVER,
-;;   G_PASSWORD_SAVE_FOR_SESSION,
-;;   G_PASSWORD_SAVE_PERMANENTLY
-;; } GPasswordSave;
-
-(define-enum-extended PasswordSave
+(define-enum-extended DataStreamByteOrder
   (in-module "G")
-  (c-name "GPasswordSave")
+  (c-name "GDataStreamByteOrder")
   (values
-    '("never" "G_PASSWORD_SAVE_NEVER" "0")
-    '("for-session" "G_PASSWORD_SAVE_FOR_SESSION" "1")
-    '("permanently" "G_PASSWORD_SAVE_PERMANENTLY" "2")
+    '("big_endian" "G_DATA_STREAM_BYTE_ORDER_BIG_ENDIAN" "0")
+    '("little_endian" "G_DATA_STREAM_BYTE_ORDER_LITTLE_ENDIAN" "1")
+    '("host_endian" "G_DATA_STREAM_BYTE_ORDER_HOST_ENDIAN" "2")
   )
 )
 
-;; Original typedef:
-;; typedef enum {
-;;   G_MOUNT_OPERATION_HANDLED,
-;;   G_MOUNT_OPERATION_ABORTED,
-;;   G_MOUNT_OPERATION_UNHANDLED
-;; } GMountOperationResult;
-
-(define-enum-extended MountOperationResult
+(define-enum-extended DataStreamNewlineType
   (in-module "G")
-  (c-name "GMountOperationResult")
+  (c-name "GDataStreamNewlineType")
   (values
-    '("handled" "G_MOUNT_OPERATION_HANDLED" "0")
-    '("aborted" "G_MOUNT_OPERATION_ABORTED" "1")
-    '("unhandled" "G_MOUNT_OPERATION_UNHANDLED" "2")
+    '("lf" "G_DATA_STREAM_NEWLINE_TYPE_LF" "0")
+    '("cr" "G_DATA_STREAM_NEWLINE_TYPE_CR" "1")
+    '("cr_lf" "G_DATA_STREAM_NEWLINE_TYPE_CR_LF" "2")
+    '("any" "G_DATA_STREAM_NEWLINE_TYPE_ANY" "3")
   )
 )
 
-;; 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
+(define-flags-extended DriveStartFlags
   (in-module "G")
-  (c-name "GOutputStreamSpliceFlags")
+  (c-name "GDriveStartFlags")
   (values
-    '("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)")
+    '("none" "G_DRIVE_START_NONE" "0")
   )
 )
 
-;; Original typedef:
-;; typedef enum {
-;;   G_IO_STREAM_SPLICE_NONE          = 0,
-;;   G_IO_STREAM_SPLICE_CLOSE_STREAM1 = (1 << 0),
-;;   G_IO_STREAM_SPLICE_CLOSE_STREAM2 = (1 << 1),
-;;   G_IO_STREAM_SPLICE_WAIT_FOR_BOTH = (1 << 2)
-;; } GIOStreamSpliceFlags;
-
-(define-flags-extended IOStreamSpliceFlags
+(define-enum-extended DriveStartStopType
   (in-module "G")
-  (c-name "GIOStreamSpliceFlags")
+  (c-name "GDriveStartStopType")
   (values
-    '("none" "G_IO_STREAM_SPLICE_NONE" "0x0")
-    '("close-stream1" "G_IO_STREAM_SPLICE_CLOSE_STREAM1" "(1 << 0)")
-    '("close-stream2" "G_IO_STREAM_SPLICE_CLOSE_STREAM2" "(1 << 1)")
-    '("wait-for-both" "G_IO_STREAM_SPLICE_WAIT_FOR_BOTH" "(1 << 2)")
+    '("unknown" "G_DRIVE_START_STOP_TYPE_UNKNOWN" "0")
+    '("shutdown" "G_DRIVE_START_STOP_TYPE_SHUTDOWN" "1")
+    '("network" "G_DRIVE_START_STOP_TYPE_NETWORK" "2")
+    '("multidisk" "G_DRIVE_START_STOP_TYPE_MULTIDISK" "3")
+    '("password" "G_DRIVE_START_STOP_TYPE_PASSWORD" "4")
   )
 )
 
-;; 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")
@@ -617,981 +362,527 @@
   )
 )
 
-;; 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")
-  (values
-    '("not-found" "G_RESOLVER_ERROR_NOT_FOUND" "0")
-    '("temporary-failure" "G_RESOLVER_ERROR_TEMPORARY_FAILURE" "1")
-    '("internal" "G_RESOLVER_ERROR_INTERNAL" "2")
-  )
-)
-
-;; Original typedef:
-;; typedef enum {
-;;   G_RESOLVER_RECORD_SRV = 1,
-;;   G_RESOLVER_RECORD_MX,
-;;   G_RESOLVER_RECORD_TXT,
-;;   G_RESOLVER_RECORD_SOA,
-;;   G_RESOLVER_RECORD_NS
-;; } GResolverRecordType;
-
-(define-enum-extended ResolverRecordType
+(define-flags-extended FileAttributeInfoFlags
   (in-module "G")
-  (c-name "GResolverRecordType")
+  (c-name "GFileAttributeInfoFlags")
   (values
-    '("srv" "G_RESOLVER_RECORD_SRV" "1")
-    '("mx" "G_RESOLVER_RECORD_MX" "2")
-    '("txt" "G_RESOLVER_RECORD_TXT" "3")
-    '("soa" "G_RESOLVER_RECORD_SOA" "4")
-    '("ns" "G_RESOLVER_RECORD_NS" "5")
+    '("none" "G_FILE_ATTRIBUTE_INFO_NONE" "0")
+    '("copy_with_file" "G_FILE_ATTRIBUTE_INFO_COPY_WITH_FILE" "1")
+    '("copy_when_moved" "G_FILE_ATTRIBUTE_INFO_COPY_WHEN_MOVED" "2")
   )
 )
 
-;; Original typedef:
-;; typedef enum {
-;;   G_RESOURCE_ERROR_NOT_FOUND,
-;;   G_RESOURCE_ERROR_INTERNAL
-;; } GResourceError;
-
-(define-enum-extended ResourceError
+(define-enum-extended FileAttributeStatus
   (in-module "G")
-  (c-name "GResourceError")
+  (c-name "GFileAttributeStatus")
   (values
-    '("not-found" "G_RESOURCE_ERROR_NOT_FOUND" "0")
-    '("internal" "G_RESOURCE_ERROR_INTERNAL" "1")
+    '("unset" "G_FILE_ATTRIBUTE_STATUS_UNSET" "0")
+    '("set" "G_FILE_ATTRIBUTE_STATUS_SET" "1")
+    '("error_setting" "G_FILE_ATTRIBUTE_STATUS_ERROR_SETTING" "2")
   )
 )
 
-;; Original typedef:
-;; typedef enum {
-;;   G_RESOURCE_FLAGS_NONE       = 0,
-;;   G_RESOURCE_FLAGS_COMPRESSED = (1<<0)
-;; } GResourceFlags;
-
-(define-flags-extended ResourceFlags
+(define-enum-extended FileAttributeType
   (in-module "G")
-  (c-name "GResourceFlags")
+  (c-name "GFileAttributeType")
   (values
-    '("none" "G_RESOURCE_FLAGS_NONE" "0x0")
-    '("compressed" "G_RESOURCE_FLAGS_COMPRESSED" "(1<<0)")
+    '("invalid" "G_FILE_ATTRIBUTE_TYPE_INVALID" "0")
+    '("string" "G_FILE_ATTRIBUTE_TYPE_STRING" "1")
+    '("byte_string" "G_FILE_ATTRIBUTE_TYPE_BYTE_STRING" "2")
+    '("boolean" "G_FILE_ATTRIBUTE_TYPE_BOOLEAN" "3")
+    '("uint32" "G_FILE_ATTRIBUTE_TYPE_UINT32" "4")
+    '("int32" "G_FILE_ATTRIBUTE_TYPE_INT32" "5")
+    '("uint64" "G_FILE_ATTRIBUTE_TYPE_UINT64" "6")
+    '("int64" "G_FILE_ATTRIBUTE_TYPE_INT64" "7")
+    '("object" "G_FILE_ATTRIBUTE_TYPE_OBJECT" "8")
+    '("stringv" "G_FILE_ATTRIBUTE_TYPE_STRINGV" "9")
   )
 )
 
-;; Original typedef:
-;; typedef enum /*< flags >*/ {
-;;   G_RESOURCE_LOOKUP_FLAGS_NONE       = 0
-;; } GResourceLookupFlags;
-
-(define-flags-extended ResourceLookupFlags
+(define-flags-extended FileCopyFlags
   (in-module "G")
-  (c-name "GResourceLookupFlags")
+  (c-name "GFileCopyFlags")
   (values
-    '("none" "G_RESOURCE_LOOKUP_FLAGS_NONE" "0x0")
+    '("none" "G_FILE_COPY_NONE" "0")
+    '("overwrite" "G_FILE_COPY_OVERWRITE" "1")
+    '("backup" "G_FILE_COPY_BACKUP" "2")
+    '("nofollow_symlinks" "G_FILE_COPY_NOFOLLOW_SYMLINKS" "4")
+    '("all_metadata" "G_FILE_COPY_ALL_METADATA" "8")
+    '("no_fallback_for_move" "G_FILE_COPY_NO_FALLBACK_FOR_MOVE" "16")
+    '("target_default_perms" "G_FILE_COPY_TARGET_DEFAULT_PERMS" "32")
   )
 )
 
-;; Original typedef:
-;; typedef enum {
-;;   G_SOCKET_FAMILY_INVALID,
-;;   G_SOCKET_FAMILY_UNIX = GLIB_SYSDEF_AF_UNIX,
-;;   G_SOCKET_FAMILY_IPV4 = GLIB_SYSDEF_AF_INET,
-;;   G_SOCKET_FAMILY_IPV6 = GLIB_SYSDEF_AF_INET6
-;; } GSocketFamily;
-
-(define-enum-extended SocketFamily
+(define-flags-extended FileCreateFlags
   (in-module "G")
-  (c-name "GSocketFamily")
+  (c-name "GFileCreateFlags")
   (values
-    '("invalid" "G_SOCKET_FAMILY_INVALID" "0")
-    '("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")
+    '("none" "G_FILE_CREATE_NONE" "0")
+    '("private" "G_FILE_CREATE_PRIVATE" "1")
+    '("replace_destination" "G_FILE_CREATE_REPLACE_DESTINATION" "2")
   )
 )
 
-;; 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
+(define-flags-extended FileMeasureFlags
   (in-module "G")
-  (c-name "GSocketType")
+  (c-name "GFileMeasureFlags")
   (values
-    '("invalid" "G_SOCKET_TYPE_INVALID" "0")
-    '("stream" "G_SOCKET_TYPE_STREAM" "1")
-    '("datagram" "G_SOCKET_TYPE_DATAGRAM" "2")
-    '("seqpacket" "G_SOCKET_TYPE_SEQPACKET" "3")
+    '("none" "G_FILE_MEASURE_NONE" "0")
+    '("report_any_error" "G_FILE_MEASURE_REPORT_ANY_ERROR" "2")
+    '("apparent_size" "G_FILE_MEASURE_APPARENT_SIZE" "4")
+    '("no_xdev" "G_FILE_MEASURE_NO_XDEV" "8")
   )
 )
 
-;; Original typedef:
-;; typedef enum /*< flags >*/
-;; {
-;;   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
+(define-enum-extended FileMonitorEvent
   (in-module "G")
-  (c-name "GSocketMsgFlags")
+  (c-name "GFileMonitorEvent")
   (values
-    '("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")
+    '("changed" "G_FILE_MONITOR_EVENT_CHANGED" "0")
+    '("changes_done_hint" "G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT" "1")
+    '("deleted" "G_FILE_MONITOR_EVENT_DELETED" "2")
+    '("created" "G_FILE_MONITOR_EVENT_CREATED" "3")
+    '("attribute_changed" "G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED" "4")
+    '("pre_unmount" "G_FILE_MONITOR_EVENT_PRE_UNMOUNT" "5")
+    '("unmounted" "G_FILE_MONITOR_EVENT_UNMOUNTED" "6")
+    '("moved" "G_FILE_MONITOR_EVENT_MOVED" "7")
   )
 )
 
-;; 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
+(define-flags-extended FileMonitorFlags
   (in-module "G")
-  (c-name "GSocketProtocol")
+  (c-name "GFileMonitorFlags")
   (values
-    '("unknown" "G_SOCKET_PROTOCOL_UNKNOWN" "-1")
-    '("default" "G_SOCKET_PROTOCOL_DEFAULT" "0")
-    '("tcp" "G_SOCKET_PROTOCOL_TCP" "6")
-    '("udp" "G_SOCKET_PROTOCOL_UDP" "17")
-    '("sctp" "G_SOCKET_PROTOCOL_SCTP" "132")
+    '("none" "G_FILE_MONITOR_NONE" "0")
+    '("watch_mounts" "G_FILE_MONITOR_WATCH_MOUNTS" "1")
+    '("send_moved" "G_FILE_MONITOR_SEND_MOVED" "2")
+    '("watch_hard_links" "G_FILE_MONITOR_WATCH_HARD_LINKS" "4")
   )
 )
 
-;; Original typedef:
-;; typedef enum {
-;;   G_ZLIB_COMPRESSOR_FORMAT_ZLIB,
-;;   G_ZLIB_COMPRESSOR_FORMAT_GZIP,
-;;   G_ZLIB_COMPRESSOR_FORMAT_RAW
-;; } GZlibCompressorFormat;
-
-(define-enum-extended ZlibCompressorFormat
+(define-flags-extended FileQueryInfoFlags
   (in-module "G")
-  (c-name "GZlibCompressorFormat")
+  (c-name "GFileQueryInfoFlags")
   (values
-    '("zlib" "G_ZLIB_COMPRESSOR_FORMAT_ZLIB" "0")
-    '("gzip" "G_ZLIB_COMPRESSOR_FORMAT_GZIP" "1")
-    '("raw" "G_ZLIB_COMPRESSOR_FORMAT_RAW" "2")
+    '("none" "G_FILE_QUERY_INFO_NONE" "0")
+    '("nofollow_symlinks" "G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS" "1")
   )
 )
 
-;; Original typedef:
-;; typedef enum {
-;;   G_UNIX_SOCKET_ADDRESS_INVALID,
-;;   G_UNIX_SOCKET_ADDRESS_ANONYMOUS,
-;;   G_UNIX_SOCKET_ADDRESS_PATH,
-;;   G_UNIX_SOCKET_ADDRESS_ABSTRACT,
-;;   G_UNIX_SOCKET_ADDRESS_ABSTRACT_PADDED
-;; } GUnixSocketAddressType;
-
-(define-enum-extended UnixSocketAddressType
+(define-enum-extended FileType
   (in-module "G")
-  (c-name "GUnixSocketAddressType")
+  (c-name "GFileType")
   (values
-    '("invalid" "G_UNIX_SOCKET_ADDRESS_INVALID" "0")
-    '("anonymous" "G_UNIX_SOCKET_ADDRESS_ANONYMOUS" "1")
-    '("path" "G_UNIX_SOCKET_ADDRESS_PATH" "2")
-    '("abstract" "G_UNIX_SOCKET_ADDRESS_ABSTRACT" "3")
-    '("abstract-padded" "G_UNIX_SOCKET_ADDRESS_ABSTRACT_PADDED" "4")
+    '("unknown" "G_FILE_TYPE_UNKNOWN" "0")
+    '("regular" "G_FILE_TYPE_REGULAR" "1")
+    '("directory" "G_FILE_TYPE_DIRECTORY" "2")
+    '("symbolic_link" "G_FILE_TYPE_SYMBOLIC_LINK" "3")
+    '("special" "G_FILE_TYPE_SPECIAL" "4")
+    '("shortcut" "G_FILE_TYPE_SHORTCUT" "5")
+    '("mountable" "G_FILE_TYPE_MOUNTABLE" "6")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   G_BUS_TYPE_STARTER = -1,
-;;   G_BUS_TYPE_NONE = 0,
-;;   G_BUS_TYPE_SYSTEM  = 1,
-;;   G_BUS_TYPE_SESSION = 2
-;; } GBusType;
-
-(define-enum-extended BusType
+(define-enum-extended FilesystemPreviewType
   (in-module "G")
-  (c-name "GBusType")
+  (c-name "GFilesystemPreviewType")
   (values
-    '("starter" "G_BUS_TYPE_STARTER" "-1")
-    '("none" "G_BUS_TYPE_NONE" "0")
-    '("system" "G_BUS_TYPE_SYSTEM" "1")
-    '("session" "G_BUS_TYPE_SESSION" "2")
+    '("if_always" "G_FILESYSTEM_PREVIEW_TYPE_IF_ALWAYS" "0")
+    '("if_local" "G_FILESYSTEM_PREVIEW_TYPE_IF_LOCAL" "1")
+    '("never" "G_FILESYSTEM_PREVIEW_TYPE_NEVER" "2")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   G_BUS_NAME_OWNER_FLAGS_NONE = 0,                    /*< nick=none >*/
-;;   G_BUS_NAME_OWNER_FLAGS_ALLOW_REPLACEMENT = (1<<0),  /*< nick=allow-replacement >*/
-;;   G_BUS_NAME_OWNER_FLAGS_REPLACE = (1<<1)            /*< nick=replace >*/
-;; } GBusNameOwnerFlags;
-
-(define-flags-extended BusNameOwnerFlags
+(define-enum-extended IOErrorEnum
   (in-module "G")
-  (c-name "GBusNameOwnerFlags")
+  (c-name "GIOErrorEnum")
   (values
-    '("none" "G_BUS_NAME_OWNER_FLAGS_NONE" "0x0")
-    '("allow-replacement" "G_BUS_NAME_OWNER_FLAGS_ALLOW_REPLACEMENT" "(1<<0)")
-    '("replace" "G_BUS_NAME_OWNER_FLAGS_REPLACE" "(1<<1)")
+    '("failed" "G_IO_ERROR_FAILED" "0")
+    '("not_found" "G_IO_ERROR_NOT_FOUND" "1")
+    '("exists" "G_IO_ERROR_EXISTS" "2")
+    '("is_directory" "G_IO_ERROR_IS_DIRECTORY" "3")
+    '("not_directory" "G_IO_ERROR_NOT_DIRECTORY" "4")
+    '("not_empty" "G_IO_ERROR_NOT_EMPTY" "5")
+    '("not_regular_file" "G_IO_ERROR_NOT_REGULAR_FILE" "6")
+    '("not_symbolic_link" "G_IO_ERROR_NOT_SYMBOLIC_LINK" "7")
+    '("not_mountable_file" "G_IO_ERROR_NOT_MOUNTABLE_FILE" "8")
+    '("filename_too_long" "G_IO_ERROR_FILENAME_TOO_LONG" "9")
+    '("invalid_filename" "G_IO_ERROR_INVALID_FILENAME" "10")
+    '("too_many_links" "G_IO_ERROR_TOO_MANY_LINKS" "11")
+    '("no_space" "G_IO_ERROR_NO_SPACE" "12")
+    '("invalid_argument" "G_IO_ERROR_INVALID_ARGUMENT" "13")
+    '("permission_denied" "G_IO_ERROR_PERMISSION_DENIED" "14")
+    '("not_supported" "G_IO_ERROR_NOT_SUPPORTED" "15")
+    '("not_mounted" "G_IO_ERROR_NOT_MOUNTED" "16")
+    '("already_mounted" "G_IO_ERROR_ALREADY_MOUNTED" "17")
+    '("closed" "G_IO_ERROR_CLOSED" "18")
+    '("cancelled" "G_IO_ERROR_CANCELLED" "19")
+    '("pending" "G_IO_ERROR_PENDING" "20")
+    '("read_only" "G_IO_ERROR_READ_ONLY" "21")
+    '("cant_create_backup" "G_IO_ERROR_CANT_CREATE_BACKUP" "22")
+    '("wrong_etag" "G_IO_ERROR_WRONG_ETAG" "23")
+    '("timed_out" "G_IO_ERROR_TIMED_OUT" "24")
+    '("would_recurse" "G_IO_ERROR_WOULD_RECURSE" "25")
+    '("busy" "G_IO_ERROR_BUSY" "26")
+    '("would_block" "G_IO_ERROR_WOULD_BLOCK" "27")
+    '("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")
+    '("too_many_open_files" "G_IO_ERROR_TOO_MANY_OPEN_FILES" "31")
+    '("not_initialized" "G_IO_ERROR_NOT_INITIALIZED" "32")
+    '("address_in_use" "G_IO_ERROR_ADDRESS_IN_USE" "33")
+    '("partial_input" "G_IO_ERROR_PARTIAL_INPUT" "34")
+    '("invalid_data" "G_IO_ERROR_INVALID_DATA" "35")
+    '("dbus_error" "G_IO_ERROR_DBUS_ERROR" "36")
+    '("host_unreachable" "G_IO_ERROR_HOST_UNREACHABLE" "37")
+    '("network_unreachable" "G_IO_ERROR_NETWORK_UNREACHABLE" "38")
+    '("connection_refused" "G_IO_ERROR_CONNECTION_REFUSED" "39")
+    '("proxy_failed" "G_IO_ERROR_PROXY_FAILED" "40")
+    '("proxy_auth_failed" "G_IO_ERROR_PROXY_AUTH_FAILED" "41")
+    '("proxy_need_auth" "G_IO_ERROR_PROXY_NEED_AUTH" "42")
+    '("proxy_not_allowed" "G_IO_ERROR_PROXY_NOT_ALLOWED" "43")
+    '("broken_pipe" "G_IO_ERROR_BROKEN_PIPE" "44")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   G_BUS_NAME_WATCHER_FLAGS_NONE = 0,
-;;   G_BUS_NAME_WATCHER_FLAGS_AUTO_START = (1<<0)
-;; } GBusNameWatcherFlags;
-
-(define-flags-extended BusNameWatcherFlags
+(define-flags-extended IOModuleScopeFlags
   (in-module "G")
-  (c-name "GBusNameWatcherFlags")
+  (c-name "GIOModuleScopeFlags")
   (values
-    '("none" "G_BUS_NAME_WATCHER_FLAGS_NONE" "0x0")
-    '("auto-start" "G_BUS_NAME_WATCHER_FLAGS_AUTO_START" "(1<<0)")
+    '("none" "G_IO_MODULE_SCOPE_NONE" "0")
+    '("block_duplicates" "G_IO_MODULE_SCOPE_BLOCK_DUPLICATES" "1")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   G_DBUS_PROXY_FLAGS_NONE = 0,
-;;   G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES = (1<<0),
-;;   G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS = (1<<1),
-;;   G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START = (1<<2),
-;;   G_DBUS_PROXY_FLAGS_GET_INVALIDATED_PROPERTIES = (1<<3),
-;;   G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START_AT_CONSTRUCTION = (1<<4)
-;; } GDBusProxyFlags;
-
-(define-flags-extended DBusProxyFlags
-  (in-module "G")
-  (c-name "GDBusProxyFlags")
-  (values
-    '("none" "G_DBUS_PROXY_FLAGS_NONE" "0x0")
-    '("do-not-load-properties" "G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES" "(1<<0)")
-    '("do-not-connect-signals" "G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS" "(1<<1)")
-    '("do-not-auto-start" "G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START" "(1<<2)")
-    '("get-invalidated-properties" "G_DBUS_PROXY_FLAGS_GET_INVALIDATED_PROPERTIES" "(1<<3)")
-    '("do-not-auto-start-at-construction" "G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START_AT_CONSTRUCTION" "(1<<4)")
-  )
-)
-
-;; Original typedef:
-;; typedef enum
-;; {
-;;   /* Well-known errors in the org.freedesktop.DBus.Error namespace */
-;;   G_DBUS_ERROR_FAILED,                           /* org.freedesktop.DBus.Error.Failed */
-;;   G_DBUS_ERROR_NO_MEMORY,                        /* org.freedesktop.DBus.Error.NoMemory */
-;;   G_DBUS_ERROR_SERVICE_UNKNOWN,                  /* org.freedesktop.DBus.Error.ServiceUnknown */
-;;   G_DBUS_ERROR_NAME_HAS_NO_OWNER,                /* org.freedesktop.DBus.Error.NameHasNoOwner */
-;;   G_DBUS_ERROR_NO_REPLY,                         /* org.freedesktop.DBus.Error.NoReply */
-;;   G_DBUS_ERROR_IO_ERROR,                         /* org.freedesktop.DBus.Error.IOError */
-;;   G_DBUS_ERROR_BAD_ADDRESS,                      /* org.freedesktop.DBus.Error.BadAddress */
-;;   G_DBUS_ERROR_NOT_SUPPORTED,                    /* org.freedesktop.DBus.Error.NotSupported */
-;;   G_DBUS_ERROR_LIMITS_EXCEEDED,                  /* org.freedesktop.DBus.Error.LimitsExceeded */
-;;   G_DBUS_ERROR_ACCESS_DENIED,                    /* org.freedesktop.DBus.Error.AccessDenied */
-;;   G_DBUS_ERROR_AUTH_FAILED,                      /* org.freedesktop.DBus.Error.AuthFailed */
-;;   G_DBUS_ERROR_NO_SERVER,                        /* org.freedesktop.DBus.Error.NoServer */
-;;   G_DBUS_ERROR_TIMEOUT,                          /* org.freedesktop.DBus.Error.Timeout */
-;;   G_DBUS_ERROR_NO_NETWORK,                       /* org.freedesktop.DBus.Error.NoNetwork */
-;;   G_DBUS_ERROR_ADDRESS_IN_USE,                   /* org.freedesktop.DBus.Error.AddressInUse */
-;;   G_DBUS_ERROR_DISCONNECTED,                     /* org.freedesktop.DBus.Error.Disconnected */
-;;   G_DBUS_ERROR_INVALID_ARGS,                     /* org.freedesktop.DBus.Error.InvalidArgs */
-;;   G_DBUS_ERROR_FILE_NOT_FOUND,                   /* org.freedesktop.DBus.Error.FileNotFound */
-;;   G_DBUS_ERROR_FILE_EXISTS,                      /* org.freedesktop.DBus.Error.FileExists */
-;;   G_DBUS_ERROR_UNKNOWN_METHOD,                   /* org.freedesktop.DBus.Error.UnknownMethod */
-;;   G_DBUS_ERROR_TIMED_OUT,                        /* org.freedesktop.DBus.Error.TimedOut */
-;;   G_DBUS_ERROR_MATCH_RULE_NOT_FOUND,             /* org.freedesktop.DBus.Error.MatchRuleNotFound */
-;;   G_DBUS_ERROR_MATCH_RULE_INVALID,               /* org.freedesktop.DBus.Error.MatchRuleInvalid */
-;;   G_DBUS_ERROR_SPAWN_EXEC_FAILED,                /* org.freedesktop.DBus.Error.Spawn.ExecFailed */
-;;   G_DBUS_ERROR_SPAWN_FORK_FAILED,                /* org.freedesktop.DBus.Error.Spawn.ForkFailed */
-;;   G_DBUS_ERROR_SPAWN_CHILD_EXITED,               /* org.freedesktop.DBus.Error.Spawn.ChildExited */
-;;   G_DBUS_ERROR_SPAWN_CHILD_SIGNALED,             /* org.freedesktop.DBus.Error.Spawn.ChildSignaled */
-;;   G_DBUS_ERROR_SPAWN_FAILED,                     /* org.freedesktop.DBus.Error.Spawn.Failed */
-;;   G_DBUS_ERROR_SPAWN_SETUP_FAILED,               /* org.freedesktop.DBus.Error.Spawn.FailedToSetup */
-;;   G_DBUS_ERROR_SPAWN_CONFIG_INVALID,             /* org.freedesktop.DBus.Error.Spawn.ConfigInvalid */
-;;   G_DBUS_ERROR_SPAWN_SERVICE_INVALID,            /* org.freedesktop.DBus.Error.Spawn.ServiceNotValid */
-;;   G_DBUS_ERROR_SPAWN_SERVICE_NOT_FOUND,          /* org.freedesktop.DBus.Error.Spawn.ServiceNotFound */
-;;   G_DBUS_ERROR_SPAWN_PERMISSIONS_INVALID,        /* org.freedesktop.DBus.Error.Spawn.PermissionsInvalid */
-;;   G_DBUS_ERROR_SPAWN_FILE_INVALID,               /* org.freedesktop.DBus.Error.Spawn.FileInvalid */
-;;   G_DBUS_ERROR_SPAWN_NO_MEMORY,                  /* org.freedesktop.DBus.Error.Spawn.NoMemory */
-;;   G_DBUS_ERROR_UNIX_PROCESS_ID_UNKNOWN,          /* org.freedesktop.DBus.Error.UnixProcessIdUnknown */
-;;   G_DBUS_ERROR_INVALID_SIGNATURE,                /* org.freedesktop.DBus.Error.InvalidSignature */
-;;   G_DBUS_ERROR_INVALID_FILE_CONTENT,             /* org.freedesktop.DBus.Error.InvalidFileContent */
-;;   G_DBUS_ERROR_SELINUX_SECURITY_CONTEXT_UNKNOWN, /* 
org.freedesktop.DBus.Error.SELinuxSecurityContextUnknown */
-;;   G_DBUS_ERROR_ADT_AUDIT_DATA_UNKNOWN,           /* org.freedesktop.DBus.Error.AdtAuditDataUnknown */
-;;   G_DBUS_ERROR_OBJECT_PATH_IN_USE,               /* org.freedesktop.DBus.Error.ObjectPathInUse */
-;;   G_DBUS_ERROR_UNKNOWN_OBJECT,                   /* org.freedesktop.DBus.Error.UnknownObject */
-;;   G_DBUS_ERROR_UNKNOWN_INTERFACE,                /* org.freedesktop.DBus.Error.UnknownInterface */
-;;   G_DBUS_ERROR_UNKNOWN_PROPERTY,                 /* org.freedesktop.DBus.Error.UnknownProperty */
-;;   G_DBUS_ERROR_PROPERTY_READ_ONLY                /* org.freedesktop.DBus.Error.PropertyReadOnly */
-;; } GDBusError;
-
-(define-enum-extended DBusError
-  (in-module "G")
-  (c-name "GDBusError")
-  (values
-    '("failed" "G_DBUS_ERROR_FAILED" "0")
-    '("no-memory" "G_DBUS_ERROR_NO_MEMORY" "1")
-    '("service-unknown" "G_DBUS_ERROR_SERVICE_UNKNOWN" "2")
-    '("name-has-no-owner" "G_DBUS_ERROR_NAME_HAS_NO_OWNER" "3")
-    '("no-reply" "G_DBUS_ERROR_NO_REPLY" "4")
-    '("io-error" "G_DBUS_ERROR_IO_ERROR" "5")
-    '("bad-address" "G_DBUS_ERROR_BAD_ADDRESS" "6")
-    '("not-supported" "G_DBUS_ERROR_NOT_SUPPORTED" "7")
-    '("limits-exceeded" "G_DBUS_ERROR_LIMITS_EXCEEDED" "8")
-    '("access-denied" "G_DBUS_ERROR_ACCESS_DENIED" "9")
-    '("auth-failed" "G_DBUS_ERROR_AUTH_FAILED" "10")
-    '("no-server" "G_DBUS_ERROR_NO_SERVER" "11")
-    '("timeout" "G_DBUS_ERROR_TIMEOUT" "12")
-    '("no-network" "G_DBUS_ERROR_NO_NETWORK" "13")
-    '("address-in-use" "G_DBUS_ERROR_ADDRESS_IN_USE" "14")
-    '("disconnected" "G_DBUS_ERROR_DISCONNECTED" "15")
-    '("invalid-args" "G_DBUS_ERROR_INVALID_ARGS" "16")
-    '("file-not-found" "G_DBUS_ERROR_FILE_NOT_FOUND" "17")
-    '("file-exists" "G_DBUS_ERROR_FILE_EXISTS" "18")
-    '("unknown-method" "G_DBUS_ERROR_UNKNOWN_METHOD" "19")
-    '("timed-out" "G_DBUS_ERROR_TIMED_OUT" "20")
-    '("match-rule-not-found" "G_DBUS_ERROR_MATCH_RULE_NOT_FOUND" "21")
-    '("match-rule-invalid" "G_DBUS_ERROR_MATCH_RULE_INVALID" "22")
-    '("spawn-exec-failed" "G_DBUS_ERROR_SPAWN_EXEC_FAILED" "23")
-    '("spawn-fork-failed" "G_DBUS_ERROR_SPAWN_FORK_FAILED" "24")
-    '("spawn-child-exited" "G_DBUS_ERROR_SPAWN_CHILD_EXITED" "25")
-    '("spawn-child-signaled" "G_DBUS_ERROR_SPAWN_CHILD_SIGNALED" "26")
-    '("spawn-failed" "G_DBUS_ERROR_SPAWN_FAILED" "27")
-    '("spawn-setup-failed" "G_DBUS_ERROR_SPAWN_SETUP_FAILED" "28")
-    '("spawn-config-invalid" "G_DBUS_ERROR_SPAWN_CONFIG_INVALID" "29")
-    '("spawn-service-invalid" "G_DBUS_ERROR_SPAWN_SERVICE_INVALID" "30")
-    '("spawn-service-not-found" "G_DBUS_ERROR_SPAWN_SERVICE_NOT_FOUND" "31")
-    '("spawn-permissions-invalid" "G_DBUS_ERROR_SPAWN_PERMISSIONS_INVALID" "32")
-    '("spawn-file-invalid" "G_DBUS_ERROR_SPAWN_FILE_INVALID" "33")
-    '("spawn-no-memory" "G_DBUS_ERROR_SPAWN_NO_MEMORY" "34")
-    '("unix-process-id-unknown" "G_DBUS_ERROR_UNIX_PROCESS_ID_UNKNOWN" "35")
-    '("invalid-signature" "G_DBUS_ERROR_INVALID_SIGNATURE" "36")
-    '("invalid-file-content" "G_DBUS_ERROR_INVALID_FILE_CONTENT" "37")
-    '("selinux-security-context-unknown" "G_DBUS_ERROR_SELINUX_SECURITY_CONTEXT_UNKNOWN" "38")
-    '("adt-audit-data-unknown" "G_DBUS_ERROR_ADT_AUDIT_DATA_UNKNOWN" "39")
-    '("object-path-in-use" "G_DBUS_ERROR_OBJECT_PATH_IN_USE" "40")
-    '("unknown-object" "G_DBUS_ERROR_UNKNOWN_OBJECT" "41")
-    '("unknown-interface" "G_DBUS_ERROR_UNKNOWN_INTERFACE" "42")
-    '("unknown-property" "G_DBUS_ERROR_UNKNOWN_PROPERTY" "43")
-    '("property-read-only" "G_DBUS_ERROR_PROPERTY_READ_ONLY" "44")
-  )
-)
-
-;; Original typedef:
-;; typedef enum {
-;;   G_DBUS_CONNECTION_FLAGS_NONE = 0,
-;;   G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_CLIENT = (1<<0),
-;;   G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_SERVER = (1<<1),
-;;   G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_ALLOW_ANONYMOUS = (1<<2),
-;;   G_DBUS_CONNECTION_FLAGS_MESSAGE_BUS_CONNECTION = (1<<3),
-;;   G_DBUS_CONNECTION_FLAGS_DELAY_MESSAGE_PROCESSING = (1<<4)
-;; } GDBusConnectionFlags;
-
-(define-flags-extended DBusConnectionFlags
+(define-flags-extended IOStreamSpliceFlags
   (in-module "G")
-  (c-name "GDBusConnectionFlags")
+  (c-name "GIOStreamSpliceFlags")
   (values
-    '("none" "G_DBUS_CONNECTION_FLAGS_NONE" "0x0")
-    '("authentication-client" "G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_CLIENT" "(1<<0)")
-    '("authentication-server" "G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_SERVER" "(1<<1)")
-    '("authentication-allow-anonymous" "G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_ALLOW_ANONYMOUS" "(1<<2)")
-    '("message-bus-connection" "G_DBUS_CONNECTION_FLAGS_MESSAGE_BUS_CONNECTION" "(1<<3)")
-    '("delay-message-processing" "G_DBUS_CONNECTION_FLAGS_DELAY_MESSAGE_PROCESSING" "(1<<4)")
+    '("none" "G_IO_STREAM_SPLICE_NONE" "0")
+    '("close_stream1" "G_IO_STREAM_SPLICE_CLOSE_STREAM1" "1")
+    '("close_stream2" "G_IO_STREAM_SPLICE_CLOSE_STREAM2" "2")
+    '("wait_for_both" "G_IO_STREAM_SPLICE_WAIT_FOR_BOTH" "4")
   )
 )
 
-;; Original typedef:
-;; typedef enum {
-;;   G_DBUS_CAPABILITY_FLAGS_NONE = 0,
-;;   G_DBUS_CAPABILITY_FLAGS_UNIX_FD_PASSING = (1<<0)
-;; } GDBusCapabilityFlags;
-
-(define-flags-extended DBusCapabilityFlags
+(define-flags-extended MountMountFlags
   (in-module "G")
-  (c-name "GDBusCapabilityFlags")
+  (c-name "GMountMountFlags")
   (values
-    '("none" "G_DBUS_CAPABILITY_FLAGS_NONE" "0x0")
-    '("unix-fd-passing" "G_DBUS_CAPABILITY_FLAGS_UNIX_FD_PASSING" "(1<<0)")
+    '("none" "G_MOUNT_MOUNT_NONE" "0")
   )
 )
 
-;; Original typedef:
-;; typedef enum {
-;;   G_DBUS_CALL_FLAGS_NONE = 0,
-;;   G_DBUS_CALL_FLAGS_NO_AUTO_START = (1<<0)
-;; } GDBusCallFlags;
-
-(define-flags-extended DBusCallFlags
+(define-enum-extended MountOperationResult
   (in-module "G")
-  (c-name "GDBusCallFlags")
+  (c-name "GMountOperationResult")
   (values
-    '("none" "G_DBUS_CALL_FLAGS_NONE" "0x0")
-    '("no-auto-start" "G_DBUS_CALL_FLAGS_NO_AUTO_START" "(1<<0)")
+    '("handled" "G_MOUNT_OPERATION_HANDLED" "0")
+    '("aborted" "G_MOUNT_OPERATION_ABORTED" "1")
+    '("unhandled" "G_MOUNT_OPERATION_UNHANDLED" "2")
   )
 )
 
-;; Original typedef:
-;; typedef enum {
-;;   G_DBUS_MESSAGE_TYPE_INVALID,
-;;   G_DBUS_MESSAGE_TYPE_METHOD_CALL,
-;;   G_DBUS_MESSAGE_TYPE_METHOD_RETURN,
-;;   G_DBUS_MESSAGE_TYPE_ERROR,
-;;   G_DBUS_MESSAGE_TYPE_SIGNAL
-;; } GDBusMessageType;
-
-(define-enum-extended DBusMessageType
+(define-flags-extended MountUnmountFlags
   (in-module "G")
-  (c-name "GDBusMessageType")
+  (c-name "GMountUnmountFlags")
   (values
-    '("invalid" "G_DBUS_MESSAGE_TYPE_INVALID" "0")
-    '("method-call" "G_DBUS_MESSAGE_TYPE_METHOD_CALL" "1")
-    '("method-return" "G_DBUS_MESSAGE_TYPE_METHOD_RETURN" "2")
-    '("error" "G_DBUS_MESSAGE_TYPE_ERROR" "3")
-    '("signal" "G_DBUS_MESSAGE_TYPE_SIGNAL" "4")
+    '("none" "G_MOUNT_UNMOUNT_NONE" "0")
+    '("force" "G_MOUNT_UNMOUNT_FORCE" "1")
   )
 )
 
-;; Original typedef:
-;; typedef enum {
-;;   G_DBUS_MESSAGE_FLAGS_NONE = 0,
-;;   G_DBUS_MESSAGE_FLAGS_NO_REPLY_EXPECTED = (1<<0),
-;;   G_DBUS_MESSAGE_FLAGS_NO_AUTO_START = (1<<1)
-;; } GDBusMessageFlags;
-
-(define-flags-extended DBusMessageFlags
+(define-enum-extended NotificationPriority
   (in-module "G")
-  (c-name "GDBusMessageFlags")
+  (c-name "GNotificationPriority")
   (values
-    '("none" "G_DBUS_MESSAGE_FLAGS_NONE" "0x0")
-    '("no-reply-expected" "G_DBUS_MESSAGE_FLAGS_NO_REPLY_EXPECTED" "(1<<0)")
-    '("no-auto-start" "G_DBUS_MESSAGE_FLAGS_NO_AUTO_START" "(1<<1)")
+    '("normal" "G_NOTIFICATION_PRIORITY_NORMAL" "0")
+    '("low" "G_NOTIFICATION_PRIORITY_LOW" "1")
+    '("high" "G_NOTIFICATION_PRIORITY_HIGH" "2")
+    '("urgent" "G_NOTIFICATION_PRIORITY_URGENT" "3")
   )
 )
 
-;; Original typedef:
-;; typedef enum {
-;;   G_DBUS_MESSAGE_HEADER_FIELD_INVALID,
-;;   G_DBUS_MESSAGE_HEADER_FIELD_PATH,
-;;   G_DBUS_MESSAGE_HEADER_FIELD_INTERFACE,
-;;   G_DBUS_MESSAGE_HEADER_FIELD_MEMBER,
-;;   G_DBUS_MESSAGE_HEADER_FIELD_ERROR_NAME,
-;;   G_DBUS_MESSAGE_HEADER_FIELD_REPLY_SERIAL,
-;;   G_DBUS_MESSAGE_HEADER_FIELD_DESTINATION,
-;;   G_DBUS_MESSAGE_HEADER_FIELD_SENDER,
-;;   G_DBUS_MESSAGE_HEADER_FIELD_SIGNATURE,
-;;   G_DBUS_MESSAGE_HEADER_FIELD_NUM_UNIX_FDS
-;; } GDBusMessageHeaderField;
-
-(define-enum-extended DBusMessageHeaderField
+(define-flags-extended OutputStreamSpliceFlags
   (in-module "G")
-  (c-name "GDBusMessageHeaderField")
+  (c-name "GOutputStreamSpliceFlags")
   (values
-    '("invalid" "G_DBUS_MESSAGE_HEADER_FIELD_INVALID" "0")
-    '("path" "G_DBUS_MESSAGE_HEADER_FIELD_PATH" "1")
-    '("interface" "G_DBUS_MESSAGE_HEADER_FIELD_INTERFACE" "2")
-    '("member" "G_DBUS_MESSAGE_HEADER_FIELD_MEMBER" "3")
-    '("error-name" "G_DBUS_MESSAGE_HEADER_FIELD_ERROR_NAME" "4")
-    '("reply-serial" "G_DBUS_MESSAGE_HEADER_FIELD_REPLY_SERIAL" "5")
-    '("destination" "G_DBUS_MESSAGE_HEADER_FIELD_DESTINATION" "6")
-    '("sender" "G_DBUS_MESSAGE_HEADER_FIELD_SENDER" "7")
-    '("signature" "G_DBUS_MESSAGE_HEADER_FIELD_SIGNATURE" "8")
-    '("num-unix-fds" "G_DBUS_MESSAGE_HEADER_FIELD_NUM_UNIX_FDS" "9")
+    '("none" "G_OUTPUT_STREAM_SPLICE_NONE" "0")
+    '("close_source" "G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE" "1")
+    '("close_target" "G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET" "2")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   G_DBUS_PROPERTY_INFO_FLAGS_NONE = 0,
-;;   G_DBUS_PROPERTY_INFO_FLAGS_READABLE = (1<<0),
-;;   G_DBUS_PROPERTY_INFO_FLAGS_WRITABLE = (1<<1)
-;; } GDBusPropertyInfoFlags;
-
-(define-flags-extended DBusPropertyInfoFlags
+(define-enum-extended PasswordSave
   (in-module "G")
-  (c-name "GDBusPropertyInfoFlags")
+  (c-name "GPasswordSave")
   (values
-    '("none" "G_DBUS_PROPERTY_INFO_FLAGS_NONE" "0x0")
-    '("readable" "G_DBUS_PROPERTY_INFO_FLAGS_READABLE" "(1<<0)")
-    '("writable" "G_DBUS_PROPERTY_INFO_FLAGS_WRITABLE" "(1<<1)")
+    '("never" "G_PASSWORD_SAVE_NEVER" "0")
+    '("for_session" "G_PASSWORD_SAVE_FOR_SESSION" "1")
+    '("permanently" "G_PASSWORD_SAVE_PERMANENTLY" "2")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   G_DBUS_SUBTREE_FLAGS_NONE = 0,
-;;   G_DBUS_SUBTREE_FLAGS_DISPATCH_TO_UNENUMERATED_NODES = (1<<0)
-;; } GDBusSubtreeFlags;
-
-(define-flags-extended DBusSubtreeFlags
+(define-enum-extended ResolverError
   (in-module "G")
-  (c-name "GDBusSubtreeFlags")
+  (c-name "GResolverError")
   (values
-    '("none" "G_DBUS_SUBTREE_FLAGS_NONE" "0x0")
-    '("dispatch-to-unenumerated-nodes" "G_DBUS_SUBTREE_FLAGS_DISPATCH_TO_UNENUMERATED_NODES" "(1<<0)")
+    '("not_found" "G_RESOLVER_ERROR_NOT_FOUND" "0")
+    '("temporary_failure" "G_RESOLVER_ERROR_TEMPORARY_FAILURE" "1")
+    '("internal" "G_RESOLVER_ERROR_INTERNAL" "2")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   G_DBUS_SERVER_FLAGS_NONE = 0,
-;;   G_DBUS_SERVER_FLAGS_RUN_IN_THREAD = (1<<0),
-;;   G_DBUS_SERVER_FLAGS_AUTHENTICATION_ALLOW_ANONYMOUS = (1<<1)
-;; } GDBusServerFlags;
-
-(define-flags-extended DBusServerFlags
+(define-enum-extended ResolverRecordType
   (in-module "G")
-  (c-name "GDBusServerFlags")
+  (c-name "GResolverRecordType")
   (values
-    '("none" "G_DBUS_SERVER_FLAGS_NONE" "0x0")
-    '("run-in-thread" "G_DBUS_SERVER_FLAGS_RUN_IN_THREAD" "(1<<0)")
-    '("authentication-allow-anonymous" "G_DBUS_SERVER_FLAGS_AUTHENTICATION_ALLOW_ANONYMOUS" "(1<<1)")
+    '("srv" "G_RESOLVER_RECORD_SRV" "1")
+    '("mx" "G_RESOLVER_RECORD_MX" "2")
+    '("txt" "G_RESOLVER_RECORD_TXT" "3")
+    '("soa" "G_RESOLVER_RECORD_SOA" "4")
+    '("ns" "G_RESOLVER_RECORD_NS" "5")
   )
 )
 
-;; Original typedef:
-;; typedef enum /*< flags >*/
-;; {
-;;   G_DBUS_SIGNAL_FLAGS_NONE = 0,
-;;   G_DBUS_SIGNAL_FLAGS_NO_MATCH_RULE = (1<<0),
-;;   G_DBUS_SIGNAL_FLAGS_MATCH_ARG0_NAMESPACE = (1<<1),
-;;   G_DBUS_SIGNAL_FLAGS_MATCH_ARG0_PATH = (1<<2)
-;; } GDBusSignalFlags;
-
-(define-flags-extended DBusSignalFlags
+(define-enum-extended ResourceError
   (in-module "G")
-  (c-name "GDBusSignalFlags")
+  (c-name "GResourceError")
   (values
-    '("none" "G_DBUS_SIGNAL_FLAGS_NONE" "0x0")
-    '("no-match-rule" "G_DBUS_SIGNAL_FLAGS_NO_MATCH_RULE" "(1<<0)")
-    '("match-arg0-namespace" "G_DBUS_SIGNAL_FLAGS_MATCH_ARG0_NAMESPACE" "(1<<1)")
-    '("match-arg0-path" "G_DBUS_SIGNAL_FLAGS_MATCH_ARG0_PATH" "(1<<2)")
+    '("not_found" "G_RESOURCE_ERROR_NOT_FOUND" "0")
+    '("internal" "G_RESOURCE_ERROR_INTERNAL" "1")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   G_DBUS_SEND_MESSAGE_FLAGS_NONE = 0,
-;;   G_DBUS_SEND_MESSAGE_FLAGS_PRESERVE_SERIAL = (1<<0)
-;; } GDBusSendMessageFlags;
-
-(define-flags-extended DBusSendMessageFlags
+(define-flags-extended ResourceFlags
   (in-module "G")
-  (c-name "GDBusSendMessageFlags")
+  (c-name "GResourceFlags")
   (values
-    '("none" "G_DBUS_SEND_MESSAGE_FLAGS_NONE" "0x0")
-    '("preserve-serial" "G_DBUS_SEND_MESSAGE_FLAGS_PRESERVE_SERIAL" "(1<<0)")
+    '("none" "G_RESOURCE_FLAGS_NONE" "0")
+    '("compressed" "G_RESOURCE_FLAGS_COMPRESSED" "1")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   G_CREDENTIALS_TYPE_INVALID,
-;;   G_CREDENTIALS_TYPE_LINUX_UCRED,
-;;   G_CREDENTIALS_TYPE_FREEBSD_CMSGCRED,
-;;   G_CREDENTIALS_TYPE_NETBSD_UNPCBID,
-;;   G_CREDENTIALS_TYPE_OPENBSD_SOCKPEERCRED,
-;;   G_CREDENTIALS_TYPE_SOLARIS_UCRED
-;; } GCredentialsType;
-
-(define-enum-extended CredentialsType
+(define-flags-extended ResourceLookupFlags
   (in-module "G")
-  (c-name "GCredentialsType")
+  (c-name "GResourceLookupFlags")
   (values
-    '("invalid" "G_CREDENTIALS_TYPE_INVALID" "0")
-    '("linux-ucred" "G_CREDENTIALS_TYPE_LINUX_UCRED" "1")
-    '("freebsd-cmsgcred" "G_CREDENTIALS_TYPE_FREEBSD_CMSGCRED" "2")
-    '("netbsd-unpcbid" "G_CREDENTIALS_TYPE_NETBSD_UNPCBID" "3")
-    '("openbsd-sockpeercred" "G_CREDENTIALS_TYPE_OPENBSD_SOCKPEERCRED" "4")
-    '("solaris-ucred" "G_CREDENTIALS_TYPE_SOLARIS_UCRED" "5")
+    '("none" "G_RESOURCE_LOOKUP_FLAGS_NONE" "0")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   G_DBUS_MESSAGE_BYTE_ORDER_BIG_ENDIAN    = 'B',
-;;   G_DBUS_MESSAGE_BYTE_ORDER_LITTLE_ENDIAN = 'l'
-;; } GDBusMessageByteOrder;
-
-(define-enum-extended DBusMessageByteOrder
+(define-flags-extended SettingsBindFlags
   (in-module "G")
-  (c-name "GDBusMessageByteOrder")
+  (c-name "GSettingsBindFlags")
   (values
-    '("big-endian" "G_DBUS_MESSAGE_BYTE_ORDER_BIG_ENDIAN" "0")
-    '("little-endian" "G_DBUS_MESSAGE_BYTE_ORDER_LITTLE_ENDIAN" "'l'")
+    '("default" "G_SETTINGS_BIND_DEFAULT" "0")
+    '("get" "G_SETTINGS_BIND_GET" "1")
+    '("set" "G_SETTINGS_BIND_SET" "2")
+    '("no_sensitivity" "G_SETTINGS_BIND_NO_SENSITIVITY" "4")
+    '("get_no_changes" "G_SETTINGS_BIND_GET_NO_CHANGES" "8")
+    '("invert_boolean" "G_SETTINGS_BIND_INVERT_BOOLEAN" "16")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   G_APPLICATION_FLAGS_NONE,
-;;   G_APPLICATION_IS_SERVICE  =          (1 << 0),
-;;   G_APPLICATION_IS_LAUNCHER =          (1 << 1),
-;; 
-;;   G_APPLICATION_HANDLES_OPEN =         (1 << 2),
-;;   G_APPLICATION_HANDLES_COMMAND_LINE = (1 << 3),
-;;   G_APPLICATION_SEND_ENVIRONMENT    =  (1 << 4),
-;; 
-;;   G_APPLICATION_NON_UNIQUE =           (1 << 5)
-;; } GApplicationFlags;
-
-(define-flags-extended ApplicationFlags
+(define-enum-extended SocketClientEvent
   (in-module "G")
-  (c-name "GApplicationFlags")
+  (c-name "GSocketClientEvent")
   (values
-    '("flags-none" "G_APPLICATION_FLAGS_NONE" "0x0")
-    '("is-service" "G_APPLICATION_IS_SERVICE" "(1 << 0)")
-    '("is-launcher" "G_APPLICATION_IS_LAUNCHER" "(1 << 1)")
-    '("handles-open" "G_APPLICATION_HANDLES_OPEN" "(1 << 2)")
-    '("handles-command-line" "G_APPLICATION_HANDLES_COMMAND_LINE" "(1 << 3)")
-    '("send-environment" "G_APPLICATION_SEND_ENVIRONMENT" "(1 << 4)")
-    '("non-unique" "G_APPLICATION_NON_UNIQUE" "(1 << 5)")
+    '("resolving" "G_SOCKET_CLIENT_RESOLVING" "0")
+    '("resolved" "G_SOCKET_CLIENT_RESOLVED" "1")
+    '("connecting" "G_SOCKET_CLIENT_CONNECTING" "2")
+    '("connected" "G_SOCKET_CLIENT_CONNECTED" "3")
+    '("proxy_negotiating" "G_SOCKET_CLIENT_PROXY_NEGOTIATING" "4")
+    '("proxy_negotiated" "G_SOCKET_CLIENT_PROXY_NEGOTIATED" "5")
+    '("tls_handshaking" "G_SOCKET_CLIENT_TLS_HANDSHAKING" "6")
+    '("tls_handshaked" "G_SOCKET_CLIENT_TLS_HANDSHAKED" "7")
+    '("complete" "G_SOCKET_CLIENT_COMPLETE" "8")
   )
 )
 
-;; Original typedef:
-;; typedef enum {
-;;   G_TLS_ERROR_UNAVAILABLE,
-;;   G_TLS_ERROR_MISC,
-;;   G_TLS_ERROR_BAD_CERTIFICATE,
-;;   G_TLS_ERROR_NOT_TLS,
-;;   G_TLS_ERROR_HANDSHAKE,
-;;   G_TLS_ERROR_CERTIFICATE_REQUIRED,
-;;   G_TLS_ERROR_EOF
-;; } GTlsError;
-
-(define-enum-extended TlsError
+(define-enum-extended SocketFamily
   (in-module "G")
-  (c-name "GTlsError")
+  (c-name "GSocketFamily")
   (values
-    '("unavailable" "G_TLS_ERROR_UNAVAILABLE" "0")
-    '("misc" "G_TLS_ERROR_MISC" "1")
-    '("bad-certificate" "G_TLS_ERROR_BAD_CERTIFICATE" "2")
-    '("not-tls" "G_TLS_ERROR_NOT_TLS" "3")
-    '("handshake" "G_TLS_ERROR_HANDSHAKE" "4")
-    '("certificate-required" "G_TLS_ERROR_CERTIFICATE_REQUIRED" "5")
-    '("eof" "G_TLS_ERROR_EOF" "6")
+    '("invalid" "G_SOCKET_FAMILY_INVALID" "0")
+    '("unix" "G_SOCKET_FAMILY_UNIX" "1")
+    '("ipv4" "G_SOCKET_FAMILY_IPV4" "2")
+    '("ipv6" "G_SOCKET_FAMILY_IPV6" "10")
   )
 )
 
-;; Original typedef:
-;; typedef enum {
-;;   G_TLS_CERTIFICATE_UNKNOWN_CA    = (1 << 0),
-;;   G_TLS_CERTIFICATE_BAD_IDENTITY  = (1 << 1),
-;;   G_TLS_CERTIFICATE_NOT_ACTIVATED = (1 << 2),
-;;   G_TLS_CERTIFICATE_EXPIRED       = (1 << 3),
-;;   G_TLS_CERTIFICATE_REVOKED       = (1 << 4),
-;;   G_TLS_CERTIFICATE_INSECURE      = (1 << 5),
-;;   G_TLS_CERTIFICATE_GENERIC_ERROR = (1 << 6),
-;; 
-;;   G_TLS_CERTIFICATE_VALIDATE_ALL  = 0x007f
-;; } GTlsCertificateFlags;
-
-(define-flags-extended TlsCertificateFlags
+(define-flags-extended SocketMsgFlags
   (in-module "G")
-  (c-name "GTlsCertificateFlags")
+  (c-name "GSocketMsgFlags")
   (values
-    '("unknown-ca" "G_TLS_CERTIFICATE_UNKNOWN_CA" "(1 << 0)")
-    '("bad-identity" "G_TLS_CERTIFICATE_BAD_IDENTITY" "(1 << 1)")
-    '("not-activated" "G_TLS_CERTIFICATE_NOT_ACTIVATED" "(1 << 2)")
-    '("expired" "G_TLS_CERTIFICATE_EXPIRED" "(1 << 3)")
-    '("revoked" "G_TLS_CERTIFICATE_REVOKED" "(1 << 4)")
-    '("insecure" "G_TLS_CERTIFICATE_INSECURE" "(1 << 5)")
-    '("generic-error" "G_TLS_CERTIFICATE_GENERIC_ERROR" "(1 << 6)")
-    '("validate-all" "G_TLS_CERTIFICATE_VALIDATE_ALL" "0x007f")
+    '("none" "G_SOCKET_MSG_NONE" "0")
+    '("oob" "G_SOCKET_MSG_OOB" "1")
+    '("peek" "G_SOCKET_MSG_PEEK" "2")
+    '("dontroute" "G_SOCKET_MSG_DONTROUTE" "4")
   )
 )
 
-;; Original typedef:
-;; typedef enum {
-;;   G_TLS_AUTHENTICATION_NONE,
-;;   G_TLS_AUTHENTICATION_REQUESTED,
-;;   G_TLS_AUTHENTICATION_REQUIRED
-;; } GTlsAuthenticationMode;
-
-(define-enum-extended TlsAuthenticationMode
+(define-enum-extended SocketProtocol
   (in-module "G")
-  (c-name "GTlsAuthenticationMode")
+  (c-name "GSocketProtocol")
   (values
-    '("none" "G_TLS_AUTHENTICATION_NONE" "0")
-    '("requested" "G_TLS_AUTHENTICATION_REQUESTED" "1")
-    '("required" "G_TLS_AUTHENTICATION_REQUIRED" "2")
+    '("unknown" "G_SOCKET_PROTOCOL_UNKNOWN" "-1")
+    '("default" "G_SOCKET_PROTOCOL_DEFAULT" "0")
+    '("tcp" "G_SOCKET_PROTOCOL_TCP" "6")
+    '("udp" "G_SOCKET_PROTOCOL_UDP" "17")
+    '("sctp" "G_SOCKET_PROTOCOL_SCTP" "132")
   )
 )
 
-;; Original typedef:
-;; typedef enum {
-;;   G_TLS_REHANDSHAKE_NEVER,
-;;   G_TLS_REHANDSHAKE_SAFELY,
-;;   G_TLS_REHANDSHAKE_UNSAFELY
-;; } GTlsRehandshakeMode;
-
-(define-enum-extended TlsRehandshakeMode
+(define-enum-extended SocketType
   (in-module "G")
-  (c-name "GTlsRehandshakeMode")
+  (c-name "GSocketType")
   (values
-    '("never" "G_TLS_REHANDSHAKE_NEVER" "0")
-    '("safely" "G_TLS_REHANDSHAKE_SAFELY" "1")
-    '("unsafely" "G_TLS_REHANDSHAKE_UNSAFELY" "2")
+    '("invalid" "G_SOCKET_TYPE_INVALID" "0")
+    '("stream" "G_SOCKET_TYPE_STREAM" "1")
+    '("datagram" "G_SOCKET_TYPE_DATAGRAM" "2")
+    '("seqpacket" "G_SOCKET_TYPE_SEQPACKET" "3")
   )
 )
 
-;; Original typedef:
-;; typedef enum _GTlsPasswordFlags
-;; {
-;;   G_TLS_PASSWORD_NONE = 0,
-;;   G_TLS_PASSWORD_RETRY = 1 << 1,
-;;   G_TLS_PASSWORD_MANY_TRIES = 1 << 2,
-;;   G_TLS_PASSWORD_FINAL_TRY = 1 << 3
-;; } GTlsPasswordFlags;
-
-(define-flags-extended TlsPasswordFlags
+(define-flags-extended SubprocessFlags
   (in-module "G")
-  (c-name "GTlsPasswordFlags")
+  (c-name "GSubprocessFlags")
   (values
-    '("none" "G_TLS_PASSWORD_NONE" "0x0")
-    '("retry" "G_TLS_PASSWORD_RETRY" "1 << 1")
-    '("many-tries" "G_TLS_PASSWORD_MANY_TRIES" "1 << 2")
-    '("final-try" "G_TLS_PASSWORD_FINAL_TRY" "1 << 3")
+    '("none" "G_SUBPROCESS_FLAGS_NONE" "0")
+    '("stdin_pipe" "G_SUBPROCESS_FLAGS_STDIN_PIPE" "1")
+    '("stdin_inherit" "G_SUBPROCESS_FLAGS_STDIN_INHERIT" "2")
+    '("stdout_pipe" "G_SUBPROCESS_FLAGS_STDOUT_PIPE" "4")
+    '("stdout_silence" "G_SUBPROCESS_FLAGS_STDOUT_SILENCE" "8")
+    '("stderr_pipe" "G_SUBPROCESS_FLAGS_STDERR_PIPE" "16")
+    '("stderr_silence" "G_SUBPROCESS_FLAGS_STDERR_SILENCE" "32")
+    '("stderr_merge" "G_SUBPROCESS_FLAGS_STDERR_MERGE" "64")
+    '("inherit_fds" "G_SUBPROCESS_FLAGS_INHERIT_FDS" "128")
   )
 )
 
-;; Original typedef:
-;; typedef enum {
-;;   G_TLS_INTERACTION_UNHANDLED,
-;;   G_TLS_INTERACTION_HANDLED,
-;;   G_TLS_INTERACTION_FAILED
-;; } GTlsInteractionResult;
-
-(define-enum-extended TlsInteractionResult
+(define-flags-extended TestDBusFlags
   (in-module "G")
-  (c-name "GTlsInteractionResult")
+  (c-name "GTestDBusFlags")
   (values
-    '("unhandled" "G_TLS_INTERACTION_UNHANDLED" "0")
-    '("handled" "G_TLS_INTERACTION_HANDLED" "1")
-    '("failed" "G_TLS_INTERACTION_FAILED" "2")
+    '("none" "G_TEST_DBUS_NONE" "0")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   G_DBUS_INTERFACE_SKELETON_FLAGS_NONE = 0,
-;;   G_DBUS_INTERFACE_SKELETON_FLAGS_HANDLE_METHOD_INVOCATIONS_IN_THREAD = (1<<0)
-;; } GDBusInterfaceSkeletonFlags;
-
-(define-flags-extended DBusInterfaceSkeletonFlags
+(define-enum-extended TlsAuthenticationMode
   (in-module "G")
-  (c-name "GDBusInterfaceSkeletonFlags")
+  (c-name "GTlsAuthenticationMode")
   (values
-    '("none" "G_DBUS_INTERFACE_SKELETON_FLAGS_NONE" "0x0")
-    '("handle-method-invocations-in-thread" 
"G_DBUS_INTERFACE_SKELETON_FLAGS_HANDLE_METHOD_INVOCATIONS_IN_THREAD" "(1<<0)")
+    '("none" "G_TLS_AUTHENTICATION_NONE" "0")
+    '("requested" "G_TLS_AUTHENTICATION_REQUESTED" "1")
+    '("required" "G_TLS_AUTHENTICATION_REQUIRED" "2")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   G_DBUS_OBJECT_MANAGER_CLIENT_FLAGS_NONE = 0,
-;;   G_DBUS_OBJECT_MANAGER_CLIENT_FLAGS_DO_NOT_AUTO_START = (1<<0)
-;; } GDBusObjectManagerClientFlags;
-
-(define-flags-extended DBusObjectManagerClientFlags
+(define-flags-extended TlsCertificateFlags
   (in-module "G")
-  (c-name "GDBusObjectManagerClientFlags")
+  (c-name "GTlsCertificateFlags")
   (values
-    '("none" "G_DBUS_OBJECT_MANAGER_CLIENT_FLAGS_NONE" "0x0")
-    '("do-not-auto-start" "G_DBUS_OBJECT_MANAGER_CLIENT_FLAGS_DO_NOT_AUTO_START" "(1<<0)")
+    '("unknown_ca" "G_TLS_CERTIFICATE_UNKNOWN_CA" "1")
+    '("bad_identity" "G_TLS_CERTIFICATE_BAD_IDENTITY" "2")
+    '("not_activated" "G_TLS_CERTIFICATE_NOT_ACTIVATED" "4")
+    '("expired" "G_TLS_CERTIFICATE_EXPIRED" "8")
+    '("revoked" "G_TLS_CERTIFICATE_REVOKED" "16")
+    '("insecure" "G_TLS_CERTIFICATE_INSECURE" "32")
+    '("generic_error" "G_TLS_CERTIFICATE_GENERIC_ERROR" "64")
+    '("validate_all" "G_TLS_CERTIFICATE_VALIDATE_ALL" "127")
   )
 )
 
-;; Original typedef:
-;; typedef enum /*< flags >*/ {
-;;   G_TLS_DATABASE_VERIFY_NONE = 0
-;; } GTlsDatabaseVerifyFlags;
-
-(define-flags-extended TlsDatabaseVerifyFlags
+(define-flags-extended TlsCertificateRequestFlags
   (in-module "G")
-  (c-name "GTlsDatabaseVerifyFlags")
+  (c-name "GTlsCertificateRequestFlags")
   (values
-    '("none" "G_TLS_DATABASE_VERIFY_NONE" "0x0")
+    '("none" "G_TLS_CERTIFICATE_REQUEST_NONE" "0")
   )
 )
 
-;; Original typedef:
-;; typedef enum {
-;;   G_TLS_DATABASE_LOOKUP_NONE = 0,
-;;   G_TLS_DATABASE_LOOKUP_KEYPAIR = 1
-;; } GTlsDatabaseLookupFlags;
-
 (define-flags-extended TlsDatabaseLookupFlags
   (in-module "G")
   (c-name "GTlsDatabaseLookupFlags")
   (values
-    '("none" "G_TLS_DATABASE_LOOKUP_NONE" "0x0")
-    '("keypair" "G_TLS_DATABASE_LOOKUP_KEYPAIR" "0x1")
+    '("none" "G_TLS_DATABASE_LOOKUP_NONE" "0")
+    '("keypair" "G_TLS_DATABASE_LOOKUP_KEYPAIR" "1")
   )
 )
 
-;; Original typedef:
-;; typedef enum {
-;;   G_TLS_CERTIFICATE_REQUEST_NONE = 0
-;; } GTlsCertificateRequestFlags;
-
-(define-flags-extended TlsCertificateRequestFlags
+(define-flags-extended TlsDatabaseVerifyFlags
   (in-module "G")
-  (c-name "GTlsCertificateRequestFlags")
+  (c-name "GTlsDatabaseVerifyFlags")
   (values
-    '("none" "G_TLS_CERTIFICATE_REQUEST_NONE" "0x0")
+    '("none" "G_TLS_DATABASE_VERIFY_NONE" "0")
   )
 )
 
-;; Original typedef:
-;; typedef enum {
-;;   G_IO_MODULE_SCOPE_NONE,
-;;   G_IO_MODULE_SCOPE_BLOCK_DUPLICATES
-;; } GIOModuleScopeFlags;
-
-(define-flags-extended IOModuleScopeFlags
+(define-enum-extended TlsError
   (in-module "G")
-  (c-name "GIOModuleScopeFlags")
+  (c-name "GTlsError")
   (values
-    '("none" "G_IO_MODULE_SCOPE_NONE" "0x0")
-    '("block-duplicates" "G_IO_MODULE_SCOPE_BLOCK_DUPLICATES" "0x1")
+    '("unavailable" "G_TLS_ERROR_UNAVAILABLE" "0")
+    '("misc" "G_TLS_ERROR_MISC" "1")
+    '("bad_certificate" "G_TLS_ERROR_BAD_CERTIFICATE" "2")
+    '("not_tls" "G_TLS_ERROR_NOT_TLS" "3")
+    '("handshake" "G_TLS_ERROR_HANDSHAKE" "4")
+    '("certificate_required" "G_TLS_ERROR_CERTIFICATE_REQUIRED" "5")
+    '("eof" "G_TLS_ERROR_EOF" "6")
   )
 )
 
-;; Original typedef:
-;; typedef enum {
-;;   G_SOCKET_CLIENT_RESOLVING,
-;;   G_SOCKET_CLIENT_RESOLVED,
-;;   G_SOCKET_CLIENT_CONNECTING,
-;;   G_SOCKET_CLIENT_CONNECTED,
-;;   G_SOCKET_CLIENT_PROXY_NEGOTIATING,
-;;   G_SOCKET_CLIENT_PROXY_NEGOTIATED,
-;;   G_SOCKET_CLIENT_TLS_HANDSHAKING,
-;;   G_SOCKET_CLIENT_TLS_HANDSHAKED,
-;;   G_SOCKET_CLIENT_COMPLETE
-;; } GSocketClientEvent;
-
-(define-enum-extended SocketClientEvent
+(define-enum-extended TlsInteractionResult
   (in-module "G")
-  (c-name "GSocketClientEvent")
+  (c-name "GTlsInteractionResult")
   (values
-    '("resolving" "G_SOCKET_CLIENT_RESOLVING" "0")
-    '("resolved" "G_SOCKET_CLIENT_RESOLVED" "1")
-    '("connecting" "G_SOCKET_CLIENT_CONNECTING" "2")
-    '("connected" "G_SOCKET_CLIENT_CONNECTED" "3")
-    '("proxy-negotiating" "G_SOCKET_CLIENT_PROXY_NEGOTIATING" "4")
-    '("proxy-negotiated" "G_SOCKET_CLIENT_PROXY_NEGOTIATED" "5")
-    '("tls-handshaking" "G_SOCKET_CLIENT_TLS_HANDSHAKING" "6")
-    '("tls-handshaked" "G_SOCKET_CLIENT_TLS_HANDSHAKED" "7")
-    '("complete" "G_SOCKET_CLIENT_COMPLETE" "8")
+    '("unhandled" "G_TLS_INTERACTION_UNHANDLED" "0")
+    '("handled" "G_TLS_INTERACTION_HANDLED" "1")
+    '("failed" "G_TLS_INTERACTION_FAILED" "2")
   )
 )
 
-;; Original typedef:
-;; typedef enum /*< flags >*/ {
-;;   G_TEST_DBUS_NONE = 0
-;; } GTestDBusFlags;
-
-(define-flags-extended TestDBusFlags
+(define-flags-extended TlsPasswordFlags
   (in-module "G")
-  (c-name "GTestDBusFlags")
+  (c-name "GTlsPasswordFlags")
   (values
-    '("us-none" "G_TEST_DBUS_NONE" "0x0")
+    '("none" "G_TLS_PASSWORD_NONE" "0")
+    '("retry" "G_TLS_PASSWORD_RETRY" "2")
+    '("many_tries" "G_TLS_PASSWORD_MANY_TRIES" "4")
+    '("final_try" "G_TLS_PASSWORD_FINAL_TRY" "8")
   )
 )
 
-;; Original typedef:
-;; typedef enum {
-;;   G_SUBPROCESS_FLAGS_NONE                  = 0,
-;;   G_SUBPROCESS_FLAGS_STDIN_PIPE            = (1u << 0),
-;;   G_SUBPROCESS_FLAGS_STDIN_INHERIT         = (1u << 1),
-;;   G_SUBPROCESS_FLAGS_STDOUT_PIPE           = (1u << 2),
-;;   G_SUBPROCESS_FLAGS_STDOUT_SILENCE        = (1u << 3),
-;;   G_SUBPROCESS_FLAGS_STDERR_PIPE           = (1u << 4),
-;;   G_SUBPROCESS_FLAGS_STDERR_SILENCE        = (1u << 5),
-;;   G_SUBPROCESS_FLAGS_STDERR_MERGE          = (1u << 6),
-;;   G_SUBPROCESS_FLAGS_INHERIT_FDS           = (1u << 7)
-;; } GSubprocessFlags;
-
-(define-flags-extended SubprocessFlags
+(define-enum-extended TlsRehandshakeMode
   (in-module "G")
-  (c-name "GSubprocessFlags")
+  (c-name "GTlsRehandshakeMode")
   (values
-    '("none" "G_SUBPROCESS_FLAGS_NONE" "0x0")
+    '("never" "G_TLS_REHANDSHAKE_NEVER" "0")
+    '("safely" "G_TLS_REHANDSHAKE_SAFELY" "1")
+    '("unsafely" "G_TLS_REHANDSHAKE_UNSAFELY" "2")
   )
 )
 
-;; Original typedef:
-;; typedef enum {
-;;   G_NOTIFICATION_PRIORITY_NORMAL,
-;;   G_NOTIFICATION_PRIORITY_LOW,
-;;   G_NOTIFICATION_PRIORITY_HIGH,
-;;   G_NOTIFICATION_PRIORITY_URGENT
-;; } GNotificationPriority;
-
-(define-enum-extended NotificationPriority
+(define-enum-extended UnixSocketAddressType
   (in-module "G")
-  (c-name "GNotificationPriority")
+  (c-name "GUnixSocketAddressType")
   (values
-    '("normal" "G_NOTIFICATION_PRIORITY_NORMAL" "0")
-    '("low" "G_NOTIFICATION_PRIORITY_LOW" "1")
-    '("high" "G_NOTIFICATION_PRIORITY_HIGH" "2")
-    '("urgent" "G_NOTIFICATION_PRIORITY_URGENT" "3")
+    '("invalid" "G_UNIX_SOCKET_ADDRESS_INVALID" "0")
+    '("anonymous" "G_UNIX_SOCKET_ADDRESS_ANONYMOUS" "1")
+    '("path" "G_UNIX_SOCKET_ADDRESS_PATH" "2")
+    '("abstract" "G_UNIX_SOCKET_ADDRESS_ABSTRACT" "3")
+    '("abstract_padded" "G_UNIX_SOCKET_ADDRESS_ABSTRACT_PADDED" "4")
   )
 )
 
-;; From gsettings.h
-
-;; Original typedef:
-;; typedef enum
-;; {
-;;   G_SETTINGS_BIND_DEFAULT,
-;;   G_SETTINGS_BIND_GET            = (1<<0),
-;;   G_SETTINGS_BIND_SET            = (1<<1),
-;;   G_SETTINGS_BIND_NO_SENSITIVITY = (1<<2),
-;;   G_SETTINGS_BIND_GET_NO_CHANGES = (1<<3),
-;;   G_SETTINGS_BIND_INVERT_BOOLEAN = (1<<4)
-;; } GSettingsBindFlags;
-
-(define-flags-extended SettingsBindFlags
+(define-enum-extended ZlibCompressorFormat
   (in-module "G")
-  (c-name "GSettingsBindFlags")
+  (c-name "GZlibCompressorFormat")
   (values
-    '("default" "G_SETTINGS_BIND_DEFAULT" "0x0")
-    '("get" "G_SETTINGS_BIND_GET" "(1<<0)")
-    '("set" "G_SETTINGS_BIND_SET" "(1<<1)")
-    '("no-sensitivity" "G_SETTINGS_BIND_NO_SENSITIVITY" "(1<<2)")
-    '("get-no-changes" "G_SETTINGS_BIND_GET_NO_CHANGES" "(1<<3)")
-    '("invert-boolean" "G_SETTINGS_BIND_INVERT_BOOLEAN" "(1<<4)")
+    '("zlib" "G_ZLIB_COMPRESSOR_FORMAT_ZLIB" "0")
+    '("gzip" "G_ZLIB_COMPRESSOR_FORMAT_GZIP" "1")
+    '("raw" "G_ZLIB_COMPRESSOR_FORMAT_RAW" "2")
   )
 )
 
diff --git a/glib/src/glib_enums.defs b/glib/src/glib_enums.defs
index 2630247..8b6851d 100644
--- a/glib/src/glib_enums.defs
+++ b/glib/src/glib_enums.defs
@@ -1,61 +1,36 @@
-;; 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
+(define-enum-extended AsciiType
   (in-module "G")
-  (c-name "GBookmarkFileError")
+  (c-name "GAsciiType")
   (values
-    '("invalid-uri" "G_BOOKMARK_FILE_ERROR_INVALID_URI" "0")
-    '("invalid-value" "G_BOOKMARK_FILE_ERROR_INVALID_VALUE" "1")
-    '("app-not-registered" "G_BOOKMARK_FILE_ERROR_APP_NOT_REGISTERED" "2")
-    '("uri-not-found" "G_BOOKMARK_FILE_ERROR_URI_NOT_FOUND" "3")
-    '("read" "G_BOOKMARK_FILE_ERROR_READ" "4")
-    '("unknown-encoding" "G_BOOKMARK_FILE_ERROR_UNKNOWN_ENCODING" "5")
-    '("write" "G_BOOKMARK_FILE_ERROR_WRITE" "6")
-    '("file-not-found" "G_BOOKMARK_FILE_ERROR_FILE_NOT_FOUND" "7")
+    '("alnum" "G_ASCII_ALNUM" "1")
+    '("alpha" "G_ASCII_ALPHA" "2")
+    '("cntrl" "G_ASCII_CNTRL" "4")
+    '("digit" "G_ASCII_DIGIT" "8")
+    '("graph" "G_ASCII_GRAPH" "16")
+    '("lower" "G_ASCII_LOWER" "32")
+    '("print" "G_ASCII_PRINT" "64")
+    '("punct" "G_ASCII_PUNCT" "128")
+    '("space" "G_ASCII_SPACE" "256")
+    '("upper" "G_ASCII_UPPER" "512")
+    '("xdigit" "G_ASCII_XDIGIT" "1024")
   )
 )
 
-;; 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
+(define-enum-extended BookmarkFileError
   (in-module "G")
-  (c-name "GBSearchArrayFlags")
+  (c-name "GBookmarkFileError")
   (values
-    '("align-power2" "G_BSEARCH_ARRAY_ALIGN_POWER2" "1 << 0")
-    '("auto-shrink" "G_BSEARCH_ARRAY_AUTO_SHRINK" "1 << 1")
+    '("invalid_uri" "G_BOOKMARK_FILE_ERROR_INVALID_URI" "0")
+    '("invalid_value" "G_BOOKMARK_FILE_ERROR_INVALID_VALUE" "1")
+    '("app_not_registered" "G_BOOKMARK_FILE_ERROR_APP_NOT_REGISTERED" "2")
+    '("uri_not_found" "G_BOOKMARK_FILE_ERROR_URI_NOT_FOUND" "3")
+    '("read" "G_BOOKMARK_FILE_ERROR_READ" "4")
+    '("unknown_encoding" "G_BOOKMARK_FILE_ERROR_UNKNOWN_ENCODING" "5")
+    '("write" "G_BOOKMARK_FILE_ERROR_WRITE" "6")
+    '("file_not_found" "G_BOOKMARK_FILE_ERROR_FILE_NOT_FOUND" "7")
   )
 )
 
-;; From gchecksum.h
-
-;; Original typedef:
-;; typedef enum {
-;;   G_CHECKSUM_MD5,
-;;   G_CHECKSUM_SHA1,
-;;   G_CHECKSUM_SHA256,
-;;   G_CHECKSUM_SHA512
-;; } GChecksumType;
-
 (define-enum-extended ChecksumType
   (in-module "G")
   (c-name "GChecksumType")
@@ -67,44 +42,20 @@
   )
 )
 
-;; 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,
-;;   G_CONVERT_ERROR_NO_MEMORY
-;; } GConvertError;
-
 (define-enum-extended ConvertError
   (in-module "G")
   (c-name "GConvertError")
   (values
-    '("no-conversion" "G_CONVERT_ERROR_NO_CONVERSION" "0")
-    '("illegal-sequence" "G_CONVERT_ERROR_ILLEGAL_SEQUENCE" "1")
+    '("no_conversion" "G_CONVERT_ERROR_NO_CONVERSION" "0")
+    '("illegal_sequence" "G_CONVERT_ERROR_ILLEGAL_SEQUENCE" "1")
     '("failed" "G_CONVERT_ERROR_FAILED" "2")
-    '("partial-input" "G_CONVERT_ERROR_PARTIAL_INPUT" "3")
-    '("bad-uri" "G_CONVERT_ERROR_BAD_URI" "4")
-    '("not-absolute-path" "G_CONVERT_ERROR_NOT_ABSOLUTE_PATH" "5")
-    '("no-memory" "G_CONVERT_ERROR_NO_MEMORY" "6")
+    '("partial_input" "G_CONVERT_ERROR_PARTIAL_INPUT" "3")
+    '("bad_uri" "G_CONVERT_ERROR_BAD_URI" "4")
+    '("not_absolute_path" "G_CONVERT_ERROR_NOT_ABSOLUTE_PATH" "5")
+    '("no_memory" "G_CONVERT_ERROR_NO_MEMORY" "6")
   )
 )
 
-;; 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")
@@ -115,57 +66,11 @@
   )
 )
 
-;; 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")
-  (values
-    '("bad-weekday" "G_DATE_BAD_WEEKDAY" "0")
-    '("monday" "G_DATE_MONDAY" "1")
-    '("tuesday" "G_DATE_TUESDAY" "2")
-    '("wednesday" "G_DATE_WEDNESDAY" "3")
-    '("thursday" "G_DATE_THURSDAY" "4")
-    '("friday" "G_DATE_FRIDAY" "5")
-    '("saturday" "G_DATE_SATURDAY" "6")
-    '("sunday" "G_DATE_SUNDAY" "7")
-  )
-)
-
-;; 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")
   (values
-    '("bad-month" "G_DATE_BAD_MONTH" "0")
+    '("bad_month" "G_DATE_BAD_MONTH" "0")
     '("january" "G_DATE_JANUARY" "1")
     '("february" "G_DATE_FEBRUARY" "2")
     '("march" "G_DATE_MARCH" "3")
@@ -181,37 +86,35 @@
   )
 )
 
-;; From gfileutils.h
+(define-enum-extended DateWeekday
+  (in-module "G")
+  (c-name "GDateWeekday")
+  (values
+    '("bad_weekday" "G_DATE_BAD_WEEKDAY" "0")
+    '("monday" "G_DATE_MONDAY" "1")
+    '("tuesday" "G_DATE_TUESDAY" "2")
+    '("wednesday" "G_DATE_WEDNESDAY" "3")
+    '("thursday" "G_DATE_THURSDAY" "4")
+    '("friday" "G_DATE_FRIDAY" "5")
+    '("saturday" "G_DATE_SATURDAY" "6")
+    '("sunday" "G_DATE_SUNDAY" "7")
+  )
+)
 
-;; 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 ErrorType
+  (in-module "G")
+  (c-name "GErrorType")
+  (values
+    '("unknown" "G_ERR_UNKNOWN" "0")
+    '("unexp_eof" "G_ERR_UNEXP_EOF" "1")
+    '("unexp_eof_in_string" "G_ERR_UNEXP_EOF_IN_STRING" "2")
+    '("unexp_eof_in_comment" "G_ERR_UNEXP_EOF_IN_COMMENT" "3")
+    '("non_digit_in_const" "G_ERR_NON_DIGIT_IN_CONST" "4")
+    '("digit_radix" "G_ERR_DIGIT_RADIX" "5")
+    '("float_radix" "G_ERR_FLOAT_RADIX" "6")
+    '("float_malformed" "G_ERR_FLOAT_MALFORMED" "7")
+  )
+)
 
 (define-enum-extended FileError
   (in-module "G")
@@ -245,86 +148,38 @@
   )
 )
 
-;; 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
+(define-enum-extended FileTest
   (in-module "G")
   (c-name "GFileTest")
   (values
-    '("is-regular" "G_FILE_TEST_IS_REGULAR" "1 << 0")
-    '("is-symlink" "G_FILE_TEST_IS_SYMLINK" "1 << 1")
-    '("is-dir" "G_FILE_TEST_IS_DIR" "1 << 2")
-    '("is-executable" "G_FILE_TEST_IS_EXECUTABLE" "1 << 3")
-    '("exists" "G_FILE_TEST_EXISTS" "1 << 4")
+    '("is_regular" "G_FILE_TEST_IS_REGULAR" "1")
+    '("is_symlink" "G_FILE_TEST_IS_SYMLINK" "2")
+    '("is_dir" "G_FILE_TEST_IS_DIR" "4")
+    '("is_executable" "G_FILE_TEST_IS_EXECUTABLE" "8")
+    '("exists" "G_FILE_TEST_EXISTS" "16")
   )
 )
 
-;; 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
+(define-flags-extended FormatSizeFlags
   (in-module "G")
-  (c-name "GHookFlagMask")
+  (c-name "GFormatSizeFlags")
   (values
-    '("active" "G_HOOK_FLAG_ACTIVE" "1 << 0")
-    '("in-call" "G_HOOK_FLAG_IN_CALL" "1 << 1")
-    '("mask" "G_HOOK_FLAG_MASK" "0x0f")
+    '("default" "G_FORMAT_SIZE_DEFAULT" "0")
+    '("long_format" "G_FORMAT_SIZE_LONG_FORMAT" "1")
+    '("iec_units" "G_FORMAT_SIZE_IEC_UNITS" "2")
   )
 )
 
-;; 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
+(define-enum-extended HookFlagMask
   (in-module "G")
-  (c-name "GIOError")
+  (c-name "GHookFlagMask")
   (values
-    '("none" "G_IO_ERROR_NONE" "0")
-    '("again" "G_IO_ERROR_AGAIN" "1")
-    '("inval" "G_IO_ERROR_INVAL" "2")
-    '("unknown" "G_IO_ERROR_UNKNOWN" "3")
+    '("active" "G_HOOK_FLAG_ACTIVE" "1")
+    '("in_call" "G_HOOK_FLAG_IN_CALL" "2")
+    '("mask" "G_HOOK_FLAG_MASK" "15")
   )
 )
 
-;; 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")
@@ -341,354 +196,159 @@
   )
 )
 
-;; 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
+(define-enum-extended IOCondition
   (in-module "G")
-  (c-name "GIOStatus")
+  (c-name "GIOCondition")
   (values
-    '("error" "G_IO_STATUS_ERROR" "0")
-    '("normal" "G_IO_STATUS_NORMAL" "1")
-    '("eof" "G_IO_STATUS_EOF" "2")
-    '("again" "G_IO_STATUS_AGAIN" "3")
+    '("in" "G_IO_IN" "1")
+    '("out" "G_IO_OUT" "4")
+    '("pri" "G_IO_PRI" "2")
+    '("err" "G_IO_ERR" "8")
+    '("hup" "G_IO_HUP" "16")
+    '("nval" "G_IO_NVAL" "32")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   G_SEEK_CUR,
-;;   G_SEEK_SET,
-;;   G_SEEK_END
-;; } GSeekType;
-
-(define-enum-extended SeekType
+(define-enum-extended IOError
   (in-module "G")
-  (c-name "GSeekType")
+  (c-name "GIOError")
   (values
-    '("cur" "G_SEEK_CUR" "0")
-    '("set" "G_SEEK_SET" "1")
-    '("end" "G_SEEK_END" "2")
+    '("none" "G_IO_ERROR_NONE" "0")
+    '("again" "G_IO_ERROR_AGAIN" "1")
+    '("inval" "G_IO_ERROR_INVAL" "2")
+    '("unknown" "G_IO_ERROR_UNKNOWN" "3")
   )
 )
 
-;; 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_WRITABLE = 1 << 3,   /* Read only flag */
-;;   G_IO_FLAG_IS_WRITEABLE = 1 << 3,      /* Misspelling in 2.29.10 and earlier */
-;;   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")
   (values
-    '("append" "G_IO_FLAG_APPEND" "1 << 0")
-    '("nonblock" "G_IO_FLAG_NONBLOCK" "1 << 1")
-    '("is-readable" "G_IO_FLAG_IS_READABLE" "1 << 2")
-    '("is-writable" "G_IO_FLAG_IS_WRITABLE" "1 << 3")
-    '("is-writeable" "G_IO_FLAG_IS_WRITEABLE" "1 << 3")
-    '("is-seekable" "G_IO_FLAG_IS_SEEKABLE" "1 << 4")
-    '("mask" "G_IO_FLAG_MASK" "(1 << 5) - 1")
-    '("get-mask" "G_IO_FLAG_GET_MASK" "0x1F")
-    '("set-mask" "G_IO_FLAG_SET_MASK" "0x3")
+    '("append" "G_IO_FLAG_APPEND" "1")
+    '("nonblock" "G_IO_FLAG_NONBLOCK" "2")
+    '("is_readable" "G_IO_FLAG_IS_READABLE" "4")
+    '("is_writable" "G_IO_FLAG_IS_WRITABLE" "8")
+    '("is_writeable" "G_IO_FLAG_IS_WRITEABLE" "8")
+    '("is_seekable" "G_IO_FLAG_IS_SEEKABLE" "16")
+    '("mask" "G_IO_FLAG_MASK" "31")
+    '("get_mask" "G_IO_FLAG_GET_MASK" "31")
+    '("set_mask" "G_IO_FLAG_SET_MASK" "3")
   )
 )
 
-;; 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 IOStatus
+  (in-module "G")
+  (c-name "GIOStatus")
+  (values
+    '("error" "G_IO_STATUS_ERROR" "0")
+    '("normal" "G_IO_STATUS_NORMAL" "1")
+    '("eof" "G_IO_STATUS_EOF" "2")
+    '("again" "G_IO_STATUS_AGAIN" "3")
+  )
+)
 
 (define-enum-extended KeyFileError
   (in-module "G")
   (c-name "GKeyFileError")
   (values
-    '("unknown-encoding" "G_KEY_FILE_ERROR_UNKNOWN_ENCODING" "0")
+    '("unknown_encoding" "G_KEY_FILE_ERROR_UNKNOWN_ENCODING" "0")
     '("parse" "G_KEY_FILE_ERROR_PARSE" "1")
-    '("not-found" "G_KEY_FILE_ERROR_NOT_FOUND" "2")
-    '("key-not-found" "G_KEY_FILE_ERROR_KEY_NOT_FOUND" "3")
-    '("group-not-found" "G_KEY_FILE_ERROR_GROUP_NOT_FOUND" "4")
-    '("invalid-value" "G_KEY_FILE_ERROR_INVALID_VALUE" "5")
+    '("not_found" "G_KEY_FILE_ERROR_NOT_FOUND" "2")
+    '("key_not_found" "G_KEY_FILE_ERROR_KEY_NOT_FOUND" "3")
+    '("group_not_found" "G_KEY_FILE_ERROR_GROUP_NOT_FOUND" "4")
+    '("invalid_value" "G_KEY_FILE_ERROR_INVALID_VALUE" "5")
   )
 )
 
-;; 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" "0x0")
-    '("keep-comments" "G_KEY_FILE_KEEP_COMMENTS" "1 << 0")
-    '("keep-translations" "G_KEY_FILE_KEEP_TRANSLATIONS" "1 << 1")
+    '("none" "G_KEY_FILE_NONE" "0")
+    '("keep_comments" "G_KEY_FILE_KEEP_COMMENTS" "1")
+    '("keep_translations" "G_KEY_FILE_KEEP_TRANSLATIONS" "2")
   )
 )
 
-;; From gmain.h
-
-;; Original typedef:
-;; typedef enum /*< flags >*/
-;; {
-;;   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;
-
-;; We hand-edit these to use the actual enum values,
-;; because the values are actually defines that contain a =,
-;; which is very bizarre.
-;; We would need to include the header anyway,
-;; because we can't just use numeric values.
-;; If you regenerate this .defs file and forget to make this change
-;; then you will see compiler errors like this:
-;; ../glibmm/iochannel.h:154:12: error: expected primary-expression before '=' token
-(define-flags-extended IOCondition
+(define-flags-extended LogLevelFlags
   (in-module "G")
-  (c-name "GIOCondition")
+  (c-name "GLogLevelFlags")
   (values
-    '("in" "G_IO_IN" "G_IO_IN")
-    '("out" "G_IO_OUT" "G_IO_OUT")
-    '("pri" "G_IO_PRI" "G_IO_PRI")
-    '("err" "G_IO_ERR" "G_IO_ERR")
-    '("hup" "G_IO_HUP" "G_IO_HUP")
-    '("nval" "G_IO_NVAL" "G_IO_NVAL")
+    '("flag_recursion" "G_LOG_FLAG_RECURSION" "1")
+    '("flag_fatal" "G_LOG_FLAG_FATAL" "2")
+    '("level_error" "G_LOG_LEVEL_ERROR" "4")
+    '("level_critical" "G_LOG_LEVEL_CRITICAL" "8")
+    '("level_warning" "G_LOG_LEVEL_WARNING" "16")
+    '("level_message" "G_LOG_LEVEL_MESSAGE" "32")
+    '("level_info" "G_LOG_LEVEL_INFO" "64")
+    '("level_debug" "G_LOG_LEVEL_DEBUG" "128")
+    '("level_mask" "G_LOG_LEVEL_MASK" "-4")
   )
 )
 
-;; 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 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" "65536")
+  )
+)
 
 (define-enum-extended MarkupError
   (in-module "G")
   (c-name "GMarkupError")
   (values
-    '("bad-utf8" "G_MARKUP_ERROR_BAD_UTF8" "0")
+    '("bad_utf8" "G_MARKUP_ERROR_BAD_UTF8" "0")
     '("empty" "G_MARKUP_ERROR_EMPTY" "1")
     '("parse" "G_MARKUP_ERROR_PARSE" "2")
-    '("unknown-element" "G_MARKUP_ERROR_UNKNOWN_ELEMENT" "3")
-    '("unknown-attribute" "G_MARKUP_ERROR_UNKNOWN_ATTRIBUTE" "4")
-    '("invalid-content" "G_MARKUP_ERROR_INVALID_CONTENT" "5")
-    '("missing-attribute" "G_MARKUP_ERROR_MISSING_ATTRIBUTE" "6")
+    '("unknown_element" "G_MARKUP_ERROR_UNKNOWN_ELEMENT" "3")
+    '("unknown_attribute" "G_MARKUP_ERROR_UNKNOWN_ATTRIBUTE" "4")
+    '("invalid_content" "G_MARKUP_ERROR_INVALID_CONTENT" "5")
+    '("missing_attribute" "G_MARKUP_ERROR_MISSING_ATTRIBUTE" "6")
   )
 )
 
-;; 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,
-;;   G_MARKUP_IGNORE_QUALIFIED                 = 1 << 3
-;; } GMarkupParseFlags;
-
 (define-flags-extended MarkupParseFlags
   (in-module "G")
   (c-name "GMarkupParseFlags")
   (values
-    '("do-not-use-this-unsupported-flag" "G_MARKUP_DO_NOT_USE_THIS_UNSUPPORTED_FLAG" "1 << 0")
-    '("treat-cdata-as-text" "G_MARKUP_TREAT_CDATA_AS_TEXT" "1 << 1")
-    '("prefix-error-position" "G_MARKUP_PREFIX_ERROR_POSITION" "1 << 2")
-    '("ignore-qualified" "G_MARKUP_IGNORE_QUALIFIED" "1 << 3")
-  )
-)
-
-;; 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" "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")
-  (values
-    '("flag-recursion" "G_LOG_FLAG_RECURSION" "1 << 0")
-    '("flag-fatal" "G_LOG_FLAG_FATAL" "1 << 1")
-    '("level-error" "G_LOG_LEVEL_ERROR" "1 << 2")
-    '("level-critical" "G_LOG_LEVEL_CRITICAL" "1 << 3")
-    '("level-warning" "G_LOG_LEVEL_WARNING" "1 << 4")
-    '("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" "0xFFFFFFFFFFFFFFFC")
+    '("do_not_use_this_unsupported_flag" "G_MARKUP_DO_NOT_USE_THIS_UNSUPPORTED_FLAG" "1")
+    '("treat_cdata_as_text" "G_MARKUP_TREAT_CDATA_AS_TEXT" "2")
+    '("prefix_error_position" "G_MARKUP_PREFIX_ERROR_POSITION" "4")
+    '("ignore_qualified" "G_MARKUP_IGNORE_QUALIFIED" "8")
   )
 )
 
-;; 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" "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
+(define-enum-extended NormalizeMode
   (in-module "G")
-  (c-name "GTraverseType")
+  (c-name "GNormalizeMode")
   (values
-    '("in-order" "G_IN_ORDER" "0")
-    '("pre-order" "G_PRE_ORDER" "1")
-    '("post-order" "G_POST_ORDER" "2")
-    '("level-order" "G_LEVEL_ORDER" "3")
+    '("default" "G_NORMALIZE_DEFAULT" "0")
+    '("nfd" "G_NORMALIZE_NFD" "0")
+    '("default_compose" "G_NORMALIZE_DEFAULT_COMPOSE" "1")
+    '("nfc" "G_NORMALIZE_NFC" "1")
+    '("all" "G_NORMALIZE_ALL" "2")
+    '("nfkd" "G_NORMALIZE_NFKD" "2")
+    '("all_compose" "G_NORMALIZE_ALL_COMPOSE" "3")
+    '("nfkc" "G_NORMALIZE_NFKC" "3")
   )
 )
 
-;; From goption.h
-
-;; Original typedef:
-;; typedef enum
-;; {
-;;   G_OPTION_FLAG_NONE            = 0,
-;;   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
+(define-enum-extended OnceStatus
   (in-module "G")
-  (c-name "GOptionFlags")
+  (c-name "GOnceStatus")
   (values
-    '("none" "G_OPTION_FLAG_NONE" "0x0")
-    '("hidden" "G_OPTION_FLAG_HIDDEN" "1 << 0")
-    '("in-main" "G_OPTION_FLAG_IN_MAIN" "1 << 1")
-    '("reverse" "G_OPTION_FLAG_REVERSE" "1 << 2")
-    '("no-arg" "G_OPTION_FLAG_NO_ARG" "1 << 3")
-    '("filename" "G_OPTION_FLAG_FILENAME" "1 << 4")
-    '("optional-arg" "G_OPTION_FLAG_OPTIONAL_ARG" "1 << 5")
-    '("noalias" "G_OPTION_FLAG_NOALIAS" "1 << 6")
+    '("notcalled" "G_ONCE_STATUS_NOTCALLED" "0")
+    '("progress" "G_ONCE_STATUS_PROGRESS" "1")
+    '("ready" "G_ONCE_STATUS_READY" "2")
   )
 )
 
-;; 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")
@@ -698,428 +358,182 @@
     '("int" "G_OPTION_ARG_INT" "2")
     '("callback" "G_OPTION_ARG_CALLBACK" "3")
     '("filename" "G_OPTION_ARG_FILENAME" "4")
-    '("string-array" "G_OPTION_ARG_STRING_ARRAY" "5")
-    '("filename-array" "G_OPTION_ARG_FILENAME_ARRAY" "6")
+    '("string_array" "G_OPTION_ARG_STRING_ARRAY" "5")
+    '("filename_array" "G_OPTION_ARG_FILENAME_ARRAY" "6")
     '("double" "G_OPTION_ARG_DOUBLE" "7")
     '("int64" "G_OPTION_ARG_INT64" "8")
   )
 )
 
-;; 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")
   (values
-    '("unknown-option" "G_OPTION_ERROR_UNKNOWN_OPTION" "0")
-    '("bad-value" "G_OPTION_ERROR_BAD_VALUE" "1")
+    '("unknown_option" "G_OPTION_ERROR_UNKNOWN_OPTION" "0")
+    '("bad_value" "G_OPTION_ERROR_BAD_VALUE" "1")
     '("failed" "G_OPTION_ERROR_FAILED" "2")
   )
 )
 
-;; 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,
-;;   G_REGEX_ERROR_INVALID_RELATIVE_REFERENCE = 158,
-;;   G_REGEX_ERROR_BACKTRACKING_CONTROL_VERB_ARGUMENT_FORBIDDEN = 159,
-;;   G_REGEX_ERROR_UNKNOWN_BACKTRACKING_CONTROL_VERB  = 160,
-;;   G_REGEX_ERROR_NUMBER_TOO_BIG = 161,
-;;   G_REGEX_ERROR_MISSING_SUBPATTERN_NAME = 162,
-;;   G_REGEX_ERROR_MISSING_DIGIT = 163,
-;;   G_REGEX_ERROR_INVALID_DATA_CHARACTER = 164,
-;;   G_REGEX_ERROR_EXTRA_SUBPATTERN_NAME = 165,
-;;   G_REGEX_ERROR_BACKTRACKING_CONTROL_VERB_ARGUMENT_REQUIRED = 166,
-;;   G_REGEX_ERROR_INVALID_CONTROL_CHAR = 168,
-;;   G_REGEX_ERROR_MISSING_NAME = 169,
-;;   G_REGEX_ERROR_NOT_SUPPORTED_IN_CLASS = 171,
-;;   G_REGEX_ERROR_TOO_MANY_FORWARD_REFERENCES = 172,
-;;   G_REGEX_ERROR_NAME_TOO_LONG = 175,
-;;   G_REGEX_ERROR_CHARACTER_VALUE_TOO_LARGE = 176
-;; } GRegexError;
-
-(define-enum-extended RegexError
+(define-flags-extended OptionFlags
   (in-module "G")
-  (c-name "GRegexError")
+  (c-name "GOptionFlags")
   (values
-    '("compile" "G_REGEX_ERROR_COMPILE" "0")
-    '("optimize" "G_REGEX_ERROR_OPTIMIZE" "1")
-    '("replace" "G_REGEX_ERROR_REPLACE" "2")
-    '("match" "G_REGEX_ERROR_MATCH" "3")
-    '("internal" "G_REGEX_ERROR_INTERNAL" "4")
-    '("stray-backslash" "G_REGEX_ERROR_STRAY_BACKSLASH" "101")
-    '("missing-control-char" "G_REGEX_ERROR_MISSING_CONTROL_CHAR" "102")
-    '("unrecognized-escape" "G_REGEX_ERROR_UNRECOGNIZED_ESCAPE" "103")
-    '("quantifiers-out-of-order" "G_REGEX_ERROR_QUANTIFIERS_OUT_OF_ORDER" "104")
-    '("quantifier-too-big" "G_REGEX_ERROR_QUANTIFIER_TOO_BIG" "105")
-    '("unterminated-character-class" "G_REGEX_ERROR_UNTERMINATED_CHARACTER_CLASS" "106")
-    '("invalid-escape-in-character-class" "G_REGEX_ERROR_INVALID_ESCAPE_IN_CHARACTER_CLASS" "107")
-    '("range-out-of-order" "G_REGEX_ERROR_RANGE_OUT_OF_ORDER" "108")
-    '("nothing-to-repeat" "G_REGEX_ERROR_NOTHING_TO_REPEAT" "109")
-    '("unrecognized-character" "G_REGEX_ERROR_UNRECOGNIZED_CHARACTER" "112")
-    '("posix-named-class-outside-class" "G_REGEX_ERROR_POSIX_NAMED_CLASS_OUTSIDE_CLASS" "113")
-    '("unmatched-parenthesis" "G_REGEX_ERROR_UNMATCHED_PARENTHESIS" "114")
-    '("inexistent-subpattern-reference" "G_REGEX_ERROR_INEXISTENT_SUBPATTERN_REFERENCE" "115")
-    '("unterminated-comment" "G_REGEX_ERROR_UNTERMINATED_COMMENT" "118")
-    '("expression-too-large" "G_REGEX_ERROR_EXPRESSION_TOO_LARGE" "120")
-    '("memory-error" "G_REGEX_ERROR_MEMORY_ERROR" "121")
-    '("variable-length-lookbehind" "G_REGEX_ERROR_VARIABLE_LENGTH_LOOKBEHIND" "125")
-    '("malformed-condition" "G_REGEX_ERROR_MALFORMED_CONDITION" "126")
-    '("too-many-conditional-branches" "G_REGEX_ERROR_TOO_MANY_CONDITIONAL_BRANCHES" "127")
-    '("assertion-expected" "G_REGEX_ERROR_ASSERTION_EXPECTED" "128")
-    '("unknown-posix-class-name" "G_REGEX_ERROR_UNKNOWN_POSIX_CLASS_NAME" "130")
-    '("posix-collating-elements-not-supported" "G_REGEX_ERROR_POSIX_COLLATING_ELEMENTS_NOT_SUPPORTED" "131")
-    '("hex-code-too-large" "G_REGEX_ERROR_HEX_CODE_TOO_LARGE" "134")
-    '("invalid-condition" "G_REGEX_ERROR_INVALID_CONDITION" "135")
-    '("single-byte-match-in-lookbehind" "G_REGEX_ERROR_SINGLE_BYTE_MATCH_IN_LOOKBEHIND" "136")
-    '("infinite-loop" "G_REGEX_ERROR_INFINITE_LOOP" "140")
-    '("missing-subpattern-name-terminator" "G_REGEX_ERROR_MISSING_SUBPATTERN_NAME_TERMINATOR" "142")
-    '("duplicate-subpattern-name" "G_REGEX_ERROR_DUPLICATE_SUBPATTERN_NAME" "143")
-    '("malformed-property" "G_REGEX_ERROR_MALFORMED_PROPERTY" "146")
-    '("unknown-property" "G_REGEX_ERROR_UNKNOWN_PROPERTY" "147")
-    '("subpattern-name-too-long" "G_REGEX_ERROR_SUBPATTERN_NAME_TOO_LONG" "148")
-    '("too-many-subpatterns" "G_REGEX_ERROR_TOO_MANY_SUBPATTERNS" "149")
-    '("invalid-octal-value" "G_REGEX_ERROR_INVALID_OCTAL_VALUE" "151")
-    '("too-many-branches-in-define" "G_REGEX_ERROR_TOO_MANY_BRANCHES_IN_DEFINE" "154")
-    '("define-repetion" "G_REGEX_ERROR_DEFINE_REPETION" "155")
-    '("inconsistent-newline-options" "G_REGEX_ERROR_INCONSISTENT_NEWLINE_OPTIONS" "156")
-    '("missing-back-reference" "G_REGEX_ERROR_MISSING_BACK_REFERENCE" "157")
-    '("invalid-relative-reference" "G_REGEX_ERROR_INVALID_RELATIVE_REFERENCE" "158")
-    '("backtracking-control-verb-argument-forbidden" 
"G_REGEX_ERROR_BACKTRACKING_CONTROL_VERB_ARGUMENT_FORBIDDEN" "159")
-    '("unknown-backtracking-control-verb" "G_REGEX_ERROR_UNKNOWN_BACKTRACKING_CONTROL_VERB" "160")
-    '("number-too-big" "G_REGEX_ERROR_NUMBER_TOO_BIG" "161")
-    '("missing-subpattern-name" "G_REGEX_ERROR_MISSING_SUBPATTERN_NAME" "162")
-    '("missing-digit" "G_REGEX_ERROR_MISSING_DIGIT" "163")
-    '("invalid-data-character" "G_REGEX_ERROR_INVALID_DATA_CHARACTER" "164")
-    '("extra-subpattern-name" "G_REGEX_ERROR_EXTRA_SUBPATTERN_NAME" "165")
-    '("backtracking-control-verb-argument-required" 
"G_REGEX_ERROR_BACKTRACKING_CONTROL_VERB_ARGUMENT_REQUIRED" "166")
-    '("invalid-control-char" "G_REGEX_ERROR_INVALID_CONTROL_CHAR" "168")
-    '("missing-name" "G_REGEX_ERROR_MISSING_NAME" "169")
-    '("not-supported-in-class" "G_REGEX_ERROR_NOT_SUPPORTED_IN_CLASS" "171")
-    '("too-many-forward-references" "G_REGEX_ERROR_TOO_MANY_FORWARD_REFERENCES" "172")
-    '("name-too-long" "G_REGEX_ERROR_NAME_TOO_LONG" "175")
-    '("character-value-too-large" "G_REGEX_ERROR_CHARACTER_VALUE_TOO_LARGE" "176")
+    '("none" "G_OPTION_FLAG_NONE" "0")
+    '("hidden" "G_OPTION_FLAG_HIDDEN" "1")
+    '("in_main" "G_OPTION_FLAG_IN_MAIN" "2")
+    '("reverse" "G_OPTION_FLAG_REVERSE" "4")
+    '("no_arg" "G_OPTION_FLAG_NO_ARG" "8")
+    '("filename" "G_OPTION_FLAG_FILENAME" "16")
+    '("optional_arg" "G_OPTION_FLAG_OPTIONAL_ARG" "32")
+    '("noalias" "G_OPTION_FLAG_NOALIAS" "64")
   )
 )
 
-;; 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_FIRSTLINE         = 1 << 18,
-;;   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,
-;;   G_REGEX_NEWLINE_ANYCRLF   = G_REGEX_NEWLINE_CR | 1 << 22,
-;;   G_REGEX_BSR_ANYCRLF       = 1 << 23,
-;;   G_REGEX_JAVASCRIPT_COMPAT = 1 << 25
-;; } GRegexCompileFlags;
-
 (define-flags-extended RegexCompileFlags
   (in-module "G")
   (c-name "GRegexCompileFlags")
   (values
-    '("caseless" "G_REGEX_CASELESS" "1 << 0")
-    '("multiline" "G_REGEX_MULTILINE" "1 << 1")
-    '("dotall" "G_REGEX_DOTALL" "1 << 2")
-    '("extended" "G_REGEX_EXTENDED" "1 << 3")
-    '("anchored" "G_REGEX_ANCHORED" "1 << 4")
-    '("dollar-endonly" "G_REGEX_DOLLAR_ENDONLY" "1 << 5")
-    '("ungreedy" "G_REGEX_UNGREEDY" "1 << 9")
-    '("raw" "G_REGEX_RAW" "1 << 11")
-    '("no-auto-capture" "G_REGEX_NO_AUTO_CAPTURE" "1 << 12")
-    '("optimize" "G_REGEX_OPTIMIZE" "1 << 13")
-    '("firstline" "G_REGEX_FIRSTLINE" "1 << 18")
-    '("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" "0x300000")
-    '("newline-anycrlf" "G_REGEX_NEWLINE_ANYCRLF" "1048576 | 1 << 22")
-    '("bsr-anycrlf" "G_REGEX_BSR_ANYCRLF" "1 << 23")
-    '("javascript-compat" "G_REGEX_JAVASCRIPT_COMPAT" "1 << 25")
+    '("caseless" "G_REGEX_CASELESS" "1")
+    '("multiline" "G_REGEX_MULTILINE" "2")
+    '("dotall" "G_REGEX_DOTALL" "4")
+    '("extended" "G_REGEX_EXTENDED" "8")
+    '("anchored" "G_REGEX_ANCHORED" "16")
+    '("dollar_endonly" "G_REGEX_DOLLAR_ENDONLY" "32")
+    '("ungreedy" "G_REGEX_UNGREEDY" "512")
+    '("raw" "G_REGEX_RAW" "2048")
+    '("no_auto_capture" "G_REGEX_NO_AUTO_CAPTURE" "4096")
+    '("optimize" "G_REGEX_OPTIMIZE" "8192")
+    '("firstline" "G_REGEX_FIRSTLINE" "262144")
+    '("dupnames" "G_REGEX_DUPNAMES" "524288")
+    '("newline_cr" "G_REGEX_NEWLINE_CR" "1048576")
+    '("newline_lf" "G_REGEX_NEWLINE_LF" "2097152")
+    '("newline_crlf" "G_REGEX_NEWLINE_CRLF" "3145728")
+    '("newline_anycrlf" "G_REGEX_NEWLINE_ANYCRLF" "5242880")
+    '("bsr_anycrlf" "G_REGEX_BSR_ANYCRLF" "8388608")
+    '("javascript_compat" "G_REGEX_JAVASCRIPT_COMPAT" "33554432")
   )
 )
 
-;; 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,
-;;   G_REGEX_MATCH_NEWLINE_ANYCRLF  = G_REGEX_MATCH_NEWLINE_CR | G_REGEX_MATCH_NEWLINE_ANY,
-;;   G_REGEX_MATCH_BSR_ANYCRLF      = 1 << 23,
-;;   G_REGEX_MATCH_BSR_ANY          = 1 << 24,
-;;   G_REGEX_MATCH_PARTIAL_SOFT     = G_REGEX_MATCH_PARTIAL,
-;;   G_REGEX_MATCH_PARTIAL_HARD     = 1 << 27,
-;;   G_REGEX_MATCH_NOTEMPTY_ATSTART = 1 << 28
-;; } GRegexMatchFlags;
-
-(define-flags-extended RegexMatchFlags
+(define-enum-extended RegexError
   (in-module "G")
-  (c-name "GRegexMatchFlags")
+  (c-name "GRegexError")
   (values
-    '("anchored" "G_REGEX_MATCH_ANCHORED" "1 << 4")
-    '("notbol" "G_REGEX_MATCH_NOTBOL" "1 << 7")
-    '("noteol" "G_REGEX_MATCH_NOTEOL" "1 << 8")
-    '("notempty" "G_REGEX_MATCH_NOTEMPTY" "1 << 10")
-    '("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" "0x300000")
-    '("newline-any" "G_REGEX_MATCH_NEWLINE_ANY" "1 << 22")
-    '("newline-anycrlf" "G_REGEX_MATCH_NEWLINE_ANYCRLF" "0x500000")
-    '("bsr-anycrlf" "G_REGEX_MATCH_BSR_ANYCRLF" "1 << 23")
-    '("bsr-any" "G_REGEX_MATCH_BSR_ANY" "1 << 24")
-    '("partial-soft" "G_REGEX_MATCH_PARTIAL_SOFT" "0x8000")
-    '("partial-hard" "G_REGEX_MATCH_PARTIAL_HARD" "1 << 27")
-    '("notempty-atstart" "G_REGEX_MATCH_NOTEMPTY_ATSTART" "1 << 28")
+    '("compile" "G_REGEX_ERROR_COMPILE" "0")
+    '("optimize" "G_REGEX_ERROR_OPTIMIZE" "1")
+    '("replace" "G_REGEX_ERROR_REPLACE" "2")
+    '("match" "G_REGEX_ERROR_MATCH" "3")
+    '("internal" "G_REGEX_ERROR_INTERNAL" "4")
+    '("stray_backslash" "G_REGEX_ERROR_STRAY_BACKSLASH" "101")
+    '("missing_control_char" "G_REGEX_ERROR_MISSING_CONTROL_CHAR" "102")
+    '("unrecognized_escape" "G_REGEX_ERROR_UNRECOGNIZED_ESCAPE" "103")
+    '("quantifiers_out_of_order" "G_REGEX_ERROR_QUANTIFIERS_OUT_OF_ORDER" "104")
+    '("quantifier_too_big" "G_REGEX_ERROR_QUANTIFIER_TOO_BIG" "105")
+    '("unterminated_character_class" "G_REGEX_ERROR_UNTERMINATED_CHARACTER_CLASS" "106")
+    '("invalid_escape_in_character_class" "G_REGEX_ERROR_INVALID_ESCAPE_IN_CHARACTER_CLASS" "107")
+    '("range_out_of_order" "G_REGEX_ERROR_RANGE_OUT_OF_ORDER" "108")
+    '("nothing_to_repeat" "G_REGEX_ERROR_NOTHING_TO_REPEAT" "109")
+    '("unrecognized_character" "G_REGEX_ERROR_UNRECOGNIZED_CHARACTER" "112")
+    '("posix_named_class_outside_class" "G_REGEX_ERROR_POSIX_NAMED_CLASS_OUTSIDE_CLASS" "113")
+    '("unmatched_parenthesis" "G_REGEX_ERROR_UNMATCHED_PARENTHESIS" "114")
+    '("inexistent_subpattern_reference" "G_REGEX_ERROR_INEXISTENT_SUBPATTERN_REFERENCE" "115")
+    '("unterminated_comment" "G_REGEX_ERROR_UNTERMINATED_COMMENT" "118")
+    '("expression_too_large" "G_REGEX_ERROR_EXPRESSION_TOO_LARGE" "120")
+    '("memory_error" "G_REGEX_ERROR_MEMORY_ERROR" "121")
+    '("variable_length_lookbehind" "G_REGEX_ERROR_VARIABLE_LENGTH_LOOKBEHIND" "125")
+    '("malformed_condition" "G_REGEX_ERROR_MALFORMED_CONDITION" "126")
+    '("too_many_conditional_branches" "G_REGEX_ERROR_TOO_MANY_CONDITIONAL_BRANCHES" "127")
+    '("assertion_expected" "G_REGEX_ERROR_ASSERTION_EXPECTED" "128")
+    '("unknown_posix_class_name" "G_REGEX_ERROR_UNKNOWN_POSIX_CLASS_NAME" "130")
+    '("posix_collating_elements_not_supported" "G_REGEX_ERROR_POSIX_COLLATING_ELEMENTS_NOT_SUPPORTED" "131")
+    '("hex_code_too_large" "G_REGEX_ERROR_HEX_CODE_TOO_LARGE" "134")
+    '("invalid_condition" "G_REGEX_ERROR_INVALID_CONDITION" "135")
+    '("single_byte_match_in_lookbehind" "G_REGEX_ERROR_SINGLE_BYTE_MATCH_IN_LOOKBEHIND" "136")
+    '("infinite_loop" "G_REGEX_ERROR_INFINITE_LOOP" "140")
+    '("missing_subpattern_name_terminator" "G_REGEX_ERROR_MISSING_SUBPATTERN_NAME_TERMINATOR" "142")
+    '("duplicate_subpattern_name" "G_REGEX_ERROR_DUPLICATE_SUBPATTERN_NAME" "143")
+    '("malformed_property" "G_REGEX_ERROR_MALFORMED_PROPERTY" "146")
+    '("unknown_property" "G_REGEX_ERROR_UNKNOWN_PROPERTY" "147")
+    '("subpattern_name_too_long" "G_REGEX_ERROR_SUBPATTERN_NAME_TOO_LONG" "148")
+    '("too_many_subpatterns" "G_REGEX_ERROR_TOO_MANY_SUBPATTERNS" "149")
+    '("invalid_octal_value" "G_REGEX_ERROR_INVALID_OCTAL_VALUE" "151")
+    '("too_many_branches_in_define" "G_REGEX_ERROR_TOO_MANY_BRANCHES_IN_DEFINE" "154")
+    '("define_repetion" "G_REGEX_ERROR_DEFINE_REPETION" "155")
+    '("inconsistent_newline_options" "G_REGEX_ERROR_INCONSISTENT_NEWLINE_OPTIONS" "156")
+    '("missing_back_reference" "G_REGEX_ERROR_MISSING_BACK_REFERENCE" "157")
+    '("invalid_relative_reference" "G_REGEX_ERROR_INVALID_RELATIVE_REFERENCE" "158")
+    '("backtracking_control_verb_argument_forbidden" 
"G_REGEX_ERROR_BACKTRACKING_CONTROL_VERB_ARGUMENT_FORBIDDEN" "159")
+    '("unknown_backtracking_control_verb" "G_REGEX_ERROR_UNKNOWN_BACKTRACKING_CONTROL_VERB" "160")
+    '("number_too_big" "G_REGEX_ERROR_NUMBER_TOO_BIG" "161")
+    '("missing_subpattern_name" "G_REGEX_ERROR_MISSING_SUBPATTERN_NAME" "162")
+    '("missing_digit" "G_REGEX_ERROR_MISSING_DIGIT" "163")
+    '("invalid_data_character" "G_REGEX_ERROR_INVALID_DATA_CHARACTER" "164")
+    '("extra_subpattern_name" "G_REGEX_ERROR_EXTRA_SUBPATTERN_NAME" "165")
+    '("backtracking_control_verb_argument_required" 
"G_REGEX_ERROR_BACKTRACKING_CONTROL_VERB_ARGUMENT_REQUIRED" "166")
+    '("invalid_control_char" "G_REGEX_ERROR_INVALID_CONTROL_CHAR" "168")
+    '("missing_name" "G_REGEX_ERROR_MISSING_NAME" "169")
+    '("not_supported_in_class" "G_REGEX_ERROR_NOT_SUPPORTED_IN_CLASS" "171")
+    '("too_many_forward_references" "G_REGEX_ERROR_TOO_MANY_FORWARD_REFERENCES" "172")
+    '("name_too_long" "G_REGEX_ERROR_NAME_TOO_LONG" "175")
+    '("character_value_too_large" "G_REGEX_ERROR_CHARACTER_VALUE_TOO_LARGE" "176")
   )
 )
 
-;; 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
+(define-flags-extended RegexMatchFlags
   (in-module "G")
-  (c-name "GErrorType")
+  (c-name "GRegexMatchFlags")
   (values
-    '("unknown" "G_ERR_UNKNOWN" "0")
-    '("unexp-eof" "G_ERR_UNEXP_EOF" "1")
-    '("unexp-eof-in-string" "G_ERR_UNEXP_EOF_IN_STRING" "2")
-    '("unexp-eof-in-comment" "G_ERR_UNEXP_EOF_IN_COMMENT" "3")
-    '("non-digit-in-const" "G_ERR_NON_DIGIT_IN_CONST" "4")
-    '("digit-radix" "G_ERR_DIGIT_RADIX" "5")
-    '("float-radix" "G_ERR_FLOAT_RADIX" "6")
-    '("float-malformed" "G_ERR_FLOAT_MALFORMED" "7")
+    '("anchored" "G_REGEX_MATCH_ANCHORED" "16")
+    '("notbol" "G_REGEX_MATCH_NOTBOL" "128")
+    '("noteol" "G_REGEX_MATCH_NOTEOL" "256")
+    '("notempty" "G_REGEX_MATCH_NOTEMPTY" "1024")
+    '("partial" "G_REGEX_MATCH_PARTIAL" "32768")
+    '("newline_cr" "G_REGEX_MATCH_NEWLINE_CR" "1048576")
+    '("newline_lf" "G_REGEX_MATCH_NEWLINE_LF" "2097152")
+    '("newline_crlf" "G_REGEX_MATCH_NEWLINE_CRLF" "3145728")
+    '("newline_any" "G_REGEX_MATCH_NEWLINE_ANY" "4194304")
+    '("newline_anycrlf" "G_REGEX_MATCH_NEWLINE_ANYCRLF" "5242880")
+    '("bsr_anycrlf" "G_REGEX_MATCH_BSR_ANYCRLF" "8388608")
+    '("bsr_any" "G_REGEX_MATCH_BSR_ANY" "16777216")
+    '("partial_soft" "G_REGEX_MATCH_PARTIAL_SOFT" "32768")
+    '("partial_hard" "G_REGEX_MATCH_PARTIAL_HARD" "134217728")
+    '("notempty_atstart" "G_REGEX_MATCH_NOTEMPTY_ATSTART" "268435456")
   )
 )
 
-;; 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,
-;; 
-;;   /*< private >*/
-;;   G_TOKEN_LAST
-;; } GTokenType;
-
-(define-enum-extended TokenType
+(define-enum-extended SeekType
   (in-module "G")
-  (c-name "GTokenType")
+  (c-name "GSeekType")
   (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")
+    '("cur" "G_SEEK_CUR" "0")
+    '("set" "G_SEEK_SET" "1")
+    '("end" "G_SEEK_END" "2")
   )
 )
 
-;; 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")
   (values
-    '("bad-quoting" "G_SHELL_ERROR_BAD_QUOTING" "0")
-    '("empty-string" "G_SHELL_ERROR_EMPTY_STRING" "1")
+    '("bad_quoting" "G_SHELL_ERROR_BAD_QUOTING" "0")
+    '("empty_string" "G_SHELL_ERROR_EMPTY_STRING" "1")
     '("failed" "G_SHELL_ERROR_FAILED" "2")
   )
 )
 
-;; 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")
   (values
-    '("always-malloc" "G_SLICE_CONFIG_ALWAYS_MALLOC" "1")
-    '("bypass-magazines" "G_SLICE_CONFIG_BYPASS_MAGAZINES" "2")
-    '("working-set-msecs" "G_SLICE_CONFIG_WORKING_SET_MSECS" "3")
-    '("color-increment" "G_SLICE_CONFIG_COLOR_INCREMENT" "4")
-    '("chunk-sizes" "G_SLICE_CONFIG_CHUNK_SIZES" "5")
-    '("contention-counter" "G_SLICE_CONFIG_CONTENTION_COUNTER" "6")
+    '("always_malloc" "G_SLICE_CONFIG_ALWAYS_MALLOC" "1")
+    '("bypass_magazines" "G_SLICE_CONFIG_BYPASS_MAGAZINES" "2")
+    '("working_set_msecs" "G_SLICE_CONFIG_WORKING_SET_MSECS" "3")
+    '("color_increment" "G_SLICE_CONFIG_COLOR_INCREMENT" "4")
+    '("chunk_sizes" "G_SLICE_CONFIG_CHUNK_SIZES" "5")
+    '("contention_counter" "G_SLICE_CONFIG_CONTENTION_COUNTER" "6")
   )
 )
 
-;; 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_TOO_BIG,/* execv() returned E2BIG */
-;; #ifndef G_DISABLE_DEPRECATED
-;;   G_SPAWN_ERROR_2BIG = G_SPAWN_ERROR_TOO_BIG,
-;; #endif
-;;   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")
@@ -1129,7 +543,7 @@
     '("chdir" "G_SPAWN_ERROR_CHDIR" "2")
     '("acces" "G_SPAWN_ERROR_ACCES" "3")
     '("perm" "G_SPAWN_ERROR_PERM" "4")
-    '("too-big" "G_SPAWN_ERROR_TOO_BIG" "5")
+    '("too_big" "G_SPAWN_ERROR_TOO_BIG" "5")
     '("2big" "G_SPAWN_ERROR_2BIG" "5")
     '("noexec" "G_SPAWN_ERROR_NOEXEC" "6")
     '("nametoolong" "G_SPAWN_ERROR_NAMETOOLONG" "7")
@@ -1148,206 +562,79 @@
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   G_SPAWN_DEFAULT                = 0,
-;;   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,
-;;   G_SPAWN_SEARCH_PATH_FROM_ENVP  = 1 << 7,
-;;   G_SPAWN_CLOEXEC_PIPES          = 1 << 8
-;; } GSpawnFlags;
-
 (define-flags-extended SpawnFlags
   (in-module "G")
   (c-name "GSpawnFlags")
   (values
-    '("default" "G_SPAWN_DEFAULT" "0x0")
-    '("leave-descriptors-open" "G_SPAWN_LEAVE_DESCRIPTORS_OPEN" "1 << 0")
-    '("do-not-reap-child" "G_SPAWN_DO_NOT_REAP_CHILD" "1 << 1")
-    '("search-path" "G_SPAWN_SEARCH_PATH" "1 << 2")
-    '("stdout-to-dev-null" "G_SPAWN_STDOUT_TO_DEV_NULL" "1 << 3")
-    '("stderr-to-dev-null" "G_SPAWN_STDERR_TO_DEV_NULL" "1 << 4")
-    '("child-inherits-stdin" "G_SPAWN_CHILD_INHERITS_STDIN" "1 << 5")
-    '("file-and-argv-zero" "G_SPAWN_FILE_AND_ARGV_ZERO" "1 << 6")
-    '("search-path-from-envp" "G_SPAWN_SEARCH_PATH_FROM_ENVP" "1 << 7")
-    '("cloexec-pipes" "G_SPAWN_CLOEXEC_PIPES" "1 << 8")
-  )
-)
-
-;; 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")
-  (values
-    '("alnum" "G_ASCII_ALNUM" "1 << 0")
-    '("alpha" "G_ASCII_ALPHA" "1 << 1")
-    '("cntrl" "G_ASCII_CNTRL" "1 << 2")
-    '("digit" "G_ASCII_DIGIT" "1 << 3")
-    '("graph" "G_ASCII_GRAPH" "1 << 4")
-    '("lower" "G_ASCII_LOWER" "1 << 5")
-    '("print" "G_ASCII_PRINT" "1 << 6")
-    '("punct" "G_ASCII_PUNCT" "1 << 7")
-    '("space" "G_ASCII_SPACE" "1 << 8")
-    '("upper" "G_ASCII_UPPER" "1 << 9")
-    '("xdigit" "G_ASCII_XDIGIT" "1 << 10")
-  )
-)
-
-;; 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")
-  (values
-    '("silence-stdout" "G_TEST_TRAP_SILENCE_STDOUT" "1 << 7")
-    '("silence-stderr" "G_TEST_TRAP_SILENCE_STDERR" "1 << 8")
-    '("inherit-stdin" "G_TEST_TRAP_INHERIT_STDIN" "1 << 9")
+    '("default" "G_SPAWN_DEFAULT" "0")
+    '("leave_descriptors_open" "G_SPAWN_LEAVE_DESCRIPTORS_OPEN" "1")
+    '("do_not_reap_child" "G_SPAWN_DO_NOT_REAP_CHILD" "2")
+    '("search_path" "G_SPAWN_SEARCH_PATH" "4")
+    '("stdout_to_dev_null" "G_SPAWN_STDOUT_TO_DEV_NULL" "8")
+    '("stderr_to_dev_null" "G_SPAWN_STDERR_TO_DEV_NULL" "16")
+    '("child_inherits_stdin" "G_SPAWN_CHILD_INHERITS_STDIN" "32")
+    '("file_and_argv_zero" "G_SPAWN_FILE_AND_ARGV_ZERO" "64")
+    '("search_path_from_envp" "G_SPAWN_SEARCH_PATH_FROM_ENVP" "128")
+    '("cloexec_pipes" "G_SPAWN_CLOEXEC_PIPES" "256")
   )
 )
 
-;; Original typedef:
-;; typedef enum {
-;;   G_TEST_SUBPROCESS_INHERIT_STDIN  = 1 << 0,
-;;   G_TEST_SUBPROCESS_INHERIT_STDOUT = 1 << 1,
-;;   G_TEST_SUBPROCESS_INHERIT_STDERR = 1 << 2
-;; } GTestSubprocessFlags;
-
-(define-flags-extended TestSubprocessFlags
+(define-enum-extended TestFileType
   (in-module "G")
-  (c-name "GTestSubprocessFlags")
+  (c-name "GTestFileType")
   (values
-    '("stdin" "G_TEST_SUBPROCESS_INHERIT_STDIN" "1 << 0")
-    '("stdout" "G_TEST_SUBPROCESS_INHERIT_STDOUT" "1 << 1")
-    '("stderr" "G_TEST_SUBPROCESS_INHERIT_STDERR" "1 << 2")
+    '("dist" "G_TEST_DIST" "0")
+    '("built" "G_TEST_BUILT" "1")
   )
 )
 
-;; 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 */
-;;   G_TEST_LOG_START_SUITE,
-;;   G_TEST_LOG_STOP_SUITE
-;; } GTestLogType;
-
 (define-enum-extended TestLogType
   (in-module "G")
   (c-name "GTestLogType")
   (values
     '("none" "G_TEST_LOG_NONE" "0")
     '("error" "G_TEST_LOG_ERROR" "1")
-    '("start-binary" "G_TEST_LOG_START_BINARY" "2")
-    '("list-case" "G_TEST_LOG_LIST_CASE" "3")
-    '("skip-case" "G_TEST_LOG_SKIP_CASE" "4")
-    '("start-case" "G_TEST_LOG_START_CASE" "5")
-    '("stop-case" "G_TEST_LOG_STOP_CASE" "6")
-    '("min-result" "G_TEST_LOG_MIN_RESULT" "7")
-    '("max-result" "G_TEST_LOG_MAX_RESULT" "8")
+    '("start_binary" "G_TEST_LOG_START_BINARY" "2")
+    '("list_case" "G_TEST_LOG_LIST_CASE" "3")
+    '("skip_case" "G_TEST_LOG_SKIP_CASE" "4")
+    '("start_case" "G_TEST_LOG_START_CASE" "5")
+    '("stop_case" "G_TEST_LOG_STOP_CASE" "6")
+    '("min_result" "G_TEST_LOG_MIN_RESULT" "7")
+    '("max_result" "G_TEST_LOG_MAX_RESULT" "8")
     '("message" "G_TEST_LOG_MESSAGE" "9")
-    '("start-suite" "G_TEST_LOG_START_SUITE" "10")
-    '("stop-suite" "G_TEST_LOG_STOP_SUITE" "11")
+    '("start_suite" "G_TEST_LOG_START_SUITE" "10")
+    '("stop_suite" "G_TEST_LOG_STOP_SUITE" "11")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   G_TEST_DIST,
-;;   G_TEST_BUILT
-;; } GTestFileType;
-
-(define-enum-extended TestFileType
+(define-flags-extended TestSubprocessFlags
   (in-module "G")
-  (c-name "GTestFileType")
+  (c-name "GTestSubprocessFlags")
   (values
-    '("dist" "G_TEST_DIST" "0")
-    '("built" "G_TEST_BUILT" "1")
+    '("stdin" "G_TEST_SUBPROCESS_INHERIT_STDIN" "1")
+    '("stdout" "G_TEST_SUBPROCESS_INHERIT_STDOUT" "2")
+    '("stderr" "G_TEST_SUBPROCESS_INHERIT_STDERR" "4")
   )
 )
 
-;; From gthread.h
-
-;; Original typedef:
-;; typedef enum
-;; {
-;;   G_THREAD_ERROR_AGAIN /* Resource temporarily unavailable */
-;; } GThreadError;
-
-(define-enum-extended ThreadError
+(define-flags-extended TestTrapFlags
   (in-module "G")
-  (c-name "GThreadError")
+  (c-name "GTestTrapFlags")
   (values
-    '("again" "G_THREAD_ERROR_AGAIN" "0")
+    '("silence_stdout" "G_TEST_TRAP_SILENCE_STDOUT" "128")
+    '("silence_stderr" "G_TEST_TRAP_SILENCE_STDERR" "256")
+    '("inherit_stdin" "G_TEST_TRAP_INHERIT_STDIN" "512")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   G_ONCE_STATUS_NOTCALLED,
-;;   G_ONCE_STATUS_PROGRESS,
-;;   G_ONCE_STATUS_READY
-;; } GOnceStatus;
-
-(define-enum-extended OnceStatus
+(define-enum-extended ThreadError
   (in-module "G")
-  (c-name "GOnceStatus")
+  (c-name "GThreadError")
   (values
-    '("notcalled" "G_ONCE_STATUS_NOTCALLED" "0")
-    '("progress" "G_ONCE_STATUS_PROGRESS" "1")
-    '("ready" "G_ONCE_STATUS_READY" "2")
+    '("thread_error_again" "G_THREAD_ERROR_AGAIN" "0")
   )
 )
 
-;; From gtimezone.h
-
-;; Original typedef:
-;; typedef enum
-;; {
-;;   G_TIME_TYPE_STANDARD,
-;;   G_TIME_TYPE_DAYLIGHT,
-;;   G_TIME_TYPE_UNIVERSAL
-;; } GTimeType;
-
 (define-enum-extended TimeType
   (in-module "G")
   (c-name "GTimeType")
@@ -1358,325 +645,112 @@
   )
 )
 
-;; 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_SPACING_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 TokenType
+  (in-module "G")
+  (c-name "GTokenType")
+  (values
+    '("eof" "G_TOKEN_EOF" "0")
+    '("left_paren" "G_TOKEN_LEFT_PAREN" "40")
+    '("right_paren" "G_TOKEN_RIGHT_PAREN" "41")
+    '("left_curly" "G_TOKEN_LEFT_CURLY" "123")
+    '("right_curly" "G_TOKEN_RIGHT_CURLY" "125")
+    '("left_brace" "G_TOKEN_LEFT_BRACE" "91")
+    '("right_brace" "G_TOKEN_RIGHT_BRACE" "93")
+    '("equal_sign" "G_TOKEN_EQUAL_SIGN" "61")
+    '("comma" "G_TOKEN_COMMA" "44")
+    '("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")
+  )
+)
 
-(define-enum-extended UnicodeType
+(define-flags-extended TraverseFlags
   (in-module "G")
-  (c-name "GUnicodeType")
+  (c-name "GTraverseFlags")
   (values
-    '("control" "G_UNICODE_CONTROL" "0")
-    '("format" "G_UNICODE_FORMAT" "1")
-    '("unassigned" "G_UNICODE_UNASSIGNED" "2")
-    '("private-use" "G_UNICODE_PRIVATE_USE" "3")
-    '("surrogate" "G_UNICODE_SURROGATE" "4")
-    '("lowercase-letter" "G_UNICODE_LOWERCASE_LETTER" "5")
-    '("modifier-letter" "G_UNICODE_MODIFIER_LETTER" "6")
-    '("other-letter" "G_UNICODE_OTHER_LETTER" "7")
-    '("titlecase-letter" "G_UNICODE_TITLECASE_LETTER" "8")
-    '("uppercase-letter" "G_UNICODE_UPPERCASE_LETTER" "9")
-    '("spacing-mark" "G_UNICODE_SPACING_MARK" "10")
-    '("enclosing-mark" "G_UNICODE_ENCLOSING_MARK" "11")
-    '("non-spacing-mark" "G_UNICODE_NON_SPACING_MARK" "12")
-    '("decimal-number" "G_UNICODE_DECIMAL_NUMBER" "13")
-    '("letter-number" "G_UNICODE_LETTER_NUMBER" "14")
-    '("other-number" "G_UNICODE_OTHER_NUMBER" "15")
-    '("connect-punctuation" "G_UNICODE_CONNECT_PUNCTUATION" "16")
-    '("dash-punctuation" "G_UNICODE_DASH_PUNCTUATION" "17")
-    '("close-punctuation" "G_UNICODE_CLOSE_PUNCTUATION" "18")
-    '("final-punctuation" "G_UNICODE_FINAL_PUNCTUATION" "19")
-    '("initial-punctuation" "G_UNICODE_INITIAL_PUNCTUATION" "20")
-    '("other-punctuation" "G_UNICODE_OTHER_PUNCTUATION" "21")
-    '("open-punctuation" "G_UNICODE_OPEN_PUNCTUATION" "22")
-    '("currency-symbol" "G_UNICODE_CURRENCY_SYMBOL" "23")
-    '("modifier-symbol" "G_UNICODE_MODIFIER_SYMBOL" "24")
-    '("math-symbol" "G_UNICODE_MATH_SYMBOL" "25")
-    '("other-symbol" "G_UNICODE_OTHER_SYMBOL" "26")
-    '("line-separator" "G_UNICODE_LINE_SEPARATOR" "27")
-    '("paragraph-separator" "G_UNICODE_PARAGRAPH_SEPARATOR" "28")
-    '("space-separator" "G_UNICODE_SPACE_SEPARATOR" "29")
+    '("leaves" "G_TRAVERSE_LEAVES" "1")
+    '("non_leaves" "G_TRAVERSE_NON_LEAVES" "2")
+    '("all" "G_TRAVERSE_ALL" "3")
+    '("mask" "G_TRAVERSE_MASK" "3")
+    '("leafs" "G_TRAVERSE_LEAFS" "1")
+    '("non_leafs" "G_TRAVERSE_NON_LEAFS" "2")
   )
 )
 
-;; 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,
-;;   G_UNICODE_BREAK_CLOSE_PARANTHESIS,
-;;   G_UNICODE_BREAK_CONDITIONAL_JAPANESE_STARTER,
-;;   G_UNICODE_BREAK_HEBREW_LETTER,
-;;   G_UNICODE_BREAK_REGIONAL_INDICATOR
-;; } GUnicodeBreakType;
+(define-enum-extended TraverseType
+  (in-module "G")
+  (c-name "GTraverseType")
+  (values
+    '("in_order" "G_IN_ORDER" "0")
+    '("pre_order" "G_PRE_ORDER" "1")
+    '("post_order" "G_POST_ORDER" "2")
+    '("level_order" "G_LEVEL_ORDER" "3")
+  )
+)
 
 (define-enum-extended UnicodeBreakType
   (in-module "G")
   (c-name "GUnicodeBreakType")
   (values
     '("mandatory" "G_UNICODE_BREAK_MANDATORY" "0")
-    '("carriage-return" "G_UNICODE_BREAK_CARRIAGE_RETURN" "1")
-    '("line-feed" "G_UNICODE_BREAK_LINE_FEED" "2")
-    '("combining-mark" "G_UNICODE_BREAK_COMBINING_MARK" "3")
+    '("carriage_return" "G_UNICODE_BREAK_CARRIAGE_RETURN" "1")
+    '("line_feed" "G_UNICODE_BREAK_LINE_FEED" "2")
+    '("combining_mark" "G_UNICODE_BREAK_COMBINING_MARK" "3")
     '("surrogate" "G_UNICODE_BREAK_SURROGATE" "4")
-    '("zero-width-space" "G_UNICODE_BREAK_ZERO_WIDTH_SPACE" "5")
+    '("zero_width_space" "G_UNICODE_BREAK_ZERO_WIDTH_SPACE" "5")
     '("inseparable" "G_UNICODE_BREAK_INSEPARABLE" "6")
-    '("non-breaking-glue" "G_UNICODE_BREAK_NON_BREAKING_GLUE" "7")
+    '("non_breaking_glue" "G_UNICODE_BREAK_NON_BREAKING_GLUE" "7")
     '("contingent" "G_UNICODE_BREAK_CONTINGENT" "8")
     '("space" "G_UNICODE_BREAK_SPACE" "9")
     '("after" "G_UNICODE_BREAK_AFTER" "10")
     '("before" "G_UNICODE_BREAK_BEFORE" "11")
-    '("before-and-after" "G_UNICODE_BREAK_BEFORE_AND_AFTER" "12")
+    '("before_and_after" "G_UNICODE_BREAK_BEFORE_AND_AFTER" "12")
     '("hyphen" "G_UNICODE_BREAK_HYPHEN" "13")
-    '("non-starter" "G_UNICODE_BREAK_NON_STARTER" "14")
-    '("open-punctuation" "G_UNICODE_BREAK_OPEN_PUNCTUATION" "15")
-    '("close-punctuation" "G_UNICODE_BREAK_CLOSE_PUNCTUATION" "16")
+    '("non_starter" "G_UNICODE_BREAK_NON_STARTER" "14")
+    '("open_punctuation" "G_UNICODE_BREAK_OPEN_PUNCTUATION" "15")
+    '("close_punctuation" "G_UNICODE_BREAK_CLOSE_PUNCTUATION" "16")
     '("quotation" "G_UNICODE_BREAK_QUOTATION" "17")
     '("exclamation" "G_UNICODE_BREAK_EXCLAMATION" "18")
     '("ideographic" "G_UNICODE_BREAK_IDEOGRAPHIC" "19")
     '("numeric" "G_UNICODE_BREAK_NUMERIC" "20")
-    '("infix-separator" "G_UNICODE_BREAK_INFIX_SEPARATOR" "21")
+    '("infix_separator" "G_UNICODE_BREAK_INFIX_SEPARATOR" "21")
     '("symbol" "G_UNICODE_BREAK_SYMBOL" "22")
     '("alphabetic" "G_UNICODE_BREAK_ALPHABETIC" "23")
     '("prefix" "G_UNICODE_BREAK_PREFIX" "24")
     '("postfix" "G_UNICODE_BREAK_POSTFIX" "25")
-    '("complex-context" "G_UNICODE_BREAK_COMPLEX_CONTEXT" "26")
+    '("complex_context" "G_UNICODE_BREAK_COMPLEX_CONTEXT" "26")
     '("ambiguous" "G_UNICODE_BREAK_AMBIGUOUS" "27")
     '("unknown" "G_UNICODE_BREAK_UNKNOWN" "28")
-    '("next-line" "G_UNICODE_BREAK_NEXT_LINE" "29")
-    '("word-joiner" "G_UNICODE_BREAK_WORD_JOINER" "30")
-    '("hangul-l-jamo" "G_UNICODE_BREAK_HANGUL_L_JAMO" "31")
-    '("hangul-v-jamo" "G_UNICODE_BREAK_HANGUL_V_JAMO" "32")
-    '("hangul-t-jamo" "G_UNICODE_BREAK_HANGUL_T_JAMO" "33")
-    '("hangul-lv-syllable" "G_UNICODE_BREAK_HANGUL_LV_SYLLABLE" "34")
-    '("hangul-lvt-syllable" "G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE" "35")
-    '("close-paranthesis" "G_UNICODE_BREAK_CLOSE_PARANTHESIS" "36")
-    '("conditional-japanese-starter" "G_UNICODE_BREAK_CONDITIONAL_JAPANESE_STARTER" "37")
-    '("hebrew-letter" "G_UNICODE_BREAK_HEBREW_LETTER" "38")
-    '("regional-indicator" "G_UNICODE_BREAK_REGIONAL_INDICATOR" "39")
+    '("next_line" "G_UNICODE_BREAK_NEXT_LINE" "29")
+    '("word_joiner" "G_UNICODE_BREAK_WORD_JOINER" "30")
+    '("hangul_l_jamo" "G_UNICODE_BREAK_HANGUL_L_JAMO" "31")
+    '("hangul_v_jamo" "G_UNICODE_BREAK_HANGUL_V_JAMO" "32")
+    '("hangul_t_jamo" "G_UNICODE_BREAK_HANGUL_T_JAMO" "33")
+    '("hangul_lv_syllable" "G_UNICODE_BREAK_HANGUL_LV_SYLLABLE" "34")
+    '("hangul_lvt_syllable" "G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE" "35")
+    '("close_paranthesis" "G_UNICODE_BREAK_CLOSE_PARANTHESIS" "36")
+    '("conditional_japanese_starter" "G_UNICODE_BREAK_CONDITIONAL_JAPANESE_STARTER" "37")
+    '("hebrew_letter" "G_UNICODE_BREAK_HEBREW_LETTER" "38")
+    '("regional_indicator" "G_UNICODE_BREAK_REGIONAL_INDICATOR" "39")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {                         /* ISO 15924 code */
-;;   G_UNICODE_SCRIPT_INVALID_CODE = -1,
-;;   G_UNICODE_SCRIPT_COMMON       = 0,   /* Zyyy */
-;;   G_UNICODE_SCRIPT_INHERITED,          /* Zinh (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,             /* Copt (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 */
-;; 
-;;   /* Unicode-5.2 additions */
-;;   G_UNICODE_SCRIPT_AVESTAN,                /* Avst */
-;;   G_UNICODE_SCRIPT_BAMUM,                  /* Bamu */
-;;   G_UNICODE_SCRIPT_EGYPTIAN_HIEROGLYPHS,   /* Egyp */
-;;   G_UNICODE_SCRIPT_IMPERIAL_ARAMAIC,       /* Armi */
-;;   G_UNICODE_SCRIPT_INSCRIPTIONAL_PAHLAVI,  /* Phli */
-;;   G_UNICODE_SCRIPT_INSCRIPTIONAL_PARTHIAN, /* Prti */
-;;   G_UNICODE_SCRIPT_JAVANESE,               /* Java */
-;;   G_UNICODE_SCRIPT_KAITHI,                 /* Kthi */
-;;   G_UNICODE_SCRIPT_LISU,                   /* Lisu */
-;;   G_UNICODE_SCRIPT_MEETEI_MAYEK,           /* Mtei */
-;;   G_UNICODE_SCRIPT_OLD_SOUTH_ARABIAN,      /* Sarb */
-;;   G_UNICODE_SCRIPT_OLD_TURKIC,             /* Orkh */
-;;   G_UNICODE_SCRIPT_SAMARITAN,              /* Samr */
-;;   G_UNICODE_SCRIPT_TAI_THAM,               /* Lana */
-;;   G_UNICODE_SCRIPT_TAI_VIET,               /* Tavt */
-;; 
-;;   /* Unicode-6.0 additions */
-;;   G_UNICODE_SCRIPT_BATAK,                  /* Batk */
-;;   G_UNICODE_SCRIPT_BRAHMI,                 /* Brah */
-;;   G_UNICODE_SCRIPT_MANDAIC,                /* Mand */
-;; 
-;;   /* Unicode-6.1 additions */
-;;   G_UNICODE_SCRIPT_CHAKMA,                 /* Cakm */
-;;   G_UNICODE_SCRIPT_MEROITIC_CURSIVE,       /* Merc */
-;;   G_UNICODE_SCRIPT_MEROITIC_HIEROGLYPHS,   /* Mero */
-;;   G_UNICODE_SCRIPT_MIAO,                   /* Plrd */
-;;   G_UNICODE_SCRIPT_SHARADA,                /* Shrd */
-;;   G_UNICODE_SCRIPT_SORA_SOMPENG,           /* Sora */
-;;   G_UNICODE_SCRIPT_TAKRI,                  /* Takr */
-;; 
-;;   /* Unicode 7.0 additions */
-;;   G_UNICODE_SCRIPT_BASSA_VAH,              /* Bass */
-;;   G_UNICODE_SCRIPT_CAUCASIAN_ALBANIAN,     /* Aghb */
-;;   G_UNICODE_SCRIPT_DUPLOYAN,               /* Dupl */
-;;   G_UNICODE_SCRIPT_ELBASAN,                /* Elba */
-;;   G_UNICODE_SCRIPT_GRANTHA,                /* Gran */
-;;   G_UNICODE_SCRIPT_KHOJKI,                 /* Khoj */
-;;   G_UNICODE_SCRIPT_KHUDAWADI,              /* Sind */
-;;   G_UNICODE_SCRIPT_LINEAR_A,               /* Lina */
-;;   G_UNICODE_SCRIPT_MAHAJANI,               /* Mahj */
-;;   G_UNICODE_SCRIPT_MANICHAEAN,             /* Manu */
-;;   G_UNICODE_SCRIPT_MENDE_KIKAKUI,          /* Mend */
-;;   G_UNICODE_SCRIPT_MODI,                   /* Modi */
-;;   G_UNICODE_SCRIPT_MRO,                    /* Mroo */
-;;   G_UNICODE_SCRIPT_NABATAEAN,              /* Nbat */
-;;   G_UNICODE_SCRIPT_OLD_NORTH_ARABIAN,      /* Narb */
-;;   G_UNICODE_SCRIPT_OLD_PERMIC,             /* Perm */
-;;   G_UNICODE_SCRIPT_PAHAWH_HMONG,           /* Hmng */
-;;   G_UNICODE_SCRIPT_PALMYRENE,              /* Palm */
-;;   G_UNICODE_SCRIPT_PAU_CIN_HAU,            /* Pauc */
-;;   G_UNICODE_SCRIPT_PSALTER_PAHLAVI,        /* Phlp */
-;;   G_UNICODE_SCRIPT_SIDDHAM,                /* Sidd */
-;;   G_UNICODE_SCRIPT_TIRHUTA,                /* Tirh */
-;;   G_UNICODE_SCRIPT_WARANG_CITI             /* Wara */
-;; } GUnicodeScript;
-
 (define-enum-extended UnicodeScript
   (in-module "G")
   (c-name "GUnicodeScript")
   (values
-    '("invalid-code" "G_UNICODE_SCRIPT_INVALID_CODE" "-1")
+    '("invalid_code" "G_UNICODE_SCRIPT_INVALID_CODE" "-1")
     '("common" "G_UNICODE_SCRIPT_COMMON" "0")
     '("inherited" "G_UNICODE_SCRIPT_INHERITED" "1")
     '("arabic" "G_UNICODE_SCRIPT_ARABIC" "2")
@@ -1707,7 +781,7 @@
     '("mongolian" "G_UNICODE_SCRIPT_MONGOLIAN" "27")
     '("myanmar" "G_UNICODE_SCRIPT_MYANMAR" "28")
     '("ogham" "G_UNICODE_SCRIPT_OGHAM" "29")
-    '("old-italic" "G_UNICODE_SCRIPT_OLD_ITALIC" "30")
+    '("old_italic" "G_UNICODE_SCRIPT_OLD_ITALIC" "30")
     '("oriya" "G_UNICODE_SCRIPT_ORIYA" "31")
     '("runic" "G_UNICODE_SCRIPT_RUNIC" "32")
     '("sinhala" "G_UNICODE_SCRIPT_SINHALA" "33")
@@ -1717,7 +791,7 @@
     '("thaana" "G_UNICODE_SCRIPT_THAANA" "37")
     '("thai" "G_UNICODE_SCRIPT_THAI" "38")
     '("tibetan" "G_UNICODE_SCRIPT_TIBETAN" "39")
-    '("canadian-aboriginal" "G_UNICODE_SCRIPT_CANADIAN_ABORIGINAL" "40")
+    '("canadian_aboriginal" "G_UNICODE_SCRIPT_CANADIAN_ABORIGINAL" "40")
     '("yi" "G_UNICODE_SCRIPT_YI" "41")
     '("tagalog" "G_UNICODE_SCRIPT_TAGALOG" "42")
     '("hanunoo" "G_UNICODE_SCRIPT_HANUNOO" "43")
@@ -1728,278 +802,184 @@
     '("limbu" "G_UNICODE_SCRIPT_LIMBU" "48")
     '("osmanya" "G_UNICODE_SCRIPT_OSMANYA" "49")
     '("shavian" "G_UNICODE_SCRIPT_SHAVIAN" "50")
-    '("linear-b" "G_UNICODE_SCRIPT_LINEAR_B" "51")
-    '("tai-le" "G_UNICODE_SCRIPT_TAI_LE" "52")
+    '("linear_b" "G_UNICODE_SCRIPT_LINEAR_B" "51")
+    '("tai_le" "G_UNICODE_SCRIPT_TAI_LE" "52")
     '("ugaritic" "G_UNICODE_SCRIPT_UGARITIC" "53")
-    '("new-tai-lue" "G_UNICODE_SCRIPT_NEW_TAI_LUE" "54")
+    '("new_tai_lue" "G_UNICODE_SCRIPT_NEW_TAI_LUE" "54")
     '("buginese" "G_UNICODE_SCRIPT_BUGINESE" "55")
     '("glagolitic" "G_UNICODE_SCRIPT_GLAGOLITIC" "56")
     '("tifinagh" "G_UNICODE_SCRIPT_TIFINAGH" "57")
-    '("syloti-nagri" "G_UNICODE_SCRIPT_SYLOTI_NAGRI" "58")
-    '("old-persian" "G_UNICODE_SCRIPT_OLD_PERSIAN" "59")
+    '("syloti_nagri" "G_UNICODE_SCRIPT_SYLOTI_NAGRI" "58")
+    '("old_persian" "G_UNICODE_SCRIPT_OLD_PERSIAN" "59")
     '("kharoshthi" "G_UNICODE_SCRIPT_KHAROSHTHI" "60")
     '("unknown" "G_UNICODE_SCRIPT_UNKNOWN" "61")
     '("balinese" "G_UNICODE_SCRIPT_BALINESE" "62")
     '("cuneiform" "G_UNICODE_SCRIPT_CUNEIFORM" "63")
     '("phoenician" "G_UNICODE_SCRIPT_PHOENICIAN" "64")
-    '("phags-pa" "G_UNICODE_SCRIPT_PHAGS_PA" "65")
+    '("phags_pa" "G_UNICODE_SCRIPT_PHAGS_PA" "65")
     '("nko" "G_UNICODE_SCRIPT_NKO" "66")
-    '("kayah-li" "G_UNICODE_SCRIPT_KAYAH_LI" "67")
+    '("kayah_li" "G_UNICODE_SCRIPT_KAYAH_LI" "67")
     '("lepcha" "G_UNICODE_SCRIPT_LEPCHA" "68")
     '("rejang" "G_UNICODE_SCRIPT_REJANG" "69")
     '("sundanese" "G_UNICODE_SCRIPT_SUNDANESE" "70")
     '("saurashtra" "G_UNICODE_SCRIPT_SAURASHTRA" "71")
     '("cham" "G_UNICODE_SCRIPT_CHAM" "72")
-    '("ol-chiki" "G_UNICODE_SCRIPT_OL_CHIKI" "73")
+    '("ol_chiki" "G_UNICODE_SCRIPT_OL_CHIKI" "73")
     '("vai" "G_UNICODE_SCRIPT_VAI" "74")
     '("carian" "G_UNICODE_SCRIPT_CARIAN" "75")
     '("lycian" "G_UNICODE_SCRIPT_LYCIAN" "76")
     '("lydian" "G_UNICODE_SCRIPT_LYDIAN" "77")
     '("avestan" "G_UNICODE_SCRIPT_AVESTAN" "78")
     '("bamum" "G_UNICODE_SCRIPT_BAMUM" "79")
-    '("egyptian-hieroglyphs" "G_UNICODE_SCRIPT_EGYPTIAN_HIEROGLYPHS" "80")
-    '("imperial-aramaic" "G_UNICODE_SCRIPT_IMPERIAL_ARAMAIC" "81")
-    '("inscriptional-pahlavi" "G_UNICODE_SCRIPT_INSCRIPTIONAL_PAHLAVI" "82")
-    '("inscriptional-parthian" "G_UNICODE_SCRIPT_INSCRIPTIONAL_PARTHIAN" "83")
+    '("egyptian_hieroglyphs" "G_UNICODE_SCRIPT_EGYPTIAN_HIEROGLYPHS" "80")
+    '("imperial_aramaic" "G_UNICODE_SCRIPT_IMPERIAL_ARAMAIC" "81")
+    '("inscriptional_pahlavi" "G_UNICODE_SCRIPT_INSCRIPTIONAL_PAHLAVI" "82")
+    '("inscriptional_parthian" "G_UNICODE_SCRIPT_INSCRIPTIONAL_PARTHIAN" "83")
     '("javanese" "G_UNICODE_SCRIPT_JAVANESE" "84")
     '("kaithi" "G_UNICODE_SCRIPT_KAITHI" "85")
     '("lisu" "G_UNICODE_SCRIPT_LISU" "86")
-    '("meetei-mayek" "G_UNICODE_SCRIPT_MEETEI_MAYEK" "87")
-    '("old-south-arabian" "G_UNICODE_SCRIPT_OLD_SOUTH_ARABIAN" "88")
-    '("old-turkic" "G_UNICODE_SCRIPT_OLD_TURKIC" "89")
+    '("meetei_mayek" "G_UNICODE_SCRIPT_MEETEI_MAYEK" "87")
+    '("old_south_arabian" "G_UNICODE_SCRIPT_OLD_SOUTH_ARABIAN" "88")
+    '("old_turkic" "G_UNICODE_SCRIPT_OLD_TURKIC" "89")
     '("samaritan" "G_UNICODE_SCRIPT_SAMARITAN" "90")
-    '("tai-tham" "G_UNICODE_SCRIPT_TAI_THAM" "91")
-    '("tai-viet" "G_UNICODE_SCRIPT_TAI_VIET" "92")
+    '("tai_tham" "G_UNICODE_SCRIPT_TAI_THAM" "91")
+    '("tai_viet" "G_UNICODE_SCRIPT_TAI_VIET" "92")
     '("batak" "G_UNICODE_SCRIPT_BATAK" "93")
     '("brahmi" "G_UNICODE_SCRIPT_BRAHMI" "94")
     '("mandaic" "G_UNICODE_SCRIPT_MANDAIC" "95")
     '("chakma" "G_UNICODE_SCRIPT_CHAKMA" "96")
-    '("meroitic-cursive" "G_UNICODE_SCRIPT_MEROITIC_CURSIVE" "97")
-    '("meroitic-hieroglyphs" "G_UNICODE_SCRIPT_MEROITIC_HIEROGLYPHS" "98")
+    '("meroitic_cursive" "G_UNICODE_SCRIPT_MEROITIC_CURSIVE" "97")
+    '("meroitic_hieroglyphs" "G_UNICODE_SCRIPT_MEROITIC_HIEROGLYPHS" "98")
     '("miao" "G_UNICODE_SCRIPT_MIAO" "99")
     '("sharada" "G_UNICODE_SCRIPT_SHARADA" "100")
-    '("sora-sompeng" "G_UNICODE_SCRIPT_SORA_SOMPENG" "101")
+    '("sora_sompeng" "G_UNICODE_SCRIPT_SORA_SOMPENG" "101")
     '("takri" "G_UNICODE_SCRIPT_TAKRI" "102")
-    '("bassa-vah" "G_UNICODE_SCRIPT_BASSA_VAH" "103")
-    '("caucasian-albanian" "G_UNICODE_SCRIPT_CAUCASIAN_ALBANIAN" "104")
+    '("bassa_vah" "G_UNICODE_SCRIPT_BASSA_VAH" "103")
+    '("caucasian_albanian" "G_UNICODE_SCRIPT_CAUCASIAN_ALBANIAN" "104")
     '("duployan" "G_UNICODE_SCRIPT_DUPLOYAN" "105")
     '("elbasan" "G_UNICODE_SCRIPT_ELBASAN" "106")
     '("grantha" "G_UNICODE_SCRIPT_GRANTHA" "107")
     '("khojki" "G_UNICODE_SCRIPT_KHOJKI" "108")
     '("khudawadi" "G_UNICODE_SCRIPT_KHUDAWADI" "109")
-    '("linear-a" "G_UNICODE_SCRIPT_LINEAR_A" "110")
+    '("linear_a" "G_UNICODE_SCRIPT_LINEAR_A" "110")
     '("mahajani" "G_UNICODE_SCRIPT_MAHAJANI" "111")
     '("manichaean" "G_UNICODE_SCRIPT_MANICHAEAN" "112")
-    '("mende-kikakui" "G_UNICODE_SCRIPT_MENDE_KIKAKUI" "113")
+    '("mende_kikakui" "G_UNICODE_SCRIPT_MENDE_KIKAKUI" "113")
     '("modi" "G_UNICODE_SCRIPT_MODI" "114")
     '("mro" "G_UNICODE_SCRIPT_MRO" "115")
     '("nabataean" "G_UNICODE_SCRIPT_NABATAEAN" "116")
-    '("old-north-arabian" "G_UNICODE_SCRIPT_OLD_NORTH_ARABIAN" "117")
-    '("old-permic" "G_UNICODE_SCRIPT_OLD_PERMIC" "118")
-    '("pahawh-hmong" "G_UNICODE_SCRIPT_PAHAWH_HMONG" "119")
+    '("old_north_arabian" "G_UNICODE_SCRIPT_OLD_NORTH_ARABIAN" "117")
+    '("old_permic" "G_UNICODE_SCRIPT_OLD_PERMIC" "118")
+    '("pahawh_hmong" "G_UNICODE_SCRIPT_PAHAWH_HMONG" "119")
     '("palmyrene" "G_UNICODE_SCRIPT_PALMYRENE" "120")
-    '("pau-cin-hau" "G_UNICODE_SCRIPT_PAU_CIN_HAU" "121")
-    '("psalter-pahlavi" "G_UNICODE_SCRIPT_PSALTER_PAHLAVI" "122")
+    '("pau_cin_hau" "G_UNICODE_SCRIPT_PAU_CIN_HAU" "121")
+    '("psalter_pahlavi" "G_UNICODE_SCRIPT_PSALTER_PAHLAVI" "122")
     '("siddham" "G_UNICODE_SCRIPT_SIDDHAM" "123")
     '("tirhuta" "G_UNICODE_SCRIPT_TIRHUTA" "124")
-    '("warang-citi" "G_UNICODE_SCRIPT_WARANG_CITI" "125")
+    '("warang_citi" "G_UNICODE_SCRIPT_WARANG_CITI" "125")
   )
 )
 
-;; 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
+(define-enum-extended UnicodeType
   (in-module "G")
-  (c-name "GNormalizeMode")
+  (c-name "GUnicodeType")
   (values
-    '("default" "G_NORMALIZE_DEFAULT" "0")
-    '("nfd" "G_NORMALIZE_NFD" "0")
-    '("default-compose" "G_NORMALIZE_DEFAULT_COMPOSE" "1")
-    '("nfc" "G_NORMALIZE_NFC" "1")
-    '("all" "G_NORMALIZE_ALL" "2")
-    '("nfkd" "G_NORMALIZE_NFKD" "2")
-    '("all-compose" "G_NORMALIZE_ALL_COMPOSE" "3")
-    '("nfkc" "G_NORMALIZE_NFKC" "3")
+    '("control" "G_UNICODE_CONTROL" "0")
+    '("format" "G_UNICODE_FORMAT" "1")
+    '("unassigned" "G_UNICODE_UNASSIGNED" "2")
+    '("private_use" "G_UNICODE_PRIVATE_USE" "3")
+    '("surrogate" "G_UNICODE_SURROGATE" "4")
+    '("lowercase_letter" "G_UNICODE_LOWERCASE_LETTER" "5")
+    '("modifier_letter" "G_UNICODE_MODIFIER_LETTER" "6")
+    '("other_letter" "G_UNICODE_OTHER_LETTER" "7")
+    '("titlecase_letter" "G_UNICODE_TITLECASE_LETTER" "8")
+    '("uppercase_letter" "G_UNICODE_UPPERCASE_LETTER" "9")
+    '("spacing_mark" "G_UNICODE_SPACING_MARK" "10")
+    '("enclosing_mark" "G_UNICODE_ENCLOSING_MARK" "11")
+    '("non_spacing_mark" "G_UNICODE_NON_SPACING_MARK" "12")
+    '("decimal_number" "G_UNICODE_DECIMAL_NUMBER" "13")
+    '("letter_number" "G_UNICODE_LETTER_NUMBER" "14")
+    '("other_number" "G_UNICODE_OTHER_NUMBER" "15")
+    '("connect_punctuation" "G_UNICODE_CONNECT_PUNCTUATION" "16")
+    '("dash_punctuation" "G_UNICODE_DASH_PUNCTUATION" "17")
+    '("close_punctuation" "G_UNICODE_CLOSE_PUNCTUATION" "18")
+    '("final_punctuation" "G_UNICODE_FINAL_PUNCTUATION" "19")
+    '("initial_punctuation" "G_UNICODE_INITIAL_PUNCTUATION" "20")
+    '("other_punctuation" "G_UNICODE_OTHER_PUNCTUATION" "21")
+    '("open_punctuation" "G_UNICODE_OPEN_PUNCTUATION" "22")
+    '("currency_symbol" "G_UNICODE_CURRENCY_SYMBOL" "23")
+    '("modifier_symbol" "G_UNICODE_MODIFIER_SYMBOL" "24")
+    '("math_symbol" "G_UNICODE_MATH_SYMBOL" "25")
+    '("other_symbol" "G_UNICODE_OTHER_SYMBOL" "26")
+    '("line_separator" "G_UNICODE_LINE_SEPARATOR" "27")
+    '("paragraph_separator" "G_UNICODE_PARAGRAPH_SEPARATOR" "28")
+    '("space_separator" "G_UNICODE_SPACE_SEPARATOR" "29")
   )
 )
 
-;; 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")
   (values
-    '("directory-desktop" "G_USER_DIRECTORY_DESKTOP" "0")
-    '("directory-documents" "G_USER_DIRECTORY_DOCUMENTS" "1")
-    '("directory-download" "G_USER_DIRECTORY_DOWNLOAD" "2")
-    '("directory-music" "G_USER_DIRECTORY_MUSIC" "3")
-    '("directory-pictures" "G_USER_DIRECTORY_PICTURES" "4")
-    '("directory-public-share" "G_USER_DIRECTORY_PUBLIC_SHARE" "5")
-    '("directory-templates" "G_USER_DIRECTORY_TEMPLATES" "6")
-    '("directory-videos" "G_USER_DIRECTORY_VIDEOS" "7")
-    '("n-directories" "G_USER_N_DIRECTORIES" "8")
-  )
-)
-
-;; Original typedef:
-;; typedef enum
-;; {
-;;   G_FORMAT_SIZE_DEFAULT     = 0,
-;;   G_FORMAT_SIZE_LONG_FORMAT = 1 << 0,
-;;   G_FORMAT_SIZE_IEC_UNITS   = 1 << 1
-;; } GFormatSizeFlags;
-
-(define-flags-extended FormatSizeFlags
-  (in-module "G")
-  (c-name "GFormatSizeFlags")
-  (values
-    '("default" "G_FORMAT_SIZE_DEFAULT" "0x0")
-    '("long-format" "G_FORMAT_SIZE_LONG_FORMAT" "1 << 0")
-    '("iec-units" "G_FORMAT_SIZE_IEC_UNITS" "1 << 1")
+    '("directory_desktop" "G_USER_DIRECTORY_DESKTOP" "0")
+    '("directory_documents" "G_USER_DIRECTORY_DOCUMENTS" "1")
+    '("directory_download" "G_USER_DIRECTORY_DOWNLOAD" "2")
+    '("directory_music" "G_USER_DIRECTORY_MUSIC" "3")
+    '("directory_pictures" "G_USER_DIRECTORY_PICTURES" "4")
+    '("directory_public_share" "G_USER_DIRECTORY_PUBLIC_SHARE" "5")
+    '("directory_templates" "G_USER_DIRECTORY_TEMPLATES" "6")
+    '("directory_videos" "G_USER_DIRECTORY_VIDEOS" "7")
+    '("n_directories" "G_USER_N_DIRECTORIES" "8")
   )
 )
 
-;; 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" "'{'")
+    '("boolean" "G_VARIANT_CLASS_BOOLEAN" "98")
+    '("byte" "G_VARIANT_CLASS_BYTE" "121")
+    '("int16" "G_VARIANT_CLASS_INT16" "110")
+    '("uint16" "G_VARIANT_CLASS_UINT16" "113")
+    '("int32" "G_VARIANT_CLASS_INT32" "105")
+    '("uint32" "G_VARIANT_CLASS_UINT32" "117")
+    '("int64" "G_VARIANT_CLASS_INT64" "120")
+    '("uint64" "G_VARIANT_CLASS_UINT64" "116")
+    '("handle" "G_VARIANT_CLASS_HANDLE" "104")
+    '("double" "G_VARIANT_CLASS_DOUBLE" "100")
+    '("string" "G_VARIANT_CLASS_STRING" "115")
+    '("object_path" "G_VARIANT_CLASS_OBJECT_PATH" "111")
+    '("signature" "G_VARIANT_CLASS_SIGNATURE" "103")
+    '("variant" "G_VARIANT_CLASS_VARIANT" "118")
+    '("maybe" "G_VARIANT_CLASS_MAYBE" "109")
+    '("array" "G_VARIANT_CLASS_ARRAY" "97")
+    '("tuple" "G_VARIANT_CLASS_TUPLE" "40")
+    '("dict_entry" "G_VARIANT_CLASS_DICT_ENTRY" "123")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   G_VARIANT_PARSE_ERROR_FAILED,
-;;   G_VARIANT_PARSE_ERROR_BASIC_TYPE_EXPECTED,
-;;   G_VARIANT_PARSE_ERROR_CANNOT_INFER_TYPE,
-;;   G_VARIANT_PARSE_ERROR_DEFINITE_TYPE_EXPECTED,
-;;   G_VARIANT_PARSE_ERROR_INPUT_NOT_AT_END,
-;;   G_VARIANT_PARSE_ERROR_INVALID_CHARACTER,
-;;   G_VARIANT_PARSE_ERROR_INVALID_FORMAT_STRING,
-;;   G_VARIANT_PARSE_ERROR_INVALID_OBJECT_PATH,
-;;   G_VARIANT_PARSE_ERROR_INVALID_SIGNATURE,
-;;   G_VARIANT_PARSE_ERROR_INVALID_TYPE_STRING,
-;;   G_VARIANT_PARSE_ERROR_NO_COMMON_TYPE,
-;;   G_VARIANT_PARSE_ERROR_NUMBER_OUT_OF_RANGE,
-;;   G_VARIANT_PARSE_ERROR_NUMBER_TOO_BIG,
-;;   G_VARIANT_PARSE_ERROR_TYPE_ERROR,
-;;   G_VARIANT_PARSE_ERROR_UNEXPECTED_TOKEN,
-;;   G_VARIANT_PARSE_ERROR_UNKNOWN_KEYWORD,
-;;   G_VARIANT_PARSE_ERROR_UNTERMINATED_STRING_CONSTANT,
-;;   G_VARIANT_PARSE_ERROR_VALUE_EXPECTED
-;; } GVariantParseError;
-
 (define-enum-extended VariantParseError
   (in-module "G")
   (c-name "GVariantParseError")
   (values
     '("failed" "G_VARIANT_PARSE_ERROR_FAILED" "0")
-    '("basic-type-expected" "G_VARIANT_PARSE_ERROR_BASIC_TYPE_EXPECTED" "1")
-    '("cannot-infer-type" "G_VARIANT_PARSE_ERROR_CANNOT_INFER_TYPE" "2")
-    '("definite-type-expected" "G_VARIANT_PARSE_ERROR_DEFINITE_TYPE_EXPECTED" "3")
-    '("input-not-at-end" "G_VARIANT_PARSE_ERROR_INPUT_NOT_AT_END" "4")
-    '("invalid-character" "G_VARIANT_PARSE_ERROR_INVALID_CHARACTER" "5")
-    '("invalid-format-string" "G_VARIANT_PARSE_ERROR_INVALID_FORMAT_STRING" "6")
-    '("invalid-object-path" "G_VARIANT_PARSE_ERROR_INVALID_OBJECT_PATH" "7")
-    '("invalid-signature" "G_VARIANT_PARSE_ERROR_INVALID_SIGNATURE" "8")
-    '("invalid-type-string" "G_VARIANT_PARSE_ERROR_INVALID_TYPE_STRING" "9")
-    '("no-common-type" "G_VARIANT_PARSE_ERROR_NO_COMMON_TYPE" "10")
-    '("number-out-of-range" "G_VARIANT_PARSE_ERROR_NUMBER_OUT_OF_RANGE" "11")
-    '("number-too-big" "G_VARIANT_PARSE_ERROR_NUMBER_TOO_BIG" "12")
-    '("type-error" "G_VARIANT_PARSE_ERROR_TYPE_ERROR" "13")
-    '("unexpected-token" "G_VARIANT_PARSE_ERROR_UNEXPECTED_TOKEN" "14")
-    '("unknown-keyword" "G_VARIANT_PARSE_ERROR_UNKNOWN_KEYWORD" "15")
-    '("unterminated-string-constant" "G_VARIANT_PARSE_ERROR_UNTERMINATED_STRING_CONSTANT" "16")
-    '("value-expected" "G_VARIANT_PARSE_ERROR_VALUE_EXPECTED" "17")
-  )
-)
-
-;; From gthread.h
-
-;; 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")
-  (values
-    '("low" "G_THREAD_PRIORITY_LOW" "0")
-    '("normal" "G_THREAD_PRIORITY_NORMAL" "1")
-    '("high" "G_THREAD_PRIORITY_HIGH" "2")
-    '("urgent" "G_THREAD_PRIORITY_URGENT" "3")
+    '("basic_type_expected" "G_VARIANT_PARSE_ERROR_BASIC_TYPE_EXPECTED" "1")
+    '("cannot_infer_type" "G_VARIANT_PARSE_ERROR_CANNOT_INFER_TYPE" "2")
+    '("definite_type_expected" "G_VARIANT_PARSE_ERROR_DEFINITE_TYPE_EXPECTED" "3")
+    '("input_not_at_end" "G_VARIANT_PARSE_ERROR_INPUT_NOT_AT_END" "4")
+    '("invalid_character" "G_VARIANT_PARSE_ERROR_INVALID_CHARACTER" "5")
+    '("invalid_format_string" "G_VARIANT_PARSE_ERROR_INVALID_FORMAT_STRING" "6")
+    '("invalid_object_path" "G_VARIANT_PARSE_ERROR_INVALID_OBJECT_PATH" "7")
+    '("invalid_signature" "G_VARIANT_PARSE_ERROR_INVALID_SIGNATURE" "8")
+    '("invalid_type_string" "G_VARIANT_PARSE_ERROR_INVALID_TYPE_STRING" "9")
+    '("no_common_type" "G_VARIANT_PARSE_ERROR_NO_COMMON_TYPE" "10")
+    '("number_out_of_range" "G_VARIANT_PARSE_ERROR_NUMBER_OUT_OF_RANGE" "11")
+    '("number_too_big" "G_VARIANT_PARSE_ERROR_NUMBER_TOO_BIG" "12")
+    '("type_error" "G_VARIANT_PARSE_ERROR_TYPE_ERROR" "13")
+    '("unexpected_token" "G_VARIANT_PARSE_ERROR_UNEXPECTED_TOKEN" "14")
+    '("unknown_keyword" "G_VARIANT_PARSE_ERROR_UNKNOWN_KEYWORD" "15")
+    '("unterminated_string_constant" "G_VARIANT_PARSE_ERROR_UNTERMINATED_STRING_CONSTANT" "16")
+    '("value_expected" "G_VARIANT_PARSE_ERROR_VALUE_EXPECTED" "17")
   )
 )
 
diff --git a/glib/src/gmodule_enums.defs b/glib/src/gmodule_enums.defs
index a5b3fe3..5a0b96f 100644
--- a/glib/src/gmodule_enums.defs
+++ b/glib/src/gmodule_enums.defs
@@ -1,20 +1,10 @@
-;; 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")
   (c-name "GModuleFlags")
   (values
-    '("lazy" "G_MODULE_BIND_LAZY" "1 << 0")
-    '("local" "G_MODULE_BIND_LOCAL" "1 << 1")
-    '("mask" "G_MODULE_BIND_MASK" "0x03")
+    '("lazy" "G_MODULE_BIND_LAZY" "1")
+    '("local" "G_MODULE_BIND_LOCAL" "2")
+    '("mask" "G_MODULE_BIND_MASK" "3")
   )
 )
 
diff --git a/glib/src/gobject_enums.defs b/glib/src/gobject_enums.defs
index 2119077..fbe784e 100644
--- a/glib/src/gobject_enums.defs
+++ b/glib/src/gobject_enums.defs
@@ -1,193 +1,99 @@
-;; From gbinding.h
-
-;; Original typedef:
-;; typedef enum { /*< prefix=G_BINDING >*/
-;;   G_BINDING_DEFAULT        = 0,
-;; 
-;;   G_BINDING_BIDIRECTIONAL  = 1 << 0,
-;;   G_BINDING_SYNC_CREATE    = 1 << 1,
-;;   G_BINDING_INVERT_BOOLEAN = 1 << 2
-;; } GBindingFlags;
-
 (define-flags-extended BindingFlags
   (in-module "G")
   (c-name "GBindingFlags")
   (values
-    '("default" "G_BINDING_DEFAULT" "0x0")
-    '("bidirectional" "G_BINDING_BIDIRECTIONAL" "1 << 0")
-    '("sync-create" "G_BINDING_SYNC_CREATE" "1 << 1")
-    '("invert-boolean" "G_BINDING_INVERT_BOOLEAN" "1 << 2")
+    '("default" "G_BINDING_DEFAULT" "0")
+    '("bidirectional" "G_BINDING_BIDIRECTIONAL" "1")
+    '("sync_create" "G_BINDING_SYNC_CREATE" "2")
+    '("invert_boolean" "G_BINDING_INVERT_BOOLEAN" "4")
   )
 )
 
-;; From gparam.h
-
-;; Original typedef:
-;; typedef enum
-;; {
-;;   G_PARAM_READABLE            = 1 << 0,
-;;   G_PARAM_WRITABLE            = 1 << 1,
-;;   G_PARAM_READWRITE           = (G_PARAM_READABLE | G_PARAM_WRITABLE),
-;;   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,
-;;   /* User defined flags go here */
-;;   G_PARAM_EXPLICIT_NOTIFY     = 1 << 30,
-;;   G_PARAM_DEPRECATED          = 1 << 31
-;; } GParamFlags;
-
-(define-flags-extended ParamFlags
+(define-flags-extended ConnectFlags
   (in-module "G")
-  (c-name "GParamFlags")
+  (c-name "GConnectFlags")
   (values
-    '("readable" "G_PARAM_READABLE" "1 << 0")
-    '("writable" "G_PARAM_WRITABLE" "1 << 1")
-    '("readwrite" "G_PARAM_READWRITE" "0x3")
-    '("construct" "G_PARAM_CONSTRUCT" "1 << 2")
-    '("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")
-    '("explicit-notify" "G_PARAM_EXPLICIT_NOTIFY" "1 << 30")
-    '("deprecated" "G_PARAM_DEPRECATED" "1 << 31")
+    '("after" "G_CONNECT_AFTER" "1")
+    '("swapped" "G_CONNECT_SWAPPED" "2")
   )
 )
 
-;; 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,
-;;   G_SIGNAL_MUST_COLLECT = 1 << 7,
-;;   G_SIGNAL_DEPRECATED   = 1 << 8
-;; } GSignalFlags;
-
-(define-flags-extended SignalFlags
+(define-flags-extended ParamFlags
   (in-module "G")
-  (c-name "GSignalFlags")
+  (c-name "GParamFlags")
   (values
-    '("run-first" "G_SIGNAL_RUN_FIRST" "1 << 0")
-    '("run-last" "G_SIGNAL_RUN_LAST" "1 << 1")
-    '("run-cleanup" "G_SIGNAL_RUN_CLEANUP" "1 << 2")
-    '("no-recurse" "G_SIGNAL_NO_RECURSE" "1 << 3")
-    '("detailed" "G_SIGNAL_DETAILED" "1 << 4")
-    '("action" "G_SIGNAL_ACTION" "1 << 5")
-    '("no-hooks" "G_SIGNAL_NO_HOOKS" "1 << 6")
-    '("must-collect" "G_SIGNAL_MUST_COLLECT" "1 << 7")
-    '("deprecated" "G_SIGNAL_DEPRECATED" "1 << 8")
+    '("readable" "G_PARAM_READABLE" "1")
+    '("writable" "G_PARAM_WRITABLE" "2")
+    '("readwrite" "G_PARAM_READWRITE" "3")
+    '("construct" "G_PARAM_CONSTRUCT" "4")
+    '("construct_only" "G_PARAM_CONSTRUCT_ONLY" "8")
+    '("lax_validation" "G_PARAM_LAX_VALIDATION" "16")
+    '("static_name" "G_PARAM_STATIC_NAME" "32")
+    '("private" "G_PARAM_PRIVATE" "32")
+    '("static_nick" "G_PARAM_STATIC_NICK" "64")
+    '("static_blurb" "G_PARAM_STATIC_BLURB" "128")
+    '("explicit_notify" "G_PARAM_EXPLICIT_NOTIFY" "1073741824")
+    '("deprecated" "G_PARAM_DEPRECATED" "2147483648")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   G_CONNECT_AFTER   = 1 << 0,
-;;   G_CONNECT_SWAPPED = 1 << 1
-;; } GConnectFlags;
-
-(define-flags-extended ConnectFlags
+(define-flags-extended SignalFlags
   (in-module "G")
-  (c-name "GConnectFlags")
+  (c-name "GSignalFlags")
   (values
-    '("after" "G_CONNECT_AFTER" "1 << 0")
-    '("swapped" "G_CONNECT_SWAPPED" "1 << 1")
+    '("run_first" "G_SIGNAL_RUN_FIRST" "1")
+    '("run_last" "G_SIGNAL_RUN_LAST" "2")
+    '("run_cleanup" "G_SIGNAL_RUN_CLEANUP" "4")
+    '("no_recurse" "G_SIGNAL_NO_RECURSE" "8")
+    '("detailed" "G_SIGNAL_DETAILED" "16")
+    '("action" "G_SIGNAL_ACTION" "32")
+    '("no_hooks" "G_SIGNAL_NO_HOOKS" "64")
+    '("must_collect" "G_SIGNAL_MUST_COLLECT" "128")
+    '("deprecated" "G_SIGNAL_DEPRECATED" "256")
   )
 )
 
-;; 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
+(define-enum-extended SignalMatchType
   (in-module "G")
   (c-name "GSignalMatchType")
   (values
-    '("id" "G_SIGNAL_MATCH_ID" "1 << 0")
-    '("detail" "G_SIGNAL_MATCH_DETAIL" "1 << 1")
-    '("closure" "G_SIGNAL_MATCH_CLOSURE" "1 << 2")
-    '("func" "G_SIGNAL_MATCH_FUNC" "1 << 3")
-    '("data" "G_SIGNAL_MATCH_DATA" "1 << 4")
-    '("unblocked" "G_SIGNAL_MATCH_UNBLOCKED" "1 << 5")
+    '("id" "G_SIGNAL_MATCH_ID" "1")
+    '("detail" "G_SIGNAL_MATCH_DETAIL" "2")
+    '("closure" "G_SIGNAL_MATCH_CLOSURE" "4")
+    '("func" "G_SIGNAL_MATCH_FUNC" "8")
+    '("data" "G_SIGNAL_MATCH_DATA" "16")
+    '("unblocked" "G_SIGNAL_MATCH_UNBLOCKED" "32")
   )
 )
 
-;; 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" "0x0")
-    '("objects" "G_TYPE_DEBUG_OBJECTS" "1 << 0")
-    '("signals" "G_TYPE_DEBUG_SIGNALS" "1 << 1")
-    '("mask" "G_TYPE_DEBUG_MASK" "0x03")
+    '("none" "G_TYPE_DEBUG_NONE" "0")
+    '("objects" "G_TYPE_DEBUG_OBJECTS" "1")
+    '("signals" "G_TYPE_DEBUG_SIGNALS" "2")
+    '("mask" "G_TYPE_DEBUG_MASK" "3")
   )
 )
 
-;; 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
+(define-flags-extended TypeFlags
   (in-module "G")
-  (c-name "GTypeFundamentalFlags")
+  (c-name "GTypeFlags")
   (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)")
+    '("abstract" "G_TYPE_FLAG_ABSTRACT" "16")
+    '("value_abstract" "G_TYPE_FLAG_VALUE_ABSTRACT" "32")
   )
 )
 
-;; Original typedef:
-;; typedef enum    /*< skip >*/
-;; {
-;;   G_TYPE_FLAG_ABSTRACT              = (1 << 4),
-;;   G_TYPE_FLAG_VALUE_ABSTRACT        = (1 << 5)
-;; } GTypeFlags;
-
-(define-flags-extended TypeFlags
+(define-flags-extended TypeFundamentalFlags
   (in-module "G")
-  (c-name "GTypeFlags")
+  (c-name "GTypeFundamentalFlags")
   (values
-    '("abstract" "G_TYPE_FLAG_ABSTRACT" "(1 << 4)")
-    '("value-abstract" "G_TYPE_FLAG_VALUE_ABSTRACT" "(1 << 5)")
+    '("classed" "G_TYPE_FLAG_CLASSED" "1")
+    '("instantiatable" "G_TYPE_FLAG_INSTANTIATABLE" "2")
+    '("derivable" "G_TYPE_FLAG_DERIVABLE" "4")
+    '("deep_derivable" "G_TYPE_FLAG_DEEP_DERIVABLE" "8")
   )
 )
 
diff --git a/tools/gen_scripts/gio_generate_enums.sh b/tools/gen_scripts/gio_generate_enums.sh
index e755bc6..6f1fcb4 100755
--- a/tools/gen_scripts/gio_generate_enums.sh
+++ b/tools/gen_scripts/gio_generate_enums.sh
@@ -12,7 +12,7 @@ fi
 PREFIX="$JHBUILD_SOURCES/glib"
 ROOT_DIR="$(dirname "$0")/../.."
 OUT_DIR="$ROOT_DIR/gio/src"
+GIR_DIR="$ROOT_DIR/gir"
 
-ENUM_PL="$JHBUILD_SOURCES/glibmm/tools/enum.pl"
-$ENUM_PL "$PREFIX"/gio/*.h > "$OUT_DIR"/gio_enums.defs
-patch "$OUT_DIR"/gio_enums.defs "$OUT_DIR"/gio_enums.defs.patch
+ENUM_PY="$JHBUILD_SOURCES/glibmm/tools/defs_gen/gir-defs-generator.py"
+$ENUM_PY "$GIR_DIR"/Gio-2.0.gir > "$OUT_DIR"/gio_enums.defs
diff --git a/tools/gen_scripts/glib_generate_enums.sh b/tools/gen_scripts/glib_generate_enums.sh
index c6ff6fe..21f6992 100755
--- a/tools/gen_scripts/glib_generate_enums.sh
+++ b/tools/gen_scripts/glib_generate_enums.sh
@@ -12,10 +12,9 @@ fi
 PREFIX="$JHBUILD_SOURCES/glib"
 ROOT_DIR="$(dirname "$0")/../.."
 OUT_DIR="$ROOT_DIR/glib/src"
+GIR_DIR="$ROOT_DIR/gir"
 
-ENUM_PL="$JHBUILD_SOURCES/glibmm/tools/enum.pl"
-$ENUM_PL "$PREFIX"/glib/*.h "$PREFIX"/glib/deprecated/*.h > "$OUT_DIR"/glib_enums.defs
-patch "$OUT_DIR"/glib_enums.defs "$OUT_DIR"/glib_enums.defs.patch
-
-$ENUM_PL "$PREFIX"/gmodule/*.h > "$OUT_DIR"/gmodule_enums.defs
-$ENUM_PL "$PREFIX"/gobject/*.h > "$OUT_DIR"/gobject_enums.defs
+ENUM_PY="$JHBUILD_SOURCES/glibmm/tools/defs_gen/gir-defs-generator.py"
+$ENUM_PY "$GIR_DIR"/GLib-2.0.gir > "$OUT_DIR"/glib_enums.defs
+$ENUM_PY "$GIR_DIR"/GModule-2.0.gir > "$OUT_DIR"/gmodule_enums.defs
+$ENUM_PY "$GIR_DIR"/GObject-2.0.gir > "$OUT_DIR"/gobject_enums.defs


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