From: Evan Nemerson <evan@coeus-group.com>
Date: Fri, 5 Mar 2010 22:02:06 +0000 (-0800)
Subject: gio-2.0: nullability fixes for g_file_replace_contents
X-Git-Tag: 0.8.0~230
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d601eb65a29ff3cae3d23f8dcac401834b94e8e1;p=thirdparty%2Fvala.git

gio-2.0: nullability fixes for g_file_replace_contents

Fixes bug 611282.
---

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"