[evolution] Bug 773550 - Do not use unstable WebKit DOM API

[Milan Crha <mcrha src gnome org>]

commit 1f7e053436a7e6ff03a38f9ca780e47771438fa1
Author: Milan Crha <mcrha redhat com>
Date:   Wed Jul 12 17:44:45 2017 +0200

    Bug 773550 - Do not use unstable WebKit DOM API

 CMakeLists.txt                                     |    2 +-
 .../module-itip-formatter-dom-utils.c              |    3 +--
 .../web-extension/e-composer-dom-functions.c       |    6 +-----
 .../web-extension/e-dialogs-dom-functions.c        |    5 +----
 .../web-extension/e-editor-dom-functions.c         |   10 +---------
 .../web-extension/e-editor-undo-redo-manager.c     |    9 +--------
 .../web-extension/e-editor-web-extension.c         |    6 +-----
 src/web-extensions/e-dom-utils.c                   |    5 +----
 src/web-extensions/e-web-extension.c               |    3 +--
 9 files changed, 9 insertions(+), 40 deletions(-)
---
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 710d19c..7c469e9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -79,7 +79,7 @@ set(gsettings_desktop_schemas_minimum_version 2.91.92)
 set(libpst_minimum_version 0.6.54)
 set(libxml_minimum_version 2.7.3)
 set(shared_mime_info_minimum_version 0.22)
-set(webkit2gtk_minimum_version 2.13.90)
+set(webkit2gtk_minimum_version 2.16.0)
 
 # Optional Packages
 set(champlain_minimum_version 0.12)
diff --git a/src/modules/itip-formatter/web-extension/module-itip-formatter-dom-utils.c 
b/src/modules/itip-formatter/web-extension/module-itip-formatter-dom-utils.c
index 390577a..9b2f937 100644
--- a/src/modules/itip-formatter/web-extension/module-itip-formatter-dom-utils.c
+++ b/src/modules/itip-formatter/web-extension/module-itip-formatter-dom-utils.c
@@ -18,8 +18,7 @@
 
 #include "module-itip-formatter-dom-utils.h"
 
-#define WEBKIT_DOM_USE_UNSTABLE_API
-#include <webkitdom/WebKitDOMHTMLElementUnstable.h>
+#include <webkitdom/webkitdom.h>
 
 #include "module-itip-formatter-web-extension.h"
 #include "../itip-view-elements-defines.h"
diff --git a/src/modules/webkit-editor/web-extension/e-composer-dom-functions.c 
b/src/modules/webkit-editor/web-extension/e-composer-dom-functions.c
index 21dfc52..25705c7 100644
--- a/src/modules/webkit-editor/web-extension/e-composer-dom-functions.c
+++ b/src/modules/webkit-editor/web-extension/e-composer-dom-functions.c
@@ -20,11 +20,7 @@
 
 #include <string.h>
 
-#define WEBKIT_DOM_USE_UNSTABLE_API
-#include <webkitdom/WebKitDOMDOMSelection.h>
-#include <webkitdom/WebKitDOMDOMWindowUnstable.h>
-#include <webkitdom/WebKitDOMElementUnstable.h>
-#undef WEBKIT_DOM_USE_UNSTABLE_API
+#include <webkitdom/webkitdom.h>
 
 #include <camel/camel.h>
 
diff --git a/src/modules/webkit-editor/web-extension/e-dialogs-dom-functions.c 
b/src/modules/webkit-editor/web-extension/e-dialogs-dom-functions.c
index b371a42..64f6c28 100644
--- a/src/modules/webkit-editor/web-extension/e-dialogs-dom-functions.c
+++ b/src/modules/webkit-editor/web-extension/e-dialogs-dom-functions.c
@@ -17,10 +17,7 @@
 
 #include "evolution-config.h"
 
-#define WEBKIT_DOM_USE_UNSTABLE_API
-#include <webkitdom/WebKitDOMDOMSelection.h>
-#include <webkitdom/WebKitDOMDOMWindowUnstable.h>
-#undef WEBKIT_DOM_USE_UNSTABLE_API
+#include <webkitdom/webkitdom.h>
 
 #include "web-extensions/e-dom-utils.h"
 
diff --git a/src/modules/webkit-editor/web-extension/e-editor-dom-functions.c 
b/src/modules/webkit-editor/web-extension/e-editor-dom-functions.c
index 002f1db..34f712b 100644
--- a/src/modules/webkit-editor/web-extension/e-editor-dom-functions.c
+++ b/src/modules/webkit-editor/web-extension/e-editor-dom-functions.c
@@ -18,15 +18,7 @@
 
 #include <string.h>
 
-#define WEBKIT_DOM_USE_UNSTABLE_API
-#include <webkitdom/WebKitDOMDocumentUnstable.h>
-#include <webkitdom/WebKitDOMDocumentFragmentUnstable.h>
-#include <webkitdom/WebKitDOMDOMSelection.h>
-#include <webkitdom/WebKitDOMDOMWindowUnstable.h>
-#include <webkitdom/WebKitDOMHTMLElementUnstable.h>
-#include <webkitdom/WebKitDOMElementUnstable.h>
-#include <webkitdom/WebKitDOMRangeUnstable.h>
-#undef WEBKIT_DOM_USE_UNSTABLE_API
+#include <webkitdom/webkitdom.h>
 
 #include "web-extensions/e-dom-utils.h"
 
diff --git a/src/modules/webkit-editor/web-extension/e-editor-undo-redo-manager.c 
b/src/modules/webkit-editor/web-extension/e-editor-undo-redo-manager.c
index 293f886..dd9a5fb 100644
--- a/src/modules/webkit-editor/web-extension/e-editor-undo-redo-manager.c
+++ b/src/modules/webkit-editor/web-extension/e-editor-undo-redo-manager.c
@@ -18,14 +18,7 @@
 
 #include "evolution-config.h"
 
-#define WEBKIT_DOM_USE_UNSTABLE_API
-#include <webkitdom/WebKitDOMDocumentFragmentUnstable.h>
-#include <webkitdom/WebKitDOMRangeUnstable.h>
-#include <webkitdom/WebKitDOMDOMSelection.h>
-#include <webkitdom/WebKitDOMDOMWindowUnstable.h>
-#include <webkitdom/WebKitDOMHTMLElementUnstable.h>
-#include <webkitdom/WebKitDOMDocumentUnstable.h>
-#undef WEBKIT_DOM_USE_UNSTABLE_API
+#include <webkitdom/webkitdom.h>
 
 #include "web-extensions/e-dom-utils.h"
 
diff --git a/src/modules/webkit-editor/web-extension/e-editor-web-extension.c 
b/src/modules/webkit-editor/web-extension/e-editor-web-extension.c
index d333b95..d799db4 100644
--- a/src/modules/webkit-editor/web-extension/e-editor-web-extension.c
+++ b/src/modules/webkit-editor/web-extension/e-editor-web-extension.c
@@ -26,11 +26,7 @@
 #include <webkit2/webkit-web-extension.h>
 #include <camel/camel.h>
 
-#define WEBKIT_DOM_USE_UNSTABLE_API
-#include <webkitdom/WebKitDOMDocumentUnstable.h>
-#include <webkitdom/WebKitDOMDOMSelection.h>
-#include <webkitdom/WebKitDOMDOMWindowUnstable.h>
-#undef WEBKIT_DOM_USE_UNSTABLE_API
+#include <webkitdom/webkitdom.h>
 
 #include "web-extensions/e-dom-utils.h"
 
diff --git a/src/web-extensions/e-dom-utils.c b/src/web-extensions/e-dom-utils.c
index 14d03ed..adcb956 100644
--- a/src/web-extensions/e-dom-utils.c
+++ b/src/web-extensions/e-dom-utils.c
@@ -20,10 +20,7 @@
 
 #include <string.h>
 
-#define WEBKIT_DOM_USE_UNSTABLE_API
-#include <webkitdom/WebKitDOMDOMSelection.h>
-#include <webkitdom/WebKitDOMDOMWindowUnstable.h>
-#include <webkitdom/WebKitDOMHTMLElementUnstable.h>
+#include <webkitdom/webkitdom.h>
 
 #include "e-web-extension.h"
 #include "e-web-extension-names.h"
diff --git a/src/web-extensions/e-web-extension.c b/src/web-extensions/e-web-extension.c
index cb67a5a..94757f5 100644
--- a/src/web-extensions/e-web-extension.c
+++ b/src/web-extensions/e-web-extension.c
@@ -31,8 +31,7 @@
 #include "e-dom-utils.h"
 #include "e-web-extension-names.h"
 
-#define WEBKIT_DOM_USE_UNSTABLE_API
-#include <webkitdom/WebKitDOMDOMWindowUnstable.h>
+#include <webkitdom/webkitdom.h>
 
 #define WEB_EXTENSION_PAGE_ID_KEY "web-extension-page-id"