Fix the build for a GDBusConnection API change.

* gio/src/gio_methods.defs:
* gio/src/gio_unix_functions.defs:
* glib/src/glib_functions.defs:
* glib/src/gobject_functions.defs: Regenerate.
* glib/src/gdbusconnection.[hg|ccg]: Made close() async, adding close_finish()
and close_sync().
Added flush(), flush_finish() and flush_sync().

10 files changed, 1249 insertions, 1164 deletions

diff --git a/ChangeLog b/ChangeLog
index cf8ddb34..4d731b6b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2010-07-15  Murray Cumming  <murrayc@murrayc.com>
+
+	Fix the build for a GDBusConnection API change.
+
+	* gio/src/gio_methods.defs:
+	* gio/src/gio_unix_functions.defs:
+	* glib/src/glib_functions.defs:
+	* glib/src/gobject_functions.defs: Regenerate.
+	* glib/src/gdbusconnection.[hg|ccg]: Made close() async, adding close_finish() 
+	and close_sync().
+	Added flush(), flush_finish() and flush_sync().
+
 2010-06-29  Murray Cumming  <murrayc@murrayc.com>
 
 	Added DBusConnection
diff --git a/gio/src/dbusconnection.ccg b/gio/src/dbusconnection.ccg
index 99338f5d..5893ffde 100644
--- a/gio/src/dbusconnection.ccg
+++ b/gio/src/dbusconnection.ccg
@@ -1,6 +1,6 @@
 // -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 
-/* Copyright (C) 2007 The giomm Development Team
+/* Copyright (C) 2010 The giomm Development Team
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -23,4 +23,69 @@
 namespace Gio
 {
 
+void DBusConnection::close()
+{
+  g_dbus_connection_close(gobj(), 0, 0, 0);
+}
+
+void DBusConnection::close(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable)
+{
+  SlotAsyncReady* slot_copy = new SlotAsyncReady(slot);
+
+  g_dbus_connection_close(gobj(),
+                    Glib::unwrap(cancellable),
+                    &SignalProxy_async_callback,
+                    slot_copy);
+}
+
+void DBusConnection::close(const SlotAsyncReady& slot)
+{
+  SlotAsyncReady* slot_copy = new SlotAsyncReady(slot);
+
+  g_dbus_connection_close(gobj(),
+                    0,
+                    &SignalProxy_async_callback,
+                    slot_copy);
+}
+
+void DBusConnection::close_sync()
+{
+  GError* gerror = 0;
+  g_dbus_connection_close_sync(gobj(), 0, &(gerror));
+  if(gerror)
+    ::Glib::Error::throw_exception(gerror);
+}
+
+void DBusConnection::flush()
+{
+  g_dbus_connection_flush(gobj(), 0, 0, 0);
+}
+
+void DBusConnection::flush(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable)
+{
+  SlotAsyncReady* slot_copy = new SlotAsyncReady(slot);
+
+  g_dbus_connection_flush(gobj(),
+                    Glib::unwrap(cancellable),
+                    &SignalProxy_async_callback,
+                    slot_copy);
+}
+
+void DBusConnection::flush(const SlotAsyncReady& slot)
+{
+  SlotAsyncReady* slot_copy = new SlotAsyncReady(slot);
+
+  g_dbus_connection_flush(gobj(),
+                    0,
+                    &SignalProxy_async_callback,
+                    slot_copy);
+}
+
+void DBusConnection::flush_sync()
+{
+  GError* gerror = 0;
+  g_dbus_connection_flush_sync(gobj(), 0, &(gerror));
+  if(gerror)
+    ::Glib::Error::throw_exception(gerror);
+}
 } // namespace Gio
diff --git a/gio/src/dbusconnection.hg b/gio/src/dbusconnection.hg
index 2c0a7c58..baf70a1f 100644
--- a/gio/src/dbusconnection.hg
+++ b/gio/src/dbusconnection.hg
@@ -19,6 +19,7 @@
 
 #include <glibmm/object.h>
 #include <giomm/iostream.h>
+#include <giomm/asyncresult.h>
 
 _DEFS(giomm,gio)
 _PINCLUDE(glibmm/private/object_p.h)
@@ -41,8 +42,48 @@ protected:
 public:
 
   _WRAP_METHOD(bool is_closed() const, g_dbus_connection_is_closed)
-  _WRAP_METHOD(void close(), g_dbus_connection_close)
   
+  //TODO: Documentation.
+  void close();
+  
+  //TODO: Documentation.
+  void close(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable);
+  
+  //TODO: Documentation.
+  void close(const SlotAsyncReady& slot);
+  _IGNORE(g_dbus_connection_close)
+  
+  _WRAP_METHOD(bool close_finish(const Glib::RefPtr<AsyncResult>& result),
+               g_dbus_connection_close_finish, errthrow)
+               
+  //TODO: Documentation.
+  void close_sync();
+  
+  //TODO: Documentation.
+  _WRAP_METHOD(void close_sync(const Glib::RefPtr<Cancellable>& cancellable), g_dbus_connection_close_sync, errthrow)
+
+
+  //TODO: Documentation.
+  void flush();
+  
+  //TODO: Documentation.
+  void flush(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& cancellable);
+  
+  //TODO: Documentation.
+  void flush(const SlotAsyncReady& slot);
+  _IGNORE(g_dbus_connection_flush)
+  
+  _WRAP_METHOD(bool flush_finish(const Glib::RefPtr<AsyncResult>& result),
+               g_dbus_connection_flush_finish, errthrow)
+               
+  //TODO: Documentation.
+  void flush_sync();
+  
+  //TODO: Documentation.
+  _WRAP_METHOD(void flush_sync(const Glib::RefPtr<Cancellable>& cancellable), g_dbus_connection_flush_sync, errthrow)
+
+
+                 
   _WRAP_METHOD(Glib::RefPtr<Gio::IOStream> get_stream(), g_dbus_connection_get_stream, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const IOStream> get_stream() const, g_dbus_connection_get_stream, refreturn, constversion)
   
@@ -50,7 +91,7 @@ public:
   _WRAP_METHOD(Glib::ustring get_unique_name() const, g_dbus_connection_get_unique_name)
   //TODO:_WRAP_METHOD(GCredentials    *g_dbus_connection_get_peer_credentials(), g_dbus_connection_get_peer_credentials )
   _WRAP_METHOD(bool get_exit_on_close() const, g_dbus_connection_get_exit_on_close)
-  _WRAP_METHOD(void set_exit_on_close(bool exit_on_close = true), _dbus_connection_set_exit_on_close)
+  _WRAP_METHOD(void set_exit_on_close(bool exit_on_close = true), g_dbus_connection_set_exit_on_close)
   _WRAP_METHOD(DBusCapabilityFlags get_capabilities() const, g_dbus_connection_get_capabilities)
 };
 
diff --git a/gio/src/filelist.am b/gio/src/filelist.am
index effe5d28..207039de 100644
--- a/gio/src/filelist.am
+++ b/gio/src/filelist.am
@@ -4,6 +4,7 @@ giomm_files_defs =			\
 	gio.defs			\
 	gio_enums.defs			\
 	gio_methods.defs		\
+	gio_unix_functions.defs		\
 	gio_others.defs			\
 	gio_signals.defs		\
 	gio_vfuncs.defs			\
diff --git a/gio/src/gio.defs b/gio/src/gio.defs
index 152d7ef8..8d30ed18 100644
--- a/gio/src/gio.defs
+++ b/gio/src/gio.defs
@@ -1,4 +1,5 @@
 (include gio_methods.defs)
+(include gio_unix_functions.defs)
 (include gio_others.defs)
 (include gio_enums.defs)
 (include gio_signals.defs)
diff --git a/gio/src/gio_methods.defs b/gio/src/gio_methods.defs
index 4347c9ca..0fed4745 100644
--- a/gio/src/gio_methods.defs
+++ b/gio/src/gio_methods.defs
@@ -52,34 +52,6 @@
   (gtype-id "G_TYPE_CREDENTIALS")
 )
 
-(define-object AuthObserver
-  (in-module "GDBus")
-  (parent "GObject")
-  (c-name "GDBusAuthObserver")
-  (gtype-id "G_TYPE_D_BUS_AUTH_OBSERVER")
-)
-
-(define-object Connection
-  (in-module "GDBus")
-  (parent "GObject")
-  (c-name "GDBusConnection")
-  (gtype-id "G_TYPE_D_BUS_CONNECTION")
-)
-
-(define-object Message
-  (in-module "GDBus")
-  (parent "GObject")
-  (c-name "GDBusMessage")
-  (gtype-id "G_TYPE_D_BUS_MESSAGE")
-)
-
-(define-object MethodInvocation
-  (in-module "GDBus")
-  (parent "GObject")
-  (c-name "GDBusMethodInvocation")
-  (gtype-id "G_TYPE_D_BUS_METHOD_INVOCATION")
-)
-
 (define-object Proxy
   (in-module "GDBus")
   (parent "GObject")
@@ -87,19 +59,6 @@
   (gtype-id "G_TYPE_D_BUS_PROXY")
 )
 
-(define-object Server
-  (in-module "GDBus")
-  (parent "GObject")
-  (c-name "GDBusServer")
-  (gtype-id "G_TYPE_D_BUS_SERVER")
-)
-
-(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")
@@ -112,12 +71,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")
@@ -413,62 +366,6 @@
   (gtype-id "G_TYPE_THREADED_SOCKET_SERVICE")
 )
 
-(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 SocketAddress
-  (in-module "GUnix")
-  (parent "GSocketAddress")
-  (c-name "GUnixSocketAddress")
-  (gtype-id "G_TYPE_UNIX_SOCKET_ADDRESS")
-)
-
-(define-object 8InputStream
-  (in-module "GUtf")
-  (parent "GFilterInputStream")
-  (c-name "GUtf8InputStream")
-  (gtype-id "G_TYPE_UTF8_INPUT_STREAM")
-)
-
 (define-object s
   (in-module "GVf")
   (parent "GObject")
@@ -506,6 +403,7 @@
     '("none" "G_APP_INFO_CREATE_NONE")
     '("needs-terminal" "G_APP_INFO_CREATE_NEEDS_TERMINAL")
     '("supports-uris" "G_APP_INFO_CREATE_SUPPORTS_URIS")
+    '("supports-startup-notification" "G_APP_INFO_CREATE_SUPPORTS_STARTUP_NOTIFICATION")
   )
 )
 
@@ -1016,6 +914,7 @@
     '("authentication-server" "G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_SERVER")
     '("authentication-allow-anonymous" "G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_ALLOW_ANONYMOUS")
     '("message-bus-connection" "G_DBUS_CONNECTION_FLAGS_MESSAGE_BUS_CONNECTION")
+    '("delay-message-processing" "G_DBUS_CONNECTION_FLAGS_DELAY_MESSAGE_PROCESSING")
   )
 )
 
@@ -1954,8 +1853,8 @@
   (c-name "g_content_type_equals")
   (return-type "gboolean")
   (parameters
-    '("const-char*" "type1")
-    '("const-char*" "type2")
+    '("const-gchar*" "type1")
+    '("const-gchar*" "type2")
   )
 )
 
@@ -1963,8 +1862,8 @@
   (c-name "g_content_type_is_a")
   (return-type "gboolean")
   (parameters
-    '("const-char*" "type")
-    '("const-char*" "supertype")
+    '("const-gchar*" "type")
+    '("const-gchar*" "supertype")
   )
 )
 
@@ -1972,23 +1871,23 @@
   (c-name "g_content_type_is_unknown")
   (return-type "gboolean")
   (parameters
-    '("const-char*" "type")
+    '("const-gchar*" "type")
   )
 )
 
 (define-function g_content_type_get_description
   (c-name "g_content_type_get_description")
-  (return-type "char*")
+  (return-type "gchar*")
   (parameters
-    '("const-char*" "type")
+    '("const-gchar*" "type")
   )
 )
 
 (define-function g_content_type_get_mime_type
   (c-name "g_content_type_get_mime_type")
-  (return-type "char*")
+  (return-type "gchar*")
   (parameters
-    '("const-char*" "type")
+    '("const-gchar*" "type")
   )
 )
 
@@ -1996,7 +1895,7 @@
   (c-name "g_content_type_get_icon")
   (return-type "GIcon*")
   (parameters
-    '("const-char*" "type")
+    '("const-gchar*" "type")
   )
 )
 
@@ -2004,23 +1903,23 @@
   (c-name "g_content_type_can_be_executable")
   (return-type "gboolean")
   (parameters
-    '("const-char*" "type")
+    '("const-gchar*" "type")
   )
 )
 
 (define-function g_content_type_from_mime_type
   (c-name "g_content_type_from_mime_type")
-  (return-type "char*")
+  (return-type "gchar*")
   (parameters
-    '("const-char*" "mime_type")
+    '("const-gchar*" "mime_type")
   )
 )
 
 (define-function g_content_type_guess
   (c-name "g_content_type_guess")
-  (return-type "char*")
+  (return-type "gchar*")
   (parameters
-    '("const-char*" "filename")
+    '("const-gchar*" "filename")
     '("const-guchar*" "data")
     '("gsize" "data_size")
     '("gboolean*" "result_uncertain")
@@ -2029,7 +1928,7 @@
 
 (define-function g_content_type_guess_for_tree
   (c-name "g_content_type_guess_for_tree")
-  (return-type "char**")
+  (return-type "gchar**")
   (parameters
     '("GFile*" "root")
   )
@@ -2692,16 +2591,16 @@
   )
 )
 
-(define-method is_closed
+(define-method start_message_processing
   (of-object "GDBusConnection")
-  (c-name "g_dbus_connection_is_closed")
-  (return-type "gboolean")
+  (c-name "g_dbus_connection_start_message_processing")
+  (return-type "none")
 )
 
-(define-method close
+(define-method is_closed
   (of-object "GDBusConnection")
-  (c-name "g_dbus_connection_close")
-  (return-type "none")
+  (c-name "g_dbus_connection_is_closed")
+  (return-type "gboolean")
 )
 
 (define-method get_stream
@@ -2749,6 +2648,68 @@
   (return-type "GDBusCapabilityFlags")
 )
 
+(define-method close
+  (of-object "GDBusConnection")
+  (c-name "g_dbus_connection_close")
+  (return-type "none")
+  (parameters
+    '("GCancellable*" "cancellable")
+    '("GAsyncReadyCallback" "callback")
+    '("gpointer" "user_data")
+  )
+)
+
+(define-method close_finish
+  (of-object "GDBusConnection")
+  (c-name "g_dbus_connection_close_finish")
+  (return-type "gboolean")
+  (parameters
+    '("GAsyncResult*" "res")
+    '("GError**" "error")
+  )
+)
+
+(define-method close_sync
+  (of-object "GDBusConnection")
+  (c-name "g_dbus_connection_close_sync")
+  (return-type "gboolean")
+  (parameters
+    '("GCancellable*" "cancellable")
+    '("GError**" "error")
+  )
+)
+
+(define-method flush
+  (of-object "GDBusConnection")
+  (c-name "g_dbus_connection_flush")
+  (return-type "none")
+  (parameters
+    '("GCancellable*" "cancellable")
+    '("GAsyncReadyCallback" "callback")
+    '("gpointer" "user_data")
+  )
+)
+
+(define-method flush_finish
+  (of-object "GDBusConnection")
+  (c-name "g_dbus_connection_flush_finish")
+  (return-type "gboolean")
+  (parameters
+    '("GAsyncResult*" "res")
+    '("GError**" "error")
+  )
+)
+
+(define-method flush_sync
+  (of-object "GDBusConnection")
+  (c-name "g_dbus_connection_flush_sync")
+  (return-type "gboolean")
+  (parameters
+    '("GCancellable*" "cancellable")
+    '("GError**" "error")
+  )
+)
+
 (define-method send_message
   (of-object "GDBusConnection")
   (c-name "g_dbus_connection_send_message")
@@ -2864,7 +2825,7 @@
   (return-type "guint")
   (parameters
     '("const-gchar*" "object_path")
-    '("const-GDBusInterfaceInfo*" "introspection_data")
+    '("const-GDBusInterfaceInfo*" "interface_info")
     '("const-GDBusInterfaceVTable*" "vtable")
     '("gpointer" "user_data")
     '("GDestroyNotify" "user_data_free_func")
@@ -8866,6 +8827,8 @@
   (return-type "GSettingsBackend*")
   (parameters
     '("const-gchar*" "filename")
+    '("const-gchar*" "root_path")
+    '("const-gchar*" "root_group")
   )
 )
 
@@ -8915,6 +8878,12 @@
   )
 )
 
+(define-method list_items
+  (of-object "GSettings")
+  (c-name "g_settings_list_items")
+  (return-type "const-gchar**")
+)
+
 (define-method set_value
   (of-object "GSettings")
   (c-name "g_settings_set_value")
@@ -9070,6 +9039,25 @@
   )
 )
 
+(define-method get_flags
+  (of-object "GSettings")
+  (c-name "g_settings_get_flags")
+  (return-type "guint")
+  (parameters
+    '("const-gchar*" "key")
+  )
+)
+
+(define-method set_flags
+  (of-object "GSettings")
+  (c-name "g_settings_set_flags")
+  (return-type "gboolean")
+  (parameters
+    '("const-gchar*" "key")
+    '("guint" "value")
+  )
+)
+
 (define-method get_child
   (of-object "GSettings")
   (c-name "g_settings_get_child")
@@ -9166,6 +9154,17 @@
   )
 )
 
+(define-method get_mapped
+  (of-object "GSettings")
+  (c-name "g_settings_get_mapped")
+  (return-type "gpointer")
+  (parameters
+    '("const-gchar*" "key")
+    '("GSettingsGetMapping" "mapping")
+    '("gpointer" "user_data")
+  )
+)
+
 
 
 ;; From gsimpleasyncresult.h
@@ -10441,24 +10440,6 @@
 
 
 
-;; From gutf8inputstream.h
-
-(define-function g_utf8_input_stream_get_type
-  (c-name "g_utf8_input_stream_get_type")
-  (return-type "GType")
-)
-
-(define-function g_utf8_input_stream_new
-  (c-name "g_utf8_input_stream_new")
-  (is-constructor-of "GUtf8InputStream")
-  (return-type "GInputStream*")
-  (parameters
-    '("GInputStream*" "base_stream")
-  )
-)
-
-
-
 ;; From gvfs.h
 
 (define-function g_vfs_get_type
@@ -10751,663 +10732,3 @@
 )
 
 
-
-;; 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-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")
-  )
-)
-
-
-
-;; 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 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 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 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")
-)
-
-
diff --git a/gio/src/gio_unix_functions.defs b/gio/src/gio_unix_functions.defs
new file mode 100644
index 00000000..73bed339
--- /dev/null
+++ b/gio/src/gio_unix_functions.defs
@@ -0,0 +1,725 @@
+;; -*- scheme -*-
+; object definitions ...
+(define-object AppInfoLookup
+  (in-module "GDesktop")
+  (c-name "GDesktopAppInfoLookup")
+  (gtype-id "G_TYPE_DESKTOP_APP_INFO_LOOKUP")
+)
+
+(define-object DescriptorBased
+  (in-module "GFile")
+  (c-name "GFileDescriptorBased")
+  (gtype-id "G_TYPE_FILE_DESCRIPTOR_BASED")
+)
+
+(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 SocketAddress
+  (in-module "GUnix")
+  (parent "GSocketAddress")
+  (c-name "GUnixSocketAddress")
+  (gtype-id "G_TYPE_UNIX_SOCKET_ADDRESS")
+)
+
+;; Enumerations and flags ...
+
+
+;; 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-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")
+  )
+)
+
+
+
+;; 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 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 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 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")
+)
+
+
diff --git a/gio/src/settings.hg b/gio/src/settings.hg
index 6388338b..9b3e4577 100644
--- a/gio/src/settings.hg
+++ b/gio/src/settings.hg
@@ -69,6 +69,11 @@ public:
 
   _WRAP_METHOD(bool set_string_array(const Glib::ustring& key,  const Glib::StringArrayHandle& value), g_settings_set_strv)
 
+  _WRAP_METHOD(int get_enum(const Glib::ustring& key) const, g_settings_get_enum )
+  _WRAP_METHOD(bool get_enum(const Glib::ustring& key, int value), g_settings_set_enum)
+  _WRAP_METHOD(guint get_flags(const Glib::ustring& key) const, g_settings_get_flags)
+  _WRAP_METHOD(bool get_flags(const Glib::ustring& key, guint value), g_settings_set_flags)
+                                                                         
   // Ignore varargs functions.
   _IGNORE(g_settings_get, g_settings_set)
 
diff --git a/glib/src/glib_functions.defs b/glib/src/glib_functions.defs
index da46ce43..aad32054 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")
@@ -627,7 +607,7 @@
   (c-name "GThreadError")
   (gtype-id "G_TYPE_THREAD_ERROR")
   (values
-    '("n" "G_THREAD_ERROR_AGAIN")
+    '("again" "G_THREAD_ERROR_AGAIN")
   )
 )
 
@@ -820,6 +800,21 @@
     '("carian" "G_UNICODE_SCRIPT_CARIAN")
     '("lycian" "G_UNICODE_SCRIPT_LYCIAN")
     '("lydian" "G_UNICODE_SCRIPT_LYDIAN")
+    '("avestan" "G_UNICODE_SCRIPT_AVESTAN")
+    '("bamum" "G_UNICODE_SCRIPT_BAMUM")
+    '("egyptian-hieroglyphs" "G_UNICODE_SCRIPT_EGYPTIAN_HIEROGLYPHS")
+    '("imperial-aramaic" "G_UNICODE_SCRIPT_IMPERIAL_ARAMAIC")
+    '("inscriptional-pahlavi" "G_UNICODE_SCRIPT_INSCRIPTIONAL_PAHLAVI")
+    '("inscriptional-parthian" "G_UNICODE_SCRIPT_INSCRIPTIONAL_PARTHIAN")
+    '("javanese" "G_UNICODE_SCRIPT_JAVANESE")
+    '("kaithi" "G_UNICODE_SCRIPT_KAITHI")
+    '("lisu" "G_UNICODE_SCRIPT_LISU")
+    '("meetei-mayek" "G_UNICODE_SCRIPT_MEETEI_MAYEK")
+    '("old-south-arabian" "G_UNICODE_SCRIPT_OLD_SOUTH_ARABIAN")
+    '("old-turkish" "G_UNICODE_SCRIPT_OLD_TURKISH")
+    '("samaritan" "G_UNICODE_SCRIPT_SAMARITAN")
+    '("tai-tham" "G_UNICODE_SCRIPT_TAI_THAM")
+    '("tai-viet" "G_UNICODE_SCRIPT_TAI_VIET")
   )
 )
 
@@ -882,9 +877,14 @@
   )
 )
 
-
-;; From galias.h
-
+(define-enum ParseError
+  (in-module "GVariant")
+  (c-name "GVariantParseError")
+  (gtype-id "G_TYPE_VARIANT_PARSE_ERROR")
+  (values
+    '("failed" "G_VARIANT_PARSE_ERROR_FAILED")
+  )
+)
 
 
 ;; From galloca.h
@@ -2066,30 +2066,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 gbuffer.h
-
-
-
 ;; From gcache.h
 
 (define-function g_cache_new
@@ -2324,18 +2300,6 @@
   )
 )
 
-(define-method
-  (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")
@@ -2618,10 +2582,6 @@
 
 
 
-;; From gdatasetprivate.h
-
-
-
 ;; From gdate.h
 
 (define-function g_date_new
@@ -3014,10 +2974,6 @@
 
 
 
-;; From gdebug.h
-
-
-
 ;; From gdir.h
 
 (define-function g_dir_open
@@ -4761,30 +4717,6 @@
 
 
 
-;; From glib.h
-
-
-
-;; From glibintl.h
-
-(define-function glib_gettext
-  (c-name "glib_gettext")
-  (return-type "const-gchar*")
-  (parameters
-    '("const-gchar*" "str")
-  )
-)
-
-
-
-;; From glib-object.h
-
-
-
-;; From glib_trace.h
-
-
-
 ;; From glist.h
 
 (define-function g_list_alloc
@@ -6171,10 +6103,6 @@
 
 
 
-;; From gmirroringtable.h
-
-
-
 ;; From gnode.h
 
 (define-function g_node_new
@@ -6787,10 +6715,6 @@
 
 
 
-;; From gprintfint.h
-
-
-
 ;; From gqsort.h
 
 (define-function g_qsort_with_data
@@ -7910,10 +7834,6 @@
 
 
 
-;; From gscripttable.h
-
-
-
 ;; From gsequence.h
 
 (define-function g_sequence_new
@@ -9724,7 +9644,7 @@
   (return-type "none")
   (parameters
     '("const-char*" "testpath")
-    '("somefunc" "test_func")
+    '("GTestFunc" "test_func")
   )
 )
 
@@ -9734,7 +9654,7 @@
   (parameters
     '("const-char*" "testpath")
     '("gconstpointer" "test_data")
-    '("somefunc" "test_func")
+    '("GTestDataFunc" "test_func")
   )
 )
 
@@ -9849,7 +9769,9 @@
     '("const-char*" "test_name")
     '("gsize" "data_size")
     '("gconstpointer" "test_data")
-    '("somefunc" "data_setup")
+    '("GTestFixtureFunc" "data_setup")
+    '("GTestFixtureFunc" "data_test")
+    '("GTestFixtureFunc" "data_teardown")
   )
 )
 
@@ -9982,7 +9904,9 @@
     '("const-char*" "testpath")
     '("gsize" "data_size")
     '("gconstpointer" "test_data")
-    '("somefunc" "data_setup")
+    '("GTestFixtureFunc" "data_setup")
+    '("GTestFixtureFunc" "data_test")
+    '("GTestFixtureFunc" "data_teardown")
   )
 )
 
@@ -10400,15 +10324,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
@@ -10646,14 +10561,6 @@
 
 
 
-;; From gunibreak.h
-
-
-
-;; From gunichartables.h
-
-
-
 ;; From gunicode.h
 
 (define-function g_get_charset
@@ -11129,18 +11036,6 @@
 
 
 
-;; From gunicodeprivate.h
-
-
-
-;; From gunicomp.h
-
-
-
-;; From gunidecomp.h
-
-
-
 ;; From gurifuncs.h
 
 (define-function g_uri_unescape_string
@@ -11255,6 +11150,24 @@
   (return-type "const-gchar*")
 )
 
+(define-function g_get_system_data_dirs
+  (c-name "g_get_system_data_dirs")
+  (return-type "const-gchar**")
+)
+
+(define-function g_win32_get_system_data_dirs_for_module
+  (c-name "g_win32_get_system_data_dirs_for_module")
+  (return-type "const-gchar**")
+  (parameters
+    '("somefunc*" "address_of_function")
+  )
+)
+
+(define-function g_get_language_names
+  (c-name "g_get_language_names")
+  (return-type "const-gchar**")
+)
+
 (define-function g_get_user_special_dir
   (c-name "g_get_user_special_dir")
   (return-type "const-gchar*")
@@ -11407,10 +11320,6 @@
 
 
 
-;; From gvariant-core.h
-
-
-
 ;; From gvariant.h
 
 (define-method unref
@@ -11431,6 +11340,12 @@
   (return-type "GVariant*")
 )
 
+(define-method is_floating
+  (of-object "GVariant")
+  (c-name "g_variant_is_floating")
+  (return-type "gboolean")
+)
+
 (define-method get_type
   (of-object "GVariant")
   (c-name "g_variant_get_type")
@@ -11590,17 +11505,25 @@
   (return-type "GVariant*")
 )
 
-(define-function g_variant_new_byte_array
-  (c-name "g_variant_new_byte_array")
+(define-function g_variant_new_strv
+  (c-name "g_variant_new_strv")
   (return-type "GVariant*")
   (parameters
-    '("gconstpointer" "array")
+    '("const-gchar*-const*" "strv")
     '("gssize" "length")
   )
 )
 
-(define-function g_variant_new_strv
-  (c-name "g_variant_new_strv")
+(define-function g_variant_new_bytestring
+  (c-name "g_variant_new_bytestring")
+  (return-type "GVariant*")
+  (parameters
+    '("const-gchar*" "string")
+  )
+)
+
+(define-function g_variant_new_bytestring_array
+  (c-name "g_variant_new_bytestring_array")
   (return-type "GVariant*")
   (parameters
     '("const-gchar*-const*" "strv")
@@ -11692,27 +11615,51 @@
   )
 )
 
-(define-method get_byte_array
+(define-method get_strv
   (of-object "GVariant")
-  (c-name "g_variant_get_byte_array")
-  (return-type "gconstpointer")
+  (c-name "g_variant_get_strv")
+  (return-type "const-gchar**")
   (parameters
     '("gsize*" "length")
   )
 )
 
-(define-method get_strv
+(define-method dup_strv
   (of-object "GVariant")
-  (c-name "g_variant_get_strv")
+  (c-name "g_variant_dup_strv")
+  (return-type "gchar**")
+  (parameters
+    '("gsize*" "length")
+  )
+)
+
+(define-method get_bytestring
+  (of-object "GVariant")
+  (c-name "g_variant_get_bytestring")
+  (return-type "const-gchar*")
+)
+
+(define-method dup_bytestring
+  (of-object "GVariant")
+  (c-name "g_variant_dup_bytestring")
+  (return-type "gchar*")
+  (parameters
+    '("gsize*" "length")
+  )
+)
+
+(define-method get_bytestring_array
+  (of-object "GVariant")
+  (c-name "g_variant_get_bytestring_array")
   (return-type "const-gchar**")
   (parameters
     '("gsize*" "length")
   )
 )
 
-(define-method dup_strv
+(define-method dup_bytestring_array
   (of-object "GVariant")
-  (c-name "g_variant_dup_strv")
+  (c-name "g_variant_dup_bytestring_array")
   (return-type "gchar**")
   (parameters
     '("gsize*" "length")
@@ -12118,110 +12065,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
@@ -12431,80 +12274,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
@@ -12568,3 +12337,5 @@
     '("const-gchar*" "utf8filename")
   )
 )
+
+
diff --git a/glib/src/gobject_functions.defs b/glib/src/gobject_functions.defs
index d0175696..d81d6295 100644
--- a/glib/src/gobject_functions.defs
+++ b/glib/src/gobject_functions.defs
@@ -16,19 +16,31 @@
 ;; Enumerations and flags ...
 
 (define-flags Flags
+  (in-module "GBinding")
+  (c-name "GBindingFlags")
+  (gtype-id "G_TYPE_BINDING_FLAGS")
+  (values
+    '("default" "G_BINDING_DEFAULT")
+    '("bidirectional" "G_BINDING_BIDIRECTIONAL")
+    '("sync-create" "G_BINDING_SYNC_CREATE")
+  )
+)
+
+(define-flags Flags
   (in-module "GParam")
   (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")
+    '("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")
   )
 )
 
@@ -106,7 +118,75 @@
 )
 
 
-;; From gatomicarray.h
+;; From gbinding.h
+
+(define-function g_binding_flags_get_type
+  (c-name "g_binding_flags_get_type")
+  (return-type "GType")
+)
+
+(define-function g_binding_get_type
+  (c-name "g_binding_get_type")
+  (return-type "GType")
+)
+
+(define-method get_flags
+  (of-object "GBinding")
+  (c-name "g_binding_get_flags")
+  (return-type "GBindingFlags")
+)
+
+(define-method get_source
+  (of-object "GBinding")
+  (c-name "g_binding_get_source")
+  (return-type "GObject*")
+)
+
+(define-method get_target
+  (of-object "GBinding")
+  (c-name "g_binding_get_target")
+  (return-type "GObject*")
+)
+
+(define-method get_source_property
+  (of-object "GBinding")
+  (c-name "g_binding_get_source_property")
+  (return-type "const-gchar*")
+)
+
+(define-method get_target_property
+  (of-object "GBinding")
+  (c-name "g_binding_get_target_property")
+  (return-type "const-gchar*")
+)
+
+(define-function g_object_bind_property
+  (c-name "g_object_bind_property")
+  (return-type "GBinding*")
+  (parameters
+    '("gpointer" "source")
+    '("const-gchar*" "source_property")
+    '("gpointer" "target")
+    '("const-gchar*" "target_property")
+    '("GBindingFlags" "flags")
+  )
+)
+
+(define-function g_object_bind_property_full
+  (c-name "g_object_bind_property_full")
+  (return-type "GBinding*")
+  (parameters
+    '("gpointer" "source")
+    '("const-gchar*" "source_property")
+    '("gpointer" "target")
+    '("const-gchar*" "target_property")
+    '("GBindingFlags" "flags")
+    '("GBindingTransformFunc" "transform_to")
+    '("GBindingTransformFunc" "transform_from")
+    '("gpointer" "user_data")
+    '("GDestroyNotify" "notify")
+  )
+)
 
 
 
@@ -243,13 +323,18 @@
   (return-type "GType")
 )
 
-(define-function g_variant_get_gtype
-  (c-name "g_variant_get_gtype")
+(define-function g_regex_get_type
+  (c-name "g_regex_get_type")
   (return-type "GType")
 )
 
-(define-function g_regex_get_type
-  (c-name "g_regex_get_type")
+(define-function g_error_get_type
+  (c-name "g_error_get_type")
+  (return-type "GType")
+)
+
+(define-function g_variant_get_gtype
+  (c-name "g_variant_get_gtype")
   (return-type "GType")
 )
 
@@ -536,10 +621,6 @@
 
 
 
-;; From gobjectalias.h
-
-
-
 ;; From gobject.h
 
 (define-function g_initially_unowned_get_type
@@ -742,6 +823,15 @@
   )
 )
 
+(define-method notify_by_pspec
+  (of-object "GObject")
+  (c-name "g_object_notify_by_pspec")
+  (return-type "none")
+  (parameters
+    '("GParamSpec*" "pspec")
+  )
+)
+
 (define-method thaw_notify
   (of-object "GObject")
   (c-name "g_object_thaw_notify")
@@ -1567,6 +1657,19 @@
   )
 )
 
+(define-function g_param_spec_variant
+  (c-name "g_param_spec_variant")
+  (return-type "GParamSpec*")
+  (parameters
+    '("const-gchar*" "name")
+    '("const-gchar*" "nick")
+    '("const-gchar*" "blurb")
+    '("const-GVariantType*" "type")
+    '("GVariant*" "default_value")
+    '("GParamFlags" "flags")
+  )
+)
+
 
 
 ;; From gsignal.h
@@ -2284,6 +2387,24 @@
   )
 )
 
+(define-method add_class_private
+  (of-object "GType")
+  (c-name "g_type_add_class_private")
+  (return-type "none")
+  (parameters
+    '("gsize" "private_size")
+  )
+)
+
+(define-method get_private
+  (of-object "GTypeClass")
+  (c-name "g_type_class_get_private")
+  (return-type "gpointer")
+  (parameters
+    '("GType" "private_type")
+  )
+)
+
 (define-method get_plugin
   (of-object "GType")
   (c-name "g_type_get_plugin")
@@ -2584,10 +2705,6 @@
 
 
 
-;; From gtype-private.h
-
-
-
 ;; From gvaluearray.h
 
 (define-method get_nth
@@ -3006,6 +3123,36 @@
   (return-type "GType")
 )
 
+(define-method set_variant
+  (of-object "GValue")
+  (c-name "g_value_set_variant")
+  (return-type "none")
+  (parameters
+    '("GVariant*" "variant")
+  )
+)
+
+(define-method take_variant
+  (of-object "GValue")
+  (c-name "g_value_take_variant")
+  (return-type "none")
+  (parameters
+    '("GVariant*" "variant")
+  )
+)
+
+(define-method get_variant
+  (of-object "GValue")
+  (c-name "g_value_get_variant")
+  (return-type "GVariant*")
+)
+
+(define-method dup_variant
+  (of-object "GValue")
+  (c-name "g_value_dup_variant")
+  (return-type "GVariant*")
+)
+
 (define-function g_pointer_type_register_static
   (c-name "g_pointer_type_register_static")
   (return-type "GType")
@@ -3041,7 +3188,3 @@
 )
 
 
-
-;; From stamp-gmarshal.h
-
-