From d601eb65a29ff3cae3d23f8dcac401834b94e8e1 Mon Sep 17 00:00:00 2001 From: Evan Nemerson Date: Fri, 5 Mar 2010 14:02:06 -0800 Subject: [PATCH] gio-2.0: nullability fixes for g_file_replace_contents Fixes bug 611282. --- vapi/gio-2.0.vapi | 4 ++-- vapi/packages/gio-2.0/gio-2.0.metadata | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi index dad2a774a..e62d5175d 100644 --- a/vapi/gio-2.0.vapi +++ b/vapi/gio-2.0.vapi @@ -1062,8 +1062,8 @@ namespace GLib { public abstract unowned GLib.FileInputStream read_fn (GLib.Cancellable? cancellable) throws GLib.Error; public abstract GLib.FileOutputStream replace (string? etag, bool make_backup, GLib.FileCreateFlags flags, GLib.Cancellable? cancellable) throws GLib.Error; public abstract async GLib.FileOutputStream replace_async (string? etag, bool make_backup, GLib.FileCreateFlags flags, int io_priority, GLib.Cancellable? cancellable) throws GLib.Error; - public bool replace_contents (string contents, size_t length, string? etag, bool make_backup, GLib.FileCreateFlags flags, out string new_etag, GLib.Cancellable? cancellable) throws GLib.Error; - public async bool replace_contents_async (string contents, size_t length, string? etag, bool make_backup, GLib.FileCreateFlags flags, GLib.Cancellable? cancellable, out string new_etag) throws GLib.Error; + public bool replace_contents (string contents, size_t length, string? etag, bool make_backup, GLib.FileCreateFlags flags, out string? new_etag, GLib.Cancellable? cancellable) throws GLib.Error; + public async bool replace_contents_async (string contents, size_t length, string? etag, bool make_backup, GLib.FileCreateFlags flags, GLib.Cancellable? cancellable, out string? new_etag) throws GLib.Error; public bool replace_contents_finish (GLib.AsyncResult res, out string new_etag) throws GLib.Error; public abstract GLib.FileOutputStream replace_finish (GLib.AsyncResult res) throws GLib.Error; public abstract unowned GLib.FileIOStream replace_readwrite (string? etag, bool make_backup, GLib.FileCreateFlags flags, GLib.Cancellable? cancellable) throws GLib.Error; diff --git a/vapi/packages/gio-2.0/gio-2.0.metadata b/vapi/packages/gio-2.0/gio-2.0.metadata index a5921ef94..d2de38807 100644 --- a/vapi/packages/gio-2.0/gio-2.0.metadata +++ b/vapi/packages/gio-2.0/gio-2.0.metadata @@ -73,8 +73,8 @@ g_file_read_finish transfer_ownership="1" g_file_replace transfer_ownership="1" g_file_replace.etag nullable="1" g_file_replace_async.etag nullable="1" -g_file_replace_contents.new_etag transfer_ownership="1" -g_file_replace_contents_finish.new_etag transfer_ownership="1" +g_file_replace_contents.new_etag transfer_ownership="1" nullable="1" +g_file_replace_contents_finish.new_etag transfer_ownership="1" nullable="1" g_file_replace_finish transfer_ownership="1" g_file_resolve_relative_path transfer_ownership="1" g_file_start_mountable async="1" -- 2.47.3