[epiphany/gnome-3-20] Update for WebKitGTK+ 2.14 unstable DOM API/ABI break



commit 88f3ef095ec13a9e08ec31a0f145b72fea62fe60
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Sat Sep 10 16:46:40 2016 -0500

    Update for WebKitGTK+ 2.14 unstable DOM API/ABI break
    
    There were two API breaks in WebKitDOMDOMTokenList.
    
    Do not provide compatibility with older versions of WebKit, due to the
    several security issues.

 configure.ac                            |    2 +-
 embed/web-extension/ephy-web-overview.c |    6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 845171f..000a348 100644
--- a/configure.ac
+++ b/configure.ac
@@ -73,7 +73,7 @@ GLIB_REQUIRED=2.44.0
 GTK_REQUIRED=3.19.1
 LIBXML_REQUIRED=2.6.12
 LIBXSLT_REQUIRED=1.1.7
-WEBKIT_GTK_REQUIRED=2.11.4
+WEBKIT_GTK_REQUIRED=2.13.2
 LIBSOUP_REQUIRED=2.48.0
 GNOME_DESKTOP_REQUIRED=2.91.2
 LIBSECRET_REQUIRED=0.14
diff --git a/embed/web-extension/ephy-web-overview.c b/embed/web-extension/ephy-web-overview.c
index eb0fe21..0557a5a 100644
--- a/embed/web-extension/ephy-web-overview.c
+++ b/embed/web-extension/ephy-web-overview.c
@@ -145,12 +145,8 @@ ephy_web_overview_model_urls_changed (EphyWebOverviewModel *model,
       item->url = g_strdup (url->url);
 
       class_list = webkit_dom_element_get_class_list (webkit_dom_node_get_parent_element (WEBKIT_DOM_NODE 
(item->anchor)));
-#if WEBKIT_CHECK_VERSION(2, 13, 0)
       if (class_list && webkit_dom_dom_token_list_contains (class_list, "overview-removed"))
-#else
-      if (class_list && webkit_dom_dom_token_list_contains (class_list, "overview-removed", NULL))
-#endif
-        webkit_dom_dom_token_list_remove (class_list, "overview-removed", NULL);
+        webkit_dom_dom_token_list_remove (class_list, NULL, "overview-removed", NULL);
 
       webkit_dom_element_set_attribute (item->anchor, "href", url->url, NULL);
       webkit_dom_element_set_attribute (item->anchor, "title", url->title, NULL);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]