diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | gio/src/gio_enums.defs | 11 | ||||
| -rw-r--r-- | gio/src/gio_methods.defs | 987 | ||||
| -rw-r--r-- | gio/src/mountoperation.hg | 2 | ||||
| -rw-r--r-- | gio/src/outputstream.hg | 2 | ||||
| -rw-r--r-- | gio/src/resolver.hg | 4 | ||||
| -rw-r--r-- | gio/src/socket.hg | 4 | ||||
| -rw-r--r-- | glib/src/checksum.hg | 2 | ||||
| -rw-r--r-- | glib/src/glib_functions.defs | 609 |
9 files changed, 1220 insertions, 412 deletions
@@ -1,3 +1,14 @@ +2010-01-29 Murray Cumming <murrayc@murrayc-desktop> + + Regenerated method .defs. Added a Resolver signal. + + * gio/src/gio_enums.defs: Removed GSocketMsgFlags because it contained + an #error and the values are non-numeric anyway. + * gio/src/gio_methods.defs: Regenerated with h2defs.py + * glib/src/glib_functions.defs: Regenerated with h2defs.py, removing + badly-generated ones that try to mention function pointers. + * gio/src/resolver.hg: Added reload signal. + 2010-01-29 Murray Cumming <murrayc@murrayc.com> Use 0 instead of NULL. diff --git a/gio/src/gio_enums.defs b/gio/src/gio_enums.defs index f3861fc5..f29e921e 100644 --- a/gio/src/gio_enums.defs +++ b/gio/src/gio_enums.defs @@ -310,17 +310,6 @@ ) ) -(define-enum-extended SocketMsgFlags - (in-module "G") - (c-name "GSocketMsgFlags") - (values - '("none" "G_SOCKET_MSG_NONE" "0") - '("oob" "G_SOCKET_MSG_OOB" "#error") - '("peek" "G_SOCKET_MSG_PEEK" "#error") - '("dontroute" "G_SOCKET_MSG_DONTROUTE" "#error") - ) -) - (define-enum-extended SocketProtocol (in-module "G") (c-name "GSocketProtocol") diff --git a/gio/src/gio_methods.defs b/gio/src/gio_methods.defs index b3e9efe6..61fb2328 100644 --- a/gio/src/gio_methods.defs +++ b/gio/src/gio_methods.defs @@ -151,6 +151,34 @@ (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 FileIOStream + (in-module "GLocal") + (parent "GFileIOStream") + (c-name "GLocalFileIOStream") + (gtype-id "G_TYPE_LOCAL_FILE_IO_STREAM") +) + +(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") @@ -234,6 +262,13 @@ (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 r (in-module "GResolve") (parent "GObject") @@ -302,6 +337,13 @@ (gtype-id "G_TYPE_SOCKET_CONTROL_MESSAGE") ) +(define-object InputStream + (in-module "GSocket") + (parent "GInputStream") + (c-name "GSocketInputStream") + (gtype-id "G_TYPE_SOCKET_INPUT_STREAM") +) + (define-object Listener (in-module "GSocket") (parent "GObject") @@ -309,6 +351,13 @@ (gtype-id "G_TYPE_SOCKET_LISTENER") ) +(define-object OutputStream + (in-module "GSocket") + (parent "GOutputStream") + (c-name "GSocketOutputStream") + (gtype-id "G_TYPE_SOCKET_OUTPUT_STREAM") +) + (define-object Service (in-module "GSocket") (parent "GSocketListener") @@ -323,6 +372,13 @@ (gtype-id "G_TYPE_TCP_CONNECTION") ) +(define-object Resolver + (in-module "GThreaded") + (parent "GResolver") + (c-name "GThreadedResolver") + (gtype-id "G_TYPE_THREADED_RESOLVER") +) + (define-object SocketService (in-module "GThreaded") (parent "GSocketService") @@ -365,6 +421,13 @@ (gtype-id "G_TYPE_UNIX_OUTPUT_STREAM") ) +(define-object Resolver + (in-module "GUnix") + (parent "GThreadedResolver") + (c-name "GUnixResolver") + (gtype-id "G_TYPE_UNIX_RESOLVER") +) + (define-object SocketAddress (in-module "GUnix") (parent "GSocketAddress") @@ -406,6 +469,13 @@ (gtype-id "G_TYPE_NATIVE_VOLUME_MONITOR") ) +(define-object 32Resolver + (in-module "GWin") + (parent "GThreadedResolver") + (c-name "GWin32Resolver") + (gtype-id "G_TYPE_WIN32_RESOLVER") +) + ;; Enumerations and flags ... (define-flags InfoCreateFlags @@ -1070,6 +1140,10 @@ +;; From gasynchelper.h + + + ;; From gasyncinitable.h (define-function g_async_initable_get_type @@ -1577,6 +1651,10 @@ +;; From gcontenttypeprivate.h + + + ;; From gconverter.h (define-function g_converter_get_type @@ -1967,6 +2045,68 @@ +;; From gdesktopappinfo.h + +(define-function g_desktop_app_info_get_type + (c-name "g_desktop_app_info_get_type") + (return-type "GType") +) + +(define-function g_desktop_app_info_new_from_filename + (c-name "g_desktop_app_info_new_from_filename") + (return-type "GDesktopAppInfo*") + (parameters + '("const-char*" "filename") + ) +) + +(define-function g_desktop_app_info_new_from_keyfile + (c-name "g_desktop_app_info_new_from_keyfile") + (return-type "GDesktopAppInfo*") + (parameters + '("GKeyFile*" "key_file") + ) +) + +(define-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 gdrive.h (define-function g_drive_get_type @@ -2181,6 +2321,10 @@ +;; From gdummyfile.h + + + ;; From gemblemedicon.h (define-function g_emblemed_icon_get_type @@ -2313,6 +2457,10 @@ +;; From gfileattribute-priv.h + + + ;; From gfileenumerator.h (define-function g_file_enumerator_get_type @@ -4228,6 +4376,10 @@ +;; From gfileinfo-priv.h + + + ;; From gfileinputstream.h (define-function g_file_input_stream_get_type @@ -4916,6 +5068,10 @@ +;; From gioalias.h + + + ;; From gioenums.h @@ -5100,6 +5256,10 @@ +;; From gio-marshal.h + + + ;; From giomodule.h (define-function g_io_module_get_type @@ -5116,6 +5276,14 @@ ) ) +(define-function g_io_modules_scan_all_in_directory + (c-name "g_io_modules_scan_all_in_directory") + (return-type "none") + (parameters + '("const-char*" "dirname") + ) +) + (define-function g_io_modules_load_all_in_directory (c-name "g_io_modules_load_all_in_directory") (return-type "GList*") @@ -5217,6 +5385,15 @@ (return-type "none") ) +(define-function g_io_module_query + (c-name "g_io_module_query") + (return-type "char**") +) + + + +;; From giomodule-priv.h + ;; From gioscheduler.h @@ -5390,6 +5567,52 @@ +;; 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 glocalfileiostream.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 @@ -5439,9 +5662,9 @@ (return-type "GOutputStream*") (parameters '("gpointer" "data") - '("gsize" "len") - '("GReallocFunc" "realloc_fn") - '("GDestroyNotify" "destroy") + '("gsize" "size") + '("GReallocFunc" "realloc_function") + '("GDestroyNotify" "destroy_function") ) ) @@ -5806,6 +6029,10 @@ +;; From gmountprivate.h + + + ;; From gnativevolumemonitor.h (define-function g_native_volume_monitor_get_type @@ -5856,6 +6083,10 @@ +;; From gnetworkingprivate.h + + + ;; From gnetworkservice.h (define-function g_network_service_get_type @@ -6085,6 +6316,10 @@ +;; From gpollfilemonitor.h + + + ;; From gresolver.h (define-function g_resolver_get_type @@ -7184,6 +7419,10 @@ +;; From gsocketinputstream.h + + + ;; From gsocketlistener.h (define-function g_socket_listener_get_type @@ -7326,6 +7565,10 @@ +;; From gsocketoutputstream.h + + + ;; From gsocketservice.h (define-function g_socket_service_get_type @@ -7501,6 +7744,15 @@ +;; From gthreadedresolver.h + +(define-function g_threaded_resolver_get_type + (c-name "g_threaded_resolver_get_type") + (return-type "GType") +) + + + ;; From gthreadedsocketservice.h (define-function g_threaded_socket_service_get_type @@ -7519,376 +7771,7 @@ -;; From gutf8inputstream.h - -(define-function g_utf8_input_stream_get_type - (c-name "g_utf8_input_stream_get_type") - (return-type "GType") -) - -(define-function g_utf8_input_stream_new - (c-name "g_utf8_input_stream_new") - (is-constructor-of "GUtf8InputStream") - (return-type "GInputStream*") - (parameters - '("GInputStream*" "base_stream") - ) -) - - - -;; From gvfs.h - -(define-function g_vfs_get_type - (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**") -) - -(define-method get_activation_root - (of-object "GVolume") - (c-name "g_volume_get_activation_root") - (return-type "GFile*") -) - -(define-method eject_with_operation - (of-object "GVolume") - (c-name "g_volume_eject_with_operation") - (return-type "none") - (parameters - '("GMountUnmountFlags" "flags") - '("GMountOperation*" "mount_operation") - '("GCancellable*" "cancellable") - '("GAsyncReadyCallback" "callback") - '("gpointer" "user_data") - ) -) - -(define-method eject_with_operation_finish - (of-object "GVolume") - (c-name "g_volume_eject_with_operation_finish") - (return-type "gboolean") - (parameters - '("GAsyncResult*" "result") - '("GError**" "error") - ) -) - - - -;; 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 gzlibcompressor.h - -(define-function g_zlib_compressor_get_type - (c-name "g_zlib_compressor_get_type") - (return-type "GType") -) - -(define-function g_zlib_compressor_new - (c-name "g_zlib_compressor_new") - (is-constructor-of "GZlibCompressor") - (return-type "GZlibCompressor*") - (parameters - '("GZlibCompressorFormat" "format") - '("int" "level") - ) -) - - - -;; From gzlibdecompressor.h - -(define-function g_zlib_decompressor_get_type - (c-name "g_zlib_decompressor_get_type") - (return-type "GType") -) - -(define-function g_zlib_decompressor_new - (c-name "g_zlib_decompressor_new") - (is-constructor-of "GZlibDecompressor") - (return-type "GZlibDecompressor*") - (parameters - '("GZlibCompressorFormat" "format") - ) -) - - - -;; From gdesktopappinfo.h - -(define-function g_desktop_app_info_get_type - (c-name "g_desktop_app_info_get_type") - (return-type "GType") -) - -(define-function g_desktop_app_info_new_from_filename - (c-name "g_desktop_app_info_new_from_filename") - (return-type "GDesktopAppInfo*") - (parameters - '("const-char*" "filename") - ) -) - -(define-function g_desktop_app_info_new_from_keyfile - (c-name "g_desktop_app_info_new_from_keyfile") - (return-type "GDesktopAppInfo*") - (parameters - '("GKeyFile*" "key_file") - ) -) - -(define-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 @@ -8078,6 +7961,10 @@ +;; From gunixmount.h + + + ;; From gunixmounts.h (define-function g_unix_mount_free @@ -8349,6 +8236,15 @@ +;; From gunixresolver.h + +(define-function g_unix_resolver_get_type + (c-name "g_unix_resolver_get_type") + (return-type "GType") +) + + + ;; From gunixsocketaddress.h (define-function g_unix_socket_address_get_type @@ -8398,3 +8294,348 @@ ) + +;; From gunixvolume.h + + + +;; From gunixvolumemonitor.h + + + +;; From gutf8inputstream.h + +(define-function g_utf8_input_stream_get_type + (c-name "g_utf8_input_stream_get_type") + (return-type "GType") +) + +(define-function g_utf8_input_stream_new + (c-name "g_utf8_input_stream_new") + (is-constructor-of "GUtf8InputStream") + (return-type "GInputStream*") + (parameters + '("GInputStream*" "base_stream") + ) +) + + + +;; From gvfs.h + +(define-function g_vfs_get_type + (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**") +) + +(define-method get_activation_root + (of-object "GVolume") + (c-name "g_volume_get_activation_root") + (return-type "GFile*") +) + +(define-method eject_with_operation + (of-object "GVolume") + (c-name "g_volume_eject_with_operation") + (return-type "none") + (parameters + '("GMountUnmountFlags" "flags") + '("GMountOperation*" "mount_operation") + '("GCancellable*" "cancellable") + '("GAsyncReadyCallback" "callback") + '("gpointer" "user_data") + ) +) + +(define-method eject_with_operation_finish + (of-object "GVolume") + (c-name "g_volume_eject_with_operation_finish") + (return-type "gboolean") + (parameters + '("GAsyncResult*" "result") + '("GError**" "error") + ) +) + + + +;; 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") +) + + + +;; From gwin32mount.h + + + +;; From gwin32resolver.h + +(define-function g_win32_resolver_get_type + (c-name "g_win32_resolver_get_type") + (return-type "GType") +) + + + +;; From gwin32volumemonitor.h + + + +;; From gzlibcompressor.h + +(define-function g_zlib_compressor_get_type + (c-name "g_zlib_compressor_get_type") + (return-type "GType") +) + +(define-function g_zlib_compressor_new + (c-name "g_zlib_compressor_new") + (is-constructor-of "GZlibCompressor") + (return-type "GZlibCompressor*") + (parameters + '("GZlibCompressorFormat" "format") + '("int" "level") + ) +) + + + +;; From gzlibdecompressor.h + +(define-function g_zlib_decompressor_get_type + (c-name "g_zlib_decompressor_get_type") + (return-type "GType") +) + +(define-function g_zlib_decompressor_new + (c-name "g_zlib_decompressor_new") + (is-constructor-of "GZlibDecompressor") + (return-type "GZlibDecompressor*") + (parameters + '("GZlibCompressorFormat" "format") + ) +) + + diff --git a/gio/src/mountoperation.hg b/gio/src/mountoperation.hg index c66a21a0..03350dc0 100644 --- a/gio/src/mountoperation.hg +++ b/gio/src/mountoperation.hg @@ -90,6 +90,8 @@ public: //TODO: Remove no_default_handler when we can break ABI: _WRAP_SIGNAL(void aborted(), aborted, no_default_handler) + //TODO: The array of char* is not very pleasant to wrap: + //_WRAP_SIGNAL( void show_processes(const Glib::ustring& message, GArray* processes, const gchar *choices[]); _WRAP_PROPERTY("username", Glib::ustring) _WRAP_PROPERTY("password", Glib::ustring) diff --git a/gio/src/outputstream.hg b/gio/src/outputstream.hg index 00699fac..e525245d 100644 --- a/gio/src/outputstream.hg +++ b/gio/src/outputstream.hg @@ -448,7 +448,7 @@ public: errthrow) // These are private inside the module (for implementations) - _IGNORE(g_output_stream_has_pending, g_output_stream_is_closed, g_output_stream_set_pending, g_output_stream_clear_pending) + _IGNORE(g_output_stream_has_pending, g_output_stream_is_closed, g_output_stream_is_closing, g_output_stream_set_pending, g_output_stream_clear_pending) }; diff --git a/gio/src/resolver.hg b/gio/src/resolver.hg index 88bba8d7..245c6dfb 100644 --- a/gio/src/resolver.hg +++ b/gio/src/resolver.hg @@ -93,6 +93,10 @@ public: void lookup_service_async(const Glib::ustring& service, const Glib::ustring& protocol, const Glib::ustring& domain, const SlotAsyncReady& slot); _IGNORE(g_resolver_lookup_service_async) _WRAP_METHOD(ListHandle_SrvTarget lookup_service_finish(const Glib::RefPtr<AsyncResult>& result), g_resolver_lookup_service_finish, errthrow) + + + //TODO: Remove no_default_handler when we can break ABI: + _WRAP_SIGNAL(void reload(), reload, no_default_handler) }; std::string hostname_to_ascii (const Glib::ustring& hostname); diff --git a/gio/src/socket.hg b/gio/src/socket.hg index 3f99c598..e89b729f 100644 --- a/gio/src/socket.hg +++ b/gio/src/socket.hg @@ -171,7 +171,7 @@ public: #else gssize receive_from(Glib::RefPtr<SocketAddress>& address, char* buffer, gsize size, std::auto_ptr<Glib::Error>& error); #endif //GLIBMM_EXCEPTIONS_ENABLED - // TODO: wrap receive_message -- figure out this GInputVector thing + // TODO: wrap g_socket_receive_message -- figure out this GInputVector thing // TODO: std::string overload? _WRAP_METHOD(gssize send(const gchar* buffer, gsize size, const Glib::RefPtr<Cancellable>& cancellable), g_socket_send, errthrow) @@ -189,7 +189,7 @@ public: gssize send_to(const Glib::RefPtr<SocketAddress>& address, const char* buffer, gsize size, std::auto_ptr<Glib::Error>& error); #endif //GLIBMM_EXCEPTIONS_ENABLED - // TODO: wrap send_message -- figure out this GOutputVector thing + // TODO: wrap g_socket_send_message -- figure out this GOutputVector thing _WRAP_METHOD(void close(), g_socket_close, errthrow) _WRAP_METHOD(bool is_closed(), g_socket_is_closed) _WRAP_METHOD(void shutdown(bool shutdown_read, bool shutdown_write), g_socket_shutdown, errthrow) diff --git a/glib/src/checksum.hg b/glib/src/checksum.hg index 659222c1..e9f599fb 100644 --- a/glib/src/checksum.hg +++ b/glib/src/checksum.hg @@ -77,6 +77,8 @@ public: _WRAP_METHOD(void reset(), g_checksum_reset) + //TODO: length should really be gssize, not gsize, when we can break ABI: +#m4 _CONVERSION(`gsize',`gssize',`(gssize)($3)') _WRAP_METHOD(void update(const guchar* data, gsize length), g_checksum_update) /** Feeds data into an existing Checksum. diff --git a/glib/src/glib_functions.defs b/glib/src/glib_functions.defs index b86a9d8c..30d7ef07 100644 --- a/glib/src/glib_functions.defs +++ b/glib/src/glib_functions.defs @@ -18,6 +18,16 @@ ) ) +(define-flags ArrayFlags + (in-module "GBSearch") + (c-name "GBSearchArrayFlags") + (gtype-id "G_TYPE_B_SEARCH_ARRAY_FLAGS") + (values + '("align-power2" "G_BSEARCH_ARRAY_ALIGN_POWER2") + '("auto-shrink" "G_BSEARCH_ARRAY_AUTO_SHRINK") + ) +) + (define-enum Type (in-module "GChecksum") (c-name "GChecksumType") @@ -91,6 +101,16 @@ ) ) +(define-flags Flag + (in-module "GDebug") + (c-name "GDebugFlag") + (gtype-id "G_TYPE_DEBUG_FLAG") + (values + '("warnings" "G_DEBUG_FATAL_WARNINGS") + '("criticals" "G_DEBUG_FATAL_CRITICALS") + ) +) + (define-enum Error (in-module "GFile") (c-name "GFileError") @@ -837,6 +857,10 @@ ) +;; From galias.h + + + ;; From galloca.h (define-function alloca @@ -882,6 +906,24 @@ ) ) +(define-method ref + (of-object "GArray") + (c-name "g_array_ref") + (return-type "GArray*") +) + +(define-method unref + (of-object "GArray") + (c-name "g_array_unref") + (return-type "none") +) + +(define-method get_element_size + (of-object "GArray") + (c-name "g_array_get_element_size") + (return-type "guint") +) + (define-method append_vals (of-object "GArray") (c-name "g_array_append_vals") @@ -975,6 +1017,14 @@ (return-type "GPtrArray*") ) +(define-function g_ptr_array_new_with_free_func + (c-name "g_ptr_array_new_with_free_func") + (return-type "GPtrArray*") + (parameters + '("GDestroyNotify" "element_free_func") + ) +) + (define-function g_ptr_array_sized_new (c-name "g_ptr_array_sized_new") (is-constructor-of "GPtrArraySized") @@ -993,6 +1043,27 @@ ) ) +(define-method ref + (of-object "GPtrArray") + (c-name "g_ptr_array_ref") + (return-type "GPtrArray*") +) + +(define-method unref + (of-object "GPtrArray") + (c-name "g_ptr_array_unref") + (return-type "none") +) + +(define-method set_free_func + (of-object "GPtrArray") + (c-name "g_ptr_array_set_free_func") + (return-type "none") + (parameters + '("GDestroyNotify" "element_free_func") + ) +) + (define-method set_size (of-object "GPtrArray") (c-name "g_ptr_array_set_size") @@ -1110,6 +1181,18 @@ ) ) +(define-method ref + (of-object "GByteArray") + (c-name "g_byte_array_ref") + (return-type "GByteArray*") +) + +(define-method unref + (of-object "GByteArray") + (c-name "g_byte_array_unref") + (return-type "none") +) + (define-method append (of-object "GByteArray") (c-name "g_byte_array_append") @@ -1362,7 +1445,7 @@ (c-name "g_atomic_int_exchange_and_add") (return-type "gint") (parameters - '("volatile-gint*" "atomic") + '("volatile-gint-G_GNUC_MAY_ALIAS*" "atomic") '("gint" "val") ) ) @@ -1371,7 +1454,7 @@ (c-name "g_atomic_int_add") (return-type "none") (parameters - '("volatile-gint*" "atomic") + '("volatile-gint-G_GNUC_MAY_ALIAS*" "atomic") '("gint" "val") ) ) @@ -1380,7 +1463,7 @@ (c-name "g_atomic_int_compare_and_exchange") (return-type "gboolean") (parameters - '("volatile-gint*" "atomic") + '("volatile-gint-G_GNUC_MAY_ALIAS*" "atomic") '("gint" "oldval") '("gint" "newval") ) @@ -1390,7 +1473,7 @@ (c-name "g_atomic_pointer_compare_and_exchange") (return-type "gboolean") (parameters - '("volatile-gpointer*" "atomic") + '("volatile-gpointer-G_GNUC_MAY_ALIAS*" "atomic") '("gpointer" "oldval") '("gpointer" "newval") ) @@ -1400,7 +1483,7 @@ (c-name "g_atomic_int_get") (return-type "gint") (parameters - '("volatile-gint*" "atomic") + '("volatile-gint-G_GNUC_MAY_ALIAS*" "atomic") ) ) @@ -1408,7 +1491,7 @@ (c-name "g_atomic_int_set") (return-type "none") (parameters - '("volatile-gint*" "atomic") + '("volatile-gint-G_GNUC_MAY_ALIAS*" "atomic") '("gint" "newval") ) ) @@ -1417,7 +1500,7 @@ (c-name "g_atomic_pointer_get") (return-type "gpointer") (parameters - '("volatile-gpointer*" "atomic") + '("volatile-gpointer-G_GNUC_MAY_ALIAS*" "atomic") ) ) @@ -1425,7 +1508,7 @@ (c-name "g_atomic_pointer_set") (return-type "none") (parameters - '("volatile-gpointer*" "atomic") + '("volatile-gpointer-G_GNUC_MAY_ALIAS*" "atomic") '("gpointer" "newval") ) ) @@ -1508,6 +1591,46 @@ ) ) +(define-function g_base64_decode_inplace + (c-name "g_base64_decode_inplace") + (return-type "guchar*") + (parameters + '("gchar*" "text") + '("gsize*" "out_len") + ) +) + + + +;; From gbitlock.h + +(define-function g_bit_lock + (c-name "g_bit_lock") + (return-type "none") + (parameters + '("volatile-gint*" "lock") + '("gint" "lock_bit") + ) +) + +(define-function g_bit_trylock + (c-name "g_bit_trylock") + (return-type "gboolean") + (parameters + '("volatile-gint*" "lock") + '("gint" "lock_bit") + ) +) + +(define-function g_bit_unlock + (c-name "g_bit_unlock") + (return-type "none") + (parameters + '("volatile-gint*" "lock") + '("gint" "lock_bit") + ) +) + ;; From gbookmarkfile.h @@ -1917,6 +2040,26 @@ +;; From gbsearcharray.h + +(define-function if + (c-name "if") + (return-type "else") + (parameters + '("cmp-<" "0") + ) +) + +(define-function MIN + (c-name "MIN") + (return-type "return") + (parameters + '("barray->n_nodes-+" "1") + ) +) + + + ;; From gcache.h (define-function g_cache_new @@ -2021,7 +2164,7 @@ (return-type "none") (parameters '("const-guchar*" "data") - '("gsize" "length") + '("gssize" "length") ) ) @@ -2433,6 +2576,10 @@ +;; From gdatasetprivate.h + + + ;; From gdate.h (define-function g_date_new @@ -2825,6 +2972,10 @@ +;; From gdebug.h + + + ;; From gdir.h (define-function g_dir_open @@ -2881,6 +3032,17 @@ ) ) +(define-function g_error_new_valist + (c-name "g_error_new_valist") + (return-type "GError*") + (parameters + '("GQuark" "domain") + '("gint" "code") + '("const-gchar*" "format") + '("va_list" "args") + ) +) + (define-method free (of-object "GError") (c-name "g_error_free") @@ -3029,6 +3191,16 @@ ) ) +(define-function g_mkstemp_full + (c-name "g_mkstemp_full") + (return-type "gint") + (parameters + '("gchar*" "tmpl") + '("int" "flags") + '("int" "mode") + ) +) + (define-function g_file_open_tmp (c-name "g_file_open_tmp") (return-type "gint") @@ -3334,6 +3506,40 @@ ) ) +(define-function g_int64_equal + (c-name "g_int64_equal") + (return-type "gboolean") + (parameters + '("gconstpointer" "v1") + '("gconstpointer" "v2") + ) +) + +(define-function g_int64_hash + (c-name "g_int64_hash") + (return-type "guint") + (parameters + '("gconstpointer" "v") + ) +) + +(define-function g_double_equal + (c-name "g_double_equal") + (return-type "gboolean") + (parameters + '("gconstpointer" "v1") + '("gconstpointer" "v2") + ) +) + +(define-function g_double_hash + (c-name "g_double_hash") + (return-type "guint") + (parameters + '("gconstpointer" "v") + ) +) + (define-function g_direct_hash (c-name "g_direct_hash") (return-type "guint") @@ -3573,6 +3779,50 @@ +;; From ghostutils.h + +(define-function g_hostname_is_non_ascii + (c-name "g_hostname_is_non_ascii") + (return-type "gboolean") + (parameters + '("const-gchar*" "hostname") + ) +) + +(define-function g_hostname_is_ascii_encoded + (c-name "g_hostname_is_ascii_encoded") + (return-type "gboolean") + (parameters + '("const-gchar*" "hostname") + ) +) + +(define-function g_hostname_is_ip_address + (c-name "g_hostname_is_ip_address") + (return-type "gboolean") + (parameters + '("const-gchar*" "hostname") + ) +) + +(define-function g_hostname_to_ascii + (c-name "g_hostname_to_ascii") + (return-type "gchar*") + (parameters + '("const-gchar*" "hostname") + ) +) + +(define-function g_hostname_to_unicode + (c-name "g_hostname_to_unicode") + (return-type "gchar*") + (parameters + '("const-gchar*" "hostname") + ) +) + + + ;; From gi18n.h @@ -4425,6 +4675,26 @@ +;; From glib.h + + + +;; From glibintl.h + +(define-function glib_gettext + (c-name "glib_gettext") + (return-type "const-gchar*") + (parameters + '("const-gchar*" "str") + ) +) + + + +;; From glib-object.h + + + ;; From glist.h (define-function g_list_alloc @@ -4874,6 +5144,23 @@ (return-type "GSource*") ) +(define-method push_thread_default + (of-object "GMainContext") + (c-name "g_main_context_push_thread_default") + (return-type "none") +) + +(define-method pop_thread_default + (of-object "GMainContext") + (c-name "g_main_context_pop_thread_default") + (return-type "none") +) + +(define-function g_main_context_get_thread_default + (c-name "g_main_context_get_thread_default") + (return-type "GMainContext*") +) + (define-function g_main_loop_new (c-name "g_main_loop_new") (is-constructor-of "GMainLoop") @@ -5248,6 +5535,18 @@ (return-type "gchar*") ) +(define-method ref + (of-object "GMappedFile") + (c-name "g_mapped_file_ref") + (return-type "GMappedFile*") +) + +(define-method unref + (of-object "GMappedFile") + (c-name "g_mapped_file_unref") + (return-type "none") +) + (define-method free (of-object "GMappedFile") (c-name "g_mapped_file_free") @@ -5702,6 +6001,10 @@ +;; From gmirroringtable.h + + + ;; From gnode.h (define-function g_node_new @@ -6314,6 +6617,10 @@ +;; From gprintfint.h + + + ;; From gqsort.h (define-function g_qsort_with_data @@ -7421,6 +7728,10 @@ +;; From gscripttable.h + + + ;; From gsequence.h (define-function g_sequence_new @@ -9216,6 +9527,7 @@ (return-type "int") ) + (define-function g_test_message (c-name "g_test_message") (return-type "none") @@ -9482,6 +9794,15 @@ (return-type "none") ) +(define-function g_test_log_set_fatal_handler + (c-name "g_test_log_set_fatal_handler") + (return-type "none") + (parameters + '("GTestLogFatalFunc" "log_func") + '("gpointer" "user_data") + ) +) + ;; From gthread.h @@ -9510,6 +9831,11 @@ ) ) +(define-function g_thread_get_initialized + (c-name "g_thread_get_initialized") + (return-type "gboolean") +) + (define-function g_static_mutex_get_mutex_impl (c-name "g_static_mutex_get_mutex_impl") (return-type "GMutex*") @@ -9842,6 +10168,15 @@ +;; From gthreadprivate.h + +(define-function g_thread_init_glib + (c-name "g_thread_init_glib") + (return-type "none") +) + + + ;; From gtimer.h (define-function g_timer_new @@ -9954,6 +10289,18 @@ ) ) +(define-method ref + (of-object "GTree") + (c-name "g_tree_ref") + (return-type "GTree*") +) + +(define-method unref + (of-object "GTree") + (c-name "g_tree_unref") + (return-type "none") +) + (define-method destroy (of-object "GTree") (c-name "g_tree_destroy") @@ -10067,6 +10414,14 @@ +;; From gunibreak.h + + + +;; From gunichartables.h + + + ;; From gunicode.h (define-function g_get_charset @@ -10542,6 +10897,18 @@ +;; From gunicodeprivate.h + + + +;; From gunicomp.h + + + +;; From gunidecomp.h + + + ;; From gurifuncs.h (define-function g_uri_unescape_string @@ -10636,6 +11003,11 @@ ) ) +(define-function g_reload_user_special_dirs_cache + (c-name "g_reload_user_special_dirs_cache") + (return-type "none") +) + (define-function g_get_user_data_dir (c-name "g_get_user_data_dir") (return-type "const-gchar*") @@ -10656,14 +11028,6 @@ (return-type "const-gchar**") ) -(define-function g_win32_get_system_data_dirs_for_module - (c-name "g_win32_get_system_data_dirs_for_module") - (return-type "const-gchar**") - (parameters - '("gconstpointer" "address") - ) -) - (define-function g_get_language_names (c-name "g_get_language_names") (return-type "const-gchar**") @@ -10793,14 +11157,6 @@ (return-type "gchar**") ) -(define-function g_atexit - (c-name "g_atexit") - (return-type "none") - (parameters - '("GVoidFunc" "func") - ) -) - (define-function g_find_program_in_path (c-name "g_find_program_in_path") (return-type "gchar*") @@ -10821,6 +11177,209 @@ +;; From gvarianttype.h + +(define-function g_variant_type_string_is_valid + (c-name "g_variant_type_string_is_valid") + (return-type "gboolean") + (parameters + '("const-gchar*" "type_string") + ) +) + +(define-function g_variant_type_string_scan + (c-name "g_variant_type_string_scan") + (return-type "gboolean") + (parameters + '("const-gchar*" "string") + '("const-gchar*" "limit") + '("const-gchar**" "endptr") + ) +) + +(define-method free + (of-object "GVariantType") + (c-name "g_variant_type_free") + (return-type "none") +) + +(define-method copy + (of-object "GVariantType") + (c-name "g_variant_type_copy") + (return-type "GVariantType*") +) + +(define-function g_variant_type_new + (c-name "g_variant_type_new") + (is-constructor-of "GVariantType") + (return-type "GVariantType*") + (parameters + '("const-gchar*" "type_string") + ) +) + +(define-method get_string_length + (of-object "GVariantType") + (c-name "g_variant_type_get_string_length") + (return-type "gsize") +) + +(define-method peek_string + (of-object "GVariantType") + (c-name "g_variant_type_peek_string") + (return-type "const-gchar*") +) + +(define-method dup_string + (of-object "GVariantType") + (c-name "g_variant_type_dup_string") + (return-type "gchar*") +) + +(define-method is_definite + (of-object "GVariantType") + (c-name "g_variant_type_is_definite") + (return-type "gboolean") +) + +(define-method is_container + (of-object "GVariantType") + (c-name "g_variant_type_is_container") + (return-type "gboolean") +) + +(define-method is_basic + (of-object "GVariantType") + (c-name "g_variant_type_is_basic") + (return-type "gboolean") +) + +(define-method is_maybe + (of-object "GVariantType") + (c-name "g_variant_type_is_maybe") + (return-type "gboolean") +) + +(define-method is_array + (of-object "GVariantType") + (c-name "g_variant_type_is_array") + (return-type "gboolean") +) + +(define-method is_tuple + (of-object "GVariantType") + (c-name "g_variant_type_is_tuple") + (return-type "gboolean") +) + +(define-method is_dict_entry + (of-object "GVariantType") + (c-name "g_variant_type_is_dict_entry") + (return-type "gboolean") +) + +(define-function g_variant_type_hash + (c-name "g_variant_type_hash") + (return-type "guint") + (parameters + '("gconstpointer" "type") + ) +) + +(define-function g_variant_type_equal + (c-name "g_variant_type_equal") + (return-type "gboolean") + (parameters + '("gconstpointer" "type1") + '("gconstpointer" "type2") + ) +) + +(define-method is_subtype_of + (of-object "GVariantType") + (c-name "g_variant_type_is_subtype_of") + (return-type "gboolean") + (parameters + '("const-GVariantType*" "supertype") + ) +) + +(define-method element + (of-object "GVariantType") + (c-name "g_variant_type_element") + (return-type "const-GVariantType*") +) + +(define-method first + (of-object "GVariantType") + (c-name "g_variant_type_first") + (return-type "const-GVariantType*") +) + +(define-method next + (of-object "GVariantType") + (c-name "g_variant_type_next") + (return-type "const-GVariantType*") +) + +(define-method n_items + (of-object "GVariantType") + (c-name "g_variant_type_n_items") + (return-type "gsize") +) + +(define-method key + (of-object "GVariantType") + (c-name "g_variant_type_key") + (return-type "const-GVariantType*") +) + +(define-method value + (of-object "GVariantType") + (c-name "g_variant_type_value") + (return-type "const-GVariantType*") +) + +(define-method new_array + (of-object "GVariantType") + (c-name "g_variant_type_new_array") + (return-type "GVariantType*") +) + +(define-method new_maybe + (of-object "GVariantType") + (c-name "g_variant_type_new_maybe") + (return-type "GVariantType*") +) + +(define-function g_variant_type_new_tuple + (c-name "g_variant_type_new_tuple") + (return-type "GVariantType*") + (parameters + '("const-GVariantType*-const*" "items") + '("gint" "length") + ) +) + +(define-method new_dict_entry + (of-object "GVariantType") + (c-name "g_variant_type_new_dict_entry") + (return-type "GVariantType*") + (parameters + '("const-GVariantType*" "value") + ) +) + +(define-function g_variant_type_checked_ + (c-name "g_variant_type_checked_") + (return-type "const-GVariantType*") + (parameters + '("const-gchar" "*") + ) +) + + + ;; From gwin32.h (define-function g_win32_ftruncate |