From 2be6461562f696845a60370568dedd7625b6dbf3 Mon Sep 17 00:00:00 2001 From: Jonathon Jongsma Date: Thu, 9 Jul 2009 12:05:40 +0100 Subject: Fix build with glib from master * gio/src/socket.hg: fix build breakage caused by the addition of a bunch of cancellable parameters to GSocket methods. --- gio/src/gio_methods.defs | 229 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 228 insertions(+), 1 deletion(-) (limited to 'gio/src/gio_methods.defs') diff --git a/gio/src/gio_methods.defs b/gio/src/gio_methods.defs index e49f0d16..d1adc383 100644 --- a/gio/src/gio_methods.defs +++ b/gio/src/gio_methods.defs @@ -25,6 +25,13 @@ (gtype-id "G_TYPE_ASYNC_RESULT") ) +(define-object e + (in-module "GCancellabl") + (parent "GObject") + (c-name "GCancellable") + (gtype-id "G_TYPE_CANCELLABLE") +) + (define-object AppInfoLookup (in-module "GDesktop") (c-name "GDesktopAppInfoLookup") @@ -415,6 +422,7 @@ '("uint64" "G_FILE_ATTRIBUTE_TYPE_UINT64") '("int64" "G_FILE_ATTRIBUTE_TYPE_INT64") '("object" "G_FILE_ATTRIBUTE_TYPE_OBJECT") + '("stringv" "G_FILE_ATTRIBUTE_TYPE_STRINGV") ) ) @@ -1887,13 +1895,19 @@ (return-type "gboolean") ) +(define-method can_start_degraded + (of-object "GDrive") + (c-name "g_drive_can_start_degraded") + (return-type "gboolean") +) + (define-method start (of-object "GDrive") (c-name "g_drive_start") (return-type "none") (parameters '("GDriveStartFlags" "flags") - '("GMountOperation*" "start_operation") + '("GMountOperation*" "mount_operation") '("GCancellable*" "cancellable") '("GAsyncReadyCallback" "callback") '("gpointer" "user_data") @@ -1922,6 +1936,7 @@ (return-type "none") (parameters '("GMountUnmountFlags" "flags") + '("GMountOperation*" "mount_operation") '("GCancellable*" "cancellable") '("GAsyncReadyCallback" "callback") '("gpointer" "user_data") @@ -1938,6 +1953,29 @@ ) ) +(define-method eject_with_operation + (of-object "GDrive") + (c-name "g_drive_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 "GDrive") + (c-name "g_drive_eject_with_operation_finish") + (return-type "gboolean") + (parameters + '("GAsyncResult*" "result") + '("GError**" "error") + ) +) + ;; From gemblemedicon.h @@ -3087,6 +3125,29 @@ ) ) +(define-method unmount_mountable_with_operation + (of-object "GFile") + (c-name "g_file_unmount_mountable_with_operation") + (return-type "none") + (parameters + '("GMountUnmountFlags" "flags") + '("GMountOperation*" "mount_operation") + '("GCancellable*" "cancellable") + '("GAsyncReadyCallback" "callback") + '("gpointer" "user_data") + ) +) + +(define-method unmount_mountable_with_operation_finish + (of-object "GFile") + (c-name "g_file_unmount_mountable_with_operation_finish") + (return-type "gboolean") + (parameters + '("GAsyncResult*" "result") + '("GError**" "error") + ) +) + (define-method eject_mountable (of-object "GFile") (c-name "g_file_eject_mountable") @@ -3109,6 +3170,29 @@ ) ) +(define-method eject_mountable_with_operation + (of-object "GFile") + (c-name "g_file_eject_mountable_with_operation") + (return-type "none") + (parameters + '("GMountUnmountFlags" "flags") + '("GMountOperation*" "mount_operation") + '("GCancellable*" "cancellable") + '("GAsyncReadyCallback" "callback") + '("gpointer" "user_data") + ) +) + +(define-method eject_mountable_with_operation_finish + (of-object "GFile") + (c-name "g_file_eject_mountable_with_operation_finish") + (return-type "gboolean") + (parameters + '("GAsyncResult*" "result") + '("GError**" "error") + ) +) + (define-method copy_attributes (of-object "GFile") (c-name "g_file_copy_attributes") @@ -3183,6 +3267,7 @@ (return-type "none") (parameters '("GMountUnmountFlags" "flags") + '("GMountOperation*" "mount_operation") '("GCancellable*" "cancellable") '("GAsyncReadyCallback" "callback") '("gpointer" "user_data") @@ -3199,6 +3284,27 @@ ) ) +(define-method poll_mountable + (of-object "GFile") + (c-name "g_file_poll_mountable") + (return-type "none") + (parameters + '("GCancellable*" "cancellable") + '("GAsyncReadyCallback" "callback") + '("gpointer" "user_data") + ) +) + +(define-method poll_mountable_finish + (of-object "GFile") + (c-name "g_file_poll_mountable_finish") + (return-type "gboolean") + (parameters + '("GAsyncResult*" "result") + '("GError**" "error") + ) +) + (define-method query_default_handler (of-object "GFile") (c-name "g_file_query_default_handler") @@ -3314,6 +3420,12 @@ ) ) +(define-method supports_thread_contexts + (of-object "GFile") + (c-name "g_file_supports_thread_contexts") + (return-type "gboolean") +) + ;; From gfileicon.h @@ -3374,6 +3486,15 @@ ) ) +(define-method has_namespace + (of-object "GFileInfo") + (c-name "g_file_info_has_namespace") + (return-type "gboolean") + (parameters + '("const-char*" "name_space") + ) +) + (define-method list_attributes (of-object "GFileInfo") (c-name "g_file_info_list_attributes") @@ -3422,6 +3543,16 @@ ) ) +(define-method set_attribute_status + (of-object "GFileInfo") + (c-name "g_file_info_set_attribute_status") + (return-type "gboolean") + (parameters + '("const-char*" "attribute") + '("GFileAttributeStatus" "status") + ) +) + (define-method get_attribute_as_string (of-object "GFileInfo") (c-name "g_file_info_get_attribute_as_string") @@ -3503,6 +3634,15 @@ ) ) +(define-method get_attribute_stringv + (of-object "GFileInfo") + (c-name "g_file_info_get_attribute_stringv") + (return-type "char**") + (parameters + '("const-char*" "attribute") + ) +) + (define-method set_attribute (of-object "GFileInfo") (c-name "g_file_info_set_attribute") @@ -3594,6 +3734,16 @@ ) ) +(define-method set_attribute_stringv + (of-object "GFileInfo") + (c-name "g_file_info_set_attribute_stringv") + (return-type "none") + (parameters + '("const-char*" "attribute") + '("char**" "attr_value") + ) +) + (define-method clear_status (of-object "GFileInfo") (c-name "g_file_info_clear_status") @@ -5261,6 +5411,52 @@ (return-type "none") ) +(define-method unmount_with_operation + (of-object "GMount") + (c-name "g_mount_unmount_with_operation") + (return-type "none") + (parameters + '("GMountUnmountFlags" "flags") + '("GMountOperation*" "mount_operation") + '("GCancellable*" "cancellable") + '("GAsyncReadyCallback" "callback") + '("gpointer" "user_data") + ) +) + +(define-method unmount_with_operation_finish + (of-object "GMount") + (c-name "g_mount_unmount_with_operation_finish") + (return-type "gboolean") + (parameters + '("GAsyncResult*" "result") + '("GError**" "error") + ) +) + +(define-method eject_with_operation + (of-object "GMount") + (c-name "g_mount_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 "GMount") + (c-name "g_mount_eject_with_operation_finish") + (return-type "gboolean") + (parameters + '("GAsyncResult*" "result") + '("GError**" "error") + ) +) + ;; From gmountoperation.h @@ -6570,6 +6766,7 @@ (return-type "gboolean") (parameters '("GSocketAddress*" "address") + '("GCancellable*" "cancellable") '("GError**" "error") ) ) @@ -6608,6 +6805,7 @@ (c-name "g_socket_accept") (return-type "GSocket*") (parameters + '("GCancellable*" "cancellable") '("GError**" "error") ) ) @@ -6628,6 +6826,7 @@ (parameters '("gchar*" "buffer") '("gsize" "size") + '("GCancellable*" "cancellable") '("GError**" "error") ) ) @@ -6640,6 +6839,7 @@ '("GSocketAddress**" "address") '("gchar*" "buffer") '("gsize" "size") + '("GCancellable*" "cancellable") '("GError**" "error") ) ) @@ -6651,6 +6851,7 @@ (parameters '("const-gchar*" "buffer") '("gsize" "size") + '("GCancellable*" "cancellable") '("GError**" "error") ) ) @@ -6663,6 +6864,7 @@ '("GSocketAddress*" "address") '("const-gchar*" "buffer") '("gsize" "size") + '("GCancellable*" "cancellable") '("GError**" "error") ) ) @@ -6678,6 +6880,7 @@ '("GSocketControlMessage***" "messages") '("gint*" "num_messages") '("gint*" "flags") + '("GCancellable*" "cancellable") '("GError**" "error") ) ) @@ -6693,6 +6896,7 @@ '("GSocketControlMessage**" "messages") '("gint" "num_messages") '("gint" "flags") + '("GCancellable*" "cancellable") '("GError**" "error") ) ) @@ -7239,6 +7443,29 @@ (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 -- cgit v1.2.1