From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Tue, 27 Oct 2015 18:24:24 +0000 (+0100)
Subject: webkit2gtk-4.0: Update to 2.10.3
X-Git-Tag: 0.30.1~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bfeee3158e5f276c7b729515f36191c9b3de6d16;p=thirdparty%2Fvala.git

webkit2gtk-4.0: Update to 2.10.3
---

diff --git a/vapi/metadata/WebKit2-4.0.metadata b/vapi/metadata/WebKit2-4.0.metadata
index 54a1d97be..ae952ed07 100644
--- a/vapi/metadata/WebKit2-4.0.metadata
+++ b/vapi/metadata/WebKit2-4.0.metadata
@@ -4,3 +4,13 @@ JavascriptResult
   .get_value skip
 WebView
   .get_javascript_global_context skip
+
+//Forward upstream
+Download
+  .failed#signal.error type="WebKit.DownloadError"
+PrintOperation
+  .failed#signal.error type="WebKit.PrintError"
+WebResource
+  .failed#signal.error type="GLib.Error"
+WebView
+  .load_failed#signal.error type="GLib.Error"
diff --git a/vapi/webkit2gtk-4.0.vapi b/vapi/webkit2gtk-4.0.vapi
index ec542f10f..4d0634275 100644
--- a/vapi/webkit2gtk-4.0.vapi
+++ b/vapi/webkit2gtk-4.0.vapi
@@ -137,7 +137,7 @@ namespace WebKit {
 		public WebKit.URIResponse response { get; }
 		public signal void created_destination (string destination);
 		public virtual signal bool decide_destination (string suggested_filename);
-		public signal void failed (void* error);
+		public signal void failed ([CCode (type = "gpointer")] WebKit.DownloadError error);
 		public signal void finished ();
 		public signal void received_data (uint64 data_length);
 	}
@@ -341,7 +341,7 @@ namespace WebKit {
 		public Gtk.PrintSettings print_settings { get; set; }
 		[NoAccessorMethod]
 		public WebKit.WebView web_view { owned get; construct; }
-		public signal void failed (void* error);
+		public signal void failed ([CCode (type = "gpointer")] WebKit.PrintError error);
 		public signal void finished ();
 	}
 	[CCode (cheader_filename = "webkit2/webkit2.h", type_id = "webkit_response_policy_decision_get_type ()")]
@@ -683,7 +683,7 @@ namespace WebKit {
 		public unowned string get_uri ();
 		public WebKit.URIResponse response { get; }
 		public string uri { get; }
-		public signal void failed (void* error);
+		public signal void failed ([CCode (type = "gpointer")] GLib.Error error);
 		public signal void failed_with_tls_errors (GLib.TlsCertificate certificate, GLib.TlsCertificateFlags errors);
 		public signal void finished ();
 		public signal void received_data (uint64 data_length);
@@ -774,7 +774,7 @@ namespace WebKit {
 		public virtual signal void insecure_content_detected (WebKit.InsecureContentEvent event);
 		public virtual signal bool leave_fullscreen ();
 		public virtual signal void load_changed (WebKit.LoadEvent load_event);
-		public virtual signal bool load_failed (WebKit.LoadEvent load_event, string failing_uri, void* error);
+		public virtual signal bool load_failed (WebKit.LoadEvent load_event, string failing_uri, [CCode (type = "gpointer")] GLib.Error error);
 		public virtual signal bool load_failed_with_tls_errors (string failing_uri, GLib.TlsCertificate certificate, GLib.TlsCertificateFlags errors);
 		public virtual signal void mouse_target_changed (WebKit.HitTestResult hit_test_result, uint modifiers);
 		public virtual signal bool permission_request (WebKit.PermissionRequest permission_request);
diff --git a/vapi/webkit2gtk-web-extension-4.0.vapi b/vapi/webkit2gtk-web-extension-4.0.vapi
index 0e2c498ea..8a4dd9b4f 100644
--- a/vapi/webkit2gtk-web-extension-4.0.vapi
+++ b/vapi/webkit2gtk-web-extension-4.0.vapi
@@ -2644,14 +2644,20 @@ namespace WebKit {
 		[CCode (has_construct_function = false)]
 		public ContextMenu ();
 		public void append (WebKit.ContextMenuItem item);
+		public unowned WebKit.ContextMenuItem first ();
+		public unowned WebKit.ContextMenuItem get_item_at_position (uint position);
+		public unowned GLib.List<WebKit.ContextMenuItem> get_items ();
 		public uint get_n_items ();
-		public GLib.Variant get_user_data ();
+		public unowned GLib.Variant get_user_data ();
 		public void insert (WebKit.ContextMenuItem item, int position);
+		public unowned WebKit.ContextMenuItem last ();
 		public void move_item (WebKit.ContextMenuItem item, int position);
 		public void prepend (WebKit.ContextMenuItem item);
 		public void remove (WebKit.ContextMenuItem item);
 		public void remove_all ();
 		public void set_user_data (GLib.Variant user_data);
+		[CCode (has_construct_function = false)]
+		public ContextMenu.with_items (GLib.List<WebKit.ContextMenuItem> items);
 	}
 	[CCode (cheader_filename = "webkit2/webkit-web-extension.h", type_id = "webkit_context_menu_item_get_type ()")]
 	public class ContextMenuItem : GLib.InitiallyUnowned {
@@ -2661,11 +2667,13 @@ namespace WebKit {
 		public ContextMenuItem.from_stock_action (WebKit.ContextMenuAction action);
 		[CCode (has_construct_function = false)]
 		public ContextMenuItem.from_stock_action_with_label (WebKit.ContextMenuAction action, string label);
+		public unowned Gtk.Action get_action ();
 		public WebKit.ContextMenuAction get_stock_action ();
+		public unowned WebKit.ContextMenu get_submenu ();
 		public bool is_separator ();
 		[CCode (has_construct_function = false)]
 		public ContextMenuItem.separator ();
-		public void set_submenu (WebKit.ContextMenu submenu);
+		public void set_submenu (WebKit.ContextMenu? submenu);
 		[CCode (has_construct_function = false)]
 		public ContextMenuItem.with_submenu (string label, WebKit.ContextMenu submenu);
 	}