From: Jürg Billeter <j@bitron.ch>
Date: Wed, 28 Aug 2013 15:07:57 +0000 (+0200)
Subject: gio-2.0: remove default argument from g_file_load_contents
X-Git-Tag: 0.21.2~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=279b7fc7fd63c39c7f98790a8a768b1b6e0471e1;p=thirdparty%2Fvala.git

gio-2.0: remove default argument from g_file_load_contents

Fixes bug 706761.
---

diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi
index d2dbaa997..0e505f92a 100644
--- a/vapi/gio-2.0.vapi
+++ b/vapi/gio-2.0.vapi
@@ -1763,9 +1763,13 @@ namespace GLib {
 	public class SimpleActionGroup : GLib.Object, GLib.ActionGroup, GLib.ActionMap {
 		[CCode (has_construct_function = false)]
 		public SimpleActionGroup ();
+		[Deprecated (since = "2.38")]
 		public void add_entries ([CCode (array_length_cname = "n_entries", array_length_pos = 1.5)] GLib.ActionEntry[] entries, void* user_data);
+		[Deprecated (since = "2.38")]
 		public void insert (GLib.Action action);
+		[Deprecated (since = "2.38")]
 		public unowned GLib.Action lookup (string action_name);
+		[Deprecated (since = "2.38")]
 		public void remove (string action_name);
 	}
 	[CCode (cheader_filename = "gio/gio.h")]
@@ -2501,7 +2505,7 @@ namespace GLib {
 		public abstract bool has_uri_scheme (string uri_scheme);
 		public abstract uint hash ();
 		public abstract bool is_native ();
-		public bool load_contents (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 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")] 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;
diff --git a/vapi/metadata/Gio-2.0.metadata b/vapi/metadata/Gio-2.0.metadata
index becfbfcfa..f9898a573 100644
--- a/vapi/metadata/Gio-2.0.metadata
+++ b/vapi/metadata/Gio-2.0.metadata
@@ -107,6 +107,7 @@ DBusServer
 Drive
   .get_sort_key#virtual_method virtual
 File
+  .load_contents.cancellable#parameter default=()
   .monitor_dir* throws="GLib.IOError"
   .monitor_file throws="GLib.IOError"
 FileInfo