[epiphany] Bump WebKitGTK+ requirements to 2.3.90 and remove unneeded ifdefs
- From: Carlos Garcia Campos <carlosgc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany] Bump WebKitGTK+ requirements to 2.3.90 and remove unneeded ifdefs
- Date: Mon, 17 Feb 2014 16:43:30 +0000 (UTC)
commit fce56ddda509bba9949079261c99ebc94a868386
Author: Carlos Garcia Campos <cgarcia igalia com>
Date: Mon Feb 17 17:41:11 2014 +0100
Bump WebKitGTK+ requirements to 2.3.90 and remove unneeded ifdefs
configure.ac | 8 +-------
embed/ephy-embed-shell.c | 4 ----
src/ephy-shell.c | 5 +----
3 files changed, 2 insertions(+), 15 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 7e2a9e8..ddeed1f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -69,7 +69,7 @@ GLIB_REQUIRED=2.35.6
GTK_REQUIRED=3.11.4
LIBXML_REQUIRED=2.6.12
LIBXSLT_REQUIRED=1.1.7
-WEBKIT_GTK_REQUIRED=2.3.5
+WEBKIT_GTK_REQUIRED=2.3.90
LIBSOUP_REQUIRED=2.42.1
GNOME_DESKTOP_REQUIRED=2.91.2
LIBSECRET_REQUIRED=0.14
@@ -233,12 +233,6 @@ AC_DEFINE_UNQUOTED([LSB_DISTRIBUTOR],["$LSB_DISTRIBUTOR"],[Distributor name])
AC_DEFINE([EPIPHANY_COMPILATION],[1],[Compiling epiphany])
-# Remove this when new WebKit version is released with this API.
-ephy_save_LIBS=$LIBS
-LIBS="$LIBS $WEB_EXTENSION_LIBS"
-AC_CHECK_FUNCS(webkit_web_view_new_with_related_view)
-LIBS=$ephy_save_LIBS
-
AC_CONFIG_FILES([
Makefile
data/Makefile
diff --git a/embed/ephy-embed-shell.c b/embed/ephy-embed-shell.c
index 07704c0..c902db2 100644
--- a/embed/ephy-embed-shell.c
+++ b/embed/ephy-embed-shell.c
@@ -370,11 +370,7 @@ ephy_embed_shell_setup_process_model (EphyEmbedShell *shell,
webkit_web_context_set_process_model (web_context, WEBKIT_PROCESS_MODEL_SHARED_SECONDARY_PROCESS);
break;
case EPHY_PREFS_PROCESS_MODEL_ONE_SECONDARY_PROCESS_PER_WEB_VIEW:
-#ifdef HAVE_WEBKIT_WEB_VIEW_NEW_WITH_RELATED_VIEW
webkit_web_context_set_process_model (web_context, WEBKIT_PROCESS_MODEL_MULTIPLE_SECONDARY_PROCESSES);
-#else
- webkit_web_context_set_process_model (web_context,
WEBKIT_PROCESS_MODEL_ONE_SECONDARY_PROCESS_PER_WEB_VIEW);
-#endif
break;
}
}
diff --git a/src/ephy-shell.c b/src/ephy-shell.c
index 20aa5e1..ccb2640 100644
--- a/src/ephy-shell.c
+++ b/src/ephy-shell.c
@@ -733,14 +733,11 @@ ephy_shell_new_tab_full (EphyShell *shell,
if (active_is_blank == FALSE) {
GtkWidget *web_view;
-#ifdef HAVE_WEBKIT_WEB_VIEW_NEW_WITH_RELATED_VIEW
if (related_view)
web_view = ephy_web_view_new_with_related_view (related_view);
else
web_view = ephy_web_view_new ();
-#else
- web_view = ephy_web_view_new ();
-#endif
+
embed = EPHY_EMBED (g_object_new (EPHY_TYPE_EMBED, "web-view", web_view, NULL));
g_assert (embed != NULL);
gtk_widget_show (GTK_WIDGET (embed));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]