glibmm r598 - in trunk: . gio/giomm gio/src

[markoa svn gnome org]

Author: markoa
Date: Tue Feb 12 22:08:41 2008
New Revision: 598
URL: http://svn.gnome.org/viewvc/glibmm?rev=598&view=rev

Log:
2008-02-12  Marko Anastasov  <marko anastasov gmail com>

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

	* gio/src/unixinputstream.hg:
	* gio/src/unixoutputstream.hg: Made wrapped constructors protected.

	* gio/src/bufferedinputstream.hg:
	* gio/src/datainputstream.hg:
	* gio/src/dataoutputstream.hg: Ditto for Data*Streams,
	and marked some hand-wrapped functions to ignore.

	* gio/src/mountoperation.hg: Wrote a note about ask_question signal,
	still to be wrapped.

	* gio/src/volume.hg: Added should_automount().

	* gio/giomm: Updated svn:ignore properties.


Modified:
   trunk/ChangeLog
   trunk/gio/giomm/   (props changed)
   trunk/gio/src/bufferedinputstream.hg
   trunk/gio/src/datainputstream.hg
   trunk/gio/src/dataoutputstream.hg
   trunk/gio/src/gio_methods.defs
   trunk/gio/src/mountoperation.hg
   trunk/gio/src/unixinputstream.hg
   trunk/gio/src/unixoutputstream.hg
   trunk/gio/src/volume.hg

Modified: trunk/gio/src/bufferedinputstream.hg
==============================================================================
--- trunk/gio/src/bufferedinputstream.hg	(original)
+++ trunk/gio/src/bufferedinputstream.hg	Tue Feb 12 22:08:41 2008
@@ -51,6 +51,8 @@
   gssize fill(gssize count, std::auto_ptr<Glib::Error>& error);
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 
+  _IGNORE(g_buffered_input_stream_fill_async)
+
   /** Reads data into the stream's buffer asynchronously, up to @a count size.
    * @ia o_priority can be used to prioritize reads. For the synchronous version of
    * this function, see fill().

Modified: trunk/gio/src/datainputstream.hg
==============================================================================
--- trunk/gio/src/datainputstream.hg	(original)
+++ trunk/gio/src/datainputstream.hg	Tue Feb 12 22:08:41 2008
@@ -36,7 +36,9 @@
 {
   _CLASS_GOBJECT(DataInputStream, GDataInputStream, G_DATA_INPUT_STREAM, Gio::BufferedInputStream, GBufferedInputStream)
 
+protected:
   _WRAP_CTOR(DataInputStream(const Glib::RefPtr<InputStream>& base_stream), g_data_input_stream_new)
+
 public:
 
   _WRAP_CREATE(const Glib::RefPtr<InputStream>& base_stream)
@@ -113,6 +115,8 @@
   guint64 read_uint64(std::auto_ptr<Glib::Error>& error);
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 
+  _IGNORE(g_data_input_stream_read_line)
+
   // FIXME: In C, these functions return NULL if there is an error (i.e. end of
   // stream reached), but if we use std::string, we don't have a way to tell an
   // empty string from NULL.  Perhaps we should use raw pointers as in C, but
@@ -131,6 +135,7 @@
   bool read_line(std::string& line, std::auto_ptr<Glib::Error>& error);
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 
+  _IGNORE(g_data_input_stream_read_until)
 
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   bool read_until(std::string& data, const std::string& stop_chars, const Glib::RefPtr<Cancellable>& cancellable);

Modified: trunk/gio/src/dataoutputstream.hg
==============================================================================
--- trunk/gio/src/dataoutputstream.hg	(original)
+++ trunk/gio/src/dataoutputstream.hg	Tue Feb 12 22:08:41 2008
@@ -36,7 +36,9 @@
 {
   _CLASS_GOBJECT(DataOutputStream, GDataOutputStream, G_DATA_OUTPUT_STREAM, Gio::BufferedOutputStream, GBufferedOutputStream)
 
+protected:
   _WRAP_CTOR(DataOutputStream(const Glib::RefPtr<OutputStream>& base_stream), g_data_output_stream_new)
+
 public:
 
   _WRAP_CREATE(const Glib::RefPtr<OutputStream>& base_stream)

Modified: trunk/gio/src/gio_methods.defs
==============================================================================
--- trunk/gio/src/gio_methods.defs	(original)
+++ trunk/gio/src/gio_methods.defs	Tue Feb 12 22:08:41 2008
@@ -1,6 +1,6 @@
 ;; -*- scheme -*-
 ; object definitions ...
-(define-object Info
+(define-object AppInfo
   (in-module "G")
   (c-name "GAppInfo")
   (gtype-id "G_TYPE_APP_INFO")
@@ -19,210 +19,189 @@
   (gtype-id "G_TYPE_ASYNC_RESULT")
 )
 
-(define-object AppInfoLookup
-  (in-module "GDesktop")
+(define-object DesktopAppInfoLookup
+  (in-module "G")
   (c-name "GDesktopAppInfoLookup")
   (gtype-id "G_TYPE_DESKTOP_APP_INFO_LOOKUP")
 )
 
-(define-object e
-  (in-module "GDriv")
+(define-object DirectoryMonitor
+  (in-module "G")
+  (parent "GObject")
+  (c-name "GDirectoryMonitor")
+  (gtype-id "G_TYPE_DIRECTORY_MONITOR")
+)
+
+(define-object Drive
+  (in-module "G")
   (c-name "GDrive")
   (gtype-id "G_TYPE_DRIVE")
 )
 
-(define-object e
-  (in-module "GFil")
+(define-object File
+  (in-module "G")
   (c-name "GFile")
   (gtype-id "G_TYPE_FILE")
 )
 
-(define-object Enumerator
-  (in-module "GFile")
+(define-object FileEnumerator
+  (in-module "G")
   (parent "GObject")
   (c-name "GFileEnumerator")
   (gtype-id "G_TYPE_FILE_ENUMERATOR")
 )
 
-(define-object Monitor
-  (in-module "GFile")
+(define-object FileMonitor
+  (in-module "G")
   (parent "GObject")
   (c-name "GFileMonitor")
   (gtype-id "G_TYPE_FILE_MONITOR")
 )
 
-(define-object n
-  (in-module "GIco")
+(define-object Icon
+  (in-module "G")
   (c-name "GIcon")
   (gtype-id "G_TYPE_ICON")
 )
 
-(define-object Stream
-  (in-module "GInput")
+(define-object InputStream
+  (in-module "G")
   (parent "GObject")
   (c-name "GInputStream")
   (gtype-id "G_TYPE_INPUT_STREAM")
 )
 
-(define-object InputStream
-  (in-module "GFilter")
+(define-object FilterInputStream
+  (in-module "G")
   (parent "GInputStream")
   (c-name "GFilterInputStream")
   (gtype-id "G_TYPE_FILTER_INPUT_STREAM")
 )
 
-(define-object InputStream
-  (in-module "GBuffered")
+(define-object BufferedInputStream
+  (in-module "G")
   (parent "GFilterInputStream")
   (c-name "GBufferedInputStream")
   (gtype-id "G_TYPE_BUFFERED_INPUT_STREAM")
 )
 
-(define-object InputStream
-  (in-module "GData")
+(define-object DataInputStream
+  (in-module "G")
   (parent "GBufferedInputStream")
   (c-name "GDataInputStream")
   (gtype-id "G_TYPE_DATA_INPUT_STREAM")
 )
 
-(define-object InputStream
-  (in-module "GFile")
+(define-object FileInputStream
+  (in-module "G")
   (parent "GInputStream")
   (c-name "GFileInputStream")
   (gtype-id "G_TYPE_FILE_INPUT_STREAM")
 )
 
-(define-object Icon
-  (in-module "GLoadable")
+(define-object LoadableIcon
+  (in-module "G")
   (c-name "GLoadableIcon")
   (gtype-id "G_TYPE_LOADABLE_ICON")
 )
 
-(define-object DirectoryMonitor
-  (in-module "GLocal")
-  (parent "GFileMonitor")
-  (c-name "GLocalDirectoryMonitor")
-  (gtype-id "G_TYPE_LOCAL_DIRECTORY_MONITOR")
-)
-
-(define-object 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")
+(define-object MemoryInputStream
+  (in-module "G")
   (parent "GInputStream")
   (c-name "GMemoryInputStream")
   (gtype-id "G_TYPE_MEMORY_INPUT_STREAM")
 )
 
-(define-object t
-  (in-module "GMoun")
+(define-object Mount
+  (in-module "G")
   (c-name "GMount")
   (gtype-id "G_TYPE_MOUNT")
 )
 
-(define-object Operation
-  (in-module "GMount")
+(define-object MountOperation
+  (in-module "G")
   (parent "GObject")
   (c-name "GMountOperation")
   (gtype-id "G_TYPE_MOUNT_OPERATION")
 )
 
-(define-object Stream
-  (in-module "GOutput")
+(define-object OutputStream
+  (in-module "G")
   (parent "GObject")
   (c-name "GOutputStream")
   (gtype-id "G_TYPE_OUTPUT_STREAM")
 )
 
-(define-object OutputStream
-  (in-module "GMemory")
+(define-object MemoryOutputStream
+  (in-module "G")
   (parent "GOutputStream")
   (c-name "GMemoryOutputStream")
   (gtype-id "G_TYPE_MEMORY_OUTPUT_STREAM")
 )
 
-(define-object OutputStream
-  (in-module "GFilter")
+(define-object FilterOutputStream
+  (in-module "G")
   (parent "GOutputStream")
   (c-name "GFilterOutputStream")
   (gtype-id "G_TYPE_FILTER_OUTPUT_STREAM")
 )
 
-(define-object OutputStream
-  (in-module "GData")
+(define-object DataOutputStream
+  (in-module "G")
   (parent "GFilterOutputStream")
   (c-name "GDataOutputStream")
   (gtype-id "G_TYPE_DATA_OUTPUT_STREAM")
 )
 
-(define-object OutputStream
-  (in-module "GFile")
+(define-object FileOutputStream
+  (in-module "G")
   (parent "GOutputStream")
   (c-name "GFileOutputStream")
   (gtype-id "G_TYPE_FILE_OUTPUT_STREAM")
 )
 
-(define-object FileOutputStream
-  (in-module "GLocal")
-  (parent "GFileOutputStream")
-  (c-name "GLocalFileOutputStream")
-  (gtype-id "G_TYPE_LOCAL_FILE_OUTPUT_STREAM")
-)
-
-(define-object e
-  (in-module "GSeekabl")
+(define-object Seekable
+  (in-module "G")
   (c-name "GSeekable")
   (gtype-id "G_TYPE_SEEKABLE")
 )
 
-(define-object InputStream
-  (in-module "GUnix")
+(define-object UnixInputStream
+  (in-module "G")
   (parent "GInputStream")
   (c-name "GUnixInputStream")
   (gtype-id "G_TYPE_UNIX_INPUT_STREAM")
 )
 
-(define-object OutputStream
-  (in-module "GUnix")
+(define-object UnixOutputStream
+  (in-module "G")
   (parent "GOutputStream")
   (c-name "GUnixOutputStream")
   (gtype-id "G_TYPE_UNIX_OUTPUT_STREAM")
 )
 
-(define-object s
-  (in-module "GVf")
+(define-object Vfs
+  (in-module "G")
   (parent "GObject")
   (c-name "GVfs")
   (gtype-id "G_TYPE_VFS")
 )
 
-(define-object e
-  (in-module "GVolum")
+(define-object Volume
+  (in-module "G")
   (c-name "GVolume")
   (gtype-id "G_TYPE_VOLUME")
 )
 
-(define-object Monitor
-  (in-module "GVolume")
+(define-object VolumeMonitor
+  (in-module "G")
   (parent "GObject")
   (c-name "GVolumeMonitor")
   (gtype-id "G_TYPE_VOLUME_MONITOR")
 )
 
-(define-object VolumeMonitor
-  (in-module "GNative")
+(define-object NativeVolumeMonitor
+  (in-module "G")
   (parent "GVolumeMonitor")
   (c-name "GNativeVolumeMonitor")
   (gtype-id "G_TYPE_NATIVE_VOLUME_MONITOR")
@@ -230,7 +209,7 @@
 
 ;; Enumerations and flags ...
 
-(define-flags InfoCreateFlags
+(define-flags AppInfoCreateFlags
   (in-module "G")
   (c-name "GAppInfoCreateFlags")
   (gtype-id "G_TYPE_APP_INFO_CREATE_FLAGS")
@@ -241,8 +220,8 @@
   )
 )
 
-(define-enum StreamByteOrder
-  (in-module "GData")
+(define-enum DataStreamByteOrder
+  (in-module "G")
   (c-name "GDataStreamByteOrder")
   (gtype-id "G_TYPE_DATA_STREAM_BYTE_ORDER")
   (values
@@ -252,8 +231,8 @@
   )
 )
 
-(define-enum StreamNewlineType
-  (in-module "GData")
+(define-enum DataStreamNewlineType
+  (in-module "G")
   (c-name "GDataStreamNewlineType")
   (gtype-id "G_TYPE_DATA_STREAM_NEWLINE_TYPE")
   (values
@@ -264,8 +243,8 @@
   )
 )
 
-(define-enum AttributeType
-  (in-module "GFile")
+(define-enum FileAttributeType
+  (in-module "G")
   (c-name "GFileAttributeType")
   (gtype-id "G_TYPE_FILE_ATTRIBUTE_TYPE")
   (values
@@ -281,8 +260,8 @@
   )
 )
 
-(define-flags AttributeInfoFlags
-  (in-module "GFile")
+(define-flags FileAttributeInfoFlags
+  (in-module "G")
   (c-name "GFileAttributeInfoFlags")
   (gtype-id "G_TYPE_FILE_ATTRIBUTE_INFO_FLAGS")
   (values
@@ -292,8 +271,8 @@
   )
 )
 
-(define-enum AttributeStatus
-  (in-module "GFile")
+(define-enum FileAttributeStatus
+  (in-module "G")
   (c-name "GFileAttributeStatus")
   (gtype-id "G_TYPE_FILE_ATTRIBUTE_STATUS")
   (values
@@ -303,8 +282,8 @@
   )
 )
 
-(define-flags QueryInfoFlags
-  (in-module "GFile")
+(define-flags FileQueryInfoFlags
+  (in-module "G")
   (c-name "GFileQueryInfoFlags")
   (gtype-id "G_TYPE_FILE_QUERY_INFO_FLAGS")
   (values
@@ -313,8 +292,8 @@
   )
 )
 
-(define-flags CreateFlags
-  (in-module "GFile")
+(define-flags FileCreateFlags
+  (in-module "G")
   (c-name "GFileCreateFlags")
   (gtype-id "G_TYPE_FILE_CREATE_FLAGS")
   (values
@@ -323,8 +302,17 @@
   )
 )
 
-(define-flags UnmountFlags
-  (in-module "GMount")
+(define-enum MountMountFlags
+  (in-module "G")
+  (c-name "GMountMountFlags")
+  (gtype-id "G_TYPE_MOUNT_MOUNT_FLAGS")
+  (values
+    '("e" "G_MOUNT_MOUNT_NONE")
+  )
+)
+
+(define-flags MountUnmountFlags
+  (in-module "G")
   (c-name "GMountUnmountFlags")
   (gtype-id "G_TYPE_MOUNT_UNMOUNT_FLAGS")
   (values
@@ -333,8 +321,8 @@
   )
 )
 
-(define-flags CopyFlags
-  (in-module "GFile")
+(define-flags FileCopyFlags
+  (in-module "G")
   (c-name "GFileCopyFlags")
   (gtype-id "G_TYPE_FILE_COPY_FLAGS")
   (values
@@ -347,8 +335,8 @@
   )
 )
 
-(define-flags MonitorFlags
-  (in-module "GFile")
+(define-flags FileMonitorFlags
+  (in-module "G")
   (c-name "GFileMonitorFlags")
   (gtype-id "G_TYPE_FILE_MONITOR_FLAGS")
   (values
@@ -357,8 +345,8 @@
   )
 )
 
-(define-enum Type
-  (in-module "GFile")
+(define-enum FileType
+  (in-module "G")
   (c-name "GFileType")
   (gtype-id "G_TYPE_FILE_TYPE")
   (values
@@ -372,8 +360,8 @@
   )
 )
 
-(define-enum MonitorEvent
-  (in-module "GFile")
+(define-enum FileMonitorEvent
+  (in-module "G")
   (c-name "GFileMonitorEvent")
   (gtype-id "G_TYPE_FILE_MONITOR_EVENT")
   (values
@@ -387,8 +375,8 @@
   )
 )
 
-(define-enum Enum
-  (in-module "GIOError")
+(define-enum IOErrorEnum
+  (in-module "G")
   (c-name "GIOErrorEnum")
   (gtype-id "G_TYPE_IO_ERROR_ENUM")
   (values
@@ -426,8 +414,8 @@
   )
 )
 
-(define-flags PasswordFlags
-  (in-module "GAsk")
+(define-flags AskPasswordFlags
+  (in-module "G")
   (c-name "GAskPasswordFlags")
   (gtype-id "G_TYPE_ASK_PASSWORD_FLAGS")
   (values
@@ -439,8 +427,8 @@
   )
 )
 
-(define-enum Save
-  (in-module "GPassword")
+(define-enum PasswordSave
+  (in-module "G")
   (c-name "GPasswordSave")
   (gtype-id "G_TYPE_PASSWORD_SAVE")
   (values
@@ -450,8 +438,8 @@
   )
 )
 
-(define-enum OperationResult
-  (in-module "GMount")
+(define-enum MountOperationResult
+  (in-module "G")
   (c-name "GMountOperationResult")
   (gtype-id "G_TYPE_MOUNT_OPERATION_RESULT")
   (values
@@ -461,8 +449,8 @@
   )
 )
 
-(define-flags StreamSpliceFlags
-  (in-module "GOutput")
+(define-flags OutputStreamSpliceFlags
+  (in-module "G")
   (c-name "GOutputStreamSpliceFlags")
   (gtype-id "G_TYPE_OUTPUT_STREAM_SPLICE_FLAGS")
   (values
@@ -704,10 +692,6 @@
 
 
 
-;; From gasynchelper.h
-
-
-
 ;; From gasyncresult.h
 
 (define-function g_async_result_get_type
@@ -1041,10 +1025,6 @@
 
 
 
-;; From gcontenttypeprivate.h
-
-
-
 ;; From gdatainputstream.h
 
 (define-function g_data_input_stream_get_type
@@ -1307,55 +1287,42 @@
 
 
 
-;; From gdesktopappinfo.h
+;; From gdirectorymonitor.h
 
-(define-function g_desktop_app_info_get_type
-  (c-name "g_desktop_app_info_get_type")
+(define-function g_directory_monitor_get_type
+  (c-name "g_directory_monitor_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
-  (c-name "g_desktop_app_info_new")
-  (is-constructor-of "GDesktopAppInfo")
-  (return-type "GDesktopAppInfo*")
-  (parameters
-    '("const-char*" "desktop_id")
-  )
+(define-method cancel
+  (of-object "GDirectoryMonitor")
+  (c-name "g_directory_monitor_cancel")
+  (return-type "gboolean")
 )
 
-(define-method get_is_hidden
-  (of-object "GDesktopAppInfo")
-  (c-name "g_desktop_app_info_get_is_hidden")
+(define-method is_cancelled
+  (of-object "GDirectoryMonitor")
+  (c-name "g_directory_monitor_is_cancelled")
   (return-type "gboolean")
 )
 
-(define-function g_desktop_app_info_set_desktop_env
-  (c-name "g_desktop_app_info_set_desktop_env")
+(define-method set_rate_limit
+  (of-object "GDirectoryMonitor")
+  (c-name "g_directory_monitor_set_rate_limit")
   (return-type "none")
   (parameters
-    '("const-char*" "desktop_env")
+    '("int" "limit_msecs")
   )
 )
 
-(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*")
+(define-method emit_event
+  (of-object "GDirectoryMonitor")
+  (c-name "g_directory_monitor_emit_event")
+  (return-type "none")
   (parameters
-    '("const-char*" "uri_scheme")
+    '("GFile*" "child")
+    '("GFile*" "other_file")
+    '("GFileMonitorEvent" "event_type")
   )
 )
 
@@ -1482,10 +1449,6 @@
 
 
 
-;; From gdummyfile.h
-
-
-
 ;; From gfileattribute.h
 
 (define-function g_file_attribute_info_list_new
@@ -1534,10 +1497,6 @@
 
 
 
-;; From gfileattribute-priv.h
-
-
-
 ;; From gfileenumerator.h
 
 (define-function g_file_enumerator_get_type
@@ -2337,6 +2296,7 @@
   (c-name "g_file_mount_enclosing_volume")
   (return-type "none")
   (parameters
+    '("GMountMountFlags" "flags")
     '("GMountOperation*" "mount_operation")
     '("GCancellable*" "cancellable")
     '("GAsyncReadyCallback" "callback")
@@ -2359,6 +2319,7 @@
   (c-name "g_file_mount_mountable")
   (return-type "none")
   (parameters
+    '("GMountMountFlags" "flags")
     '("GMountOperation*" "mount_operation")
     '("GCancellable*" "cancellable")
     '("GAsyncReadyCallback" "callback")
@@ -3503,10 +3464,6 @@
 
 
 
-;; From gioalias.h
-
-
-
 ;; From gioenumtypes.h
 
 (define-function g_app_info_create_flags_get_type
@@ -3534,6 +3491,11 @@
   (return-type "GType")
 )
 
+(define-function g_mount_mount_flags_get_type
+  (c-name "g_mount_mount_flags_get_type")
+  (return-type "GType")
+)
+
 (define-function g_mount_unmount_flags_get_type
   (c-name "g_mount_unmount_flags_get_type")
   (return-type "GType")
@@ -3622,10 +3584,6 @@
 
 
 
-;; From gio-marshal.h
-
-
-
 ;; From giomodule.h
 
 (define-function g_io_module_get_type
@@ -3654,7 +3612,7 @@
   (c-name "g_io_extension_point_register")
   (return-type "GIOExtensionPoint*")
   (parameters
-    '("const-char*" "extension_point")
+    '("const-char*" "name")
   )
 )
 
@@ -3662,7 +3620,7 @@
   (c-name "g_io_extension_point_lookup")
   (return-type "GIOExtensionPoint*")
   (parameters
-    '("const-char*" "extension_point")
+    '("const-char*" "name")
   )
 )
 
@@ -3745,10 +3703,6 @@
 
 
 
-;; From giomodule-priv.h
-
-
-
 ;; From gioscheduler.h
 
 (define-function g_io_scheduler_push_job
@@ -3836,48 +3790,6 @@
 
 
 
-;; From glocaldirectorymonitor.h
-
-(define-function g_local_directory_monitor_get_type
-  (c-name "g_local_directory_monitor_get_type")
-  (return-type "GType")
-)
-
-
-
-;; From glocalfileenumerator.h
-
-
-
-;; From glocalfile.h
-
-
-
-;; From glocalfileinfo.h
-
-
-
-;; From glocalfileinputstream.h
-
-
-
-;; From 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
@@ -4051,6 +3963,7 @@
   (c-name "g_mount_remount")
   (return-type "none")
   (parameters
+    '("GMountMountFlags" "flags")
     '("GMountOperation*" "mount_operation")
     '("GCancellable*" "cancellable")
     '("GAsyncReadyCallback" "callback")
@@ -4184,10 +4097,6 @@
 
 
 
-;; From gmountprivate.h
-
-
-
 ;; From gnativevolumemonitor.h
 
 (define-function g_native_volume_monitor_get_type
@@ -4382,10 +4291,6 @@
 
 
 
-;; From gpollfilemonitor.h
-
-
-
 ;; From gseekable.h
 
 (define-function g_seekable_get_type
@@ -4668,68 +4573,341 @@
 
 
 
-;; From gunionvolumemonitor.h
-
-
-
-;; From gunixinputstream.h
+;; From gvfs.h
 
-(define-function g_unix_input_stream_get_type
-  (c-name "g_unix_input_stream_get_type")
+(define-function g_vfs_get_type
+  (c-name "g_vfs_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")
-  )
+(define-method is_active
+  (of-object "GVfs")
+  (c-name "g_vfs_is_active")
+  (return-type "gboolean")
 )
 
-
-
-;; From gunixmount.h
-
-
-
-;; From gunixmounts.h
-
-(define-function g_unix_mount_free
-  (c-name "g_unix_mount_free")
-  (return-type "none")
+(define-method get_file_for_path
+  (of-object "GVfs")
+  (c-name "g_vfs_get_file_for_path")
+  (return-type "GFile*")
   (parameters
-    '("GUnixMountEntry*" "mount_entry")
+    '("const-char*" "path")
   )
 )
 
-(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")
+(define-method get_file_for_uri
+  (of-object "GVfs")
+  (c-name "g_vfs_get_file_for_uri")
+  (return-type "GFile*")
   (parameters
-    '("GUnixMountEntry*" "mount1")
-    '("GUnixMountEntry*" "mount2")
+    '("const-char*" "uri")
   )
 )
 
-(define-function g_unix_mount_get_mount_path
-  (c-name "g_unix_mount_get_mount_path")
-  (return-type "const-char*")
+(define-method parse_name
+  (of-object "GVfs")
+  (c-name "g_vfs_parse_name")
+  (return-type "GFile*")
   (parameters
-    '("GUnixMountEntry*" "mount_entry")
+    '("const-char*" "parse_name")
   )
 )
 
-(define-function g_unix_mount_get_device_path
-  (c-name "g_unix_mount_get_device_path")
+(define-function g_vfs_get_default
+  (c-name "g_vfs_get_default")
+  (return-type "GVfs*")
+)
+
+(define-function g_vfs_get_local
+  (c-name "g_vfs_get_local")
+  (return-type "GVfs*")
+)
+
+
+
+;; From gvolume.h
+
+(define-function g_volume_get_type
+  (c-name "g_volume_get_type")
+  (return-type "GType")
+)
+
+(define-method get_name
+  (of-object "GVolume")
+  (c-name "g_volume_get_name")
+  (return-type "char*")
+)
+
+(define-method get_icon
+  (of-object "GVolume")
+  (c-name "g_volume_get_icon")
+  (return-type "GIcon*")
+)
+
+(define-method get_uuid
+  (of-object "GVolume")
+  (c-name "g_volume_get_uuid")
+  (return-type "char*")
+)
+
+(define-method get_drive
+  (of-object "GVolume")
+  (c-name "g_volume_get_drive")
+  (return-type "GDrive*")
+)
+
+(define-method get_mount
+  (of-object "GVolume")
+  (c-name "g_volume_get_mount")
+  (return-type "GMount*")
+)
+
+(define-method can_mount
+  (of-object "GVolume")
+  (c-name "g_volume_can_mount")
+  (return-type "gboolean")
+)
+
+(define-method can_eject
+  (of-object "GVolume")
+  (c-name "g_volume_can_eject")
+  (return-type "gboolean")
+)
+
+(define-method should_automount
+  (of-object "GVolume")
+  (c-name "g_volume_should_automount")
+  (return-type "gboolean")
+)
+
+(define-method mount
+  (of-object "GVolume")
+  (c-name "g_volume_mount")
+  (return-type "none")
+  (parameters
+    '("GMountMountFlags" "flags")
+    '("GMountOperation*" "mount_operation")
+    '("GCancellable*" "cancellable")
+    '("GAsyncReadyCallback" "callback")
+    '("gpointer" "user_data")
+  )
+)
+
+(define-method mount_finish
+  (of-object "GVolume")
+  (c-name "g_volume_mount_finish")
+  (return-type "gboolean")
+  (parameters
+    '("GAsyncResult*" "result")
+    '("GError**" "error")
+  )
+)
+
+(define-method eject
+  (of-object "GVolume")
+  (c-name "g_volume_eject")
+  (return-type "none")
+  (parameters
+    '("GMountUnmountFlags" "flags")
+    '("GCancellable*" "cancellable")
+    '("GAsyncReadyCallback" "callback")
+    '("gpointer" "user_data")
+  )
+)
+
+(define-method eject_finish
+  (of-object "GVolume")
+  (c-name "g_volume_eject_finish")
+  (return-type "gboolean")
+  (parameters
+    '("GAsyncResult*" "result")
+    '("GError**" "error")
+  )
+)
+
+(define-method get_identifier
+  (of-object "GVolume")
+  (c-name "g_volume_get_identifier")
+  (return-type "char*")
+  (parameters
+    '("const-char*" "kind")
+  )
+)
+
+(define-method enumerate_identifiers
+  (of-object "GVolume")
+  (c-name "g_volume_enumerate_identifiers")
+  (return-type "char**")
+)
+
+
+
+;; From gvolumemonitor.h
+
+(define-function g_volume_monitor_get_type
+  (c-name "g_volume_monitor_get_type")
+  (return-type "GType")
+)
+
+(define-function g_volume_monitor_get
+  (c-name "g_volume_monitor_get")
+  (return-type "GVolumeMonitor*")
+)
+
+(define-method get_connected_drives
+  (of-object "GVolumeMonitor")
+  (c-name "g_volume_monitor_get_connected_drives")
+  (return-type "GList*")
+)
+
+(define-method get_volumes
+  (of-object "GVolumeMonitor")
+  (c-name "g_volume_monitor_get_volumes")
+  (return-type "GList*")
+)
+
+(define-method get_mounts
+  (of-object "GVolumeMonitor")
+  (c-name "g_volume_monitor_get_mounts")
+  (return-type "GList*")
+)
+
+(define-method get_volume_for_uuid
+  (of-object "GVolumeMonitor")
+  (c-name "g_volume_monitor_get_volume_for_uuid")
+  (return-type "GVolume*")
+  (parameters
+    '("const-char*" "uuid")
+  )
+)
+
+(define-method get_mount_for_uuid
+  (of-object "GVolumeMonitor")
+  (c-name "g_volume_monitor_get_mount_for_uuid")
+  (return-type "GMount*")
+  (parameters
+    '("const-char*" "uuid")
+  )
+)
+
+(define-function g_volume_monitor_adopt_orphan_mount
+  (c-name "g_volume_monitor_adopt_orphan_mount")
+  (return-type "GVolume*")
+  (parameters
+    '("GMount*" "mount")
+  )
+)
+
+
+
+;; 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
+  (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 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 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")
@@ -4935,240 +5113,3 @@
 )
 
 
-
-;; From gunixvolume.h
-
-
-
-;; From gunixvolumemonitor.h
-
-
-
-;; From gvfs.h
-
-(define-function g_vfs_get_type
-  (c-name "g_vfs_get_type")
-  (return-type "GType")
-)
-
-(define-method is_active
-  (of-object "GVfs")
-  (c-name "g_vfs_is_active")
-  (return-type "gboolean")
-)
-
-(define-method get_file_for_path
-  (of-object "GVfs")
-  (c-name "g_vfs_get_file_for_path")
-  (return-type "GFile*")
-  (parameters
-    '("const-char*" "path")
-  )
-)
-
-(define-method get_file_for_uri
-  (of-object "GVfs")
-  (c-name "g_vfs_get_file_for_uri")
-  (return-type "GFile*")
-  (parameters
-    '("const-char*" "uri")
-  )
-)
-
-(define-method parse_name
-  (of-object "GVfs")
-  (c-name "g_vfs_parse_name")
-  (return-type "GFile*")
-  (parameters
-    '("const-char*" "parse_name")
-  )
-)
-
-(define-function g_vfs_get_default
-  (c-name "g_vfs_get_default")
-  (return-type "GVfs*")
-)
-
-(define-function g_vfs_get_local
-  (c-name "g_vfs_get_local")
-  (return-type "GVfs*")
-)
-
-
-
-;; From gvolume.h
-
-(define-function g_volume_get_type
-  (c-name "g_volume_get_type")
-  (return-type "GType")
-)
-
-(define-method get_name
-  (of-object "GVolume")
-  (c-name "g_volume_get_name")
-  (return-type "char*")
-)
-
-(define-method get_icon
-  (of-object "GVolume")
-  (c-name "g_volume_get_icon")
-  (return-type "GIcon*")
-)
-
-(define-method get_uuid
-  (of-object "GVolume")
-  (c-name "g_volume_get_uuid")
-  (return-type "char*")
-)
-
-(define-method get_drive
-  (of-object "GVolume")
-  (c-name "g_volume_get_drive")
-  (return-type "GDrive*")
-)
-
-(define-method get_mount
-  (of-object "GVolume")
-  (c-name "g_volume_get_mount")
-  (return-type "GMount*")
-)
-
-(define-method can_mount
-  (of-object "GVolume")
-  (c-name "g_volume_can_mount")
-  (return-type "gboolean")
-)
-
-(define-method can_eject
-  (of-object "GVolume")
-  (c-name "g_volume_can_eject")
-  (return-type "gboolean")
-)
-
-(define-method mount
-  (of-object "GVolume")
-  (c-name "g_volume_mount")
-  (return-type "none")
-  (parameters
-    '("GMountOperation*" "mount_operation")
-    '("GCancellable*" "cancellable")
-    '("GAsyncReadyCallback" "callback")
-    '("gpointer" "user_data")
-  )
-)
-
-(define-method mount_finish
-  (of-object "GVolume")
-  (c-name "g_volume_mount_finish")
-  (return-type "gboolean")
-  (parameters
-    '("GAsyncResult*" "result")
-    '("GError**" "error")
-  )
-)
-
-(define-method eject
-  (of-object "GVolume")
-  (c-name "g_volume_eject")
-  (return-type "none")
-  (parameters
-    '("GMountUnmountFlags" "flags")
-    '("GCancellable*" "cancellable")
-    '("GAsyncReadyCallback" "callback")
-    '("gpointer" "user_data")
-  )
-)
-
-(define-method eject_finish
-  (of-object "GVolume")
-  (c-name "g_volume_eject_finish")
-  (return-type "gboolean")
-  (parameters
-    '("GAsyncResult*" "result")
-    '("GError**" "error")
-  )
-)
-
-(define-method get_identifier
-  (of-object "GVolume")
-  (c-name "g_volume_get_identifier")
-  (return-type "char*")
-  (parameters
-    '("const-char*" "kind")
-  )
-)
-
-(define-method enumerate_identifiers
-  (of-object "GVolume")
-  (c-name "g_volume_enumerate_identifiers")
-  (return-type "char**")
-)
-
-
-
-;; From gvolumemonitor.h
-
-(define-function g_volume_monitor_get_type
-  (c-name "g_volume_monitor_get_type")
-  (return-type "GType")
-)
-
-(define-function g_volume_monitor_get
-  (c-name "g_volume_monitor_get")
-  (return-type "GVolumeMonitor*")
-)
-
-(define-method get_connected_drives
-  (of-object "GVolumeMonitor")
-  (c-name "g_volume_monitor_get_connected_drives")
-  (return-type "GList*")
-)
-
-(define-method get_volumes
-  (of-object "GVolumeMonitor")
-  (c-name "g_volume_monitor_get_volumes")
-  (return-type "GList*")
-)
-
-(define-method get_mounts
-  (of-object "GVolumeMonitor")
-  (c-name "g_volume_monitor_get_mounts")
-  (return-type "GList*")
-)
-
-(define-method get_volume_for_uuid
-  (of-object "GVolumeMonitor")
-  (c-name "g_volume_monitor_get_volume_for_uuid")
-  (return-type "GVolume*")
-  (parameters
-    '("const-char*" "uuid")
-  )
-)
-
-(define-method get_mount_for_uuid
-  (of-object "GVolumeMonitor")
-  (c-name "g_volume_monitor_get_mount_for_uuid")
-  (return-type "GMount*")
-  (parameters
-    '("const-char*" "uuid")
-  )
-)
-
-(define-function g_volume_monitor_adopt_orphan_mount
-  (c-name "g_volume_monitor_adopt_orphan_mount")
-  (return-type "GVolume*")
-  (parameters
-    '("GMount*" "mount")
-  )
-)
-
-
-
-;; From gwin32appinfo.h
-
-(define-function g_win32_app_info_get_type
-  (c-name "g_win32_app_info_get_type")
-  (return-type "GType")
-)
-
-

Modified: trunk/gio/src/mountoperation.hg
==============================================================================
--- trunk/gio/src/mountoperation.hg	(original)
+++ trunk/gio/src/mountoperation.hg	Tue Feb 12 22:08:41 2008
@@ -78,7 +78,11 @@
 
 #m4 _CONVERSION(`const char*',`const Glib::ustring&',__GCHARP_TO_USTRING)
   _WRAP_SIGNAL(void ask_password(const Glib::ustring& message, const Glib::ustring& default_user, const Glib::ustring& default_domain, AskPasswordFlags flags), ask_password)
-  //TODO:_WRAP_SIGNAL(void ask_question(const Glib::ustring& message, const Glib::ustring& choices[]), ask_question)
+#m4 _CONVERSION(`const Glib::StringArrayHandle&',`GStrv*',`const_cast<GStrv*>(($3).data())')
+#m4 _CONVERSION(`GStrv*',`const Glib::StringArrayHandle&',`Glib::StringArrayHandle($3, Glib::OWNERSHIP_DEEP)')
+  // TODO: The signal def is wrong - it states that choices are GStrv* (gchar***)
+  // but actually they are const char*[]
+  //  _WRAP_SIGNAL(void ask_question(const Glib::ustring& message, const Glib::StringArrayHandle& choices), ask_question)
   _WRAP_SIGNAL(void reply(MountOperationResult result), reply)
 
 

Modified: trunk/gio/src/unixinputstream.hg
==============================================================================
--- trunk/gio/src/unixinputstream.hg	(original)
+++ trunk/gio/src/unixinputstream.hg	Tue Feb 12 22:08:41 2008
@@ -36,6 +36,7 @@
 {
   _CLASS_GOBJECT(UnixInputStream, GUnixInputStream, G_UNIX_INPUT_STREAM, Gio::InputStream, GInputStream)
 
+protected:
   _WRAP_CTOR(UnixInputStream(int fd, bool close_fd_at_close), g_unix_input_stream_new)
 
 public:

Modified: trunk/gio/src/unixoutputstream.hg
==============================================================================
--- trunk/gio/src/unixoutputstream.hg	(original)
+++ trunk/gio/src/unixoutputstream.hg	Tue Feb 12 22:08:41 2008
@@ -36,6 +36,7 @@
 {
   _CLASS_GOBJECT(UnixOutputStream, GUnixOutputStream, G_UNIX_OUTPUT_STREAM, Gio::OutputStream, GOutputStream)
 
+protected:
   _WRAP_CTOR(UnixOutputStream(int fd, bool close_fd_at_close), g_unix_output_stream_new)
 
 public:

Modified: trunk/gio/src/volume.hg
==============================================================================
--- trunk/gio/src/volume.hg	(original)
+++ trunk/gio/src/volume.hg	Tue Feb 12 22:08:41 2008
@@ -82,6 +82,7 @@
 
   _WRAP_METHOD(bool can_mount() const, g_volume_can_mount)
   _WRAP_METHOD(bool can_eject() const, g_volume_can_eject)
+  _WRAP_METHOD(bool should_automount() const, g_volume_should_automount)
 
   /** Mounts a volume.
    * This is an asynchronous operation, and is finished by calling mount_finish() with the AsyncResult data returned in the callback slot.