glibmm r558 - in trunk: . gio/src
- From: markoa svn gnome org
- To: svn-commits-list gnome org
- Subject: glibmm r558 - in trunk: . gio/src
- Date: Sat, 2 Feb 2008 15:42:23 +0000 (GMT)
Author: markoa
Date: Sat Feb 2 15:42:23 2008
New Revision: 558
URL: http://svn.gnome.org/viewvc/glibmm?rev=558&view=rev
Log:
2008-02-02 Marko Anastasov <marko marko anastasov name>
* gio/src/volume.hg: Added get_mount().
* gio/src/gio_enums.defs: Regenerated with enums.pl.
* gio/src/gio_methods.defs: Regenerated with h2defs.py.
Modified:
trunk/ChangeLog
trunk/gio/src/gio_enums.defs
trunk/gio/src/gio_methods.defs
trunk/gio/src/volume.hg
Modified: trunk/gio/src/gio_enums.defs
==============================================================================
--- trunk/gio/src/gio_enums.defs (original)
+++ trunk/gio/src/gio_enums.defs Sat Feb 2 15:42:23 2008
@@ -1,14 +1,16 @@
-;; From /opt/gnome2/include/glib-2.0/gio/gappinfo.h
+;; From /home/marko/prefix/include/glib-2.0/gio/gappinfo.h
-(define-enum-extended AppInfoCreateFlags
+(define-flags-extended AppInfoCreateFlags
(in-module "G")
(c-name "GAppInfoCreateFlags")
(values
- '("e" "G_APP_INFO_CREATE_NONE" "0")
+ '("none" "G_APP_INFO_CREATE_NONE" "0")
+ '("needs-terminal" "G_APP_INFO_CREATE_NEEDS_TERMINAL" "1<<0")
+ '("supports-uris" "G_APP_INFO_CREATE_SUPPORTS_URIS" "1<<1")
)
)
-;; From /opt/gnome2/include/glib-2.0/gio/gdatainputstream.h
+;; From /home/marko/prefix/include/glib-2.0/gio/gdatainputstream.h
(define-enum-extended DataStreamByteOrder
(in-module "G")
@@ -31,7 +33,7 @@
)
)
-;; From /opt/gnome2/include/glib-2.0/gio/gfileattribute.h
+;; From /home/marko/prefix/include/glib-2.0/gio/gfileattribute.h
(define-enum-extended FileAttributeType
(in-module "G")
@@ -69,49 +71,58 @@
)
)
-;; From /opt/gnome2/include/glib-2.0/gio/gfile.h
+;; From /home/marko/prefix/include/glib-2.0/gio/gfile.h
-(define-enum-extended FileQueryInfoFlags
+(define-flags-extended FileQueryInfoFlags
(in-module "G")
(c-name "GFileQueryInfoFlags")
(values
- '("e" "G_FILE_QUERY_INFO_NONE" "0")
+ '("none" "G_FILE_QUERY_INFO_NONE" "0")
+ '("nofollow-symlinks" "G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS" "1<<0")
)
)
-(define-enum-extended FileCreateFlags
+(define-flags-extended FileCreateFlags
(in-module "G")
(c-name "GFileCreateFlags")
(values
- '("e" "G_FILE_CREATE_NONE" "0")
+ '("none" "G_FILE_CREATE_NONE" "0")
+ '("private" "G_FILE_CREATE_PRIVATE" "1<<0")
)
)
-(define-enum-extended MountUnmountFlags
+(define-flags-extended MountUnmountFlags
(in-module "G")
(c-name "GMountUnmountFlags")
(values
- '("e" "G_MOUNT_UNMOUNT_NONE" "0")
+ '("none" "G_MOUNT_UNMOUNT_NONE" "0")
+ '("force" "G_MOUNT_UNMOUNT_FORCE" "1<<0")
)
)
-(define-enum-extended FileCopyFlags
+(define-flags-extended FileCopyFlags
(in-module "G")
(c-name "GFileCopyFlags")
(values
- '("e" "G_FILE_COPY_NONE" "0")
+ '("none" "G_FILE_COPY_NONE" "0")
+ '("overwrite" "G_FILE_COPY_OVERWRITE" "1<<0")
+ '("backup" "G_FILE_COPY_BACKUP" "1<<1")
+ '("nofollow-symlinks" "G_FILE_COPY_NOFOLLOW_SYMLINKS" "1<<2")
+ '("all-metadata" "G_FILE_COPY_ALL_METADATA" "1<<3")
+ '("no-fallback-for-move" "G_FILE_COPY_NO_FALLBACK_FOR_MOVE" "1<<4")
)
)
-(define-enum-extended FileMonitorFlags
+(define-flags-extended FileMonitorFlags
(in-module "G")
(c-name "GFileMonitorFlags")
(values
- '("e" "G_FILE_MONITOR_NONE" "0")
+ '("none" "G_FILE_MONITOR_NONE" "0")
+ '("watch-mounts" "G_FILE_MONITOR_WATCH_MOUNTS" "1<<0")
)
)
-;; From /opt/gnome2/include/glib-2.0/gio/gfileinfo.h
+;; From /home/marko/prefix/include/glib-2.0/gio/gfileinfo.h
(define-enum-extended FileType
(in-module "G")
@@ -127,7 +138,7 @@
)
)
-;; From /opt/gnome2/include/glib-2.0/gio/gfilemonitor.h
+;; From /home/marko/prefix/include/glib-2.0/gio/gfilemonitor.h
(define-enum-extended FileMonitorEvent
(in-module "G")
@@ -143,7 +154,7 @@
)
)
-;; From /opt/gnome2/include/glib-2.0/gio/gioerror.h
+;; From /home/marko/prefix/include/glib-2.0/gio/gioerror.h
(define-enum-extended IOErrorEnum
(in-module "G")
@@ -183,7 +194,7 @@
)
)
-;; From /opt/gnome2/include/glib-2.0/gio/gmountoperation.h
+;; From /home/marko/prefix/include/glib-2.0/gio/gmountoperation.h
(define-flags-extended AskPasswordFlags
(in-module "G")
@@ -217,7 +228,7 @@
)
)
-;; From /opt/gnome2/include/glib-2.0/gio/goutputstream.h
+;; From /home/marko/prefix/include/glib-2.0/gio/goutputstream.h
(define-flags-extended OutputStreamSpliceFlags
(in-module "G")
Modified: trunk/gio/src/gio_methods.defs
==============================================================================
--- trunk/gio/src/gio_methods.defs (original)
+++ trunk/gio/src/gio_methods.defs Sat Feb 2 15:42:23 2008
@@ -1,222 +1,187 @@
;; -*- scheme -*-
; object definitions ...
-(define-object Info
- (in-module "GApp")
+(define-object AppInfo
+ (in-module "G")
(c-name "GAppInfo")
(gtype-id "G_TYPE_APP_INFO")
)
-(define-object LaunchContext
- (in-module "GApp")
+(define-object AppLaunchContext
+ (in-module "G")
(parent "GObject")
(c-name "GAppLaunchContext")
(gtype-id "G_TYPE_APP_LAUNCH_CONTEXT")
)
-(define-object Result
- (in-module "GAsync")
+(define-object AsyncResult
+ (in-module "G")
(c-name "GAsyncResult")
(gtype-id "G_TYPE_ASYNC_RESULT")
)
-(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")
- (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")
+(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")
@@ -224,18 +189,19 @@
;; Enumerations and flags ...
-(define-flags InfoCreateFlags
- (in-module "GApp")
+(define-flags AppInfoCreateFlags
+ (in-module "G")
(c-name "GAppInfoCreateFlags")
(gtype-id "G_TYPE_APP_INFO_CREATE_FLAGS")
(values
- '("one" "G_APP_INFO_CREATE_NONE")
- '("eeds-terminal" "G_APP_INFO_CREATE_NEEDS_TERMINAL")
+ '("none" "G_APP_INFO_CREATE_NONE")
+ '("needs-terminal" "G_APP_INFO_CREATE_NEEDS_TERMINAL")
+ '("supports-uris" "G_APP_INFO_CREATE_SUPPORTS_URIS")
)
)
-(define-enum StreamByteOrder
- (in-module "GData")
+(define-enum DataStreamByteOrder
+ (in-module "G")
(c-name "GDataStreamByteOrder")
(gtype-id "G_TYPE_DATA_STREAM_BYTE_ORDER")
(values
@@ -245,8 +211,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
@@ -257,8 +223,8 @@
)
)
-(define-enum AttributeType
- (in-module "GFile")
+(define-enum FileAttributeType
+ (in-module "G")
(c-name "GFileAttributeType")
(gtype-id "G_TYPE_FILE_ATTRIBUTE_TYPE")
(values
@@ -274,8 +240,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
@@ -285,8 +251,8 @@
)
)
-(define-enum AttributeStatus
- (in-module "GFile")
+(define-enum FileAttributeStatus
+ (in-module "G")
(c-name "GFileAttributeStatus")
(gtype-id "G_TYPE_FILE_ATTRIBUTE_STATUS")
(values
@@ -296,8 +262,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
@@ -306,8 +272,8 @@
)
)
-(define-flags CreateFlags
- (in-module "GFile")
+(define-flags FileCreateFlags
+ (in-module "G")
(c-name "GFileCreateFlags")
(gtype-id "G_TYPE_FILE_CREATE_FLAGS")
(values
@@ -316,8 +282,8 @@
)
)
-(define-flags UnmountFlags
- (in-module "GMount")
+(define-flags MountUnmountFlags
+ (in-module "G")
(c-name "GMountUnmountFlags")
(gtype-id "G_TYPE_MOUNT_UNMOUNT_FLAGS")
(values
@@ -326,8 +292,8 @@
)
)
-(define-flags CopyFlags
- (in-module "GFile")
+(define-flags FileCopyFlags
+ (in-module "G")
(c-name "GFileCopyFlags")
(gtype-id "G_TYPE_FILE_COPY_FLAGS")
(values
@@ -340,8 +306,8 @@
)
)
-(define-flags MonitorFlags
- (in-module "GFile")
+(define-flags FileMonitorFlags
+ (in-module "G")
(c-name "GFileMonitorFlags")
(gtype-id "G_TYPE_FILE_MONITOR_FLAGS")
(values
@@ -350,8 +316,8 @@
)
)
-(define-enum Type
- (in-module "GFile")
+(define-enum FileType
+ (in-module "G")
(c-name "GFileType")
(gtype-id "G_TYPE_FILE_TYPE")
(values
@@ -365,8 +331,8 @@
)
)
-(define-enum MonitorEvent
- (in-module "GFile")
+(define-enum FileMonitorEvent
+ (in-module "G")
(c-name "GFileMonitorEvent")
(gtype-id "G_TYPE_FILE_MONITOR_EVENT")
(values
@@ -380,8 +346,8 @@
)
)
-(define-enum Enum
- (in-module "GIOError")
+(define-enum IOErrorEnum
+ (in-module "G")
(c-name "GIOErrorEnum")
(gtype-id "G_TYPE_IO_ERROR_ENUM")
(values
@@ -419,8 +385,8 @@
)
)
-(define-flags PasswordFlags
- (in-module "GAsk")
+(define-flags AskPasswordFlags
+ (in-module "G")
(c-name "GAskPasswordFlags")
(gtype-id "G_TYPE_ASK_PASSWORD_FLAGS")
(values
@@ -432,8 +398,8 @@
)
)
-(define-enum Save
- (in-module "GPassword")
+(define-enum PasswordSave
+ (in-module "G")
(c-name "GPasswordSave")
(gtype-id "G_TYPE_PASSWORD_SAVE")
(values
@@ -443,8 +409,8 @@
)
)
-(define-enum OperationResult
- (in-module "GMount")
+(define-enum MountOperationResult
+ (in-module "G")
(c-name "GMountOperationResult")
(gtype-id "G_TYPE_MOUNT_OPERATION_RESULT")
(values
@@ -454,8 +420,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
@@ -650,6 +616,16 @@
)
)
+(define-function g_app_info_launch_default_for_uri
+ (c-name "g_app_info_launch_default_for_uri")
+ (return-type "gboolean")
+ (parameters
+ '("const-char*" "uri")
+ '("GAppLaunchContext*" "launch_context")
+ '("GError**" "error")
+ )
+)
+
(define-function g_app_launch_context_new
(c-name "g_app_launch_context_new")
(is-constructor-of "GAppLaunchContext")
@@ -687,10 +663,6 @@
-;; From gasynchelper.h
-
-
-
;; From gasyncresult.h
(define-function g_async_result_get_type
@@ -1024,10 +996,6 @@
-;; From gcontenttypeprivate.h
-
-
-
;; From gdatainputstream.h
(define-function g_data_input_stream_get_type
@@ -1290,41 +1258,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-method cancel
+ (of-object "GDirectoryMonitor")
+ (c-name "g_directory_monitor_cancel")
+ (return-type "gboolean")
)
-(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 is_cancelled
+ (of-object "GDirectoryMonitor")
+ (c-name "g_directory_monitor_is_cancelled")
+ (return-type "gboolean")
)
-(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")
+ (return-type "none")
+ (parameters
+ '("int" "limit_msecs")
+ )
)
-(define-function g_desktop_app_info_set_desktop_env
- (c-name "g_desktop_app_info_set_desktop_env")
+(define-method emit_event
+ (of-object "GDirectoryMonitor")
+ (c-name "g_directory_monitor_emit_event")
(return-type "none")
(parameters
- '("const-char*" "desktop_env")
+ '("GFile*" "child")
+ '("GFile*" "other_file")
+ '("GFileMonitorEvent" "event_type")
)
)
@@ -1434,9 +1403,20 @@
)
)
+(define-method get_identifier
+ (of-object "GDrive")
+ (c-name "g_drive_get_identifier")
+ (return-type "char*")
+ (parameters
+ '("const-char*" "kind")
+ )
+)
-
-;; From gdummyfile.h
+(define-method enumerate_identifiers
+ (of-object "GDrive")
+ (c-name "g_drive_enumerate_identifiers")
+ (return-type "char**")
+)
@@ -1488,10 +1468,6 @@
-;; From gfileattribute-priv.h
-
-
-
;; From gfileenumerator.h
(define-function g_file_enumerator_get_type
@@ -2076,6 +2052,32 @@
)
)
+(define-method copy_async
+ (of-object "GFile")
+ (c-name "g_file_copy_async")
+ (return-type "none")
+ (parameters
+ '("GFile*" "destination")
+ '("GFileCopyFlags" "flags")
+ '("int" "io_priority")
+ '("GCancellable*" "cancellable")
+ '("GFileProgressCallback" "progress_callback")
+ '("gpointer" "progress_callback_data")
+ '("GAsyncReadyCallback" "callback")
+ '("gpointer" "user_data")
+ )
+)
+
+(define-method copy_finish
+ (of-object "GFile")
+ (c-name "g_file_copy_finish")
+ (return-type "gboolean")
+ (parameters
+ '("GAsyncResult*" "res")
+ '("GError**" "error")
+ )
+)
+
(define-method move
(of-object "GFile")
(c-name "g_file_move")
@@ -2382,6 +2384,16 @@
)
)
+(define-method query_default_handler
+ (of-object "GFile")
+ (c-name "g_file_query_default_handler")
+ (return-type "GAppInfo*")
+ (parameters
+ '("GCancellable*" "cancellable")
+ '("GError**" "error")
+ )
+)
+
(define-method load_contents
(of-object "GFile")
(c-name "g_file_load_contents")
@@ -3080,30 +3092,6 @@
)
)
-(define-method tell
- (of-object "GFileInputStream")
- (c-name "g_file_input_stream_tell")
- (return-type "goffset")
-)
-
-(define-method can_seek
- (of-object "GFileInputStream")
- (c-name "g_file_input_stream_can_seek")
- (return-type "gboolean")
-)
-
-(define-method seek
- (of-object "GFileInputStream")
- (c-name "g_file_input_stream_seek")
- (return-type "gboolean")
- (parameters
- '("goffset" "offset")
- '("GSeekType" "type")
- '("GCancellable*" "cancellable")
- '("GError**" "error")
- )
-)
-
;; From gfilemonitor.h
@@ -3139,7 +3127,7 @@
(c-name "g_file_monitor_emit_event")
(return-type "none")
(parameters
- '("GFile*" "file")
+ '("GFile*" "child")
'("GFile*" "other_file")
'("GFileMonitorEvent" "event_type")
)
@@ -3236,47 +3224,6 @@
(return-type "char*")
)
-(define-method tell
- (of-object "GFileOutputStream")
- (c-name "g_file_output_stream_tell")
- (return-type "goffset")
-)
-
-(define-method can_seek
- (of-object "GFileOutputStream")
- (c-name "g_file_output_stream_can_seek")
- (return-type "gboolean")
-)
-
-(define-method seek
- (of-object "GFileOutputStream")
- (c-name "g_file_output_stream_seek")
- (return-type "gboolean")
- (parameters
- '("goffset" "offset")
- '("GSeekType" "type")
- '("GCancellable*" "cancellable")
- '("GError**" "error")
- )
-)
-
-(define-method can_truncate
- (of-object "GFileOutputStream")
- (c-name "g_file_output_stream_can_truncate")
- (return-type "gboolean")
-)
-
-(define-method truncate
- (of-object "GFileOutputStream")
- (c-name "g_file_output_stream_truncate")
- (return-type "gboolean")
- (parameters
- '("goffset" "size")
- '("GCancellable*" "cancellable")
- '("GError**" "error")
- )
-)
-
;; From gfilterinputstream.h
@@ -3486,10 +3433,6 @@
-;; From gioalias.h
-
-
-
;; From gioenumtypes.h
(define-function g_app_info_create_flags_get_type
@@ -3605,10 +3548,6 @@
-;; From gio-marshal.h
-
-
-
;; From giomodule.h
(define-function g_io_module_get_type
@@ -3633,6 +3572,87 @@
)
)
+(define-function g_io_extension_point_register
+ (c-name "g_io_extension_point_register")
+ (return-type "GIOExtensionPoint*")
+ (parameters
+ '("const-char*" "extension_point")
+ )
+)
+
+(define-function g_io_extension_point_lookup
+ (c-name "g_io_extension_point_lookup")
+ (return-type "GIOExtensionPoint*")
+ (parameters
+ '("const-char*" "extension_point")
+ )
+)
+
+(define-method set_required_type
+ (of-object "GIOExtensionPoint")
+ (c-name "g_io_extension_point_set_required_type")
+ (return-type "none")
+ (parameters
+ '("GType" "type")
+ )
+)
+
+(define-method get_required_type
+ (of-object "GIOExtensionPoint")
+ (c-name "g_io_extension_point_get_required_type")
+ (return-type "GType")
+)
+
+(define-method get_extensions
+ (of-object "GIOExtensionPoint")
+ (c-name "g_io_extension_point_get_extensions")
+ (return-type "GList*")
+)
+
+(define-method get_extension_by_name
+ (of-object "GIOExtensionPoint")
+ (c-name "g_io_extension_point_get_extension_by_name")
+ (return-type "GIOExtension*")
+ (parameters
+ '("const-char*" "name")
+ )
+)
+
+(define-function g_io_extension_point_implement
+ (c-name "g_io_extension_point_implement")
+ (return-type "GIOExtension*")
+ (parameters
+ '("const-char*" "extension_point_name")
+ '("GType" "type")
+ '("const-char*" "extension_name")
+ '("gint" "priority")
+ )
+)
+
+(define-method get_type
+ (of-object "GIOExtension")
+ (c-name "g_io_extension_get_type")
+ (return-type "GType")
+)
+
+(define-method get_name
+ (of-object "GIOExtension")
+ (c-name "g_io_extension_get_name")
+ (return-type "const-char*")
+)
+
+(define-method get_priority
+ (of-object "GIOExtension")
+ (c-name "g_io_extension_get_priority")
+ (return-type "gint")
+)
+
+(define-method ref_class
+ (of-object "GIOExtension")
+ (c-name "g_io_extension_ref_class")
+ (return-type "GTypeClass*")
+)
+
(define-method load
(of-object "GIOModule")
(c-name "g_io_module_load")
@@ -3647,10 +3667,6 @@
-;; From giomodule-priv.h
-
-
-
;; From gioscheduler.h
(define-function g_io_scheduler_push_job
@@ -3738,48 +3754,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
@@ -4086,10 +4060,6 @@
-;; From gmountprivate.h
-
-
-
;; From gnativevolumemonitor.h
(define-function g_native_volume_monitor_get_type
@@ -4284,10 +4254,6 @@
-;; From gpollfilemonitor.h
-
-
-
;; From gseekable.h
(define-function g_seekable_get_type
@@ -4570,282 +4536,6 @@
-;; 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
@@ -4991,6 +4681,21 @@
)
)
+(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
@@ -5050,12 +4755,3 @@
)
-
-;; 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/volume.hg
==============================================================================
--- trunk/gio/src/volume.hg (original)
+++ trunk/gio/src/volume.hg Sat Feb 2 15:42:23 2008
@@ -73,6 +73,13 @@
g_volume_get_drive,
refreturn, constversion)
+ _WRAP_METHOD(Glib::RefPtr<Mount> get_mount(),
+ g_volume_get_mount,
+ refreturn)
+ _WRAP_METHOD(Glib::RefPtr<const Mount> get_mount() const,
+ g_volume_get_mount,
+ refreturn, constversion)
+
_WRAP_METHOD(bool can_mount() const, g_volume_can_mount)
_WRAP_METHOD(bool can_eject() const, g_volume_can_eject)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
