Merge pull request #595 from jangernert/webkit_gaction

GAction instead of deprecated Gtk.Action

6 files changed, 35 insertions, 29 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5bc779ad..6d20c374 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,7 +28,7 @@ find_package(Vala REQUIRED)
 include(ValaVersion)
 include(ValaPrecompile)
 include(GResource)
-ensure_vala_version("0.30" MINIMUM)
+ensure_vala_version("0.36" MINIMUM)
 
 pkg_check_modules(LIBUNITY QUIET unity)
 
@@ -53,7 +53,7 @@ set(MODULES
 	libsecret-1
 	libxml-2.0
 	rest-0.7
-	webkit2gtk-4.0
+	webkit2gtk-4.0>=2.18
 	gstreamer-1.0
 	gstreamer-pbutils-1.0
 	libpeas-1.0
diff --git a/INSTALL.md b/INSTALL.md
index 26f4244c..9a738226 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -1,26 +1,26 @@
 ## Dependencies (package names may differ depending on distribution)
 
-- build-essential
-- cmake
-- vala (>=0.26)
-- pkg-config
-- libgirepository1.0-dev
-- libgtk-3-dev (>= 3.20)
-- libsoup2.4-dev
-- libjson-glib-dev
-- libwebkit2gtk-4.0-dev
-- libsqlite3-dev
-- libsecret-1-dev
-- libnotify-dev
-- libxml2-dev
-- libunity-dev (optional)
-- librest-dev
-- libgee-0.8-dev
-- libgstreamer1.0-dev
-- libgstreamer-plugins-base1.0-dev (gstreamer-pbutils-1.0)
-- libgoa-1.0-dev (>= 3.20)
-- libcurl-dev
-- libpeas-dev
+- `build-essential`
+- `cmake`
+- `vala (>=0.38)`
+- `pkg-config`
+- `libgirepository1.0-dev`
+- `libgtk-3-dev (>= 3.22)`
+- `libsoup2.4-dev`
+- `libjson-glib-dev`
+- `libwebkit2gtk-4.0-dev (>=2.18)`
+- `libsqlite3-dev`
+- `libsecret-1-dev`
+- `libnotify-dev`
+- `libxml2-dev`
+- `libunity-dev (optional)`
+- `librest-dev`
+- `libgee-0.8-dev`
+- `libgstreamer1.0-dev`
+- `libgstreamer-plugins-base1.0-dev (gstreamer-pbutils-1.0)`
+- `libgoa-1.0-dev (>= 3.20)`
+- `libcurl-dev`
+- `libpeas-dev`
 
 ## Fedora dependencies install 
 ```
diff --git a/README.md b/README.md
index 4dd17898..90d4e4f8 100644
--- a/README.md
+++ b/README.md
@@ -16,13 +16,13 @@ For translators : https://www.transifex.com/dev-feedreader/feedreader
 ## Dependencies
 - `build-essential`
 - `cmake`
-- `vala (>=0.26)`
+- `vala (>=0.38)`
 - `pkg-config`
 - `libgirepository1.0-dev`
 - `libgtk-3-dev (>= 3.22)`
 - `libsoup2.4-dev`
 - `libjson-glib-dev`
-- `libwebkit2gtk-4.0-dev`
+- `libwebkit2gtk-4.0-dev (>=2.18)`
 - `libsqlite3-dev`
 - `libsecret-1-dev`
 - `libnotify-dev`
diff --git a/src/Widgets/ArticleView.vala b/src/Widgets/ArticleView.vala
index 895ef402..1571eaa3 100644
--- a/src/Widgets/ArticleView.vala
+++ b/src/Widgets/ArticleView.vala
@@ -773,11 +773,11 @@ public class FeedReader.ArticleView : Gtk.Overlay {
 		if(hitTest.context_is_image())
 		{
 			var uri = hitTest.get_image_uri().substring("file://".length);
-			var action = new Gtk.Action("save", _("Save image as"), null, null);
+			var action = new GLib.SimpleAction ("save", null);
 			action.activate.connect(() => {
 				Utils.saveImageDialog(uri);
 			});
-			menu.append(new WebKit.ContextMenuItem(action));
+			menu.append(new WebKit.ContextMenuItem.from_gaction(action, _("Save image as"), null));
 		}
 
 		if(menu.first() == null)
diff --git a/vapi/webkit2gtk-4.0.deps b/vapi/webkit2gtk-4.0.deps
deleted file mode 100644
index 2868ee0c..00000000
--- a/vapi/webkit2gtk-4.0.deps
+++ /dev/null
@@ -1,2 +0,0 @@
-gtk+-3.0
-libsoup-2.4
diff --git a/vapi/webkit2gtk-4.0.vapi b/vapi/webkit2gtk-4.0.vapi
index df78fa3a..f028a0eb 100644
--- a/vapi/webkit2gtk-4.0.vapi
+++ b/vapi/webkit2gtk-4.0.vapi
@@ -95,12 +95,19 @@ namespace WebKit {
 	[CCode (cheader_filename = "webkit2/webkit2.h", type_id = "webkit_context_menu_item_get_type ()")]
 	public class ContextMenuItem : GLib.InitiallyUnowned {
 		[CCode (has_construct_function = false)]
+		[Version (deprecated = true, deprecated_since = "2.18")]
 		public ContextMenuItem (Gtk.Action action);
 		[CCode (has_construct_function = false)]
+		[Version (since = "2.18")]
+		public ContextMenuItem.from_gaction (GLib.Action action, string label, GLib.Variant? target);
+		[CCode (has_construct_function = false)]
 		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);
+		[Version (deprecated = true, deprecated_since = "2.18")]
 		public unowned Gtk.Action get_action ();
+		[Version (since = "2.18")]
+		public unowned GLib.Action get_gaction ();
 		public WebKit.ContextMenuAction get_stock_action ();
 		public unowned WebKit.ContextMenu get_submenu ();
 		public bool is_separator ();
@@ -1445,3 +1452,4 @@ namespace WebKit {
 	[Version (since = "2.8")]
 	public static bool user_media_permission_is_for_video_device (WebKit.UserMediaPermissionRequest request);
 }
+