Regenerated with h2defs.py

2008-02-06  Murray Cumming <murrayc@murrayc.com>

* gio/src/gio_methods.defs: Regenerated with h2defs.py

* configure.in: Depend on gio-unix-2.0 when not on win32.
* gio/src/Makefile_list_of_hg.am_fragment:
* gio/src/unixinputstream.ccg:
* gio/src/unixinputstream.hg:
* gio/src/unixoutputstream.ccg: Mentioned this as unix-specific files 
so they are built.

* gio/src/bufferedoutputstream.hg: Fixed a parameter type to fix the 
build, after a change in gio.

svn path=/trunk/; revision=586

10 files changed, 566 insertions, 121 deletions

diff --git a/ChangeLog b/ChangeLog
index 9395a8b2..a6127d1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2008-02-06  Murray Cumming <murrayc@murrayc.com>
+
+	* gio/src/gio_methods.defs: Regenerated with h2defs.py
+
+	* configure.in: Depend on gio-unix-2.0 when not on win32.
+	* gio/src/Makefile_list_of_hg.am_fragment:
+	* gio/src/unixinputstream.ccg:
+	* gio/src/unixinputstream.hg:
+	* gio/src/unixoutputstream.ccg: Mentioned this as unix-specific files 
+	so they are built.
+
+	* gio/src/bufferedoutputstream.hg: Fixed a parameter type to fix the 
+	build, after a change in gio.
+
 2008-02-05  Murray Cumming  <murrayc@murrayc.com>
 
 	* gio/src/file.ccg:
diff --git a/configure.in b/configure.in
index 95b4cfd1..dda1c8b0 100644
--- a/configure.in
+++ b/configure.in
@@ -137,7 +137,13 @@ PKG_CHECK_MODULES(GLIBMM, sigc++-2.0 >= ${gtkmm_min_sigc_version} glib-2.0 >= ${
 AC_SUBST(GLIBMM_CFLAGS)
 AC_SUBST(GLIBMM_LIBS)
 
-PKG_CHECK_MODULES(GIOMM, sigc++-2.0 >= ${gtkmm_min_sigc_version} glib-2.0 >= ${gtkmm_min_glib_version} gobject-2.0 >= ${gtkmm_min_glib_version} gmodule-2.0 >= ${gtkmm_min_glib_version} gio-2.0 >= ${gtkmm_min_glib_version})
+
+# Only check for gio-unix-2.0 on non-win32 platform, because that API is Unix-specific. 
+if test x"$os_win32" = xyes; then
+  PKG_CHECK_MODULES(GIOMM, sigc++-2.0 >= ${gtkmm_min_sigc_version} glib-2.0 >= ${gtkmm_min_glib_version} gobject-2.0 >= ${gtkmm_min_glib_version} gmodule-2.0 >= ${gtkmm_min_glib_version} gio-2.0 >= ${gtkmm_min_glib_version})
+else
+  PKG_CHECK_MODULES(GIOMM, sigc++-2.0 >= ${gtkmm_min_sigc_version} glib-2.0 >= ${gtkmm_min_glib_version} gobject-2.0 >= ${gtkmm_min_glib_version} gmodule-2.0 >= ${gtkmm_min_glib_version} gio-2.0 >= ${gtkmm_min_glib_version} gio-unix-2.0 >= ${gtkmm_min_glib_version})
+fi
 AC_SUBST(GIOMM_CFLAGS)
 AC_SUBST(GIOMM_LIBS)
 
diff --git a/gio/src/Makefile_list_of_hg.am_fragment b/gio/src/Makefile_list_of_hg.am_fragment
index 173ac8b3..69ebe466 100644
--- a/gio/src/Makefile_list_of_hg.am_fragment
+++ b/gio/src/Makefile_list_of_hg.am_fragment
@@ -3,7 +3,7 @@
 ## or Makefile, so it's like copy-and-pasting this into each of those
 ## Makefile.am files.
 
-files_posix_hg =
+files_posix_hg = unixinputstream.hg unixoutputstream.hg   
 files_win32_hg =
 files_general_hg = appinfo.hg asyncresult.hg cancellable.hg drive.hg error.hg file.hg fileattributeinfo.hg \
 				   fileattributeinfolist.hg fileenumerator.hg fileicon.hg fileinfo.hg fileinputstream.hg fileoutputstream.hg \
diff --git a/gio/src/bufferedoutputstream.hg b/gio/src/bufferedoutputstream.hg
index 11f1188b..75ade8fd 100644
--- a/gio/src/bufferedoutputstream.hg
+++ b/gio/src/bufferedoutputstream.hg
@@ -31,7 +31,7 @@ class BufferedOutputStream : public Gio::FilterOutputStream
   _CLASS_GOBJECT(BufferedOutputStream, GBufferedOutputStream, G_BUFFERED_OUTPUT_STREAM, Gio::FilterOutputStream, GFilterOutputStream)
 protected:
   _WRAP_CTOR(BufferedOutputStream(const Glib::RefPtr<OutputStream>& base_stream), g_buffered_output_stream_new)
-  _WRAP_CTOR(BufferedOutputStream(const Glib::RefPtr<OutputStream>& base_stream, guint size), g_buffered_output_stream_new_sized)
+  _WRAP_CTOR(BufferedOutputStream(const Glib::RefPtr<OutputStream>& base_stream, gsize size), g_buffered_output_stream_new_sized)
 public:
   _WRAP_CREATE(const Glib::RefPtr<OutputStream>& base_stream)
   static Glib::RefPtr<BufferedOutputStream> create_sized(const Glib::RefPtr<OutputStream>& base_stream, gsize size);
diff --git a/gio/src/gio_methods.defs b/gio/src/gio_methods.defs
index e8cdcdfc..684673bb 100644
--- a/gio/src/gio_methods.defs
+++ b/gio/src/gio_methods.defs
@@ -1,187 +1,228 @@
 ;; -*- scheme -*-
 ; object definitions ...
-(define-object AppInfo
-  (in-module "G")
+(define-object Info
+  (in-module "GApp")
   (c-name "GAppInfo")
   (gtype-id "G_TYPE_APP_INFO")
 )
 
-(define-object AppLaunchContext
-  (in-module "G")
+(define-object LaunchContext
+  (in-module "GApp")
   (parent "GObject")
   (c-name "GAppLaunchContext")
   (gtype-id "G_TYPE_APP_LAUNCH_CONTEXT")
 )
 
-(define-object AsyncResult
-  (in-module "G")
+(define-object Result
+  (in-module "GAsync")
   (c-name "GAsyncResult")
   (gtype-id "G_TYPE_ASYNC_RESULT")
 )
 
-(define-object DirectoryMonitor
-  (in-module "G")
-  (parent "GObject")
-  (c-name "GDirectoryMonitor")
-  (gtype-id "G_TYPE_DIRECTORY_MONITOR")
+(define-object AppInfoLookup
+  (in-module "GDesktop")
+  (c-name "GDesktopAppInfoLookup")
+  (gtype-id "G_TYPE_DESKTOP_APP_INFO_LOOKUP")
 )
 
-(define-object Drive
-  (in-module "G")
+(define-object e
+  (in-module "GDriv")
   (c-name "GDrive")
   (gtype-id "G_TYPE_DRIVE")
 )
 
-(define-object File
-  (in-module "G")
+(define-object e
+  (in-module "GFil")
   (c-name "GFile")
   (gtype-id "G_TYPE_FILE")
 )
 
-(define-object FileEnumerator
-  (in-module "G")
+(define-object Enumerator
+  (in-module "GFile")
   (parent "GObject")
   (c-name "GFileEnumerator")
   (gtype-id "G_TYPE_FILE_ENUMERATOR")
 )
 
-(define-object FileMonitor
-  (in-module "G")
+(define-object Monitor
+  (in-module "GFile")
   (parent "GObject")
   (c-name "GFileMonitor")
   (gtype-id "G_TYPE_FILE_MONITOR")
 )
 
-(define-object Icon
-  (in-module "G")
+(define-object n
+  (in-module "GIco")
   (c-name "GIcon")
   (gtype-id "G_TYPE_ICON")
 )
 
-(define-object InputStream
-  (in-module "G")
+(define-object Stream
+  (in-module "GInput")
   (parent "GObject")
   (c-name "GInputStream")
   (gtype-id "G_TYPE_INPUT_STREAM")
 )
 
-(define-object FilterInputStream
-  (in-module "G")
+(define-object InputStream
+  (in-module "GFilter")
   (parent "GInputStream")
   (c-name "GFilterInputStream")
   (gtype-id "G_TYPE_FILTER_INPUT_STREAM")
 )
 
-(define-object BufferedInputStream
-  (in-module "G")
+(define-object InputStream
+  (in-module "GBuffered")
   (parent "GFilterInputStream")
   (c-name "GBufferedInputStream")
   (gtype-id "G_TYPE_BUFFERED_INPUT_STREAM")
 )
 
-(define-object DataInputStream
-  (in-module "G")
+(define-object InputStream
+  (in-module "GData")
   (parent "GBufferedInputStream")
   (c-name "GDataInputStream")
   (gtype-id "G_TYPE_DATA_INPUT_STREAM")
 )
 
-(define-object FileInputStream
-  (in-module "G")
+(define-object InputStream
+  (in-module "GFile")
   (parent "GInputStream")
   (c-name "GFileInputStream")
   (gtype-id "G_TYPE_FILE_INPUT_STREAM")
 )
 
-(define-object LoadableIcon
-  (in-module "G")
+(define-object Icon
+  (in-module "GLoadable")
   (c-name "GLoadableIcon")
   (gtype-id "G_TYPE_LOADABLE_ICON")
 )
 
-(define-object MemoryInputStream
-  (in-module "G")
+(define-object DirectoryMonitor
+  (in-module "GLocal")
+  (parent "GFileMonitor")
+  (c-name "GLocalDirectoryMonitor")
+  (gtype-id "G_TYPE_LOCAL_DIRECTORY_MONITOR")
+)
+
+(define-object FileInputStream
+  (in-module "GLocal")
+  (parent "GFileInputStream")
+  (c-name "GLocalFileInputStream")
+  (gtype-id "G_TYPE_LOCAL_FILE_INPUT_STREAM")
+)
+
+(define-object FileMonitor
+  (in-module "GLocal")
+  (parent "GFileMonitor")
+  (c-name "GLocalFileMonitor")
+  (gtype-id "G_TYPE_LOCAL_FILE_MONITOR")
+)
+
+(define-object InputStream
+  (in-module "GMemory")
   (parent "GInputStream")
   (c-name "GMemoryInputStream")
   (gtype-id "G_TYPE_MEMORY_INPUT_STREAM")
 )
 
-(define-object Mount
-  (in-module "G")
+(define-object t
+  (in-module "GMoun")
   (c-name "GMount")
   (gtype-id "G_TYPE_MOUNT")
 )
 
-(define-object MountOperation
-  (in-module "G")
+(define-object Operation
+  (in-module "GMount")
   (parent "GObject")
   (c-name "GMountOperation")
   (gtype-id "G_TYPE_MOUNT_OPERATION")
 )
 
-(define-object OutputStream
-  (in-module "G")
+(define-object Stream
+  (in-module "GOutput")
   (parent "GObject")
   (c-name "GOutputStream")
   (gtype-id "G_TYPE_OUTPUT_STREAM")
 )
 
-(define-object MemoryOutputStream
-  (in-module "G")
+(define-object OutputStream
+  (in-module "GMemory")
   (parent "GOutputStream")
   (c-name "GMemoryOutputStream")
   (gtype-id "G_TYPE_MEMORY_OUTPUT_STREAM")
 )
 
-(define-object FilterOutputStream
-  (in-module "G")
+(define-object OutputStream
+  (in-module "GFilter")
   (parent "GOutputStream")
   (c-name "GFilterOutputStream")
   (gtype-id "G_TYPE_FILTER_OUTPUT_STREAM")
 )
 
-(define-object DataOutputStream
-  (in-module "G")
+(define-object OutputStream
+  (in-module "GData")
   (parent "GFilterOutputStream")
   (c-name "GDataOutputStream")
   (gtype-id "G_TYPE_DATA_OUTPUT_STREAM")
 )
 
-(define-object FileOutputStream
-  (in-module "G")
+(define-object OutputStream
+  (in-module "GFile")
   (parent "GOutputStream")
   (c-name "GFileOutputStream")
   (gtype-id "G_TYPE_FILE_OUTPUT_STREAM")
 )
 
-(define-object Seekable
-  (in-module "G")
+(define-object FileOutputStream
+  (in-module "GLocal")
+  (parent "GFileOutputStream")
+  (c-name "GLocalFileOutputStream")
+  (gtype-id "G_TYPE_LOCAL_FILE_OUTPUT_STREAM")
+)
+
+(define-object e
+  (in-module "GSeekabl")
   (c-name "GSeekable")
   (gtype-id "G_TYPE_SEEKABLE")
 )
 
-(define-object Vfs
-  (in-module "G")
+(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 s
+  (in-module "GVf")
   (parent "GObject")
   (c-name "GVfs")
   (gtype-id "G_TYPE_VFS")
 )
 
-(define-object Volume
-  (in-module "G")
+(define-object e
+  (in-module "GVolum")
   (c-name "GVolume")
   (gtype-id "G_TYPE_VOLUME")
 )
 
-(define-object VolumeMonitor
-  (in-module "G")
+(define-object Monitor
+  (in-module "GVolume")
   (parent "GObject")
   (c-name "GVolumeMonitor")
   (gtype-id "G_TYPE_VOLUME_MONITOR")
 )
 
-(define-object NativeVolumeMonitor
-  (in-module "G")
+(define-object VolumeMonitor
+  (in-module "GNative")
   (parent "GVolumeMonitor")
   (c-name "GNativeVolumeMonitor")
   (gtype-id "G_TYPE_NATIVE_VOLUME_MONITOR")
@@ -189,8 +230,8 @@
 
 ;; Enumerations and flags ...
 
-(define-flags AppInfoCreateFlags
-  (in-module "G")
+(define-flags InfoCreateFlags
+  (in-module "GApp")
   (c-name "GAppInfoCreateFlags")
   (gtype-id "G_TYPE_APP_INFO_CREATE_FLAGS")
   (values
@@ -200,8 +241,8 @@
   )
 )
 
-(define-enum DataStreamByteOrder
-  (in-module "G")
+(define-enum StreamByteOrder
+  (in-module "GData")
   (c-name "GDataStreamByteOrder")
   (gtype-id "G_TYPE_DATA_STREAM_BYTE_ORDER")
   (values
@@ -211,8 +252,8 @@
   )
 )
 
-(define-enum DataStreamNewlineType
-  (in-module "G")
+(define-enum StreamNewlineType
+  (in-module "GData")
   (c-name "GDataStreamNewlineType")
   (gtype-id "G_TYPE_DATA_STREAM_NEWLINE_TYPE")
   (values
@@ -223,8 +264,8 @@
   )
 )
 
-(define-enum FileAttributeType
-  (in-module "G")
+(define-enum AttributeType
+  (in-module "GFile")
   (c-name "GFileAttributeType")
   (gtype-id "G_TYPE_FILE_ATTRIBUTE_TYPE")
   (values
@@ -240,8 +281,8 @@
   )
 )
 
-(define-flags FileAttributeInfoFlags
-  (in-module "G")
+(define-flags AttributeInfoFlags
+  (in-module "GFile")
   (c-name "GFileAttributeInfoFlags")
   (gtype-id "G_TYPE_FILE_ATTRIBUTE_INFO_FLAGS")
   (values
@@ -251,8 +292,8 @@
   )
 )
 
-(define-enum FileAttributeStatus
-  (in-module "G")
+(define-enum AttributeStatus
+  (in-module "GFile")
   (c-name "GFileAttributeStatus")
   (gtype-id "G_TYPE_FILE_ATTRIBUTE_STATUS")
   (values
@@ -262,8 +303,8 @@
   )
 )
 
-(define-flags FileQueryInfoFlags
-  (in-module "G")
+(define-flags QueryInfoFlags
+  (in-module "GFile")
   (c-name "GFileQueryInfoFlags")
   (gtype-id "G_TYPE_FILE_QUERY_INFO_FLAGS")
   (values
@@ -272,8 +313,8 @@
   )
 )
 
-(define-flags FileCreateFlags
-  (in-module "G")
+(define-flags CreateFlags
+  (in-module "GFile")
   (c-name "GFileCreateFlags")
   (gtype-id "G_TYPE_FILE_CREATE_FLAGS")
   (values
@@ -282,8 +323,8 @@
   )
 )
 
-(define-flags MountUnmountFlags
-  (in-module "G")
+(define-flags UnmountFlags
+  (in-module "GMount")
   (c-name "GMountUnmountFlags")
   (gtype-id "G_TYPE_MOUNT_UNMOUNT_FLAGS")
   (values
@@ -292,8 +333,8 @@
   )
 )
 
-(define-flags FileCopyFlags
-  (in-module "G")
+(define-flags CopyFlags
+  (in-module "GFile")
   (c-name "GFileCopyFlags")
   (gtype-id "G_TYPE_FILE_COPY_FLAGS")
   (values
@@ -306,8 +347,8 @@
   )
 )
 
-(define-flags FileMonitorFlags
-  (in-module "G")
+(define-flags MonitorFlags
+  (in-module "GFile")
   (c-name "GFileMonitorFlags")
   (gtype-id "G_TYPE_FILE_MONITOR_FLAGS")
   (values
@@ -316,8 +357,8 @@
   )
 )
 
-(define-enum FileType
-  (in-module "G")
+(define-enum Type
+  (in-module "GFile")
   (c-name "GFileType")
   (gtype-id "G_TYPE_FILE_TYPE")
   (values
@@ -331,8 +372,8 @@
   )
 )
 
-(define-enum FileMonitorEvent
-  (in-module "G")
+(define-enum MonitorEvent
+  (in-module "GFile")
   (c-name "GFileMonitorEvent")
   (gtype-id "G_TYPE_FILE_MONITOR_EVENT")
   (values
@@ -346,8 +387,8 @@
   )
 )
 
-(define-enum IOErrorEnum
-  (in-module "G")
+(define-enum Enum
+  (in-module "GIOError")
   (c-name "GIOErrorEnum")
   (gtype-id "G_TYPE_IO_ERROR_ENUM")
   (values
@@ -385,8 +426,8 @@
   )
 )
 
-(define-flags AskPasswordFlags
-  (in-module "G")
+(define-flags PasswordFlags
+  (in-module "GAsk")
   (c-name "GAskPasswordFlags")
   (gtype-id "G_TYPE_ASK_PASSWORD_FLAGS")
   (values
@@ -398,8 +439,8 @@
   )
 )
 
-(define-enum PasswordSave
-  (in-module "G")
+(define-enum Save
+  (in-module "GPassword")
   (c-name "GPasswordSave")
   (gtype-id "G_TYPE_PASSWORD_SAVE")
   (values
@@ -409,8 +450,8 @@
   )
 )
 
-(define-enum MountOperationResult
-  (in-module "G")
+(define-enum OperationResult
+  (in-module "GMount")
   (c-name "GMountOperationResult")
   (gtype-id "G_TYPE_MOUNT_OPERATION_RESULT")
   (values
@@ -420,8 +461,8 @@
   )
 )
 
-(define-flags OutputStreamSpliceFlags
-  (in-module "G")
+(define-flags StreamSpliceFlags
+  (in-module "GOutput")
   (c-name "GOutputStreamSpliceFlags")
   (gtype-id "G_TYPE_OUTPUT_STREAM_SPLICE_FLAGS")
   (values
@@ -663,6 +704,10 @@
 
 
 
+;; From gasynchelper.h
+
+
+
 ;; From gasyncresult.h
 
 (define-function g_async_result_get_type
@@ -817,7 +862,7 @@
   (return-type "GOutputStream*")
   (parameters
     '("GOutputStream*" "base_stream")
-    '("guint" "size")
+    '("gsize" "size")
   )
 )
 
@@ -996,6 +1041,10 @@
 
 
 
+;; From gcontenttypeprivate.h
+
+
+
 ;; From gdatainputstream.h
 
 (define-function g_data_input_stream_get_type
@@ -1258,42 +1307,55 @@
 
 
 
-;; From gdirectorymonitor.h
+;; From gdesktopappinfo.h
 
-(define-function g_directory_monitor_get_type
-  (c-name "g_directory_monitor_get_type")
+(define-function g_desktop_app_info_get_type
+  (c-name "g_desktop_app_info_get_type")
   (return-type "GType")
 )
 
-(define-method cancel
-  (of-object "GDirectoryMonitor")
-  (c-name "g_directory_monitor_cancel")
-  (return-type "gboolean")
+(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-method is_cancelled
-  (of-object "GDirectoryMonitor")
-  (c-name "g_directory_monitor_is_cancelled")
+(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-method set_rate_limit
-  (of-object "GDirectoryMonitor")
-  (c-name "g_directory_monitor_set_rate_limit")
+(define-function g_desktop_app_info_set_desktop_env
+  (c-name "g_desktop_app_info_set_desktop_env")
   (return-type "none")
   (parameters
-    '("int" "limit_msecs")
+    '("const-char*" "desktop_env")
   )
 )
 
-(define-method emit_event
-  (of-object "GDirectoryMonitor")
-  (c-name "g_directory_monitor_emit_event")
-  (return-type "none")
+(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
-    '("GFile*" "child")
-    '("GFile*" "other_file")
-    '("GFileMonitorEvent" "event_type")
+    '("const-char*" "uri_scheme")
   )
 )
 
@@ -1420,6 +1482,10 @@
 
 
 
+;; From gdummyfile.h
+
+
+
 ;; From gfileattribute.h
 
 (define-function g_file_attribute_info_list_new
@@ -1468,6 +1534,10 @@
 
 
 
+;; From gfileattribute-priv.h
+
+
+
 ;; From gfileenumerator.h
 
 (define-function g_file_enumerator_get_type
@@ -3433,6 +3503,10 @@
 
 
 
+;; From gioalias.h
+
+
+
 ;; From gioenumtypes.h
 
 (define-function g_app_info_create_flags_get_type
@@ -3548,6 +3622,10 @@
 
 
 
+;; From gio-marshal.h
+
+
+
 ;; From giomodule.h
 
 (define-function g_io_module_get_type
@@ -3667,6 +3745,10 @@
 
 
 
+;; From giomodule-priv.h
+
+
+
 ;; From gioscheduler.h
 
 (define-function g_io_scheduler_push_job
@@ -3754,6 +3836,48 @@
 
 
 
+;; From glocaldirectorymonitor.h
+
+(define-function g_local_directory_monitor_get_type
+  (c-name "g_local_directory_monitor_get_type")
+  (return-type "GType")
+)
+
+
+
+;; From glocalfileenumerator.h
+
+
+
+;; From glocalfile.h
+
+
+
+;; From glocalfileinfo.h
+
+
+
+;; From glocalfileinputstream.h
+
+
+
+;; From glocalfilemonitor.h
+
+(define-function g_local_file_monitor_get_type
+  (c-name "g_local_file_monitor_get_type")
+  (return-type "GType")
+)
+
+
+
+;; From glocalfileoutputstream.h
+
+
+
+;; From glocalvfs.h
+
+
+
 ;; From gmemoryinputstream.h
 
 (define-function g_memory_input_stream_get_type
@@ -4060,6 +4184,10 @@
 
 
 
+;; From gmountprivate.h
+
+
+
 ;; From gnativevolumemonitor.h
 
 (define-function g_native_volume_monitor_get_type
@@ -4254,6 +4382,10 @@
 
 
 
+;; From gpollfilemonitor.h
+
+
+
 ;; From gseekable.h
 
 (define-function g_seekable_get_type
@@ -4536,6 +4668,282 @@
 
 
 
+;; From gunionvolumemonitor.h
+
+
+
+;; 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
+    '("int" "fd")
+    '("gboolean" "close_fd_at_close")
+  )
+)
+
+
+
+;; From gunixmount.h
+
+
+
+;; From gunixmounts.h
+
+(define-function g_unix_mount_free
+  (c-name "g_unix_mount_free")
+  (return-type "none")
+  (parameters
+    '("GUnixMountEntry*" "mount_entry")
+  )
+)
+
+(define-method free
+  (of-object "GUnixMountPoint")
+  (c-name "g_unix_mount_point_free")
+  (return-type "none")
+)
+
+(define-function g_unix_mount_compare
+  (c-name "g_unix_mount_compare")
+  (return-type "gint")
+  (parameters
+    '("GUnixMountEntry*" "mount1")
+    '("GUnixMountEntry*" "mount2")
+  )
+)
+
+(define-function g_unix_mount_get_mount_path
+  (c-name "g_unix_mount_get_mount_path")
+  (return-type "const-char*")
+  (parameters
+    '("GUnixMountEntry*" "mount_entry")
+  )
+)
+
+(define-function g_unix_mount_get_device_path
+  (c-name "g_unix_mount_get_device_path")
+  (return-type "const-char*")
+  (parameters
+    '("GUnixMountEntry*" "mount_entry")
+  )
+)
+
+(define-function g_unix_mount_get_fs_type
+  (c-name "g_unix_mount_get_fs_type")
+  (return-type "const-char*")
+  (parameters
+    '("GUnixMountEntry*" "mount_entry")
+  )
+)
+
+(define-function g_unix_mount_is_readonly
+  (c-name "g_unix_mount_is_readonly")
+  (return-type "gboolean")
+  (parameters
+    '("GUnixMountEntry*" "mount_entry")
+  )
+)
+
+(define-function g_unix_mount_is_system_internal
+  (c-name "g_unix_mount_is_system_internal")
+  (return-type "gboolean")
+  (parameters
+    '("GUnixMountEntry*" "mount_entry")
+  )
+)
+
+(define-function g_unix_mount_guess_can_eject
+  (c-name "g_unix_mount_guess_can_eject")
+  (return-type "gboolean")
+  (parameters
+    '("GUnixMountEntry*" "mount_entry")
+  )
+)
+
+(define-function g_unix_mount_guess_should_display
+  (c-name "g_unix_mount_guess_should_display")
+  (return-type "gboolean")
+  (parameters
+    '("GUnixMountEntry*" "mount_entry")
+  )
+)
+
+(define-function g_unix_mount_guess_name
+  (c-name "g_unix_mount_guess_name")
+  (return-type "char*")
+  (parameters
+    '("GUnixMountEntry*" "mount_entry")
+  )
+)
+
+(define-function g_unix_mount_guess_icon
+  (c-name "g_unix_mount_guess_icon")
+  (return-type "GIcon*")
+  (parameters
+    '("GUnixMountEntry*" "mount_entry")
+  )
+)
+
+(define-method compare
+  (of-object "GUnixMountPoint")
+  (c-name "g_unix_mount_point_compare")
+  (return-type "gint")
+  (parameters
+    '("GUnixMountPoint*" "mount2")
+  )
+)
+
+(define-method get_mount_path
+  (of-object "GUnixMountPoint")
+  (c-name "g_unix_mount_point_get_mount_path")
+  (return-type "const-char*")
+)
+
+(define-method get_device_path
+  (of-object "GUnixMountPoint")
+  (c-name "g_unix_mount_point_get_device_path")
+  (return-type "const-char*")
+)
+
+(define-method get_fs_type
+  (of-object "GUnixMountPoint")
+  (c-name "g_unix_mount_point_get_fs_type")
+  (return-type "const-char*")
+)
+
+(define-method is_readonly
+  (of-object "GUnixMountPoint")
+  (c-name "g_unix_mount_point_is_readonly")
+  (return-type "gboolean")
+)
+
+(define-method is_user_mountable
+  (of-object "GUnixMountPoint")
+  (c-name "g_unix_mount_point_is_user_mountable")
+  (return-type "gboolean")
+)
+
+(define-method is_loopback
+  (of-object "GUnixMountPoint")
+  (c-name "g_unix_mount_point_is_loopback")
+  (return-type "gboolean")
+)
+
+(define-method guess_can_eject
+  (of-object "GUnixMountPoint")
+  (c-name "g_unix_mount_point_guess_can_eject")
+  (return-type "gboolean")
+)
+
+(define-method guess_name
+  (of-object "GUnixMountPoint")
+  (c-name "g_unix_mount_point_guess_name")
+  (return-type "char*")
+)
+
+(define-method guess_icon
+  (of-object "GUnixMountPoint")
+  (c-name "g_unix_mount_point_guess_icon")
+  (return-type "GIcon*")
+)
+
+(define-function g_unix_mount_points_get
+  (c-name "g_unix_mount_points_get")
+  (return-type "GList*")
+  (parameters
+    '("guint64*" "time_read")
+  )
+)
+
+(define-function g_unix_mounts_get
+  (c-name "g_unix_mounts_get")
+  (return-type "GList*")
+  (parameters
+    '("guint64*" "time_read")
+  )
+)
+
+(define-function g_unix_mount_at
+  (c-name "g_unix_mount_at")
+  (return-type "GUnixMountEntry*")
+  (parameters
+    '("const-char*" "mount_path")
+    '("guint64*" "time_read")
+  )
+)
+
+(define-function g_unix_mounts_changed_since
+  (c-name "g_unix_mounts_changed_since")
+  (return-type "gboolean")
+  (parameters
+    '("guint64" "time")
+  )
+)
+
+(define-function g_unix_mount_points_changed_since
+  (c-name "g_unix_mount_points_changed_since")
+  (return-type "gboolean")
+  (parameters
+    '("guint64" "time")
+  )
+)
+
+(define-function g_unix_mount_monitor_get_type
+  (c-name "g_unix_mount_monitor_get_type")
+  (return-type "GType")
+)
+
+(define-function g_unix_mount_monitor_new
+  (c-name "g_unix_mount_monitor_new")
+  (is-constructor-of "GUnixMountMonitor")
+  (return-type "GUnixMountMonitor*")
+)
+
+(define-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
+    '("int" "fd")
+    '("gboolean" "close_fd_at_close")
+  )
+)
+
+
+
+;; From gunixvolume.h
+
+
+
+;; From gunixvolumemonitor.h
+
+
+
 ;; From gvfs.h
 
 (define-function g_vfs_get_type
@@ -4755,3 +5163,12 @@
 )
 
 
+
+;; From gwin32appinfo.h
+
+(define-function g_win32_app_info_get_type
+  (c-name "g_win32_app_info_get_type")
+  (return-type "GType")
+)
+
+
diff --git a/gio/src/unixinputstream.ccg b/gio/src/unixinputstream.ccg
index 7a72047f..bf77e745 100644
--- a/gio/src/unixinputstream.ccg
+++ b/gio/src/unixinputstream.ccg
@@ -18,3 +18,4 @@
  */
 
 #include <gio/gio.h>
+#include <gio/gunixinputstream.h>
diff --git a/gio/src/unixinputstream.hg b/gio/src/unixinputstream.hg
index 685476b9..09be8d34 100644
--- a/gio/src/unixinputstream.hg
+++ b/gio/src/unixinputstream.hg
@@ -27,7 +27,7 @@ namespace Gio
 
 /**
  * UnixInputStream implements InputStream for reading from a unix file
- * descriptor, including asynchronous operations. The file descriptor much be
+ * descriptor, including asynchronous operations. The file descriptor must be
  * selectable, so it doesn't work with opened files.
  *
  * @newin2p16
diff --git a/gio/src/unixmount.ccg b/gio/src/unixmount.ccg
index 7a72047f..34f390bb 100644
--- a/gio/src/unixmount.ccg
+++ b/gio/src/unixmount.ccg
@@ -18,3 +18,4 @@
  */
 
 #include <gio/gio.h>
+#include <gio/gunixmounts.h>
diff --git a/gio/src/unixmount.hg b/gio/src/unixmount.hg
index d7206804..5c5143c1 100644
--- a/gio/src/unixmount.hg
+++ b/gio/src/unixmount.hg
@@ -31,6 +31,10 @@ namespace Gio
  *
  * @newin2p16
  */
+
+// TODO: GUnixMount seems to be hidden (the gunixmount.h header is not installed.)
+// But we do need to wrap GUnixMountPoint, GUnixMountEntry and GUnixMountMonitor from gunixmounts.h - notice the s. murrayc.
+/*
 class UnixMount
 : public Glib::Object,
   public Mount
@@ -38,6 +42,7 @@ class UnixMount
   _CLASS_GOBJECT(UnixMount, GUnixMount, G_UNIX_MOUNT, Glib::Object, GObject)
   _IMPLEMENTS_INTERFACE(Mount)
 };
+*/
 
 } // namespace Gio
 
diff --git a/gio/src/unixoutputstream.ccg b/gio/src/unixoutputstream.ccg
index 7a72047f..2af03e83 100644
--- a/gio/src/unixoutputstream.ccg
+++ b/gio/src/unixoutputstream.ccg
@@ -18,3 +18,4 @@
  */
 
 #include <gio/gio.h>
+#include <gio/gunixoutputstream.h>