From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Tue, 1 May 2018 17:43:26 +0000 (+0200)
Subject: webkit2gtk-4.0: Cherry-pick some fixes from 0.42
X-Git-Tag: 0.38.10~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f20fcb96940c35534ed0035211a0596827ca2f8;p=thirdparty%2Fvala.git

webkit2gtk-4.0: Cherry-pick some fixes from 0.42
---

diff --git a/vapi/webkit2gtk-4.0.vapi b/vapi/webkit2gtk-4.0.vapi
index 6696d1516..43c2e9d4f 100644
--- a/vapi/webkit2gtk-4.0.vapi
+++ b/vapi/webkit2gtk-4.0.vapi
@@ -67,15 +67,15 @@ namespace WebKit {
 	public class BackForwardList : GLib.Object {
 		[CCode (has_construct_function = false)]
 		protected BackForwardList ();
-		public unowned WebKit.BackForwardListItem get_back_item ();
+		public unowned WebKit.BackForwardListItem? get_back_item ();
 		public GLib.List<weak WebKit.BackForwardListItem> get_back_list ();
 		public GLib.List<weak WebKit.BackForwardListItem> get_back_list_with_limit (uint limit);
-		public unowned WebKit.BackForwardListItem get_current_item ();
-		public unowned WebKit.BackForwardListItem get_forward_item ();
+		public unowned WebKit.BackForwardListItem? get_current_item ();
+		public unowned WebKit.BackForwardListItem? get_forward_item ();
 		public GLib.List<weak WebKit.BackForwardListItem> get_forward_list ();
 		public GLib.List<weak WebKit.BackForwardListItem> get_forward_list_with_limit (uint limit);
 		public uint get_length ();
-		public unowned WebKit.BackForwardListItem get_nth_item (int index);
+		public unowned WebKit.BackForwardListItem? get_nth_item (int index);
 		public signal void changed (WebKit.BackForwardListItem? item_added, void* items_removed);
 	}
 	[CCode (cheader_filename = "webkit2/webkit2.h", type_id = "webkit_back_forward_list_item_get_type ()")]
@@ -406,7 +406,7 @@ namespace WebKit {
 	public class NetworkProxySettings {
 		[CCode (has_construct_function = false)]
 		[Version (since = "2.16")]
-		public NetworkProxySettings (string? default_proxy_uri, string? ignore_hosts);
+		public NetworkProxySettings (string? default_proxy_uri, [CCode (array_length = false, array_null_terminated = true)] string[]? ignore_hosts);
 		[Version (since = "2.16")]
 		public void add_proxy_for_scheme (string scheme, string proxy_uri);
 		[Version (since = "2.16")]