Regenerated .defs files.

* glib/src/glib_functions.defs:
* glib/src/gobject_functions.defs:
* glib/src/gmodule_functions.defs:
* gio/src/gio_functions.defs: Regenerated with h2defs.py, though see
  bug #660225 .
  * glib/src/datetime.hg: Added an m4 conversion that is now necessary.

6 files changed, 339 insertions, 1671 deletions

diff --git a/ChangeLog b/ChangeLog
index 1a6bdad3..a4ebf3ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2011-09-27  Murray Cumming  <murrayc@murrayc.com>
+
+	Regenerated .defs files.
+
+	* glib/src/glib_functions.defs:
+	* glib/src/gobject_functions.defs:
+	* glib/src/gmodule_functions.defs:
+	* gio/src/gio_functions.defs: Regenerated with h2defs.py, though see 
+  bug #660225 .
+  * glib/src/datetime.hg: Added an m4 conversion that is now necessary.
+
 2011-09-26  Murray Cumming  <murrayc@murrayc.com>
 
 	Remove Application and friends, because they are still not ready.
diff --git a/gio/src/gio_methods.defs b/gio/src/gio_methods.defs
index ec93d971..d4f61c1e 100644
--- a/gio/src/gio_methods.defs
+++ b/gio/src/gio_methods.defs
@@ -52,41 +52,6 @@
   (gtype-id "G_TYPE_CONVERTER")
 )
 
-(define-object Auth
-  (in-module "GDBus")
-  (parent "GObject")
-  (c-name "GDBusAuth")
-  (gtype-id "G_TYPE_D_BUS_AUTH")
-)
-
-(define-object AuthMechanism
-  (in-module "GDBus")
-  (parent "GObject")
-  (c-name "GDBusAuthMechanism")
-  (gtype-id "G_TYPE_D_BUS_AUTH_MECHANISM")
-)
-
-(define-object AuthMechanismAnon
-  (in-module "GDBus")
-  (parent "GDBusAuthMechanism")
-  (c-name "GDBusAuthMechanismAnon")
-  (gtype-id "G_TYPE_D_BUS_AUTH_MECHANISM_ANON")
-)
-
-(define-object AuthMechanismExternal
-  (in-module "GDBus")
-  (parent "GDBusAuthMechanism")
-  (c-name "GDBusAuthMechanismExternal")
-  (gtype-id "G_TYPE_D_BUS_AUTH_MECHANISM_EXTERNAL")
-)
-
-(define-object AuthMechanismSha1
-  (in-module "GDBus")
-  (parent "GDBusAuthMechanism")
-  (c-name "GDBusAuthMechanismSha1")
-  (gtype-id "G_TYPE_D_BUS_AUTH_MECHANISM_SHA1")
-)
-
 (define-object Interface
   (in-module "GDBus")
   (c-name "GDBusInterface")
@@ -147,12 +112,6 @@
   (gtype-id "G_TYPE_D_BUS_PROXY")
 )
 
-(define-object AppInfoLookup
-  (in-module "GDesktop")
-  (c-name "GDesktopAppInfoLookup")
-  (gtype-id "G_TYPE_DESKTOP_APP_INFO_LOOKUP")
-)
-
 (define-object e
   (in-module "GDriv")
   (c-name "GDrive")
@@ -172,12 +131,6 @@
   (gtype-id "G_TYPE_FILE")
 )
 
-(define-object DescriptorBased
-  (in-module "GFile")
-  (c-name "GFileDescriptorBased")
-  (gtype-id "G_TYPE_FILE_DESCRIPTOR_BASED")
-)
-
 (define-object Enumerator
   (in-module "GFile")
   (parent "GObject")
@@ -273,34 +226,6 @@
   (gtype-id "G_TYPE_LOADABLE_ICON")
 )
 
-(define-object DirectoryMonitor
-  (in-module "GLocal")
-  (parent "GFileMonitor")
-  (c-name "GLocalDirectoryMonitor")
-  (gtype-id "G_TYPE_LOCAL_DIRECTORY_MONITOR")
-)
-
-(define-object FileIOStream
-  (in-module "GLocal")
-  (parent "GFileIOStream")
-  (c-name "GLocalFileIOStream")
-  (gtype-id "G_TYPE_LOCAL_FILE_IO_STREAM")
-)
-
-(define-object FileInputStream
-  (in-module "GLocal")
-  (parent "GFileInputStream")
-  (c-name "GLocalFileInputStream")
-  (gtype-id "G_TYPE_LOCAL_FILE_INPUT_STREAM")
-)
-
-(define-object FileMonitor
-  (in-module "GLocal")
-  (parent "GFileMonitor")
-  (c-name "GLocalFileMonitor")
-  (gtype-id "G_TYPE_LOCAL_FILE_MONITOR")
-)
-
 (define-object InputStream
   (in-module "GMemory")
   (parent "GInputStream")
@@ -384,13 +309,6 @@
   (gtype-id "G_TYPE_FILE_OUTPUT_STREAM")
 )
 
-(define-object FileOutputStream
-  (in-module "GLocal")
-  (parent "GFileOutputStream")
-  (c-name "GLocalFileOutputStream")
-  (gtype-id "G_TYPE_LOCAL_FILE_OUTPUT_STREAM")
-)
-
 (define-object n
   (in-module "GPermissio")
   (parent "GObject")
@@ -425,20 +343,6 @@
   (gtype-id "G_TYPE_SETTINGS_BACKEND")
 )
 
-(define-object SettingsBackend
-  (in-module "GDelayed")
-  (parent "GSettingsBackend")
-  (c-name "GDelayedSettingsBackend")
-  (gtype-id "G_TYPE_DELAYED_SETTINGS_BACKEND")
-)
-
-(define-object Schema
-  (in-module "GSettings")
-  (parent "GObject")
-  (c-name "GSettingsSchema")
-  (gtype-id "G_TYPE_SETTINGS_SCHEMA")
-)
-
 (define-object ActionGroup
   (in-module "GSimple")
   (parent "GObject")
@@ -515,13 +419,6 @@
   (gtype-id "G_TYPE_SOCKET_CONTROL_MESSAGE")
 )
 
-(define-object InputStream
-  (in-module "GSocket")
-  (parent "GInputStream")
-  (c-name "GSocketInputStream")
-  (gtype-id "G_TYPE_SOCKET_INPUT_STREAM")
-)
-
 (define-object Listener
   (in-module "GSocket")
   (parent "GObject")
@@ -529,13 +426,6 @@
   (gtype-id "G_TYPE_SOCKET_LISTENER")
 )
 
-(define-object OutputStream
-  (in-module "GSocket")
-  (parent "GOutputStream")
-  (c-name "GSocketOutputStream")
-  (gtype-id "G_TYPE_SOCKET_OUTPUT_STREAM")
-)
-
 (define-object Service
   (in-module "GSocket")
   (parent "GSocketListener")
@@ -543,13 +433,6 @@
   (gtype-id "G_TYPE_SOCKET_SERVICE")
 )
 
-(define-object 4aProxy
-  (in-module "GSocks")
-  (parent "GObject")
-  (c-name "GSocks4aProxy")
-  (gtype-id "G_TYPE_SOCKS4A_PROXY")
-)
-
 (define-object Connection
   (in-module "GTcp")
   (parent "GSocketConnection")
@@ -564,13 +447,6 @@
   (gtype-id "G_TYPE_TCP_WRAPPER_CONNECTION")
 )
 
-(define-object Resolver
-  (in-module "GThreaded")
-  (parent "GResolver")
-  (c-name "GThreadedResolver")
-  (gtype-id "G_TYPE_THREADED_RESOLVER")
-)
-
 (define-object SocketService
   (in-module "GThreaded")
   (parent "GSocketService")
@@ -613,62 +489,6 @@
   (gtype-id "G_TYPE_TLS_PASSWORD")
 )
 
-(define-object Connection
-  (in-module "GUnix")
-  (parent "GSocketConnection")
-  (c-name "GUnixConnection")
-  (gtype-id "G_TYPE_UNIX_CONNECTION")
-)
-
-(define-object CredentialsMessage
-  (in-module "GUnix")
-  (parent "GSocketControlMessage")
-  (c-name "GUnixCredentialsMessage")
-  (gtype-id "G_TYPE_UNIX_CREDENTIALS_MESSAGE")
-)
-
-(define-object FDList
-  (in-module "GUnix")
-  (parent "GObject")
-  (c-name "GUnixFDList")
-  (gtype-id "G_TYPE_UNIX_FD_LIST")
-)
-
-(define-object FDMessage
-  (in-module "GUnix")
-  (parent "GSocketControlMessage")
-  (c-name "GUnixFDMessage")
-  (gtype-id "G_TYPE_UNIX_FD_MESSAGE")
-)
-
-(define-object InputStream
-  (in-module "GUnix")
-  (parent "GInputStream")
-  (c-name "GUnixInputStream")
-  (gtype-id "G_TYPE_UNIX_INPUT_STREAM")
-)
-
-(define-object OutputStream
-  (in-module "GUnix")
-  (parent "GOutputStream")
-  (c-name "GUnixOutputStream")
-  (gtype-id "G_TYPE_UNIX_OUTPUT_STREAM")
-)
-
-(define-object Resolver
-  (in-module "GUnix")
-  (parent "GThreadedResolver")
-  (c-name "GUnixResolver")
-  (gtype-id "G_TYPE_UNIX_RESOLVER")
-)
-
-(define-object SocketAddress
-  (in-module "GUnix")
-  (parent "GSocketAddress")
-  (c-name "GUnixSocketAddress")
-  (gtype-id "G_TYPE_UNIX_SOCKET_ADDRESS")
-)
-
 (define-object s
   (in-module "GVf")
   (parent "GObject")
@@ -696,42 +516,8 @@
   (gtype-id "G_TYPE_NATIVE_VOLUME_MONITOR")
 )
 
-(define-object 32InputStream
-  (in-module "GWin")
-  (parent "GInputStream")
-  (c-name "GWin32InputStream")
-  (gtype-id "G_TYPE_WIN32_INPUT_STREAM")
-)
-
-(define-object 32OutputStream
-  (in-module "GWin")
-  (parent "GOutputStream")
-  (c-name "GWin32OutputStream")
-  (gtype-id "G_TYPE_WIN32_OUTPUT_STREAM")
-)
-
-(define-object 32Resolver
-  (in-module "GWin")
-  (parent "GThreadedResolver")
-  (c-name "GWin32Resolver")
-  (gtype-id "G_TYPE_WIN32_RESOLVER")
-)
-
 ;; Enumerations and flags ...
 
-(define-enum AuthMechanismState
-  (in-module "GDBus")
-  (c-name "GDBusAuthMechanismState")
-  (gtype-id "G_TYPE_D_BUS_AUTH_MECHANISM_STATE")
-  (values
-    '("invalid" "G_DBUS_AUTH_MECHANISM_STATE_INVALID")
-    '("waiting-for-data" "G_DBUS_AUTH_MECHANISM_STATE_WAITING_FOR_DATA")
-    '("have-data-to-send" "G_DBUS_AUTH_MECHANISM_STATE_HAVE_DATA_TO_SEND")
-    '("rejected" "G_DBUS_AUTH_MECHANISM_STATE_REJECTED")
-    '("accepted" "G_DBUS_AUTH_MECHANISM_STATE_ACCEPTED")
-  )
-)
-
 (define-flags InfoCreateFlags
   (in-module "GApp")
   (c-name "GAppInfoCreateFlags")
@@ -2254,14 +2040,6 @@
 
 
 
-;; From gapplicationimpl.h
-
-
-
-;; From gasynchelper.h
-
-
-
 ;; From gasyncinitable.h
 
 (define-function g_async_initable_get_type
@@ -2775,10 +2553,6 @@
 
 
 
-;; From gcontenttypeprivate.h
-
-
-
 ;; From gconverter.h
 
 (define-function g_converter_get_type
@@ -3361,26 +3135,6 @@
 
 
 
-;; From gdbusauth.h
-
-
-
-;; From gdbusauthmechanismanon.h
-
-
-
-;; From gdbusauthmechanismexternal.h
-
-
-
-;; From gdbusauthmechanism.h
-
-
-
-;; From gdbusauthmechanismsha1.h
-
-
-
 ;; From gdbusauthobserver.h
 
 (define-function g_dbus_auth_observer_get_type
@@ -5318,10 +5072,6 @@
 
 
 
-;; From gdbusprivate.h
-
-
-
 ;; From gdbusproxy.h
 
 (define-function g_dbus_proxy_get_type
@@ -5709,121 +5459,6 @@
 
 
 
-;; From gdelayedsettingsbackend.h
-
-
-
-;; From gdesktopappinfo.h
-
-(define-function g_desktop_app_info_get_type
-  (c-name "g_desktop_app_info_get_type")
-  (return-type "GType")
-)
-
-(define-function g_desktop_app_info_new_from_filename
-  (c-name "g_desktop_app_info_new_from_filename")
-  (return-type "GDesktopAppInfo*")
-  (parameters
-    '("const-char*" "filename")
-  )
-)
-
-(define-function g_desktop_app_info_new_from_keyfile
-  (c-name "g_desktop_app_info_new_from_keyfile")
-  (return-type "GDesktopAppInfo*")
-  (parameters
-    '("GKeyFile*" "key_file")
-  )
-)
-
-(define-method get_filename
-  (of-object "GDesktopAppInfo")
-  (c-name "g_desktop_app_info_get_filename")
-  (return-type "const-char*")
-)
-
-(define-method get_generic_name
-  (of-object "GDesktopAppInfo")
-  (c-name "g_desktop_app_info_get_generic_name")
-  (return-type "const-char*")
-)
-
-(define-method get_categories
-  (of-object "GDesktopAppInfo")
-  (c-name "g_desktop_app_info_get_categories")
-  (return-type "const-char*")
-)
-
-(define-method get_nodisplay
-  (of-object "GDesktopAppInfo")
-  (c-name "g_desktop_app_info_get_nodisplay")
-  (return-type "gboolean")
-)
-
-(define-method get_show_in
-  (of-object "GDesktopAppInfo")
-  (c-name "g_desktop_app_info_get_show_in")
-  (return-type "gboolean")
-  (parameters
-    '("const-gchar*" "desktop_env")
-  )
-)
-
-(define-function g_desktop_app_info_new
-  (c-name "g_desktop_app_info_new")
-  (is-constructor-of "GDesktopAppInfo")
-  (return-type "GDesktopAppInfo*")
-  (parameters
-    '("const-char*" "desktop_id")
-  )
-)
-
-(define-method get_is_hidden
-  (of-object "GDesktopAppInfo")
-  (c-name "g_desktop_app_info_get_is_hidden")
-  (return-type "gboolean")
-)
-
-(define-function g_desktop_app_info_set_desktop_env
-  (c-name "g_desktop_app_info_set_desktop_env")
-  (return-type "none")
-  (parameters
-    '("const-char*" "desktop_env")
-  )
-)
-
-(define-function g_desktop_app_info_lookup_get_type
-  (c-name "g_desktop_app_info_lookup_get_type")
-  (return-type "GType")
-)
-
-(define-method get_default_for_uri_scheme
-  (of-object "GDesktopAppInfoLookup")
-  (c-name "g_desktop_app_info_lookup_get_default_for_uri_scheme")
-  (return-type "GAppInfo*")
-  (parameters
-    '("const-char*" "uri_scheme")
-  )
-)
-
-(define-method launch_uris_as_manager
-  (of-object "GDesktopAppInfo")
-  (c-name "g_desktop_app_info_launch_uris_as_manager")
-  (return-type "gboolean")
-  (parameters
-    '("GList*" "uris")
-    '("GAppLaunchContext*" "launch_context")
-    '("GSpawnFlags" "spawn_flags")
-    '("GSpawnChildSetupFunc" "user_setup")
-    '("gpointer" "user_setup_data")
-    '("GDesktopAppLaunchCallback" "pid_callback")
-    '("gpointer" "pid_callback_data")
-    '("GError**" "error")
-  )
-)
-
-
-
 ;; From gdrive.h
 
 (define-function g_drive_get_type
@@ -6038,18 +5673,6 @@
 
 
 
-;; From gdummyfile.h
-
-
-
-;; From gdummyproxyresolver.h
-
-
-
-;; From gdummytlsbackend.h
-
-
-
 ;; From gemblemedicon.h
 
 (define-function g_emblemed_icon_get_type
@@ -6188,25 +5811,6 @@
 
 
 
-;; From gfileattribute-priv.h
-
-
-
-;; From gfiledescriptorbased.h
-
-(define-function g_file_descriptor_based_get_type
-  (c-name "g_file_descriptor_based_get_type")
-  (return-type "GType")
-)
-
-(define-method get_fd
-  (of-object "GFileDescriptorBased")
-  (c-name "g_file_descriptor_based_get_fd")
-  (return-type "int")
-)
-
-
-
 ;; From gfileenumerator.h
 
 (define-function g_file_enumerator_get_type
@@ -8127,10 +7731,6 @@
 
 
 
-;; From gfileinfo-priv.h
-
-
-
 ;; From gfileinputstream.h
 
 (define-function g_file_input_stream_get_type
@@ -9359,10 +8959,6 @@
 
 
 
-;; From giomodule-priv.h
-
-
-
 ;; From gioscheduler.h
 
 (define-function g_io_scheduler_push_job
@@ -9557,52 +9153,6 @@
 
 
 
-;; From glocaldirectorymonitor.h
-
-(define-function g_local_directory_monitor_get_type
-  (c-name "g_local_directory_monitor_get_type")
-  (return-type "GType")
-)
-
-
-
-;; From glocalfileenumerator.h
-
-
-
-;; From glocalfile.h
-
-
-
-;; From glocalfileinfo.h
-
-
-
-;; From glocalfileinputstream.h
-
-
-
-;; From glocalfileiostream.h
-
-
-
-;; From glocalfilemonitor.h
-
-(define-function g_local_file_monitor_get_type
-  (c-name "g_local_file_monitor_get_type")
-  (return-type "GType")
-)
-
-
-
-;; From glocalfileoutputstream.h
-
-
-
-;; From glocalvfs.h
-
-
-
 ;; From gmemoryinputstream.h
 
 (define-function g_memory_input_stream_get_type
@@ -10025,10 +9575,6 @@
 
 
 
-;; From gmountprivate.h
-
-
-
 ;; From gnativevolumemonitor.h
 
 (define-function g_native_volume_monitor_get_type
@@ -10095,10 +9641,6 @@
 
 
 
-;; From gnetworkingprivate.h
-
-
-
 ;; From gnetworkservice.h
 
 (define-function g_network_service_get_type
@@ -10536,10 +10078,6 @@
 
 
 
-;; From gpollfilemonitor.h
-
-
-
 ;; From gproxyaddressenumerator.h
 
 (define-function g_proxy_address_enumerator_get_type
@@ -10714,10 +10252,6 @@
 
 
 
-;; From gregistrysettingsbackend.h
-
-
-
 ;; From gresolver.h
 
 (define-function g_resolver_get_type
@@ -11019,10 +10553,6 @@
 
 
 
-;; From gsettingsbackendinternal.h
-
-
-
 ;; From gsettings.h
 
 (define-function g_settings_get_type
@@ -11409,14 +10939,6 @@
 
 
 
-;; From gsettings-mapping.h
-
-
-
-;; From gsettingsschema.h
-
-
-
 ;; From gsimpleactiongroup.h
 
 (define-function g_simple_action_group_get_type
@@ -12631,10 +12153,6 @@
 
 
 
-;; From gsocketinputstream.h
-
-
-
 ;; From gsocketlistener.h
 
 (define-function g_socket_listener_get_type
@@ -12777,10 +12295,6 @@
 
 
 
-;; From gsocketoutputstream.h
-
-
-
 ;; From gsocketservice.h
 
 (define-function g_socket_service_get_type
@@ -12814,18 +12328,6 @@
 
 
 
-;; From gsocks4aproxy.h
-
-
-
-;; From gsocks4proxy.h
-
-
-
-;; From gsocks5proxy.h
-
-
-
 ;; From gsrvtarget.h
 
 (define-function g_srv_target_get_type
@@ -12993,15 +12495,6 @@
 
 
 
-;; From gthreadedresolver.h
-
-(define-function g_threaded_resolver_get_type
-  (c-name "g_threaded_resolver_get_type")
-  (return-type "GType")
-)
-
-
-
 ;; From gthreadedsocketservice.h
 
 (define-function g_threaded_socket_service_get_type
@@ -13718,608 +13211,6 @@
 
 
 
-;; From gunionvolumemonitor.h
-
-
-
-;; From gunixconnection.h
-
-(define-function g_unix_connection_get_type
-  (c-name "g_unix_connection_get_type")
-  (return-type "GType")
-)
-
-(define-method send_fd
-  (of-object "GUnixConnection")
-  (c-name "g_unix_connection_send_fd")
-  (return-type "gboolean")
-  (parameters
-    '("gint" "fd")
-    '("GCancellable*" "cancellable")
-    '("GError**" "error")
-  )
-)
-
-(define-method receive_fd
-  (of-object "GUnixConnection")
-  (c-name "g_unix_connection_receive_fd")
-  (return-type "gint")
-  (parameters
-    '("GCancellable*" "cancellable")
-    '("GError**" "error")
-  )
-)
-
-(define-method send_credentials
-  (of-object "GUnixConnection")
-  (c-name "g_unix_connection_send_credentials")
-  (return-type "gboolean")
-  (parameters
-    '("GCancellable*" "cancellable")
-    '("GError**" "error")
-  )
-)
-
-(define-method receive_credentials
-  (of-object "GUnixConnection")
-  (c-name "g_unix_connection_receive_credentials")
-  (return-type "GCredentials*")
-  (parameters
-    '("GCancellable*" "cancellable")
-    '("GError**" "error")
-  )
-)
-
-
-
-;; From gunixcredentialsmessage.h
-
-(define-function g_unix_credentials_message_get_type
-  (c-name "g_unix_credentials_message_get_type")
-  (return-type "GType")
-)
-
-(define-function g_unix_credentials_message_new
-  (c-name "g_unix_credentials_message_new")
-  (is-constructor-of "GUnixCredentialsMessage")
-  (return-type "GSocketControlMessage*")
-)
-
-(define-function g_unix_credentials_message_new_with_credentials
-  (c-name "g_unix_credentials_message_new_with_credentials")
-  (return-type "GSocketControlMessage*")
-  (parameters
-    '("GCredentials*" "credentials")
-  )
-)
-
-(define-method get_credentials
-  (of-object "GUnixCredentialsMessage")
-  (c-name "g_unix_credentials_message_get_credentials")
-  (return-type "GCredentials*")
-)
-
-(define-function g_unix_credentials_message_is_supported
-  (c-name "g_unix_credentials_message_is_supported")
-  (return-type "gboolean")
-)
-
-
-
-;; From gunixfdlist.h
-
-(define-function g_unix_fd_list_get_type
-  (c-name "g_unix_fd_list_get_type")
-  (return-type "GType")
-)
-
-(define-function g_unix_fd_list_new
-  (c-name "g_unix_fd_list_new")
-  (is-constructor-of "GUnixFdList")
-  (return-type "GUnixFDList*")
-)
-
-(define-function g_unix_fd_list_new_from_array
-  (c-name "g_unix_fd_list_new_from_array")
-  (return-type "GUnixFDList*")
-  (parameters
-    '("const-gint*" "fds")
-    '("gint" "n_fds")
-  )
-)
-
-(define-method append
-  (of-object "GUnixFDList")
-  (c-name "g_unix_fd_list_append")
-  (return-type "gint")
-  (parameters
-    '("gint" "fd")
-    '("GError**" "error")
-  )
-)
-
-(define-method get_length
-  (of-object "GUnixFDList")
-  (c-name "g_unix_fd_list_get_length")
-  (return-type "gint")
-)
-
-(define-method get
-  (of-object "GUnixFDList")
-  (c-name "g_unix_fd_list_get")
-  (return-type "gint")
-  (parameters
-    '("gint" "index_")
-    '("GError**" "error")
-  )
-)
-
-(define-method peek_fds
-  (of-object "GUnixFDList")
-  (c-name "g_unix_fd_list_peek_fds")
-  (return-type "const-gint*")
-  (parameters
-    '("gint*" "length")
-  )
-)
-
-(define-method steal_fds
-  (of-object "GUnixFDList")
-  (c-name "g_unix_fd_list_steal_fds")
-  (return-type "gint*")
-  (parameters
-    '("gint*" "length")
-  )
-)
-
-
-
-;; From gunixfdmessage.h
-
-(define-function g_unix_fd_message_get_type
-  (c-name "g_unix_fd_message_get_type")
-  (return-type "GType")
-)
-
-(define-function g_unix_fd_message_new_with_fd_list
-  (c-name "g_unix_fd_message_new_with_fd_list")
-  (return-type "GSocketControlMessage*")
-  (parameters
-    '("GUnixFDList*" "fd_list")
-  )
-)
-
-(define-function g_unix_fd_message_new
-  (c-name "g_unix_fd_message_new")
-  (is-constructor-of "GUnixFdMessage")
-  (return-type "GSocketControlMessage*")
-)
-
-(define-method get_fd_list
-  (of-object "GUnixFDMessage")
-  (c-name "g_unix_fd_message_get_fd_list")
-  (return-type "GUnixFDList*")
-)
-
-(define-method steal_fds
-  (of-object "GUnixFDMessage")
-  (c-name "g_unix_fd_message_steal_fds")
-  (return-type "gint*")
-  (parameters
-    '("gint*" "length")
-  )
-)
-
-(define-method append_fd
-  (of-object "GUnixFDMessage")
-  (c-name "g_unix_fd_message_append_fd")
-  (return-type "gboolean")
-  (parameters
-    '("gint" "fd")
-    '("GError**" "error")
-  )
-)
-
-
-
-;; From gunixinputstream.h
-
-(define-function g_unix_input_stream_get_type
-  (c-name "g_unix_input_stream_get_type")
-  (return-type "GType")
-)
-
-(define-function g_unix_input_stream_new
-  (c-name "g_unix_input_stream_new")
-  (is-constructor-of "GUnixInputStream")
-  (return-type "GInputStream*")
-  (parameters
-    '("gint" "fd")
-    '("gboolean" "close_fd")
-  )
-)
-
-(define-method set_close_fd
-  (of-object "GUnixInputStream")
-  (c-name "g_unix_input_stream_set_close_fd")
-  (return-type "none")
-  (parameters
-    '("gboolean" "close_fd")
-  )
-)
-
-(define-method get_close_fd
-  (of-object "GUnixInputStream")
-  (c-name "g_unix_input_stream_get_close_fd")
-  (return-type "gboolean")
-)
-
-(define-method get_fd
-  (of-object "GUnixInputStream")
-  (c-name "g_unix_input_stream_get_fd")
-  (return-type "gint")
-)
-
-
-
-;; From gunixmount.h
-
-
-
-;; From gunixmounts.h
-
-(define-function g_unix_mount_free
-  (c-name "g_unix_mount_free")
-  (return-type "none")
-  (parameters
-    '("GUnixMountEntry*" "mount_entry")
-  )
-)
-
-(define-method free
-  (of-object "GUnixMountPoint")
-  (c-name "g_unix_mount_point_free")
-  (return-type "none")
-)
-
-(define-function g_unix_mount_compare
-  (c-name "g_unix_mount_compare")
-  (return-type "gint")
-  (parameters
-    '("GUnixMountEntry*" "mount1")
-    '("GUnixMountEntry*" "mount2")
-  )
-)
-
-(define-function g_unix_mount_get_mount_path
-  (c-name "g_unix_mount_get_mount_path")
-  (return-type "const-char*")
-  (parameters
-    '("GUnixMountEntry*" "mount_entry")
-  )
-)
-
-(define-function g_unix_mount_get_device_path
-  (c-name "g_unix_mount_get_device_path")
-  (return-type "const-char*")
-  (parameters
-    '("GUnixMountEntry*" "mount_entry")
-  )
-)
-
-(define-function g_unix_mount_get_fs_type
-  (c-name "g_unix_mount_get_fs_type")
-  (return-type "const-char*")
-  (parameters
-    '("GUnixMountEntry*" "mount_entry")
-  )
-)
-
-(define-function g_unix_mount_is_readonly
-  (c-name "g_unix_mount_is_readonly")
-  (return-type "gboolean")
-  (parameters
-    '("GUnixMountEntry*" "mount_entry")
-  )
-)
-
-(define-function g_unix_mount_is_system_internal
-  (c-name "g_unix_mount_is_system_internal")
-  (return-type "gboolean")
-  (parameters
-    '("GUnixMountEntry*" "mount_entry")
-  )
-)
-
-(define-function g_unix_mount_guess_can_eject
-  (c-name "g_unix_mount_guess_can_eject")
-  (return-type "gboolean")
-  (parameters
-    '("GUnixMountEntry*" "mount_entry")
-  )
-)
-
-(define-function g_unix_mount_guess_should_display
-  (c-name "g_unix_mount_guess_should_display")
-  (return-type "gboolean")
-  (parameters
-    '("GUnixMountEntry*" "mount_entry")
-  )
-)
-
-(define-function g_unix_mount_guess_name
-  (c-name "g_unix_mount_guess_name")
-  (return-type "char*")
-  (parameters
-    '("GUnixMountEntry*" "mount_entry")
-  )
-)
-
-(define-function g_unix_mount_guess_icon
-  (c-name "g_unix_mount_guess_icon")
-  (return-type "GIcon*")
-  (parameters
-    '("GUnixMountEntry*" "mount_entry")
-  )
-)
-
-(define-method compare
-  (of-object "GUnixMountPoint")
-  (c-name "g_unix_mount_point_compare")
-  (return-type "gint")
-  (parameters
-    '("GUnixMountPoint*" "mount2")
-  )
-)
-
-(define-method get_mount_path
-  (of-object "GUnixMountPoint")
-  (c-name "g_unix_mount_point_get_mount_path")
-  (return-type "const-char*")
-)
-
-(define-method get_device_path
-  (of-object "GUnixMountPoint")
-  (c-name "g_unix_mount_point_get_device_path")
-  (return-type "const-char*")
-)
-
-(define-method get_fs_type
-  (of-object "GUnixMountPoint")
-  (c-name "g_unix_mount_point_get_fs_type")
-  (return-type "const-char*")
-)
-
-(define-method is_readonly
-  (of-object "GUnixMountPoint")
-  (c-name "g_unix_mount_point_is_readonly")
-  (return-type "gboolean")
-)
-
-(define-method is_user_mountable
-  (of-object "GUnixMountPoint")
-  (c-name "g_unix_mount_point_is_user_mountable")
-  (return-type "gboolean")
-)
-
-(define-method is_loopback
-  (of-object "GUnixMountPoint")
-  (c-name "g_unix_mount_point_is_loopback")
-  (return-type "gboolean")
-)
-
-(define-method guess_can_eject
-  (of-object "GUnixMountPoint")
-  (c-name "g_unix_mount_point_guess_can_eject")
-  (return-type "gboolean")
-)
-
-(define-method guess_name
-  (of-object "GUnixMountPoint")
-  (c-name "g_unix_mount_point_guess_name")
-  (return-type "char*")
-)
-
-(define-method guess_icon
-  (of-object "GUnixMountPoint")
-  (c-name "g_unix_mount_point_guess_icon")
-  (return-type "GIcon*")
-)
-
-(define-function g_unix_mount_points_get
-  (c-name "g_unix_mount_points_get")
-  (return-type "GList*")
-  (parameters
-    '("guint64*" "time_read")
-  )
-)
-
-(define-function g_unix_mounts_get
-  (c-name "g_unix_mounts_get")
-  (return-type "GList*")
-  (parameters
-    '("guint64*" "time_read")
-  )
-)
-
-(define-function g_unix_mount_at
-  (c-name "g_unix_mount_at")
-  (return-type "GUnixMountEntry*")
-  (parameters
-    '("const-char*" "mount_path")
-    '("guint64*" "time_read")
-  )
-)
-
-(define-function g_unix_mounts_changed_since
-  (c-name "g_unix_mounts_changed_since")
-  (return-type "gboolean")
-  (parameters
-    '("guint64" "time")
-  )
-)
-
-(define-function g_unix_mount_points_changed_since
-  (c-name "g_unix_mount_points_changed_since")
-  (return-type "gboolean")
-  (parameters
-    '("guint64" "time")
-  )
-)
-
-(define-function g_unix_mount_monitor_get_type
-  (c-name "g_unix_mount_monitor_get_type")
-  (return-type "GType")
-)
-
-(define-function g_unix_mount_monitor_new
-  (c-name "g_unix_mount_monitor_new")
-  (is-constructor-of "GUnixMountMonitor")
-  (return-type "GUnixMountMonitor*")
-)
-
-(define-method set_rate_limit
-  (of-object "GUnixMountMonitor")
-  (c-name "g_unix_mount_monitor_set_rate_limit")
-  (return-type "none")
-  (parameters
-    '("int" "limit_msec")
-  )
-)
-
-(define-function g_unix_is_mount_path_system_internal
-  (c-name "g_unix_is_mount_path_system_internal")
-  (return-type "gboolean")
-  (parameters
-    '("const-char*" "mount_path")
-  )
-)
-
-
-
-;; From gunixoutputstream.h
-
-(define-function g_unix_output_stream_get_type
-  (c-name "g_unix_output_stream_get_type")
-  (return-type "GType")
-)
-
-(define-function g_unix_output_stream_new
-  (c-name "g_unix_output_stream_new")
-  (is-constructor-of "GUnixOutputStream")
-  (return-type "GOutputStream*")
-  (parameters
-    '("gint" "fd")
-    '("gboolean" "close_fd")
-  )
-)
-
-(define-method set_close_fd
-  (of-object "GUnixOutputStream")
-  (c-name "g_unix_output_stream_set_close_fd")
-  (return-type "none")
-  (parameters
-    '("gboolean" "close_fd")
-  )
-)
-
-(define-method get_close_fd
-  (of-object "GUnixOutputStream")
-  (c-name "g_unix_output_stream_get_close_fd")
-  (return-type "gboolean")
-)
-
-(define-method get_fd
-  (of-object "GUnixOutputStream")
-  (c-name "g_unix_output_stream_get_fd")
-  (return-type "gint")
-)
-
-
-
-;; From gunixresolver.h
-
-(define-function g_unix_resolver_get_type
-  (c-name "g_unix_resolver_get_type")
-  (return-type "GType")
-)
-
-
-
-;; From gunixsocketaddress.h
-
-(define-function g_unix_socket_address_get_type
-  (c-name "g_unix_socket_address_get_type")
-  (return-type "GType")
-)
-
-(define-function g_unix_socket_address_new
-  (c-name "g_unix_socket_address_new")
-  (is-constructor-of "GUnixSocketAddress")
-  (return-type "GSocketAddress*")
-  (parameters
-    '("const-gchar*" "path")
-  )
-)
-
-(define-function g_unix_socket_address_new_abstract
-  (c-name "g_unix_socket_address_new_abstract")
-  (return-type "GSocketAddress*")
-  (parameters
-    '("const-gchar*" "path")
-    '("gint" "path_len")
-  )
-)
-
-(define-function g_unix_socket_address_new_with_type
-  (c-name "g_unix_socket_address_new_with_type")
-  (return-type "GSocketAddress*")
-  (parameters
-    '("const-gchar*" "path")
-    '("gint" "path_len")
-    '("GUnixSocketAddressType" "type")
-  )
-)
-
-(define-method get_path
-  (of-object "GUnixSocketAddress")
-  (c-name "g_unix_socket_address_get_path")
-  (return-type "const-char*")
-)
-
-(define-method get_path_len
-  (of-object "GUnixSocketAddress")
-  (c-name "g_unix_socket_address_get_path_len")
-  (return-type "gsize")
-)
-
-(define-method get_address_type
-  (of-object "GUnixSocketAddress")
-  (c-name "g_unix_socket_address_get_address_type")
-  (return-type "GUnixSocketAddressType")
-)
-
-(define-method get_is_abstract
-  (of-object "GUnixSocketAddress")
-  (c-name "g_unix_socket_address_get_is_abstract")
-  (return-type "gboolean")
-)
-
-(define-function g_unix_socket_address_abstract_names_supported
-  (c-name "g_unix_socket_address_abstract_names_supported")
-  (return-type "gboolean")
-)
-
-
-
-;; From gunixvolume.h
-
-
-
-;; From gunixvolumemonitor.h
-
-
-
 ;; From gvfs.h
 
 (define-function g_vfs_get_type
@@ -14576,112 +13467,6 @@
 
 
 
-;; From gwin32appinfo.h
-
-(define-function g_win32_app_info_get_type
-  (c-name "g_win32_app_info_get_type")
-  (return-type "GType")
-)
-
-
-
-;; From gwin32inputstream.h
-
-(define-function g_win32_input_stream_get_type
-  (c-name "g_win32_input_stream_get_type")
-  (return-type "GType")
-)
-
-(define-function g_win32_input_stream_new
-  (c-name "g_win32_input_stream_new")
-  (is-constructor-of "GWin32InputStream")
-  (return-type "GInputStream*")
-  (parameters
-    '("void*" "handle")
-    '("gboolean" "close_handle")
-  )
-)
-
-(define-method set_close_handle
-  (of-object "GWin32InputStream")
-  (c-name "g_win32_input_stream_set_close_handle")
-  (return-type "none")
-  (parameters
-    '("gboolean" "close_handle")
-  )
-)
-
-(define-method get_close_handle
-  (of-object "GWin32InputStream")
-  (c-name "g_win32_input_stream_get_close_handle")
-  (return-type "gboolean")
-)
-
-(define-method get_handle
-  (of-object "GWin32InputStream")
-  (c-name "g_win32_input_stream_get_handle")
-  (return-type "void*")
-)
-
-
-
-;; From gwin32mount.h
-
-
-
-;; From gwin32outputstream.h
-
-(define-function g_win32_output_stream_get_type
-  (c-name "g_win32_output_stream_get_type")
-  (return-type "GType")
-)
-
-(define-function g_win32_output_stream_new
-  (c-name "g_win32_output_stream_new")
-  (is-constructor-of "GWin32OutputStream")
-  (return-type "GOutputStream*")
-  (parameters
-    '("void*" "handle")
-    '("gboolean" "close_handle")
-  )
-)
-
-(define-method set_close_handle
-  (of-object "GWin32OutputStream")
-  (c-name "g_win32_output_stream_set_close_handle")
-  (return-type "none")
-  (parameters
-    '("gboolean" "close_handle")
-  )
-)
-
-(define-method get_close_handle
-  (of-object "GWin32OutputStream")
-  (c-name "g_win32_output_stream_get_close_handle")
-  (return-type "gboolean")
-)
-
-(define-method get_handle
-  (of-object "GWin32OutputStream")
-  (c-name "g_win32_output_stream_get_handle")
-  (return-type "void*")
-)
-
-
-
-;; From gwin32resolver.h
-
-(define-function g_win32_resolver_get_type
-  (c-name "g_win32_resolver_get_type")
-  (return-type "GType")
-)
-
-
-
-;; From gwin32volumemonitor.h
-
-
-
 ;; From gzlibcompressor.h
 
 (define-function g_zlib_compressor_get_type
diff --git a/glib/src/datetime.hg b/glib/src/datetime.hg
index 6b5c62f1..50abe35b 100644
--- a/glib/src/datetime.hg
+++ b/glib/src/datetime.hg
@@ -92,6 +92,7 @@ public:
   _WRAP_METHOD(DateTime add_full(int years, int months, int days, int hours, int minutes, double seconds) const, g_date_time_add_full)
   _WRAP_METHOD(TimeSpan difference(const DateTime& other) const, g_date_time_difference)
 
+#m4 _CONVERSION(`const DateTime&',`gconstpointer',`static_cast<gconstpointer>(&($3))')
   _WRAP_METHOD(int compare(const DateTime& other) const, g_date_time_compare)
   _WRAP_METHOD(guint hash() const, g_date_time_hash)
   _WRAP_METHOD(bool equal(const DateTime& other) const, g_date_time_equal)
diff --git a/glib/src/glib_functions.defs b/glib/src/glib_functions.defs
index fd38301e..32fa922e 100644
--- a/glib/src/glib_functions.defs
+++ b/glib/src/glib_functions.defs
@@ -18,16 +18,6 @@
   )
 )
 
-(define-flags ArrayFlags
-  (in-module "GBSearch")
-  (c-name "GBSearchArrayFlags")
-  (gtype-id "G_TYPE_B_SEARCH_ARRAY_FLAGS")
-  (values
-    '("lign-power2" "G_BSEARCH_ARRAY_ALIGN_POWER2")
-    '("uto-shrink" "G_BSEARCH_ARRAY_AUTO_SHRINK")
-  )
-)
-
 (define-enum Type
   (in-module "GChecksum")
   (c-name "GChecksumType")
@@ -101,16 +91,6 @@
   )
 )
 
-(define-flags Flag
-  (in-module "GDebug")
-  (c-name "GDebugFlag")
-  (gtype-id "G_TYPE_DEBUG_FLAG")
-  (values
-    '("warnings" "G_DEBUG_FATAL_WARNINGS")
-    '("criticals" "G_DEBUG_FATAL_CRITICALS")
-  )
-)
-
 (define-enum Error
   (in-module "GFile")
   (c-name "GFileError")
@@ -157,6 +137,17 @@
   )
 )
 
+(define-flags SizeFlags
+  (in-module "GFormat")
+  (c-name "GFormatSizeFlags")
+  (gtype-id "G_TYPE_FORMAT_SIZE_FLAGS")
+  (values
+    '("default" "G_FORMAT_SIZE_DEFAULT")
+    '("long-format" "G_FORMAT_SIZE_LONG_FORMAT")
+    '("iec-units" "G_FORMAT_SIZE_IEC_UNITS")
+  )
+)
+
 (define-flags FlagMask
   (in-module "GHook")
   (c-name "GHookFlagMask")
@@ -680,7 +671,7 @@
     '("other-letter" "G_UNICODE_OTHER_LETTER")
     '("titlecase-letter" "G_UNICODE_TITLECASE_LETTER")
     '("uppercase-letter" "G_UNICODE_UPPERCASE_LETTER")
-    '("combining-mark" "G_UNICODE_COMBINING_MARK")
+    '("spacing-mark" "G_UNICODE_SPACING_MARK")
     '("enclosing-mark" "G_UNICODE_ENCLOSING_MARK")
     '("non-spacing-mark" "G_UNICODE_NON_SPACING_MARK")
     '("decimal-number" "G_UNICODE_DECIMAL_NUMBER")
@@ -1112,6 +1103,15 @@
   )
 )
 
+(define-function g_ptr_array_new_full
+  (c-name "g_ptr_array_new_full")
+  (return-type "GPtrArray*")
+  (parameters
+    '("guint" "reserved_size")
+    '("GDestroyNotify" "element_free_func")
+  )
+)
+
 (define-method free
   (of-object "GPtrArray")
   (c-name "g_ptr_array_free")
@@ -2224,30 +2224,6 @@
 
 
 
-;; From gbsearcharray.h
-
-(define-function if
-  (c-name "if")
-  (return-type "else")
-  (parameters
-    '("cmp-<" "0")
-  )
-)
-
-(define-function MIN
-  (c-name "MIN")
-  (return-type "return")
-  (parameters
-    '("barray->n_nodes-+" "1")
-  )
-)
-
-
-
-;; From gbufferprivate.h
-
-
-
 ;; From gcache.h
 
 (define-function g_cache_new
@@ -2482,18 +2458,6 @@
   )
 )
 
-(define-method iconv
-  (of-object "GIConv")
-  (c-name "g_iconv")
-  (return-type "gsize")
-  (parameters
-    '("gchar**" "inbuf")
-    '("gsize*" "inbytes_left")
-    '("gchar**" "outbuf")
-    '("gsize*" "outbytes_left")
-  )
-)
-
 (define-method close
   (of-object "GIConv")
   (c-name "g_iconv_close")
@@ -2785,10 +2749,6 @@
 
 
 
-;; From gdatasetprivate.h
-
-
-
 ;; From gdate.h
 
 (define-function g_date_new
@@ -3372,12 +3332,12 @@
   )
 )
 
-(define-method compare
-  (of-object "GDateTime")
+(define-function g_date_time_compare
   (c-name "g_date_time_compare")
   (return-type "gint")
   (parameters
-    '("GDateTime*" "dt2")
+    '("gconstpointer" "dt1")
+    '("gconstpointer" "dt2")
   )
 )
 
@@ -3390,18 +3350,20 @@
   )
 )
 
-(define-method hash
-  (of-object "GDateTime")
+(define-function g_date_time_hash
   (c-name "g_date_time_hash")
   (return-type "guint")
+  (parameters
+    '("gconstpointer" "datetime")
+  )
 )
 
-(define-method equal
-  (of-object "GDateTime")
+(define-function g_date_time_equal
   (c-name "g_date_time_equal")
   (return-type "gboolean")
   (parameters
-    '("GDateTime*" "dt2")
+    '("gconstpointer" "dt1")
+    '("gconstpointer" "dt2")
   )
 )
 
@@ -3553,10 +3515,6 @@
 
 
 
-;; From gdebug.h
-
-
-
 ;; From gdir.h
 
 (define-function g_dir_open
@@ -3764,6 +3722,23 @@
   )
 )
 
+(define-function g_mkdtemp
+  (c-name "g_mkdtemp")
+  (return-type "gchar*")
+  (parameters
+    '("gchar*" "tmpl")
+  )
+)
+
+(define-function g_mkdtemp_full
+  (c-name "g_mkdtemp_full")
+  (return-type "gchar*")
+  (parameters
+    '("gchar*" "tmpl")
+    '("gint" "mode")
+  )
+)
+
 (define-function g_mkstemp
   (c-name "g_mkstemp")
   (return-type "gint")
@@ -3777,8 +3752,8 @@
   (return-type "gint")
   (parameters
     '("gchar*" "tmpl")
-    '("int" "flags")
-    '("int" "mode")
+    '("gint" "flags")
+    '("gint" "mode")
   )
 )
 
@@ -3792,6 +3767,32 @@
   )
 )
 
+(define-function g_dir_make_tmp
+  (c-name "g_dir_make_tmp")
+  (return-type "gchar*")
+  (parameters
+    '("const-gchar*" "tmpl")
+    '("GError**" "error")
+  )
+)
+
+(define-function g_format_size_full
+  (c-name "g_format_size_full")
+  (return-type "gchar*")
+  (parameters
+    '("guint64" "size")
+    '("GFormatSizeFlags" "flags")
+  )
+)
+
+(define-function g_format_size
+  (c-name "g_format_size")
+  (return-type "gchar*")
+  (parameters
+    '("guint64" "size")
+  )
+)
+
 (define-function g_format_size_for_display
   (c-name "g_format_size_for_display")
   (return-type "char*")
@@ -4035,6 +4036,15 @@
   (return-type "none")
 )
 
+(define-method replace
+  (of-object "GHashTableIter")
+  (c-name "g_hash_table_iter_replace")
+  (return-type "none")
+  (parameters
+    '("gpointer" "value")
+  )
+)
+
 (define-method steal
   (of-object "GHashTableIter")
   (c-name "g_hash_table_iter_steal")
@@ -4140,6 +4150,89 @@
 
 
 
+;; From ghmac.h
+
+(define-function g_hmac_new
+  (c-name "g_hmac_new")
+  (is-constructor-of "GHmac")
+  (return-type "GHmac*")
+  (parameters
+    '("GChecksumType" "digest_type")
+    '("const-guchar*" "key")
+    '("gsize" "key_len")
+  )
+)
+
+(define-method copy
+  (of-object "GHmac")
+  (c-name "g_hmac_copy")
+  (return-type "GHmac*")
+)
+
+(define-method ref
+  (of-object "GHmac")
+  (c-name "g_hmac_ref")
+  (return-type "GHmac*")
+)
+
+(define-method unref
+  (of-object "GHmac")
+  (c-name "g_hmac_unref")
+  (return-type "none")
+)
+
+(define-method update
+  (of-object "GHmac")
+  (c-name "g_hmac_update")
+  (return-type "none")
+  (parameters
+    '("const-guchar*" "data")
+    '("gssize" "length")
+  )
+)
+
+(define-method get_string
+  (of-object "GHmac")
+  (c-name "g_hmac_get_string")
+  (return-type "const-gchar*")
+)
+
+(define-method get_digest
+  (of-object "GHmac")
+  (c-name "g_hmac_get_digest")
+  (return-type "none")
+  (parameters
+    '("guint8*" "buffer")
+    '("gsize*" "digest_len")
+  )
+)
+
+(define-function g_compute_hmac_for_data
+  (c-name "g_compute_hmac_for_data")
+  (return-type "gchar*")
+  (parameters
+    '("GChecksumType" "digest_type")
+    '("const-guchar*" "key")
+    '("gsize" "key_len")
+    '("const-guchar*" "data")
+    '("gsize" "length")
+  )
+)
+
+(define-function g_compute_hmac_for_string
+  (c-name "g_compute_hmac_for_string")
+  (return-type "gchar*")
+  (parameters
+    '("GChecksumType" "digest_type")
+    '("const-guchar*" "key")
+    '("gsize" "key_len")
+    '("const-gchar*" "str")
+    '("gssize" "length")
+  )
+)
+
+
+
 ;; From ghook.h
 
 (define-method init
@@ -4943,18 +5036,6 @@
   )
 )
 
-(define-method has_key_full
-  (of-object "GKeyFile")
-  (c-name "g_key_file_has_key_full")
-  (return-type "gboolean")
-  (parameters
-    '("const-gchar*" "group_name")
-    '("const-gchar*" "key")
-    '("gboolean*" "has_key")
-    '("GError**" "error")
-  )
-)
-
 (define-method get_value
   (of-object "GKeyFile")
   (c-name "g_key_file_get_value")
@@ -5312,93 +5393,6 @@
 
 
 
-;; From glibconfig.h
-
-
-
-;; From glib.h
-
-
-
-;; From glibintl.h
-
-(define-function glib_gettext
-  (c-name "glib_gettext")
-  (return-type "const-gchar*")
-  (parameters
-    '("const-gchar*" "str")
-  )
-)
-
-(define-function glib_pgettext
-  (c-name "glib_pgettext")
-  (return-type "const-gchar*")
-  (parameters
-    '("const-gchar*" "msgctxtid")
-    '("gsize" "msgidoffset")
-  )
-)
-
-
-
-;; From glib-object.h
-
-
-
-;; From glib_trace.h
-
-
-
-;; From glib-unix.h
-
-(define-function g_unix_error_quark
-  (c-name "g_unix_error_quark")
-  (return-type "GQuark")
-)
-
-(define-function g_unix_open_pipe
-  (c-name "g_unix_open_pipe")
-  (return-type "gboolean")
-  (parameters
-    '("gint*" "fds")
-    '("gint" "flags")
-    '("GError**" "error")
-  )
-)
-
-(define-function g_unix_set_fd_nonblocking
-  (c-name "g_unix_set_fd_nonblocking")
-  (return-type "gboolean")
-  (parameters
-    '("gint" "fd")
-    '("gboolean" "nonblock")
-    '("GError**" "error")
-  )
-)
-
-(define-function g_unix_signal_source_new
-  (c-name "g_unix_signal_source_new")
-  (is-constructor-of "GUnixSignalSource")
-  (return-type "GSource*")
-  (parameters
-    '("gint" "signum")
-  )
-)
-
-(define-function g_unix_signal_add_watch_full
-  (c-name "g_unix_signal_add_watch_full")
-  (return-type "guint")
-  (parameters
-    '("gint" "signum")
-    '("gint" "priority")
-    '("GSourceFunc" "handler")
-    '("gpointer" "user_data")
-    '("GDestroyNotify" "notify")
-  )
-)
-
-
-
 ;; From glist.h
 
 (define-function g_list_alloc
@@ -6303,10 +6297,6 @@
 
 
 
-;; From gmain-internal.h
-
-
-
 ;; From gmappedfile.h
 
 (define-function g_mapped_file_new
@@ -6854,10 +6844,6 @@
 
 
 
-;; From gmirroringtable.h
-
-
-
 ;; From gnode.h
 
 (define-function g_node_new
@@ -7470,10 +7456,6 @@
 
 
 
-;; From gprintfint.h
-
-
-
 ;; From gqsort.h
 
 (define-function g_qsort_with_data
@@ -8049,6 +8031,15 @@
   )
 )
 
+(define-function g_regex_escape_nul
+  (c-name "g_regex_escape_nul")
+  (return-type "gchar*")
+  (parameters
+    '("const-gchar*" "string")
+    '("gint" "length")
+  )
+)
+
 (define-method get_compile_flags
   (of-object "GRegex")
   (c-name "g_regex_get_compile_flags")
@@ -8222,6 +8213,18 @@
   (return-type "const-gchar*")
 )
 
+(define-method ref
+  (of-object "GMatchInfo")
+  (c-name "g_match_info_ref")
+  (return-type "GMatchInfo*")
+)
+
+(define-method unref
+  (of-object "GMatchInfo")
+  (c-name "g_match_info_unref")
+  (return-type "none")
+)
+
 (define-method free
   (of-object "GMatchInfo")
   (c-name "g_match_info_free")
@@ -8593,10 +8596,6 @@
 
 
 
-;; From gscripttable.h
-
-
-
 ;; From gsequence.h
 
 (define-function g_sequence_new
@@ -11123,15 +11122,6 @@
 
 
 
-;; From gthreadprivate.h
-
-(define-function g_thread_init_glib
-  (c-name "g_thread_init_glib")
-  (return-type "none")
-)
-
-
-
 ;; From gtimer.h
 
 (define-function g_timer_new
@@ -11215,11 +11205,6 @@
 
 ;; From gtimezone.h
 
-(define-function g_time_zone_refresh_local
-  (c-name "g_time_zone_refresh_local")
-  (return-type "none")
-)
-
 (define-function g_time_zone_new
   (c-name "g_time_zone_new")
   (is-constructor-of "GTimeZone")
@@ -11456,15 +11441,21 @@
 
 
 
-;; From gunibreak.h
-
-
-
-;; From gunichartables.h
-
+;; From gunicode.h
 
+(define-method to_iso15924
+  (of-object "GUnicodeScript")
+  (c-name "g_unicode_script_to_iso15924")
+  (return-type "guint32")
+)
 
-;; From gunicode.h
+(define-function g_unicode_script_from_iso15924
+  (c-name "g_unicode_script_from_iso15924")
+  (return-type "GUnicodeScript")
+  (parameters
+    '("guint32" "iso15924")
+  )
+)
 
 (define-function g_get_charset
   (c-name "g_get_charset")
@@ -11624,6 +11615,58 @@
   (return-type "gint")
 )
 
+(define-method get_mirror_char
+  (of-object "gunichar")
+  (c-name "g_unichar_get_mirror_char")
+  (return-type "gboolean")
+  (parameters
+    '("gunichar*" "mirrored_ch")
+  )
+)
+
+(define-method get_script
+  (of-object "gunichar")
+  (c-name "g_unichar_get_script")
+  (return-type "GUnicodeScript")
+)
+
+(define-method validate
+  (of-object "gunichar")
+  (c-name "g_unichar_validate")
+  (return-type "gboolean")
+)
+
+(define-method compose
+  (of-object "gunichar")
+  (c-name "g_unichar_compose")
+  (return-type "gboolean")
+  (parameters
+    '("gunichar" "b")
+    '("gunichar*" "ch")
+  )
+)
+
+(define-method decompose
+  (of-object "gunichar")
+  (c-name "g_unichar_decompose")
+  (return-type "gboolean")
+  (parameters
+    '("gunichar*" "a")
+    '("gunichar*" "b")
+  )
+)
+
+(define-method fully_decompose
+  (of-object "gunichar")
+  (c-name "g_unichar_fully_decompose")
+  (return-type "gsize")
+  (parameters
+    '("gboolean" "compat")
+    '("gunichar*" "result")
+    '("gsize" "result_len")
+  )
+)
+
 (define-function g_unicode_canonical_ordering
   (c-name "g_unicode_canonical_ordering")
   (return-type "none")
@@ -11712,6 +11755,16 @@
   )
 )
 
+(define-function g_utf8_substring
+  (c-name "g_utf8_substring")
+  (return-type "gchar*")
+  (parameters
+    '("const-gchar*" "str")
+    '("glong" "start_pos")
+    '("glong" "end_pos")
+  )
+)
+
 (define-function g_utf8_strncpy
   (c-name "g_utf8_strncpy")
   (return-type "gchar*")
@@ -11852,12 +11905,6 @@
   )
 )
 
-(define-method validate
-  (of-object "gunichar")
-  (c-name "g_unichar_validate")
-  (return-type "gboolean")
-)
-
 (define-function g_utf8_strup
   (c-name "g_utf8_strup")
   (return-type "gchar*")
@@ -11922,33 +11969,6 @@
   )
 )
 
-(define-method get_mirror_char
-  (of-object "gunichar")
-  (c-name "g_unichar_get_mirror_char")
-  (return-type "gboolean")
-  (parameters
-    '("gunichar*" "mirrored_ch")
-  )
-)
-
-(define-method get_script
-  (of-object "gunichar")
-  (c-name "g_unichar_get_script")
-  (return-type "GUnicodeScript")
-)
-
-
-
-;; From gunicodeprivate.h
-
-
-
-;; From gunicomp.h
-
-
-
-;; From gunidecomp.h
-
 
 
 ;; From gurifuncs.h
@@ -12235,10 +12255,6 @@
 
 
 
-;; From gvariant-core.h
-
-
-
 ;; From gvariant.h
 
 (define-method unref
@@ -12265,6 +12281,12 @@
   (return-type "gboolean")
 )
 
+(define-method take_ref
+  (of-object "GVariant")
+  (c-name "g_variant_take_ref")
+  (return-type "GVariant*")
+)
+
 (define-method get_type
   (of-object "GVariant")
   (c-name "g_variant_get_type")
@@ -12433,6 +12455,15 @@
   )
 )
 
+(define-function g_variant_new_objv
+  (c-name "g_variant_new_objv")
+  (return-type "GVariant*")
+  (parameters
+    '("const-gchar*-const*" "strv")
+    '("gssize" "length")
+  )
+)
+
 (define-function g_variant_new_bytestring
   (c-name "g_variant_new_bytestring")
   (return-type "GVariant*")
@@ -12552,6 +12583,24 @@
   )
 )
 
+(define-method get_objv
+  (of-object "GVariant")
+  (c-name "g_variant_get_objv")
+  (return-type "const-gchar**")
+  (parameters
+    '("gsize*" "length")
+  )
+)
+
+(define-method dup_objv
+  (of-object "GVariant")
+  (c-name "g_variant_dup_objv")
+  (return-type "gchar**")
+  (parameters
+    '("gsize*" "length")
+  )
+)
+
 (define-method get_bytestring
   (of-object "GVariant")
   (c-name "g_variant_get_bytestring")
@@ -13005,110 +13054,6 @@
 
 
 
-;; From gvariant-internal.h
-
-(define-function g_variant_format_string_scan
-  (c-name "g_variant_format_string_scan")
-  (return-type "gboolean")
-  (parameters
-    '("const-gchar*" "string")
-    '("const-gchar*" "limit")
-    '("const-gchar**" "endptr")
-  )
-)
-
-(define-function g_variant_format_string_scan_type
-  (c-name "g_variant_format_string_scan_type")
-  (return-type "GVariantType*")
-  (parameters
-    '("const-gchar*" "string")
-    '("const-gchar*" "limit")
-    '("const-gchar**" "endptr")
-  )
-)
-
-
-
-;; From gvariant-serialiser.h
-
-(define-method n_children
-  (of-object "GVariantSerialised")
-  (c-name "g_variant_serialised_n_children")
-  (return-type "gsize")
-)
-
-(define-method get_child
-  (of-object "GVariantSerialised")
-  (c-name "g_variant_serialised_get_child")
-  (return-type "GVariantSerialised")
-  (parameters
-    '("gsize" "index")
-  )
-)
-
-(define-function g_variant_serialiser_needed_size
-  (c-name "g_variant_serialiser_needed_size")
-  (return-type "gsize")
-  (parameters
-    '("GVariantTypeInfo*" "info")
-    '("GVariantSerialisedFiller" "gsv_filler")
-    '("const-gpointer*" "children")
-    '("gsize" "n_children")
-  )
-)
-
-(define-function g_variant_serialiser_serialise
-  (c-name "g_variant_serialiser_serialise")
-  (return-type "none")
-  (parameters
-    '("GVariantSerialised" "container")
-    '("GVariantSerialisedFiller" "gsv_filler")
-    '("const-gpointer*" "children")
-    '("gsize" "n_children")
-  )
-)
-
-(define-method is_normal
-  (of-object "GVariantSerialised")
-  (c-name "g_variant_serialised_is_normal")
-  (return-type "gboolean")
-)
-
-(define-method byteswap
-  (of-object "GVariantSerialised")
-  (c-name "g_variant_serialised_byteswap")
-  (return-type "none")
-)
-
-(define-function g_variant_serialiser_is_string
-  (c-name "g_variant_serialiser_is_string")
-  (return-type "gboolean")
-  (parameters
-    '("gconstpointer" "data")
-    '("gsize" "size")
-  )
-)
-
-(define-function g_variant_serialiser_is_object_path
-  (c-name "g_variant_serialiser_is_object_path")
-  (return-type "gboolean")
-  (parameters
-    '("gconstpointer" "data")
-    '("gsize" "size")
-  )
-)
-
-(define-function g_variant_serialiser_is_signature
-  (c-name "g_variant_serialiser_is_signature")
-  (return-type "gboolean")
-  (parameters
-    '("gconstpointer" "data")
-    '("gsize" "size")
-  )
-)
-
-
-
 ;; From gvarianttype.h
 
 (define-function g_variant_type_string_is_valid
@@ -13318,80 +13263,6 @@
 
 
 
-;; From gvarianttypeinfo.h
-
-(define-method get_type_string
-  (of-object "GVariantTypeInfo")
-  (c-name "g_variant_type_info_get_type_string")
-  (return-type "const-gchar*")
-)
-
-(define-method query
-  (of-object "GVariantTypeInfo")
-  (c-name "g_variant_type_info_query")
-  (return-type "none")
-  (parameters
-    '("guint*" "alignment")
-    '("gsize*" "size")
-  )
-)
-
-(define-method element
-  (of-object "GVariantTypeInfo")
-  (c-name "g_variant_type_info_element")
-  (return-type "GVariantTypeInfo*")
-)
-
-(define-method query_element
-  (of-object "GVariantTypeInfo")
-  (c-name "g_variant_type_info_query_element")
-  (return-type "none")
-  (parameters
-    '("guint*" "alignment")
-    '("gsize*" "size")
-  )
-)
-
-(define-method n_members
-  (of-object "GVariantTypeInfo")
-  (c-name "g_variant_type_info_n_members")
-  (return-type "gsize")
-)
-
-(define-method member_info
-  (of-object "GVariantTypeInfo")
-  (c-name "g_variant_type_info_member_info")
-  (return-type "const-GVariantMemberInfo*")
-  (parameters
-    '("gsize" "index")
-  )
-)
-
-(define-method info_get
-  (of-object "GVariantType")
-  (c-name "g_variant_type_info_get")
-  (return-type "GVariantTypeInfo*")
-)
-
-(define-method ref
-  (of-object "GVariantTypeInfo")
-  (c-name "g_variant_type_info_ref")
-  (return-type "GVariantTypeInfo*")
-)
-
-(define-method unref
-  (of-object "GVariantTypeInfo")
-  (c-name "g_variant_type_info_unref")
-  (return-type "none")
-)
-
-(define-function g_variant_type_info_assert_no_infos
-  (c-name "g_variant_type_info_assert_no_infos")
-  (return-type "none")
-)
-
-
-
 ;; From gwin32.h
 
 (define-function g_win32_ftruncate
diff --git a/glib/src/gmodule_functions.defs b/glib/src/gmodule_functions.defs
index 29b48355..853bd0bd 100644
--- a/glib/src/gmodule_functions.defs
+++ b/glib/src/gmodule_functions.defs
@@ -14,10 +14,6 @@
 )
 
 
-;; From gmoduleconf.h
-
-
-
 ;; From gmodule.h
 
 (define-function g_module_supported
diff --git a/glib/src/gobject_functions.defs b/glib/src/gobject_functions.defs
index af0e6a28..f92d8c76 100644
--- a/glib/src/gobject_functions.defs
+++ b/glib/src/gobject_functions.defs
@@ -32,16 +32,16 @@
   (c-name "GParamFlags")
   (gtype-id "G_TYPE_PARAM_FLAGS")
   (values
-    '("g-param-readable" "G_PARAM_READABLE")
-    '("g-param-writable" "G_PARAM_WRITABLE")
-    '("g-param-construct" "G_PARAM_CONSTRUCT")
-    '("g-param-construct-only" "G_PARAM_CONSTRUCT_ONLY")
-    '("g-param-lax-validation" "G_PARAM_LAX_VALIDATION")
-    '("g-param-static-name" "G_PARAM_STATIC_NAME")
-    '("#ifndef" "#ifndef")
-    '("#endif" "#endif")
-    '("g-param-static-blurb" "G_PARAM_STATIC_BLURB")
-    '("g-param-deprecated" "G_PARAM_DEPRECATED")
+    '("readable" "G_PARAM_READABLE")
+    '("writable" "G_PARAM_WRITABLE")
+    '("construct" "G_PARAM_CONSTRUCT")
+    '("construct-only" "G_PARAM_CONSTRUCT_ONLY")
+    '("lax-validation" "G_PARAM_LAX_VALIDATION")
+    '("static-name" "G_PARAM_STATIC_NAME")
+    '("private" "G_PARAM_PRIVATE")
+    '("static-nick" "G_PARAM_STATIC_NICK")
+    '("static-blurb" "G_PARAM_STATIC_BLURB")
+    '("deprecated" "G_PARAM_DEPRECATED")
   )
 )
 
@@ -120,10 +120,6 @@
 )
 
 
-;; From gatomicarray.h
-
-
-
 ;; From gbinding.h
 
 (define-function g_binding_flags_get_type
@@ -642,6 +638,11 @@
   (return-type "GType")
 )
 
+(define-function g_match_info_get_type
+  (c-name "g_match_info_get_type")
+  (return-type "GType")
+)
+
 (define-function g_error_get_type
   (c-name "g_error_get_type")
   (return-type "GType")
@@ -667,6 +668,21 @@
   (return-type "GType")
 )
 
+(define-function g_main_loop_get_type
+  (c-name "g_main_loop_get_type")
+  (return-type "GType")
+)
+
+(define-function g_main_context_get_type
+  (c-name "g_main_context_get_type")
+  (return-type "GType")
+)
+
+(define-function g_source_get_type
+  (c-name "g_source_get_type")
+  (return-type "GType")
+)
+
 (define-function g_variant_get_gtype
   (c-name "g_variant_get_gtype")
   (return-type "GType")
@@ -1191,10 +1207,6 @@
 
 
 
-;; From gobject_trace.h
-
-
-
 ;; From gparam.h
 
 (define-method ref
@@ -2791,10 +2803,6 @@
 
 
 
-;; From gtype-private.h
-
-
-
 ;; From gvaluearray.h
 
 (define-method get_nth
@@ -3278,7 +3286,3 @@
 )
 
 
-
-;; From stamp-gmarshal.h
-
-