From 158a273158582155cf5baf1242bb10d12a3e223d Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sat, 26 Oct 2013 12:43:14 +0200 Subject: [PATCH] Revert "gio-2.0: Fix uint8[]/char** types for contents parameters for g_file_[load|replace]_contents()" This reverts commit e4ef6fb72f560da385a09d262ef8afd2b64a1fc8. --- vapi/gio-2.0.vapi | 4 ++-- vapi/metadata/Gio-2.0.metadata | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi index 0a684e609..d0e2a65ee 100644 --- a/vapi/gio-2.0.vapi +++ b/vapi/gio-2.0.vapi @@ -2533,7 +2533,7 @@ namespace GLib { public abstract uint hash (); public abstract bool is_native (); public bool load_contents (GLib.Cancellable? cancellable, [CCode (array_length_cname = "length", array_length_pos = 2.5, array_length_type = "gsize")] out uint8[] contents, out string etag_out) throws GLib.Error; - public async bool load_contents_async (GLib.Cancellable? cancellable = null, [CCode (array_length_cname = "length", array_length_pos = 2.5, array_length_type = "gsize", type = "char**")] out uint8[] contents, out string etag_out) throws GLib.Error; + public async bool load_contents_async (GLib.Cancellable? cancellable = null, [CCode (array_length_cname = "length", array_length_pos = 2.5, array_length_type = "gsize")] out uint8[] contents, out string etag_out) throws GLib.Error; public async bool load_partial_contents_async (GLib.Cancellable? cancellable = null, GLib.FileReadMoreCallback read_more_callback, [CCode (array_length_cname = "length", array_length_pos = 2.5, array_length_type = "gsize")] out uint8[] contents, out string etag_out) throws GLib.Error; public abstract bool make_directory (GLib.Cancellable? cancellable = null) throws GLib.Error; public abstract async bool make_directory_async (int io_priority = GLib.Priority.DEFAULT, GLib.Cancellable? cancellable = null) throws GLib.Error; @@ -2577,7 +2577,7 @@ namespace GLib { public abstract GLib.FileOutputStream replace (string? etag, bool make_backup, GLib.FileCreateFlags flags, GLib.Cancellable? cancellable = null) throws GLib.Error; public abstract async GLib.FileOutputStream replace_async (string? etag, bool make_backup, GLib.FileCreateFlags flags, int io_priority = GLib.Priority.DEFAULT, GLib.Cancellable? cancellable = null) throws GLib.Error; public bool replace_contents ([CCode (array_length_cname = "length", array_length_pos = 1.5, array_length_type = "gsize")] uint8[] contents, string? etag, bool make_backup, GLib.FileCreateFlags flags, out string new_etag, GLib.Cancellable? cancellable = null) throws GLib.Error; - public async bool replace_contents_async ([CCode (array_length_cname = "length", array_length_pos = 1.5, array_length_type = "gsize", type = "const char*")] uint8[] contents, string? etag, bool make_backup, GLib.FileCreateFlags flags, GLib.Cancellable? cancellable = null, out string new_etag) throws GLib.Error; + public async bool replace_contents_async ([CCode (array_length_cname = "length", array_length_pos = 1.5, array_length_type = "gsize")] uint8[] contents, string? etag, bool make_backup, GLib.FileCreateFlags flags, GLib.Cancellable? cancellable = null, out string new_etag) throws GLib.Error; public abstract GLib.FileIOStream replace_readwrite (string? etag, bool make_backup, GLib.FileCreateFlags flags, GLib.Cancellable? cancellable = null) throws GLib.Error; public abstract async GLib.FileIOStream replace_readwrite_async (string? etag, bool make_backup, GLib.FileCreateFlags flags, int io_priority = GLib.Priority.DEFAULT, GLib.Cancellable? cancellable = null) throws GLib.Error; public abstract GLib.File resolve_relative_path (string relative_path); diff --git a/vapi/metadata/Gio-2.0.metadata b/vapi/metadata/Gio-2.0.metadata index 512d899d3..3ee2d969d 100644 --- a/vapi/metadata/Gio-2.0.metadata +++ b/vapi/metadata/Gio-2.0.metadata @@ -108,9 +108,6 @@ Drive .get_sort_key#virtual_method virtual File .load_contents.cancellable#parameter default=() - .load_contents_async.contents#parameter type="char**" - .load_partial_contents_async.contents#parameter type="char**" - .replace_contents_async.contents#parameter type="const char*" .monitor_dir* throws="GLib.IOError" .monitor_file throws="GLib.IOError" FileInfo -- 2.47.2