[glibmm/mkolny/use-mmgirgenerator] Add files generated by mmgirgenerator, script running mmgirgenerator



commit f2eb2003628fdfb373d5a3caa83ea4aa91bde349
Author: Marcin Kolny <marcin kolny gmail com>
Date:   Sat Nov 5 14:17:38 2016 +0100

    Add files generated by mmgirgenerator, script running mmgirgenerator

 gio/src/gio_enums.defs                    | 2030 ++++----------
 gio/src/gio_enums.defs.patch              |   20 +-
 gio/src/gio_signals.defs                  | 3037 ++++++++++-----------
 gio/src/gio_signals.defs.patch            |   61 +-
 gio/src/gio_vfuncs.defs                   | 4386 +++++++++++++++++++++++------
 gio/src/gio_vfuncs.defs.patch             |   30 +
 gio/src/settings.hg                       |    2 +-
 glib/src/filelist.am                      |    2 -
 glib/src/glib.defs                        |    2 -
 glib/src/glib_enums.defs                  | 2230 +++++-----------
 glib/src/glib_enums.defs.patch            |   48 +-
 glib/src/glib_signals.defs                |   63 +-
 glib/src/glib_vfuncs.defs                 |   92 +
 glib/src/gmodule_enums.defs               |   20 -
 glib/src/gobject_enums.defs               |  195 --
 tools/gen_scripts/glibmm_generate_defs.sh |   59 +
 16 files changed, 6488 insertions(+), 5789 deletions(-)
---
diff --git a/gio/src/gio_enums.defs b/gio/src/gio_enums.defs
index 98a7922..13d196f 100644
--- a/gio/src/gio_enums.defs
+++ b/gio/src/gio_enums.defs
@@ -1,74 +1,83 @@
-;; 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 "Gio")
+  (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
-  (in-module "G")
-  (c-name "GDBusAuthMechanismState")
+(define-flags-extended ApplicationFlags
+  (in-module "Gio")
+  (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")
+    '("can_override_app_id" "G_APPLICATION_CAN_OVERRIDE_APP_ID" "64")
   )
 )
 
-;; From gioenums.h
+(define-flags-extended AskPasswordFlags
+  (in-module "Gio")
+  (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 "Gio")
+  (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
-  (in-module "G")
-  (c-name "GAppInfoCreateFlags")
+(define-flags-extended BusNameWatcherFlags
+  (in-module "Gio")
+  (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 "Gio")
+  (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")
+  (in-module "Gio")
   (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")
+  (in-module "Gio")
   (c-name "GConverterResult")
   (values
     '("error" "G_CONVERTER_ERROR" "0")
@@ -78,550 +87,275 @@
   )
 )
 
-;; Original typedef:
-;; typedef enum {
-;;   G_DATA_STREAM_BYTE_ORDER_BIG_ENDIAN,
-;;   G_DATA_STREAM_BYTE_ORDER_LITTLE_ENDIAN,
-;;   G_DATA_STREAM_BYTE_ORDER_HOST_ENDIAN
-;; } GDataStreamByteOrder;
-
-(define-enum-extended DataStreamByteOrder
-  (in-module "G")
-  (c-name "GDataStreamByteOrder")
+(define-enum-extended CredentialsType
+  (in-module "Gio")
+  (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
-  (in-module "G")
-  (c-name "GDataStreamNewlineType")
+(define-flags-extended DBusCallFlags
+  (in-module "Gio")
+  (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")
+    '("allow_interactive_authorization" "G_DBUS_CALL_FLAGS_ALLOW_INTERACTIVE_AUTHORIZATION" "2")
   )
 )
 
-;; Original typedef:
-;; typedef enum {
-;;   G_FILE_ATTRIBUTE_TYPE_INVALID = 0,
-;;   G_FILE_ATTRIBUTE_TYPE_STRING,
-;;   G_FILE_ATTRIBUTE_TYPE_BYTE_STRING, /* zero terminated string of non-zero bytes */
-;;   G_FILE_ATTRIBUTE_TYPE_BOOLEAN,
-;;   G_FILE_ATTRIBUTE_TYPE_UINT32,
-;;   G_FILE_ATTRIBUTE_TYPE_INT32,
-;;   G_FILE_ATTRIBUTE_TYPE_UINT64,
-;;   G_FILE_ATTRIBUTE_TYPE_INT64,
-;;   G_FILE_ATTRIBUTE_TYPE_OBJECT,
-;;   G_FILE_ATTRIBUTE_TYPE_STRINGV
-;; } GFileAttributeType;
-
-(define-enum-extended FileAttributeType
-  (in-module "G")
-  (c-name "GFileAttributeType")
+(define-flags-extended DBusCapabilityFlags
+  (in-module "Gio")
+  (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
-  (in-module "G")
-  (c-name "GFileAttributeInfoFlags")
+(define-flags-extended DBusConnectionFlags
+  (in-module "Gio")
+  (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
-  (in-module "G")
-  (c-name "GFileAttributeStatus")
+(define-enum-extended DBusError
+  (in-module "Gio")
+  (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
-  (in-module "G")
-  (c-name "GFileQueryInfoFlags")
+(define-flags-extended DBusInterfaceSkeletonFlags
+  (in-module "Gio")
+  (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
-  (in-module "G")
-  (c-name "GFileCreateFlags")
+(define-enum-extended DBusMessageByteOrder
+  (in-module "Gio")
+  (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
-  (in-module "G")
-  (c-name "GFileMeasureFlags")
+(define-flags-extended DBusMessageFlags
+  (in-module "Gio")
+  (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")
+    '("allow_interactive_authorization" "G_DBUS_MESSAGE_FLAGS_ALLOW_INTERACTIVE_AUTHORIZATION" "4")
   )
 )
 
-;; Original typedef:
-;; typedef enum /*< flags >*/ {
-;;   G_MOUNT_MOUNT_NONE = 0
-;; } GMountMountFlags;
-
-(define-flags-extended MountMountFlags
-  (in-module "G")
-  (c-name "GMountMountFlags")
+(define-enum-extended DBusMessageHeaderField
+  (in-module "Gio")
+  (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
-  (in-module "G")
-  (c-name "GMountUnmountFlags")
+(define-enum-extended DBusMessageType
+  (in-module "Gio")
+  (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
-  (in-module "G")
-  (c-name "GDriveStartFlags")
+(define-flags-extended DBusObjectManagerClientFlags
+  (in-module "Gio")
+  (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
-  (in-module "G")
-  (c-name "GDriveStartStopType")
+(define-flags-extended DBusPropertyInfoFlags
+  (in-module "Gio")
+  (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
-  (in-module "G")
-  (c-name "GFileCopyFlags")
+(define-flags-extended DBusProxyFlags
+  (in-module "Gio")
+  (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),
-;;   G_FILE_MONITOR_WATCH_MOVES      = (1 << 3)
-;; } GFileMonitorFlags;
-
-(define-flags-extended FileMonitorFlags
-  (in-module "G")
-  (c-name "GFileMonitorFlags")
+(define-flags-extended DBusSendMessageFlags
+  (in-module "Gio")
+  (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)")
-    '("watch-moves" "G_FILE_MONITOR_WATCH_MOVES" "(1 << 3)")
+    '("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")
+(define-flags-extended DBusServerFlags
+  (in-module "Gio")
+  (c-name "GDBusServerFlags")
   (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")
+    '("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_FILESYSTEM_PREVIEW_TYPE_IF_ALWAYS = 0,
-;;   G_FILESYSTEM_PREVIEW_TYPE_IF_LOCAL,
-;;   G_FILESYSTEM_PREVIEW_TYPE_NEVER
-;; } GFilesystemPreviewType;
-
-(define-enum-extended FilesystemPreviewType
-  (in-module "G")
-  (c-name "GFilesystemPreviewType")
+(define-flags-extended DBusSignalFlags
+  (in-module "Gio")
+  (c-name "GDBusSignalFlags")
   (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_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_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,
-;;   G_FILE_MONITOR_EVENT_RENAMED,
-;;   G_FILE_MONITOR_EVENT_MOVED_IN,
-;;   G_FILE_MONITOR_EVENT_MOVED_OUT
-;; } GFileMonitorEvent;
-
-(define-enum-extended FileMonitorEvent
-  (in-module "G")
-  (c-name "GFileMonitorEvent")
-  (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")
-    '("renamed" "G_FILE_MONITOR_EVENT_RENAMED" "8")
-    '("moved-in" "G_FILE_MONITOR_EVENT_MOVED_IN" "9")
-    '("moved-out" "G_FILE_MONITOR_EVENT_MOVED_OUT" "10")
-  )
-)
-
-;; 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,
-;;   G_IO_ERROR_CONNECTION_CLOSED = G_IO_ERROR_BROKEN_PIPE,
-;;   G_IO_ERROR_NOT_CONNECTED,
-;;   G_IO_ERROR_MESSAGE_TOO_LARGE
-;; } 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")
-    '("connection-closed" "G_IO_ERROR_CONNECTION_CLOSED" "44")
-    '("not-connected" "G_IO_ERROR_NOT_CONNECTED" "45")
-    '("message-too-large" "G_IO_ERROR_MESSAGE_TOO_LARGE" "46")
-  )
-)
-
-;; Original typedef:
-;; typedef enum {
-;;   G_ASK_PASSWORD_NEED_PASSWORD       = (1 << 0),
-;;   G_ASK_PASSWORD_NEED_USERNAME       = (1 << 1),
-;;   G_ASK_PASSWORD_NEED_DOMAIN         = (1 << 2),
-;;   G_ASK_PASSWORD_SAVING_SUPPORTED    = (1 << 3),
-;;   G_ASK_PASSWORD_ANONYMOUS_SUPPORTED = (1 << 4)
-;; } GAskPasswordFlags;
-
-(define-flags-extended AskPasswordFlags
-  (in-module "G")
-  (c-name "GAskPasswordFlags")
+(define-flags-extended DBusSubtreeFlags
+  (in-module "Gio")
+  (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
-  (in-module "G")
-  (c-name "GPasswordSave")
+(define-enum-extended DataStreamByteOrder
+  (in-module "Gio")
+  (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
-  (in-module "G")
-  (c-name "GMountOperationResult")
+(define-enum-extended DataStreamNewlineType
+  (in-module "Gio")
+  (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
-  (in-module "G")
-  (c-name "GOutputStreamSpliceFlags")
+(define-flags-extended DriveStartFlags
+  (in-module "Gio")
+  (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
-  (in-module "G")
-  (c-name "GIOStreamSpliceFlags")
+(define-enum-extended DriveStartStopType
+  (in-module "Gio")
+  (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")
+  (in-module "Gio")
   (c-name "GEmblemOrigin")
   (values
     '("unknown" "G_EMBLEM_ORIGIN_UNKNOWN" "0")
@@ -631,1087 +365,557 @@
   )
 )
 
-;; 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
-  (in-module "G")
-  (c-name "GResolverRecordType")
+(define-flags-extended FileAttributeInfoFlags
+  (in-module "Gio")
+  (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
-  (in-module "G")
-  (c-name "GResourceError")
+(define-enum-extended FileAttributeStatus
+  (in-module "Gio")
+  (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
-  (in-module "G")
-  (c-name "GResourceFlags")
+(define-enum-extended FileAttributeType
+  (in-module "Gio")
+  (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
-  (in-module "G")
-  (c-name "GResourceLookupFlags")
+(define-flags-extended FileCopyFlags
+  (in-module "Gio")
+  (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
-  (in-module "G")
-  (c-name "GSocketFamily")
+(define-flags-extended FileCreateFlags
+  (in-module "Gio")
+  (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
-  (in-module "G")
-  (c-name "GSocketType")
+(define-flags-extended FileMeasureFlags
+  (in-module "Gio")
+  (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
-  (in-module "G")
-  (c-name "GSocketMsgFlags")
+(define-enum-extended FileMonitorEvent
+  (in-module "Gio")
+  (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")
+    '("renamed" "G_FILE_MONITOR_EVENT_RENAMED" "8")
+    '("moved_in" "G_FILE_MONITOR_EVENT_MOVED_IN" "9")
+    '("moved_out" "G_FILE_MONITOR_EVENT_MOVED_OUT" "10")
   )
 )
 
-;; Original typedef:
-;; typedef enum {
-;;   G_SOCKET_PROTOCOL_UNKNOWN = -1,
-;;   G_SOCKET_PROTOCOL_DEFAULT = 0,
-;;   G_SOCKET_PROTOCOL_TCP     = 6,
-;;   G_SOCKET_PROTOCOL_UDP     = 17,
-;;   G_SOCKET_PROTOCOL_SCTP    = 132
-;; } GSocketProtocol;
-
-(define-enum-extended SocketProtocol
-  (in-module "G")
-  (c-name "GSocketProtocol")
+(define-flags-extended FileMonitorFlags
+  (in-module "Gio")
+  (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")
+    '("watch_moves" "G_FILE_MONITOR_WATCH_MOVES" "8")
   )
 )
 
-;; Original typedef:
-;; typedef enum {
-;;   G_ZLIB_COMPRESSOR_FORMAT_ZLIB,
-;;   G_ZLIB_COMPRESSOR_FORMAT_GZIP,
-;;   G_ZLIB_COMPRESSOR_FORMAT_RAW
-;; } GZlibCompressorFormat;
-
-(define-enum-extended ZlibCompressorFormat
-  (in-module "G")
-  (c-name "GZlibCompressorFormat")
+(define-flags-extended FileQueryInfoFlags
+  (in-module "Gio")
+  (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
-  (in-module "G")
-  (c-name "GUnixSocketAddressType")
+(define-enum-extended FileType
+  (in-module "Gio")
+  (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
-  (in-module "G")
-  (c-name "GBusType")
+(define-enum-extended FilesystemPreviewType
+  (in-module "Gio")
+  (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
-  (in-module "G")
-  (c-name "GBusNameOwnerFlags")
+(define-enum-extended IOErrorEnum
+  (in-module "Gio")
+  (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)")
-  )
-)
-
-;; 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
-  (in-module "G")
-  (c-name "GBusNameWatcherFlags")
+    '("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")
+    '("connection_closed" "G_IO_ERROR_CONNECTION_CLOSED" "44")
+    '("not_connected" "G_IO_ERROR_NOT_CONNECTED" "45")
+    '("message_too_large" "G_IO_ERROR_MESSAGE_TOO_LARGE" "46")
+  )
+)
+
+(define-enum-extended IOModuleScopeFlags
+  (in-module "Gio")
+  (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
-  (in-module "G")
-  (c-name "GDBusConnectionFlags")
+(define-flags-extended IOStreamSpliceFlags
+  (in-module "Gio")
+  (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
-  (in-module "G")
-  (c-name "GDBusCapabilityFlags")
+(define-flags-extended MountMountFlags
+  (in-module "Gio")
+  (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),
-;;   G_DBUS_CALL_FLAGS_ALLOW_INTERACTIVE_AUTHORIZATION = (1<<1)
-;; } GDBusCallFlags;
-
-(define-flags-extended DBusCallFlags
-  (in-module "G")
-  (c-name "GDBusCallFlags")
+(define-enum-extended MountOperationResult
+  (in-module "Gio")
+  (c-name "GMountOperationResult")
   (values
-    '("none" "G_DBUS_CALL_FLAGS_NONE" "0x0")
-    '("no-auto-start" "G_DBUS_CALL_FLAGS_NO_AUTO_START" "(1<<0)")
-    '("allow-interactive-authorization" "G_DBUS_CALL_FLAGS_ALLOW_INTERACTIVE_AUTHORIZATION" "(1<<1)")
+    '("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
-  (in-module "G")
-  (c-name "GDBusMessageType")
+(define-flags-extended MountUnmountFlags
+  (in-module "Gio")
+  (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),
-;;   G_DBUS_MESSAGE_FLAGS_ALLOW_INTERACTIVE_AUTHORIZATION = (1<<2)
-;; } GDBusMessageFlags;
-
-(define-flags-extended DBusMessageFlags
-  (in-module "G")
-  (c-name "GDBusMessageFlags")
+(define-enum-extended NetworkConnectivity
+  (in-module "Gio")
+  (c-name "GNetworkConnectivity")
   (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)")
-    '("allow-interactive-authorization" "G_DBUS_MESSAGE_FLAGS_ALLOW_INTERACTIVE_AUTHORIZATION" "(1<<2)")
+    '("local" "G_NETWORK_CONNECTIVITY_LOCAL" "1")
+    '("limited" "G_NETWORK_CONNECTIVITY_LIMITED" "2")
+    '("portal" "G_NETWORK_CONNECTIVITY_PORTAL" "3")
+    '("full" "G_NETWORK_CONNECTIVITY_FULL" "4")
   )
 )
 
-;; 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
-  (in-module "G")
-  (c-name "GDBusMessageHeaderField")
+(define-enum-extended NotificationPriority
+  (in-module "Gio")
+  (c-name "GNotificationPriority")
   (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")
+    '("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_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
-  (in-module "G")
-  (c-name "GDBusPropertyInfoFlags")
+(define-flags-extended OutputStreamSpliceFlags
+  (in-module "Gio")
+  (c-name "GOutputStreamSpliceFlags")
   (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)")
+    '("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_SUBTREE_FLAGS_NONE = 0,
-;;   G_DBUS_SUBTREE_FLAGS_DISPATCH_TO_UNENUMERATED_NODES = (1<<0)
-;; } GDBusSubtreeFlags;
-
-(define-flags-extended DBusSubtreeFlags
-  (in-module "G")
-  (c-name "GDBusSubtreeFlags")
+(define-enum-extended PasswordSave
+  (in-module "Gio")
+  (c-name "GPasswordSave")
   (values
-    '("none" "G_DBUS_SUBTREE_FLAGS_NONE" "0x0")
-    '("dispatch-to-unenumerated-nodes" "G_DBUS_SUBTREE_FLAGS_DISPATCH_TO_UNENUMERATED_NODES" "(1<<0)")
+    '("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_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
-  (in-module "G")
-  (c-name "GDBusServerFlags")
+(define-enum-extended ResolverError
+  (in-module "Gio")
+  (c-name "GResolverError")
   (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)")
+    '("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 /*< 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
-  (in-module "G")
-  (c-name "GDBusSignalFlags")
+(define-enum-extended ResolverRecordType
+  (in-module "Gio")
+  (c-name "GResolverRecordType")
   (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)")
+    '("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
-;; {
-;;   G_DBUS_SEND_MESSAGE_FLAGS_NONE = 0,
-;;   G_DBUS_SEND_MESSAGE_FLAGS_PRESERVE_SERIAL = (1<<0)
-;; } GDBusSendMessageFlags;
-
-(define-flags-extended DBusSendMessageFlags
-  (in-module "G")
-  (c-name "GDBusSendMessageFlags")
+(define-enum-extended ResourceError
+  (in-module "Gio")
+  (c-name "GResourceError")
   (values
-    '("none" "G_DBUS_SEND_MESSAGE_FLAGS_NONE" "0x0")
-    '("preserve-serial" "G_DBUS_SEND_MESSAGE_FLAGS_PRESERVE_SERIAL" "(1<<0)")
+    '("not_found" "G_RESOURCE_ERROR_NOT_FOUND" "0")
+    '("internal" "G_RESOURCE_ERROR_INTERNAL" "1")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   G_CREDENTIALS_TYPE_INVALID,
-;;   G_CREDENTIALS_TYPE_LINUX_UCRED,
-;;   G_CREDENTIALS_TYPE_FREEBSD_CMSGCRED,
-;;   G_CREDENTIALS_TYPE_OPENBSD_SOCKPEERCRED,
-;;   G_CREDENTIALS_TYPE_SOLARIS_UCRED,
-;;   G_CREDENTIALS_TYPE_NETBSD_UNPCBID
-;; } GCredentialsType;
-
-(define-enum-extended CredentialsType
-  (in-module "G")
-  (c-name "GCredentialsType")
+(define-flags-extended ResourceFlags
+  (in-module "Gio")
+  (c-name "GResourceFlags")
   (values
-    '("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")
+    '("none" "G_RESOURCE_FLAGS_NONE" "0")
+    '("compressed" "G_RESOURCE_FLAGS_COMPRESSED" "1")
   )
 )
 
-;; 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
-  (in-module "G")
-  (c-name "GDBusMessageByteOrder")
+(define-flags-extended ResourceLookupFlags
+  (in-module "Gio")
+  (c-name "GResourceLookupFlags")
   (values
-    '("big-endian" "G_DBUS_MESSAGE_BYTE_ORDER_BIG_ENDIAN" "0")
-    '("little-endian" "G_DBUS_MESSAGE_BYTE_ORDER_LITTLE_ENDIAN" "'l'")
+    '("none" "G_RESOURCE_LOOKUP_FLAGS_NONE" "0")
   )
 )
 
-;; 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),
-;; 
-;;   G_APPLICATION_CAN_OVERRIDE_APP_ID =  (1 << 6)
-;; } GApplicationFlags;
-
-(define-flags-extended ApplicationFlags
-  (in-module "G")
-  (c-name "GApplicationFlags")
+(define-flags-extended SettingsBindFlags
+  (in-module "Gio")
+  (c-name "GSettingsBindFlags")
   (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)")
-    '("can-override-app-id" "G_APPLICATION_CAN_OVERRIDE_APP_ID" "(1 << 6)")
+    '("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_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
-  (in-module "G")
-  (c-name "GTlsError")
+(define-enum-extended SocketClientEvent
+  (in-module "Gio")
+  (c-name "GSocketClientEvent")
   (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")
+    '("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_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
-  (in-module "G")
-  (c-name "GTlsCertificateFlags")
+(define-enum-extended SocketFamily
+  (in-module "Gio")
+  (c-name "GSocketFamily")
   (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")
+    '("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_AUTHENTICATION_NONE,
-;;   G_TLS_AUTHENTICATION_REQUESTED,
-;;   G_TLS_AUTHENTICATION_REQUIRED
-;; } GTlsAuthenticationMode;
-
-(define-enum-extended TlsAuthenticationMode
-  (in-module "G")
-  (c-name "GTlsAuthenticationMode")
+(define-enum-extended SocketListenerEvent
+  (in-module "Gio")
+  (c-name "GSocketListenerEvent")
   (values
-    '("none" "G_TLS_AUTHENTICATION_NONE" "0")
-    '("requested" "G_TLS_AUTHENTICATION_REQUESTED" "1")
-    '("required" "G_TLS_AUTHENTICATION_REQUIRED" "2")
+    '("binding" "G_SOCKET_LISTENER_BINDING" "0")
+    '("bound" "G_SOCKET_LISTENER_BOUND" "1")
+    '("listening" "G_SOCKET_LISTENER_LISTENING" "2")
+    '("listened" "G_SOCKET_LISTENER_LISTENED" "3")
   )
 )
 
-;; Original typedef:
-;; typedef enum {
-;;   G_TLS_REHANDSHAKE_NEVER,
-;;   G_TLS_REHANDSHAKE_SAFELY,
-;;   G_TLS_REHANDSHAKE_UNSAFELY
-;; } GTlsRehandshakeMode;
-
-(define-enum-extended TlsRehandshakeMode
-  (in-module "G")
-  (c-name "GTlsRehandshakeMode")
+(define-flags-extended SocketMsgFlags
+  (in-module "Gio")
+  (c-name "GSocketMsgFlags")
   (values
-    '("never" "G_TLS_REHANDSHAKE_NEVER" "0")
-    '("safely" "G_TLS_REHANDSHAKE_SAFELY" "1")
-    '("unsafely" "G_TLS_REHANDSHAKE_UNSAFELY" "2")
+    '("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 _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
-  (in-module "G")
-  (c-name "GTlsPasswordFlags")
+(define-enum-extended SocketProtocol
+  (in-module "Gio")
+  (c-name "GSocketProtocol")
   (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")
+    '("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_INTERACTION_UNHANDLED,
-;;   G_TLS_INTERACTION_HANDLED,
-;;   G_TLS_INTERACTION_FAILED
-;; } GTlsInteractionResult;
-
-(define-enum-extended TlsInteractionResult
-  (in-module "G")
-  (c-name "GTlsInteractionResult")
+(define-enum-extended SocketType
+  (in-module "Gio")
+  (c-name "GSocketType")
   (values
-    '("unhandled" "G_TLS_INTERACTION_UNHANDLED" "0")
-    '("handled" "G_TLS_INTERACTION_HANDLED" "1")
-    '("failed" "G_TLS_INTERACTION_FAILED" "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
-;; {
-;;   G_DBUS_INTERFACE_SKELETON_FLAGS_NONE = 0,
-;;   G_DBUS_INTERFACE_SKELETON_FLAGS_HANDLE_METHOD_INVOCATIONS_IN_THREAD = (1<<0)
-;; } GDBusInterfaceSkeletonFlags;
-
-(define-flags-extended DBusInterfaceSkeletonFlags
-  (in-module "G")
-  (c-name "GDBusInterfaceSkeletonFlags")
+(define-flags-extended SubprocessFlags
+  (in-module "Gio")
+  (c-name "GSubprocessFlags")
   (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_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_DBUS_OBJECT_MANAGER_CLIENT_FLAGS_NONE = 0,
-;;   G_DBUS_OBJECT_MANAGER_CLIENT_FLAGS_DO_NOT_AUTO_START = (1<<0)
-;; } GDBusObjectManagerClientFlags;
-
-(define-flags-extended DBusObjectManagerClientFlags
-  (in-module "G")
-  (c-name "GDBusObjectManagerClientFlags")
+(define-flags-extended TestDBusFlags
+  (in-module "Gio")
+  (c-name "GTestDBusFlags")
   (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)")
+    '("none" "G_TEST_DBUS_NONE" "0")
   )
 )
 
-;; Original typedef:
-;; typedef enum /*< flags >*/ {
-;;   G_TLS_DATABASE_VERIFY_NONE = 0
-;; } GTlsDatabaseVerifyFlags;
-
-(define-flags-extended TlsDatabaseVerifyFlags
-  (in-module "G")
-  (c-name "GTlsDatabaseVerifyFlags")
+(define-enum-extended TlsAuthenticationMode
+  (in-module "Gio")
+  (c-name "GTlsAuthenticationMode")
   (values
-    '("none" "G_TLS_DATABASE_VERIFY_NONE" "0x0")
+    '("none" "G_TLS_AUTHENTICATION_NONE" "0")
+    '("requested" "G_TLS_AUTHENTICATION_REQUESTED" "1")
+    '("required" "G_TLS_AUTHENTICATION_REQUIRED" "2")
   )
 )
 
-;; 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")
+(define-flags-extended TlsCertificateFlags
+  (in-module "Gio")
+  (c-name "GTlsCertificateFlags")
   (values
-    '("none" "G_TLS_DATABASE_LOOKUP_NONE" "0x0")
-    '("keypair" "G_TLS_DATABASE_LOOKUP_KEYPAIR" "0x1")
+    '("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 {
-;;   G_TLS_CERTIFICATE_REQUEST_NONE = 0
-;; } GTlsCertificateRequestFlags;
-
-(define-flags-extended TlsCertificateRequestFlags
-  (in-module "G")
+(define-enum-extended TlsCertificateRequestFlags
+  (in-module "Gio")
   (c-name "GTlsCertificateRequestFlags")
   (values
-    '("none" "G_TLS_CERTIFICATE_REQUEST_NONE" "0x0")
+    '("none" "G_TLS_CERTIFICATE_REQUEST_NONE" "0")
   )
 )
 
-;; Original typedef:
-;; typedef enum {
-;;   G_IO_MODULE_SCOPE_NONE,
-;;   G_IO_MODULE_SCOPE_BLOCK_DUPLICATES
-;; } GIOModuleScopeFlags;
-
-(define-flags-extended IOModuleScopeFlags
-  (in-module "G")
-  (c-name "GIOModuleScopeFlags")
+(define-enum-extended TlsDatabaseLookupFlags
+  (in-module "Gio")
+  (c-name "GTlsDatabaseLookupFlags")
   (values
-    '("none" "G_IO_MODULE_SCOPE_NONE" "0x0")
-    '("block-duplicates" "G_IO_MODULE_SCOPE_BLOCK_DUPLICATES" "0x1")
+    '("none" "G_TLS_DATABASE_LOOKUP_NONE" "0")
+    '("keypair" "G_TLS_DATABASE_LOOKUP_KEYPAIR" "1")
   )
 )
 
-;; 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
-  (in-module "G")
-  (c-name "GSocketClientEvent")
+(define-flags-extended TlsDatabaseVerifyFlags
+  (in-module "Gio")
+  (c-name "GTlsDatabaseVerifyFlags")
   (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")
+    '("none" "G_TLS_DATABASE_VERIFY_NONE" "0")
   )
 )
 
-;; Original typedef:
-;; typedef enum {
-;;   G_SOCKET_LISTENER_BINDING,
-;;   G_SOCKET_LISTENER_BOUND,
-;;   G_SOCKET_LISTENER_LISTENING,
-;;   G_SOCKET_LISTENER_LISTENED
-;; } GSocketListenerEvent;
-
-(define-enum-extended SocketListenerEvent
-  (in-module "G")
-  (c-name "GSocketListenerEvent")
+(define-enum-extended TlsError
+  (in-module "Gio")
+  (c-name "GTlsError")
   (values
-    '("binding" "G_SOCKET_LISTENER_BINDING" "0")
-    '("bound" "G_SOCKET_LISTENER_BOUND" "1")
-    '("listening" "G_SOCKET_LISTENER_LISTENING" "2")
-    '("listened" "G_SOCKET_LISTENER_LISTENED" "3")
+    '("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 /*< flags >*/ {
-;;   G_TEST_DBUS_NONE = 0
-;; } GTestDBusFlags;
-
-(define-flags-extended TestDBusFlags
-  (in-module "G")
-  (c-name "GTestDBusFlags")
+(define-enum-extended TlsInteractionResult
+  (in-module "Gio")
+  (c-name "GTlsInteractionResult")
   (values
-    '("us-none" "G_TEST_DBUS_NONE" "0x0")
+    '("unhandled" "G_TLS_INTERACTION_UNHANDLED" "0")
+    '("handled" "G_TLS_INTERACTION_HANDLED" "1")
+    '("failed" "G_TLS_INTERACTION_FAILED" "2")
   )
 )
 
-;; 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
-  (in-module "G")
-  (c-name "GSubprocessFlags")
+(define-flags-extended TlsPasswordFlags
+  (in-module "Gio")
+  (c-name "GTlsPasswordFlags")
   (values
-    '("none" "G_SUBPROCESS_FLAGS_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_NOTIFICATION_PRIORITY_NORMAL,
-;;   G_NOTIFICATION_PRIORITY_LOW,
-;;   G_NOTIFICATION_PRIORITY_HIGH,
-;;   G_NOTIFICATION_PRIORITY_URGENT
-;; } GNotificationPriority;
-
-(define-enum-extended NotificationPriority
-  (in-module "G")
-  (c-name "GNotificationPriority")
+(define-enum-extended TlsRehandshakeMode
+  (in-module "Gio")
+  (c-name "GTlsRehandshakeMode")
   (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")
+    '("never" "G_TLS_REHANDSHAKE_NEVER" "0")
+    '("safely" "G_TLS_REHANDSHAKE_SAFELY" "1")
+    '("unsafely" "G_TLS_REHANDSHAKE_UNSAFELY" "2")
   )
 )
 
-;; Original typedef:
-;; typedef enum {
-;;   G_NETWORK_CONNECTIVITY_LOCAL       = 1,
-;;   G_NETWORK_CONNECTIVITY_LIMITED     = 2,
-;;   G_NETWORK_CONNECTIVITY_PORTAL      = 3,
-;;   G_NETWORK_CONNECTIVITY_FULL        = 4
-;; } GNetworkConnectivity;
-
-(define-enum-extended NetworkConnectivity
-  (in-module "G")
-  (c-name "GNetworkConnectivity")
+(define-enum-extended UnixSocketAddressType
+  (in-module "Gio")
+  (c-name "GUnixSocketAddressType")
   (values
-    '("local" "G_NETWORK_CONNECTIVITY_LOCAL" "1")
-    '("limited" "G_NETWORK_CONNECTIVITY_LIMITED" "2")
-    '("portal" "G_NETWORK_CONNECTIVITY_PORTAL" "3")
-    '("full" "G_NETWORK_CONNECTIVITY_FULL" "4")
+    '("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
-  (in-module "G")
-  (c-name "GSettingsBindFlags")
+(define-enum-extended ZlibCompressorFormat
+  (in-module "Gio")
+  (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)")
-  )
-)
-
-;; From gwin32registrykey.h
-
-;; Original typedef:
-;; typedef enum {
-;;   G_WIN32_REGISTRY_VALUE_NONE = 0,
-;;   G_WIN32_REGISTRY_VALUE_BINARY = 1,
-;;   G_WIN32_REGISTRY_VALUE_UINT32LE = 2,
-;;   G_WIN32_REGISTRY_VALUE_UINT32BE = 3,
-;; #if G_BYTE_ORDER == G_BIG_ENDIAN
-;;   G_WIN32_REGISTRY_VALUE_UINT32 = G_WIN32_REGISTRY_VALUE_UINT32BE,
-;; #else
-;;   G_WIN32_REGISTRY_VALUE_UINT32 = G_WIN32_REGISTRY_VALUE_UINT32LE,
-;; #endif
-;;   G_WIN32_REGISTRY_VALUE_EXPAND_STR = 4,
-;;   G_WIN32_REGISTRY_VALUE_LINK = 5,
-;;   G_WIN32_REGISTRY_VALUE_MULTI_STR = 6,
-;;   G_WIN32_REGISTRY_VALUE_UINT64LE = 7,
-;; #if G_BYTE_ORDER == G_LITTLE_ENDIAN
-;;   G_WIN32_REGISTRY_VALUE_UINT64 = G_WIN32_REGISTRY_VALUE_UINT64LE,
-;; #endif
-;;   G_WIN32_REGISTRY_VALUE_STR = 8
-;; } GWin32RegistryValueType;
-
-(define-enum-extended Win32RegistryValueType
-  (in-module "G")
-  (c-name "GWin32RegistryValueType")
-  (values
-    '("none" "G_WIN32_REGISTRY_VALUE_NONE" "0")
-    '("binary" "G_WIN32_REGISTRY_VALUE_BINARY" "1")
-    '("uint32le" "G_WIN32_REGISTRY_VALUE_UINT32LE" "2")
-    '("uint32be" "G_WIN32_REGISTRY_VALUE_UINT32BE" "3")
-    '("uint32" "G_WIN32_REGISTRY_VALUE_UINT32" "3")
-    '("uint32" "G_WIN32_REGISTRY_VALUE_UINT32" "2")
-    '("expand-str" "G_WIN32_REGISTRY_VALUE_EXPAND_STR" "4")
-    '("link" "G_WIN32_REGISTRY_VALUE_LINK" "5")
-    '("multi-str" "G_WIN32_REGISTRY_VALUE_MULTI_STR" "6")
-    '("uint64le" "G_WIN32_REGISTRY_VALUE_UINT64LE" "7")
-    '("uint64" "G_WIN32_REGISTRY_VALUE_UINT64" "7")
-    '("str" "G_WIN32_REGISTRY_VALUE_STR" "8")
-  )
-)
-
-;; Original typedef:
-;; typedef enum {
-;;   G_WIN32_REGISTRY_WATCH_NAME = 1 << 0,
-;;   G_WIN32_REGISTRY_WATCH_ATTRIBUTES = 1 << 1,
-;;   G_WIN32_REGISTRY_WATCH_VALUES = 1 << 2,
-;;   G_WIN32_REGISTRY_WATCH_SECURITY = 1 << 3,
-;; } GWin32RegistryKeyWatcherFlags;
-
-(define-flags-extended Win32RegistryKeyWatcherFlags
-  (in-module "G")
-  (c-name "GWin32RegistryKeyWatcherFlags")
-  (values
-    '("name" "G_WIN32_REGISTRY_WATCH_NAME" "1 << 0")
-    '("attributes" "G_WIN32_REGISTRY_WATCH_ATTRIBUTES" "1 << 1")
-    '("values" "G_WIN32_REGISTRY_WATCH_VALUES" "1 << 2")
-    '("security" "G_WIN32_REGISTRY_WATCH_SECURITY" "1 << 3")
+    '("zlib" "G_ZLIB_COMPRESSOR_FORMAT_ZLIB" "0")
+    '("gzip" "G_ZLIB_COMPRESSOR_FORMAT_GZIP" "1")
+    '("raw" "G_ZLIB_COMPRESSOR_FORMAT_RAW" "2")
   )
 )
 
diff --git a/gio/src/gio_enums.defs.patch b/gio/src/gio_enums.defs.patch
index 4d64a58..56215c1 100644
--- a/gio/src/gio_enums.defs.patch
+++ b/gio/src/gio_enums.defs.patch
@@ -1,14 +1,10 @@
---- ./../../gio/src/gio_enums.defs.orig        2015-07-24 16:57:40.866238234 +0200
-+++ ./../../gio/src/gio_enums.defs     2015-07-24 16:57:40.870238424 +0200
-@@ -495,10 +495,11 @@
-     '("timed-out" "G_IO_ERROR_TIMED_OUT" "24")
-     '("would-recurse" "G_IO_ERROR_WOULD_RECURSE" "25")
+--- a/gio/src/gio_enums.defs
++++ b/gio/src/gio_enums.defs
+@@ -533,6 +533,7 @@
      '("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_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")
+     '("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")
diff --git a/gio/src/gio_signals.defs b/gio/src/gio_signals.defs
index 7af937c..f79bfb9 100644
--- a/gio/src/gio_signals.defs
+++ b/gio/src/gio_signals.defs
@@ -1,95 +1,64 @@
-;; From GAsyncResult
-
-;; From GAction
-
-(define-property enabled
-  (of-object "GAction")
-  (prop-type "GParamBoolean")
-  (docs "If the action can be activated")
-  (readable #t)
-  (writable #f)
-  (construct-only #f)
-)
-
-(define-property name
-  (of-object "GAction")
-  (prop-type "GParamString")
-  (docs "The name used to invoke the action")
-  (readable #t)
-  (writable #f)
-  (construct-only #f)
-)
-
-(define-property parameter-type
-  (of-object "GAction")
-  (prop-type "GParamBoxed")
-  (docs "The type of GVariant passed to activate()")
-  (readable #t)
-  (writable #f)
-  (construct-only #f)
-)
-
-(define-property state
-  (of-object "GAction")
-  (prop-type "GParamVariant")
-  (docs "The state the action is in")
-  (readable #t)
-  (writable #f)
-  (construct-only #f)
+(define-signal changed
+  (of-object "GAppInfoMonitor")
+  (return-type "void")
+  (when "first")
 )
 
-(define-property state-type
-  (of-object "GAction")
-  (prop-type "GParamBoxed")
-  (docs "The type of the state kept by the action")
-  (readable #t)
-  (writable #f)
-  (construct-only #f)
+(define-signal launch-failed
+  (of-object "GAppLaunchContext")
+  (return-type "void")
+  (when "last")
+  (parameters
+   '("const-gchar*" "startup_notify_id")
+  )
 )
 
-;; From GActionGroup
-
-(define-signal action-added
-  (of-object "GActionGroup")
+(define-signal launched
+  (of-object "GAppLaunchContext")
   (return-type "void")
   (when "last")
   (parameters
-    '("const-gchar*" "p0")
+   '("GAppInfo*" "info")
+   '("GVariant*" "platform_data")
   )
 )
 
-(define-signal action-removed
-  (of-object "GActionGroup")
+(define-signal activate
+  (of-object "GApplication")
   (return-type "void")
   (when "last")
+)
+
+(define-signal command-line
+  (of-object "GApplication")
+  (return-type "gint")
+  (when "last")
   (parameters
-    '("const-gchar*" "p0")
+   '("GApplicationCommandLine*" "command_line")
   )
 )
 
-(define-signal action-enabled-changed
-  (of-object "GActionGroup")
-  (return-type "void")
+(define-signal handle-local-options
+  (of-object "GApplication")
+  (return-type "gint")
   (when "last")
   (parameters
-    '("const-gchar*" "p0")
-    '("gboolean" "p1")
+   '("GVariantDict*" "options")
   )
 )
 
-(define-signal action-state-changed
-  (of-object "GActionGroup")
+(define-signal open
+  (of-object "GApplication")
   (return-type "void")
   (when "last")
   (parameters
-    '("const-gchar*" "p0")
-    '("GVariant*" "p1")
+   '("gpointer" "files")
+   '("gint" "n_files")
+   '("const-gchar*" "hint")
   )
 )
 
-;; From GApplication
-
-(define-signal activate
+(define-signal shutdown
   (of-object "GApplication")
   (return-type "void")
   (when "last")
@@ -101,1359 +70,1218 @@
   (when "first")
 )
 
-(define-signal shutdown
-  (of-object "GApplication")
+(define-signal cancelled
+  (of-object "GCancellable")
   (return-type "void")
   (when "last")
 )
 
-(define-signal open
-  (of-object "GApplication")
-  (return-type "void")
+(define-signal allow-mechanism
+  (of-object "GDBusAuthObserver")
+  (return-type "gboolean")
   (when "last")
   (parameters
-    '("gpointer" "p0")
-    '("gint" "p1")
-    '("const-gchar*" "p2")
+   '("const-gchar*" "mechanism")
   )
 )
 
-(define-signal command-line
-  (of-object "GApplication")
-  (return-type "gint")
+(define-signal authorize-authenticated-peer
+  (of-object "GDBusAuthObserver")
+  (return-type "gboolean")
   (when "last")
   (parameters
-    '("GApplicationCommandLine*" "p0")
+   '("GIOStream*" "stream")
+   '("GCredentials*" "credentials")
   )
 )
 
-(define-signal handle-local-options
-  (of-object "GApplication")
-  (return-type "gint")
+(define-signal closed
+  (of-object "GDBusConnection")
+  (return-type "void")
   (when "last")
   (parameters
-    '("GVariantDict*" "p0")
+   '("gboolean" "remote_peer_vanished")
+   '("GError*" "error")
   )
 )
 
-(define-property application-id
-  (of-object "GApplication")
-  (prop-type "GParamString")
-  (docs "The unique identifier for the application")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
-)
-
-(define-property flags
-  (of-object "GApplication")
-  (prop-type "GParamFlags")
-  (docs "Flags specifying the behaviour of the application")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
+(define-signal g-authorize-method
+  (of-object "GDBusInterfaceSkeleton")
+  (return-type "gboolean")
+  (when "last")
+  (parameters
+   '("GDBusMethodInvocation*" "invocation")
+  )
 )
 
-(define-property resource-base-path
-  (of-object "GApplication")
-  (prop-type "GParamString")
-  (docs "The base resource path for the application")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
+(define-signal interface-proxy-properties-changed
+  (of-object "GDBusObjectManagerClient")
+  (return-type "void")
+  (when "last")
+  (parameters
+   '("GDBusObjectProxy*" "object_proxy")
+   '("GDBusProxy*" "interface_proxy")
+   '("GVariant*" "changed_properties")
+   '("gchar**" "invalidated_properties")
+  )
 )
 
-(define-property is-registered
-  (of-object "GApplication")
-  (prop-type "GParamBoolean")
-  (docs "If g_application_register() has been called")
-  (readable #t)
-  (writable #f)
-  (construct-only #f)
+(define-signal interface-proxy-signal
+  (of-object "GDBusObjectManagerClient")
+  (return-type "void")
+  (when "last")
+  (parameters
+   '("GDBusObjectProxy*" "object_proxy")
+   '("GDBusProxy*" "interface_proxy")
+   '("const-gchar*" "sender_name")
+   '("const-gchar*" "signal_name")
+   '("GVariant*" "parameters")
+  )
 )
 
-(define-property is-remote
-  (of-object "GApplication")
-  (prop-type "GParamBoolean")
-  (docs "If this application instance is remote")
-  (readable #t)
-  (writable #f)
-  (construct-only #f)
+(define-signal authorize-method
+  (of-object "GDBusObjectSkeleton")
+  (return-type "gboolean")
+  (when "last")
+  (parameters
+   '("GDBusInterfaceSkeleton*" "interface")
+   '("GDBusMethodInvocation*" "invocation")
+  )
 )
 
-(define-property inactivity-timeout
-  (of-object "GApplication")
-  (prop-type "GParamUInt")
-  (docs "Time (ms) to stay alive after becoming idle")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
+(define-signal g-properties-changed
+  (of-object "GDBusProxy")
+  (return-type "void")
+  (when "last")
+  (parameters
+   '("GVariant*" "changed_properties")
+   '("gchar**" "invalidated_properties")
+  )
 )
 
-(define-property action-group
-  (of-object "GApplication")
-  (prop-type "GParamObject")
-  (docs "The group of actions that the application exports")
-  (readable #f)
-  (writable #t)
-  (construct-only #f)
-  (deprecated #t)
+(define-signal g-signal
+  (of-object "GDBusProxy")
+  (return-type "void")
+  (when "last")
+  (parameters
+   '("const-gchar*" "sender_name")
+   '("const-gchar*" "signal_name")
+   '("GVariant*" "parameters")
+  )
 )
 
-(define-property is-busy
-  (of-object "GApplication")
-  (prop-type "GParamBoolean")
-  (docs "If this application is currently marked busy")
-  (readable #t)
-  (writable #f)
-  (construct-only #f)
+(define-signal new-connection
+  (of-object "GDBusServer")
+  (return-type "gboolean")
+  (when "last")
+  (parameters
+   '("GDBusConnection*" "connection")
+  )
 )
 
-;; From GAppInfoMonitor
-
 (define-signal changed
-  (of-object "GAppInfoMonitor")
+  (of-object "GFileMonitor")
   (return-type "void")
-  (when "first")
+  (when "last")
+  (parameters
+   '("GFile*" "file")
+   '("GFile*" "other_file")
+   '("GFileMonitorEvent" "event_type")
+  )
 )
 
-;; From GCancellable
-
-(define-signal cancelled
-  (of-object "GCancellable")
+(define-signal got-completion-data
+  (of-object "GFilenameCompleter")
   (return-type "void")
   (when "last")
 )
 
-;; From GBufferedInputStream
-
-(define-property buffer-size
-  (of-object "GBufferedInputStream")
-  (prop-type "GParamUInt")
-  (docs "The size of the backend buffer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
+(define-signal items-changed
+  (of-object "GMenuModel")
+  (return-type "void")
+  (when "last")
+  (parameters
+   '("gint" "position")
+   '("gint" "removed")
+   '("gint" "added")
+  )
 )
 
-;; From GBufferedOutputStream
-
-(define-property buffer-size
-  (of-object "GBufferedOutputStream")
-  (prop-type "GParamUInt")
-  (docs "The size of the backend buffer")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
+(define-signal aborted
+  (of-object "GMountOperation")
+  (return-type "void")
+  (when "last")
 )
 
-(define-property auto-grow
-  (of-object "GBufferedOutputStream")
-  (prop-type "GParamBoolean")
-  (docs "Whether the buffer should automatically grow")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
+(define-signal ask-password
+  (of-object "GMountOperation")
+  (return-type "void")
+  (when "last")
+  (parameters
+   '("const-gchar*" "message")
+   '("const-gchar*" "default_user")
+   '("const-gchar*" "default_domain")
+   '("GAskPasswordFlags" "flags")
+  )
 )
 
-;; From GCharsetConverter
-
-(define-property from-charset
-  (of-object "GCharsetConverter")
-  (prop-type "GParamString")
-  (docs "The character encoding to convert from")
-  (readable #t)
-  (writable #t)
-  (construct-only #t)
+(define-signal ask-question
+  (of-object "GMountOperation")
+  (return-type "void")
+  (when "last")
+  (parameters
+   '("const-gchar*" "message")
+   '("const-gchar**" "choices")
+  )
 )
 
-(define-property to-charset
-  (of-object "GCharsetConverter")
-  (prop-type "GParamString")
-  (docs "The character encoding to convert to")
-  (readable #t)
-  (writable #t)
-  (construct-only #t)
+(define-signal reply
+  (of-object "GMountOperation")
+  (return-type "void")
+  (when "last")
+  (parameters
+   '("GMountOperationResult" "result")
+  )
 )
 
-(define-property use-fallback
-  (of-object "GCharsetConverter")
-  (prop-type "GParamBoolean")
-  (docs "Use fallback (of form \<hexval>) for invalid bytes")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
+(define-signal show-processes
+  (of-object "GMountOperation")
+  (return-type "void")
+  (when "last")
+  (parameters
+   '("const-gchar*" "message")
+   '("GArray*" "processes")
+   '("const-gchar**" "choices")
+  )
 )
 
-;; From GConverterInputStream
-
-(define-property converter
-  (of-object "GConverterInputStream")
-  (prop-type "GParamObject")
-  (docs "The converter object")
-  (readable #t)
-  (writable #t)
-  (construct-only #t)
+(define-signal show-unmount-progress
+  (of-object "GMountOperation")
+  (return-type "void")
+  (when "last")
+  (parameters
+   '("const-gchar*" "message")
+   '("gint64" "time_left")
+   '("gint64" "bytes_left")
+  )
 )
 
-;; From GConverterOutputStream
-
-(define-property converter
-  (of-object "GConverterOutputStream")
-  (prop-type "GParamObject")
-  (docs "The converter object")
-  (readable #t)
-  (writable #t)
-  (construct-only #t)
+(define-signal reload
+  (of-object "GResolver")
+  (return-type "void")
+  (when "last")
 )
 
-;; From GDataInputStream
-
-(define-property byte-order
-  (of-object "GDataInputStream")
-  (prop-type "GParamEnum")
-  (docs "The byte order")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
+(define-signal change-event
+  (of-object "GSettings")
+  (return-type "gboolean")
+  (when "last")
+  (parameters
+   '("gpointer" "keys")
+   '("gint" "n_keys")
+  )
 )
 
-(define-property newline-type
-  (of-object "GDataInputStream")
-  (prop-type "GParamEnum")
-  (docs "The accepted types of line ending")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
+(define-signal changed
+  (of-object "GSettings")
+  (return-type "void")
+  (when "last")
+  (parameters
+   '("const-gchar*" "key")
+  )
 )
 
-;; From GDataOutputStream
-
-(define-property byte-order
-  (of-object "GDataOutputStream")
-  (prop-type "GParamEnum")
-  (docs "The byte order")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
+(define-signal writable-change-event
+  (of-object "GSettings")
+  (return-type "gboolean")
+  (when "last")
+  (parameters
+   '("guint" "key")
+  )
 )
 
-;; From GDrive
-
-(define-signal changed
-  (of-object "GDrive")
+(define-signal writable-changed
+  (of-object "GSettings")
   (return-type "void")
   (when "last")
+  (parameters
+   '("const-gchar*" "key")
+  )
 )
 
-(define-signal disconnected
-  (of-object "GDrive")
+(define-signal activate
+  (of-object "GSimpleAction")
   (return-type "void")
   (when "last")
+  (parameters
+   '("GVariant*" "parameter")
+  )
 )
 
-(define-signal eject-button
-  (of-object "GDrive")
+(define-signal change-state
+  (of-object "GSimpleAction")
   (return-type "void")
   (when "last")
+  (parameters
+   '("GVariant*" "value")
+  )
 )
 
-(define-signal stop-button
-  (of-object "GDrive")
+(define-signal event
+  (of-object "GSocketClient")
   (return-type "void")
   (when "last")
+  (parameters
+   '("GSocketClientEvent" "event")
+   '("GSocketConnectable*" "connectable")
+   '("GIOStream*" "connection")
+  )
 )
 
-;; From GFile
-
-;; From GFileEnumerator
-
-(define-property container
-  (of-object "GFileEnumerator")
-  (prop-type "GParamObject")
-  (docs "The container that is being enumerated")
-  (readable #f)
-  (writable #t)
-  (construct-only #t)
+(define-signal event
+  (of-object "GSocketListener")
+  (return-type "void")
+  (when "last")
+  (parameters
+   '("GSocketListenerEvent" "event")
+   '("GSocket*" "socket")
+  )
 )
 
-;; From GFileInfo
-
-;; From GFileIcon
-
-(define-property file
-  (of-object "GFileIcon")
-  (prop-type "GParamObject")
-  (docs "The file containing the icon")
-  (readable #t)
-  (writable #t)
-  (construct-only #t)
+(define-signal incoming
+  (of-object "GSocketService")
+  (return-type "gboolean")
+  (when "last")
+  (parameters
+   '("GSocketConnection*" "connection")
+   '("GObject*" "source_object")
+  )
 )
 
-;; From GFileMonitor
-
-(define-signal changed
-  (of-object "GFileMonitor")
-  (return-type "void")
+(define-signal run
+  (of-object "GThreadedSocketService")
+  (return-type "gboolean")
   (when "last")
   (parameters
-    '("GFile*" "p0")
-    '("GFile*" "p1")
-    '("GFileMonitorEvent" "p2")
+   '("GSocketConnection*" "connection")
+   '("GObject*" "source_object")
   )
 )
 
-(define-property rate-limit
-  (of-object "GFileMonitor")
-  (prop-type "GParamInt")
-  (docs "The limit of the monitor to watch for changes, in milliseconds")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
+(define-signal accept-certificate
+  (of-object "GTlsConnection")
+  (return-type "gboolean")
+  (when "last")
+  (parameters
+   '("GTlsCertificate*" "peer_cert")
+   '("GTlsCertificateFlags" "errors")
+  )
 )
 
-(define-property cancelled
-  (of-object "GFileMonitor")
-  (prop-type "GParamBoolean")
-  (docs "Whether the monitor has been cancelled")
-  (readable #t)
-  (writable #f)
-  (construct-only #f)
+(define-signal mountpoints-changed
+  (of-object "GUnixMountMonitor")
+  (return-type "void")
+  (when "last")
 )
 
-;; From GFilenameCompleter
-
-(define-signal got-completion-data
-  (of-object "GFilenameCompleter")
+(define-signal mounts-changed
+  (of-object "GUnixMountMonitor")
   (return-type "void")
   (when "last")
 )
 
-;; From GFileInputStream
-
-;; From GFileOutputStream
-
-;; From GFilterInputStream
-
-(define-property base-stream
-  (of-object "GFilterInputStream")
-  (prop-type "GParamObject")
-  (docs "The underlying base stream on which the io ops will be done.")
-  (readable #t)
-  (writable #t)
-  (construct-only #t)
+(define-signal drive-changed
+  (of-object "GVolumeMonitor")
+  (return-type "void")
+  (when "last")
+  (parameters
+   '("GDrive*" "drive")
+  )
 )
 
-(define-property close-base-stream
-  (of-object "GFilterInputStream")
-  (prop-type "GParamBoolean")
-  (docs "If the base stream should be closed when the filter stream is closed.")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
+(define-signal drive-connected
+  (of-object "GVolumeMonitor")
+  (return-type "void")
+  (when "last")
+  (parameters
+   '("GDrive*" "drive")
+  )
 )
 
-;; From GFilterOutputStream
-
-(define-property base-stream
-  (of-object "GFilterOutputStream")
-  (prop-type "GParamObject")
-  (docs "The underlying base stream on which the io ops will be done.")
-  (readable #t)
-  (writable #t)
-  (construct-only #t)
+(define-signal drive-disconnected
+  (of-object "GVolumeMonitor")
+  (return-type "void")
+  (when "last")
+  (parameters
+   '("GDrive*" "drive")
+  )
 )
 
-(define-property close-base-stream
-  (of-object "GFilterOutputStream")
-  (prop-type "GParamBoolean")
-  (docs "If the base stream should be closed when the filter stream is closed.")
-  (readable #t)
-  (writable #t)
-  (construct-only #t)
+(define-signal drive-eject-button
+  (of-object "GVolumeMonitor")
+  (return-type "void")
+  (when "last")
+  (parameters
+   '("GDrive*" "drive")
+  )
 )
 
-;; From GUnixCredentialsMessage
-
-(define-property credentials
-  (of-object "GUnixCredentialsMessage")
-  (prop-type "GParamObject")
-  (docs "The credentials stored in the message")
-  (readable #t)
-  (writable #t)
-  (construct-only #t)
+(define-signal drive-stop-button
+  (of-object "GVolumeMonitor")
+  (return-type "void")
+  (when "last")
+  (parameters
+   '("GDrive*" "drive")
+  )
 )
 
-;; From GUnixFDMessage
-
-(define-property fd-list
-  (of-object "GUnixFDMessage")
-  (prop-type "GParamObject")
-  (docs "The GUnixFDList object to send with the message")
-  (readable #t)
-  (writable #t)
-  (construct-only #t)
+(define-signal mount-added
+  (of-object "GVolumeMonitor")
+  (return-type "void")
+  (when "last")
+  (parameters
+   '("GMount*" "mount")
+  )
 )
 
-;; From GUnixInputStream
-
-(define-property fd
-  (of-object "GUnixInputStream")
-  (prop-type "GParamInt")
-  (docs "The file descriptor to read from")
-  (readable #t)
-  (writable #t)
-  (construct-only #t)
+(define-signal mount-changed
+  (of-object "GVolumeMonitor")
+  (return-type "void")
+  (when "last")
+  (parameters
+   '("GMount*" "mount")
+  )
 )
 
-(define-property close-fd
-  (of-object "GUnixInputStream")
-  (prop-type "GParamBoolean")
-  (docs "Whether to close the file descriptor when the stream is closed")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
+(define-signal mount-pre-unmount
+  (of-object "GVolumeMonitor")
+  (return-type "void")
+  (when "last")
+  (parameters
+   '("GMount*" "mount")
+  )
 )
 
-;; From GUnixOutputStream
-
-(define-property fd
-  (of-object "GUnixOutputStream")
-  (prop-type "GParamInt")
-  (docs "The file descriptor to write to")
-  (readable #t)
-  (writable #t)
-  (construct-only #t)
+(define-signal mount-removed
+  (of-object "GVolumeMonitor")
+  (return-type "void")
+  (when "last")
+  (parameters
+   '("GMount*" "mount")
+  )
 )
 
-(define-property close-fd
-  (of-object "GUnixOutputStream")
-  (prop-type "GParamBoolean")
-  (docs "Whether to close the file descriptor when the stream is closed")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
+(define-signal volume-added
+  (of-object "GVolumeMonitor")
+  (return-type "void")
+  (when "last")
+  (parameters
+   '("GVolume*" "volume")
+  )
 )
 
-;; From GUnixSocketAddress
-
-(define-property path
-  (of-object "GUnixSocketAddress")
-  (prop-type "GParamString")
-  (docs "UNIX socket path")
-  (readable #t)
-  (writable #t)
-  (construct-only #t)
+(define-signal volume-changed
+  (of-object "GVolumeMonitor")
+  (return-type "void")
+  (when "last")
+  (parameters
+   '("GVolume*" "volume")
+  )
 )
 
-(define-property path-as-array
-  (of-object "GUnixSocketAddress")
-  (prop-type "GParamBoxed")
-  (docs "UNIX socket path, as byte array")
-  (readable #t)
-  (writable #t)
-  (construct-only #t)
+(define-signal volume-removed
+  (of-object "GVolumeMonitor")
+  (return-type "void")
+  (when "last")
+  (parameters
+   '("GVolume*" "volume")
+  )
 )
 
-(define-property abstract
-  (of-object "GUnixSocketAddress")
-  (prop-type "GParamBoolean")
-  (docs "Whether or not this is an abstract address")
-  (readable #t)
-  (writable #t)
-  (construct-only #t)
+(define-signal action-added
+  (of-object "GActionGroup")
+  (return-type "void")
+  (when "last")
+  (parameters
+   '("const-gchar*" "action_name")
+  )
 )
 
-(define-property address-type
-  (of-object "GUnixSocketAddress")
-  (prop-type "GParamEnum")
-  (docs "The type of UNIX socket address")
-  (readable #t)
-  (writable #t)
-  (construct-only #t)
+(define-signal action-enabled-changed
+  (of-object "GActionGroup")
+  (return-type "void")
+  (when "last")
+  (parameters
+   '("const-gchar*" "action_name")
+   '("gboolean" "enabled")
+  )
 )
 
-;; From GInputStream
-
-;; From GListModel
-
-(define-signal items-changed
-  (of-object "GListModel")
+(define-signal action-removed
+  (of-object "GActionGroup")
   (return-type "void")
   (when "last")
   (parameters
-    '("guint" "p0")
-    '("guint" "p1")
-    '("guint" "p2")
+   '("const-gchar*" "action_name")
   )
 )
 
-;; From GListStore
-
-(define-property item-type
-  (of-object "GListStore")
-  (prop-type "GParamGType")
-  (docs "")
-  (readable #t)
-  (writable #t)
-  (construct-only #t)
+(define-signal action-state-changed
+  (of-object "GActionGroup")
+  (return-type "void")
+  (when "last")
+  (parameters
+   '("const-gchar*" "action_name")
+   '("GVariant*" "value")
+  )
 )
 
-;; From GLoadableIcon
-
-;; From GMemoryInputStream
-
-;; From GMemoryOutputStream
-
-(define-property data
-  (of-object "GMemoryOutputStream")
-  (prop-type "GParamPointer")
-  (docs "Pointer to buffer where data will be written.")
-  (readable #t)
-  (writable #t)
-  (construct-only #t)
+(define-signal interface-added
+  (of-object "GDBusObject")
+  (return-type "void")
+  (when "last")
+  (parameters
+   '("GDBusInterface*" "interface")
+  )
 )
 
-(define-property size
-  (of-object "GMemoryOutputStream")
-  (prop-type "GParamULong")
-  (docs "Current size of the data buffer.")
-  (readable #t)
-  (writable #t)
-  (construct-only #t)
+(define-signal interface-removed
+  (of-object "GDBusObject")
+  (return-type "void")
+  (when "last")
+  (parameters
+   '("GDBusInterface*" "interface")
+  )
 )
 
-(define-property data-size
-  (of-object "GMemoryOutputStream")
-  (prop-type "GParamULong")
-  (docs "Size of data written to the buffer.")
-  (readable #t)
-  (writable #f)
-  (construct-only #f)
+(define-signal interface-added
+  (of-object "GDBusObjectManager")
+  (return-type "void")
+  (when "last")
+  (parameters
+   '("GDBusObject*" "object")
+   '("GDBusInterface*" "interface")
+  )
 )
 
-(define-property realloc-function
-  (of-object "GMemoryOutputStream")
-  (prop-type "GParamPointer")
-  (docs "Function with realloc semantics called to enlarge the buffer.")
-  (readable #t)
-  (writable #t)
-  (construct-only #t)
+(define-signal interface-removed
+  (of-object "GDBusObjectManager")
+  (return-type "void")
+  (when "last")
+  (parameters
+   '("GDBusObject*" "object")
+   '("GDBusInterface*" "interface")
+  )
 )
 
-(define-property destroy-function
-  (of-object "GMemoryOutputStream")
-  (prop-type "GParamPointer")
-  (docs "Function called with the buffer as argument when the stream is destroyed.")
-  (readable #t)
-  (writable #t)
-  (construct-only #t)
+(define-signal object-added
+  (of-object "GDBusObjectManager")
+  (return-type "void")
+  (when "last")
+  (parameters
+   '("GDBusObject*" "object")
+  )
 )
 
-;; From GMenu
-
-;; From GMenuModel
-
-(define-signal items-changed
-  (of-object "GMenuModel")
+(define-signal object-removed
+  (of-object "GDBusObjectManager")
   (return-type "void")
   (when "last")
   (parameters
-    '("gint" "p0")
-    '("gint" "p1")
-    '("gint" "p2")
+   '("GDBusObject*" "object")
   )
 )
 
-;; From GMount
-
 (define-signal changed
-  (of-object "GMount")
+  (of-object "GDrive")
   (return-type "void")
   (when "last")
 )
 
-(define-signal unmounted
-  (of-object "GMount")
+(define-signal disconnected
+  (of-object "GDrive")
   (return-type "void")
   (when "last")
 )
 
-(define-signal pre-unmount
-  (of-object "GMount")
+(define-signal eject-button
+  (of-object "GDrive")
   (return-type "void")
   (when "last")
 )
 
-;; From GMountOperation
-
-(define-signal ask-password
-  (of-object "GMountOperation")
+(define-signal stop-button
+  (of-object "GDrive")
   (return-type "void")
   (when "last")
+)
+
+(define-signal accept-certificate
+  (of-object "GDtlsConnection")
+  (return-type "gboolean")
+  (when "last")
   (parameters
-    '("const-gchar*" "p0")
-    '("const-gchar*" "p1")
-    '("const-gchar*" "p2")
-    '("GAskPasswordFlags" "p3")
+   '("GTlsCertificate*" "peer_cert")
+   '("GTlsCertificateFlags" "errors")
   )
 )
 
-(define-signal ask-question
-  (of-object "GMountOperation")
+(define-signal items-changed
+  (of-object "GListModel")
   (return-type "void")
   (when "last")
   (parameters
-    '("const-gchar*" "p0")
-    '("const-gchar**" "p1")
+   '("guint" "position")
+   '("guint" "removed")
+   '("guint" "added")
   )
 )
 
-(define-signal reply
-  (of-object "GMountOperation")
+(define-signal changed
+  (of-object "GMount")
   (return-type "void")
   (when "last")
-  (parameters
-    '("GMountOperationResult" "p0")
-  )
 )
 
-(define-signal aborted
-  (of-object "GMountOperation")
+(define-signal pre-unmount
+  (of-object "GMount")
   (return-type "void")
   (when "last")
 )
 
-(define-signal show-processes
-  (of-object "GMountOperation")
+(define-signal unmounted
+  (of-object "GMount")
   (return-type "void")
   (when "last")
-  (parameters
-    '("const-gchar*" "p0")
-    '("GArray*" "p1")
-    '("GStrv*" "p2")
-  )
 )
 
-(define-signal show-unmount-progress
-  (of-object "GMountOperation")
+(define-signal network-changed
+  (of-object "GNetworkMonitor")
   (return-type "void")
   (when "last")
   (parameters
-    '("const-gchar*" "p0")
-    '("gint64" "p1")
-    '("gint64" "p2")
+   '("gboolean" "available")
   )
 )
 
-(define-property username
-  (of-object "GMountOperation")
-  (prop-type "GParamString")
-  (docs "The user name")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
+(define-signal changed
+  (of-object "GVolume")
+  (return-type "void")
+  (when "last")
 )
 
-(define-property password
-  (of-object "GMountOperation")
-  (prop-type "GParamString")
-  (docs "The password")
-  (readable #t)
-  (writable #t)
-  (construct-only #f)
+(define-signal removed
+  (of-object "GVolume")
+  (return-type "void")
+  (when "last")
 )
 
-(define-property anonymous
-  (of-object "GMountOperation")
-  (prop-type "GParamBoolean")
-  (docs "Whether to use an anonymous user")
-  (readable #t)
+(define-property action-group
+  (of-object "GApplication")
+  (readable #f)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property domain
-  (of-object "GMountOperation")
-  (prop-type "GParamString")
-  (docs "The domain of the mount operation")
+(define-property application-id
+  (of-object "GApplication")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property password-save
-  (of-object "GMountOperation")
-  (prop-type "GParamEnum")
-  (docs "How passwords should be saved")
+(define-property flags
+  (of-object "GApplication")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property choice
-  (of-object "GMountOperation")
-  (prop-type "GParamInt")
-  (docs "The users choice")
+(define-property inactivity-timeout
+  (of-object "GApplication")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-;; From GNotification
-
-;; From GPermission
-
-(define-property allowed
-  (of-object "GPermission")
-  (prop-type "GParamBoolean")
-  (docs "If the caller is allowed to perform the action")
+(define-property is-busy
+  (of-object "GApplication")
+  (docs "Whether the application is currently marked as busy through g_application_mark_busy() or 
g_application_bind_busy_property().")
   (readable #t)
   (writable #f)
   (construct-only #f)
 )
 
-(define-property can-acquire
-  (of-object "GPermission")
-  (prop-type "GParamBoolean")
-  (docs "If calling g_permission_acquire() makes sense")
+(define-property is-registered
+  (of-object "GApplication")
   (readable #t)
   (writable #f)
   (construct-only #f)
 )
 
-(define-property can-release
-  (of-object "GPermission")
-  (prop-type "GParamBoolean")
-  (docs "If calling g_permission_release() makes sense")
+(define-property is-remote
+  (of-object "GApplication")
   (readable #t)
   (writable #f)
   (construct-only #f)
 )
 
-;; From GPropertyAction
-
-(define-property name
-  (of-object "GPropertyAction")
-  (prop-type "GParamString")
-  (docs "The name used to invoke the action")
+(define-property resource-base-path
+  (of-object "GApplication")
   (readable #t)
   (writable #t)
+  (construct-only #f)
+)
+
+(define-property arguments
+  (of-object "GApplicationCommandLine")
+  (readable #f)
+  (writable #t)
   (construct-only #t)
 )
 
-(define-property parameter-type
-  (of-object "GPropertyAction")
-  (prop-type "GParamBoxed")
-  (docs "The type of GVariant passed to activate()")
+(define-property is-remote
+  (of-object "GApplicationCommandLine")
   (readable #t)
   (writable #f)
   (construct-only #f)
 )
 
-(define-property enabled
-  (of-object "GPropertyAction")
-  (prop-type "GParamBoolean")
-  (docs "If the action can be activated")
-  (readable #t)
-  (writable #f)
-  (construct-only #f)
+(define-property options
+  (of-object "GApplicationCommandLine")
+  (readable #f)
+  (writable #t)
+  (construct-only #t)
 )
 
-(define-property state-type
-  (of-object "GPropertyAction")
-  (prop-type "GParamBoxed")
-  (docs "The type of the state kept by the action")
+(define-property platform-data
+  (of-object "GApplicationCommandLine")
+  (readable #f)
+  (writable #t)
+  (construct-only #t)
+)
+
+(define-property buffer-size
+  (of-object "GBufferedInputStream")
   (readable #t)
-  (writable #f)
+  (writable #t)
   (construct-only #f)
 )
 
-(define-property state
-  (of-object "GPropertyAction")
-  (prop-type "GParamVariant")
-  (docs "The state the action is in")
+(define-property auto-grow
+  (of-object "GBufferedOutputStream")
   (readable #t)
-  (writable #f)
+  (writable #t)
   (construct-only #f)
 )
 
-(define-property object
-  (of-object "GPropertyAction")
-  (prop-type "GParamObject")
-  (docs "The object with the property to wrap")
-  (readable #f)
+(define-property buffer-size
+  (of-object "GBufferedOutputStream")
+  (readable #t)
   (writable #t)
-  (construct-only #t)
+  (construct-only #f)
 )
 
-(define-property property-name
-  (of-object "GPropertyAction")
-  (prop-type "GParamString")
-  (docs "The name of the property to wrap")
-  (readable #f)
+(define-property bytes
+  (of-object "GBytesIcon")
+  (docs "The bytes containing the icon.")
+  (readable #t)
   (writable #t)
   (construct-only #t)
 )
 
-(define-property invert-boolean
-  (of-object "GPropertyAction")
-  (prop-type "GParamBoolean")
-  (docs "Whether to invert the value of a boolean property")
+(define-property from-charset
+  (of-object "GCharsetConverter")
   (readable #t)
   (writable #t)
   (construct-only #t)
 )
 
-;; From GProxy
-
-;; From GProxyAddress
-
-(define-property protocol
-  (of-object "GProxyAddress")
-  (prop-type "GParamString")
-  (docs "The proxy protocol")
+(define-property to-charset
+  (of-object "GCharsetConverter")
   (readable #t)
   (writable #t)
   (construct-only #t)
 )
 
-(define-property destination-protocol
-  (of-object "GProxyAddress")
-  (prop-type "GParamString")
-  (docs "The proxy destination protocol")
+(define-property use-fallback
+  (of-object "GCharsetConverter")
   (readable #t)
   (writable #t)
-  (construct-only #t)
+  (construct-only #f)
 )
 
-(define-property destination-hostname
-  (of-object "GProxyAddress")
-  (prop-type "GParamString")
-  (docs "The proxy destination hostname")
+(define-property converter
+  (of-object "GConverterInputStream")
   (readable #t)
   (writable #t)
   (construct-only #t)
 )
 
-(define-property destination-port
-  (of-object "GProxyAddress")
-  (prop-type "GParamUInt")
-  (docs "The proxy destination port")
+(define-property converter
+  (of-object "GConverterOutputStream")
   (readable #t)
   (writable #t)
   (construct-only #t)
 )
 
-(define-property username
-  (of-object "GProxyAddress")
-  (prop-type "GParamString")
-  (docs "The proxy username")
-  (readable #t)
+(define-property address
+  (of-object "GDBusConnection")
+  (docs "A D-Bus address specifying potential endpoints that can be used when establishing the connection.")
+  (readable #f)
   (writable #t)
   (construct-only #t)
 )
 
-(define-property password
-  (of-object "GProxyAddress")
-  (prop-type "GParamString")
-  (docs "The proxy password")
-  (readable #t)
+(define-property authentication-observer
+  (of-object "GDBusConnection")
+  (docs "A #GDBusAuthObserver object to assist in the authentication process or %NULL.")
+  (readable #f)
   (writable #t)
   (construct-only #t)
 )
 
-(define-property uri
-  (of-object "GProxyAddress")
-  (prop-type "GParamString")
-  (docs "The proxy's URI")
+(define-property capabilities
+  (of-object "GDBusConnection")
+  (docs "Flags from the #GDBusCapabilityFlags enumeration representing connection features negotiated with 
the other peer.")
   (readable #t)
-  (writable #t)
-  (construct-only #t)
+  (writable #f)
+  (construct-only #f)
 )
 
-;; From GProxyAddressEnumerator
+(define-property closed
+  (of-object "GDBusConnection")
+  (docs "A boolean specifying whether the connection has been closed.")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
 
-(define-property uri
-  (of-object "GProxyAddressEnumerator")
-  (prop-type "GParamString")
-  (docs "The destination URI, use none:// for generic socket")
+(define-property exit-on-close
+  (of-object "GDBusConnection")
+  (docs "A boolean specifying whether the process will be terminated (by calling `raise(SIGTERM)`) if the 
connection is closed by the remote peer.  Note that #GDBusConnection objects returned by g_bus_get_finish() 
and g_bus_get_sync() will (usually) have this property set to %TRUE.")
   (readable #t)
   (writable #t)
+  (construct-only #f)
+)
+
+(define-property flags
+  (of-object "GDBusConnection")
+  (docs "Flags from the #GDBusConnectionFlags enumeration.")
+  (readable #f)
+  (writable #t)
   (construct-only #t)
 )
 
-(define-property default-port
-  (of-object "GProxyAddressEnumerator")
-  (prop-type "GParamUInt")
-  (docs "The default port to use if uri does not specify one")
+(define-property guid
+  (of-object "GDBusConnection")
+  (docs "The GUID of the peer performing the role of server when authenticating.  If you are constructing a 
#GDBusConnection and pass %G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_SERVER in the #GDBusConnection:flags 
property then you MUST also set this property to a valid guid.  If you are constructing a #GDBusConnection 
and pass %G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_CLIENT in the #GDBusConnection:flags property you will be 
able to read the GUID of the other peer here after the connection has been successfully initialized.")
   (readable #t)
   (writable #t)
   (construct-only #t)
 )
 
-(define-property connectable
-  (of-object "GProxyAddressEnumerator")
-  (prop-type "GParamObject")
-  (docs "The connectable being enumerated.")
+(define-property stream
+  (of-object "GDBusConnection")
+  (docs "The underlying #GIOStream used for I/O.  If this is passed on construction and is a 
#GSocketConnection, then the corresponding #GSocket will be put into non-blocking mode.  While the 
#GDBusConnection is active, it will interact with this stream from a worker thread, so it is not safe to 
interact with the stream directly.")
   (readable #t)
   (writable #t)
   (construct-only #t)
 )
 
-(define-property proxy-resolver
-  (of-object "GProxyAddressEnumerator")
-  (prop-type "GParamObject")
-  (docs "The proxy resolver to use.")
+(define-property unique-name
+  (of-object "GDBusConnection")
+  (docs "The unique name as assigned by the message bus or %NULL if the connection is not open or not a 
message bus connection.")
   (readable #t)
-  (writable #t)
+  (writable #f)
   (construct-only #f)
 )
 
-;; From GProxyResolver
-
-;; From GSeekable
-
-;; From GSettings
-
-(define-signal changed
-  (of-object "GSettings")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("const-gchar*" "p0")
-  )
+(define-property g-flags
+  (of-object "GDBusInterfaceSkeleton")
+  (docs "Flags from the #GDBusInterfaceSkeletonFlags enumeration.")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
 )
 
-(define-signal change-event
-  (of-object "GSettings")
-  (return-type "gboolean")
-  (when "last")
-  (parameters
-    '("gpointer" "p0")
-    '("gint" "p1")
-  )
+(define-property locked
+  (of-object "GDBusMessage")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
 )
 
-(define-signal writable-changed
-  (of-object "GSettings")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("const-gchar*" "p0")
-  )
+(define-property bus-type
+  (of-object "GDBusObjectManagerClient")
+  (docs "If this property is not %G_BUS_TYPE_NONE, then #GDBusObjectManagerClient:connection must be %NULL 
and will be set to the #GDBusConnection obtained by calling g_bus_get() with the value of this property.")
+  (readable #f)
+  (writable #t)
+  (construct-only #t)
 )
 
-(define-signal writable-change-event
-  (of-object "GSettings")
-  (return-type "gboolean")
-  (when "last")
-  (parameters
-    '("guint" "p0")
-  )
+(define-property connection
+  (of-object "GDBusObjectManagerClient")
+  (docs "The #GDBusConnection to use.")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
 )
 
-(define-property settings-schema
-  (of-object "GSettings")
-  (prop-type "GParamBoxed")
-  (docs "The GSettingsSchema for this settings object")
+(define-property flags
+  (of-object "GDBusObjectManagerClient")
+  (docs "Flags from the #GDBusObjectManagerClientFlags enumeration.")
   (readable #t)
   (writable #t)
   (construct-only #t)
 )
 
-(define-property schema
-  (of-object "GSettings")
-  (prop-type "GParamString")
-  (docs "The name of the schema for this settings object")
+(define-property get-proxy-type-destroy-notify
+  (of-object "GDBusObjectManagerClient")
+  (docs "A #GDestroyNotify for the #gpointer user_data in 
#GDBusObjectManagerClient:get-proxy-type-user-data.")
   (readable #t)
   (writable #t)
   (construct-only #t)
-  (deprecated #t)
 )
 
-(define-property schema-id
-  (of-object "GSettings")
-  (prop-type "GParamString")
-  (docs "The name of the schema for this settings object")
+(define-property get-proxy-type-func
+  (of-object "GDBusObjectManagerClient")
+  (docs "The #GDBusProxyTypeFunc to use when determining what #GType to use for interface proxies or %NULL.")
   (readable #t)
   (writable #t)
   (construct-only #t)
 )
 
-(define-property backend
-  (of-object "GSettings")
-  (prop-type "GParamObject")
-  (docs "The GSettingsBackend for this settings object")
+(define-property get-proxy-type-user-data
+  (of-object "GDBusObjectManagerClient")
+  (docs "The #gpointer user_data to pass to #GDBusObjectManagerClient:get-proxy-type-func.")
   (readable #t)
   (writable #t)
   (construct-only #t)
 )
 
-(define-property path
-  (of-object "GSettings")
-  (prop-type "GParamString")
-  (docs "The path within the backend where the settings are")
+(define-property name
+  (of-object "GDBusObjectManagerClient")
+  (docs "The well-known name or unique name that the manager is for.")
   (readable #t)
   (writable #t)
   (construct-only #t)
 )
 
-(define-property has-unapplied
-  (of-object "GSettings")
-  (prop-type "GParamBoolean")
-  (docs "TRUE if there are outstanding changes to apply()")
+(define-property name-owner
+  (of-object "GDBusObjectManagerClient")
+  (docs "The unique name that owns #GDBusObjectManagerClient:name or %NULL if no-one is currently owning the 
name. Connect to the #GObject::notify signal to track changes to this property.")
   (readable #t)
   (writable #f)
   (construct-only #f)
 )
 
-(define-property delay-apply
-  (of-object "GSettings")
-  (prop-type "GParamBoolean")
-  (docs "Whether this settings object is in 'delay-apply' mode")
+(define-property object-path
+  (of-object "GDBusObjectManagerClient")
+  (docs "The object path the manager is for.")
   (readable #t)
-  (writable #f)
-  (construct-only #f)
+  (writable #t)
+  (construct-only #t)
 )
 
-;; From GSettingsBackend
-
-;; From GSimpleAsyncResult
-
-;; From GSimpleAction
-
-(define-signal activate
-  (of-object "GSimpleAction")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("GVariant*" "p0")
-  )
+(define-property connection
+  (of-object "GDBusObjectManagerServer")
+  (docs "The #GDBusConnection to export objects on.")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
 )
 
-(define-signal change-state
-  (of-object "GSimpleAction")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("GVariant*" "p0")
-  )
+(define-property object-path
+  (of-object "GDBusObjectManagerServer")
+  (docs "The object path to register the manager object at.")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
 )
 
-(define-property name
-  (of-object "GSimpleAction")
-  (prop-type "GParamString")
-  (docs "The name used to invoke the action")
+(define-property g-connection
+  (of-object "GDBusObjectProxy")
+  (docs "The connection of the proxy.")
   (readable #t)
   (writable #t)
   (construct-only #t)
 )
 
-(define-property parameter-type
-  (of-object "GSimpleAction")
-  (prop-type "GParamBoxed")
-  (docs "The type of GVariant passed to activate()")
+(define-property g-object-path
+  (of-object "GDBusObjectProxy")
+  (docs "The object path of the proxy.")
   (readable #t)
   (writable #t)
   (construct-only #t)
 )
 
-(define-property enabled
-  (of-object "GSimpleAction")
-  (prop-type "GParamBoolean")
-  (docs "If the action can be activated")
+(define-property g-object-path
+  (of-object "GDBusObjectSkeleton")
+  (docs "The object path where the object is exported.")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property state-type
-  (of-object "GSimpleAction")
-  (prop-type "GParamBoxed")
-  (docs "The type of the state kept by the action")
+(define-property g-bus-type
+  (of-object "GDBusProxy")
+  (docs "If this property is not %G_BUS_TYPE_NONE, then #GDBusProxy:g-connection must be %NULL and will be 
set to the #GDBusConnection obtained by calling g_bus_get() with the value of this property.")
+  (readable #f)
+  (writable #t)
+  (construct-only #t)
+)
+
+(define-property g-connection
+  (of-object "GDBusProxy")
+  (docs "The #GDBusConnection the proxy is for.")
   (readable #t)
-  (writable #f)
-  (construct-only #f)
+  (writable #t)
+  (construct-only #t)
 )
 
-(define-property state
-  (of-object "GSimpleAction")
-  (prop-type "GParamVariant")
-  (docs "The state the action is in")
+(define-property g-default-timeout
+  (of-object "GDBusProxy")
+  (docs "The timeout to use if -1 (specifying default timeout) is passed as @timeout_msec in the 
g_dbus_proxy_call() and g_dbus_proxy_call_sync() functions.  This allows applications to set a proxy-wide 
timeout for all remote method invocations on the proxy. If this property is -1, the default timeout 
(typically 25 seconds) is used. If set to %G_MAXINT, then no timeout is used.")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-;; From GSimpleIOStream
-
-(define-property input-stream
-  (of-object "GSimpleIOStream")
-  (prop-type "GParamObject")
-  (docs "The GInputStream to read from")
+(define-property g-flags
+  (of-object "GDBusProxy")
+  (docs "Flags from the #GDBusProxyFlags enumeration.")
   (readable #t)
   (writable #t)
   (construct-only #t)
 )
 
-(define-property output-stream
-  (of-object "GSimpleIOStream")
-  (prop-type "GParamObject")
-  (docs "The GOutputStream to write to")
+(define-property g-interface-info
+  (of-object "GDBusProxy")
+  (docs "Ensure that interactions with this proxy conform to the given interface. This is mainly to ensure 
that malformed data received from the other peer is ignored. The given #GDBusInterfaceInfo is said to be the 
'expected interface'.  The checks performed are: - When completing a method call, if the type signature of   
the reply message isn't what's expected, the reply is   discarded and the #GError is set to 
%G_IO_ERROR_INVALID_ARGUMENT.  - Received signals that have a type signature mismatch are dropped and   a 
warning is logged via g_warning().  - Properties received via the initial `GetAll()` call or via the   
`::PropertiesChanged` signal (on the   
[org.freedesktop.DBus.Properties](http://dbus.freedesktop.org/doc/dbus-specification.html#standard-interfaces-properties)
   interface) or set using g_dbus_proxy_set_cached_property()   with a type signature mismatch are ignored 
and a warning is   logged via g_warning().  Note that these checks are never done on methods, si
 gnals and properties that are not referenced in the given #GDBusInterfaceInfo, since extending a D-Bus 
interface on the service-side is not considered an ABI break.")
   (readable #t)
   (writable #t)
-  (construct-only #t)
+  (construct-only #f)
 )
 
-;; From GSubprocess
-
-(define-property flags
-  (of-object "GSubprocess")
-  (prop-type "GParamFlags")
-  (docs "Subprocess flags")
-  (readable #f)
+(define-property g-interface-name
+  (of-object "GDBusProxy")
+  (docs "The D-Bus interface name the proxy is for.")
+  (readable #t)
   (writable #t)
   (construct-only #t)
 )
 
-(define-property argv
-  (of-object "GSubprocess")
-  (prop-type "GParamBoxed")
-  (docs "Argument vector")
-  (readable #f)
+(define-property g-name
+  (of-object "GDBusProxy")
+  (docs "The well-known or unique name that the proxy is for.")
+  (readable #t)
   (writable #t)
   (construct-only #t)
 )
 
-;; From GSubprocessLauncher
+(define-property g-name-owner
+  (of-object "GDBusProxy")
+  (docs "The unique name that owns #GDBusProxy:g-name or %NULL if no-one currently owns that name. You may 
connect to #GObject::notify signal to track changes to this property.")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
 
-(define-property flags
-  (of-object "GSubprocessLauncher")
-  (prop-type "GParamFlags")
-  (docs "GSubprocessFlags for launched processes")
-  (readable #f)
+(define-property g-object-path
+  (of-object "GDBusProxy")
+  (docs "The object path the proxy is for.")
+  (readable #t)
   (writable #t)
   (construct-only #t)
 )
 
-;; From GThemedIcon
+(define-property active
+  (of-object "GDBusServer")
+  (docs "Whether the server is currently active.")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
 
-(define-property name
-  (of-object "GThemedIcon")
-  (prop-type "GParamString")
-  (docs "The name of the icon")
-  (readable #f)
+(define-property address
+  (of-object "GDBusServer")
+  (docs "The D-Bus address to listen on.")
+  (readable #t)
   (writable #t)
   (construct-only #t)
 )
 
-(define-property names
-  (of-object "GThemedIcon")
-  (prop-type "GParamBoxed")
-  (docs "An array containing the icon names")
+(define-property authentication-observer
+  (of-object "GDBusServer")
+  (docs "A #GDBusAuthObserver object to assist in the authentication process or %NULL.")
   (readable #t)
   (writable #t)
   (construct-only #t)
 )
 
-(define-property use-default-fallbacks
-  (of-object "GThemedIcon")
-  (prop-type "GParamBoolean")
-  (docs "Whether to use default fallbacks found by shortening the name at '-' characters. Ignores names 
after the first if multiple names are given.")
+(define-property client-address
+  (of-object "GDBusServer")
+  (docs "The D-Bus address that clients can use.")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property flags
+  (of-object "GDBusServer")
+  (docs "Flags from the #GDBusServerFlags enumeration.")
   (readable #t)
   (writable #t)
   (construct-only #t)
 )
 
-;; From GVolume
-
-(define-signal changed
-  (of-object "GVolume")
-  (return-type "void")
-  (when "last")
+(define-property guid
+  (of-object "GDBusServer")
+  (docs "The guid of the server.")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
 )
 
-(define-signal removed
-  (of-object "GVolume")
-  (return-type "void")
-  (when "last")
+(define-property byte-order
+  (of-object "GDataInputStream")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
 )
 
-;; From GVolumeMonitor
-
-(define-signal volume-added
-  (of-object "GVolumeMonitor")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("GVolume*" "p0")
-  )
+(define-property newline-type
+  (of-object "GDataInputStream")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
 )
 
-(define-signal volume-removed
-  (of-object "GVolumeMonitor")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("GVolume*" "p0")
-  )
+(define-property byte-order
+  (of-object "GDataOutputStream")
+  (docs "Determines the byte ordering that is used when writing multi-byte entities (such as integers) to 
the stream.")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
 )
 
-(define-signal volume-changed
-  (of-object "GVolumeMonitor")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("GVolume*" "p0")
-  )
+(define-property filename
+  (of-object "GDesktopAppInfo")
+  (docs "The origin filename of this #GDesktopAppInfo")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
 )
 
-(define-signal mount-added
-  (of-object "GVolumeMonitor")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("GMount*" "p0")
-  )
+(define-property icon
+  (of-object "GEmblem")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
 )
 
-(define-signal mount-removed
-  (of-object "GVolumeMonitor")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("GMount*" "p0")
-  )
+(define-property origin
+  (of-object "GEmblem")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
 )
 
-(define-signal mount-pre-unmount
-  (of-object "GVolumeMonitor")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("GMount*" "p0")
-  )
+(define-property gicon
+  (of-object "GEmblemedIcon")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
 )
 
-(define-signal mount-changed
-  (of-object "GVolumeMonitor")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("GMount*" "p0")
-  )
+(define-property container
+  (of-object "GFileEnumerator")
+  (readable #f)
+  (writable #t)
+  (construct-only #t)
 )
 
-(define-signal drive-connected
-  (of-object "GVolumeMonitor")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("GDrive*" "p0")
-  )
+(define-property file
+  (of-object "GFileIcon")
+  (docs "The file containing the icon.")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
 )
 
-(define-signal drive-disconnected
-  (of-object "GVolumeMonitor")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("GDrive*" "p0")
-  )
+(define-property cancelled
+  (of-object "GFileMonitor")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
 )
 
-(define-signal drive-changed
-  (of-object "GVolumeMonitor")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("GDrive*" "p0")
-  )
+(define-property rate-limit
+  (of-object "GFileMonitor")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
 )
 
-(define-signal drive-eject-button
-  (of-object "GVolumeMonitor")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("GDrive*" "p0")
-  )
+(define-property base-stream
+  (of-object "GFilterInputStream")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
 )
 
-(define-signal drive-stop-button
-  (of-object "GVolumeMonitor")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("GDrive*" "p0")
-  )
+(define-property close-base-stream
+  (of-object "GFilterInputStream")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
 )
 
-;; From GZlibCompressor
-
-(define-property format
-  (of-object "GZlibCompressor")
-  (prop-type "GParamEnum")
-  (docs "The format of the compressed data")
+(define-property base-stream
+  (of-object "GFilterOutputStream")
   (readable #t)
   (writable #t)
   (construct-only #t)
 )
 
-(define-property level
-  (of-object "GZlibCompressor")
-  (prop-type "GParamInt")
-  (docs "The level of compression from 0 (no compression) to 9 (most compression), -1 for the default level")
+(define-property close-base-stream
+  (of-object "GFilterOutputStream")
   (readable #t)
   (writable #t)
   (construct-only #t)
 )
 
-(define-property file-info
-  (of-object "GZlibCompressor")
-  (prop-type "GParamObject")
-  (docs "File info")
+(define-property closed
+  (of-object "GIOStream")
   (readable #t)
-  (writable #t)
+  (writable #f)
   (construct-only #f)
 )
 
-;; From GZlibDecompressor
-
-(define-property format
-  (of-object "GZlibDecompressor")
-  (prop-type "GParamEnum")
-  (docs "The format of the compressed data")
+(define-property input-stream
+  (of-object "GIOStream")
   (readable #t)
-  (writable #t)
-  (construct-only #t)
+  (writable #f)
+  (construct-only #f)
 )
 
-(define-property file-info
-  (of-object "GZlibDecompressor")
-  (prop-type "GParamObject")
-  (docs "File info")
+(define-property output-stream
+  (of-object "GIOStream")
   (readable #t)
   (writable #f)
   (construct-only #f)
 )
 
-;; From GInetAddress
-
-(define-property family
+(define-property bytes
   (of-object "GInetAddress")
-  (prop-type "GParamEnum")
-  (docs "The address family (IPv4 or IPv6)")
   (readable #t)
   (writable #t)
   (construct-only #t)
 )
 
-(define-property bytes
+(define-property family
   (of-object "GInetAddress")
-  (prop-type "GParamPointer")
-  (docs "The raw address data")
   (readable #t)
   (writable #t)
   (construct-only #t)
@@ -1461,118 +1289,122 @@
 
 (define-property is-any
   (of-object "GInetAddress")
-  (prop-type "GParamBoolean")
-  (docs "Whether this is the 'any' address for its family")
+  (docs "Whether this is the 'any' address for its family. See g_inet_address_get_is_any().")
   (readable #t)
   (writable #f)
   (construct-only #f)
 )
 
-(define-property is-loopback
+(define-property is-link-local
   (of-object "GInetAddress")
-  (prop-type "GParamBoolean")
-  (docs "Whether this is the loopback address for its family")
+  (docs "Whether this is a link-local address. See g_inet_address_get_is_link_local().")
   (readable #t)
   (writable #f)
   (construct-only #f)
 )
 
-(define-property is-link-local
+(define-property is-loopback
   (of-object "GInetAddress")
-  (prop-type "GParamBoolean")
-  (docs "Whether this is a link-local address")
+  (docs "Whether this is the loopback address for its family. See g_inet_address_get_is_loopback().")
   (readable #t)
   (writable #f)
   (construct-only #f)
 )
 
-(define-property is-site-local
+(define-property is-mc-global
   (of-object "GInetAddress")
-  (prop-type "GParamBoolean")
-  (docs "Whether this is a site-local address")
+  (docs "Whether this is a global multicast address. See g_inet_address_get_is_mc_global().")
   (readable #t)
   (writable #f)
   (construct-only #f)
 )
 
-(define-property is-multicast
+(define-property is-mc-link-local
   (of-object "GInetAddress")
-  (prop-type "GParamBoolean")
-  (docs "Whether this is a multicast address")
+  (docs "Whether this is a link-local multicast address. See g_inet_address_get_is_mc_link_local().")
   (readable #t)
   (writable #f)
   (construct-only #f)
 )
 
-(define-property is-mc-global
+(define-property is-mc-node-local
   (of-object "GInetAddress")
-  (prop-type "GParamBoolean")
-  (docs "Whether this is a global multicast address")
+  (docs "Whether this is a node-local multicast address. See g_inet_address_get_is_mc_node_local().")
   (readable #t)
   (writable #f)
   (construct-only #f)
 )
 
-(define-property is-mc-link-local
+(define-property is-mc-org-local
   (of-object "GInetAddress")
-  (prop-type "GParamBoolean")
-  (docs "Whether this is a link-local multicast address")
+  (docs "Whether this is an organization-local multicast address. See g_inet_address_get_is_mc_org_local().")
   (readable #t)
   (writable #f)
   (construct-only #f)
 )
 
-(define-property is-mc-node-local
+(define-property is-mc-site-local
   (of-object "GInetAddress")
-  (prop-type "GParamBoolean")
-  (docs "Whether this is a node-local multicast address")
+  (docs "Whether this is a site-local multicast address. See g_inet_address_get_is_mc_site_local().")
   (readable #t)
   (writable #f)
   (construct-only #f)
 )
 
-(define-property is-mc-org-local
+(define-property is-multicast
   (of-object "GInetAddress")
-  (prop-type "GParamBoolean")
-  (docs "Whether this is an organization-local multicast address")
+  (docs "Whether this is a multicast address. See g_inet_address_get_is_multicast().")
   (readable #t)
   (writable #f)
   (construct-only #f)
 )
 
-(define-property is-mc-site-local
+(define-property is-site-local
   (of-object "GInetAddress")
-  (prop-type "GParamBoolean")
-  (docs "Whether this is a site-local multicast address")
+  (docs "Whether this is a site-local address. See g_inet_address_get_is_loopback().")
   (readable #t)
   (writable #f)
   (construct-only #f)
 )
 
-;; From GInetSocketAddress
+(define-property address
+  (of-object "GInetAddressMask")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property family
+  (of-object "GInetAddressMask")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property length
+  (of-object "GInetAddressMask")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
 
 (define-property address
   (of-object "GInetSocketAddress")
-  (prop-type "GParamObject")
-  (docs "The address")
   (readable #t)
   (writable #t)
   (construct-only #t)
 )
 
-(define-property port
+(define-property flowinfo
   (of-object "GInetSocketAddress")
-  (prop-type "GParamUInt")
-  (docs "The port")
+  (docs "The `sin6_flowinfo` field, for IPv6 addresses.")
   (readable #t)
   (writable #t)
   (construct-only #t)
 )
 
-(define-property flowinfo
+(define-property port
   (of-object "GInetSocketAddress")
-  (prop-type "GParamUInt")
-  (docs "IPv6 flow info")
   (readable #t)
   (writable #t)
   (construct-only #t)
@@ -1580,44 +1412,109 @@
 
 (define-property scope-id
   (of-object "GInetSocketAddress")
-  (prop-type "GParamUInt")
-  (docs "IPv6 scope ID")
   (readable #t)
   (writable #t)
   (construct-only #t)
 )
 
-;; From GSocketAddress
+(define-property item-type
+  (of-object "GListStore")
+  (docs "The type of items contained in this list store. Items must be subclasses of #GObject.")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
+)
 
-(define-property family
-  (of-object "GSocketAddress")
-  (prop-type "GParamEnum")
-  (docs "The family of the socket address")
+(define-property data
+  (of-object "GMemoryOutputStream")
+  (docs "Pointer to buffer where data will be written.")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
+)
+
+(define-property data-size
+  (of-object "GMemoryOutputStream")
+  (docs "Size of data written to the buffer.")
   (readable #t)
   (writable #f)
   (construct-only #f)
 )
 
-;; From GSocketAddressEnumerator
+(define-property destroy-function
+  (of-object "GMemoryOutputStream")
+  (docs "Function called with the buffer as argument when the stream is destroyed.")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
+)
 
-;; From GSocketConnectable
+(define-property realloc-function
+  (of-object "GMemoryOutputStream")
+  (docs "Function with realloc semantics called to enlarge the buffer.")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
+)
 
-;; GSrvTarget is neither a GObject nor a GInterface. Not checked for signals and properties.
+(define-property size
+  (of-object "GMemoryOutputStream")
+  (docs "Current size of the data buffer.")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
+)
 
-;; From GResolver
+(define-property anonymous
+  (of-object "GMountOperation")
+  (docs "Whether to use an anonymous user when authenticating.")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
 
-(define-signal reload
-  (of-object "GResolver")
-  (return-type "void")
-  (when "last")
+(define-property choice
+  (of-object "GMountOperation")
+  (docs "The index of the user's choice when a question is asked during the mount operation. See the 
#GMountOperation::ask-question signal.")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property domain
+  (of-object "GMountOperation")
+  (docs "The domain to use for the mount operation.")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property password
+  (of-object "GMountOperation")
+  (docs "The password that is used for authentication when carrying out the mount operation.")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property password-save
+  (of-object "GMountOperation")
+  (docs "Determines if and how the password information should be saved.")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
 )
 
-;; From GNetworkAddress
+(define-property username
+  (of-object "GMountOperation")
+  (docs "The user name that is used for authentication when carrying out the mount operation.")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
 
 (define-property hostname
   (of-object "GNetworkAddress")
-  (prop-type "GParamString")
-  (docs "Hostname to resolve")
   (readable #t)
   (writable #t)
   (construct-only #t)
@@ -1625,8 +1522,6 @@
 
 (define-property port
   (of-object "GNetworkAddress")
-  (prop-type "GParamUInt")
-  (docs "Network port")
   (readable #t)
   (writable #t)
   (construct-only #t)
@@ -1634,132 +1529,234 @@
 
 (define-property scheme
   (of-object "GNetworkAddress")
-  (prop-type "GParamString")
-  (docs "URI Scheme")
   (readable #t)
   (writable #t)
   (construct-only #t)
 )
 
-;; From GNetworkMonitor
+(define-property domain
+  (of-object "GNetworkService")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
+)
 
-(define-signal network-changed
-  (of-object "GNetworkMonitor")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("gboolean" "p0")
-  )
+(define-property protocol
+  (of-object "GNetworkService")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
 )
 
-(define-property connectivity
-  (of-object "GNetworkMonitor")
-  (prop-type "GParamEnum")
-  (docs "Level of network connectivity")
+(define-property scheme
+  (of-object "GNetworkService")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property service
+  (of-object "GNetworkService")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
+)
+
+(define-property allowed
+  (of-object "GPermission")
+  (docs "%TRUE if the caller currently has permission to perform the action that @permission represents the 
permission to perform.")
   (readable #t)
   (writable #f)
   (construct-only #f)
 )
 
-(define-property network-available
-  (of-object "GNetworkMonitor")
-  (prop-type "GParamBoolean")
-  (docs "Whether the network is available")
+(define-property can-acquire
+  (of-object "GPermission")
+  (docs "%TRUE if it is generally possible to acquire the permission by calling g_permission_acquire().")
   (readable #t)
   (writable #f)
   (construct-only #f)
 )
 
-(define-property network-metered
-  (of-object "GNetworkMonitor")
-  (prop-type "GParamBoolean")
-  (docs "Whether the network is metered")
+(define-property can-release
+  (of-object "GPermission")
+  (docs "%TRUE if it is generally possible to release the permission by calling g_permission_release().")
   (readable #t)
   (writable #f)
   (construct-only #f)
 )
 
-;; From GNetworkService
+(define-property enabled
+  (of-object "GPropertyAction")
+  (docs "If @action is currently enabled.  If the action is disabled then calls to g_action_activate() and 
g_action_change_state() have no effect.")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
 
-(define-property service
-  (of-object "GNetworkService")
-  (prop-type "GParamString")
-  (docs "Service name, eg 'ldap'")
+(define-property invert-boolean
+  (of-object "GPropertyAction")
+  (docs "If %TRUE, the state of the action will be the negation of the property value, provided the property 
is boolean.")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
+)
+
+(define-property name
+  (of-object "GPropertyAction")
+  (docs "The name of the action.  This is mostly meaningful for identifying the action once it has been 
added to a #GActionMap.")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
+)
+
+(define-property object
+  (of-object "GPropertyAction")
+  (docs "The object to wrap a property on.  The object must be a non-%NULL #GObject with properties.")
+  (readable #f)
+  (writable #t)
+  (construct-only #t)
+)
+
+(define-property parameter-type
+  (of-object "GPropertyAction")
+  (docs "The type of the parameter that must be given when activating the action.")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property property-name
+  (of-object "GPropertyAction")
+  (docs "The name of the property to wrap on the object.  The property must exist on the passed-in object 
and it must be readable and writable (and not construct-only).")
+  (readable #f)
+  (writable #t)
+  (construct-only #t)
+)
+
+(define-property state
+  (of-object "GPropertyAction")
+  (docs "The state of the action, or %NULL if the action is stateless.")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property state-type
+  (of-object "GPropertyAction")
+  (docs "The #GVariantType of the state that the action has, or %NULL if the action is stateless.")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property destination-hostname
+  (of-object "GProxyAddress")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
+)
+
+(define-property destination-port
+  (of-object "GProxyAddress")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
+)
+
+(define-property destination-protocol
+  (of-object "GProxyAddress")
+  (docs "The protocol being spoke to the destination host, or %NULL if the #GProxyAddress doesn't know.")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
+)
+
+(define-property password
+  (of-object "GProxyAddress")
   (readable #t)
   (writable #t)
   (construct-only #t)
 )
 
 (define-property protocol
-  (of-object "GNetworkService")
-  (prop-type "GParamString")
-  (docs "Network protocol, eg 'tcp'")
+  (of-object "GProxyAddress")
   (readable #t)
   (writable #t)
   (construct-only #t)
 )
 
-(define-property domain
-  (of-object "GNetworkService")
-  (prop-type "GParamString")
-  (docs "Network domain, eg, 'example.com'")
+(define-property uri
+  (of-object "GProxyAddress")
+  (docs "The URI string that the proxy was constructed from (or %NULL if the creator didn't specify this).")
   (readable #t)
   (writable #t)
   (construct-only #t)
 )
 
-(define-property scheme
-  (of-object "GNetworkService")
-  (prop-type "GParamString")
-  (docs "Network scheme (default is to use service)")
+(define-property username
+  (of-object "GProxyAddress")
   (readable #t)
   (writable #t)
-  (construct-only #f)
+  (construct-only #t)
 )
 
-;; From GSettings
+(define-property connectable
+  (of-object "GProxyAddressEnumerator")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
+)
 
-(define-signal changed
-  (of-object "GSettings")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("const-gchar*" "p0")
-  )
+(define-property default-port
+  (of-object "GProxyAddressEnumerator")
+  (docs "The default port to use if #GProxyAddressEnumerator:uri does not specify one.")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
 )
 
-(define-signal change-event
+(define-property proxy-resolver
+  (of-object "GProxyAddressEnumerator")
+  (docs "The proxy resolver to use.")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property uri
+  (of-object "GProxyAddressEnumerator")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
+)
+
+(define-property backend
   (of-object "GSettings")
-  (return-type "gboolean")
-  (when "last")
-  (parameters
-    '("gpointer" "p0")
-    '("gint" "p1")
-  )
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
 )
 
-(define-signal writable-changed
+(define-property delay-apply
   (of-object "GSettings")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("const-gchar*" "p0")
-  )
+  (docs "Whether the #GSettings object is in 'delay-apply' mode. See g_settings_delay() for details.")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
 )
 
-(define-signal writable-change-event
+(define-property has-unapplied
   (of-object "GSettings")
-  (return-type "gboolean")
-  (when "last")
-  (parameters
-    '("guint" "p0")
-  )
+  (docs "If this property is %TRUE, the #GSettings object has outstanding changes that will be applied when 
g_settings_apply() is called.")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
 )
 
-(define-property settings-schema
+(define-property path
   (of-object "GSettings")
-  (prop-type "GParamBoxed")
-  (docs "The GSettingsSchema for this settings object")
+  (docs "The path within the backend where the settings are stored.")
   (readable #t)
   (writable #t)
   (construct-only #t)
@@ -1767,8 +1764,7 @@
 
 (define-property schema
   (of-object "GSettings")
-  (prop-type "GParamString")
-  (docs "The name of the schema for this settings object")
+  (docs "The name of the schema that describes the types of keys for this #GSettings object.  The type of 
this property is *not* #GSettingsSchema. #GSettingsSchema has only existed since version 2.32 and 
unfortunately this name was used in previous versions to refer to the schema ID rather than the schema 
itself.  Take care to use the 'settings-schema' property if you wish to pass in a #GSettingsSchema.")
   (readable #t)
   (writable #t)
   (construct-only #t)
@@ -1777,81 +1773,107 @@
 
 (define-property schema-id
   (of-object "GSettings")
-  (prop-type "GParamString")
-  (docs "The name of the schema for this settings object")
+  (docs "The name of the schema that describes the types of keys for this #GSettings object.")
   (readable #t)
   (writable #t)
   (construct-only #t)
 )
 
-(define-property backend
+(define-property settings-schema
   (of-object "GSettings")
-  (prop-type "GParamObject")
-  (docs "The GSettingsBackend for this settings object")
+  (docs "The #GSettingsSchema describing the types of keys for this #GSettings object.  Ideally, this 
property would be called 'schema'.  #GSettingsSchema has only existed since version 2.32, however, and before 
then the 'schema' property was used to refer to the ID of the schema rather than the schema itself.  Take 
care.")
   (readable #t)
   (writable #t)
   (construct-only #t)
 )
 
-(define-property path
-  (of-object "GSettings")
-  (prop-type "GParamString")
-  (docs "The path within the backend where the settings are")
+(define-property enabled
+  (of-object "GSimpleAction")
+  (docs "If @action is currently enabled.  If the action is disabled then calls to g_action_activate() and 
g_action_change_state() have no effect.")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+(define-property name
+  (of-object "GSimpleAction")
+  (docs "The name of the action. This is mostly meaningful for identifying the action once it has been added 
to a #GSimpleActionGroup.")
   (readable #t)
   (writable #t)
   (construct-only #t)
 )
 
-(define-property has-unapplied
-  (of-object "GSettings")
-  (prop-type "GParamBoolean")
-  (docs "TRUE if there are outstanding changes to apply()")
+(define-property parameter-type
+  (of-object "GSimpleAction")
+  (docs "The type of the parameter that must be given when activating the action.")
   (readable #t)
-  (writable #f)
+  (writable #t)
+  (construct-only #t)
+)
+
+(define-property state
+  (of-object "GSimpleAction")
+  (docs "The state of the action, or %NULL if the action is stateless.")
+  (readable #t)
+  (writable #t)
   (construct-only #f)
 )
 
-(define-property delay-apply
-  (of-object "GSettings")
-  (prop-type "GParamBoolean")
-  (docs "Whether this settings object is in 'delay-apply' mode")
+(define-property state-type
+  (of-object "GSimpleAction")
+  (docs "The #GVariantType of the state that the action has, or %NULL if the action is stateless.")
   (readable #t)
   (writable #f)
   (construct-only #f)
 )
 
-;; GSettingsSchema is neither a GObject nor a GInterface. Not checked for signals and properties.
-
-;; GSettingsSchemaKey is neither a GObject nor a GInterface. Not checked for signals and properties.
+(define-property input-stream
+  (of-object "GSimpleIOStream")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
+)
 
-;; GSettingsSchemaSource is neither a GObject nor a GInterface. Not checked for signals and properties.
+(define-property output-stream
+  (of-object "GSimpleIOStream")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
+)
 
-;; From GSimplePermission
+(define-property default-proxy
+  (of-object "GSimpleProxyResolver")
+  (docs "The default proxy URI that will be used for any URI that doesn't match 
#GSimpleProxyResolver:ignore-hosts, and doesn't match any of the schemes set with 
g_simple_proxy_resolver_set_uri_proxy().  Note that as a special case, if this URI starts with 'socks://', 
#GSimpleProxyResolver will treat it as referring to all three of the socks5, socks4a, and socks4 proxy 
types.")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
 
-;; From GSocket
+(define-property ignore-hosts
+  (of-object "GSimpleProxyResolver")
+  (docs "A list of hostnames and IP addresses that the resolver should allow direct connections to.  Entries 
can be in one of 4 formats:  - A hostname, such as 'example.com', '.example.com', or   '*.example.com', any 
of which match 'example.com' or   any subdomain of it.  - An IPv4 or IPv6 address, such as '192.168.1.1',   
which matches only that address.  - A hostname or IP address followed by a port, such as   'example.com:80', 
which matches whatever the hostname or IP   address would match, but only for URLs with the (explicitly)   
indicated port. In the case of an IPv6 address, the address   part must appear in brackets: '[::1]:443'  - An 
IP address range, given by a base address and prefix length,   such as 'fe80::/10', which matches any address 
in that range.  Note that when dealing with Unicode hostnames, the matching is done against the ASCII form of 
the name.  Also note that hostname exclusions apply only to connections made to hosts identified by name, and 
IP addre
 ss exclusions apply only to connections made to hosts identified by address. That is, if example.com has an 
address of 192.168.1.1, and the :ignore-hosts list contains only '192.168.1.1', then a connection to 
'example.com' (eg, via a #GNetworkAddress) will use the proxy, and a connection to '192.168.1.1' (eg, via a 
#GInetSocketAddress) will not.  These rules match the 'ignore-hosts'/'noproxy' rules most commonly used by 
other applications.")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
 
-(define-property family
+(define-property blocking
   (of-object "GSocket")
-  (prop-type "GParamEnum")
-  (docs "The sockets address family")
   (readable #t)
   (writable #t)
-  (construct-only #t)
+  (construct-only #f)
 )
 
-(define-property type
+(define-property broadcast
   (of-object "GSocket")
-  (prop-type "GParamEnum")
-  (docs "The sockets type")
+  (docs "Whether the socket should allow sending to broadcast addresses.")
   (readable #t)
   (writable #t)
-  (construct-only #t)
+  (construct-only #f)
 )
 
-(define-property protocol
+(define-property family
   (of-object "GSocket")
-  (prop-type "GParamEnum")
-  (docs "The id of the protocol to use, or -1 for unknown")
   (readable #t)
   (writable #t)
   (construct-only #t)
@@ -1859,17 +1881,13 @@
 
 (define-property fd
   (of-object "GSocket")
-  (prop-type "GParamInt")
-  (docs "The sockets file descriptor")
   (readable #t)
   (writable #t)
   (construct-only #t)
 )
 
-(define-property blocking
+(define-property keepalive
   (of-object "GSocket")
-  (prop-type "GParamBoolean")
-  (docs "Whether or not I/O on this socket is blocking")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -1877,147 +1895,116 @@
 
 (define-property listen-backlog
   (of-object "GSocket")
-  (prop-type "GParamInt")
-  (docs "Outstanding connections in the listen queue")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property keepalive
+(define-property local-address
   (of-object "GSocket")
-  (prop-type "GParamBoolean")
-  (docs "Keep connection alive by sending periodic pings")
   (readable #t)
-  (writable #t)
+  (writable #f)
   (construct-only #f)
 )
 
-(define-property local-address
+(define-property multicast-loopback
   (of-object "GSocket")
-  (prop-type "GParamObject")
-  (docs "The local address the socket is bound to")
+  (docs "Whether outgoing multicast packets loop back to the local host.")
   (readable #t)
-  (writable #f)
+  (writable #t)
   (construct-only #f)
 )
 
-(define-property remote-address
+(define-property multicast-ttl
   (of-object "GSocket")
-  (prop-type "GParamObject")
-  (docs "The remote address the socket is connected to")
+  (docs "Time-to-live out outgoing multicast packets")
   (readable #t)
-  (writable #f)
+  (writable #t)
   (construct-only #f)
 )
 
-(define-property timeout
+(define-property protocol
   (of-object "GSocket")
-  (prop-type "GParamUInt")
-  (docs "The timeout in seconds on socket I/O")
   (readable #t)
   (writable #t)
-  (construct-only #f)
+  (construct-only #t)
 )
 
-(define-property ttl
+(define-property remote-address
   (of-object "GSocket")
-  (prop-type "GParamUInt")
-  (docs "Time-to-live of outgoing unicast packets")
   (readable #t)
-  (writable #t)
+  (writable #f)
   (construct-only #f)
 )
 
-(define-property broadcast
+(define-property timeout
   (of-object "GSocket")
-  (prop-type "GParamBoolean")
-  (docs "Whether to allow sending to broadcast addresses")
+  (docs "The timeout in seconds on socket I/O")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property multicast-loopback
+(define-property ttl
   (of-object "GSocket")
-  (prop-type "GParamBoolean")
-  (docs "Whether outgoing multicast packets loop back to the local host")
+  (docs "Time-to-live for outgoing unicast packets")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property multicast-ttl
+(define-property type
   (of-object "GSocket")
-  (prop-type "GParamUInt")
-  (docs "Time-to-live of outgoing multicast packets")
   (readable #t)
   (writable #t)
-  (construct-only #f)
+  (construct-only #t)
 )
 
-;; From GSocketClient
-
-(define-signal event
-  (of-object "GSocketClient")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("GSocketClientEvent" "p0")
-    '("GSocketConnectable*" "p1")
-    '("GIOStream*" "p2")
-  )
+(define-property family
+  (of-object "GSocketAddress")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
 )
 
-(define-property family
+(define-property enable-proxy
   (of-object "GSocketClient")
-  (prop-type "GParamEnum")
-  (docs "The sockets address family to use for socket construction")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property type
+(define-property family
   (of-object "GSocketClient")
-  (prop-type "GParamEnum")
-  (docs "The sockets type to use for socket construction")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property protocol
+(define-property local-address
   (of-object "GSocketClient")
-  (prop-type "GParamEnum")
-  (docs "The protocol to use for socket construction, or 0 for default")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property local-address
+(define-property protocol
   (of-object "GSocketClient")
-  (prop-type "GParamObject")
-  (docs "The local address constructed sockets will be bound to")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property timeout
+(define-property proxy-resolver
   (of-object "GSocketClient")
-  (prop-type "GParamUInt")
-  (docs "The I/O timeout for sockets, or 0 for none")
+  (docs "The proxy resolver to use")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property enable-proxy
+(define-property timeout
   (of-object "GSocketClient")
-  (prop-type "GParamBoolean")
-  (docs "Enable proxy support")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -2025,8 +2012,6 @@
 
 (define-property tls
   (of-object "GSocketClient")
-  (prop-type "GParamBoolean")
-  (docs "Whether to create TLS connections")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -2034,185 +2019,173 @@
 
 (define-property tls-validation-flags
   (of-object "GSocketClient")
-  (prop-type "GParamFlags")
-  (docs "TLS validation flags to use")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property proxy-resolver
+(define-property type
   (of-object "GSocketClient")
-  (prop-type "GParamObject")
-  (docs "The proxy resolver to use")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-;; From GSocketConnection
-
 (define-property socket
   (of-object "GSocketConnection")
-  (prop-type "GParamObject")
-  (docs "The underlying GSocket")
   (readable #t)
   (writable #t)
   (construct-only #t)
 )
 
-;; From GTcpConnection
+(define-property listen-backlog
+  (of-object "GSocketListener")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
 
-(define-property graceful-disconnect
-  (of-object "GTcpConnection")
-  (prop-type "GParamBoolean")
-  (docs "Whether or not close does a graceful disconnect")
+(define-property active
+  (of-object "GSocketService")
+  (docs "Whether the service is currently accepting connections.")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-;; From GTcpWrapperConnection
+(define-property argv
+  (of-object "GSubprocess")
+  (readable #f)
+  (writable #t)
+  (construct-only #t)
+)
 
-(define-property base-io-stream
-  (of-object "GTcpWrapperConnection")
-  (prop-type "GParamObject")
-  (docs "The wrapped GIOStream")
-  (readable #t)
+(define-property flags
+  (of-object "GSubprocess")
+  (readable #f)
   (writable #t)
   (construct-only #t)
 )
 
-;; From GTlsBackend
+(define-property flags
+  (of-object "GSubprocessLauncher")
+  (readable #f)
+  (writable #t)
+  (construct-only #t)
+)
 
-;; From GTlsCertificate
+(define-property completed
+  (of-object "GTask")
+  (docs "Whether the task has completed, meaning its callback (if set) has been invoked. This can only 
happen after g_task_return_pointer(), g_task_return_error() or one of the other return functions have been 
called on the task.  This property is guaranteed to change from %FALSE to %TRUE exactly once.  The 
#GObject::notify signal for this change is emitted in the same main context as the task’s callback, 
immediately after that callback is invoked.")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
 
-(define-property certificate
-  (of-object "GTlsCertificate")
-  (prop-type "GParamBoxed")
-  (docs "The DER representation of the certificate")
+(define-property graceful-disconnect
+  (of-object "GTcpConnection")
   (readable #t)
   (writable #t)
-  (construct-only #t)
+  (construct-only #f)
 )
 
-(define-property certificate-pem
-  (of-object "GTlsCertificate")
-  (prop-type "GParamString")
-  (docs "The PEM representation of the certificate")
+(define-property base-io-stream
+  (of-object "GTcpWrapperConnection")
   (readable #t)
   (writable #t)
   (construct-only #t)
 )
 
-(define-property private-key
-  (of-object "GTlsCertificate")
-  (prop-type "GParamBoxed")
-  (docs "The DER representation of the certificate's private key")
-  (readable #f)
+(define-property flags
+  (of-object "GTestDBus")
+  (docs "#GTestDBusFlags specifying the behaviour of the D-Bus session.")
+  (readable #t)
   (writable #t)
   (construct-only #t)
 )
 
-(define-property private-key-pem
-  (of-object "GTlsCertificate")
-  (prop-type "GParamString")
-  (docs "The PEM representation of the certificate's private key")
+(define-property name
+  (of-object "GThemedIcon")
+  (docs "The icon name.")
   (readable #f)
   (writable #t)
   (construct-only #t)
 )
 
-(define-property issuer
-  (of-object "GTlsCertificate")
-  (prop-type "GParamObject")
-  (docs "The certificate for the issuing entity")
+(define-property names
+  (of-object "GThemedIcon")
+  (docs "A %NULL-terminated array of icon names.")
   (readable #t)
   (writable #t)
   (construct-only #t)
 )
 
-;; From GTlsClientConnection
-
-(define-property accepted-cas
-  (of-object "GTlsClientConnection")
-  (prop-type "GParamPointer")
-  (docs "Distinguished names of the CAs the server accepts certificates from")
+(define-property use-default-fallbacks
+  (of-object "GThemedIcon")
+  (docs "Whether to use the default fallbacks found by shortening the icon name at '-' characters. If the 
'names' array has more than one element, ignores any past the first.  For example, if the icon name was 
'gnome-dev-cdrom-audio', the array would become |[<!-- language='C' --> {   'gnome-dev-cdrom-audio',   
'gnome-dev-cdrom',   'gnome-dev',   'gnome',   NULL }; ]|")
   (readable #t)
-  (writable #f)
-  (construct-only #f)
+  (writable #t)
+  (construct-only #t)
 )
 
-(define-property server-identity
-  (of-object "GTlsClientConnection")
-  (prop-type "GParamObject")
-  (docs "GSocketConnectable identifying the server")
+(define-property max-threads
+  (of-object "GThreadedSocketService")
   (readable #t)
   (writable #t)
-  (construct-only #f)
+  (construct-only #t)
 )
 
-(define-property use-ssl3
-  (of-object "GTlsClientConnection")
-  (prop-type "GParamBoolean")
-  (docs "Use fallback version of SSL/TLS rather than most recent version")
+(define-property certificate
+  (of-object "GTlsCertificate")
+  (docs "The DER (binary) encoded representation of the certificate. This property and the 
#GTlsCertificate:certificate-pem property represent the same data, just in different forms.")
   (readable #t)
   (writable #t)
-  (construct-only #f)
+  (construct-only #t)
 )
 
-(define-property validation-flags
-  (of-object "GTlsClientConnection")
-  (prop-type "GParamFlags")
-  (docs "What certificate validation to perform")
+(define-property certificate-pem
+  (of-object "GTlsCertificate")
+  (docs "The PEM (ASCII) encoded representation of the certificate. This property and the 
#GTlsCertificate:certificate property represent the same data, just in different forms.")
   (readable #t)
   (writable #t)
-  (construct-only #f)
+  (construct-only #t)
 )
 
-;; From GTlsConnection
-
-(define-signal accept-certificate
-  (of-object "GTlsConnection")
-  (return-type "gboolean")
-  (when "last")
-  (parameters
-    '("GTlsCertificate*" "p0")
-    '("GTlsCertificateFlags" "p1")
-  )
+(define-property issuer
+  (of-object "GTlsCertificate")
+  (docs "A #GTlsCertificate representing the entity that issued this certificate. If %NULL, this means that 
the certificate is either self-signed, or else the certificate of the issuer is not available.")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
 )
 
-(define-property base-io-stream
-  (of-object "GTlsConnection")
-  (prop-type "GParamObject")
-  (docs "The GIOStream that the connection wraps")
-  (readable #t)
+(define-property private-key
+  (of-object "GTlsCertificate")
+  (docs "The DER (binary) encoded representation of the certificate's private key, in either PKCS#1 format 
or unencrypted PKCS#8 format. This property (or the #GTlsCertificate:private-key-pem property) can be set 
when constructing a key (eg, from a file), but cannot be read.  PKCS#8 format is supported since 2.32; 
earlier releases only support PKCS#1. You can use the `openssl rsa` tool to convert PKCS#8 keys to PKCS#1.")
+  (readable #f)
   (writable #t)
   (construct-only #t)
 )
 
-(define-property require-close-notify
-  (of-object "GTlsConnection")
-  (prop-type "GParamBoolean")
-  (docs "Whether to require proper TLS close notification")
-  (readable #t)
+(define-property private-key-pem
+  (of-object "GTlsCertificate")
+  (docs "The PEM (ASCII) encoded representation of the certificate's private key in either PKCS#1 format 
('`BEGIN RSA PRIVATE KEY`') or unencrypted PKCS#8 format ('`BEGIN PRIVATE KEY`'). This property (or the 
#GTlsCertificate:private-key property) can be set when constructing a key (eg, from a file), but cannot be 
read.  PKCS#8 format is supported since 2.32; earlier releases only support PKCS#1. You can use the `openssl 
rsa` tool to convert PKCS#8 keys to PKCS#1.")
+  (readable #f)
   (writable #t)
-  (construct-only #f)
+  (construct-only #t)
 )
 
-(define-property rehandshake-mode
+(define-property base-io-stream
   (of-object "GTlsConnection")
-  (prop-type "GParamEnum")
-  (docs "When to allow rehandshaking")
+  (docs "The #GIOStream that the connection wraps. The connection holds a reference to this stream, and may 
run operations on the stream from other threads throughout its lifetime. Consequently, after the #GIOStream 
has been constructed, application code may only run its own operations on this stream when no #GIOStream 
operations are running.")
   (readable #t)
   (writable #t)
-  (construct-only #f)
+  (construct-only #t)
 )
 
-(define-property use-system-certdb
+(define-property certificate
   (of-object "GTlsConnection")
-  (prop-type "GParamBoolean")
-  (docs "Whether to verify peer certificates against the system certificate database")
+  (docs "The connection's certificate; see g_tls_connection_set_certificate().")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -2220,8 +2193,7 @@
 
 (define-property database
   (of-object "GTlsConnection")
-  (prop-type "GParamObject")
-  (docs "Certificate database to use for looking up or verifying certificates")
+  (docs "The certificate database to use when verifying this TLS connection. If no certificate database is 
set, then the default database will be used. See g_tls_backend_get_default_database().")
   (readable #t)
   (writable #t)
   (construct-only #f)
@@ -2229,512 +2201,393 @@
 
 (define-property interaction
   (of-object "GTlsConnection")
-  (prop-type "GParamObject")
-  (docs "Optional object for user interaction")
+  (docs "A #GTlsInteraction object to be used when the connection or certificate database need to interact 
with the user. This will be used to prompt the user for passwords where necessary.")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property certificate
+(define-property peer-certificate
   (of-object "GTlsConnection")
-  (prop-type "GParamObject")
-  (docs "The connection's certificate")
+  (docs "The connection's peer's certificate, after the TLS handshake has completed and the certificate has 
been accepted. Note in particular that this is not yet set during the emission of 
#GTlsConnection::accept-certificate.  (You can watch for a #GObject::notify signal on this property to detect 
when a handshake has occurred.)")
   (readable #t)
-  (writable #t)
+  (writable #f)
   (construct-only #f)
 )
 
-(define-property peer-certificate
+(define-property peer-certificate-errors
   (of-object "GTlsConnection")
-  (prop-type "GParamObject")
-  (docs "The connection's peer's certificate")
+  (docs "The errors noticed-and-ignored while verifying #GTlsConnection:peer-certificate. Normally this 
should be 0, but it may not be if #GTlsClientConnection:validation-flags is not 
%G_TLS_CERTIFICATE_VALIDATE_ALL, or if #GTlsConnection::accept-certificate overrode the default behavior.")
   (readable #t)
   (writable #f)
   (construct-only #f)
 )
 
-(define-property peer-certificate-errors
+(define-property rehandshake-mode
   (of-object "GTlsConnection")
-  (prop-type "GParamFlags")
-  (docs "Errors found with the peer's certificate")
+  (docs "The rehandshaking mode. See g_tls_connection_set_rehandshake_mode().")
   (readable #t)
-  (writable #f)
+  (writable #t)
   (construct-only #f)
 )
 
-;; From GTlsDatabase
-
-;; From GTlsFileDatabase
-
-(define-property anchors
-  (of-object "GTlsFileDatabase")
-  (prop-type "GParamString")
-  (docs "The certificate authority anchor file")
+(define-property require-close-notify
+  (of-object "GTlsConnection")
+  (docs "Whether or not proper TLS close notification is required. See 
g_tls_connection_set_require_close_notify().")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-;; From GTlsInteraction
-
-;; From GTlsPassword
-
-(define-property flags
-  (of-object "GTlsPassword")
-  (prop-type "GParamFlags")
-  (docs "Flags about the password")
+(define-property use-system-certdb
+  (of-object "GTlsConnection")
+  (docs "Whether or not the system certificate database will be used to verify peer certificates. See 
g_tls_connection_set_use_system_certdb().")
   (readable #t)
   (writable #t)
   (construct-only #f)
+  (deprecated #t)
 )
 
 (define-property description
   (of-object "GTlsPassword")
-  (prop-type "GParamString")
-  (docs "Description of what the password is for")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property warning
+(define-property flags
   (of-object "GTlsPassword")
-  (prop-type "GParamString")
-  (docs "Warning about the password")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-;; From GTlsServerConnection
-
-(define-property authentication-mode
-  (of-object "GTlsServerConnection")
-  (prop-type "GParamEnum")
-  (docs "The client authentication mode")
+(define-property warning
+  (of-object "GTlsPassword")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-;; From GUnixConnection
-
-;; From GSocketListener
-
-(define-signal event
-  (of-object "GSocketListener")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("GSocketListenerEvent" "p0")
-    '("GSocket*" "p1")
-  )
-)
-
-(define-property listen-backlog
-  (of-object "GSocketListener")
-  (prop-type "GParamInt")
-  (docs "outstanding connections in the listen queue")
+(define-property credentials
+  (of-object "GUnixCredentialsMessage")
+  (docs "The credentials stored in the message.")
   (readable #t)
   (writable #t)
-  (construct-only #f)
+  (construct-only #t)
 )
 
-;; From GSocketService
-
-(define-signal incoming
-  (of-object "GSocketService")
-  (return-type "gboolean")
-  (when "last")
-  (parameters
-    '("GSocketConnection*" "p0")
-    '("GObject*" "p1")
-  )
+(define-property fd-list
+  (of-object "GUnixFDMessage")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
 )
 
-(define-property active
-  (of-object "GSocketService")
-  (prop-type "GParamBoolean")
-  (docs "Whether the service is currently accepting connections")
+(define-property close-fd
+  (of-object "GUnixInputStream")
+  (docs "Whether to close the file descriptor when the stream is closed.")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-;; From GThreadedSocketService
-
-(define-signal run
-  (of-object "GThreadedSocketService")
-  (return-type "gboolean")
-  (when "last")
-  (parameters
-    '("GSocketConnection*" "p0")
-    '("GObject*" "p1")
-  )
-)
-
-(define-property max-threads
-  (of-object "GThreadedSocketService")
-  (prop-type "GParamInt")
-  (docs "The max number of threads handling clients for this service")
+(define-property fd
+  (of-object "GUnixInputStream")
+  (docs "The file descriptor that the stream reads from.")
   (readable #t)
   (writable #t)
   (construct-only #t)
 )
 
-;; From GDBusAuthObserver
-
-(define-signal authorize-authenticated-peer
-  (of-object "GDBusAuthObserver")
-  (return-type "gboolean")
-  (when "last")
-  (parameters
-    '("GIOStream*" "p0")
-    '("GCredentials*" "p1")
-  )
-)
-
-(define-signal allow-mechanism
-  (of-object "GDBusAuthObserver")
-  (return-type "gboolean")
-  (when "last")
-  (parameters
-    '("const-gchar*" "p0")
-  )
+(define-property close-fd
+  (of-object "GUnixOutputStream")
+  (docs "Whether to close the file descriptor when the stream is closed.")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
 )
 
-;; From GDBusConnection
-
-(define-signal closed
-  (of-object "GDBusConnection")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("gboolean" "p0")
-    '("GError*" "p1")
-  )
+(define-property fd
+  (of-object "GUnixOutputStream")
+  (docs "The file descriptor that the stream writes to.")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
 )
 
-(define-property stream
-  (of-object "GDBusConnection")
-  (prop-type "GParamObject")
-  (docs "The underlying streams used for I/O")
+(define-property abstract
+  (of-object "GUnixSocketAddress")
+  (docs "Whether or not this is an abstract address")
   (readable #t)
   (writable #t)
   (construct-only #t)
+  (deprecated #t)
 )
 
-(define-property address
-  (of-object "GDBusConnection")
-  (prop-type "GParamString")
-  (docs "D-Bus address specifying potential socket endpoints")
-  (readable #f)
+(define-property address-type
+  (of-object "GUnixSocketAddress")
+  (readable #t)
   (writable #t)
   (construct-only #t)
 )
 
-(define-property flags
-  (of-object "GDBusConnection")
-  (prop-type "GParamFlags")
-  (docs "Flags")
-  (readable #f)
+(define-property path
+  (of-object "GUnixSocketAddress")
+  (readable #t)
   (writable #t)
   (construct-only #t)
 )
 
-(define-property guid
-  (of-object "GDBusConnection")
-  (prop-type "GParamString")
-  (docs "GUID of the server peer")
+(define-property path-as-array
+  (of-object "GUnixSocketAddress")
   (readable #t)
   (writable #t)
   (construct-only #t)
 )
 
-(define-property unique-name
-  (of-object "GDBusConnection")
-  (prop-type "GParamString")
-  (docs "Unique name of bus connection")
+(define-property file-info
+  (of-object "GZlibCompressor")
+  (docs "If set to a non-%NULL #GFileInfo object, and #GZlibCompressor:format is 
%G_ZLIB_COMPRESSOR_FORMAT_GZIP, the compressor will write the file name and modification time from the file 
info to the GZIP header.")
   (readable #t)
-  (writable #f)
+  (writable #t)
   (construct-only #f)
 )
 
-(define-property closed
-  (of-object "GDBusConnection")
-  (prop-type "GParamBoolean")
-  (docs "Whether the connection is closed")
+(define-property format
+  (of-object "GZlibCompressor")
   (readable #t)
-  (writable #f)
-  (construct-only #f)
+  (writable #t)
+  (construct-only #t)
 )
 
-(define-property exit-on-close
-  (of-object "GDBusConnection")
-  (prop-type "GParamBoolean")
-  (docs "Whether the process is terminated when the connection is closed")
+(define-property level
+  (of-object "GZlibCompressor")
   (readable #t)
   (writable #t)
-  (construct-only #f)
+  (construct-only #t)
 )
 
-(define-property capabilities
-  (of-object "GDBusConnection")
-  (prop-type "GParamFlags")
-  (docs "Capabilities")
+(define-property file-info
+  (of-object "GZlibDecompressor")
+  (docs "A #GFileInfo containing the information found in the GZIP header of the data stream processed, or 
%NULL if the header was not yet fully processed, is not present at all, or the compressor's 
#GZlibDecompressor:format property is not %G_ZLIB_COMPRESSOR_FORMAT_GZIP.")
   (readable #t)
   (writable #f)
   (construct-only #f)
 )
 
-(define-property authentication-observer
-  (of-object "GDBusConnection")
-  (prop-type "GParamObject")
-  (docs "Object used to assist in the authentication process")
-  (readable #f)
+(define-property format
+  (of-object "GZlibDecompressor")
+  (readable #t)
   (writable #t)
   (construct-only #t)
 )
 
-;; GDBusError is neither a GObject nor a GInterface. Not checked for signals and properties.
-
-;; GDBusAnnotationInfo is neither a GObject nor a GInterface. Not checked for signals and properties.
-
-;; GDBusArgInfo is neither a GObject nor a GInterface. Not checked for signals and properties.
-
-;; From GDBusMenuModel
-
-;; GDBusMethodInfo is neither a GObject nor a GInterface. Not checked for signals and properties.
-
-;; GDBusSignalInfo is neither a GObject nor a GInterface. Not checked for signals and properties.
-
-;; GDBusPropertyInfo is neither a GObject nor a GInterface. Not checked for signals and properties.
-
-;; GDBusInterfaceInfo is neither a GObject nor a GInterface. Not checked for signals and properties.
-
-;; From GDBusInterfaceSkeleton
-
-(define-signal g-authorize-method
-  (of-object "GDBusInterfaceSkeleton")
-  (return-type "gboolean")
-  (when "last")
-  (parameters
-    '("GDBusMethodInvocation*" "p0")
-  )
+(define-property enabled
+  (of-object "GAction")
+  (docs "If @action is currently enabled.  If the action is disabled then calls to g_action_activate() and 
g_action_change_state() have no effect.")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
 )
 
-(define-property g-flags
-  (of-object "GDBusInterfaceSkeleton")
-  (prop-type "GParamFlags")
-  (docs "Flags for the interface skeleton")
+(define-property name
+  (of-object "GAction")
+  (docs "The name of the action.  This is mostly meaningful for identifying the action once it has been 
added to a #GActionGroup. It is immutable.")
   (readable #t)
-  (writable #t)
+  (writable #f)
   (construct-only #f)
 )
 
-;; From GDBusObject
-
-(define-signal interface-added
-  (of-object "GDBusObject")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("GDBusInterface*" "p0")
-  )
+(define-property parameter-type
+  (of-object "GAction")
+  (docs "The type of the parameter that must be given when activating the action. This is immutable, and may 
be %NULL if no parameter is needed when activating the action.")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
 )
 
-(define-signal interface-removed
-  (of-object "GDBusObject")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("GDBusInterface*" "p0")
-  )
+(define-property state
+  (of-object "GAction")
+  (docs "The state of the action, or %NULL if the action is stateless.")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
 )
 
-;; GDBusNodeInfo is neither a GObject nor a GInterface. Not checked for signals and properties.
-
-;; From GDBusMessage
-
-(define-property locked
-  (of-object "GDBusMessage")
-  (prop-type "GParamBoolean")
-  (docs "Whether the message is locked")
+(define-property state-type
+  (of-object "GAction")
+  (docs "The #GVariantType of the state that the action has, or %NULL if the action is stateless. This is 
immutable.")
   (readable #t)
   (writable #f)
   (construct-only #f)
 )
 
-;; From GDBusMethodInvocation
-
-;; From GDBusProxy
-
-(define-signal g-properties-changed
-  (of-object "GDBusProxy")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("GVariant*" "p0")
-    '("const-gchar*const*" "p1")
-  )
+(define-property accepted-cas
+  (of-object "GDtlsClientConnection")
+  (docs "A list of the distinguished names of the Certificate Authorities that the server will accept client 
certificates signed by. If the server requests a client certificate during the handshake, then this property 
will be set after the handshake completes.  Each item in the list is a #GByteArray which contains the 
complete subject DN of the certificate authority.")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
 )
 
-(define-signal g-signal
-  (of-object "GDBusProxy")
-  (return-type "void")
-  (when "last")
-  (parameters
-    '("const-gchar*" "p0")
-    '("const-gchar*" "p1")
-    '("GVariant*" "p2")
-  )
+(define-property server-identity
+  (of-object "GDtlsClientConnection")
+  (docs "A #GSocketConnectable describing the identity of the server that is expected on the other end of 
the connection.  If the %G_TLS_CERTIFICATE_BAD_IDENTITY flag is set in 
#GDtlsClientConnection:validation-flags, this object will be used to determine the expected identify of the 
remote end of the connection; if #GDtlsClientConnection:server-identity is not set, or does not match the 
identity presented by the server, then the %G_TLS_CERTIFICATE_BAD_IDENTITY validation will fail.  In addition 
to its use in verifying the server certificate, this is also used to give a hint to the server about what 
certificate we expect, which is useful for servers that serve virtual hosts.")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
 )
 
-(define-property g-connection
-  (of-object "GDBusProxy")
-  (prop-type "GParamObject")
-  (docs "The connection the proxy is for")
+(define-property validation-flags
+  (of-object "GDtlsClientConnection")
+  (docs "What steps to perform when validating a certificate received from a server. Server certificates 
that fail to validate in all of the ways indicated here will be rejected unless the application overrides the 
default via #GDtlsConnection::accept-certificate.")
   (readable #t)
   (writable #t)
-  (construct-only #t)
+  (construct-only #f)
 )
 
-(define-property g-bus-type
-  (of-object "GDBusProxy")
-  (prop-type "GParamEnum")
-  (docs "The bus to connect to, if any")
-  (readable #f)
+(define-property base-socket
+  (of-object "GDtlsConnection")
+  (docs "The #GDatagramBased that the connection wraps. Note that this may be any implementation of 
#GDatagramBased, not just a #GSocket.")
+  (readable #t)
   (writable #t)
   (construct-only #t)
 )
 
-(define-property g-name
-  (of-object "GDBusProxy")
-  (prop-type "GParamString")
-  (docs "The well-known or unique name that the proxy is for")
+(define-property certificate
+  (of-object "GDtlsConnection")
+  (docs "The connection's certificate; see g_dtls_connection_set_certificate().")
   (readable #t)
   (writable #t)
-  (construct-only #t)
+  (construct-only #f)
 )
 
-(define-property g-name-owner
-  (of-object "GDBusProxy")
-  (prop-type "GParamString")
-  (docs "The unique name for the owner")
+(define-property database
+  (of-object "GDtlsConnection")
+  (docs "The certificate database to use when verifying this TLS connection. If no certificate database is 
set, then the default database will be used. See g_dtls_backend_get_default_database().")
   (readable #t)
-  (writable #f)
+  (writable #t)
   (construct-only #f)
 )
 
-(define-property g-flags
-  (of-object "GDBusProxy")
-  (prop-type "GParamFlags")
-  (docs "Flags for the proxy")
+(define-property interaction
+  (of-object "GDtlsConnection")
+  (docs "A #GTlsInteraction object to be used when the connection or certificate database need to interact 
with the user. This will be used to prompt the user for passwords where necessary.")
   (readable #t)
   (writable #t)
-  (construct-only #t)
+  (construct-only #f)
 )
 
-(define-property g-object-path
-  (of-object "GDBusProxy")
-  (prop-type "GParamString")
-  (docs "The object path the proxy is for")
+(define-property peer-certificate
+  (of-object "GDtlsConnection")
+  (docs "The connection's peer's certificate, after the TLS handshake has completed and the certificate has 
been accepted. Note in particular that this is not yet set during the emission of 
#GDtlsConnection::accept-certificate.  (You can watch for a #GObject::notify signal on this property to 
detect when a handshake has occurred.)")
   (readable #t)
-  (writable #t)
-  (construct-only #t)
+  (writable #f)
+  (construct-only #f)
 )
 
-(define-property g-interface-name
-  (of-object "GDBusProxy")
-  (prop-type "GParamString")
-  (docs "The D-Bus interface name the proxy is for")
+(define-property peer-certificate-errors
+  (of-object "GDtlsConnection")
+  (docs "The errors noticed-and-ignored while verifying #GDtlsConnection:peer-certificate. Normally this 
should be 0, but it may not be if #GDtlsClientConnection:validation-flags is not 
%G_TLS_CERTIFICATE_VALIDATE_ALL, or if #GDtlsConnection::accept-certificate overrode the default behavior.")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
+
+(define-property rehandshake-mode
+  (of-object "GDtlsConnection")
+  (docs "The rehandshaking mode. See g_dtls_connection_set_rehandshake_mode().")
   (readable #t)
   (writable #t)
-  (construct-only #t)
+  (construct-only #f)
 )
 
-(define-property g-default-timeout
-  (of-object "GDBusProxy")
-  (prop-type "GParamInt")
-  (docs "Timeout for remote method invocation")
+(define-property require-close-notify
+  (of-object "GDtlsConnection")
+  (docs "Whether or not proper TLS close notification is required. See 
g_dtls_connection_set_require_close_notify().")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-(define-property g-interface-info
-  (of-object "GDBusProxy")
-  (prop-type "GParamBoxed")
-  (docs "Interface Information")
+(define-property authentication-mode
+  (of-object "GDtlsServerConnection")
+  (docs "The #GTlsAuthenticationMode for the server. This can be changed before calling 
g_dtls_connection_handshake() if you want to rehandshake with a different mode from the initial handshake.")
   (readable #t)
   (writable #t)
   (construct-only #f)
 )
 
-;; From GDBusServer
+(define-property connectivity
+  (of-object "GNetworkMonitor")
+  (docs "More detailed information about the host's network connectivity. See 
g_network_monitor_get_connectivity() and #GNetworkConnectivity for more details.")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
+)
 
-(define-signal new-connection
-  (of-object "GDBusServer")
-  (return-type "gboolean")
-  (when "last")
-  (parameters
-    '("GDBusConnection*" "p0")
-  )
+(define-property network-available
+  (of-object "GNetworkMonitor")
+  (docs "Whether the network is considered available. That is, whether the system has a default route for at 
least one of IPv4 or IPv6.  Real-world networks are of course much more complicated than this; the machine 
may be connected to a wifi hotspot that requires payment before allowing traffic through, or may be connected 
to a functioning router that has lost its own upstream connectivity. Some hosts might only be accessible when 
a VPN is active. Other hosts might only be accessible when the VPN is not active. Thus, it is best to use 
g_network_monitor_can_reach() or g_network_monitor_can_reach_async() to test for reachability on a 
host-by-host basis. (On the other hand, when the property is %FALSE, the application can reasonably expect 
that no remote hosts at all are reachable, and should indicate this to the user in its UI.)  See also 
#GNetworkMonitor::network-changed.")
+  (readable #t)
+  (writable #f)
+  (construct-only #f)
 )
 
-(define-property address
-  (of-object "GDBusServer")
-  (prop-type "GParamString")
-  (docs "The address to listen on")
+(define-property network-metered
+  (of-object "GNetworkMonitor")
+  (docs "Whether the network is considered metered. That is, whether the system has traffic flowing through 
the default connection that is subject to limitations set by service providers. For example, traffic might be 
billed by the amount of data transmitted, or there might be a quota on the amount of traffic per month. This 
is typical with tethered connections (3G and 4G) and in such situations, bandwidth intensive applications may 
wish to avoid network activity where possible if it will cost the user money or use up their limited quota.  
If more information is required about specific devices then the system network management API should be used 
instead (for example, NetworkManager or ConnMan).  If this information is not available then no networks will 
be marked as metered.  See also #GNetworkMonitor:network-available.")
   (readable #t)
-  (writable #t)
-  (construct-only #t)
+  (writable #f)
+  (construct-only #f)
 )
 
-(define-property client-address
-  (of-object "GDBusServer")
-  (prop-type "GParamString")
-  (docs "The address clients can use")
+(define-property accepted-cas
+  (of-object "GTlsClientConnection")
+  (docs "A list of the distinguished names of the Certificate Authorities that the server will accept client 
certificates signed by. If the server requests a client certificate during the handshake, then this property 
will be set after the handshake completes.  Each item in the list is a #GByteArray which contains the 
complete subject DN of the certificate authority.")
   (readable #t)
   (writable #f)
   (construct-only #f)
 )
 
-(define-property flags
-  (of-object "GDBusServer")
-  (prop-type "GParamFlags")
-  (docs "Flags for the server")
+(define-property server-identity
+  (of-object "GTlsClientConnection")
+  (docs "A #GSocketConnectable describing the identity of the server that is expected on the other end of 
the connection.  If the %G_TLS_CERTIFICATE_BAD_IDENTITY flag is set in 
#GTlsClientConnection:validation-flags, this object will be used to determine the expected identify of the 
remote end of the connection; if #GTlsClientConnection:server-identity is not set, or does not match the 
identity presented by the server, then the %G_TLS_CERTIFICATE_BAD_IDENTITY validation will fail.  In addition 
to its use in verifying the server certificate, this is also used to give a hint to the server about what 
certificate we expect, which is useful for servers that serve virtual hosts.")
   (readable #t)
   (writable #t)
-  (construct-only #t)
+  (construct-only #f)
 )
 
-(define-property guid
-  (of-object "GDBusServer")
-  (prop-type "GParamString")
-  (docs "The guid of the server")
+(define-property use-ssl3
+  (of-object "GTlsClientConnection")
+  (docs "If %TRUE, tells the connection to use a fallback version of TLS or SSL, rather than trying to 
negotiate the best version of TLS to use. This can be used when talking to servers that don't implement 
version negotiation correctly and therefore refuse to handshake at all with a 'modern' TLS handshake.  
Despite the property name, the fallback version is not necessarily SSL 3.0; if SSL 3.0 has been disabled, the 
#GTlsClientConnection will use the next highest available version (normally TLS 1.0) as the fallback 
version.")
   (readable #t)
   (writable #t)
-  (construct-only #t)
+  (construct-only #f)
 )
 
-(define-property active
-  (of-object "GDBusServer")
-  (prop-type "GParamBoolean")
-  (docs "Whether the server is currently active")
+(define-property validation-flags
+  (of-object "GTlsClientConnection")
+  (docs "What steps to perform when validating a certificate received from a server. Server certificates 
that fail to validate in all of the ways indicated here will be rejected unless the application overrides the 
default via #GTlsConnection::accept-certificate.")
   (readable #t)
-  (writable #f)
+  (writable #t)
   (construct-only #f)
 )
 
-(define-property authentication-observer
-  (of-object "GDBusServer")
-  (prop-type "GParamObject")
-  (docs "Object used to assist in the authentication process")
+(define-property anchors
+  (of-object "GTlsFileDatabase")
+  (docs "The path to a file containing PEM encoded certificate authority root anchors. The certificates in 
this file will be treated as root authorities for the purpose of verifying other certificates via the 
g_tls_database_verify_chain() operation.")
   (readable #t)
   (writable #t)
-  (construct-only #t)
+  (construct-only #f)
 )
 
+(define-property authentication-mode
+  (of-object "GTlsServerConnection")
+  (docs "The #GTlsAuthenticationMode for the server. This can be changed before calling 
g_tls_connection_handshake() if you want to rehandshake with a different mode from the initial handshake.")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
 
diff --git a/gio/src/gio_signals.defs.patch b/gio/src/gio_signals.defs.patch
index a7b07ba..c0e410d 100644
--- a/gio/src/gio_signals.defs.patch
+++ b/gio/src/gio_signals.defs.patch
@@ -1,58 +1,19 @@
---- gio_signals.defs   2012-02-28 13:19:25.000000000 -0500
-+++ gio_signals.defs.new       2012-02-28 12:47:50.000000000 -0500
-@@ -83,7 +83,7 @@
+--- gio_signals.defs
++++ gio_signals.defs
+@@ -231,7 +231,7 @@
    (when "last")
    (parameters
-     '("const-gchar*" "p0")
--    '("GVariant" "p1")
-+    '("GVariant*" "p1")
+    '("const-gchar*" "message")
++   '("const-gchar**" "choices")
+-   '("gchar**" "choices")
    )
  )
  
-@@ -579,7 +579,7 @@
-   (when "last")
-   (parameters
-     '("const-gchar*" "p0")
--    '("GStrv*" "p1")
-+    '("const-gchar**" "p1")
-   )
- )
- 
-@@ -849,7 +849,7 @@
-   (return-type "void")
-   (when "last")
-   (parameters
--    '("GVariant" "p0")
-+    '("GVariant*" "p0")
-   )
- )
- 
-@@ -858,7 +858,7 @@
-   (return-type "void")
-   (when "last")
+@@ -251,7 +251,7 @@
    (parameters
--    '("GVariant" "p0")
-+    '("GVariant*" "p0")
+    '("const-gchar*" "message")
+    '("GArray*" "processes")
++   '("const-gchar**" "choices")
+-   '("gchar**" "choices")
    )
  )
- 
-@@ -1824,8 +1824,8 @@
-   (return-type "void")
-   (when "last")
-   (parameters
--    '("GVariant" "p0")
--    '("GStrv*" "p1")
-+    '("GVariant*" "p0")
-+    '("const-gchar*const*" "p1")
-   )
- )
- 
-@@ -1836,7 +1836,7 @@
-   (parameters
-     '("const-gchar*" "p0")
-     '("const-gchar*" "p1")
--    '("GVariant" "p2")
-+    '("GVariant*" "p2")
-   )
- )
- 
diff --git a/gio/src/gio_vfuncs.defs b/gio/src/gio_vfuncs.defs
index 4bcfa1e..f1f1849 100644
--- a/gio/src/gio_vfuncs.defs
+++ b/gio/src/gio_vfuncs.defs
@@ -1,9 +1,1801 @@
-;; -*- scheme -*-
-; virtual function definitions
-; define-vfunc is g*mm-specific
-; These are hand-written.
+(define-vfunc get_display
+  (of-object "GAppLaunchContext")
+  (return-type "char*")
+  (parameters
+   '("GAppInfo*" "info")
+   '("GList*" "files")
+  )
+)
+
+(define-vfunc get_startup_notify_id
+  (of-object "GAppLaunchContext")
+  (return-type "char*")
+  (parameters
+   '("GAppInfo*" "info")
+   '("GList*" "files")
+  )
+)
+
+(define-vfunc launch_failed
+  (of-object "GAppLaunchContext")
+  (return-type "void")
+  (parameters
+   '("const-char*" "startup_notify_id")
+  )
+)
+
+(define-vfunc launched
+  (of-object "GAppLaunchContext")
+  (return-type "void")
+  (parameters
+   '("GAppInfo*" "info")
+   '("GVariant*" "platform_data")
+  )
+)
+
+(define-vfunc activate
+  (of-object "GApplication")
+  (return-type "void")
+)
+
+(define-vfunc add_platform_data
+  (of-object "GApplication")
+  (return-type "void")
+  (parameters
+   '("GVariantBuilder*" "builder")
+  )
+)
+
+(define-vfunc after_emit
+  (of-object "GApplication")
+  (return-type "void")
+  (parameters
+   '("GVariant*" "platform_data")
+  )
+)
+
+(define-vfunc before_emit
+  (of-object "GApplication")
+  (return-type "void")
+  (parameters
+   '("GVariant*" "platform_data")
+  )
+)
+
+(define-vfunc command_line
+  (of-object "GApplication")
+  (return-type "int")
+  (parameters
+   '("GApplicationCommandLine*" "command_line")
+  )
+)
+
+(define-vfunc dbus_register
+  (of-object "GApplication")
+  (return-type "gboolean")
+  (parameters
+   '("GDBusConnection*" "connection")
+   '("const-gchar*" "object_path")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc dbus_unregister
+  (of-object "GApplication")
+  (return-type "void")
+  (parameters
+   '("GDBusConnection*" "connection")
+   '("const-gchar*" "object_path")
+  )
+)
+
+(define-vfunc handle_local_options
+  (of-object "GApplication")
+  (return-type "gint")
+  (parameters
+   '("GVariantDict*" "options")
+  )
+)
+
+(define-vfunc local_command_line
+  (of-object "GApplication")
+  (return-type "gboolean")
+  (parameters
+   '("gchar***" "arguments")
+   '("int*" "exit_status")
+  )
+)
+
+(define-vfunc open
+  (of-object "GApplication")
+  (return-type "void")
+  (parameters
+   '("GFile**" "files")
+   '("gint" "n_files")
+   '("const-gchar*" "hint")
+  )
+)
+
+(define-vfunc quit_mainloop
+  (of-object "GApplication")
+  (return-type "void")
+)
+
+(define-vfunc run_mainloop
+  (of-object "GApplication")
+  (return-type "void")
+)
+
+(define-vfunc shutdown
+  (of-object "GApplication")
+  (return-type "void")
+)
+
+(define-vfunc startup
+  (of-object "GApplication")
+  (return-type "void")
+)
+
+(define-vfunc get_stdin
+  (of-object "GApplicationCommandLine")
+  (return-type "GInputStream*")
+)
+
+(define-vfunc print_literal
+  (of-object "GApplicationCommandLine")
+  (return-type "void")
+  (parameters
+   '("const-gchar*" "message")
+  )
+)
 
-; GAction
+(define-vfunc printerr_literal
+  (of-object "GApplicationCommandLine")
+  (return-type "void")
+  (parameters
+   '("const-gchar*" "message")
+  )
+)
+
+(define-vfunc fill
+  (of-object "GBufferedInputStream")
+  (return-type "gssize")
+  (parameters
+   '("gssize" "count")
+   '("GCancellable*" "cancellable")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc fill_async
+  (of-object "GBufferedInputStream")
+  (return-type "void")
+  (parameters
+   '("gssize" "count")
+   '("int" "io_priority")
+   '("GCancellable*" "cancellable")
+   '("GAsyncReadyCallback" "callback")
+   '("gpointer" "user_data")
+  )
+)
+
+(define-vfunc fill_finish
+  (of-object "GBufferedInputStream")
+  (return-type "gssize")
+  (parameters
+   '("GAsyncResult*" "result")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc cancelled
+  (of-object "GCancellable")
+  (return-type "void")
+)
+
+(define-vfunc flush
+  (of-object "GDBusInterfaceSkeleton")
+  (return-type "void")
+)
+
+(define-vfunc g_authorize_method
+  (of-object "GDBusInterfaceSkeleton")
+  (return-type "gboolean")
+  (parameters
+   '("GDBusMethodInvocation*" "invocation")
+  )
+)
+
+(define-vfunc get_info
+  (of-object "GDBusInterfaceSkeleton")
+  (return-type "GDBusInterfaceInfo*")
+)
+
+(define-vfunc get_properties
+  (of-object "GDBusInterfaceSkeleton")
+  (return-type "GVariant*")
+)
+
+(define-vfunc get_vtable
+  (of-object "GDBusInterfaceSkeleton")
+  (return-type "GDBusInterfaceVTable*")
+)
+
+(define-vfunc interface_proxy_properties_changed
+  (of-object "GDBusObjectManagerClient")
+  (return-type "void")
+  (parameters
+   '("GDBusObjectProxy*" "object_proxy")
+   '("GDBusProxy*" "interface_proxy")
+   '("GVariant*" "changed_properties")
+   '("const-gchar*const*" "invalidated_properties")
+  )
+)
+
+(define-vfunc interface_proxy_signal
+  (of-object "GDBusObjectManagerClient")
+  (return-type "void")
+  (parameters
+   '("GDBusObjectProxy*" "object_proxy")
+   '("GDBusProxy*" "interface_proxy")
+   '("const-gchar*" "sender_name")
+   '("const-gchar*" "signal_name")
+   '("GVariant*" "parameters")
+  )
+)
+
+(define-vfunc authorize_method
+  (of-object "GDBusObjectSkeleton")
+  (return-type "gboolean")
+  (parameters
+   '("GDBusInterfaceSkeleton*" "interface_")
+   '("GDBusMethodInvocation*" "invocation")
+  )
+)
+
+(define-vfunc g_properties_changed
+  (of-object "GDBusProxy")
+  (return-type "void")
+  (parameters
+   '("GVariant*" "changed_properties")
+   '("const-gchar*const*" "invalidated_properties")
+  )
+)
+
+(define-vfunc g_signal
+  (of-object "GDBusProxy")
+  (return-type "void")
+  (parameters
+   '("const-gchar*" "sender_name")
+   '("const-gchar*" "signal_name")
+   '("GVariant*" "parameters")
+  )
+)
+
+(define-vfunc close_async
+  (of-object "GFileEnumerator")
+  (return-type "void")
+  (parameters
+   '("int" "io_priority")
+   '("GCancellable*" "cancellable")
+   '("GAsyncReadyCallback" "callback")
+   '("gpointer" "user_data")
+  )
+)
+
+(define-vfunc close_finish
+  (of-object "GFileEnumerator")
+  (return-type "gboolean")
+  (parameters
+   '("GAsyncResult*" "result")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc close_fn
+  (of-object "GFileEnumerator")
+  (return-type "gboolean")
+  (parameters
+   '("GCancellable*" "cancellable")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc next_file
+  (of-object "GFileEnumerator")
+  (return-type "GFileInfo*")
+  (parameters
+   '("GCancellable*" "cancellable")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc next_files_async
+  (of-object "GFileEnumerator")
+  (return-type "void")
+  (parameters
+   '("int" "num_files")
+   '("int" "io_priority")
+   '("GCancellable*" "cancellable")
+   '("GAsyncReadyCallback" "callback")
+   '("gpointer" "user_data")
+  )
+)
+
+(define-vfunc next_files_finish
+  (of-object "GFileEnumerator")
+  (return-type "GList*")
+  (parameters
+   '("GAsyncResult*" "result")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc can_seek
+  (of-object "GFileIOStream")
+  (return-type "gboolean")
+)
+
+(define-vfunc can_truncate
+  (of-object "GFileIOStream")
+  (return-type "gboolean")
+)
+
+(define-vfunc get_etag
+  (of-object "GFileIOStream")
+  (return-type "char*")
+)
+
+(define-vfunc query_info
+  (of-object "GFileIOStream")
+  (return-type "GFileInfo*")
+  (parameters
+   '("const-char*" "attributes")
+   '("GCancellable*" "cancellable")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc query_info_async
+  (of-object "GFileIOStream")
+  (return-type "void")
+  (parameters
+   '("const-char*" "attributes")
+   '("int" "io_priority")
+   '("GCancellable*" "cancellable")
+   '("GAsyncReadyCallback" "callback")
+   '("gpointer" "user_data")
+  )
+)
+
+(define-vfunc query_info_finish
+  (of-object "GFileIOStream")
+  (return-type "GFileInfo*")
+  (parameters
+   '("GAsyncResult*" "result")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc seek
+  (of-object "GFileIOStream")
+  (return-type "gboolean")
+  (parameters
+   '("goffset" "offset")
+   '("GSeekType" "type")
+   '("GCancellable*" "cancellable")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc tell
+  (of-object "GFileIOStream")
+  (return-type "goffset")
+)
+
+(define-vfunc truncate_fn
+  (of-object "GFileIOStream")
+  (return-type "gboolean")
+  (parameters
+   '("goffset" "size")
+   '("GCancellable*" "cancellable")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc can_seek
+  (of-object "GFileInputStream")
+  (return-type "gboolean")
+)
+
+(define-vfunc query_info
+  (of-object "GFileInputStream")
+  (return-type "GFileInfo*")
+  (parameters
+   '("const-char*" "attributes")
+   '("GCancellable*" "cancellable")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc query_info_async
+  (of-object "GFileInputStream")
+  (return-type "void")
+  (parameters
+   '("const-char*" "attributes")
+   '("int" "io_priority")
+   '("GCancellable*" "cancellable")
+   '("GAsyncReadyCallback" "callback")
+   '("gpointer" "user_data")
+  )
+)
+
+(define-vfunc query_info_finish
+  (of-object "GFileInputStream")
+  (return-type "GFileInfo*")
+  (parameters
+   '("GAsyncResult*" "result")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc seek
+  (of-object "GFileInputStream")
+  (return-type "gboolean")
+  (parameters
+   '("goffset" "offset")
+   '("GSeekType" "type")
+   '("GCancellable*" "cancellable")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc tell
+  (of-object "GFileInputStream")
+  (return-type "goffset")
+)
+
+(define-vfunc cancel
+  (of-object "GFileMonitor")
+  (return-type "gboolean")
+)
+
+(define-vfunc changed
+  (of-object "GFileMonitor")
+  (return-type "void")
+  (parameters
+   '("GFile*" "file")
+   '("GFile*" "other_file")
+   '("GFileMonitorEvent" "event_type")
+  )
+)
+
+(define-vfunc can_seek
+  (of-object "GFileOutputStream")
+  (return-type "gboolean")
+)
+
+(define-vfunc can_truncate
+  (of-object "GFileOutputStream")
+  (return-type "gboolean")
+)
+
+(define-vfunc get_etag
+  (of-object "GFileOutputStream")
+  (return-type "char*")
+)
+
+(define-vfunc query_info
+  (of-object "GFileOutputStream")
+  (return-type "GFileInfo*")
+  (parameters
+   '("const-char*" "attributes")
+   '("GCancellable*" "cancellable")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc query_info_async
+  (of-object "GFileOutputStream")
+  (return-type "void")
+  (parameters
+   '("const-char*" "attributes")
+   '("int" "io_priority")
+   '("GCancellable*" "cancellable")
+   '("GAsyncReadyCallback" "callback")
+   '("gpointer" "user_data")
+  )
+)
+
+(define-vfunc query_info_finish
+  (of-object "GFileOutputStream")
+  (return-type "GFileInfo*")
+  (parameters
+   '("GAsyncResult*" "result")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc seek
+  (of-object "GFileOutputStream")
+  (return-type "gboolean")
+  (parameters
+   '("goffset" "offset")
+   '("GSeekType" "type")
+   '("GCancellable*" "cancellable")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc tell
+  (of-object "GFileOutputStream")
+  (return-type "goffset")
+)
+
+(define-vfunc truncate_fn
+  (of-object "GFileOutputStream")
+  (return-type "gboolean")
+  (parameters
+   '("goffset" "size")
+   '("GCancellable*" "cancellable")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc got_completion_data
+  (of-object "GFilenameCompleter")
+  (return-type "void")
+)
+
+(define-vfunc close_async
+  (of-object "GIOStream")
+  (return-type "void")
+  (parameters
+   '("int" "io_priority")
+   '("GCancellable*" "cancellable")
+   '("GAsyncReadyCallback" "callback")
+   '("gpointer" "user_data")
+  )
+)
+
+(define-vfunc close_finish
+  (of-object "GIOStream")
+  (return-type "gboolean")
+  (parameters
+   '("GAsyncResult*" "result")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc close_fn
+  (of-object "GIOStream")
+  (return-type "gboolean")
+  (parameters
+   '("GCancellable*" "cancellable")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc get_input_stream
+  (of-object "GIOStream")
+  (return-type "GInputStream*")
+)
+
+(define-vfunc get_output_stream
+  (of-object "GIOStream")
+  (return-type "GOutputStream*")
+)
+
+(define-vfunc to_bytes
+  (of-object "GInetAddress")
+  (return-type "const-guint8*")
+)
+
+(define-vfunc to_string
+  (of-object "GInetAddress")
+  (return-type "gchar*")
+)
+
+(define-vfunc close_async
+  (of-object "GInputStream")
+  (return-type "void")
+  (parameters
+   '("int" "io_priority")
+   '("GCancellable*" "cancellable")
+   '("GAsyncReadyCallback" "callback")
+   '("gpointer" "user_data")
+  )
+)
+
+(define-vfunc close_finish
+  (of-object "GInputStream")
+  (return-type "gboolean")
+  (parameters
+   '("GAsyncResult*" "result")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc close_fn
+  (of-object "GInputStream")
+  (return-type "gboolean")
+  (parameters
+   '("GCancellable*" "cancellable")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc read_async
+  (of-object "GInputStream")
+  (return-type "void")
+  (parameters
+   '("void*" "buffer")
+   '("gsize" "count")
+   '("int" "io_priority")
+   '("GCancellable*" "cancellable")
+   '("GAsyncReadyCallback" "callback")
+   '("gpointer" "user_data")
+  )
+)
+
+(define-vfunc read_finish
+  (of-object "GInputStream")
+  (return-type "gssize")
+  (parameters
+   '("GAsyncResult*" "result")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc read_fn
+  (of-object "GInputStream")
+  (return-type "gssize")
+  (parameters
+   '("void*" "buffer")
+   '("gsize" "count")
+   '("GCancellable*" "cancellable")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc skip
+  (of-object "GInputStream")
+  (return-type "gssize")
+  (parameters
+   '("gsize" "count")
+   '("GCancellable*" "cancellable")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc skip_async
+  (of-object "GInputStream")
+  (return-type "void")
+  (parameters
+   '("gsize" "count")
+   '("int" "io_priority")
+   '("GCancellable*" "cancellable")
+   '("GAsyncReadyCallback" "callback")
+   '("gpointer" "user_data")
+  )
+)
+
+(define-vfunc skip_finish
+  (of-object "GInputStream")
+  (return-type "gssize")
+  (parameters
+   '("GAsyncResult*" "result")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc get_next
+  (of-object "GMenuAttributeIter")
+  (return-type "gboolean")
+  (parameters
+   '("const-gchar**" "out_name")
+   '("GVariant**" "value")
+  )
+)
+
+(define-vfunc get_next
+  (of-object "GMenuLinkIter")
+  (return-type "gboolean")
+  (parameters
+   '("const-gchar**" "out_link")
+   '("GMenuModel**" "value")
+  )
+)
+
+(define-vfunc get_item_attribute_value
+  (of-object "GMenuModel")
+  (return-type "GVariant*")
+  (parameters
+   '("gint" "item_index")
+   '("const-gchar*" "attribute")
+   '("const-GVariantType*" "expected_type")
+  )
+)
+
+(define-vfunc get_item_attributes
+  (of-object "GMenuModel")
+  (return-type "void")
+  (parameters
+   '("gint" "item_index")
+   '("GHashTable**" "attributes")
+  )
+)
+
+(define-vfunc get_item_link
+  (of-object "GMenuModel")
+  (return-type "GMenuModel*")
+  (parameters
+   '("gint" "item_index")
+   '("const-gchar*" "link")
+  )
+)
+
+(define-vfunc get_item_links
+  (of-object "GMenuModel")
+  (return-type "void")
+  (parameters
+   '("gint" "item_index")
+   '("GHashTable**" "links")
+  )
+)
+
+(define-vfunc get_n_items
+  (of-object "GMenuModel")
+  (return-type "gint")
+)
+
+(define-vfunc is_mutable
+  (of-object "GMenuModel")
+  (return-type "gboolean")
+)
+
+(define-vfunc iterate_item_attributes
+  (of-object "GMenuModel")
+  (return-type "GMenuAttributeIter*")
+  (parameters
+   '("gint" "item_index")
+  )
+)
+
+(define-vfunc iterate_item_links
+  (of-object "GMenuModel")
+  (return-type "GMenuLinkIter*")
+  (parameters
+   '("gint" "item_index")
+  )
+)
+
+(define-vfunc aborted
+  (of-object "GMountOperation")
+  (return-type "void")
+)
+
+(define-vfunc ask_password
+  (of-object "GMountOperation")
+  (return-type "void")
+  (parameters
+   '("const-char*" "message")
+   '("const-char*" "default_user")
+   '("const-char*" "default_domain")
+   '("GAskPasswordFlags" "flags")
+  )
+)
+
+(define-vfunc ask_question
+  (of-object "GMountOperation")
+  (return-type "void")
+  (parameters
+   '("const-char*" "message")
+   '("const-gchar**" "choices")
+  )
+)
+
+(define-vfunc reply
+  (of-object "GMountOperation")
+  (return-type "void")
+  (parameters
+   '("GMountOperationResult" "result")
+  )
+)
+
+(define-vfunc show_processes
+  (of-object "GMountOperation")
+  (return-type "void")
+  (parameters
+   '("const-gchar*" "message")
+   '("GArray*" "processes")
+   '("const-gchar*" "choices")
+  )
+)
+
+(define-vfunc show_unmount_progress
+  (of-object "GMountOperation")
+  (return-type "void")
+  (parameters
+   '("const-gchar*" "message")
+   '("gint64" "time_left")
+   '("gint64" "bytes_left")
+  )
+)
+
+(define-vfunc close_async
+  (of-object "GOutputStream")
+  (return-type "void")
+  (parameters
+   '("int" "io_priority")
+   '("GCancellable*" "cancellable")
+   '("GAsyncReadyCallback" "callback")
+   '("gpointer" "user_data")
+  )
+)
+
+(define-vfunc close_finish
+  (of-object "GOutputStream")
+  (return-type "gboolean")
+  (parameters
+   '("GAsyncResult*" "result")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc close_fn
+  (of-object "GOutputStream")
+  (return-type "gboolean")
+  (parameters
+   '("GCancellable*" "cancellable")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc flush
+  (of-object "GOutputStream")
+  (return-type "gboolean")
+  (parameters
+   '("GCancellable*" "cancellable")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc flush_async
+  (of-object "GOutputStream")
+  (return-type "void")
+  (parameters
+   '("int" "io_priority")
+   '("GCancellable*" "cancellable")
+   '("GAsyncReadyCallback" "callback")
+   '("gpointer" "user_data")
+  )
+)
+
+(define-vfunc flush_finish
+  (of-object "GOutputStream")
+  (return-type "gboolean")
+  (parameters
+   '("GAsyncResult*" "result")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc splice
+  (of-object "GOutputStream")
+  (return-type "gssize")
+  (parameters
+   '("GInputStream*" "source")
+   '("GOutputStreamSpliceFlags" "flags")
+   '("GCancellable*" "cancellable")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc splice_async
+  (of-object "GOutputStream")
+  (return-type "void")
+  (parameters
+   '("GInputStream*" "source")
+   '("GOutputStreamSpliceFlags" "flags")
+   '("int" "io_priority")
+   '("GCancellable*" "cancellable")
+   '("GAsyncReadyCallback" "callback")
+   '("gpointer" "user_data")
+  )
+)
+
+(define-vfunc splice_finish
+  (of-object "GOutputStream")
+  (return-type "gssize")
+  (parameters
+   '("GAsyncResult*" "result")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc write_async
+  (of-object "GOutputStream")
+  (return-type "void")
+  (parameters
+   '("void*" "buffer")
+   '("gsize" "count")
+   '("int" "io_priority")
+   '("GCancellable*" "cancellable")
+   '("GAsyncReadyCallback" "callback")
+   '("gpointer" "user_data")
+  )
+)
+
+(define-vfunc write_finish
+  (of-object "GOutputStream")
+  (return-type "gssize")
+  (parameters
+   '("GAsyncResult*" "result")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc write_fn
+  (of-object "GOutputStream")
+  (return-type "gssize")
+  (parameters
+   '("void*" "buffer")
+   '("gsize" "count")
+   '("GCancellable*" "cancellable")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc acquire
+  (of-object "GPermission")
+  (return-type "gboolean")
+  (parameters
+   '("GCancellable*" "cancellable")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc acquire_async
+  (of-object "GPermission")
+  (return-type "void")
+  (parameters
+   '("GCancellable*" "cancellable")
+   '("GAsyncReadyCallback" "callback")
+   '("gpointer" "user_data")
+  )
+)
+
+(define-vfunc acquire_finish
+  (of-object "GPermission")
+  (return-type "gboolean")
+  (parameters
+   '("GAsyncResult*" "result")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc release
+  (of-object "GPermission")
+  (return-type "gboolean")
+  (parameters
+   '("GCancellable*" "cancellable")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc release_async
+  (of-object "GPermission")
+  (return-type "void")
+  (parameters
+   '("GCancellable*" "cancellable")
+   '("GAsyncReadyCallback" "callback")
+   '("gpointer" "user_data")
+  )
+)
+
+(define-vfunc release_finish
+  (of-object "GPermission")
+  (return-type "gboolean")
+  (parameters
+   '("GAsyncResult*" "result")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc lookup_by_address
+  (of-object "GResolver")
+  (return-type "gchar*")
+  (parameters
+   '("GInetAddress*" "address")
+   '("GCancellable*" "cancellable")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc lookup_by_address_async
+  (of-object "GResolver")
+  (return-type "void")
+  (parameters
+   '("GInetAddress*" "address")
+   '("GCancellable*" "cancellable")
+   '("GAsyncReadyCallback" "callback")
+   '("gpointer" "user_data")
+  )
+)
+
+(define-vfunc lookup_by_address_finish
+  (of-object "GResolver")
+  (return-type "gchar*")
+  (parameters
+   '("GAsyncResult*" "result")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc lookup_by_name
+  (of-object "GResolver")
+  (return-type "GList*")
+  (parameters
+   '("const-gchar*" "hostname")
+   '("GCancellable*" "cancellable")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc lookup_by_name_async
+  (of-object "GResolver")
+  (return-type "void")
+  (parameters
+   '("const-gchar*" "hostname")
+   '("GCancellable*" "cancellable")
+   '("GAsyncReadyCallback" "callback")
+   '("gpointer" "user_data")
+  )
+)
+
+(define-vfunc lookup_by_name_finish
+  (of-object "GResolver")
+  (return-type "GList*")
+  (parameters
+   '("GAsyncResult*" "result")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc lookup_records
+  (of-object "GResolver")
+  (return-type "GList*")
+  (parameters
+   '("const-gchar*" "rrname")
+   '("GResolverRecordType" "record_type")
+   '("GCancellable*" "cancellable")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc lookup_records_async
+  (of-object "GResolver")
+  (return-type "void")
+  (parameters
+   '("const-gchar*" "rrname")
+   '("GResolverRecordType" "record_type")
+   '("GCancellable*" "cancellable")
+   '("GAsyncReadyCallback" "callback")
+   '("gpointer" "user_data")
+  )
+)
+
+(define-vfunc lookup_records_finish
+  (of-object "GResolver")
+  (return-type "GList*")
+  (parameters
+   '("GAsyncResult*" "result")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc lookup_service
+  (of-object "GResolver")
+  (return-type "GList*")
+  (parameters
+   '("const-gchar*" "rrname")
+   '("GCancellable*" "cancellable")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc lookup_service_async
+  (of-object "GResolver")
+  (return-type "void")
+  (parameters
+   '("const-gchar*" "rrname")
+   '("GCancellable*" "cancellable")
+   '("GAsyncReadyCallback" "callback")
+   '("gpointer" "user_data")
+  )
+)
+
+(define-vfunc lookup_service_finish
+  (of-object "GResolver")
+  (return-type "GList*")
+  (parameters
+   '("GAsyncResult*" "result")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc reload
+  (of-object "GResolver")
+  (return-type "void")
+)
+
+(define-vfunc change_event
+  (of-object "GSettings")
+  (return-type "gboolean")
+  (parameters
+   '("const-GQuark*" "keys")
+   '("gint" "n_keys")
+  )
+)
+
+(define-vfunc changed
+  (of-object "GSettings")
+  (return-type "void")
+  (parameters
+   '("const-gchar*" "key")
+  )
+)
+
+(define-vfunc writable_change_event
+  (of-object "GSettings")
+  (return-type "gboolean")
+  (parameters
+   '("GQuark" "key")
+  )
+)
+
+(define-vfunc writable_changed
+  (of-object "GSettings")
+  (return-type "void")
+  (parameters
+   '("const-gchar*" "key")
+  )
+)
+
+(define-vfunc get_family
+  (of-object "GSocketAddress")
+  (return-type "GSocketFamily")
+)
+
+(define-vfunc get_native_size
+  (of-object "GSocketAddress")
+  (return-type "gssize")
+)
+
+(define-vfunc to_native
+  (of-object "GSocketAddress")
+  (return-type "gboolean")
+  (parameters
+   '("gpointer" "dest")
+   '("gsize" "destlen")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc next
+  (of-object "GSocketAddressEnumerator")
+  (return-type "GSocketAddress*")
+  (parameters
+   '("GCancellable*" "cancellable")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc next_async
+  (of-object "GSocketAddressEnumerator")
+  (return-type "void")
+  (parameters
+   '("GCancellable*" "cancellable")
+   '("GAsyncReadyCallback" "callback")
+   '("gpointer" "user_data")
+  )
+)
+
+(define-vfunc next_finish
+  (of-object "GSocketAddressEnumerator")
+  (return-type "GSocketAddress*")
+  (parameters
+   '("GAsyncResult*" "result")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc event
+  (of-object "GSocketClient")
+  (return-type "void")
+  (parameters
+   '("GSocketClientEvent" "event")
+   '("GSocketConnectable*" "connectable")
+   '("GIOStream*" "connection")
+  )
+)
+
+(define-vfunc get_level
+  (of-object "GSocketControlMessage")
+  (return-type "int")
+)
+
+(define-vfunc get_size
+  (of-object "GSocketControlMessage")
+  (return-type "gsize")
+)
+
+(define-vfunc get_type
+  (of-object "GSocketControlMessage")
+  (return-type "int")
+)
+
+(define-vfunc serialize
+  (of-object "GSocketControlMessage")
+  (return-type "void")
+  (parameters
+   '("gpointer" "data")
+  )
+)
+
+(define-vfunc changed
+  (of-object "GSocketListener")
+  (return-type "void")
+)
+
+(define-vfunc event
+  (of-object "GSocketListener")
+  (return-type "void")
+  (parameters
+   '("GSocketListenerEvent*" "event")
+   '("GSocket*" "socket")
+  )
+)
+
+(define-vfunc incoming
+  (of-object "GSocketService")
+  (return-type "gboolean")
+  (parameters
+   '("GSocketConnection*" "connection")
+   '("GObject*" "source_object")
+  )
+)
+
+(define-vfunc run
+  (of-object "GThreadedSocketService")
+  (return-type "gboolean")
+  (parameters
+   '("GSocketConnection*" "connection")
+   '("GObject*" "source_object")
+  )
+)
+
+(define-vfunc verify
+  (of-object "GTlsCertificate")
+  (return-type "GTlsCertificateFlags")
+  (parameters
+   '("GSocketConnectable*" "identity")
+   '("GTlsCertificate*" "trusted_ca")
+  )
+)
+
+(define-vfunc accept_certificate
+  (of-object "GTlsConnection")
+  (return-type "gboolean")
+  (parameters
+   '("GTlsCertificate*" "peer_cert")
+   '("GTlsCertificateFlags" "errors")
+  )
+)
+
+(define-vfunc handshake
+  (of-object "GTlsConnection")
+  (return-type "gboolean")
+  (parameters
+   '("GCancellable*" "cancellable")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc handshake_async
+  (of-object "GTlsConnection")
+  (return-type "void")
+  (parameters
+   '("int" "io_priority")
+   '("GCancellable*" "cancellable")
+   '("GAsyncReadyCallback" "callback")
+   '("gpointer" "user_data")
+  )
+)
+
+(define-vfunc handshake_finish
+  (of-object "GTlsConnection")
+  (return-type "gboolean")
+  (parameters
+   '("GAsyncResult*" "result")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc create_certificate_handle
+  (of-object "GTlsDatabase")
+  (return-type "gchar*")
+  (parameters
+   '("GTlsCertificate*" "certificate")
+  )
+)
+
+(define-vfunc lookup_certificate_for_handle
+  (of-object "GTlsDatabase")
+  (return-type "GTlsCertificate*")
+  (parameters
+   '("const-gchar*" "handle")
+   '("GTlsInteraction*" "interaction")
+   '("GTlsDatabaseLookupFlags" "flags")
+   '("GCancellable*" "cancellable")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc lookup_certificate_for_handle_async
+  (of-object "GTlsDatabase")
+  (return-type "void")
+  (parameters
+   '("const-gchar*" "handle")
+   '("GTlsInteraction*" "interaction")
+   '("GTlsDatabaseLookupFlags" "flags")
+   '("GCancellable*" "cancellable")
+   '("GAsyncReadyCallback" "callback")
+   '("gpointer" "user_data")
+  )
+)
+
+(define-vfunc lookup_certificate_for_handle_finish
+  (of-object "GTlsDatabase")
+  (return-type "GTlsCertificate*")
+  (parameters
+   '("GAsyncResult*" "result")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc lookup_certificate_issuer
+  (of-object "GTlsDatabase")
+  (return-type "GTlsCertificate*")
+  (parameters
+   '("GTlsCertificate*" "certificate")
+   '("GTlsInteraction*" "interaction")
+   '("GTlsDatabaseLookupFlags" "flags")
+   '("GCancellable*" "cancellable")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc lookup_certificate_issuer_async
+  (of-object "GTlsDatabase")
+  (return-type "void")
+  (parameters
+   '("GTlsCertificate*" "certificate")
+   '("GTlsInteraction*" "interaction")
+   '("GTlsDatabaseLookupFlags" "flags")
+   '("GCancellable*" "cancellable")
+   '("GAsyncReadyCallback" "callback")
+   '("gpointer" "user_data")
+  )
+)
+
+(define-vfunc lookup_certificate_issuer_finish
+  (of-object "GTlsDatabase")
+  (return-type "GTlsCertificate*")
+  (parameters
+   '("GAsyncResult*" "result")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc lookup_certificates_issued_by
+  (of-object "GTlsDatabase")
+  (return-type "GList*")
+  (parameters
+   '("GByteArray*" "issuer_raw_dn")
+   '("GTlsInteraction*" "interaction")
+   '("GTlsDatabaseLookupFlags" "flags")
+   '("GCancellable*" "cancellable")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc lookup_certificates_issued_by_async
+  (of-object "GTlsDatabase")
+  (return-type "void")
+  (parameters
+   '("GByteArray*" "issuer_raw_dn")
+   '("GTlsInteraction*" "interaction")
+   '("GTlsDatabaseLookupFlags" "flags")
+   '("GCancellable*" "cancellable")
+   '("GAsyncReadyCallback" "callback")
+   '("gpointer" "user_data")
+  )
+)
+
+(define-vfunc lookup_certificates_issued_by_finish
+  (of-object "GTlsDatabase")
+  (return-type "GList*")
+  (parameters
+   '("GAsyncResult*" "result")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc verify_chain
+  (of-object "GTlsDatabase")
+  (return-type "GTlsCertificateFlags")
+  (parameters
+   '("GTlsCertificate*" "chain")
+   '("const-gchar*" "purpose")
+   '("GSocketConnectable*" "identity")
+   '("GTlsInteraction*" "interaction")
+   '("GTlsDatabaseVerifyFlags" "flags")
+   '("GCancellable*" "cancellable")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc verify_chain_async
+  (of-object "GTlsDatabase")
+  (return-type "void")
+  (parameters
+   '("GTlsCertificate*" "chain")
+   '("const-gchar*" "purpose")
+   '("GSocketConnectable*" "identity")
+   '("GTlsInteraction*" "interaction")
+   '("GTlsDatabaseVerifyFlags" "flags")
+   '("GCancellable*" "cancellable")
+   '("GAsyncReadyCallback" "callback")
+   '("gpointer" "user_data")
+  )
+)
+
+(define-vfunc verify_chain_finish
+  (of-object "GTlsDatabase")
+  (return-type "GTlsCertificateFlags")
+  (parameters
+   '("GAsyncResult*" "result")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc ask_password
+  (of-object "GTlsInteraction")
+  (return-type "GTlsInteractionResult")
+  (parameters
+   '("GTlsPassword*" "password")
+   '("GCancellable*" "cancellable")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc ask_password_async
+  (of-object "GTlsInteraction")
+  (return-type "void")
+  (parameters
+   '("GTlsPassword*" "password")
+   '("GCancellable*" "cancellable")
+   '("GAsyncReadyCallback" "callback")
+   '("gpointer" "user_data")
+  )
+)
+
+(define-vfunc ask_password_finish
+  (of-object "GTlsInteraction")
+  (return-type "GTlsInteractionResult")
+  (parameters
+   '("GAsyncResult*" "result")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc request_certificate
+  (of-object "GTlsInteraction")
+  (return-type "GTlsInteractionResult")
+  (parameters
+   '("GTlsConnection*" "connection")
+   '("GTlsCertificateRequestFlags" "flags")
+   '("GCancellable*" "cancellable")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc request_certificate_async
+  (of-object "GTlsInteraction")
+  (return-type "void")
+  (parameters
+   '("GTlsConnection*" "connection")
+   '("GTlsCertificateRequestFlags" "flags")
+   '("GCancellable*" "cancellable")
+   '("GAsyncReadyCallback" "callback")
+   '("gpointer" "user_data")
+  )
+)
+
+(define-vfunc request_certificate_finish
+  (of-object "GTlsInteraction")
+  (return-type "GTlsInteractionResult")
+  (parameters
+   '("GAsyncResult*" "result")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc get_default_warning
+  (of-object "GTlsPassword")
+  (return-type "const-gchar*")
+)
+
+(define-vfunc get_value
+  (of-object "GTlsPassword")
+  (return-type "const-guchar*")
+  (parameters
+   '("gsize*" "length")
+  )
+)
+
+(define-vfunc set_value
+  (of-object "GTlsPassword")
+  (return-type "void")
+  (parameters
+   '("guchar*" "value")
+   '("gssize" "length")
+   '("GDestroyNotify" "destroy")
+  )
+)
+
+(define-vfunc add_writable_namespaces
+  (of-object "GVfs")
+  (return-type "void")
+  (parameters
+   '("GFileAttributeInfoList*" "list")
+  )
+)
+
+(define-vfunc deserialize_icon
+  (of-object "GVfs")
+  (return-type "GIcon*")
+  (parameters
+   '("GVariant*" "value")
+  )
+)
+
+(define-vfunc get_file_for_path
+  (of-object "GVfs")
+  (return-type "GFile*")
+  (parameters
+   '("const-char*" "path")
+  )
+)
+
+(define-vfunc get_file_for_uri
+  (of-object "GVfs")
+  (return-type "GFile*")
+  (parameters
+   '("const-char*" "uri")
+  )
+)
+
+(define-vfunc get_supported_uri_schemes
+  (of-object "GVfs")
+  (return-type "const-gchar*const*")
+)
+
+(define-vfunc is_active
+  (of-object "GVfs")
+  (return-type "gboolean")
+)
+
+(define-vfunc local_file_add_info
+  (of-object "GVfs")
+  (return-type "void")
+  (parameters
+   '("const-char*" "filename")
+   '("guint64" "device")
+   '("GFileAttributeMatcher*" "attribute_matcher")
+   '("GFileInfo*" "info")
+   '("GCancellable*" "cancellable")
+   '("gpointer*" "extra_data")
+   '("GDestroyNotify*" "free_extra_data")
+  )
+)
+
+(define-vfunc local_file_moved
+  (of-object "GVfs")
+  (return-type "void")
+  (parameters
+   '("const-char*" "source")
+   '("const-char*" "dest")
+  )
+)
+
+(define-vfunc local_file_removed
+  (of-object "GVfs")
+  (return-type "void")
+  (parameters
+   '("const-char*" "filename")
+  )
+)
+
+(define-vfunc local_file_set_attributes
+  (of-object "GVfs")
+  (return-type "gboolean")
+  (parameters
+   '("const-char*" "filename")
+   '("GFileInfo*" "info")
+   '("GFileQueryInfoFlags" "flags")
+   '("GCancellable*" "cancellable")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc parse_name
+  (of-object "GVfs")
+  (return-type "GFile*")
+  (parameters
+   '("const-char*" "parse_name")
+  )
+)
+
+(define-vfunc drive_changed
+  (of-object "GVolumeMonitor")
+  (return-type "void")
+  (parameters
+   '("GDrive*" "drive")
+  )
+)
+
+(define-vfunc drive_connected
+  (of-object "GVolumeMonitor")
+  (return-type "void")
+  (parameters
+   '("GDrive*" "drive")
+  )
+)
+
+(define-vfunc drive_disconnected
+  (of-object "GVolumeMonitor")
+  (return-type "void")
+  (parameters
+   '("GDrive*" "drive")
+  )
+)
+
+(define-vfunc drive_eject_button
+  (of-object "GVolumeMonitor")
+  (return-type "void")
+  (parameters
+   '("GDrive*" "drive")
+  )
+)
+
+(define-vfunc drive_stop_button
+  (of-object "GVolumeMonitor")
+  (return-type "void")
+  (parameters
+   '("GDrive*" "drive")
+  )
+)
+
+(define-vfunc get_connected_drives
+  (of-object "GVolumeMonitor")
+  (return-type "GList*")
+)
+
+(define-vfunc get_mount_for_uuid
+  (of-object "GVolumeMonitor")
+  (return-type "GMount*")
+  (parameters
+   '("const-char*" "uuid")
+  )
+)
+
+(define-vfunc get_mounts
+  (of-object "GVolumeMonitor")
+  (return-type "GList*")
+)
+
+(define-vfunc get_volume_for_uuid
+  (of-object "GVolumeMonitor")
+  (return-type "GVolume*")
+  (parameters
+   '("const-char*" "uuid")
+  )
+)
+
+(define-vfunc get_volumes
+  (of-object "GVolumeMonitor")
+  (return-type "GList*")
+)
+
+(define-vfunc mount_added
+  (of-object "GVolumeMonitor")
+  (return-type "void")
+  (parameters
+   '("GMount*" "mount")
+  )
+)
+
+(define-vfunc mount_changed
+  (of-object "GVolumeMonitor")
+  (return-type "void")
+  (parameters
+   '("GMount*" "mount")
+  )
+)
+
+(define-vfunc mount_pre_unmount
+  (of-object "GVolumeMonitor")
+  (return-type "void")
+  (parameters
+   '("GMount*" "mount")
+  )
+)
+
+(define-vfunc mount_removed
+  (of-object "GVolumeMonitor")
+  (return-type "void")
+  (parameters
+   '("GMount*" "mount")
+  )
+)
+
+(define-vfunc volume_added
+  (of-object "GVolumeMonitor")
+  (return-type "void")
+  (parameters
+   '("GVolume*" "volume")
+  )
+)
+
+(define-vfunc volume_changed
+  (of-object "GVolumeMonitor")
+  (return-type "void")
+  (parameters
+   '("GVolume*" "volume")
+  )
+)
+
+(define-vfunc volume_removed
+  (of-object "GVolumeMonitor")
+  (return-type "void")
+  (parameters
+   '("GVolume*" "volume")
+  )
+)
+
+(define-vfunc activate
+  (of-object "GAction")
+  (return-type "void")
+  (parameters
+   '("GVariant*" "parameter")
+  )
+)
+
+(define-vfunc change_state
+  (of-object "GAction")
+  (return-type "void")
+  (parameters
+   '("GVariant*" "value")
+  )
+)
+
+(define-vfunc get_enabled
+  (of-object "GAction")
+  (return-type "gboolean")
+)
 
 (define-vfunc get_name
   (of-object "GAction")
@@ -15,9 +1807,9 @@
   (return-type "const-GVariantType*")
 )
 
-(define-vfunc get_state_type
+(define-vfunc get_state
   (of-object "GAction")
-  (return-type "const-GVariantType*")
+  (return-type "GVariant*")
 )
 
 (define-vfunc get_state_hint
@@ -25,45 +1817,61 @@
   (return-type "GVariant*")
 )
 
-(define-vfunc get_enabled
+(define-vfunc get_state_type
   (of-object "GAction")
-  (return-type "gboolean")
+  (return-type "const-GVariantType*")
 )
 
-(define-vfunc get_state
-  (of-object "GAction")
-  (return-type "GVariant*")
+(define-vfunc action_added
+  (of-object "GActionGroup")
+  (return-type "void")
+  (parameters
+   '("const-gchar*" "action_name")
+  )
 )
 
-(define-vfunc change_state
-  (of-object "GAction")
+(define-vfunc action_enabled_changed
+  (of-object "GActionGroup")
   (return-type "void")
   (parameters
-   '("GVariant*" "value")
+   '("const-gchar*" "action_name")
+   '("gboolean" "enabled")
   )
 )
 
-(define-vfunc activate
-  (of-object "GAction")
+(define-vfunc action_removed
+  (of-object "GActionGroup")
   (return-type "void")
   (parameters
-   '("GVariant*" "parameter")
+   '("const-gchar*" "action_name")
   )
 )
 
-; GActionGroup
+(define-vfunc action_state_changed
+  (of-object "GActionGroup")
+  (return-type "void")
+  (parameters
+   '("const-gchar*" "action_name")
+   '("GVariant*" "state")
+  )
+)
 
-(define-vfunc has_action
+(define-vfunc activate_action
   (of-object "GActionGroup")
-  (return-type "gboolean")
+  (return-type "void")
   (parameters
    '("const-gchar*" "action_name")
+   '("GVariant*" "parameter")
   )
 )
 
-(define-vfunc list_actions
+(define-vfunc change_action_state
   (of-object "GActionGroup")
-  (return-type "gchar**")
+  (return-type "void")
+  (parameters
+   '("const-gchar*" "action_name")
+   '("GVariant*" "value")
+  )
 )
 
 (define-vfunc get_action_enabled
@@ -82,9 +1890,9 @@
   )
 )
 
-(define-vfunc get_action_state_type
+(define-vfunc get_action_state
   (of-object "GActionGroup")
-  (return-type "const-GVariantType*")
+  (return-type "GVariant*")
   (parameters
    '("const-gchar*" "action_name")
   )
@@ -98,33 +1906,47 @@
   )
 )
 
-(define-vfunc get_action_state
+(define-vfunc get_action_state_type
   (of-object "GActionGroup")
-  (return-type "GVariant*")
+  (return-type "const-GVariantType*")
   (parameters
    '("const-gchar*" "action_name")
   )
 )
 
-(define-vfunc change_action_state
+(define-vfunc has_action
   (of-object "GActionGroup")
-  (return-type "void")
+  (return-type "gboolean")
   (parameters
    '("const-gchar*" "action_name")
-   '("GVariant*" "value")
   )
 )
 
-(define-vfunc activate_action
+(define-vfunc list_actions
   (of-object "GActionGroup")
-  (return-type "void")
+  (return-type "gchar**")
+)
+
+(define-vfunc query_action
+  (of-object "GActionGroup")
+  (return-type "gboolean")
   (parameters
    '("const-gchar*" "action_name")
-   '("GVariant*" "parameter")
+   '("gboolean*" "enabled")
+   '("const-GVariantType**" "parameter_type")
+   '("const-GVariantType**" "state_type")
+   '("GVariant**" "state_hint")
+   '("GVariant**" "state")
   )
 )
 
-;GActionMap
+(define-vfunc add_action
+  (of-object "GActionMap")
+  (return-type "void")
+  (parameters
+   '("GAction*" "action")
+  )
+)
 
 (define-vfunc lookup_action
   (of-object "GActionMap")
@@ -134,48 +1956,62 @@
   )
 )
 
-(define-vfunc add_action
+(define-vfunc remove_action
   (of-object "GActionMap")
   (return-type "void")
   (parameters
-   '("GAction*" "action")
+   '("const-gchar*" "action_name")
   )
 )
 
-(define-vfunc remove_action
-  (of-object "GActionMap")
-  (return-type "void")
+(define-vfunc add_supports_type
+  (of-object "GAppInfo")
+  (return-type "gboolean")
   (parameters
-   '("const-gchar*" "action_name")
+   '("const-char*" "content_type")
+   '("GError**" "error")
   )
 )
 
-; GAppInfo
+(define-vfunc can_delete
+  (of-object "GAppInfo")
+  (return-type "gboolean")
+)
+
+(define-vfunc can_remove_supports_type
+  (of-object "GAppInfo")
+  (return-type "gboolean")
+)
+
+(define-vfunc do_delete
+  (of-object "GAppInfo")
+  (return-type "gboolean")
+)
 
 (define-vfunc dup
- (of-object "GAppInfo")
- (return-type "GAppInfo*")
+  (of-object "GAppInfo")
+  (return-type "GAppInfo*")
 )
 
 (define-vfunc equal
- (of-object "GAppInfo")
- (return-type "gboolean")
- (parameters
-  '("GAppInfo*" "appinfo2")
- )
+  (of-object "GAppInfo")
+  (return-type "gboolean")
+  (parameters
+   '("GAppInfo*" "appinfo2")
+  )
 )
 
-(define-vfunc get_id
+(define-vfunc get_commandline
   (of-object "GAppInfo")
   (return-type "const-char*")
 )
 
-(define-vfunc get_name
+(define-vfunc get_description
   (of-object "GAppInfo")
   (return-type "const-char*")
 )
 
-(define-vfunc get_description
+(define-vfunc get_display_name
   (of-object "GAppInfo")
   (return-type "const-char*")
 )
@@ -190,47 +2026,47 @@
   (return-type "GIcon*")
 )
 
-(define-vfunc launch
+(define-vfunc get_id
   (of-object "GAppInfo")
-  (return-type "gboolean")
- (parameters
-  '("GList*" "filenames")
-  '("GAppLaunchContext*" "launch_context")
-  '("GError**" "error")
- )
+  (return-type "const-char*")
 )
 
-(define-vfunc supports_uris
+(define-vfunc get_name
   (of-object "GAppInfo")
-  (return-type "gboolean")
+  (return-type "const-char*")
 )
 
-(define-vfunc supports_files
+(define-vfunc get_supported_types
   (of-object "GAppInfo")
-  (return-type "gboolean")
+  (return-type "char**")
 )
 
-(define-vfunc launch_uris
+(define-vfunc launch
   (of-object "GAppInfo")
   (return-type "gboolean")
- (parameters
-  '("GList*" "uris")
-  '("GAppLaunchContext*" "launch_context")
-  '("GError**" "error")
- )
+  (parameters
+   '("GList*" "files")
+   '("GAppLaunchContext*" "launch_context")
+   '("GError**" "error")
+  )
 )
 
-(define-vfunc should_show
+(define-vfunc launch_uris
   (of-object "GAppInfo")
   (return-type "gboolean")
+  (parameters
+   '("GList*" "uris")
+   '("GAppLaunchContext*" "launch_context")
+   '("GError**" "error")
+  )
 )
 
-(define-vfunc set_as_default_for_type
+(define-vfunc remove_supports_type
   (of-object "GAppInfo")
   (return-type "gboolean")
   (parameters
-  '("const-char*" "content_type")
-  '("GError**" "error")
+   '("const-char*" "content_type")
+   '("GError**" "error")
   )
 )
 
@@ -238,12 +2074,12 @@
   (of-object "GAppInfo")
   (return-type "gboolean")
   (parameters
-   '("const-char*" "extension")
+   '("char*" "extension")
    '("GError**" "error")
   )
 )
 
-(define-vfunc add_supports_type
+(define-vfunc set_as_default_for_type
   (of-object "GAppInfo")
   (return-type "gboolean")
   (parameters
@@ -252,12 +2088,7 @@
   )
 )
 
-(define-vfunc can_remove_supports_type
-  (of-object "GAppInfo")
-  (return-type "gboolean")
-)
-
-(define-vfunc remove_supports_type
+(define-vfunc set_as_last_used_for_type
   (of-object "GAppInfo")
   (return-type "gboolean")
   (parameters
@@ -266,58 +2097,21 @@
   )
 )
 
-; GApplication
-
-(define-vfunc local_command_line
-  (of-object "GApplication")
+(define-vfunc should_show
+  (of-object "GAppInfo")
   (return-type "gboolean")
-  (parameters
-   '("gchar***" "arguments")
-   '("int*" "exit_status")
-  )
 )
 
-(define-vfunc before_emit
-  (of-object "GApplication")
-  (return-type "void")
-  (parameters
-   '("GVariant*" "platform_data")
-  )
-)
-
-(define-vfunc after_emit
-  (of-object "GApplication")
-  (return-type "void")
-  (parameters
-   '("GVariant*" "platform_data")
-  )
-)
-
-(define-vfunc add_platform_data
-  (of-object "GApplication")
-  (return-type "void")
-  (parameters
-   '("GVariantBuilder*" "builder")
-  )
-)
-
-(define-vfunc quit_mainloop
-  (of-object "GApplication")
-  (return-type "void")
-)
-
-(define-vfunc run_mainloop
-  (of-object "GApplication")
-  (return-type "void")
+(define-vfunc supports_files
+  (of-object "GAppInfo")
+  (return-type "gboolean")
 )
 
-(define-vfunc shutdown
-  (of-object "GApplication")
-  (return-type "void")
+(define-vfunc supports_uris
+  (of-object "GAppInfo")
+  (return-type "gboolean")
 )
 
-; GAsyncInitable
-
 (define-vfunc init_async
   (of-object "GAsyncInitable")
   (return-type "void")
@@ -338,48 +2132,24 @@
   )
 )
 
-; GAsyncResult
-
 (define-vfunc get_source_object
   (of-object "GAsyncResult")
   (return-type "GObject*")
 )
 
-; GBufferedInputStream
-
-(define-vfunc fill
- (of-object "GBufferedInputStream")
- (return-type "gssize")
- (parameters
-  '("gssize" "count")
-  '("GCancellable*" "cancellable")
-  '("GError**" "error")
- )
-)
-
-(define-vfunc fill_async
- (of-object "GBufferedInputStream")
- (return-type "void")
- (parameters
-  '("gssize" "count")
-  '("int" "io_priority")
-  '("GCancellable*" "cancellable")
-  '("GAsyncReadyCallback" "callback")
-  '("gpointer" "user_data")
- )
+(define-vfunc get_user_data
+  (of-object "GAsyncResult")
+  (return-type "gpointer")
 )
 
-(define-vfunc fill_finish
- (of-object "GBufferedInputStream")
- (return-type "gssize")
- (parameters
-  '("GAsyncResult*" "result")
-  '("GError**" "error")
- )
+(define-vfunc is_tagged
+  (of-object "GAsyncResult")
+  (return-type "gboolean")
+  (parameters
+   '("gpointer" "source_tag")
+  )
 )
 
-; GConverter
-
 (define-vfunc convert
   (of-object "GConverter")
   (return-type "GConverterResult")
@@ -400,7 +2170,10 @@
   (return-type "void")
 )
 
-; GDBusInterface
+(define-vfunc dup_object
+  (of-object "GDBusInterface")
+  (return-type "GDBusObject*")
+)
 
 (define-vfunc get_info
   (of-object "GDBusInterface")
@@ -420,773 +2193,1519 @@
   )
 )
 
-(define-vfunc dup_object
-  (of-object "GDBusInterface")
-  (return-type "GDBusObject*")
+(define-vfunc get_interface
+  (of-object "GDBusObject")
+  (return-type "GDBusInterface*")
+  (parameters
+   '("const-gchar*" "interface_name")
+  )
 )
 
-; GDBusObject
+(define-vfunc get_interfaces
+  (of-object "GDBusObject")
+  (return-type "GList*")
+)
 
 (define-vfunc get_object_path
   (of-object "GDBusObject")
   (return-type "const-gchar*")
 )
 
-(define-vfunc get_interfaces
+(define-vfunc interface_added
   (of-object "GDBusObject")
-  (return-type "GList*")
+  (return-type "void")
+  (parameters
+   '("GDBusInterface*" "interface_")
+  )
 )
 
-(define-vfunc get_interface
+(define-vfunc interface_removed
   (of-object "GDBusObject")
+  (return-type "void")
+  (parameters
+   '("GDBusInterface*" "interface_")
+  )
+)
+
+(define-vfunc get_interface
+  (of-object "GDBusObjectManager")
   (return-type "GDBusInterface*")
   (parameters
+   '("const-gchar*" "object_path")
    '("const-gchar*" "interface_name")
   )
 )
 
-; GDrive
+(define-vfunc get_object
+  (of-object "GDBusObjectManager")
+  (return-type "GDBusObject*")
+  (parameters
+   '("const-gchar*" "object_path")
+  )
+)
+
+(define-vfunc get_object_path
+  (of-object "GDBusObjectManager")
+  (return-type "const-gchar*")
+)
+
+(define-vfunc get_objects
+  (of-object "GDBusObjectManager")
+  (return-type "GList*")
+)
+
+(define-vfunc interface_added
+  (of-object "GDBusObjectManager")
+  (return-type "void")
+  (parameters
+   '("GDBusObject*" "object")
+   '("GDBusInterface*" "interface_")
+  )
+)
+
+(define-vfunc interface_removed
+  (of-object "GDBusObjectManager")
+  (return-type "void")
+  (parameters
+   '("GDBusObject*" "object")
+   '("GDBusInterface*" "interface_")
+  )
+)
+
+(define-vfunc object_added
+  (of-object "GDBusObjectManager")
+  (return-type "void")
+  (parameters
+   '("GDBusObject*" "object")
+  )
+)
+
+(define-vfunc object_removed
+  (of-object "GDBusObjectManager")
+  (return-type "void")
+  (parameters
+   '("GDBusObject*" "object")
+  )
+)
+
+(define-vfunc condition_check
+  (of-object "GDatagramBased")
+  (return-type "GIOCondition")
+  (parameters
+   '("GIOCondition" "condition")
+  )
+)
+
+(define-vfunc condition_wait
+  (of-object "GDatagramBased")
+  (return-type "gboolean")
+  (parameters
+   '("GIOCondition" "condition")
+   '("gint64" "timeout")
+   '("GCancellable*" "cancellable")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc create_source
+  (of-object "GDatagramBased")
+  (return-type "GSource*")
+  (parameters
+   '("GIOCondition" "condition")
+   '("GCancellable*" "cancellable")
+  )
+)
+
+(define-vfunc receive_messages
+  (of-object "GDatagramBased")
+  (return-type "gint")
+  (parameters
+   '("GInputMessage*" "messages")
+   '("guint" "num_messages")
+   '("gint" "flags")
+   '("gint64" "timeout")
+   '("GCancellable*" "cancellable")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc send_messages
+  (of-object "GDatagramBased")
+  (return-type "gint")
+  (parameters
+   '("GOutputMessage*" "messages")
+   '("guint" "num_messages")
+   '("gint" "flags")
+   '("gint64" "timeout")
+   '("GCancellable*" "cancellable")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc get_default_for_uri_scheme
+  (of-object "GDesktopAppInfoLookup")
+  (return-type "GAppInfo*")
+  (parameters
+   '("const-char*" "uri_scheme")
+  )
+)
+
+(define-vfunc can_eject
+  (of-object "GDrive")
+  (return-type "gboolean")
+)
+
+(define-vfunc can_poll_for_media
+  (of-object "GDrive")
+  (return-type "gboolean")
+)
+
+(define-vfunc can_start
+  (of-object "GDrive")
+  (return-type "gboolean")
+)
+
+(define-vfunc can_start_degraded
+  (of-object "GDrive")
+  (return-type "gboolean")
+)
+
+(define-vfunc can_stop
+  (of-object "GDrive")
+  (return-type "gboolean")
+)
+
+(define-vfunc changed
+  (of-object "GDrive")
+  (return-type "void")
+)
+
+(define-vfunc disconnected
+  (of-object "GDrive")
+  (return-type "void")
+)
+
+(define-vfunc eject
+  (of-object "GDrive")
+  (return-type "void")
+  (parameters
+   '("GMountUnmountFlags" "flags")
+   '("GCancellable*" "cancellable")
+   '("GAsyncReadyCallback" "callback")
+   '("gpointer" "user_data")
+  )
+)
+
+(define-vfunc eject_button
+  (of-object "GDrive")
+  (return-type "void")
+)
+
+(define-vfunc eject_finish
+  (of-object "GDrive")
+  (return-type "gboolean")
+  (parameters
+   '("GAsyncResult*" "result")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc eject_with_operation
+  (of-object "GDrive")
+  (return-type "void")
+  (parameters
+   '("GMountUnmountFlags" "flags")
+   '("GMountOperation*" "mount_operation")
+   '("GCancellable*" "cancellable")
+   '("GAsyncReadyCallback" "callback")
+   '("gpointer" "user_data")
+  )
+)
+
+(define-vfunc eject_with_operation_finish
+  (of-object "GDrive")
+  (return-type "gboolean")
+  (parameters
+   '("GAsyncResult*" "result")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc enumerate_identifiers
+  (of-object "GDrive")
+  (return-type "char**")
+)
+
+(define-vfunc get_icon
+  (of-object "GDrive")
+  (return-type "GIcon*")
+)
+
+(define-vfunc get_identifier
+  (of-object "GDrive")
+  (return-type "char*")
+  (parameters
+   '("const-char*" "kind")
+  )
+)
 
 (define-vfunc get_name
   (of-object "GDrive")
   (return-type "char*")
 )
 
+(define-vfunc get_sort_key
+  (of-object "GDrive")
+  (return-type "const-gchar*")
+)
+
+(define-vfunc get_start_stop_type
+  (of-object "GDrive")
+  (return-type "GDriveStartStopType")
+)
+
+(define-vfunc get_symbolic_icon
+  (of-object "GDrive")
+  (return-type "GIcon*")
+)
+
+(define-vfunc get_volumes
+  (of-object "GDrive")
+  (return-type "GList*")
+)
+
+(define-vfunc has_media
+  (of-object "GDrive")
+  (return-type "gboolean")
+)
+
 (define-vfunc has_volumes
   (of-object "GDrive")
   (return-type "gboolean")
 )
 
-(define-vfunc is_automounted
+(define-vfunc is_media_check_automatic
   (of-object "GDrive")
   (return-type "gboolean")
 )
 
-(define-vfunc can_mount
+(define-vfunc is_media_removable
   (of-object "GDrive")
   (return-type "gboolean")
 )
 
-(define-vfunc can_eject
+(define-vfunc is_removable
   (of-object "GDrive")
   (return-type "gboolean")
 )
 
-; GFile
+(define-vfunc poll_for_media
+  (of-object "GDrive")
+  (return-type "void")
+  (parameters
+   '("GCancellable*" "cancellable")
+   '("GAsyncReadyCallback" "callback")
+   '("gpointer" "user_data")
+  )
+)
 
-(define-vfunc dup
+(define-vfunc poll_for_media_finish
+  (of-object "GDrive")
+  (return-type "gboolean")
+  (parameters
+   '("GAsyncResult*" "result")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc start
+  (of-object "GDrive")
+  (return-type "void")
+  (parameters
+   '("GDriveStartFlags" "flags")
+   '("GMountOperation*" "mount_operation")
+   '("GCancellable*" "cancellable")
+   '("GAsyncReadyCallback" "callback")
+   '("gpointer" "user_data")
+  )
+)
+
+(define-vfunc start_finish
+  (of-object "GDrive")
+  (return-type "gboolean")
+  (parameters
+   '("GAsyncResult*" "result")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc stop
+  (of-object "GDrive")
+  (return-type "void")
+  (parameters
+   '("GMountUnmountFlags" "flags")
+   '("GMountOperation*" "mount_operation")
+   '("GCancellable*" "cancellable")
+   '("GAsyncReadyCallback" "callback")
+   '("gpointer" "user_data")
+  )
+)
+
+(define-vfunc stop_button
+  (of-object "GDrive")
+  (return-type "void")
+)
+
+(define-vfunc stop_finish
+  (of-object "GDrive")
+  (return-type "gboolean")
+  (parameters
+   '("GAsyncResult*" "result")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc accept_certificate
+  (of-object "GDtlsConnection")
+  (return-type "gboolean")
+  (parameters
+   '("GTlsCertificate*" "peer_cert")
+   '("GTlsCertificateFlags" "errors")
+  )
+)
+
+(define-vfunc handshake
+  (of-object "GDtlsConnection")
+  (return-type "gboolean")
+  (parameters
+   '("GCancellable*" "cancellable")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc handshake_async
+  (of-object "GDtlsConnection")
+  (return-type "void")
+  (parameters
+   '("int" "io_priority")
+   '("GCancellable*" "cancellable")
+   '("GAsyncReadyCallback" "callback")
+   '("gpointer" "user_data")
+  )
+)
+
+(define-vfunc handshake_finish
+  (of-object "GDtlsConnection")
+  (return-type "gboolean")
+  (parameters
+   '("GAsyncResult*" "result")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc shutdown
+  (of-object "GDtlsConnection")
+  (return-type "gboolean")
+  (parameters
+   '("gboolean" "shutdown_read")
+   '("gboolean" "shutdown_write")
+   '("GCancellable*" "cancellable")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc shutdown_async
+  (of-object "GDtlsConnection")
+  (return-type "void")
+  (parameters
+   '("gboolean" "shutdown_read")
+   '("gboolean" "shutdown_write")
+   '("int" "io_priority")
+   '("GCancellable*" "cancellable")
+   '("GAsyncReadyCallback" "callback")
+   '("gpointer" "user_data")
+  )
+)
+
+(define-vfunc shutdown_finish
+  (of-object "GDtlsConnection")
+  (return-type "gboolean")
+  (parameters
+   '("GAsyncResult*" "result")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc append_to
   (of-object "GFile")
-  (return-type "GFile*")
+  (return-type "GFileOutputStream*")
+  (parameters
+   '("GFileCreateFlags" "flags")
+   '("GCancellable*" "cancellable")
+   '("GError**" "error")
+  )
 )
 
-(define-vfunc hash
+(define-vfunc append_to_async
   (of-object "GFile")
-  (return-type "guint")
+  (return-type "void")
+  (parameters
+   '("GFileCreateFlags" "flags")
+   '("int" "io_priority")
+   '("GCancellable*" "cancellable")
+   '("GAsyncReadyCallback" "callback")
+   '("gpointer" "user_data")
+  )
 )
 
-(define-vfunc get_basename
+(define-vfunc append_to_finish
   (of-object "GFile")
-  (return-type "char*")
+  (return-type "GFileOutputStream*")
+  (parameters
+   '("GAsyncResult*" "res")
+   '("GError**" "error")
+  )
 )
 
-(define-vfunc get_path
+(define-vfunc copy
   (of-object "GFile")
-  (return-type "char*")
+  (return-type "gboolean")
+  (parameters
+   '("GFile*" "destination")
+   '("GFileCopyFlags" "flags")
+   '("GCancellable*" "cancellable")
+   '("GFileProgressCallback" "progress_callback")
+   '("gpointer" "progress_callback_data")
+   '("GError**" "error")
+  )
 )
 
-(define-vfunc get_uri
+(define-vfunc copy_async
   (of-object "GFile")
-  (return-type "char*")
+  (return-type "void")
+  (parameters
+   '("GFile*" "destination")
+   '("GFileCopyFlags" "flags")
+   '("int" "io_priority")
+   '("GCancellable*" "cancellable")
+   '("GFileProgressCallback" "progress_callback")
+   '("gpointer" "progress_callback_data")
+   '("GAsyncReadyCallback" "callback")
+   '("gpointer" "user_data")
+  )
 )
 
-(define-vfunc get_parse_name
+(define-vfunc copy_finish
   (of-object "GFile")
-  (return-type "char*")
+  (return-type "gboolean")
+  (parameters
+   '("GAsyncResult*" "res")
+   '("GError**" "error")
+  )
 )
 
-(define-vfunc get_parent
+(define-vfunc create
   (of-object "GFile")
-  (return-type "GFile*")
+  (return-type "GFileOutputStream*")
+  (parameters
+   '("GFileCreateFlags" "flags")
+   '("GCancellable*" "cancellable")
+   '("GError**" "error")
+  )
 )
 
-(define-vfunc get_child_for_display_name
+(define-vfunc create_async
   (of-object "GFile")
-  (return-type "GFile*")
+  (return-type "void")
   (parameters
-   '("const-char*" "display_name")
+   '("GFileCreateFlags" "flags")
+   '("int" "io_priority")
+   '("GCancellable*" "cancellable")
+   '("GAsyncReadyCallback" "callback")
+   '("gpointer" "user_data")
+  )
+)
+
+(define-vfunc create_finish
+  (of-object "GFile")
+  (return-type "GFileOutputStream*")
+  (parameters
+   '("GAsyncResult*" "res")
    '("GError**" "error")
   )
 )
 
-(define-vfunc has_prefix
+(define-vfunc create_readwrite
   (of-object "GFile")
-  (return-type "gboolean")
+  (return-type "GFileIOStream*")
   (parameters
-   '("GFile*" "prefix")
+   '("GFileCreateFlags" "flags")
+   '("GCancellable*" "cancellable")
+   '("GError**" "error")
   )
 )
 
-(define-vfunc get_relative_path
+(define-vfunc create_readwrite_async
   (of-object "GFile")
-  (return-type "char*")
+  (return-type "void")
   (parameters
-   '("GFile*" "descendant")
+   '("GFileCreateFlags" "flags")
+   '("int" "io_priority")
+   '("GCancellable*" "cancellable")
+   '("GAsyncReadyCallback" "callback")
+   '("gpointer" "user_data")
   )
 )
 
-(define-vfunc resolve_relative_path
+(define-vfunc create_readwrite_finish
   (of-object "GFile")
-  (return-type "GFile*")
+  (return-type "GFileIOStream*")
   (parameters
-   '("const-char*" "relative_path")
+   '("GAsyncResult*" "res")
+   '("GError**" "error")
   )
 )
 
-(define-vfunc is_native
+(define-vfunc delete_file
   (of-object "GFile")
   (return-type "gboolean")
+  (parameters
+   '("GCancellable*" "cancellable")
+   '("GError**" "error")
+  )
 )
 
-(define-vfunc has_uri_scheme
+(define-vfunc delete_file_async
+  (of-object "GFile")
+  (return-type "void")
+  (parameters
+   '("int" "io_priority")
+   '("GCancellable*" "cancellable")
+   '("GAsyncReadyCallback" "callback")
+   '("gpointer" "user_data")
+  )
+)
+
+(define-vfunc delete_file_finish
   (of-object "GFile")
   (return-type "gboolean")
   (parameters
-   '("const-char*" "uri_scheme")
+   '("GAsyncResult*" "result")
+   '("GError**" "error")
   )
 )
 
-; GFileInputStream
+(define-vfunc dup
+  (of-object "GFile")
+  (return-type "GFile*")
+)
 
-(define-vfunc tell
- (of-object "GFileInputStream")
- (return-type "goffset")
+(define-vfunc eject_mountable
+  (of-object "GFile")
+  (return-type "void")
+  (parameters
+   '("GMountUnmountFlags" "flags")
+   '("GCancellable*" "cancellable")
+   '("GAsyncReadyCallback" "callback")
+   '("gpointer" "user_data")
+  )
 )
 
-(define-vfunc can_seek
- (of-object "GFileInputStream")
- (return-type "gboolean")
+(define-vfunc eject_mountable_finish
+  (of-object "GFile")
+  (return-type "gboolean")
+  (parameters
+   '("GAsyncResult*" "result")
+   '("GError**" "error")
+  )
 )
 
-(define-vfunc seek
- (of-object "GFileInputStream")
- (return-type "gboolean")
- (parameters
-  '("goffset" "offset")
-  '("GSeekType" "type")
-  '("GCancellable*" "cancellable")
-  '("GError**" "error")
- )
+(define-vfunc eject_mountable_with_operation
+  (of-object "GFile")
+  (return-type "void")
+  (parameters
+   '("GMountUnmountFlags" "flags")
+   '("GMountOperation*" "mount_operation")
+   '("GCancellable*" "cancellable")
+   '("GAsyncReadyCallback" "callback")
+   '("gpointer" "user_data")
+  )
 )
 
-(define-vfunc query_info
- (of-object "GFileInputStream")
- (return-type "GFileInfo*")
- (parameters
-  '("const-char*" "attributes")
-  '("GCancellable*" "cancellable")
-  '("GError**" "error")
- )
+(define-vfunc eject_mountable_with_operation_finish
+  (of-object "GFile")
+  (return-type "gboolean")
+  (parameters
+   '("GAsyncResult*" "result")
+   '("GError**" "error")
+  )
 )
 
-(define-vfunc query_info_async
- (of-object "GFileInputStream")
- (return-type "void")
- (parameters
-  '("const-char*" "attributes")
-  '("int" "io_priority")
-  '("GCancellable*" "cancellable")
-  '("GAsyncReadyCallback" "callback")
-  '("gpointer" "user_data")
- )
+(define-vfunc enumerate_children
+  (of-object "GFile")
+  (return-type "GFileEnumerator*")
+  (parameters
+   '("const-char*" "attributes")
+   '("GFileQueryInfoFlags" "flags")
+   '("GCancellable*" "cancellable")
+   '("GError**" "error")
+  )
 )
 
-(define-vfunc query_info_finish
- (of-object "GFileInputStream")
- (return-type "GFileInfo*")
- (parameters
-  '("GAsyncResult*" "result")
-  '("GError**" "error")
- )
+(define-vfunc enumerate_children_async
+  (of-object "GFile")
+  (return-type "void")
+  (parameters
+   '("const-char*" "attributes")
+   '("GFileQueryInfoFlags" "flags")
+   '("int" "io_priority")
+   '("GCancellable*" "cancellable")
+   '("GAsyncReadyCallback" "callback")
+   '("gpointer" "user_data")
+  )
 )
 
-; GFileOutputStream
+(define-vfunc enumerate_children_finish
+  (of-object "GFile")
+  (return-type "GFileEnumerator*")
+  (parameters
+   '("GAsyncResult*" "res")
+   '("GError**" "error")
+  )
+)
 
-(define-vfunc tell
- (of-object "GFileOutputStream")
- (return-type "goffset")
+(define-vfunc equal
+  (of-object "GFile")
+  (return-type "gboolean")
+  (parameters
+   '("GFile*" "file2")
+  )
 )
 
-(define-vfunc can_seek
- (of-object "GFileOutputStream")
- (return-type "gboolean")
+(define-vfunc find_enclosing_mount
+  (of-object "GFile")
+  (return-type "GMount*")
+  (parameters
+   '("GCancellable*" "cancellable")
+   '("GError**" "error")
+  )
 )
 
-(define-vfunc seek
- (of-object "GFileOutputStream")
- (return-type "gboolean")
- (parameters
-  '("goffset" "offset")
-  '("GSeekType" "type")
-  '("GCancellable*" "cancellable")
-  '("GError**" "error")
- )
+(define-vfunc find_enclosing_mount_async
+  (of-object "GFile")
+  (return-type "void")
+  (parameters
+   '("int" "io_priority")
+   '("GCancellable*" "cancellable")
+   '("GAsyncReadyCallback" "callback")
+   '("gpointer" "user_data")
+  )
 )
 
-(define-vfunc can_truncate
- (of-object "GFileOutputStream")
- (return-type "gboolean")
+(define-vfunc find_enclosing_mount_finish
+  (of-object "GFile")
+  (return-type "GMount*")
+  (parameters
+   '("GAsyncResult*" "res")
+   '("GError**" "error")
+  )
 )
 
-(define-vfunc truncate_fn
- (of-object "GFileOutputStream")
- (return-type "gboolean")
- (parameters
-  '("goffset" "offset")
-  '("GCancellable*" "cancellable")
-  '("GError**" "error")
- )
+(define-vfunc get_basename
+  (of-object "GFile")
+  (return-type "char*")
 )
 
-(define-vfunc query_info
- (of-object "GFileOutputStream")
- (return-type "GFileInfo*")
- (parameters
-  '("const-char*" "attributes")
-  '("GCancellable*" "cancellable")
-  '("GError**" "error")
- )
+(define-vfunc get_child_for_display_name
+  (of-object "GFile")
+  (return-type "GFile*")
+  (parameters
+   '("const-char*" "display_name")
+   '("GError**" "error")
+  )
 )
 
-(define-vfunc query_info_async
- (of-object "GFileOutputStream")
- (return-type "void")
- (parameters
-  '("const-char*" "attributes")
-  '("int" "io_priority")
-  '("GCancellable*" "cancellable")
-  '("GAsyncReadyCallback" "callback")
-  '("gpointer" "user_data")
- )
+(define-vfunc get_parent
+  (of-object "GFile")
+  (return-type "GFile*")
 )
 
-(define-vfunc query_info_finish
- (of-object "GFileOutputStream")
- (return-type "GFileInfo*")
- (parameters
-  '("GAsyncResult*" "result")
-  '("GError**" "error")
- )
+(define-vfunc get_parse_name
+  (of-object "GFile")
+  (return-type "char*")
 )
 
-(define-vfunc get_etag
- (of-object "GFileOutputStream")
- (return-type "char*")
+(define-vfunc get_path
+  (of-object "GFile")
+  (return-type "char*")
 )
 
-; GIcon
+(define-vfunc get_relative_path
+  (of-object "GFile")
+  (return-type "char*")
+  (parameters
+   '("GFile*" "descendant")
+  )
+)
+
+(define-vfunc get_uri
+  (of-object "GFile")
+  (return-type "char*")
+)
+
+(define-vfunc get_uri_scheme
+  (of-object "GFile")
+  (return-type "char*")
+)
+
+(define-vfunc has_uri_scheme
+  (of-object "GFile")
+  (return-type "gboolean")
+  (parameters
+   '("const-char*" "uri_scheme")
+  )
+)
 
 (define-vfunc hash
-  (of-object "GIcon")
+  (of-object "GFile")
   (return-type "guint")
 )
 
-; GInitable
+(define-vfunc is_native
+  (of-object "GFile")
+  (return-type "gboolean")
+)
 
-(define-vfunc init
-  (of-object "GInitable")
+(define-vfunc make_directory
+  (of-object "GFile")
   (return-type "gboolean")
   (parameters
-    '("GCancellable*" "cancellable")
-    '("GError**" "error")
+   '("GCancellable*" "cancellable")
+   '("GError**" "error")
   )
 )
 
-; GInputStream
+(define-vfunc make_directory_async
+  (of-object "GFile")
+  (return-type "void")
+  (parameters
+   '("int" "io_priority")
+   '("GCancellable*" "cancellable")
+   '("GAsyncReadyCallback" "callback")
+   '("gpointer" "user_data")
+  )
+)
 
-(define-vfunc read_fn
- (of-object "GInputStream")
- (return-type "gssize")
- (parameters
-  '("void*" "buffer")
-  '("gsize" "count")
-  '("GCancellable*" "cancellable")
-  '("GError**" "error")
- )
+(define-vfunc make_directory_finish
+  (of-object "GFile")
+  (return-type "gboolean")
+  (parameters
+   '("GAsyncResult*" "result")
+   '("GError**" "error")
+  )
 )
 
-(define-vfunc skip
- (of-object "GInputStream")
- (return-type "gssize")
- (parameters
-  '("gsize" "count")
-  '("GCancellable*" "cancellable")
-  '("GError**" "error")
- )
+(define-vfunc make_symbolic_link
+  (of-object "GFile")
+  (return-type "gboolean")
+  (parameters
+   '("char*" "symlink_value")
+   '("GCancellable*" "cancellable")
+   '("GError**" "error")
+  )
 )
 
-(define-vfunc close_fn
- (of-object "GInputStream")
- (return-type "gboolean")
- (parameters
-  '("GCancellable*" "cancellable")
-  '("GError**" "error")
- )
+(define-vfunc measure_disk_usage
+  (of-object "GFile")
+  (return-type "gboolean")
+  (parameters
+   '("GFileMeasureFlags" "flags")
+   '("GCancellable*" "cancellable")
+   '("GFileMeasureProgressCallback" "progress_callback")
+   '("gpointer" "progress_data")
+   '("guint64*" "disk_usage")
+   '("guint64*" "num_dirs")
+   '("guint64*" "num_files")
+   '("GError**" "error")
+  )
 )
 
-(define-vfunc read_async
- (of-object "GInputStream")
- (return-type "void")
- (parameters
-  '("void*" "buffer")
-  '("gsize" "count")
-  '("int" "io_priority")
-  '("GCancellable*" "cancellable")
-  '("GAsyncReadyCallback" "callback")
-  '("gpointer" "user_data")
- )
+(define-vfunc measure_disk_usage_async
+  (of-object "GFile")
+  (return-type "void")
+  (parameters
+   '("GFileMeasureFlags" "flags")
+   '("gint" "io_priority")
+   '("GCancellable*" "cancellable")
+   '("GFileMeasureProgressCallback" "progress_callback")
+   '("gpointer" "progress_data")
+   '("GAsyncReadyCallback" "callback")
+   '("gpointer" "user_data")
+  )
 )
 
-(define-vfunc read_finish
- (of-object "GInputStream")
- (return-type "gssize")
- (parameters
-  '("GAsyncResult*" "result")
-  '("GError**" "error")
- )
+(define-vfunc measure_disk_usage_finish
+  (of-object "GFile")
+  (return-type "gboolean")
+  (parameters
+   '("GAsyncResult*" "result")
+   '("guint64*" "disk_usage")
+   '("guint64*" "num_dirs")
+   '("guint64*" "num_files")
+   '("GError**" "error")
+  )
 )
 
-(define-vfunc skip_async
- (of-object "GInputStream")
- (return-type "void")
- (parameters
-  '("gsize" "count")
-  '("int" "io_priority")
-  '("GCancellable*" "cancellable")
-  '("GAsyncReadyCallback" "callback")
-  '("gpointer" "user_data")
- )
+(define-vfunc monitor_dir
+  (of-object "GFile")
+  (return-type "GFileMonitor*")
+  (parameters
+   '("GFileMonitorFlags" "flags")
+   '("GCancellable*" "cancellable")
+   '("GError**" "error")
+  )
 )
 
-(define-vfunc skip_finish
- (of-object "GInputStream")
- (return-type "gssize")
- (parameters
-  '("GAsyncResult*" "result")
-  '("GError**" "error")
- )
+(define-vfunc monitor_file
+  (of-object "GFile")
+  (return-type "GFileMonitor*")
+  (parameters
+   '("GFileMonitorFlags" "flags")
+   '("GCancellable*" "cancellable")
+   '("GError**" "error")
+  )
 )
 
-(define-vfunc close_async
- (of-object "GInputStream")
- (return-type "void")
- (parameters
-  '("int" "io_priority")
-  '("GCancellable*" "cancellable")
-  '("GAsyncReadyCallback" "callback")
-  '("gpointer" "user_data")
- )
+(define-vfunc mount_enclosing_volume
+  (of-object "GFile")
+  (return-type "void")
+  (parameters
+   '("GMountMountFlags" "flags")
+   '("GMountOperation*" "mount_operation")
+   '("GCancellable*" "cancellable")
+   '("GAsyncReadyCallback" "callback")
+   '("gpointer" "user_data")
+  )
 )
 
-(define-vfunc close_finish
- (of-object "GInputStream")
- (return-type "gboolean")
- (parameters
-  '("GAsyncResult*" "result")
-  '("GError**" "error")
- )
+(define-vfunc mount_enclosing_volume_finish
+  (of-object "GFile")
+  (return-type "gboolean")
+  (parameters
+   '("GAsyncResult*" "result")
+   '("GError**" "error")
+  )
 )
 
-; GListModel
+(define-vfunc mount_mountable
+  (of-object "GFile")
+  (return-type "void")
+  (parameters
+   '("GMountMountFlags" "flags")
+   '("GMountOperation*" "mount_operation")
+   '("GCancellable*" "cancellable")
+   '("GAsyncReadyCallback" "callback")
+   '("gpointer" "user_data")
+  )
+)
 
-(define-vfunc get_item_type
-  (of-object "GListModel")
-  (return-type "GType")
+(define-vfunc mount_mountable_finish
+  (of-object "GFile")
+  (return-type "GFile*")
+  (parameters
+   '("GAsyncResult*" "result")
+   '("GError**" "error")
+  )
 )
 
-(define-vfunc get_n_items
-  (of-object "GListModel")
-  (return-type "guint")
+(define-vfunc move
+  (of-object "GFile")
+  (return-type "gboolean")
+  (parameters
+   '("GFile*" "destination")
+   '("GFileCopyFlags" "flags")
+   '("GCancellable*" "cancellable")
+   '("GFileProgressCallback" "progress_callback")
+   '("gpointer" "progress_callback_data")
+   '("GError**" "error")
+  )
 )
 
-(define-vfunc get_item
-  (of-object "GListModel")
-  (return-type "gpointer")
+(define-vfunc open_readwrite
+  (of-object "GFile")
+  (return-type "GFileIOStream*")
   (parameters
-   '("guint" "position")
+   '("GCancellable*" "cancellable")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc open_readwrite_async
+  (of-object "GFile")
+  (return-type "void")
+  (parameters
+   '("int" "io_priority")
+   '("GCancellable*" "cancellable")
+   '("GAsyncReadyCallback" "callback")
+   '("gpointer" "user_data")
   )
 )
 
-; GLoadableIcon
+(define-vfunc open_readwrite_finish
+  (of-object "GFile")
+  (return-type "GFileIOStream*")
+  (parameters
+   '("GAsyncResult*" "res")
+   '("GError**" "error")
+  )
+)
 
-(define-vfunc load
- (of-object "GLoadableIcon")
- (return-type "GInputStream*")
- (parameters
-  '("int" "size")
-  '("char**" "type")
-  '("GCancellable*" "cancellable")
-  '("GError**" "error")
- )
+(define-vfunc poll_mountable
+  (of-object "GFile")
+  (return-type "void")
+  (parameters
+   '("GCancellable*" "cancellable")
+   '("GAsyncReadyCallback" "callback")
+   '("gpointer" "user_data")
+  )
 )
 
-(define-vfunc load_async
- (of-object "GLoadableIcon")
- (return-type "void")
- (parameters
-  '("int" "size")
-  '("GCancellable*" "cancellable")
-  '("GAsyncReadyCallback" "callback")
-  '("gpointer" "user_data")
- )
+(define-vfunc poll_mountable_finish
+  (of-object "GFile")
+  (return-type "gboolean")
+  (parameters
+   '("GAsyncResult*" "result")
+   '("GError**" "error")
+  )
 )
 
-(define-vfunc load_finish
- (of-object "GLoadableIcon")
- (return-type "GInputStream*")
- (parameters
-  '("GAsyncResult*" "res")
-  '("char**" "type")
-  '("GError**" "error")
- )
+(define-vfunc prefix_matches
+  (of-object "GFile")
+  (return-type "gboolean")
+  (parameters
+   '("GFile*" "file")
+  )
 )
 
-; GOutputStream
+(define-vfunc query_filesystem_info
+  (of-object "GFile")
+  (return-type "GFileInfo*")
+  (parameters
+   '("const-char*" "attributes")
+   '("GCancellable*" "cancellable")
+   '("GError**" "error")
+  )
+)
 
-(define-vfunc write_fn
- (of-object "GOutputStream")
- (return-type "gssize")
- (parameters
-  '("const-void*" "buffer")
-  '("gsize" "count")
-  '("GCancellable*" "cancellable")
-  '("GError**" "error")
- )
+(define-vfunc query_filesystem_info_async
+  (of-object "GFile")
+  (return-type "void")
+  (parameters
+   '("const-char*" "attributes")
+   '("int" "io_priority")
+   '("GCancellable*" "cancellable")
+   '("GAsyncReadyCallback" "callback")
+   '("gpointer" "user_data")
+  )
 )
 
-(define-vfunc splice
- (of-object "GOutputStream")
- (return-type "gssize")
- (parameters
-  '("GInputStream*" "source")
-  '("GOutputStreamSpliceFlags" "flags")
-  '("GCancellable*" "cancellable")
-  '("GError**" "error")
- )
+(define-vfunc query_filesystem_info_finish
+  (of-object "GFile")
+  (return-type "GFileInfo*")
+  (parameters
+   '("GAsyncResult*" "res")
+   '("GError**" "error")
+  )
 )
 
-(define-vfunc flush
- (of-object "GOutputStream")
- (return-type "gboolean")
- (parameters
-  '("GCancellable*" "cancellable")
-  '("GError**" "error")
- )
+(define-vfunc query_info
+  (of-object "GFile")
+  (return-type "GFileInfo*")
+  (parameters
+   '("const-char*" "attributes")
+   '("GFileQueryInfoFlags" "flags")
+   '("GCancellable*" "cancellable")
+   '("GError**" "error")
+  )
 )
 
-(define-vfunc close_fn
- (of-object "GOutputStream")
- (return-type "gboolean")
- (parameters
-  '("GCancellable*" "cancellable")
-  '("GError**" "error")
- )
+(define-vfunc query_info_async
+  (of-object "GFile")
+  (return-type "void")
+  (parameters
+   '("const-char*" "attributes")
+   '("GFileQueryInfoFlags" "flags")
+   '("int" "io_priority")
+   '("GCancellable*" "cancellable")
+   '("GAsyncReadyCallback" "callback")
+   '("gpointer" "user_data")
+  )
 )
 
-(define-vfunc write_async
- (of-object "GOutputStream")
- (return-type "void")
- (parameters
-  '("const-void*" "buffer")
-  '("gsize" "count")
-  '("int" "io_priority")
-  '("GCancellable*" "cancellable")
-  '("GAsyncReadyCallback" "callback")
-  '("gpointer" "user_data")
- )
+(define-vfunc query_info_finish
+  (of-object "GFile")
+  (return-type "GFileInfo*")
+  (parameters
+   '("GAsyncResult*" "res")
+   '("GError**" "error")
+  )
 )
 
-(define-vfunc write_finish
- (of-object "GOutputStream")
- (return-type "gssize")
- (parameters
-  '("GAsyncResult*" "result")
-  '("GError**" "error")
- )
+(define-vfunc query_settable_attributes
+  (of-object "GFile")
+  (return-type "GFileAttributeInfoList*")
+  (parameters
+   '("GCancellable*" "cancellable")
+   '("GError**" "error")
+  )
 )
 
-(define-vfunc splice_async
- (of-object "GOutputStream")
- (return-type "void")
- (parameters
-  '("GInputStream*" "source")
-  '("GOutputStreamSpliceFlags" "flags")
-  '("int" "io_priority")
-  '("GCancellable*" "cancellable")
-  '("GAsyncReadyCallback" "callback")
-  '("gpointer" "user_data")
- )
+(define-vfunc query_writable_namespaces
+  (of-object "GFile")
+  (return-type "GFileAttributeInfoList*")
+  (parameters
+   '("GCancellable*" "cancellable")
+   '("GError**" "error")
+  )
 )
 
-(define-vfunc splice_finish
- (of-object "GOutputStream")
- (return-type "gssize")
- (parameters
-  '("GAsyncResult*" "result")
-  '("GError**" "error")
- )
+(define-vfunc read_async
+  (of-object "GFile")
+  (return-type "void")
+  (parameters
+   '("int" "io_priority")
+   '("GCancellable*" "cancellable")
+   '("GAsyncReadyCallback" "callback")
+   '("gpointer" "user_data")
+  )
 )
 
-(define-vfunc flush_async
- (of-object "GOutputStream")
- (return-type "void")
- (parameters
-  '("int" "io_priority")
-  '("GCancellable*" "cancellable")
-  '("GAsyncReadyCallback" "callback")
-  '("gpointer" "user_data")
- )
+(define-vfunc read_finish
+  (of-object "GFile")
+  (return-type "GFileInputStream*")
+  (parameters
+   '("GAsyncResult*" "res")
+   '("GError**" "error")
+  )
 )
 
-(define-vfunc flush_finish
- (of-object "GOutputStream")
- (return-type "gboolean")
- (parameters
-  '("GAsyncResult*" "result")
-  '("GError**" "error")
- )
+(define-vfunc read_fn
+  (of-object "GFile")
+  (return-type "GFileInputStream*")
+  (parameters
+   '("GCancellable*" "cancellable")
+   '("GError**" "error")
+  )
 )
 
-(define-vfunc close_async
- (of-object "GOutputStream")
- (return-type "void")
- (parameters
-  '("int" "io_priority")
-  '("GCancellable*" "cancellable")
-  '("GAsyncReadyCallback" "callback")
-  '("gpointer" "user_data")
- )
+(define-vfunc replace
+  (of-object "GFile")
+  (return-type "GFileOutputStream*")
+  (parameters
+   '("const-char*" "etag")
+   '("gboolean" "make_backup")
+   '("GFileCreateFlags" "flags")
+   '("GCancellable*" "cancellable")
+   '("GError**" "error")
+  )
 )
 
-(define-vfunc close_finish
- (of-object "GOutputStream")
- (return-type "gboolean")
- (parameters
-  '("GAsyncResult*" "result")
-  '("GError**" "error")
- )
+(define-vfunc replace_async
+  (of-object "GFile")
+  (return-type "void")
+  (parameters
+   '("const-char*" "etag")
+   '("gboolean" "make_backup")
+   '("GFileCreateFlags" "flags")
+   '("int" "io_priority")
+   '("GCancellable*" "cancellable")
+   '("GAsyncReadyCallback" "callback")
+   '("gpointer" "user_data")
+  )
 )
 
-; GPermission
+(define-vfunc replace_finish
+  (of-object "GFile")
+  (return-type "GFileOutputStream*")
+  (parameters
+   '("GAsyncResult*" "res")
+   '("GError**" "error")
+  )
+)
 
-(define-vfunc acquire
- (of-object "GPermission")
- (return-type "gboolean")
- (parameters
-  '("GCancellable*" "cancellable")
-  '("GError**" "error")
- )
+(define-vfunc replace_readwrite
+  (of-object "GFile")
+  (return-type "GFileIOStream*")
+  (parameters
+   '("const-char*" "etag")
+   '("gboolean" "make_backup")
+   '("GFileCreateFlags" "flags")
+   '("GCancellable*" "cancellable")
+   '("GError**" "error")
+  )
 )
 
-(define-vfunc acquire_async
- (of-object "GPermission")
- (return-type "void")
- (parameters
-  '("GCancellable*" "cancellable")
-  '("GAsyncReadyCallback" "callback")
-  '("gpointer" "user_data")
- )
+(define-vfunc replace_readwrite_async
+  (of-object "GFile")
+  (return-type "void")
+  (parameters
+   '("const-char*" "etag")
+   '("gboolean" "make_backup")
+   '("GFileCreateFlags" "flags")
+   '("int" "io_priority")
+   '("GCancellable*" "cancellable")
+   '("GAsyncReadyCallback" "callback")
+   '("gpointer" "user_data")
+  )
 )
 
-(define-vfunc acquire_finish
- (of-object "GPermission")
- (return-type "gboolean")
- (parameters
-  '("GAsyncResult*" "result")
-  '("GError**" "error")
- )
+(define-vfunc replace_readwrite_finish
+  (of-object "GFile")
+  (return-type "GFileIOStream*")
+  (parameters
+   '("GAsyncResult*" "res")
+   '("GError**" "error")
+  )
 )
 
-(define-vfunc release
- (of-object "GPermission")
- (return-type "gboolean")
- (parameters
-  '("GCancellable*" "cancellable")
-  '("GError**" "error")
- )
+(define-vfunc resolve_relative_path
+  (of-object "GFile")
+  (return-type "GFile*")
+  (parameters
+   '("char*" "relative_path")
+  )
 )
 
-(define-vfunc release_async
- (of-object "GPermission")
- (return-type "void")
- (parameters
-  '("GCancellable*" "cancellable")
-  '("GAsyncReadyCallback" "callback")
-  '("gpointer" "user_data")
- )
+(define-vfunc set_attribute
+  (of-object "GFile")
+  (return-type "gboolean")
+  (parameters
+   '("const-char*" "attribute")
+   '("GFileAttributeType" "type")
+   '("gpointer" "value_p")
+   '("GFileQueryInfoFlags" "flags")
+   '("GCancellable*" "cancellable")
+   '("GError**" "error")
+  )
 )
 
-(define-vfunc release_finish
- (of-object "GPermission")
- (return-type "gboolean")
- (parameters
-  '("GAsyncResult*" "result")
-  '("GError**" "error")
- )
+(define-vfunc set_attributes_async
+  (of-object "GFile")
+  (return-type "void")
+  (parameters
+   '("GFileInfo*" "info")
+   '("GFileQueryInfoFlags" "flags")
+   '("int" "io_priority")
+   '("GCancellable*" "cancellable")
+   '("GAsyncReadyCallback" "callback")
+   '("gpointer" "user_data")
+  )
 )
 
-; GPollableInputStream
+(define-vfunc set_attributes_finish
+  (of-object "GFile")
+  (return-type "gboolean")
+  (parameters
+   '("GAsyncResult*" "result")
+   '("GFileInfo**" "info")
+   '("GError**" "error")
+  )
+)
 
-(define-vfunc can_poll
-  (of-object "GPollableInputStream")
+(define-vfunc set_attributes_from_info
+  (of-object "GFile")
   (return-type "gboolean")
+  (parameters
+   '("GFileInfo*" "info")
+   '("GFileQueryInfoFlags" "flags")
+   '("GCancellable*" "cancellable")
+   '("GError**" "error")
+  )
 )
 
-(define-vfunc is_readable
-  (of-object "GPollableInputStream")
+(define-vfunc set_display_name
+  (of-object "GFile")
+  (return-type "GFile*")
+  (parameters
+   '("const-char*" "display_name")
+   '("GCancellable*" "cancellable")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc set_display_name_async
+  (of-object "GFile")
+  (return-type "void")
+  (parameters
+   '("const-char*" "display_name")
+   '("int" "io_priority")
+   '("GCancellable*" "cancellable")
+   '("GAsyncReadyCallback" "callback")
+   '("gpointer" "user_data")
+  )
+)
+
+(define-vfunc set_display_name_finish
+  (of-object "GFile")
+  (return-type "GFile*")
+  (parameters
+   '("GAsyncResult*" "res")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc start_mountable
+  (of-object "GFile")
+  (return-type "void")
+  (parameters
+   '("GDriveStartFlags" "flags")
+   '("GMountOperation*" "start_operation")
+   '("GCancellable*" "cancellable")
+   '("GAsyncReadyCallback" "callback")
+   '("gpointer" "user_data")
+  )
+)
+
+(define-vfunc start_mountable_finish
+  (of-object "GFile")
   (return-type "gboolean")
+  (parameters
+   '("GAsyncResult*" "result")
+   '("GError**" "error")
+  )
 )
 
-(define-vfunc create_source
-  (of-object "GPollableInputStream")
-  (return-type "GSource*")
+(define-vfunc stop_mountable
+  (of-object "GFile")
+  (return-type "void")
   (parameters
+   '("GMountUnmountFlags" "flags")
+   '("GMountOperation*" "mount_operation")
    '("GCancellable*" "cancellable")
+   '("GAsyncReadyCallback" "callback")
+   '("gpointer" "user_data")
   )
 )
 
-(define-vfunc read_nonblocking
-  (of-object "GPollableInputStream")
-  (return-type "gssize")
+(define-vfunc stop_mountable_finish
+  (of-object "GFile")
+  (return-type "gboolean")
   (parameters
-   '("void*" "buffer")
-   '("gsize" "count")
+   '("GAsyncResult*" "result")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc trash
+  (of-object "GFile")
+  (return-type "gboolean")
+  (parameters
+   '("GCancellable*" "cancellable")
    '("GError**" "error")
   )
 )
 
-; GPollableOutputStream
+(define-vfunc trash_async
+  (of-object "GFile")
+  (return-type "void")
+  (parameters
+   '("int" "io_priority")
+   '("GCancellable*" "cancellable")
+   '("GAsyncReadyCallback" "callback")
+   '("gpointer" "user_data")
+  )
+)
 
-(define-vfunc can_poll
-  (of-object "GPollableOutputStream")
+(define-vfunc trash_finish
+  (of-object "GFile")
   (return-type "gboolean")
+  (parameters
+   '("GAsyncResult*" "result")
+   '("GError**" "error")
+  )
 )
 
-(define-vfunc is_writable
-  (of-object "GPollableOutputStream")
+(define-vfunc unmount_mountable
+  (of-object "GFile")
+  (return-type "void")
+  (parameters
+   '("GMountUnmountFlags" "flags")
+   '("GCancellable*" "cancellable")
+   '("GAsyncReadyCallback" "callback")
+   '("gpointer" "user_data")
+  )
+)
+
+(define-vfunc unmount_mountable_finish
+  (of-object "GFile")
   (return-type "gboolean")
+  (parameters
+   '("GAsyncResult*" "result")
+   '("GError**" "error")
+  )
 )
 
-(define-vfunc create_source
-  (of-object "GPollableOutputStream")
-  (return-type "GSource*")
+(define-vfunc unmount_mountable_with_operation
+  (of-object "GFile")
+  (return-type "void")
   (parameters
+   '("GMountUnmountFlags" "flags")
+   '("GMountOperation*" "mount_operation")
    '("GCancellable*" "cancellable")
+   '("GAsyncReadyCallback" "callback")
+   '("gpointer" "user_data")
   )
 )
 
-(define-vfunc write_nonblocking
-  (of-object "GPollableOutputStream")
-  (return-type "gssize")
+(define-vfunc unmount_mountable_with_operation_finish
+  (of-object "GFile")
+  (return-type "gboolean")
   (parameters
-   '("const-void*" "buffer")
-   '("gsize" "count")
+   '("GAsyncResult*" "result")
    '("GError**" "error")
   )
 )
 
-; GRemoteActionGroup
+(define-vfunc get_fd
+  (of-object "GFileDescriptorBased")
+  (return-type "int")
+)
 
-(define-vfunc activate_action_full
- (of-object "GRemoteActionGroup")
- (return-type "void")
- (parameters
-  '("const-gchar*" "action_name")
-  '("GVariant*" "parameter")
-  '("GVariant*" "platform_data")
- )
+(define-vfunc equal
+  (of-object "GIcon")
+  (return-type "gboolean")
+  (parameters
+   '("GIcon*" "icon2")
+  )
 )
 
-(define-vfunc change_action_state_full
- (of-object "GRemoteActionGroup")
- (return-type "void")
- (parameters
-  '("const-gchar*" "action_name")
-  '("GVariant*" "value")
-  '("GVariant*" "platform_data")
- )
+(define-vfunc hash
+  (of-object "GIcon")
+  (return-type "guint")
 )
 
-; GSocketControlMessage
+(define-vfunc serialize
+  (of-object "GIcon")
+  (return-type "GVariant*")
+)
+
+(define-vfunc to_tokens
+  (of-object "GIcon")
+  (return-type "gboolean")
+  (parameters
+   '("GPtrArray*" "tokens")
+   '("gint*" "out_version")
+  )
+)
 
-(define-vfunc deserialize
- (of-object "GSocketControlMessage")
- (return-type "GSocketControlMessage*")
- (parameters
-  '("int" "level")
-  '("int" "type")
-  '("gsize" "size")
-  '("gpointer" "data")
- )
+(define-vfunc init
+  (of-object "GInitable")
+  (return-type "gboolean")
+  (parameters
+   '("GCancellable*" "cancellable")
+   '("GError**" "error")
+  )
 )
 
-(define-vfunc get_size
- (of-object "GSocketControlMessage")
- (return-type "gsize")
+(define-vfunc get_item
+  (of-object "GListModel")
+  (return-type "gpointer")
+  (parameters
+   '("guint" "position")
+  )
 )
 
-(define-vfunc get_level
- (of-object "GSocketControlMessage")
- (return-type "int")
+(define-vfunc get_item_type
+  (of-object "GListModel")
+  (return-type "GType")
 )
 
-(define-vfunc get_type
- (of-object "GSocketControlMessage")
- (return-type "int")
+(define-vfunc get_n_items
+  (of-object "GListModel")
+  (return-type "guint")
 )
 
-(define-vfunc serialize
- (of-object "GSocketControlMessage")
- (return-type "void")
- (parameters
-  '("gpointer" "data")
- )
+(define-vfunc load
+  (of-object "GLoadableIcon")
+  (return-type "GInputStream*")
+  (parameters
+   '("int" "size")
+   '("char**" "type")
+   '("GCancellable*" "cancellable")
+   '("GError**" "error")
+  )
 )
 
-; GTlsCertificate
+(define-vfunc load_async
+  (of-object "GLoadableIcon")
+  (return-type "void")
+  (parameters
+   '("int" "size")
+   '("GCancellable*" "cancellable")
+   '("GAsyncReadyCallback" "callback")
+   '("gpointer" "user_data")
+  )
+)
 
-(define-vfunc verify
-  (of-object "GTlsCertificate")
-  (return-type "GTlsCertificateFlags")
+(define-vfunc load_finish
+  (of-object "GLoadableIcon")
+  (return-type "GInputStream*")
   (parameters
-   '("GSocketConnectable*" "identity")
-   '("GTlsCertificate*" "trusted_ca")
+   '("GAsyncResult*" "res")
+   '("char**" "type")
+   '("GError**" "error")
   )
 )
 
-; GTlsConnection
+(define-vfunc can_eject
+  (of-object "GMount")
+  (return-type "gboolean")
+)
 
-(define-vfunc handshake
-  (of-object "GTlsConnection")
+(define-vfunc can_unmount
+  (of-object "GMount")
   (return-type "gboolean")
+)
+
+(define-vfunc changed
+  (of-object "GMount")
+  (return-type "void")
+)
+
+(define-vfunc eject
+  (of-object "GMount")
+  (return-type "void")
   (parameters
+   '("GMountUnmountFlags" "flags")
    '("GCancellable*" "cancellable")
+   '("GAsyncReadyCallback" "callback")
+   '("gpointer" "user_data")
+  )
+)
+
+(define-vfunc eject_finish
+  (of-object "GMount")
+  (return-type "gboolean")
+  (parameters
+   '("GAsyncResult*" "result")
    '("GError**" "error")
   )
 )
 
-(define-vfunc handshake_async
-  (of-object "GTlsConnection")
+(define-vfunc eject_with_operation
+  (of-object "GMount")
   (return-type "void")
   (parameters
-   '("int" "io_priority")
+   '("GMountUnmountFlags" "flags")
+   '("GMountOperation*" "mount_operation")
    '("GCancellable*" "cancellable")
    '("GAsyncReadyCallback" "callback")
    '("gpointer" "user_data")
   )
 )
 
-(define-vfunc handshake_finish
-  (of-object "GTlsConnection")
+(define-vfunc eject_with_operation_finish
+  (of-object "GMount")
   (return-type "gboolean")
   (parameters
    '("GAsyncResult*" "result")
@@ -1194,363 +3713,550 @@
   )
 )
 
-; GTlsDatabase
+(define-vfunc get_default_location
+  (of-object "GMount")
+  (return-type "GFile*")
+)
 
-(define-vfunc verify_chain
-  (of-object "GTlsDatabase")
-  (return-type "GTlsCertificateFlags")
+(define-vfunc get_drive
+  (of-object "GMount")
+  (return-type "GDrive*")
+)
+
+(define-vfunc get_icon
+  (of-object "GMount")
+  (return-type "GIcon*")
+)
+
+(define-vfunc get_name
+  (of-object "GMount")
+  (return-type "char*")
+)
+
+(define-vfunc get_root
+  (of-object "GMount")
+  (return-type "GFile*")
+)
+
+(define-vfunc get_sort_key
+  (of-object "GMount")
+  (return-type "const-gchar*")
+)
+
+(define-vfunc get_symbolic_icon
+  (of-object "GMount")
+  (return-type "GIcon*")
+)
+
+(define-vfunc get_uuid
+  (of-object "GMount")
+  (return-type "char*")
+)
+
+(define-vfunc get_volume
+  (of-object "GMount")
+  (return-type "GVolume*")
+)
+
+(define-vfunc guess_content_type
+  (of-object "GMount")
+  (return-type "void")
   (parameters
-   '("GTlsCertificate*" "chain")
-   '("const-gchar*" "purpose")
-   '("GSocketConnectable*" "identity")
-   '("GTlsInteraction*" "interaction")
-   '("GTlsDatabaseVerifyFlags" "flags")
+   '("gboolean" "force_rescan")
+   '("GCancellable*" "cancellable")
+   '("GAsyncReadyCallback" "callback")
+   '("gpointer" "user_data")
+  )
+)
+
+(define-vfunc guess_content_type_finish
+  (of-object "GMount")
+  (return-type "gchar**")
+  (parameters
+   '("GAsyncResult*" "result")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc guess_content_type_sync
+  (of-object "GMount")
+  (return-type "gchar**")
+  (parameters
+   '("gboolean" "force_rescan")
    '("GCancellable*" "cancellable")
    '("GError**" "error")
   )
 )
 
-(define-vfunc verify_chain_async
-  (of-object "GTlsDatabase")
+(define-vfunc pre_unmount
+  (of-object "GMount")
+  (return-type "void")
+)
+
+(define-vfunc remount
+  (of-object "GMount")
   (return-type "void")
   (parameters
-   '("GTlsCertificate*" "chain")
-   '("const-gchar*" "purpose")
-   '("GSocketConnectable*" "identity")
-   '("GTlsInteraction*" "interaction")
-   '("GTlsDatabaseVerifyFlags" "flags")
+   '("GMountMountFlags" "flags")
+   '("GMountOperation*" "mount_operation")
    '("GCancellable*" "cancellable")
    '("GAsyncReadyCallback" "callback")
    '("gpointer" "user_data")
   )
 )
 
-(define-vfunc verify_chain_finish
-  (of-object "GTlsDatabase")
-  (return-type "GTlsCertificateFlags")
+(define-vfunc remount_finish
+  (of-object "GMount")
+  (return-type "gboolean")
   (parameters
    '("GAsyncResult*" "result")
    '("GError**" "error")
   )
 )
 
-(define-vfunc create_certificate_handle
-  (of-object "GTlsDatabase")
-  (return-type "gchar*")
+(define-vfunc unmount
+  (of-object "GMount")
+  (return-type "void")
   (parameters
-   '("GTlsCertificate*" "certificate")
+   '("GMountUnmountFlags" "flags")
+   '("GCancellable*" "cancellable")
+   '("GAsyncReadyCallback" "callback")
+   '("gpointer" "user_data")
   )
 )
 
-(define-vfunc lookup_certificate_for_handle
-  (of-object "GTlsDatabase")
-  (return-type "GTlsCertificate*")
+(define-vfunc unmount_finish
+  (of-object "GMount")
+  (return-type "gboolean")
   (parameters
-   '("const-gchar*" "handle")
-   '("GTlsInteraction*" "interaction")
-   '("GTlsDatabaseLookupFlags" "flags")
-   '("GCancellable*" "cancellable")
+   '("GAsyncResult*" "result")
    '("GError**" "error")
   )
 )
 
-(define-vfunc lookup_certificate_for_handle_async
-  (of-object "GTlsDatabase")
+(define-vfunc unmount_with_operation
+  (of-object "GMount")
   (return-type "void")
   (parameters
-   '("const-gchar*" "handle")
-   '("GTlsInteraction*" "interaction")
-   '("GTlsDatabaseLookupFlags" "flags")
+   '("GMountUnmountFlags" "flags")
+   '("GMountOperation*" "mount_operation")
    '("GCancellable*" "cancellable")
    '("GAsyncReadyCallback" "callback")
    '("gpointer" "user_data")
   )
 )
 
-(define-vfunc lookup_certificate_for_handle_finish
-  (of-object "GTlsDatabase")
-  (return-type "GTlsCertificate*")
+(define-vfunc unmount_with_operation_finish
+  (of-object "GMount")
+  (return-type "gboolean")
   (parameters
    '("GAsyncResult*" "result")
    '("GError**" "error")
   )
 )
 
-(define-vfunc lookup_certificate_issuer
-  (of-object "GTlsDatabase")
-  (return-type "GTlsCertificate*")
+(define-vfunc unmounted
+  (of-object "GMount")
+  (return-type "void")
+)
+
+(define-vfunc can_reach
+  (of-object "GNetworkMonitor")
+  (return-type "gboolean")
   (parameters
-   '("GTlsCertificate*" "certificate")
-   '("GTlsInteraction*" "interaction")
-   '("GTlsDatabaseLookupFlags" "flags")
+   '("GSocketConnectable*" "connectable")
    '("GCancellable*" "cancellable")
    '("GError**" "error")
   )
 )
 
-(define-vfunc lookup_certificate_issuer_async
-  (of-object "GTlsDatabase")
+(define-vfunc can_reach_async
+  (of-object "GNetworkMonitor")
   (return-type "void")
   (parameters
-   '("GTlsCertificate*" "certificate")
-   '("GTlsInteraction*" "interaction")
-   '("GTlsDatabaseLookupFlags" "flags")
+   '("GSocketConnectable*" "connectable")
    '("GCancellable*" "cancellable")
    '("GAsyncReadyCallback" "callback")
    '("gpointer" "user_data")
   )
 )
 
-(define-vfunc lookup_certificate_issuer_finish
-  (of-object "GTlsDatabase")
-  (return-type "GTlsCertificate*")
+(define-vfunc can_reach_finish
+  (of-object "GNetworkMonitor")
+  (return-type "gboolean")
   (parameters
    '("GAsyncResult*" "result")
    '("GError**" "error")
   )
 )
 
-(define-vfunc lookup_certificates_issued_by
-  (of-object "GTlsDatabase")
-  (return-type "GList*")
+(define-vfunc network_changed
+  (of-object "GNetworkMonitor")
+  (return-type "void")
+  (parameters
+   '("gboolean" "available")
+  )
+)
+
+(define-vfunc can_poll
+  (of-object "GPollableInputStream")
+  (return-type "gboolean")
+)
+
+(define-vfunc create_source
+  (of-object "GPollableInputStream")
+  (return-type "GSource*")
   (parameters
-   '("GByteArray*" "issuer_raw_dn")
-   '("GTlsInteraction*" "interaction")
-   '("GTlsDatabaseLookupFlags" "flags")
    '("GCancellable*" "cancellable")
+  )
+)
+
+(define-vfunc is_readable
+  (of-object "GPollableInputStream")
+  (return-type "gboolean")
+)
+
+(define-vfunc read_nonblocking
+  (of-object "GPollableInputStream")
+  (return-type "gssize")
+  (parameters
+   '("void*" "buffer")
+   '("gsize" "count")
    '("GError**" "error")
   )
 )
 
-(define-vfunc lookup_certificates_issued_by_async
-  (of-object "GTlsDatabase")
+(define-vfunc can_poll
+  (of-object "GPollableOutputStream")
+  (return-type "gboolean")
+)
+
+(define-vfunc create_source
+  (of-object "GPollableOutputStream")
+  (return-type "GSource*")
+  (parameters
+   '("GCancellable*" "cancellable")
+  )
+)
+
+(define-vfunc is_writable
+  (of-object "GPollableOutputStream")
+  (return-type "gboolean")
+)
+
+(define-vfunc write_nonblocking
+  (of-object "GPollableOutputStream")
+  (return-type "gssize")
+  (parameters
+   '("const-void*" "buffer")
+   '("gsize" "count")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc connect
+  (of-object "GProxy")
+  (return-type "GIOStream*")
+  (parameters
+   '("GIOStream*" "connection")
+   '("GProxyAddress*" "proxy_address")
+   '("GCancellable*" "cancellable")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc connect_async
+  (of-object "GProxy")
   (return-type "void")
   (parameters
-   '("GByteArray*" "issuer_raw_dn")
-   '("GTlsInteraction*" "interaction")
-   '("GTlsDatabaseLookupFlags" "flags")
+   '("GIOStream*" "connection")
+   '("GProxyAddress*" "proxy_address")
    '("GCancellable*" "cancellable")
    '("GAsyncReadyCallback" "callback")
    '("gpointer" "user_data")
   )
 )
 
-(define-vfunc lookup_certificates_issued_by_finish
-  (of-object "GTlsDatabase")
-  (return-type "GList*")
+(define-vfunc connect_finish
+  (of-object "GProxy")
+  (return-type "GIOStream*")
   (parameters
    '("GAsyncResult*" "result")
    '("GError**" "error")
   )
 )
 
-; GTlsInteraction
+(define-vfunc supports_hostname
+  (of-object "GProxy")
+  (return-type "gboolean")
+)
 
-(define-vfunc ask_password
-  (of-object "GTlsInteraction")
-  (return-type "GTlsInteractionResult")
+(define-vfunc is_supported
+  (of-object "GProxyResolver")
+  (return-type "gboolean")
+)
+
+(define-vfunc lookup
+  (of-object "GProxyResolver")
+  (return-type "gchar**")
   (parameters
-   '("GTlsPassword*" "password")
+   '("const-gchar*" "uri")
    '("GCancellable*" "cancellable")
    '("GError**" "error")
   )
 )
 
-(define-vfunc ask_password_async
-  (of-object "GTlsInteraction")
+(define-vfunc lookup_async
+  (of-object "GProxyResolver")
   (return-type "void")
   (parameters
-   '("GTlsPassword*" "password")
+   '("const-gchar*" "uri")
    '("GCancellable*" "cancellable")
    '("GAsyncReadyCallback" "callback")
    '("gpointer" "user_data")
   )
 )
 
-(define-vfunc ask_password_finish
-  (of-object "GTlsInteraction")
-  (return-type "GTlsInteractionResult")
+(define-vfunc lookup_finish
+  (of-object "GProxyResolver")
+  (return-type "gchar**")
   (parameters
    '("GAsyncResult*" "result")
    '("GError**" "error")
   )
 )
 
-; GTlsPassword
-
-(define-vfunc get_value
-  (of-object "GTlsPassword")
-  (return-type "const-guchar*")
+(define-vfunc activate_action_full
+  (of-object "GRemoteActionGroup")
+  (return-type "void")
   (parameters
-   '("gsize*" "length")
+   '("const-gchar*" "action_name")
+   '("GVariant*" "parameter")
+   '("GVariant*" "platform_data")
   )
 )
 
-(define-vfunc set_value
-  (of-object "GTlsPassword")
+(define-vfunc change_action_state_full
+  (of-object "GRemoteActionGroup")
   (return-type "void")
   (parameters
-   '("guchar*" "value")
-   '("gssize" "length")
-   '("GDestroyNotify" "destroy")
+   '("const-gchar*" "action_name")
+   '("GVariant*" "value")
+   '("GVariant*" "platform_data")
   )
 )
 
-(define-vfunc get_default_warning
-  (of-object "GTlsPassword")
-  (return-type "const-gchar*")
+(define-vfunc can_seek
+  (of-object "GSeekable")
+  (return-type "gboolean")
 )
 
-; GVolume
+(define-vfunc can_truncate
+  (of-object "GSeekable")
+  (return-type "gboolean")
+)
 
-(define-vfunc get_name
- (of-object "GVolume")
- (return-type "char*")
+(define-vfunc seek
+  (of-object "GSeekable")
+  (return-type "gboolean")
+  (parameters
+   '("goffset" "offset")
+   '("GSeekType" "type")
+   '("GCancellable*" "cancellable")
+   '("GError**" "error")
+  )
 )
 
-(define-vfunc get_icon
- (of-object "GVolume")
- (return-type "GIcon*")
+(define-vfunc tell
+  (of-object "GSeekable")
+  (return-type "goffset")
 )
 
-(define-vfunc get_uuid
- (of-object "GVolume")
- (return-type "char*")
+(define-vfunc truncate_fn
+  (of-object "GSeekable")
+  (return-type "gboolean")
+  (parameters
+   '("goffset" "offset")
+   '("GCancellable*" "cancellable")
+   '("GError**" "error")
+  )
 )
 
-(define-vfunc get_drive
- (of-object "GVolume")
- (return-type "GDrive*")
+(define-vfunc enumerate
+  (of-object "GSocketConnectable")
+  (return-type "GSocketAddressEnumerator*")
 )
 
-(define-vfunc get_mount
- (of-object "GVolume")
- (return-type "GMount*")
+(define-vfunc proxy_enumerate
+  (of-object "GSocketConnectable")
+  (return-type "GSocketAddressEnumerator*")
 )
 
-(define-vfunc can_mount
- (of-object "GVolume")
- (return-type "gboolean")
+(define-vfunc to_string
+  (of-object "GSocketConnectable")
+  (return-type "gchar*")
 )
 
-(define-vfunc can_eject
- (of-object "GVolume")
- (return-type "gboolean")
+(define-vfunc get_default_database
+  (of-object "GTlsBackend")
+  (return-type "GTlsDatabase*")
 )
 
-(define-vfunc mount_fn
- (of-object "GVolume")
- (return-type "void")
- (parameters
-  '("GMountMountFlags" "flags")
-  '("GMountOperation*" "mount_operation")
-  '("GCancellable*" "cancellable")
-  '("GAsyncReadyCallback" "callback")
-  '("gpointer" "user_data")
- )
+(define-vfunc supports_dtls
+  (of-object "GTlsBackend")
+  (return-type "gboolean")
 )
 
-(define-vfunc mount_finish
- (of-object "GVolume")
- (return-type "gboolean")
- (parameters
-  '("GAsyncResult*" "result")
-  '("GError**" "error")
- )
+(define-vfunc supports_tls
+  (of-object "GTlsBackend")
+  (return-type "gboolean")
 )
 
+(define-vfunc copy_session_state
+  (of-object "GTlsClientConnection")
+  (return-type "void")
+  (parameters
+   '("GTlsClientConnection*" "source")
+  )
+)
+
+(define-vfunc can_eject
+  (of-object "GVolume")
+  (return-type "gboolean")
+)
+
+(define-vfunc can_mount
+  (of-object "GVolume")
+  (return-type "gboolean")
+)
+
+(define-vfunc changed
+  (of-object "GVolume")
+  (return-type "void")
+)
 
 (define-vfunc eject
- (of-object "GVolume")
- (return-type "void")
- (parameters
-  '("GMountUnmountFlags" "flags")
-  '("GCancellable*" "cancellable")
-  '("GAsyncReadyCallback" "callback")
-  '("gpointer" "user_data")
- )
+  (of-object "GVolume")
+  (return-type "void")
+  (parameters
+   '("GMountUnmountFlags" "flags")
+   '("GCancellable*" "cancellable")
+   '("GAsyncReadyCallback" "callback")
+   '("gpointer" "user_data")
+  )
 )
 
 (define-vfunc eject_finish
- (of-object "GVolume")
- (return-type "gboolean")
- (parameters
-  '("GAsyncResult*" "result")
-  '("GError**" "error")
- )
+  (of-object "GVolume")
+  (return-type "gboolean")
+  (parameters
+   '("GAsyncResult*" "result")
+   '("GError**" "error")
+  )
 )
 
-(define-vfunc get_identifier
- (of-object "GVolume")
- (return-type "char*")
- (parameters
-  '("const-char*" "kind")
- )
+(define-vfunc eject_with_operation
+  (of-object "GVolume")
+  (return-type "void")
+  (parameters
+   '("GMountUnmountFlags" "flags")
+   '("GMountOperation*" "mount_operation")
+   '("GCancellable*" "cancellable")
+   '("GAsyncReadyCallback" "callback")
+   '("gpointer" "user_data")
+  )
+)
+
+(define-vfunc eject_with_operation_finish
+  (of-object "GVolume")
+  (return-type "gboolean")
+  (parameters
+   '("GAsyncResult*" "result")
+   '("GError**" "error")
+  )
 )
 
 (define-vfunc enumerate_identifiers
- (of-object "GVolume")
- (return-type "char**")
+  (of-object "GVolume")
+  (return-type "char**")
 )
 
-(define-vfunc should_automount
- (of-object "GVolume")
- (return-type "gboolean")
+(define-vfunc get_activation_root
+  (of-object "GVolume")
+  (return-type "GFile*")
 )
 
+(define-vfunc get_drive
+  (of-object "GVolume")
+  (return-type "GDrive*")
+)
 
-; GVolumeMonitor
+(define-vfunc get_icon
+  (of-object "GVolume")
+  (return-type "GIcon*")
+)
 
-; This doesn't even take a GVolumeMonitor.
-; Maybe it is not a real vfunc. murrayc.
-(define-vfunc is_supported
- (of-object "GVolumeMonitor")
- (return-type "gboolean")
+(define-vfunc get_identifier
+  (of-object "GVolume")
+  (return-type "char*")
+  (parameters
+   '("const-char*" "kind")
+  )
 )
 
-(define-vfunc get_connected_drives
- (of-object "GVolumeMonitor")
- (return-type "GList*")
+(define-vfunc get_mount
+  (of-object "GVolume")
+  (return-type "GMount*")
 )
 
-(define-vfunc get_connected_drives
- (of-object "GVolumeMonitor")
- (return-type "GList*")
+(define-vfunc get_name
+  (of-object "GVolume")
+  (return-type "char*")
 )
 
-(define-vfunc get_volumes
- (of-object "GVolumeMonitor")
- (return-type "GList*")
+(define-vfunc get_sort_key
+  (of-object "GVolume")
+  (return-type "const-gchar*")
 )
 
-(define-vfunc get_mounts
- (of-object "GVolumeMonitor")
- (return-type "GList*")
+(define-vfunc get_symbolic_icon
+  (of-object "GVolume")
+  (return-type "GIcon*")
 )
 
-(define-vfunc get_volume_for_uuid
- (of-object "GVolumeMonitor")
- (return-type "GVolume*")
- (parameters
-  '("const-char*" "uuid")
- )
+(define-vfunc get_uuid
+  (of-object "GVolume")
+  (return-type "char*")
 )
 
-(define-vfunc get_mount_for_uuid
- (of-object "GVolumeMonitor")
- (return-type "GMount*")
- (parameters
-  '("const-char*" "uuid")
- )
-)
-
-; This doesn't take a GVolumeMonitor.
-; Maybe it is not a real vfunc. murrayc
-(define-vfunc adopt_orphan_mount
- (of-object "GVolumeMonitor")
- (return-type "GVolume*")
- (parameters
-  '("GMount*" "mount")
- )
+(define-vfunc mount_finish
+  (of-object "GVolume")
+  (return-type "gboolean")
+  (parameters
+   '("GAsyncResult*" "result")
+   '("GError**" "error")
+  )
+)
+
+(define-vfunc mount_fn
+  (of-object "GVolume")
+  (return-type "void")
+  (parameters
+   '("GMountMountFlags" "flags")
+   '("GMountOperation*" "mount_operation")
+   '("GCancellable*" "cancellable")
+   '("GAsyncReadyCallback" "callback")
+   '("gpointer" "user_data")
+  )
+)
+
+(define-vfunc removed
+  (of-object "GVolume")
+  (return-type "void")
+)
+
+(define-vfunc should_automount
+  (of-object "GVolume")
+  (return-type "gboolean")
 )
 
diff --git a/gio/src/gio_vfuncs.defs.patch b/gio/src/gio_vfuncs.defs.patch
new file mode 100644
index 0000000..c853884
--- /dev/null
+++ b/gio/src/gio_vfuncs.defs.patch
@@ -0,0 +1,30 @@
+--- gio_vfuncs.defs
++++ gio_vfuncs.defs
+@@ -791,7 +791,7 @@
+   (return-type "void")
+   (parameters
+    '("const-char*" "message")
++   '("const-gchar**" "choices")
+-   '("const-char*" "choices")
+   )
+ )
+
+@@ -2154,7 +2154,7 @@
+   (of-object "GConverter")
+   (return-type "GConverterResult")
+   (parameters
++   '("const-void*" "inbuf")
+-   '("void*" "inbuf")
+    '("gsize" "inbuf_size")
+    '("void*" "outbuf")
+    '("gsize" "outbuf_size")
+
+@@ -3948,7 +3948,7 @@
+   (of-object "GPollableOutputStream")
+   (return-type "gssize")
+   (parameters
++   '("const-void*" "buffer")
+-   '("void*" "buffer")
+    '("gsize" "count")
+    '("GError**" "error")
+   )
diff --git a/gio/src/settings.hg b/gio/src/settings.hg
index 49c1905..dbdbf20 100644
--- a/gio/src/settings.hg
+++ b/gio/src/settings.hg
@@ -215,7 +215,7 @@ _DEPRECATE_IFDEF_END
 #m4 _CONVERSION(`const char*',`const Glib::ustring&',__GCHARP_TO_USTRING)
   _WRAP_SIGNAL(void changed(const Glib::ustring& key), "changed", detail_name key, two_signal_methods)
 
-  _WRAP_SIGNAL(bool writable_change_event(guint key), "writable-change-event")
+  _WRAP_SIGNAL(bool writable_change_event(GQuark key), "writable-change-event")
   _WRAP_SIGNAL(void writable_changed(const Glib::ustring& key), writable_changed)
 };
 
diff --git a/glib/src/filelist.am b/glib/src/filelist.am
index 6b52c61..bb515e6 100644
--- a/glib/src/filelist.am
+++ b/glib/src/filelist.am
@@ -6,9 +6,7 @@ glibmm_files_defs =             \
        glib_functions.defs     \
        glib_extra_objects.defs \
        glib_signals.defs       \
-       gmodule_enums.defs      \
        gmodule_functions.defs  \
-       gobject_enums.defs      \
        gobject_functions.defs  \
        glib_docs.xml           \
        glib_docs_override.xml
diff --git a/glib/src/glib.defs b/glib/src/glib.defs
index dd679a3..655bc71 100644
--- a/glib/src/glib.defs
+++ b/glib/src/glib.defs
@@ -2,8 +2,6 @@
 (include glib_enums.defs)
 (include glib_extra_objects.defs)
 (include glib_signals.defs)
-(include gobject_enums.defs)
 (include gobject_functions.defs)
 (include gmodule_functions.defs)
-(include gmodule_enums.defs)
 
diff --git a/glib/src/glib_enums.defs b/glib/src/glib_enums.defs
index d9979c3..b6a8a0a 100644
--- a/glib/src/glib_enums.defs
+++ b/glib/src/glib_enums.defs
@@ -1,63 +1,38 @@
-;; 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-flags-extended AsciiType
+  (in-module "GLib")
+  (c-name "GAsciiType")
+  (values
+    '("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")
+  )
+)
 
 (define-enum-extended BookmarkFileError
-  (in-module "G")
+  (in-module "GLib")
   (c-name "GBookmarkFileError")
   (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")
+    '("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")
+    '("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 gbsearcharray.h
-
-;; Original typedef:
-;; typedef enum
-;; {
-;;   G_BSEARCH_ARRAY_ALIGN_POWER2  = 1 << 0, /* align memory to power2 sizes */
-;;   G_BSEARCH_ARRAY_AUTO_SHRINK  = 1 << 1   /* shrink array upon removal */
-;; } GBSearchArrayFlags;
-
-(define-flags-extended BSearchArrayFlags
-  (in-module "G")
-  (c-name "GBSearchArrayFlags")
-  (values
-    '("align-power2" "G_BSEARCH_ARRAY_ALIGN_POWER2" "1 << 0")
-    '("auto-shrink" "G_BSEARCH_ARRAY_AUTO_SHRINK" "1 << 1")
+    '("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")
+  (in-module "GLib")
   (c-name "GChecksumType")
   (values
     '("md5" "G_CHECKSUM_MD5" "0")
@@ -67,46 +42,22 @@
   )
 )
 
-;; 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")
+  (in-module "GLib")
   (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")
+  (in-module "GLib")
   (c-name "GDateDMY")
   (values
     '("day" "G_DATE_DAY" "0")
@@ -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")
+  (in-module "GLib")
   (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,40 +86,38 @@
   )
 )
 
-;; From gfileutils.h
+(define-enum-extended DateWeekday
+  (in-module "GLib")
+  (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 "GLib")
+  (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")
+  (in-module "GLib")
   (c-name "GFileError")
   (values
     '("exist" "G_FILE_ERROR_EXIST" "0")
@@ -245,88 +148,40 @@
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   G_FILE_TEST_IS_REGULAR    = 1 << 0,
-;;   G_FILE_TEST_IS_SYMLINK    = 1 << 1,
-;;   G_FILE_TEST_IS_DIR        = 1 << 2,
-;;   G_FILE_TEST_IS_EXECUTABLE = 1 << 3,
-;;   G_FILE_TEST_EXISTS        = 1 << 4
-;; } GFileTest;
-
 (define-flags-extended FileTest
-  (in-module "G")
+  (in-module "GLib")
   (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
-  (in-module "G")
-  (c-name "GHookFlagMask")
+(define-flags-extended FormatSizeFlags
+  (in-module "GLib")
+  (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
-  (in-module "G")
-  (c-name "GIOError")
+(define-flags-extended HookFlagMask
+  (in-module "GLib")
+  (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")
+  (in-module "GLib")
   (c-name "GIOChannelError")
   (values
     '("fbig" "G_IO_CHANNEL_ERROR_FBIG" "0")
@@ -341,372 +196,170 @@
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   G_IO_STATUS_ERROR,
-;;   G_IO_STATUS_NORMAL,
-;;   G_IO_STATUS_EOF,
-;;   G_IO_STATUS_AGAIN
-;; } GIOStatus;
-
-(define-enum-extended IOStatus
-  (in-module "G")
-  (c-name "GIOStatus")
+(define-flags-extended IOCondition
+  (in-module "GLib")
+  (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
-  (in-module "G")
-  (c-name "GSeekType")
+(define-enum-extended IOError
+  (in-module "GLib")
+  (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")
+  (in-module "GLib")
   (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 "GLib")
+  (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")
+  (in-module "GLib")
   (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")
+  (in-module "GLib")
   (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
-  (in-module "G")
-  (c-name "GIOCondition")
-  (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")
-  )
-)
-
-;; From gmarkup.h
-
-;; Original typedef:
-;; typedef enum
-;; {
-;;   G_MARKUP_ERROR_BAD_UTF8,
-;;   G_MARKUP_ERROR_EMPTY,
-;;   G_MARKUP_ERROR_PARSE,
-;;   /* The following are primarily intended for specific GMarkupParser
-;;    * implementations to set.
-;;    */
-;;   G_MARKUP_ERROR_UNKNOWN_ELEMENT,
-;;   G_MARKUP_ERROR_UNKNOWN_ATTRIBUTE,
-;;   G_MARKUP_ERROR_INVALID_CONTENT,
-;;   G_MARKUP_ERROR_MISSING_ATTRIBUTE
-;; } GMarkupError;
-
-(define-enum-extended MarkupError
-  (in-module "G")
-  (c-name "GMarkupError")
+(define-flags-extended LogLevelFlags
+  (in-module "GLib")
+  (c-name "GLogLevelFlags")
   (values
-    '("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")
+    '("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")
   )
 )
 
-;; 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")
+(define-enum-extended LogWriterOutput
+  (in-module "GLib")
+  (c-name "GLogWriterOutput")
   (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")
+    '("handled" "G_LOG_WRITER_HANDLED" "1")
+    '("unhandled" "G_LOG_WRITER_UNHANDLED" "0")
   )
 )
 
-;; 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")
+  (in-module "GLib")
   (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")
+    '("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")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   G_LOG_WRITER_HANDLED = 1,
-;;   G_LOG_WRITER_UNHANDLED = 0,
-;; } GLogWriterOutput;
-
-(define-enum-extended LogWriterOutput
-  (in-module "G")
-  (c-name "GLogWriterOutput")
+(define-enum-extended MarkupError
+  (in-module "GLib")
+  (c-name "GMarkupError")
   (values
-    '("handled" "G_LOG_WRITER_HANDLED" "1")
-    '("unhandled" "G_LOG_WRITER_UNHANDLED" "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")
   )
 )
 
-;; 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")
+(define-flags-extended MarkupParseFlags
+  (in-module "GLib")
+  (c-name "GMarkupParseFlags")
   (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")
+    '("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")
   )
 )
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   G_IN_ORDER,
-;;   G_PRE_ORDER,
-;;   G_POST_ORDER,
-;;   G_LEVEL_ORDER
-;; } GTraverseType;
-
-(define-enum-extended TraverseType
-  (in-module "G")
-  (c-name "GTraverseType")
+(define-enum-extended NormalizeMode
+  (in-module "GLib")
+  (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
-  (in-module "G")
-  (c-name "GOptionFlags")
+(define-enum-extended OnceStatus
+  (in-module "GLib")
+  (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")
+  (in-module "GLib")
   (c-name "GOptionArg")
   (values
     '("none" "G_OPTION_ARG_NONE" "0")
@@ -714,99 +367,65 @@
     '("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")
+  (in-module "GLib")
   (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
+(define-flags-extended OptionFlags
+  (in-module "GLib")
+  (c-name "GOptionFlags")
+  (values
+    '("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_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-flags-extended RegexCompileFlags
+  (in-module "GLib")
+  (c-name "GRegexCompileFlags")
+  (values
+    '("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")
+  )
+)
 
 (define-enum-extended RegexError
-  (in-module "G")
+  (in-module "GLib")
   (c-name "GRegexError")
   (values
     '("compile" "G_REGEX_ERROR_COMPILE" "0")
@@ -814,330 +433,118 @@
     '("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")
-  )
-)
-
-;; 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")
+    '("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")
   )
 )
 
-;; 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
-  (in-module "G")
+  (in-module "GLib")
   (c-name "GRegexMatchFlags")
   (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")
+    '("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")
   )
 )
 
-;; From gscanner.h
-
-;; Original typedef:
-;; typedef enum
-;; {
-;;   G_ERR_UNKNOWN,
-;;   G_ERR_UNEXP_EOF,
-;;   G_ERR_UNEXP_EOF_IN_STRING,
-;;   G_ERR_UNEXP_EOF_IN_COMMENT,
-;;   G_ERR_NON_DIGIT_IN_CONST,
-;;   G_ERR_DIGIT_RADIX,
-;;   G_ERR_FLOAT_RADIX,
-;;   G_ERR_FLOAT_MALFORMED
-;; } GErrorType;
-
-(define-enum-extended ErrorType
-  (in-module "G")
-  (c-name "GErrorType")
-  (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")
-  )
-)
-
-;; 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
-  (in-module "G")
-  (c-name "GTokenType")
+(define-enum-extended SeekType
+  (in-module "GLib")
+  (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")
+  (in-module "GLib")
   (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")
+  (in-module "GLib")
   (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")
+  (in-module "GLib")
   (c-name "GSpawnError")
   (values
     '("fork" "G_SPAWN_ERROR_FORK" "0")
@@ -1145,7 +552,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")
@@ -1164,208 +571,81 @@
   )
 )
 
-;; 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")
+  (in-module "GLib")
   (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")
+    '("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")
   )
 )
 
-;; 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")
-  )
-)
-
-;; 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
-  (in-module "G")
-  (c-name "GTestSubprocessFlags")
+(define-enum-extended TestFileType
+  (in-module "GLib")
+  (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")
+  (in-module "GLib")
   (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
-  (in-module "G")
-  (c-name "GTestFileType")
+(define-flags-extended TestSubprocessFlags
+  (in-module "GLib")
+  (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
-  (in-module "G")
-  (c-name "GThreadError")
+(define-flags-extended TestTrapFlags
+  (in-module "GLib")
+  (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
-  (in-module "G")
-  (c-name "GOnceStatus")
+(define-enum-extended ThreadError
+  (in-module "GLib")
+  (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")
+  (in-module "GLib")
   (c-name "GTimeType")
   (values
     '("standard" "G_TIME_TYPE_STANDARD" "0")
@@ -1374,333 +654,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 "GLib")
+  (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
-  (in-module "G")
-  (c-name "GUnicodeType")
+(define-flags-extended TraverseFlags
+  (in-module "GLib")
+  (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 "GLib")
+  (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")
+  (in-module "GLib")
   (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 */
-;; 
-;;   /* Unicode 8.0 additions */
-;;   G_UNICODE_SCRIPT_AHOM,                   /* Ahom */
-;;   G_UNICODE_SCRIPT_ANATOLIAN_HIEROGLYPHS,  /* Hluw */
-;;   G_UNICODE_SCRIPT_HATRAN,                 /* Hatr */
-;;   G_UNICODE_SCRIPT_MULTANI,                /* Mult */
-;;   G_UNICODE_SCRIPT_OLD_HUNGARIAN,          /* Hung */
-;;   G_UNICODE_SCRIPT_SIGNWRITING             /* Sgnw */
-;; } GUnicodeScript;
-
 (define-enum-extended UnicodeScript
-  (in-module "G")
+  (in-module "GLib")
   (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")
@@ -1731,7 +790,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")
@@ -1741,7 +800,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")
@@ -1752,295 +811,302 @@
     '("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")
     '("ahom" "G_UNICODE_SCRIPT_AHOM" "126")
-    '("anatolian-hieroglyphs" "G_UNICODE_SCRIPT_ANATOLIAN_HIEROGLYPHS" "127")
+    '("anatolian_hieroglyphs" "G_UNICODE_SCRIPT_ANATOLIAN_HIEROGLYPHS" "127")
     '("hatran" "G_UNICODE_SCRIPT_HATRAN" "128")
     '("multani" "G_UNICODE_SCRIPT_MULTANI" "129")
-    '("old-hungarian" "G_UNICODE_SCRIPT_OLD_HUNGARIAN" "130")
+    '("old_hungarian" "G_UNICODE_SCRIPT_OLD_HUNGARIAN" "130")
     '("signwriting" "G_UNICODE_SCRIPT_SIGNWRITING" "131")
   )
 )
 
-;; Original typedef:
-;; typedef enum {
-;;   G_NORMALIZE_DEFAULT,
-;;   G_NORMALIZE_NFD = G_NORMALIZE_DEFAULT,
-;;   G_NORMALIZE_DEFAULT_COMPOSE,
-;;   G_NORMALIZE_NFC = G_NORMALIZE_DEFAULT_COMPOSE,
-;;   G_NORMALIZE_ALL,
-;;   G_NORMALIZE_NFKD = G_NORMALIZE_ALL,
-;;   G_NORMALIZE_ALL_COMPOSE,
-;;   G_NORMALIZE_NFKC = G_NORMALIZE_ALL_COMPOSE
-;; } GNormalizeMode;
-
-(define-enum-extended NormalizeMode
-  (in-module "G")
-  (c-name "GNormalizeMode")
+(define-enum-extended UnicodeType
+  (in-module "GLib")
+  (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")
+  (in-module "GLib")
   (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")
+    '("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")
+(define-enum-extended VariantClass
+  (in-module "GLib")
+  (c-name "GVariantClass")
   (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")
+    '("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")
   )
 )
 
-;; From gvariant.h
+(define-enum-extended VariantParseError
+  (in-module "GLib")
+  (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")
+  )
+)
 
-;; 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-flags-extended ModuleFlags
+  (in-module "GLib")
+  (c-name "GModuleFlags")
+  (values
+    '("lazy" "G_MODULE_BIND_LAZY" "1")
+    '("local" "G_MODULE_BIND_LOCAL" "2")
+    '("mask" "G_MODULE_BIND_MASK" "3")
+  )
+)
 
-(define-enum-extended VariantClass
-  (in-module "G")
-  (c-name "GVariantClass")
+(define-flags-extended BindingFlags
+  (in-module "GLib")
+  (c-name "GBindingFlags")
   (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" "'{'")
+    '("default" "G_BINDING_DEFAULT" "0")
+    '("bidirectional" "G_BINDING_BIDIRECTIONAL" "1")
+    '("sync_create" "G_BINDING_SYNC_CREATE" "2")
+    '("invert_boolean" "G_BINDING_INVERT_BOOLEAN" "4")
   )
 )
 
-;; 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-flags-extended ConnectFlags
+  (in-module "GLib")
+  (c-name "GConnectFlags")
+  (values
+    '("after" "G_CONNECT_AFTER" "1")
+    '("swapped" "G_CONNECT_SWAPPED" "2")
+  )
+)
 
-(define-enum-extended VariantParseError
-  (in-module "G")
-  (c-name "GVariantParseError")
+(define-flags-extended ParamFlags
+  (in-module "GLib")
+  (c-name "GParamFlags")
   (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")
+    '("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")
   )
 )
 
-;; From gwin32.h
+(define-flags-extended SignalFlags
+  (in-module "GLib")
+  (c-name "GSignalFlags")
+  (values
+    '("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_WIN32_OS_ANY,
-;;   G_WIN32_OS_WORKSTATION,
-;;   G_WIN32_OS_SERVER,
-;; } GWin32OSType;
+(define-flags-extended SignalMatchType
+  (in-module "GLib")
+  (c-name "GSignalMatchType")
+  (values
+    '("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")
+  )
+)
 
-(define-enum-extended Win32OSType
-  (in-module "G")
-  (c-name "GWin32OSType")
+(define-flags-extended TypeDebugFlags
+  (in-module "GLib")
+  (c-name "GTypeDebugFlags")
   (values
-    '("any" "G_WIN32_OS_ANY" "0")
-    '("workstation" "G_WIN32_OS_WORKSTATION" "1")
-    '("server" "G_WIN32_OS_SERVER" "2")
+    '("none" "G_TYPE_DEBUG_NONE" "0")
+    '("objects" "G_TYPE_DEBUG_OBJECTS" "1")
+    '("signals" "G_TYPE_DEBUG_SIGNALS" "2")
+    '("instance_count" "G_TYPE_DEBUG_INSTANCE_COUNT" "4")
+    '("mask" "G_TYPE_DEBUG_MASK" "7")
   )
 )
 
-;; From gthread.h
+(define-flags-extended TypeFlags
+  (in-module "GLib")
+  (c-name "GTypeFlags")
+  (values
+    '("abstract" "G_TYPE_FLAG_ABSTRACT" "16")
+    '("value_abstract" "G_TYPE_FLAG_VALUE_ABSTRACT" "32")
+  )
+)
 
-;; Original typedef:
-;; typedef enum
-;; {
-;;   G_THREAD_PRIORITY_LOW,
-;;   G_THREAD_PRIORITY_NORMAL,
-;;   G_THREAD_PRIORITY_HIGH,
-;;   G_THREAD_PRIORITY_URGENT
-;; } GThreadPriority;
+(define-flags-extended TypeFundamentalFlags
+  (in-module "GLib")
+  (c-name "GTypeFundamentalFlags")
+  (values
+    '("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")
+  )
+)
 
 (define-enum-extended ThreadPriority
   (in-module "G")
diff --git a/glib/src/glib_enums.defs.patch b/glib/src/glib_enums.defs.patch
index 022f3b1..94d6b64 100644
--- a/glib/src/glib_enums.defs.patch
+++ b/glib/src/glib_enums.defs.patch
@@ -1,37 +1,17 @@
---- ./../../glib/src/glib_enums.defs.orig      2015-07-24 16:56:29.570857821 +0200
-+++ ./../../glib/src/glib_enums.defs   2015-07-24 16:56:29.706864274 +0200
-@@ -464,20 +464,28 @@
- ;;   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
-   (in-module "G")
-   (c-name "GIOCondition")
-   (values
--    '("in" "G_IO_IN" "GLIB_SYSDEF_POLLIN")
--    '("out" "G_IO_OUT" "GLIB_SYSDEF_POLLOUT")
--    '("pri" "G_IO_PRI" "GLIB_SYSDEF_POLLPRI")
--    '("err" "G_IO_ERR" "GLIB_SYSDEF_POLLERR")
--    '("hup" "G_IO_HUP" "GLIB_SYSDEF_POLLHUP")
--    '("nval" "G_IO_NVAL" "GLIB_SYSDEF_POLLNVAL")
-+    '("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")
+--- glib_enums.defs
++++ glib_enums.defs
+@@ -1108,3 +1108,14 @@
    )
  )
  
- ;; From gmarkup.h
- 
++(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")
++  )
++)
++
diff --git a/glib/src/glib_signals.defs b/glib/src/glib_signals.defs
index d65d39e..f08ffa6 100644
--- a/glib/src/glib_signals.defs
+++ b/glib/src/glib_signals.defs
@@ -1,18 +1,23 @@
-;; From GBinding
+(define-signal notify
+  (of-object "GObject")
+  (return-type "void")
+  (when "first")
+  (parameters
+   '("GParamSpec*" "pspec")
+  )
+)
 
-(define-property source
+(define-property flags
   (of-object "GBinding")
-  (prop-type "GParamObject")
-  (docs "The source of the binding")
+  (docs "Flags to be used to control the #GBinding")
   (readable #t)
   (writable #t)
   (construct-only #t)
 )
 
-(define-property target
+(define-property source
   (of-object "GBinding")
-  (prop-type "GParamObject")
-  (docs "The target of the binding")
+  (docs "The #GObject that should be used as the source of the binding")
   (readable #t)
   (writable #t)
   (construct-only #t)
@@ -20,59 +25,25 @@
 
 (define-property source-property
   (of-object "GBinding")
-  (prop-type "GParamString")
-  (docs "The property on the source to bind")
+  (docs "The name of the property of #GBinding:source that should be used as the source of the binding")
   (readable #t)
   (writable #t)
   (construct-only #t)
 )
 
-(define-property target-property
+(define-property target
   (of-object "GBinding")
-  (prop-type "GParamString")
-  (docs "The property on the target to bind")
+  (docs "The #GObject that should be used as the target of the binding")
   (readable #t)
   (writable #t)
   (construct-only #t)
 )
 
-(define-property flags
+(define-property target-property
   (of-object "GBinding")
-  (prop-type "GParamFlags")
-  (docs "The binding flags")
+  (docs "The name of the property of #GBinding:target that should be used as the target of the binding")
   (readable #t)
   (writable #t)
   (construct-only #t)
 )
 
-;; GBytes is neither a GObject nor a GInterface. Not checked for signals and properties.
-
-;; GChecksum is neither a GObject nor a GInterface. Not checked for signals and properties.
-
-;; GDate is neither a GObject nor a GInterface. Not checked for signals and properties.
-
-;; GDateTime is neither a GObject nor a GInterface. Not checked for signals and properties.
-
-;; GIOChannel is neither a GObject nor a GInterface. Not checked for signals and properties.
-
-;; GKeyFile is neither a GObject nor a GInterface. Not checked for signals and properties.
-
-;; GMainContext is neither a GObject nor a GInterface. Not checked for signals and properties.
-
-;; GMainLoop is neither a GObject nor a GInterface. Not checked for signals and properties.
-
-;; GMatchInfo is neither a GObject nor a GInterface. Not checked for signals and properties.
-
-;; GRegex is neither a GObject nor a GInterface. Not checked for signals and properties.
-
-;; GSource is neither a GObject nor a GInterface. Not checked for signals and properties.
-
-;; GThread is neither a GObject nor a GInterface. Not checked for signals and properties.
-
-;; GVariant is neither a GObject nor a GInterface. Not checked for signals and properties.
-
-;; GVariantBuilder is neither a GObject nor a GInterface. Not checked for signals and properties.
-
-;; GVariantDict is neither a GObject nor a GInterface. Not checked for signals and properties.
-
-
diff --git a/glib/src/glib_vfuncs.defs b/glib/src/glib_vfuncs.defs
new file mode 100644
index 0000000..e675a9b
--- /dev/null
+++ b/glib/src/glib_vfuncs.defs
@@ -0,0 +1,92 @@
+(define-vfunc constructed
+  (of-object "GObject")
+  (return-type "void")
+)
+
+(define-vfunc dispatch_properties_changed
+  (of-object "GObject")
+  (return-type "void")
+  (parameters
+   '("guint" "n_pspecs")
+   '("GParamSpec**" "pspecs")
+  )
+)
+
+(define-vfunc dispose
+  (of-object "GObject")
+  (return-type "void")
+)
+
+(define-vfunc finalize
+  (of-object "GObject")
+  (return-type "void")
+)
+
+(define-vfunc get_property
+  (of-object "GObject")
+  (return-type "void")
+  (parameters
+   '("guint" "property_id")
+   '("GValue*" "value")
+   '("GParamSpec*" "pspec")
+  )
+)
+
+(define-vfunc notify
+  (of-object "GObject")
+  (return-type "void")
+  (parameters
+   '("GParamSpec*" "pspec")
+  )
+)
+
+(define-vfunc set_property
+  (of-object "GObject")
+  (return-type "void")
+  (parameters
+   '("guint" "property_id")
+   '("const-GValue*" "value")
+   '("GParamSpec*" "pspec")
+  )
+)
+
+(define-vfunc finalize
+  (of-object "GParamSpec")
+  (return-type "void")
+)
+
+(define-vfunc value_set_default
+  (of-object "GParamSpec")
+  (return-type "void")
+  (parameters
+   '("GValue*" "value")
+  )
+)
+
+(define-vfunc value_validate
+  (of-object "GParamSpec")
+  (return-type "gboolean")
+  (parameters
+   '("GValue*" "value")
+  )
+)
+
+(define-vfunc values_cmp
+  (of-object "GParamSpec")
+  (return-type "gint")
+  (parameters
+   '("const-GValue*" "value1")
+   '("const-GValue*" "value2")
+  )
+)
+
+(define-vfunc load
+  (of-object "GTypeModule")
+  (return-type "gboolean")
+)
+
+(define-vfunc unload
+  (of-object "GTypeModule")
+  (return-type "void")
+)
+
diff --git a/tools/gen_scripts/glibmm_generate_defs.sh b/tools/gen_scripts/glibmm_generate_defs.sh
new file mode 100755
index 0000000..68d5e31
--- /dev/null
+++ b/tools/gen_scripts/glibmm_generate_defs.sh
@@ -0,0 +1,59 @@
+#!/bin/sh
+
+if [ -z "$GLIBMM_DIR" ]; then
+  echo -e "GLIBMM_DIR must contain the path to the glibmm repository."
+  exit 1;
+fi
+
+function patch_directory {
+    PATCH_OPTIONS="--backup --version-control=simple --suffix=.orig"
+    for patch_file in $1/*.patch;
+    do
+       orig_file=$(echo $patch_file | sed s/.patch$//)
+       patch $PATCH_OPTIONS $orig_file $patch_file
+    done
+}
+
+MMGIRGEN_PATH=mmgirgenerator
+
+############## GLib ###############
+# GLib enums
+$MMGIRGEN_PATH GLib-2.0 GModule-2.0 GObject-2.0 \
+    --namespace=GLib \
+    --namespace-mapping=GModule:GLib,GObject:GLib \
+    --print-enum > $GLIBMM_DIR/glib/src/glib_enums.defs
+
+#GLib signals & properties
+$MMGIRGEN_PATH GLib-2.0 GModule-2.0 GObject-2.0 \
+    --namespace=GLib \
+    --namespace-mapping=GModule:GLib,GObject:GLib \
+    --print-signal\
+    --print-property > $GLIBMM_DIR/glib/src/glib_signals.defs
+
+#GLib virtual methods
+$MMGIRGEN_PATH GLib-2.0 GModule-2.0 GObject-2.0 \
+    --namespace=GLib \
+    --namespace-mapping=GModule:GLib,GObject:GLib \
+    --print-vfunc > $GLIBMM_DIR/glib/src/glib_vfuncs.defs
+
+patch_directory $GLIBMM_DIR/glib/src
+
+
+############## Gio ###############
+# Gio enums
+$MMGIRGEN_PATH Gio-2.0 \
+    --namespace=Gio \
+    --print-enum > $GLIBMM_DIR/gio/src/gio_enums.defs
+
+# Gio signals & properties
+$MMGIRGEN_PATH Gio-2.0 \
+    --namespace=Gio \
+    --print-signal \
+    --print-property > $GLIBMM_DIR/gio/src/gio_signals.defs
+
+# Gio virtual methods
+$MMGIRGEN_PATH Gio-2.0 \
+    --namespace=Gio \
+    --print-vfunc > $GLIBMM_DIR/gio/src/gio_vfuncs.defs
+
+patch_directory $GLIBMM_DIR/gio/src


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