Regenerated more defs.

* gio/src/gio_enums.defs: Regenerated with enums.pl.
* gio/src/gio_methods.defs: Regenerated with h2defs.py.
* glib/src/glib_functions.defs:
* glib/src/gobject_functions.defs: Regenereated with h2defs.py
* glib/src/glib_deprecated_functions.defs: Added this file.
* glib/src/glib.defs: Mention the new file.

7 files changed, 800 insertions, 1039 deletions

diff --git a/ChangeLog b/ChangeLog
index 05e6b4f1..ca8ae856 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2011-10-25  Murray Cumming  <murrayc@murrayc.com>
 
+	Regenerated more defs.
+
+	* gio/src/gio_enums.defs: Regenerated with enums.pl.
+	* gio/src/gio_methods.defs: Regenerated with h2defs.py.
+	* glib/src/glib_functions.defs:
+	* glib/src/gobject_functions.defs: Regenereated with h2defs.py
+	* glib/src/glib_deprecated_functions.defs: Added this file.
+	* glib/src/glib.defs: Mention the new file.
+
+2011-10-25  Murray Cumming  <murrayc@murrayc.com>
+
 	Do not use gthread-2.0.
 
 	* configure.ac: Do not use gthread-2.0 at all, because it only contains 
diff --git a/gio/src/gio_enums.defs b/gio/src/gio_enums.defs
index 34e0a727..145998d4 100644
--- a/gio/src/gio_enums.defs
+++ b/gio/src/gio_enums.defs
@@ -442,7 +442,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")
-     '("host-not-found" "G_IO_ERROR_HOST_WAS_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")
@@ -534,6 +534,25 @@
 )
 
 ;; 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")
+  (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)")
+  )
+)
+
+;; Original typedef:
 ;; typedef enum  {
 ;;   G_EMBLEM_ORIGIN_UNKNOWN,
 ;;   G_EMBLEM_ORIGIN_DEVICE,
@@ -1035,14 +1054,16 @@
 ;; Original typedef:
 ;; typedef enum /*< flags >*/
 ;; {
-;;   G_DBUS_SIGNAL_FLAGS_NONE = 0
+;;   G_DBUS_SIGNAL_FLAGS_NONE = 0,
+;;   G_DBUS_SIGNAL_FLAGS_NO_MATCH_RULE = (1<<0)
 ;; } GDBusSignalFlags;
 
 (define-flags-extended DBusSignalFlags
   (in-module "G")
   (c-name "GDBusSignalFlags")
   (values
-    '("us-signal-flags-none" "G_DBUS_SIGNAL_FLAGS_NONE" "0x0")
+    '("none" "G_DBUS_SIGNAL_FLAGS_NONE" "0x0")
+    '("no-match-rule" "G_DBUS_SIGNAL_FLAGS_NO_MATCH_RULE" "(1<<0)")
   )
 )
 
@@ -1067,7 +1088,8 @@
 ;; {
 ;;   G_CREDENTIALS_TYPE_INVALID,
 ;;   G_CREDENTIALS_TYPE_LINUX_UCRED,
-;;   G_CREDENTIALS_TYPE_FREEBSD_CMSGCRED
+;;   G_CREDENTIALS_TYPE_FREEBSD_CMSGCRED,
+;;   G_CREDENTIALS_TYPE_OPENBSD_SOCKPEERCRED
 ;; } GCredentialsType;
 
 (define-enum-extended CredentialsType
@@ -1077,6 +1099,7 @@
     '("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")
   )
 )
 
@@ -1102,9 +1125,12 @@
 ;;   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_HANDLES_COMMAND_LINE = (1 << 3),
+;;   G_APPLICATION_SEND_ENVIRONMENT    =  (1 << 4),
+;; 
+;;   G_APPLICATION_NON_UNIQUE =           (1 << 5)
 ;; } GApplicationFlags;
 
 (define-flags-extended ApplicationFlags
@@ -1116,6 +1142,207 @@
     '("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)")
+  )
+)
+
+;; 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")
+  (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")
+  )
+)
+
+;; 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")
+  (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")
+  )
+)
+
+;; 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")
+  (values
+    '("none" "G_TLS_AUTHENTICATION_NONE" "0")
+    '("requested" "G_TLS_AUTHENTICATION_REQUESTED" "1")
+    '("required" "G_TLS_AUTHENTICATION_REQUIRED" "2")
+  )
+)
+
+;; 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")
+  (values
+    '("never" "G_TLS_REHANDSHAKE_NEVER" "0")
+    '("safely" "G_TLS_REHANDSHAKE_SAFELY" "1")
+    '("unsafely" "G_TLS_REHANDSHAKE_UNSAFELY" "2")
+  )
+)
+
+;; 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")
+  (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")
+  )
+)
+
+;; 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")
+  (values
+    '("unhandled" "G_TLS_INTERACTION_UNHANDLED" "0")
+    '("handled" "G_TLS_INTERACTION_HANDLED" "1")
+    '("failed" "G_TLS_INTERACTION_FAILED" "2")
+  )
+)
+
+;; 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")
+  (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)")
+  )
+)
+
+;; 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")
+  (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)")
+  )
+)
+
+;; Original typedef:
+;; typedef enum {
+;;   G_TLS_DATABASE_VERIFY_NONE = 0
+;; } GTlsDatabaseVerifyFlags;
+
+(define-flags-extended TlsDatabaseVerifyFlags
+  (in-module "G")
+  (c-name "GTlsDatabaseVerifyFlags")
+  (values
+    '("none" "G_TLS_DATABASE_VERIFY_NONE" "0x0")
+  )
+)
+
+;; Original typedef:
+;; typedef enum {
+;;   G_TLS_DATABASE_LOOKUP_NONE = 0,
+;;   G_TLS_DATABASE_LOOKUP_KEYPAIR = 1
+;; } GTlsDatabaseLookupFlags;
+
+(define-flags-extended TlsDatabaseLookupFlags
+  (in-module "G")
+  (c-name "GTlsDatabaseLookupFlags")
+  (values
+    '("none" "G_TLS_DATABASE_LOOKUP_NONE" "0x0")
+    '("keypair" "G_TLS_DATABASE_LOOKUP_KEYPAIR" "0x1")
+  )
+)
+
+;; 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")
+  (values
+    '("none" "G_IO_MODULE_SCOPE_NONE" "0x0")
+    '("block-duplicates" "G_IO_MODULE_SCOPE_BLOCK_DUPLICATES" "0x1")
   )
 )
 
@@ -1144,3 +1371,4 @@
     '("invert-boolean" "G_SETTINGS_BIND_INVERT_BOOLEAN" "(1<<4)")
   )
 )
+
diff --git a/gio/src/gio_methods.defs b/gio/src/gio_methods.defs
index d4f61c1e..0fad83f5 100644
--- a/gio/src/gio_methods.defs
+++ b/gio/src/gio_methods.defs
@@ -1787,6 +1787,31 @@
   (return-type "GAppLaunchContext*")
 )
 
+(define-method setenv
+  (of-object "GAppLaunchContext")
+  (c-name "g_app_launch_context_setenv")
+  (return-type "none")
+  (parameters
+    '("const-char*" "variable")
+    '("const-char*" "value")
+  )
+)
+
+(define-method unsetenv
+  (of-object "GAppLaunchContext")
+  (c-name "g_app_launch_context_unsetenv")
+  (return-type "none")
+  (parameters
+    '("const-char*" "variable")
+  )
+)
+
+(define-method get_environment
+  (of-object "GAppLaunchContext")
+  (c-name "g_app_launch_context_get_environment")
+  (return-type "char**")
+)
+
 (define-method get_display
   (of-object "GAppLaunchContext")
   (c-name "g_app_launch_context_get_display")
@@ -5520,28 +5545,6 @@
   (return-type "gboolean")
 )
 
-(define-method eject
-  (of-object "GDrive")
-  (c-name "g_drive_eject")
-  (return-type "none")
-  (parameters
-    '("GMountUnmountFlags" "flags")
-    '("GCancellable*" "cancellable")
-    '("GAsyncReadyCallback" "callback")
-    '("gpointer" "user_data")
-  )
-)
-
-(define-method eject_finish
-  (of-object "GDrive")
-  (c-name "g_drive_eject_finish")
-  (return-type "gboolean")
-  (parameters
-    '("GAsyncResult*" "result")
-    '("GError**" "error")
-  )
-)
-
 (define-method poll_for_media
   (of-object "GDrive")
   (c-name "g_drive_poll_for_media")
@@ -5671,6 +5674,12 @@
   )
 )
 
+(define-method get_sort_key
+  (of-object "GDrive")
+  (c-name "g_drive_get_sort_key")
+  (return-type "const-gchar*")
+)
+
 
 
 ;; From gemblemedicon.h
@@ -6813,28 +6822,6 @@
   )
 )
 
-(define-method unmount_mountable
-  (of-object "GFile")
-  (c-name "g_file_unmount_mountable")
-  (return-type "none")
-  (parameters
-    '("GMountUnmountFlags" "flags")
-    '("GCancellable*" "cancellable")
-    '("GAsyncReadyCallback" "callback")
-    '("gpointer" "user_data")
-  )
-)
-
-(define-method unmount_mountable_finish
-  (of-object "GFile")
-  (c-name "g_file_unmount_mountable_finish")
-  (return-type "gboolean")
-  (parameters
-    '("GAsyncResult*" "result")
-    '("GError**" "error")
-  )
-)
-
 (define-method unmount_mountable_with_operation
   (of-object "GFile")
   (c-name "g_file_unmount_mountable_with_operation")
@@ -6858,28 +6845,6 @@
   )
 )
 
-(define-method eject_mountable
-  (of-object "GFile")
-  (c-name "g_file_eject_mountable")
-  (return-type "none")
-  (parameters
-    '("GMountUnmountFlags" "flags")
-    '("GCancellable*" "cancellable")
-    '("GAsyncReadyCallback" "callback")
-    '("gpointer" "user_data")
-  )
-)
-
-(define-method eject_mountable_finish
-  (of-object "GFile")
-  (c-name "g_file_eject_mountable_finish")
-  (return-type "gboolean")
-  (parameters
-    '("GAsyncResult*" "result")
-    '("GError**" "error")
-  )
-)
-
 (define-method eject_mountable_with_operation
   (of-object "GFile")
   (c-name "g_file_eject_mountable_with_operation")
@@ -9295,50 +9260,6 @@
   (return-type "gboolean")
 )
 
-(define-method unmount
-  (of-object "GMount")
-  (c-name "g_mount_unmount")
-  (return-type "none")
-  (parameters
-    '("GMountUnmountFlags" "flags")
-    '("GCancellable*" "cancellable")
-    '("GAsyncReadyCallback" "callback")
-    '("gpointer" "user_data")
-  )
-)
-
-(define-method unmount_finish
-  (of-object "GMount")
-  (c-name "g_mount_unmount_finish")
-  (return-type "gboolean")
-  (parameters
-    '("GAsyncResult*" "result")
-    '("GError**" "error")
-  )
-)
-
-(define-method eject
-  (of-object "GMount")
-  (c-name "g_mount_eject")
-  (return-type "none")
-  (parameters
-    '("GMountUnmountFlags" "flags")
-    '("GCancellable*" "cancellable")
-    '("GAsyncReadyCallback" "callback")
-    '("gpointer" "user_data")
-  )
-)
-
-(define-method eject_finish
-  (of-object "GMount")
-  (c-name "g_mount_eject_finish")
-  (return-type "gboolean")
-  (parameters
-    '("GAsyncResult*" "result")
-    '("GError**" "error")
-  )
-)
-
 (define-method remount
   (of-object "GMount")
   (c-name "g_mount_remount")
@@ -9459,6 +9380,12 @@
   )
 )
 
+(define-method get_sort_key
+  (of-object "GMount")
+  (c-name "g_mount_get_sort_key")
+  (return-type "const-gchar*")
+)
+
 
 
 ;; From gmountoperation.h
@@ -12704,21 +12631,6 @@
   (return-type "GType")
 )
 
-(define-method set_use_system_certdb
-  (of-object "GTlsConnection")
-  (c-name "g_tls_connection_set_use_system_certdb")
-  (return-type "none")
-  (parameters
-    '("gboolean" "use_system_certdb")
-  )
-)
-
-(define-method get_use_system_certdb
-  (of-object "GTlsConnection")
-  (c-name "g_tls_connection_get_use_system_certdb")
-  (return-type "gboolean")
-)
-
 (define-method set_database
   (of-object "GTlsConnection")
   (c-name "g_tls_connection_set_database")
@@ -13341,28 +13253,6 @@
   )
 )
 
-(define-method eject
-  (of-object "GVolume")
-  (c-name "g_volume_eject")
-  (return-type "none")
-  (parameters
-    '("GMountUnmountFlags" "flags")
-    '("GCancellable*" "cancellable")
-    '("GAsyncReadyCallback" "callback")
-    '("gpointer" "user_data")
-  )
-)
-
-(define-method eject_finish
-  (of-object "GVolume")
-  (c-name "g_volume_eject_finish")
-  (return-type "gboolean")
-  (parameters
-    '("GAsyncResult*" "result")
-    '("GError**" "error")
-  )
-)
-
 (define-method get_identifier
   (of-object "GVolume")
   (c-name "g_volume_get_identifier")
@@ -13407,6 +13297,12 @@
   )
 )
 
+(define-method get_sort_key
+  (of-object "GVolume")
+  (c-name "g_volume_get_sort_key")
+  (return-type "const-gchar*")
+)
+
 
 
 ;; From gvolumemonitor.h
diff --git a/glib/src/glib.defs b/glib/src/glib.defs
index 640c5ed9..18231910 100644
--- a/glib/src/glib.defs
+++ b/glib/src/glib.defs
@@ -1,4 +1,5 @@
 (include glib_functions.defs)
+(include glib_deprecated_functions.defs)
 (include glib_enums.defs)
 (include glib_deprecated_enums.defs)
 (include glib_extra_objects.defs)
diff --git a/glib/src/glib_functions.defs b/glib/src/glib_functions.defs
index 32fa922e..76d35cb2 100644
--- a/glib/src/glib_functions.defs
+++ b/glib/src/glib_functions.defs
@@ -137,17 +137,6 @@
   )
 )
 
-(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")
@@ -233,7 +222,7 @@
     '("append" "G_IO_FLAG_APPEND")
     '("nonblock" "G_IO_FLAG_NONBLOCK")
     '("is-readable" "G_IO_FLAG_IS_READABLE")
-    '("is-writeable" "G_IO_FLAG_IS_WRITEABLE")
+    '("is-writable" "G_IO_FLAG_IS_WRITABLE")
     '("is-seekable" "G_IO_FLAG_IS_SEEKABLE")
     '("mask" "G_IO_FLAG_MASK")
     '("get-mask" "G_IO_FLAG_GET_MASK")
@@ -622,18 +611,6 @@
   )
 )
 
-(define-enum Priority
-  (in-module "GThread")
-  (c-name "GThreadPriority")
-  (gtype-id "G_TYPE_THREAD_PRIORITY")
-  (values
-    '("low" "G_THREAD_PRIORITY_LOW")
-    '("normal" "G_THREAD_PRIORITY_NORMAL")
-    '("high" "G_THREAD_PRIORITY_HIGH")
-    '("urgent" "G_THREAD_PRIORITY_URGENT")
-  )
-)
-
 (define-enum Status
   (in-module "GOnce")
   (c-name "GOnceStatus")
@@ -877,6 +854,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-enum Class
   (in-module "GVariant")
   (c-name "GVariantClass")
@@ -1389,18 +1377,6 @@
   (return-type "none")
 )
 
-(define-method ref_unlocked
-  (of-object "GAsyncQueue")
-  (c-name "g_async_queue_ref_unlocked")
-  (return-type "none")
-)
-
-(define-method unref_and_unlock
-  (of-object "GAsyncQueue")
-  (c-name "g_async_queue_unref_and_unlock")
-  (return-type "none")
-)
-
 (define-method push
   (of-object "GAsyncQueue")
   (c-name "g_async_queue_push")
@@ -1661,15 +1637,6 @@
   )
 )
 
-(define-function g_atomic_int_exchange_and_add
-  (c-name "g_atomic_int_exchange_and_add")
-  (return-type "gint")
-  (parameters
-    '("volatile-gint*" "atomic")
-    '("gint" "val")
-  )
-)
-
 
 
 ;; From gbacktrace.h
@@ -2224,64 +2191,26 @@
 
 
 
-;; From gcache.h
+;; From gcharset.h
 
-(define-function g_cache_new
-  (c-name "g_cache_new")
-  (is-constructor-of "GCache")
-  (return-type "GCache*")
-  (parameters
-    '("GCacheNewFunc" "value_new_func")
-    '("GCacheDestroyFunc" "value_destroy_func")
-    '("GCacheDupFunc" "key_dup_func")
-    '("GCacheDestroyFunc" "key_destroy_func")
-    '("GHashFunc" "hash_key_func")
-    '("GHashFunc" "hash_value_func")
-    '("GEqualFunc" "key_equal_func")
-  )
-)
-
-(define-method destroy
-  (of-object "GCache")
-  (c-name "g_cache_destroy")
-  (return-type "none")
-)
-
-(define-method insert
-  (of-object "GCache")
-  (c-name "g_cache_insert")
-  (return-type "gpointer")
-  (parameters
-    '("gpointer" "key")
-  )
-)
-
-(define-method remove
-  (of-object "GCache")
-  (c-name "g_cache_remove")
-  (return-type "none")
+(define-function g_get_charset
+  (c-name "g_get_charset")
+  (return-type "gboolean")
   (parameters
-    '("gconstpointer" "value")
+    '("const-char**" "charset")
   )
 )
 
-(define-method key_foreach
-  (of-object "GCache")
-  (c-name "g_cache_key_foreach")
-  (return-type "none")
-  (parameters
-    '("GHFunc" "func")
-    '("gpointer" "user_data")
-  )
+(define-function g_get_codeset
+  (c-name "g_get_codeset")
+  (return-type "gchar*")
 )
 
-(define-method value_foreach
-  (of-object "GCache")
-  (c-name "g_cache_value_foreach")
-  (return-type "none")
+(define-function g_get_locale_variants
+  (c-name "g_get_locale_variants")
+  (return-type "gchar**")
   (parameters
-    '("GHFunc" "func")
-    '("gpointer" "user_data")
+    '("const-gchar*" "locale")
   )
 )
 
@@ -2370,78 +2299,6 @@
 
 
 
-;; From gcompletion.h
-
-(define-function g_completion_new
-  (c-name "g_completion_new")
-  (is-constructor-of "GCompletion")
-  (return-type "GCompletion*")
-  (parameters
-    '("GCompletionFunc" "func")
-  )
-)
-
-(define-method add_items
-  (of-object "GCompletion")
-  (c-name "g_completion_add_items")
-  (return-type "none")
-  (parameters
-    '("GList*" "items")
-  )
-)
-
-(define-method remove_items
-  (of-object "GCompletion")
-  (c-name "g_completion_remove_items")
-  (return-type "none")
-  (parameters
-    '("GList*" "items")
-  )
-)
-
-(define-method clear_items
-  (of-object "GCompletion")
-  (c-name "g_completion_clear_items")
-  (return-type "none")
-)
-
-(define-method complete
-  (of-object "GCompletion")
-  (c-name "g_completion_complete")
-  (return-type "GList*")
-  (parameters
-    '("const-gchar*" "prefix")
-    '("gchar**" "new_prefix")
-  )
-)
-
-(define-method complete_utf8
-  (of-object "GCompletion")
-  (c-name "g_completion_complete_utf8")
-  (return-type "GList*")
-  (parameters
-    '("const-gchar*" "prefix")
-    '("gchar**" "new_prefix")
-  )
-)
-
-(define-method set_compare
-  (of-object "GCompletion")
-  (c-name "g_completion_set_compare")
-  (return-type "none")
-  (parameters
-    '("GCompletionStrncmpFunc" "strncmp_func")
-  )
-)
-
-(define-method free
-  (of-object "GCompletion")
-  (c-name "g_completion_free")
-  (return-type "none")
-)
-
-
-
 ;; From gconvert.h
 
 (define-function g_convert_error_quark
@@ -2927,15 +2784,6 @@
   )
 )
 
-(define-method set_time
-  (of-object "GDate")
-  (c-name "g_date_set_time")
-  (return-type "none")
-  (parameters
-    '("GTime" "time_")
-  )
-)
-
 (define-method set_month
   (of-object "GDate")
   (c-name "g_date_set_month")
@@ -3547,6 +3395,75 @@
 
 
 
+;; From genviron.h
+
+(define-function g_getenv
+  (c-name "g_getenv")
+  (return-type "const-gchar*")
+  (parameters
+    '("const-gchar*" "variable")
+  )
+)
+
+(define-function g_setenv
+  (c-name "g_setenv")
+  (return-type "gboolean")
+  (parameters
+    '("const-gchar*" "variable")
+    '("const-gchar*" "value")
+    '("gboolean" "overwrite")
+  )
+)
+
+(define-function g_unsetenv
+  (c-name "g_unsetenv")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "variable")
+  )
+)
+
+(define-function g_listenv
+  (c-name "g_listenv")
+  (return-type "gchar**")
+)
+
+(define-function g_get_environ
+  (c-name "g_get_environ")
+  (return-type "gchar**")
+)
+
+(define-function g_environ_getenv
+  (c-name "g_environ_getenv")
+  (return-type "const-gchar*")
+  (parameters
+    '("gchar**" "envp")
+    '("const-gchar*" "variable")
+  )
+)
+
+(define-function g_environ_setenv
+  (c-name "g_environ_setenv")
+  (return-type "gchar**")
+  (parameters
+    '("gchar**" "envp")
+    '("const-gchar*" "variable")
+    '("const-gchar*" "value")
+    '("gboolean" "overwrite")
+  )
+)
+
+(define-function g_environ_unsetenv
+  (c-name "g_environ_unsetenv")
+  (return-type "gchar**")
+  (parameters
+    '("gchar**" "envp")
+    '("const-gchar*" "variable")
+  )
+)
+
+
+
 ;; From gerror.h
 
 (define-function g_error_new
@@ -3776,31 +3693,6 @@
   )
 )
 
-(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*")
-  (parameters
-    '("goffset" "size")
-  )
-)
-
 (define-function g_build_path
   (c-name "g_build_path")
   (return-type "gchar*")
@@ -3839,10 +3731,110 @@
 
 (define-function g_mkdir_with_parents
   (c-name "g_mkdir_with_parents")
-  (return-type "int")
+  (return-type "gint")
   (parameters
     '("const-gchar*" "pathname")
-    '("int" "mode")
+    '("gint" "mode")
+  )
+)
+
+(define-function g_path_is_absolute
+  (c-name "g_path_is_absolute")
+  (return-type "gboolean")
+  (parameters
+    '("const-gchar*" "file_name")
+  )
+)
+
+(define-function g_path_skip_root
+  (c-name "g_path_skip_root")
+  (return-type "const-gchar*")
+  (parameters
+    '("const-gchar*" "file_name")
+  )
+)
+
+(define-function g_get_current_dir
+  (c-name "g_get_current_dir")
+  (return-type "gchar*")
+)
+
+(define-function g_path_get_basename
+  (c-name "g_path_get_basename")
+  (return-type "gchar*")
+  (parameters
+    '("const-gchar*" "file_name")
+  )
+)
+
+(define-function g_path_get_dirname
+  (c-name "g_path_get_dirname")
+  (return-type "gchar*")
+  (parameters
+    '("const-gchar*" "file_name")
+  )
+)
+
+
+
+;; From ggettext.h
+
+(define-function g_strip_context
+  (c-name "g_strip_context")
+  (return-type "const-gchar*")
+  (parameters
+    '("const-gchar*" "msgid")
+    '("const-gchar*" "msgval")
+  )
+)
+
+(define-function g_dgettext
+  (c-name "g_dgettext")
+  (return-type "const-gchar*")
+  (parameters
+    '("const-gchar*" "domain")
+    '("const-gchar*" "msgid")
+  )
+)
+
+(define-function g_dcgettext
+  (c-name "g_dcgettext")
+  (return-type "const-gchar*")
+  (parameters
+    '("const-gchar*" "domain")
+    '("const-gchar*" "msgid")
+    '("gint" "category")
+  )
+)
+
+(define-function g_dngettext
+  (c-name "g_dngettext")
+  (return-type "const-gchar*")
+  (parameters
+    '("const-gchar*" "domain")
+    '("const-gchar*" "msgid")
+    '("const-gchar*" "msgid_plural")
+    '("gulong" "n")
+  )
+)
+
+(define-function g_dpgettext
+  (c-name "g_dpgettext")
+  (return-type "const-gchar*")
+  (parameters
+    '("const-gchar*" "domain")
+    '("const-gchar*" "msgctxtid")
+    '("gsize" "msgidoffset")
+  )
+)
+
+(define-function g_dpgettext2
+  (c-name "g_dpgettext2")
+  (return-type "const-gchar*")
+  (parameters
+    '("const-gchar*" "domain")
+    '("const-gchar*" "context")
+    '("const-gchar*" "msgid")
   )
 )
 
@@ -4525,44 +4517,6 @@
   (return-type "none")
 )
 
-(define-method read
-  (of-object "GIOChannel")
-  (c-name "g_io_channel_read")
-  (return-type "GIOError")
-  (parameters
-    '("gchar*" "buf")
-    '("gsize" "count")
-    '("gsize*" "bytes_read")
-  )
-)
-
-(define-method write
-  (of-object "GIOChannel")
-  (c-name "g_io_channel_write")
-  (return-type "GIOError")
-  (parameters
-    '("const-gchar*" "buf")
-    '("gsize" "count")
-    '("gsize*" "bytes_written")
-  )
-)
-
-(define-method seek
-  (of-object "GIOChannel")
-  (c-name "g_io_channel_seek")
-  (return-type "GIOError")
-  (parameters
-    '("gint64" "offset")
-    '("GSeekType" "type")
-  )
-)
-
-(define-method close
-  (of-object "GIOChannel")
-  (c-name "g_io_channel_close")
-  (return-type "none")
-)
-
 (define-method shutdown
   (of-object "GIOChannel")
   (c-name "g_io_channel_shutdown")
@@ -4917,6 +4871,18 @@
   (return-type "GKeyFile*")
 )
 
+(define-method ref
+  (of-object "GKeyFile")
+  (c-name "g_key_file_ref")
+  (return-type "GKeyFile*")
+)
+
+(define-method unref
+  (of-object "GKeyFile")
+  (c-name "g_key_file_unref")
+  (return-type "none")
+)
+
 (define-method free
   (of-object "GKeyFile")
   (c-name "g_key_file_free")
@@ -5648,19 +5614,6 @@
   )
 )
 
-(define-function g_list_push_allocator
-  (c-name "g_list_push_allocator")
-  (return-type "none")
-  (parameters
-    '("gpointer" "allocator")
-  )
-)
-
-(define-function g_list_pop_allocator
-  (c-name "g_list_pop_allocator")
-  (return-type "none")
-)
-
 
 
 ;; From gmacros.h
@@ -5868,6 +5821,11 @@
   (return-type "GMainContext*")
 )
 
+(define-function g_main_context_ref_thread_default
+  (c-name "g_main_context_ref_thread_default")
+  (return-type "GMainContext*")
+)
+
 (define-function g_main_loop_new
   (c-name "g_main_loop_new")
   (is-constructor-of "GMainLoop")
@@ -6089,15 +6047,6 @@
   )
 )
 
-(define-method get_current_time
-  (of-object "GSource")
-  (c-name "g_source_get_current_time")
-  (return-type "none")
-  (parameters
-    '("GTimeVal*" "timeval")
-  )
-)
-
 (define-method get_time
   (of-object "GSource")
   (c-name "g_source_get_time")
@@ -6310,6 +6259,16 @@
   )
 )
 
+(define-function g_mapped_file_new_from_fd
+  (c-name "g_mapped_file_new_from_fd")
+  (return-type "GMappedFile*")
+  (parameters
+    '("gint" "fd")
+    '("gboolean" "writable")
+    '("GError**" "error")
+  )
+)
+
 (define-method get_length
   (of-object "GMappedFile")
   (c-name "g_mapped_file_get_length")
@@ -6334,12 +6293,6 @@
   (return-type "none")
 )
 
-(define-method free
-  (of-object "GMappedFile")
-  (c-name "g_mapped_file_free")
-  (return-type "none")
-)
-
 
 
 ;; From gmarkup.h
@@ -6608,89 +6561,6 @@
   (return-type "none")
 )
 
-(define-function g_mem_chunk_new
-  (c-name "g_mem_chunk_new")
-  (is-constructor-of "GMemChunk")
-  (return-type "GMemChunk*")
-  (parameters
-    '("const-gchar*" "name")
-    '("gint" "atom_size")
-    '("gsize" "area_size")
-    '("gint" "type")
-  )
-)
-
-(define-method destroy
-  (of-object "GMemChunk")
-  (c-name "g_mem_chunk_destroy")
-  (return-type "none")
-)
-
-(define-method alloc
-  (of-object "GMemChunk")
-  (c-name "g_mem_chunk_alloc")
-  (return-type "gpointer")
-)
-
-(define-method alloc0
-  (of-object "GMemChunk")
-  (c-name "g_mem_chunk_alloc0")
-  (return-type "gpointer")
-)
-
-(define-method free
-  (of-object "GMemChunk")
-  (c-name "g_mem_chunk_free")
-  (return-type "none")
-  (parameters
-    '("gpointer" "mem")
-  )
-)
-
-(define-method clean
-  (of-object "GMemChunk")
-  (c-name "g_mem_chunk_clean")
-  (return-type "none")
-)
-
-(define-method reset
-  (of-object "GMemChunk")
-  (c-name "g_mem_chunk_reset")
-  (return-type "none")
-)
-
-(define-method print
-  (of-object "GMemChunk")
-  (c-name "g_mem_chunk_print")
-  (return-type "none")
-)
-
-(define-function g_mem_chunk_info
-  (c-name "g_mem_chunk_info")
-  (return-type "none")
-)
-
-(define-function g_blow_chunks
-  (c-name "g_blow_chunks")
-  (return-type "none")
-)
-
-(define-function g_allocator_new
-  (c-name "g_allocator_new")
-  (is-constructor-of "GAllocator")
-  (return-type "GAllocator*")
-  (parameters
-    '("const-gchar*" "name")
-    '("guint" "n_preallocs")
-  )
-)
-
-(define-method free
-  (of-object "GAllocator")
-  (c-name "g_allocator_free")
-  (return-type "none")
-)
-
 
 
 ;; From gmessages.h
@@ -7060,19 +6930,6 @@
   (return-type "GNode*")
 )
 
-(define-function g_node_push_allocator
-  (c-name "g_node_push_allocator")
-  (return-type "none")
-  (parameters
-    '("gpointer" "dummy")
-  )
-)
-
-(define-function g_node_pop_allocator
-  (c-name "g_node_pop_allocator")
-  (return-type "none")
-)
-
 
 
 ;; From goption.h
@@ -8316,106 +8173,6 @@
 
 
 
-;; From grel.h
-
-(define-function g_relation_new
-  (c-name "g_relation_new")
-  (is-constructor-of "GRelation")
-  (return-type "GRelation*")
-  (parameters
-    '("gint" "fields")
-  )
-)
-
-(define-method destroy
-  (of-object "GRelation")
-  (c-name "g_relation_destroy")
-  (return-type "none")
-)
-
-(define-method index
-  (of-object "GRelation")
-  (c-name "g_relation_index")
-  (return-type "none")
-  (parameters
-    '("gint" "field")
-    '("GHashFunc" "hash_func")
-    '("GEqualFunc" "key_equal_func")
-  )
-)
-
-(define-method insert
-  (of-object "GRelation")
-  (c-name "g_relation_insert")
-  (return-type "none")
-  (parameters
-  )
-  (varargs #t)
-)
-
-(define-method delete
-  (of-object "GRelation")
-  (c-name "g_relation_delete")
-  (return-type "gint")
-  (parameters
-    '("gconstpointer" "key")
-    '("gint" "field")
-  )
-)
-
-(define-method select
-  (of-object "GRelation")
-  (c-name "g_relation_select")
-  (return-type "GTuples*")
-  (parameters
-    '("gconstpointer" "key")
-    '("gint" "field")
-  )
-)
-
-(define-method count
-  (of-object "GRelation")
-  (c-name "g_relation_count")
-  (return-type "gint")
-  (parameters
-    '("gconstpointer" "key")
-    '("gint" "field")
-  )
-)
-
-(define-method exists
-  (of-object "GRelation")
-  (c-name "g_relation_exists")
-  (return-type "gboolean")
-  (parameters
-  )
-  (varargs #t)
-)
-
-(define-method print
-  (of-object "GRelation")
-  (c-name "g_relation_print")
-  (return-type "none")
-)
-
-(define-method destroy
-  (of-object "GTuples")
-  (c-name "g_tuples_destroy")
-  (return-type "none")
-)
-
-(define-method index
-  (of-object "GTuples")
-  (c-name "g_tuples_index")
-  (return-type "gpointer")
-  (parameters
-    '("gint" "index_")
-    '("gint" "field")
-  )
-)
-
-
-
 ;; From gscanner.h
 
 (define-function g_scanner_new
@@ -9273,19 +9030,6 @@
   )
 )
 
-(define-function g_slist_push_allocator
-  (c-name "g_slist_push_allocator")
-  (return-type "none")
-  (parameters
-    '("gpointer" "dummy")
-  )
-)
-
-(define-function g_slist_pop_allocator
-  (c-name "g_slist_pop_allocator")
-  (return-type "none")
-)
-
 
 
 ;; From gspawn.h
@@ -9803,41 +9547,6 @@
   )
 )
 
-(define-function g_strcasecmp
-  (c-name "g_strcasecmp")
-  (return-type "gint")
-  (parameters
-    '("const-gchar*" "s1")
-    '("const-gchar*" "s2")
-  )
-)
-
-(define-function g_strncasecmp
-  (c-name "g_strncasecmp")
-  (return-type "gint")
-  (parameters
-    '("const-gchar*" "s1")
-    '("const-gchar*" "s2")
-    '("guint" "n")
-  )
-)
-
-(define-function g_strdown
-  (c-name "g_strdown")
-  (return-type "gchar*")
-  (parameters
-    '("gchar*" "string")
-  )
-)
-
-(define-function g_strup
-  (c-name "g_strup")
-  (return-type "gchar*")
-  (parameters
-    '("gchar*" "string")
-  )
-)
-
 (define-function g_strdup
   (c-name "g_strdup")
   (return-type "gchar*")
@@ -9988,68 +9697,9 @@
   )
 )
 
-(define-function g_strip_context
-  (c-name "g_strip_context")
-  (return-type "const-gchar*")
-  (parameters
-    '("const-gchar*" "msgid")
-    '("const-gchar*" "msgval")
-  )
-)
-
-(define-function g_dgettext
-  (c-name "g_dgettext")
-  (return-type "const-gchar*")
-  (parameters
-    '("const-gchar*" "domain")
-    '("const-gchar*" "msgid")
-  )
-)
-
-(define-function g_dcgettext
-  (c-name "g_dcgettext")
-  (return-type "const-gchar*")
-  (parameters
-    '("const-gchar*" "domain")
-    '("const-gchar*" "msgid")
-    '("int" "category")
-  )
-)
 
-(define-function g_dngettext
-  (c-name "g_dngettext")
-  (return-type "const-gchar*")
-  (parameters
-    '("const-gchar*" "domain")
-    '("const-gchar*" "msgid")
-    '("const-gchar*" "msgid_plural")
-    '("gulong" "n")
-  )
-)
 
-(define-function g_dpgettext
-  (c-name "g_dpgettext")
-  (return-type "const-gchar*")
-  (parameters
-    '("const-gchar*" "domain")
-    '("const-gchar*" "msgctxtid")
-    '("gsize" "msgidoffset")
-  )
-)
-
-(define-function g_dpgettext2
-  (c-name "g_dpgettext2")
-  (return-type "const-gchar*")
-  (parameters
-    '("const-gchar*" "domain")
-    '("const-gchar*" "context")
-    '("const-gchar*" "msgid")
-  )
-)
-
-
-
-;; From gstring.h
+;; From gstringchunk.h
 
 (define-function g_string_chunk_new
   (c-name "g_string_chunk_new")
@@ -10091,6 +9741,10 @@
   )
 )
 
+
+
+;; From gstring.h
+
 (define-function g_string_new
   (c-name "g_string_new")
   (is-constructor-of "GString")
@@ -10372,18 +10026,12 @@
   (c-name "g_string_append_uri_escaped")
   (return-type "GString*")
   (parameters
-    '("const-char*" "unescaped")
-    '("const-char*" "reserved_chars_allowed")
+    '("const-gchar*" "unescaped")
+    '("const-gchar*" "reserved_chars_allowed")
     '("gboolean" "allow_utf8")
   )
 )
 
-(define-method up
-  (of-object "GString")
-  (c-name "g_string_up")
-  (return-type "GString*")
-)
-
 
 
 ;; From gtestutils.h
@@ -10761,53 +10409,42 @@
 
 ;; From gthread.h
 
-(define-function guint64
-  (c-name "guint64")
-  (return-type "GLIB_VAR")
-  (parameters
-    '("*" "g_thread_gettime")
-  )
+(define-function g_thread_error_quark
+  (c-name "g_thread_error_quark")
+  (return-type "GQuark")
 )
 
-(define-function g_thread_init
-  (c-name "g_thread_init")
-  (return-type "none")
-  (parameters
-    '("GThreadFunctions*" "vtable")
-  )
+(define-method ref
+  (of-object "GThread")
+  (c-name "g_thread_ref")
+  (return-type "GThread*")
 )
 
-(define-function g_thread_init_with_errorcheck_mutexes
-  (c-name "g_thread_init_with_errorcheck_mutexes")
+(define-method unref
+  (of-object "GThread")
+  (c-name "g_thread_unref")
   (return-type "none")
-  (parameters
-    '("GThreadFunctions*" "vtable")
-  )
 )
 
-(define-function g_thread_get_initialized
-  (c-name "g_thread_get_initialized")
-  (return-type "gboolean")
-)
-
-(define-function g_static_mutex_get_mutex_impl
-  (c-name "g_static_mutex_get_mutex_impl")
-  (return-type "GMutex*")
+(define-function g_thread_new
+  (c-name "g_thread_new")
+  (is-constructor-of "GThread")
+  (return-type "GThread*")
   (parameters
-    '("GMutex**" "mutex")
+    '("const-gchar*" "name")
+    '("GThreadFunc" "func")
+    '("gpointer" "data")
   )
 )
 
-(define-function g_thread_create_full
-  (c-name "g_thread_create_full")
+(define-function g_thread_try_new
+  (c-name "g_thread_try_new")
+  (is-constructor-of "GThreadTry")
   (return-type "GThread*")
   (parameters
+    '("const-gchar*" "name")
     '("GThreadFunc" "func")
     '("gpointer" "data")
-    '("gulong" "stack_size")
-    '("gboolean" "joinable")
-    '("gboolean" "bound")
-    '("GThreadPriority" "priority")
     '("GError**" "error")
   )
 )
@@ -10831,154 +10468,183 @@
   (return-type "gpointer")
 )
 
-(define-method set_priority
-  (of-object "GThread")
-  (c-name "g_thread_set_priority")
+(define-function g_thread_yield
+  (c-name "g_thread_yield")
   (return-type "none")
-  (parameters
-    '("GThreadPriority" "priority")
-  )
 )
 
 (define-method init
-  (of-object "GStaticMutex")
-  (c-name "g_static_mutex_init")
+  (of-object "GMutex")
+  (c-name "g_mutex_init")
   (return-type "none")
 )
 
-(define-method free
-  (of-object "GStaticMutex")
-  (c-name "g_static_mutex_free")
+(define-method clear
+  (of-object "GMutex")
+  (c-name "g_mutex_clear")
   (return-type "none")
 )
 
-(define-method init
-  (of-object "GStaticPrivate")
-  (c-name "g_static_private_init")
+(define-method lock
+  (of-object "GMutex")
+  (c-name "g_mutex_lock")
   (return-type "none")
 )
 
-(define-method get
-  (of-object "GStaticPrivate")
-  (c-name "g_static_private_get")
-  (return-type "gpointer")
+(define-method trylock
+  (of-object "GMutex")
+  (c-name "g_mutex_trylock")
+  (return-type "gboolean")
 )
 
-(define-method set
-  (of-object "GStaticPrivate")
-  (c-name "g_static_private_set")
+(define-method unlock
+  (of-object "GMutex")
+  (c-name "g_mutex_unlock")
   (return-type "none")
-  (parameters
-    '("gpointer" "data")
-    '("GDestroyNotify" "notify")
-  )
 )
 
-(define-method free
-  (of-object "GStaticPrivate")
-  (c-name "g_static_private_free")
+(define-method init
+  (of-object "GRWLock")
+  (c-name "g_rw_lock_init")
   (return-type "none")
 )
 
-(define-method init
-  (of-object "GStaticRecMutex")
-  (c-name "g_static_rec_mutex_init")
+(define-method clear
+  (of-object "GRWLock")
+  (c-name "g_rw_lock_clear")
   (return-type "none")
 )
 
-(define-method lock
-  (of-object "GStaticRecMutex")
-  (c-name "g_static_rec_mutex_lock")
+(define-method writer_lock
+  (of-object "GRWLock")
+  (c-name "g_rw_lock_writer_lock")
   (return-type "none")
 )
 
-(define-method trylock
-  (of-object "GStaticRecMutex")
-  (c-name "g_static_rec_mutex_trylock")
+(define-method writer_trylock
+  (of-object "GRWLock")
+  (c-name "g_rw_lock_writer_trylock")
   (return-type "gboolean")
 )
 
-(define-method unlock
-  (of-object "GStaticRecMutex")
-  (c-name "g_static_rec_mutex_unlock")
+(define-method writer_unlock
+  (of-object "GRWLock")
+  (c-name "g_rw_lock_writer_unlock")
   (return-type "none")
 )
 
-(define-method lock_full
-  (of-object "GStaticRecMutex")
-  (c-name "g_static_rec_mutex_lock_full")
+(define-method reader_lock
+  (of-object "GRWLock")
+  (c-name "g_rw_lock_reader_lock")
   (return-type "none")
-  (parameters
-    '("guint" "depth")
-  )
 )
 
-(define-method unlock_full
-  (of-object "GStaticRecMutex")
-  (c-name "g_static_rec_mutex_unlock_full")
-  (return-type "guint")
+(define-method reader_trylock
+  (of-object "GRWLock")
+  (c-name "g_rw_lock_reader_trylock")
+  (return-type "gboolean")
 )
 
-(define-method free
-  (of-object "GStaticRecMutex")
-  (c-name "g_static_rec_mutex_free")
+(define-method reader_unlock
+  (of-object "GRWLock")
+  (c-name "g_rw_lock_reader_unlock")
   (return-type "none")
 )
 
 (define-method init
-  (of-object "GStaticRWLock")
-  (c-name "g_static_rw_lock_init")
+  (of-object "GRecMutex")
+  (c-name "g_rec_mutex_init")
   (return-type "none")
 )
 
-(define-method reader_lock
-  (of-object "GStaticRWLock")
-  (c-name "g_static_rw_lock_reader_lock")
+(define-method clear
+  (of-object "GRecMutex")
+  (c-name "g_rec_mutex_clear")
   (return-type "none")
 )
 
-(define-method reader_trylock
-  (of-object "GStaticRWLock")
-  (c-name "g_static_rw_lock_reader_trylock")
+(define-method lock
+  (of-object "GRecMutex")
+  (c-name "g_rec_mutex_lock")
+  (return-type "none")
+)
+
+(define-method trylock
+  (of-object "GRecMutex")
+  (c-name "g_rec_mutex_trylock")
   (return-type "gboolean")
 )
 
-(define-method reader_unlock
-  (of-object "GStaticRWLock")
-  (c-name "g_static_rw_lock_reader_unlock")
+(define-method unlock
+  (of-object "GRecMutex")
+  (c-name "g_rec_mutex_unlock")
   (return-type "none")
 )
 
-(define-method writer_lock
-  (of-object "GStaticRWLock")
-  (c-name "g_static_rw_lock_writer_lock")
+(define-method init
+  (of-object "GCond")
+  (c-name "g_cond_init")
   (return-type "none")
 )
 
-(define-method writer_trylock
-  (of-object "GStaticRWLock")
-  (c-name "g_static_rw_lock_writer_trylock")
-  (return-type "gboolean")
+(define-method clear
+  (of-object "GCond")
+  (c-name "g_cond_clear")
+  (return-type "none")
 )
 
-(define-method writer_unlock
-  (of-object "GStaticRWLock")
-  (c-name "g_static_rw_lock_writer_unlock")
+(define-method wait
+  (of-object "GCond")
+  (c-name "g_cond_wait")
   (return-type "none")
+  (parameters
+    '("GMutex*" "mutex")
+  )
 )
 
-(define-method free
-  (of-object "GStaticRWLock")
-  (c-name "g_static_rw_lock_free")
+(define-method signal
+  (of-object "GCond")
+  (c-name "g_cond_signal")
   (return-type "none")
 )
 
-(define-function g_thread_foreach
-  (c-name "g_thread_foreach")
+(define-method broadcast
+  (of-object "GCond")
+  (c-name "g_cond_broadcast")
   (return-type "none")
+)
+
+(define-method wait_until
+  (of-object "GCond")
+  (c-name "g_cond_wait_until")
+  (return-type "gboolean")
   (parameters
-    '("GFunc" "thread_func")
-    '("gpointer" "user_data")
+    '("GMutex*" "mutex")
+    '("gint64" "end_time")
+  )
+)
+
+(define-method get
+  (of-object "GPrivate")
+  (c-name "g_private_get")
+  (return-type "gpointer")
+)
+
+(define-method set
+  (of-object "GPrivate")
+  (c-name "g_private_set")
+  (return-type "none")
+  (parameters
+    '("gpointer" "value")
+  )
+)
+
+(define-method replace
+  (of-object "GPrivate")
+  (c-name "g_private_replace")
+  (return-type "none")
+  (parameters
+    '("gpointer" "value")
   )
 )
 
@@ -10992,11 +10658,11 @@
   )
 )
 
-(define-function g_once_init_enter_impl
-  (c-name "g_once_init_enter_impl")
+(define-function g_once_init_enter
+  (c-name "g_once_init_enter")
   (return-type "gboolean")
   (parameters
-    '("volatile-gsize*" "value_location")
+    '("volatile-void*" "location")
   )
 )
 
@@ -11004,8 +10670,8 @@
   (c-name "g_once_init_leave")
   (return-type "none")
   (parameters
-    '("volatile-gsize*" "value_location")
-    '("gsize" "initialization_value")
+    '("volatile-void*" "location")
+    '("gsize" "result")
   )
 )
 
@@ -11026,20 +10692,46 @@
   )
 )
 
+(define-method free
+  (of-object "GThreadPool")
+  (c-name "g_thread_pool_free")
+  (return-type "none")
+  (parameters
+    '("gboolean" "immediate")
+    '("gboolean" "wait_")
+  )
+)
+
 (define-method push
   (of-object "GThreadPool")
   (c-name "g_thread_pool_push")
-  (return-type "none")
+  (return-type "gboolean")
   (parameters
     '("gpointer" "data")
     '("GError**" "error")
   )
 )
 
+(define-method unprocessed
+  (of-object "GThreadPool")
+  (c-name "g_thread_pool_unprocessed")
+  (return-type "guint")
+)
+
+(define-method set_sort_function
+  (of-object "GThreadPool")
+  (c-name "g_thread_pool_set_sort_function")
+  (return-type "none")
+  (parameters
+    '("GCompareDataFunc" "func")
+    '("gpointer" "user_data")
+  )
+)
+
 (define-method set_max_threads
   (of-object "GThreadPool")
   (c-name "g_thread_pool_set_max_threads")
-  (return-type "none")
+  (return-type "gboolean")
   (parameters
     '("gint" "max_threads")
     '("GError**" "error")
@@ -11058,22 +10750,6 @@
   (return-type "guint")
 )
 
-(define-method unprocessed
-  (of-object "GThreadPool")
-  (c-name "g_thread_pool_unprocessed")
-  (return-type "guint")
-)
-
-(define-method free
-  (of-object "GThreadPool")
-  (c-name "g_thread_pool_free")
-  (return-type "none")
-  (parameters
-    '("gboolean" "immediate")
-    '("gboolean" "wait_")
-  )
-)
-
 (define-function g_thread_pool_set_max_unused_threads
   (c-name "g_thread_pool_set_max_unused_threads")
   (return-type "none")
@@ -11097,16 +10773,6 @@
   (return-type "none")
 )
 
-(define-method set_sort_function
-  (of-object "GThreadPool")
-  (c-name "g_thread_pool_set_sort_function")
-  (return-type "none")
-  (parameters
-    '("GCompareDataFunc" "func")
-    '("gpointer" "user_data")
-  )
-)
-
 (define-function g_thread_pool_set_max_idle_time
   (c-name "g_thread_pool_set_max_idle_time")
   (return-type "none")
@@ -11285,6 +10951,52 @@
 
 
 
+;; From gtrashstack.h
+
+(define-function g_trash_stack_push
+  (c-name "g_trash_stack_push")
+  (return-type "none")
+  (parameters
+    '("GTrashStack**" "stack_p")
+    '("gpointer" "data_p")
+  )
+)
+
+(define-function g_trash_stack_pop
+  (c-name "g_trash_stack_pop")
+  (return-type "gpointer")
+  (parameters
+    '("GTrashStack**" "stack_p")
+  )
+)
+
+(define-function g_trash_stack_peek
+  (c-name "g_trash_stack_peek")
+  (return-type "gpointer")
+  (parameters
+    '("GTrashStack**" "stack_p")
+  )
+)
+
+(define-function g_trash_stack_height
+  (c-name "g_trash_stack_height")
+  (return-type "guint")
+  (parameters
+    '("GTrashStack**" "stack_p")
+  )
+)
+
+(define-function g_trash_stack_push
+  (c-name "g_trash_stack_push")
+  (return-type "none")
+  (parameters
+    '("GTrashStack**" "stack_p")
+    '("gpointer" "data_p")
+  )
+)
+
+
+
 ;; From gtree.h
 
 (define-function g_tree_new
@@ -11402,17 +11114,6 @@
   )
 )
 
-(define-method traverse
-  (of-object "GTree")
-  (c-name "g_tree_traverse")
-  (return-type "none")
-  (parameters
-    '("GTraverseFunc" "traverse_func")
-    '("GTraverseType" "traverse_type")
-    '("gpointer" "user_data")
-  )
-)
-
 (define-method search
   (of-object "GTree")
   (c-name "g_tree_search")
@@ -11457,14 +11158,6 @@
   )
 )
 
-(define-function g_get_charset
-  (c-name "g_get_charset")
-  (return-type "gboolean")
-  (parameters
-    '("const-char**" "charset")
-  )
-)
-
 (define-method isalnum
   (of-object "gunichar")
   (c-name "g_unichar_isalnum")
@@ -11676,15 +11369,6 @@
   )
 )
 
-(define-function g_unicode_canonical_decomposition
-  (c-name "g_unicode_canonical_decomposition")
-  (return-type "gunichar*")
-  (parameters
-    '("gunichar" "ch")
-    '("gsize*" "result_len")
-  )
-)
-
 (define-function g_utf8_get_char
   (c-name "g_utf8_get_char")
   (return-type "gunichar")
@@ -12090,14 +11774,6 @@
   (return-type "const-gchar*")
 )
 
-(define-function g_get_locale_variants
-  (c-name "g_get_locale_variants")
-  (return-type "gchar**")
-  (parameters
-    '("const-gchar*" "locale")
-  )
-)
-
 (define-function g_get_user_special_dir
   (c-name "g_get_user_special_dir")
   (return-type "const-gchar*")
@@ -12138,51 +11814,6 @@
   )
 )
 
-(define-function g_path_is_absolute
-  (c-name "g_path_is_absolute")
-  (return-type "gboolean")
-  (parameters
-    '("const-gchar*" "file_name")
-  )
-)
-
-(define-function g_path_skip_root
-  (c-name "g_path_skip_root")
-  (return-type "const-gchar*")
-  (parameters
-    '("const-gchar*" "file_name")
-  )
-)
-
-(define-function g_basename
-  (c-name "g_basename")
-  (return-type "const-gchar*")
-  (parameters
-    '("const-gchar*" "file_name")
-  )
-)
-
-(define-function g_get_current_dir
-  (c-name "g_get_current_dir")
-  (return-type "gchar*")
-)
-
-(define-function g_path_get_basename
-  (c-name "g_path_get_basename")
-  (return-type "gchar*")
-  (parameters
-    '("const-gchar*" "file_name")
-  )
-)
-
-(define-function g_path_get_dirname
-  (c-name "g_path_get_dirname")
-  (return-type "gchar*")
-  (parameters
-    '("const-gchar*" "file_name")
-  )
-)
-
 (define-function g_nullify_pointer
   (c-name "g_nullify_pointer")
   (return-type "none")
@@ -12191,65 +11822,63 @@
   )
 )
 
-(define-function g_getenv
-  (c-name "g_getenv")
-  (return-type "const-gchar*")
+(define-function g_format_size_full
+  (c-name "g_format_size_full")
+  (return-type "gchar*")
   (parameters
-    '("const-gchar*" "variable")
+    '("guint64" "size")
+    '("GFormatSizeFlags" "flags")
   )
 )
 
-(define-function g_setenv
-  (c-name "g_setenv")
-  (return-type "gboolean")
+(define-function g_format_size
+  (c-name "g_format_size")
+  (return-type "gchar*")
   (parameters
-    '("const-gchar*" "variable")
-    '("const-gchar*" "value")
-    '("gboolean" "overwrite")
+    '("guint64" "size")
   )
 )
 
-(define-function g_unsetenv
-  (c-name "g_unsetenv")
-  (return-type "none")
+(define-function g_find_program_in_path
+  (c-name "g_find_program_in_path")
+  (return-type "gchar*")
   (parameters
-    '("const-gchar*" "variable")
+    '("const-gchar*" "program")
   )
 )
 
-(define-function g_listenv
-  (c-name "g_listenv")
-  (return-type "gchar**")
-)
-
-(define-function g_get_environ
-  (c-name "g_get_environ")
-  (return-type "gchar**")
+(define-function g_bit_nth_lsf
+  (c-name "g_bit_nth_lsf")
+  (return-type "gint")
+  (parameters
+    '("gulong" "mask")
+    '("gint" "nth_bit")
+  )
 )
 
-(define-function g_atexit
-  (c-name "g_atexit")
-  (return-type "none")
+(define-function g_bit_nth_msf
+  (c-name "g_bit_nth_msf")
+  (return-type "gint")
   (parameters
-    '("GVoidFunc" "func")
+    '("gulong" "mask")
+    '("gint" "nth_bit")
   )
 )
 
-(define-function g_find_program_in_path
-  (c-name "g_find_program_in_path")
-  (return-type "gchar*")
+(define-function g_bit_storage
+  (c-name "g_bit_storage")
+  (return-type "guint")
   (parameters
-    '("const-gchar*" "program")
+    '("gulong" "number")
   )
 )
 
-(define-function glib_check_version
-  (c-name "glib_check_version")
-  (return-type "const-gchar*")
+(define-function g_bit_nth_lsf
+  (c-name "g_bit_nth_lsf")
+  (return-type "gint")
   (parameters
-    '("guint" "required_major")
-    '("guint" "required_minor")
-    '("guint" "required_micro")
+    '("gulong" "mask")
+    '("gint" "nth_bit")
   )
 )
 
@@ -12481,6 +12110,17 @@
   )
 )
 
+(define-function g_variant_new_fixed_array
+  (c-name "g_variant_new_fixed_array")
+  (return-type "GVariant*")
+  (parameters
+    '("const-GVariantType*" "element_type")
+    '("gconstpointer" "elements")
+    '("gsize" "n_elements")
+    '("gsize" "element_size")
+  )
+)
+
 (define-method get_boolean
   (of-object "GVariant")
   (c-name "g_variant_get_boolean")
@@ -13263,6 +12903,20 @@
 
 
 
+;; From gversion.h
+
+(define-function glib_check_version
+  (c-name "glib_check_version")
+  (return-type "const-gchar*")
+  (parameters
+    '("guint" "required_major")
+    '("guint" "required_minor")
+    '("guint" "required_micro")
+  )
+)
+
+
+
 ;; From gwin32.h
 
 (define-function g_win32_ftruncate
diff --git a/glib/src/gobject_functions.defs b/glib/src/gobject_functions.defs
index f92d8c76..fed4b7bb 100644
--- a/glib/src/gobject_functions.defs
+++ b/glib/src/gobject_functions.defs
@@ -253,15 +253,6 @@
   )
 )
 
-(define-method set_boxed_take_ownership
-  (of-object "GValue")
-  (c-name "g_value_set_boxed_take_ownership")
-  (return-type "none")
-  (parameters
-    '("gconstpointer" "v_boxed")
-  )
-)
-
 (define-method get_boxed
   (of-object "GValue")
   (c-name "g_value_get_boxed")
@@ -668,6 +659,11 @@
   (return-type "GType")
 )
 
+(define-function g_key_file_get_type
+  (c-name "g_key_file_get_type")
+  (return-type "GType")
+)
+
 (define-function g_main_loop_get_type
   (c-name "g_main_loop_get_type")
   (return-type "GType")
@@ -1179,15 +1175,6 @@
   )
 )
 
-(define-method set_object_take_ownership
-  (of-object "GValue")
-  (c-name "g_value_set_object_take_ownership")
-  (return-type "none")
-  (parameters
-    '("gpointer" "v_object")
-  )
-)
-
 (define-function g_object_compat_control
   (c-name "g_object_compat_control")
   (return-type "gsize")
@@ -1374,15 +1361,6 @@
   )
 )
 
-(define-method set_param_take_ownership
-  (of-object "GValue")
-  (c-name "g_value_set_param_take_ownership")
-  (return-type "none")
-  (parameters
-    '("GParamSpec*" "param")
-  )
-)
-
 (define-function g_param_type_register_static
   (c-name "g_param_type_register_static")
   (return-type "GType")
@@ -2991,19 +2969,19 @@
 
 ;; From gvaluetypes.h
 
-(define-method set_char
+(define-method set_schar
   (of-object "GValue")
-  (c-name "g_value_set_char")
+  (c-name "g_value_set_schar")
   (return-type "none")
   (parameters
-    '("gchar" "v_char")
+    '("gint8" "v_char")
   )
 )
 
-(define-method get_char
+(define-method get_schar
   (of-object "GValue")
-  (c-name "g_value_get_char")
-  (return-type "gchar")
+  (c-name "g_value_get_schar")
+  (return-type "gint8")
 )
 
 (define-method set_uchar
@@ -3276,13 +3254,4 @@
   )
 )
 
-(define-method set_string_take_ownership
-  (of-object "GValue")
-  (c-name "g_value_set_string_take_ownership")
-  (return-type "none")
-  (parameters
-    '("gchar*" "v_string")
-  )
-)
-
 
diff --git a/glib/src/keyfile.hg b/glib/src/keyfile.hg
index 4796b24f..ac3122b3 100644
--- a/glib/src/keyfile.hg
+++ b/glib/src/keyfile.hg
@@ -97,6 +97,8 @@ class KeyFile
   _CLASS_GENERIC(KeyFile, GKeyFile)
 public:
 
+  //TODO: GKeyFile now seems to be a reference-counted type.
+
   //TODO: Maybe replace all the get_*/set_* methods with some generic get/set
   //methods when it is possible.