[evolution/wip-webkit2: 1/11] Require WebKit2 instead of WebKit1.

[Tomas Popela <tpopela src gnome org>]

commit 7e12b484cb991e0ef086c765eac0de2276faa9da
Author: Tomas Popela <tpopela redhat com>
Date:   Tue Oct 15 09:46:11 2013 +0200

    Require WebKit2 instead of WebKit1.

 addressbook/gui/widgets/eab-contact-display.c |    2 +-
 configure.ac                                  |    4 ++--
 e-util/e-web-view.h                           |    2 +-
 mail/e-http-request.c                         |    2 +-
 mail/e-mail-display-popup-extension.h         |    2 +-
 mail/e-mail-request.c                         |    2 +-
 shell/main.c                                  |    2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/addressbook/gui/widgets/eab-contact-display.c b/addressbook/gui/widgets/eab-contact-display.c
index c467e38..6586ac6 100644
--- a/addressbook/gui/widgets/eab-contact-display.c
+++ b/addressbook/gui/widgets/eab-contact-display.c
@@ -29,7 +29,7 @@
 #include <string.h>
 #include <glib/gi18n.h>
 
-#include <webkit/webkit.h>
+#include <webkit2/webkit2.h>
 
 #include "e-contact-map.h"
 #include "eab-contact-formatter.h"
diff --git a/configure.ac b/configure.ac
index a5464f1..34b3b5e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,7 +51,7 @@ m4_define([gcr_minimum_version], [3.4])
 m4_define([gnome_desktop_minimum_version], [2.91.3])
 m4_define([gnome_icon_theme_minimum_version], [2.30.2.1])
 m4_define([gsettings_desktop_schemas_minimum_version], [2.91.92])
-m4_define([webkitgtk_minimum_version], [1.10.0])
+m4_define([webkit2gtk_minimum_version], [2.0.1])
 m4_define([libgdata_minimum_version], [0.10])
 m4_define([libxml_minimum_version], [2.7.3])
 m4_define([shared_mime_info_minimum_version], [0.22])
@@ -289,7 +289,7 @@ PKG_CHECK_MODULES([GNOME_PLATFORM],
         shared-mime-info >= shared_mime_info_minimum_version
         gnome-desktop-3.0 >= gnome_desktop_minimum_version
         gsettings-desktop-schemas >= gsettings_desktop_schemas_minimum_version
-        webkitgtk-3.0 >= webkitgtk_minimum_version])
+        webkit2gtk-3.0 >= webkit2gtk_minimum_version])
 AC_SUBST(GNOME_PLATFORM_CFLAGS)
 AC_SUBST(GNOME_PLATFORM_LIBS)
 
diff --git a/e-util/e-web-view.h b/e-util/e-web-view.h
index e01a635..b21acd2 100644
--- a/e-util/e-web-view.h
+++ b/e-util/e-web-view.h
@@ -31,7 +31,7 @@
 #ifndef E_WEB_VIEW_H
 #define E_WEB_VIEW_H
 
-#include <webkit/webkit.h>
+#include <webkit2/webkit2.h>
 #include <e-util/e-activity.h>
 
 /* Standard GObject macros */
diff --git a/mail/e-http-request.c b/mail/e-http-request.c
index 996a993..ddc00eb 100644
--- a/mail/e-http-request.c
+++ b/mail/e-http-request.c
@@ -27,7 +27,7 @@
 #include <libsoup/soup-requester.h>
 #include <libsoup/soup-request-http.h>
 #include <camel/camel.h>
-#include <webkit/webkit.h>
+#include <webkit2/webkit2.h>
 
 #include <e-util/e-util.h>
 #include <mail/em-utils.h>
diff --git a/mail/e-mail-display-popup-extension.h b/mail/e-mail-display-popup-extension.h
index 307071e..d694778 100644
--- a/mail/e-mail-display-popup-extension.h
+++ b/mail/e-mail-display-popup-extension.h
@@ -20,7 +20,7 @@
 #define E_MAIL_DISPLAY_POPUP_EXTENSION_H
 
 #include <glib-object.h>
-#include <webkit/webkit.h>
+#include <webkit2/webkit2.h>
 
 /* Standard GObject macros */
 #define E_TYPE_MAIL_DISPLAY_POPUP_EXTENSION \
diff --git a/mail/e-mail-request.c b/mail/e-mail-request.c
index bfbedc3..a4cbe32 100644
--- a/mail/e-mail-request.c
+++ b/mail/e-mail-request.c
@@ -25,7 +25,7 @@
 #include <libsoup/soup-requester.h>
 #include <libsoup/soup-request-http.h>
 
-#include <webkit/webkit.h>
+#include <webkit2/webkit2.h>
 
 #include <glib/gi18n.h>
 #include <camel/camel.h>
diff --git a/shell/main.c b/shell/main.c
index 8f3d5a4..bfee350 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -55,7 +55,7 @@
 #include <libxml/parser.h>
 #include <libxml/tree.h>
 
-#include <webkit/webkit.h>
+#include <webkit2/webkit2.h>
 
 #include "e-shell.h"
 #include "e-shell-migrate.h"