summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog19
-rw-r--r--gio/src/Makefile.am2
-rw-r--r--gio/src/gio_methods.defs891
-rw-r--r--gio/src/gio_others.defs6
-rw-r--r--gio/src/gio_signals.defs6
-rw-r--r--gio/src/memoryinputstream.ccg14
-rw-r--r--gio/src/memoryinputstream.hg12
-rw-r--r--gio/src/mountoperation.hg15
-rw-r--r--gio/src/themedicon.hg6
9 files changed, 549 insertions, 422 deletions
diff --git a/ChangeLog b/ChangeLog
index 697eccf7..6696272c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2008-02-21 Murray Cumming <murrayc@murrayc.com>
+
+ * gio/src/gio_methods.defs: Regenerated with h2defs.py
+
+ * gio/src/gio_signals.defs: Corrected the GMountOperation::ask-question
+ definition.
+ * gio/src/mountoperation.hg: Wrapped the ask-question signal, though
+ I wonder if it really works.
+
+ * gio/src/memoryinputstream.ccg:
+ * gio/src/memoryinputstream.hg:
+ Added add_data(const void* data, gssize len).
+
+ * gio/src/gio_others.defs: Added g_themed_icon_get_names()
+ because h2defs.py cannot seem to parse it.
+ * gio/src/Makefile.am: Mention gio_methods.defs.
+ * gio/src/themedicon.hg: Attempted to wrap get_names(), but I get a
+ gmmproc error.
+
2008-02-20 Marko Anastasov <marko.anastasov@gmail.com>
* gio/src/desktopappinfo.hg: Removed a todo regarding
diff --git a/gio/src/Makefile.am b/gio/src/Makefile.am
index 2f653cd5..cd08120a 100644
--- a/gio/src/Makefile.am
+++ b/gio/src/Makefile.am
@@ -5,7 +5,7 @@ sublib_name = giomm
sublib_namespace = Gio
sublib_parentdir = giomm
files_defs = gio.defs gio_methods.defs gio_signals.defs gio_enums.defs \
- gio_docs.xml gio_docs_override.xml gio_vfuncs.defs
+ gio_docs.xml gio_docs_override.xml gio_vfuncs.defs gio_others.defs
include $(top_srcdir)/build_shared/Makefile_gensrc.am_fragment
diff --git a/gio/src/gio_methods.defs b/gio/src/gio_methods.defs
index 0a3a8f76..e8dc0805 100644
--- a/gio/src/gio_methods.defs
+++ b/gio/src/gio_methods.defs
@@ -1,207 +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 DesktopAppInfoLookup
- (in-module "G")
+(define-object AppInfoLookup
+ (in-module "GDesktop")
(c-name "GDesktopAppInfoLookup")
(gtype-id "G_TYPE_DESKTOP_APP_INFO_LOOKUP")
)
-(define-object DirectoryMonitor
- (in-module "G")
- (parent "GObject")
- (c-name "GDirectoryMonitor")
- (gtype-id "G_TYPE_DIRECTORY_MONITOR")
-)
-
-(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 UnixInputStream
- (in-module "G")
+(define-object InputStream
+ (in-module "GUnix")
(parent "GInputStream")
(c-name "GUnixInputStream")
(gtype-id "G_TYPE_UNIX_INPUT_STREAM")
)
-(define-object UnixOutputStream
- (in-module "G")
+(define-object OutputStream
+ (in-module "GUnix")
(parent "GOutputStream")
(c-name "GUnixOutputStream")
(gtype-id "G_TYPE_UNIX_OUTPUT_STREAM")
)
-(define-object Vfs
- (in-module "G")
+(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")
@@ -209,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
@@ -220,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
@@ -231,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
@@ -243,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
@@ -260,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
@@ -271,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
@@ -282,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
@@ -292,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
@@ -302,8 +323,8 @@
)
)
-(define-enum MountMountFlags
- (in-module "G")
+(define-enum MountFlags
+ (in-module "GMount")
(c-name "GMountMountFlags")
(gtype-id "G_TYPE_MOUNT_MOUNT_FLAGS")
(values
@@ -311,8 +332,8 @@
)
)
-(define-flags MountUnmountFlags
- (in-module "G")
+(define-flags UnmountFlags
+ (in-module "GMount")
(c-name "GMountUnmountFlags")
(gtype-id "G_TYPE_MOUNT_UNMOUNT_FLAGS")
(values
@@ -321,8 +342,8 @@
)
)
-(define-flags FileCopyFlags
- (in-module "G")
+(define-flags CopyFlags
+ (in-module "GFile")
(c-name "GFileCopyFlags")
(gtype-id "G_TYPE_FILE_COPY_FLAGS")
(values
@@ -335,8 +356,8 @@
)
)
-(define-flags FileMonitorFlags
- (in-module "G")
+(define-flags MonitorFlags
+ (in-module "GFile")
(c-name "GFileMonitorFlags")
(gtype-id "G_TYPE_FILE_MONITOR_FLAGS")
(values
@@ -345,8 +366,8 @@
)
)
-(define-enum FileType
- (in-module "G")
+(define-enum Type
+ (in-module "GFile")
(c-name "GFileType")
(gtype-id "G_TYPE_FILE_TYPE")
(values
@@ -360,8 +381,8 @@
)
)
-(define-enum FileMonitorEvent
- (in-module "G")
+(define-enum MonitorEvent
+ (in-module "GFile")
(c-name "GFileMonitorEvent")
(gtype-id "G_TYPE_FILE_MONITOR_EVENT")
(values
@@ -375,8 +396,8 @@
)
)
-(define-enum IOErrorEnum
- (in-module "G")
+(define-enum Enum
+ (in-module "GIOError")
(c-name "GIOErrorEnum")
(gtype-id "G_TYPE_IO_ERROR_ENUM")
(values
@@ -414,8 +435,8 @@
)
)
-(define-flags AskPasswordFlags
- (in-module "G")
+(define-flags PasswordFlags
+ (in-module "GAsk")
(c-name "GAskPasswordFlags")
(gtype-id "G_TYPE_ASK_PASSWORD_FLAGS")
(values
@@ -427,8 +448,8 @@
)
)
-(define-enum PasswordSave
- (in-module "G")
+(define-enum Save
+ (in-module "GPassword")
(c-name "GPasswordSave")
(gtype-id "G_TYPE_PASSWORD_SAVE")
(values
@@ -438,8 +459,8 @@
)
)
-(define-enum MountOperationResult
- (in-module "G")
+(define-enum OperationResult
+ (in-module "GMount")
(c-name "GMountOperationResult")
(gtype-id "G_TYPE_MOUNT_OPERATION_RESULT")
(values
@@ -449,8 +470,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
@@ -692,6 +713,10 @@
+;; From gasynchelper.h
+
+
+
;; From gasyncresult.h
(define-function g_async_result_get_type
@@ -1025,6 +1050,10 @@
+;; From gcontenttypeprivate.h
+
+
+
;; From gdatainputstream.h
(define-function g_data_input_stream_get_type
@@ -1287,42 +1316,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")
)
)
@@ -1449,6 +1491,10 @@
+;; From gdummyfile.h
+
+
+
;; From gfileattribute.h
(define-function g_file_attribute_info_list_new
@@ -1497,6 +1543,10 @@
+;; From gfileattribute-priv.h
+
+
+
;; From gfileenumerator.h
(define-function g_file_enumerator_get_type
@@ -3464,6 +3514,10 @@
+;; From gioalias.h
+
+
+
;; From gioenumtypes.h
(define-function g_app_info_create_flags_get_type
@@ -3584,6 +3638,10 @@
+;; From gio-marshal.h
+
+
+
;; From giomodule.h
(define-function g_io_module_get_type
@@ -3703,6 +3761,10 @@
+;; From giomodule-priv.h
+
+
+
;; From gioscheduler.h
(define-function g_io_scheduler_push_job
@@ -3790,6 +3852,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
@@ -4097,6 +4201,10 @@
+;; From gmountprivate.h
+
+
+
;; From gnativevolumemonitor.h
(define-function g_native_volume_monitor_get_type
@@ -4291,6 +4399,10 @@
+;; From gpollfilemonitor.h
+
+
+
;; From gseekable.h
(define-function g_seekable_get_type
@@ -4573,284 +4685,7 @@
-;; 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 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 gunionvolumemonitor.h
@@ -4873,6 +4708,10 @@
+;; From gunixmount.h
+
+
+
;; From gunixmounts.h
(define-function g_unix_mount_free
@@ -5113,3 +4952,247 @@
)
+
+;; 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 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 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/gio_others.defs b/gio/src/gio_others.defs
index 8b137891..2b884b29 100644
--- a/gio/src/gio_others.defs
+++ b/gio/src/gio_others.defs
@@ -1 +1,5 @@
-
+; h2defs.py does not generate this. murrayc.
+(define-function g_themed_icon_get_names
+ (c-name "g_themed_icon_get_names")
+ (return-type "const-char*const*")
+)
diff --git a/gio/src/gio_signals.defs b/gio/src/gio_signals.defs
index a0ebd8dc..b7f98925 100644
--- a/gio/src/gio_signals.defs
+++ b/gio/src/gio_signals.defs
@@ -214,13 +214,17 @@
)
)
+;; p1 is actually a gchar**,
+;; but that is equivalent (by typedef) to gchar**,
+;; and the declaration in gmountoperation.h adds a const.
+;; murrayc
(define-signal ask-question
(of-object "GMountOperation")
(return-type "void")
(when "last")
(parameters
'("const-gchar*" "p0")
- '("GStrv*" "p1")
+ '("const-gchar**" "p1")
)
)
diff --git a/gio/src/memoryinputstream.ccg b/gio/src/memoryinputstream.ccg
index 1d2937fa..72089d32 100644
--- a/gio/src/memoryinputstream.ccg
+++ b/gio/src/memoryinputstream.ccg
@@ -22,9 +22,15 @@
namespace Gio
{
- void MemoryInputStream::add_data(const std::string& data)
- {
- g_memory_input_stream_add_data(gobj(), data.c_str(), data.size(), NULL);
- }
+void MemoryInputStream::add_data(const std::string& data)
+{
+ g_memory_input_stream_add_data(gobj(), data.c_str(), data.size(), NULL);
+}
+
+
+void MemoryInputStream::add_data(const void* data, gssize len)
+{
+ g_memory_input_stream_add_data(gobj(), data, len, NULL);
+}
} // namespace Gio
diff --git a/gio/src/memoryinputstream.hg b/gio/src/memoryinputstream.hg
index 924897af..7cfad118 100644
--- a/gio/src/memoryinputstream.hg
+++ b/gio/src/memoryinputstream.hg
@@ -44,10 +44,18 @@ protected:
public:
_WRAP_CREATE()
- //TODO: Add documentation.
- //TODO: Add a gchar*+length method overload.
+ /** Appends to data that can be read from the input stream.
+ *
+ * @param data Input data.
+ */
void add_data(const std::string& data);
+ /** Appends to data that can be read from the input stream.
+ *
+ * @param data Input data.
+ * @param len Length of the data, may be -1 if data is a null-terminated string.
+ */
+ void add_data(const void* data, gssize len);
};
} // namespace Gio
diff --git a/gio/src/mountoperation.hg b/gio/src/mountoperation.hg
index 6c424029..64d24073 100644
--- a/gio/src/mountoperation.hg
+++ b/gio/src/mountoperation.hg
@@ -76,13 +76,15 @@ public:
_WRAP_METHOD(void set_choice(int choice), g_mount_operation_set_choice)
_WRAP_METHOD(void reply(MountOperationResult result), g_mount_operation_reply)
+
#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)
-#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)
+
+ //TODO: We really need some test to make sure that our use of StringArrayHandle is correct. murrayc.
+#m4 _CONVERSION(`const Glib::StringArrayHandle&',`const gchar**',`const_cast<const gchar**>(($3).data())')
+#m4 _CONVERSION(`const gchar**',`const Glib::StringArrayHandle&',`Glib::StringArrayHandle($3, Glib::OWNERSHIP_DEEP)')
+ _WRAP_SIGNAL(void ask_question(const Glib::ustring& message, const Glib::StringArrayHandle& choices), ask_question)
+
_WRAP_SIGNAL(void reply(MountOperationResult result), reply)
@@ -92,9 +94,6 @@ public:
_WRAP_PROPERTY("domain", Glib::ustring)
_WRAP_PROPERTY("password-save", PasswordSave)
_WRAP_PROPERTY("choice", int)
-
- //TODO: vfuncs
-
};
} // namespace Gio
diff --git a/gio/src/themedicon.hg b/gio/src/themedicon.hg
index 24a1762e..a8090ea7 100644
--- a/gio/src/themedicon.hg
+++ b/gio/src/themedicon.hg
@@ -51,10 +51,14 @@ protected:
public:
_WRAP_CREATE(const std::string& iconname)
+
+ //See http://bugzilla.gnome.org/show_bug.cgi?id=517676 about the constructors. murrayc.
//TODO: GIcon *g_themed_icon_new_with_default_fallbacks (const char *iconname);
//TODO: GIcon *g_themed_icon_new_from_names (char **iconnames, int len);
- //TODO: const char * const *g_themed_icon_get_names (GThemedIcon *icon);
+#m4 _CONVERSION(`const char*const*',`Glib::StringArrayHandle',`Glib::StringArrayHandle($3, Glib::OWNERSHIP_DEEP)')
+ //TODO: gmmproc complains about the wrong number of arguments, but I can't see why. murrayc.
+ //_WRAP_METHOD(Glib::StringArrayHandle get_names() const, g_themed_icon_get_names)
//There are no signals or properties.
};
View Lorry Controller Status