Merge lp:~midori/midori/webKitTwoOnly into lp:midori

[Cris Dywan]

Drop non-WebKit2 code paths

[lp:~midori/midori/webKitTwoOnly]

7102. By gue5t <email address hidden> on 2016-02-10

support user-stylesheet-uri with wk2 by adding a WebKit.UserContentManager to Midori.Settings

7103. By Cris Dywan on 2016-02-17

Use WebExtension without the bindings

[gue5t gue5t (gue5t)]

With these last changes, adblock works, but *only* if I install Midori after building. Running from the uninstalled build directory results in adblock silently not blocking ads.

[lp:~midori/midori/webKitTwoOnly]

7104. By gue5t <email address hidden> on 2016-02-22

Fix four MidoriView/MidoriTab bugs causing popup window opening to segfault or misbehave

Before these changes, clicking the first green arrow on http://javascript.info/tutorial/popup-windows results in a segfault, instead of the expected popup.

There were four bugs here:

1. The constructor for Midori.Tab was mistakenly setting the nonexistent "related" property instead of the "related-view" property.
2. The signature of webkit_web_view_create_web_view_cb did not match the signature of the "create" signal for a WK2 WebKitWebView, causing a WebKitNavigationAction to be used as a MidoriView.
3. The function called when a popup is ready to be shown was asking for the "width" and "height" properties used by WebKitWindowProperties in WK1 rather than the "geometry" property used in WK2.

(Fixing these three resulted in no more crashes, but popups would be empty instead of loading the expected URIs.)

4. An old (WK1, touched in r5389 and r842, originally in 2009) workaround was unconditionally doing "web_view.load_uri ("")" which cancelled the loading of the intended URI for popups.

After the other fixes, removing this workaround results in everything working as expected.

7105. By Cris Dywan on 2016-03-13

Merge lp:midori

7106. By Cris Dywan on 2016-03-21

Use load-failed-with-tls-errors to handle certificate errors

7107. By gue5t <email address hidden> on 2016-09-05

fix theming issues under GTK+ 3.20

7108. By gue5t <email address hidden> on 2016-09-05

partially fix LocationAction dropdown under Wayland

Unmerged revisions

7108. By gue5t <email address hidden> on 2016-09-05

partially fix LocationAction dropdown under Wayland

7107. By gue5t <email address hidden> on 2016-09-05

fix theming issues under GTK+ 3.20

7106. By Cris Dywan on 2016-03-21

Use load-failed-with-tls-errors to handle certificate errors

7105. By Cris Dywan on 2016-03-13

Merge lp:midori

7104. By gue5t <email address hidden> on 2016-02-22

Fix four MidoriView/MidoriTab bugs causing popup window opening to segfault or misbehave

Before these changes, clicking the first green arrow on http://javascript.info/tutorial/popup-windows results in a segfault, instead of the expected popup.

There were four bugs here:

1. The constructor for Midori.Tab was mistakenly setting the nonexistent "related" property instead of the "related-view" property.
2. The signature of webkit_web_view_create_web_view_cb did not match the signature of the "create" signal for a WK2 WebKitWebView, causing a WebKitNavigationAction to be used as a MidoriView.
3. The function called when a popup is ready to be shown was asking for the "width" and "height" properties used by WebKitWindowProperties in WK1 rather than the "geometry" property used in WK2.

(Fixing these three resulted in no more crashes, but popups would be empty instead of loading the expected URIs.)

4. An old (WK1, touched in r5389 and r842, originally in 2009) workaround was unconditionally doing "web_view.load_uri ("")" which cancelled the loading of the intended URI for popups.

After the other fixes, removing this workaround results in everything working as expected.

7103. By Cris Dywan on 2016-02-17

Use WebExtension without the bindings

7102. By gue5t <email address hidden> on 2016-02-10

support user-stylesheet-uri with wk2 by adding a WebKit.UserContentManager to Midori.Settings

7101. By Cris Dywan on 2016-02-07

Drop non-WebKit2 code paths

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-02-04 19:54:52 +0000
+++ CMakeLists.txt	2016-09-20 20:57:01 +0000
@@ -112,13 +112,13 @@
                   sqlite3>=3.6.19
                   gmodule-2.0
                   gio-2.0>=2.32.3
-                  libsoup-gnome-2.4>=2.37.1
+                  libsoup-2.4>=2.42.0
                   )
 add_definitions("-DHAVE_LIBXML")
 add_definitions("-DGIO_VERSION=\"${DEPS_gio-2.0_VERSION}\"")
-add_definitions("-DLIBSOUP_VERSION=\"${DEPS_libsoup-gnome-2.4_VERSION}\"")
-set(PKGS posix linux libxml-2.0 sqlite3 gmodule-2.0 gio-2.0 libsoup-2.4)
-if (${DEPS_libsoup-gnome-2.4_VERSION} VERSION_GREATER "2.40.0")
+add_definitions("-DLIBSOUP_VERSION=\"${DEPS_libsoup-2.4_VERSION}\"")
+set(PKGS posix linux libxml-2.0 sqlite3 gmodule-2.0 gio-2.0 libsoup-2.4 gtk+-3.0)
+if (${DEPS_libsoup-2.4_VERSION} VERSION_GREATER "2.40.0")
     # valac 0.16 didn't have the bindings yet
     # For consistency we need to ensure C code makes the same assumptions
     if (${VALA_VERSION} VERSION_GREATER "0.17.0")
@@ -126,7 +126,7 @@
         set(VALAFLAGS ${VALAFLAGS} -D HAVE_LIBSOUP_2_40_0)
     endif ()
 endif ()
-if (${DEPS_libsoup-gnome-2.4_VERSION} VERSION_GREATER "2.48.0")
+if (${DEPS_libsoup-2.4_VERSION} VERSION_GREATER "2.48.0")
     add_definitions("-DHAVE_LIBSOUP_2_48_0")
     set(VALAFLAGS ${VALAFLAGS} -D HAVE_LIBSOUP_2_48_0)
 endif ()
@@ -142,21 +142,14 @@
     set(PKGS ${PKGS} libnotify)
 endif ()
 
-option(USE_GTK3 "Use GTK+3" OFF)
-option(HALF_BRO_INCOM_WEBKIT2 "Serve as a guniea pig" OFF)
 option(USE_ZEITGEIST "Zeitgeist history integration" ON)
 option(USE_GRANITE "Fancy notebook and pop-overs" OFF)
 option(USE_APIDOCS "API documentation" OFF)
 option(USE_GIR "Generate GObject Introspection bindings" OFF)
 option(EXTRA_WARNINGS "Additional compiler warnings" OFF)
 
-# GTK+3 is implied here, whether set or not
-if (USE_GRANITE OR HALF_BRO_INCOM_WEBKIT2)
-    set(USE_GTK3 ON)
-endif ()
-
 if (USE_GRANITE)
-    pkg_check_modules(GRANITE granite>=0.2)
+	pkg_check_modules(GRANITE REQUIRED granite>=0.2)
     set(OPTS_INCLUDE_DIRS "${OPTS_INCLUDE_DIRS};${GRANITE_INCLUDE_DIRS}")
     set(OPTS_LIBRARIES "${OPTS_LIBRARIES};${GRANITE_LIBRARIES}")
     add_definitions("-DHAVE_GRANITE")
@@ -178,53 +171,25 @@
 if (WIN32)
     add_definitions("-DGCR_VERSION=\"No\"")
 else ()
-    if (USE_GTK3)
-        pkg_check_modules(GCR REQUIRED gcr-3>=2.32)
-    else ()
-        pkg_check_modules(GCR REQUIRED gcr-base-3>=2.32)
-    endif ()
+    pkg_check_modules(GCR REQUIRED gcr-3>=2.32)
     add_definitions("-DGCR_VERSION=\"${GCR_VERSION}\"")
     add_definitions("-DHAVE_GCR")
     set(OPTS_INCLUDE_DIRS ${OPTS_INCLUDE_DIRS} ${GCR_INCLUDE_DIRS})
     set(OPTS_LIBRARIES ${OPTS_LIBRARIES} ${GCR_LIBRARIES})
 endif ()
 
-if (HALF_BRO_INCOM_WEBKIT2)
-    pkg_check_modules(DEPS_GTK REQUIRED
-                      gtk+-3.0>=3.10.0
-                      webkit2gtk-4.0>=2.3.91
-                      )
-    add_definitions("-DHAVE_WEBKIT2")
-    add_definitions("-DGTK_VERSION=\"${DEPS_GTK_gtk+-3.0_VERSION}\"")
-    add_definitions("-DWEBKIT_VERSION=\"${DEPS_GTK_webkit2gtk-4.0_VERSION}\"")
-    set(PKGS ${PKGS} gtk+-3.0)
-    # set(EXTRA_VAPIS ${EXTRA_VAPIS} "${CMAKE_SOURCE_DIR}/midori/webkit2gtk-web-extension-4.0.vapi")
-    set(EXTRA_VAPIS ${EXTRA_VAPIS} "${CMAKE_SOURCE_DIR}/midori/webkit2gtk-4.0.vapi")
-    set(VALAFLAGS ${VALAFLAGS} -D HAVE_GTK3)
-    set(VALAFLAGS ${VALAFLAGS} -D HAVE_WEBKIT2)
-        set(VALAFLAGS ${VALAFLAGS} -D HAVE_WEBKIT2_3_91)
-elseif (USE_GTK3)
-    pkg_check_modules(DEPS_GTK REQUIRED
-                      gtk+-3.0>=3.10.0
-                      webkitgtk-3.0>=1.8.1
-                      javascriptcoregtk-3.0
-                      )
-    add_definitions("-DGTK_VERSION=\"${DEPS_GTK_gtk+-3.0_VERSION}\"")
-    add_definitions("-DWEBKIT_VERSION=\"${DEPS_GTK_webkitgtk-3.0_VERSION}\"")
-    set(PKGS ${PKGS} gtk+-3.0)
-    set(EXTRA_VAPIS ${EXTRA_VAPIS} "${CMAKE_SOURCE_DIR}/midori/webkitgtk-3.0.vapi")
-    set(VALAFLAGS ${VALAFLAGS} -D HAVE_GTK3)
-else ()
-    pkg_check_modules(DEPS_GTK REQUIRED
-                      gtk+-2.0>=2.24.0
-                      webkit-1.0>=1.8.1
-                      javascriptcoregtk-1.0
-                      )
-    add_definitions("-DGTK_VERSION=\"${DEPS_GTK_gtk+-2.0_VERSION}\"")
-    add_definitions("-DWEBKIT_VERSION=\"${DEPS_GTK_webkit-1.0_VERSION}\"")
-    set(PKGS ${PKGS} gtk+-2.0)
-    set(EXTRA_VAPIS ${EXTRA_VAPIS} "${CMAKE_SOURCE_DIR}/midori/webkitgtk-3.0.vapi")
-endif ()
+pkg_check_modules(DEPS_GTK REQUIRED
+                  gtk+-3.0>=3.10.0
+                  webkit2gtk-4.0>=2.3.91
+                  )
+add_definitions("-DHAVE_WEBKIT2")
+add_definitions("-DGTK_VERSION=\"${DEPS_GTK_gtk+-3.0_VERSION}\"")
+add_definitions("-DWEBKIT_VERSION=\"${DEPS_GTK_webkit2gtk-4.0_VERSION}\"")
+# set(EXTRA_VAPIS ${EXTRA_VAPIS} "${CMAKE_SOURCE_DIR}/midori/webkit2gtk-web-extension-4.0.vapi")
+set(EXTRA_VAPIS ${EXTRA_VAPIS} "${CMAKE_SOURCE_DIR}/midori/webkit2gtk-4.0.vapi")
+set(VALAFLAGS ${VALAFLAGS} -D HAVE_GTK3)
+set(VALAFLAGS ${VALAFLAGS} -D HAVE_WEBKIT2)
+set(VALAFLAGS ${VALAFLAGS} -D HAVE_WEBKIT2_3_91)
 set(EXTRA_VAPIS ${EXTRA_VAPIS} "${CMAKE_SOURCE_DIR}/katze/katze.vapi")
 
 # dh_translations detects this if there's no variable used

=== modified file 'data/gtk3.css'
--- data/gtk3.css	2014-01-13 22:55:08 +0000
+++ data/gtk3.css	2016-09-20 20:57:01 +0000
@@ -1,9 +1,4 @@
 .notebook tab .button {
-    -GtkButton-default-border: 0;
-    -GtkButton-default-outside-border: 0;
-    -GtkButton-inner-border: 0;
-    -GtkWidget-focus-line-width: 0;
-    -GtkWidget-focus-padding: 0;
     padding: 0;
     border-width: 1px 1px 0 0;
 }
@@ -23,7 +18,7 @@
 /* Kill grey backround on inactive buttons */
 GtkDrawingArea,
 GtkImage,
-GtkImage:insensitive,
+GtkImage:disabled,
 GtkImage:selected {
     background-color: @transparent;
 }

=== modified file 'extensions/CMakeLists.txt'
--- extensions/CMakeLists.txt	2015-04-19 14:06:12 +0000
+++ extensions/CMakeLists.txt	2016-09-20 20:57:01 +0000
@@ -13,17 +13,15 @@
                     "${CMAKE_BINARY_DIR}/midori"
                     )
 file(GLOB EXTENSIONS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *)
-if (HALF_BRO_INCOM_WEBKIT2)
-    list(REMOVE_ITEM EXTENSIONS
-         "cookie-permissions"
-         "addons.c"
-         "formhistory"
-         "external-download-manager.vala"
-         "nojs"
-         "nsplugin-manager.vala"
-         "tabs2one.c"
-         )
-endif ()
+list(REMOVE_ITEM EXTENSIONS
+     "cookie-permissions"
+     "addons.c"
+     "formhistory"
+     "external-download-manager.vala"
+     "nojs"
+     "nsplugin-manager.vala"
+     "tabs2one.c"
+     )
 
 # FIXME: re-enable webmedia extension
 # once we have working notifications on win

=== modified file 'extensions/about.vala'
--- extensions/about.vala	2015-06-11 22:33:48 +0000
+++ extensions/about.vala	2016-09-20 20:57:01 +0000
@@ -15,11 +15,7 @@
         public abstract string uri { get; set; }
         public abstract void get_contents (Midori.View view, string uri);
         protected void load_html (Midori.View view, string content, string uri) {
-            #if HAVE_WEBKIT2 
                 view.web_view.load_html (content, uri);
-            #else
-                view.web_view.load_html_string (content, uri);
-            #endif
         }
     }
 

=== modified file 'extensions/adblock/extension.vala'
--- extensions/adblock/extension.vala	2016-02-01 19:48:47 +0000
+++ extensions/adblock/extension.vala	2016-09-20 20:57:01 +0000
@@ -55,22 +55,20 @@
         internal string? js_hider_function_body;
 #endif
 
-#if HAVE_WEBKIT2
-#if !HAVE_WEBKIT2_3_91
-        public Extension.WebExtension (WebKit.WebExtension web_extension) {
-            init ();
-            web_extension.page_created.connect (page_created);
-        }
-
-        void page_created (WebKit.WebPage web_page) {
-            web_page.send_request.connect (send_request);
-        }
-
-        bool send_request (WebKit.WebPage web_page, WebKit.URIRequest request, WebKit.URIResponse? redirected_response) {
-            return request_handled (request.uri, web_page.uri);
-        }
-#endif
-#endif
+        public Extension.WebExtension (GLib.Object extension) {
+            Midori.Paths.init_exec_path ({"/usr/share"});
+            extension.connect ("signal::page-created", page_created, null);
+        }
+
+        void page_created (GLib.Object page) {
+            page.connect ("signal::send-request", send_request, page);
+        }
+
+        bool send_request (WebKit.URIRequest request, WebKit.URIResponse? redirected_response, GLib.Object page) {
+            string uri;
+            page.get ("uri", out uri);
+            return request_handled (request.uri, uri);
+        }
 
         public Extension () {
             GLib.Object (name: _("Advertisement blocker"),
@@ -87,7 +85,6 @@
         }
 
         void extension_activated (Midori.App app) {
-#if HAVE_WEBKIT2
             string cache_dir = Environment.get_user_cache_dir ();
             string wk2path = Path.build_path (Path.DIR_SEPARATOR_S, cache_dir, "wk2ext");
             Midori.Paths.mkdir_with_parents (wk2path);
@@ -101,7 +98,6 @@
             } catch (Error error) {
                 critical ("Failed to create WebKit2 link: %s", error.message);
             }
-#endif
             init ();
             foreach (var browser in app.get_browsers ())
                 browser_added (browser);
@@ -136,17 +132,11 @@
 
         void tab_added (Midori.View view) {
             view.navigation_requested.connect (navigation_requested);
-#if !HAVE_WEBKIT2
-            view.web_view.resource_request_starting.connect (resource_requested);
-#endif
             view.notify["load-status"].connect (load_status_changed);
             view.context_menu.connect (context_menu);
         }
 
         void tab_removed (Midori.View view) {
-#if !HAVE_WEBKIT2
-            view.web_view.resource_request_starting.disconnect (resource_requested);
-#endif
             view.navigation_requested.disconnect (navigation_requested);
             view.notify["load-status"].disconnect (load_status_changed);
             view.context_menu.disconnect (context_menu);
@@ -179,23 +169,6 @@
             menu.add (action);
         }
 
-#if !HAVE_WEBKIT2
-        void resource_requested (WebKit.WebView web_view, WebKit.WebFrame frame,
-            WebKit.WebResource resource, WebKit.NetworkRequest request, WebKit.NetworkResponse? response) {
-           
-            WebKit.WebFrame main_frame = web_view.get_main_frame ();
-
-            WebKit.WebDataSource? ds = main_frame.get_provisional_data_source ();
-            WebKit.NetworkRequest? main_frame_request = (ds != null) ? ds.get_request () : null;
-            string? main_frame_uri = (main_frame_request != null) ? main_frame_request.uri : null;
-
-            bool is_main_frame_request = (frame == main_frame) && (request.uri == main_frame_uri);
-            if (!is_main_frame_request && request_handled (request.uri, web_view.uri)) {
-                request.set_uri ("about:blank");
-            }
-        }
-#endif
-
         bool navigation_requested (Midori.Tab tab, string uri) {
             if (uri.has_prefix ("abp:")) {
                 string parsed_uri = parse_subscription_uri (uri);
@@ -346,7 +319,7 @@
 
         internal void init () {
             hider_selectors = new StringBuilder ();
-            load_config ();
+            config = load_config ();
             manager = new SubscriptionManager (config);
             status_icon = new StatusIcon (config, manager);
             foreach (unowned Subscription sub in config) {
@@ -374,29 +347,26 @@
             hider_selectors = new StringBuilder ();
         }
 
-        void load_config () {
-#if HAVE_WEBKIT2
+        static Config load_config () {
             string config_dir = Path.build_filename (GLib.Environment.get_user_config_dir (), PACKAGE_NAME, "extensions", "libadblock." + GLib.Module.SUFFIX);
             Midori.Paths.mkdir_with_parents (config_dir);
-#else
-            string config_dir = Midori.Paths.get_extension_config_dir ("adblock");
-#endif
             string presets = Midori.Paths.get_extension_preset_filename ("adblock", "config");
             string filename = Path.build_filename (config_dir, "config");
-            config = new Config (filename, presets);
+            var config = new Config (filename, presets);
             string custom_list = GLib.Path.build_filename (config_dir, "custom.list");
             try {
-                custom = new Subscription (Filename.to_uri (custom_list, null));
+                var custom = new Subscription (Filename.to_uri (custom_list, null));
                 custom.mutable = false;
                 custom.title = _("Custom");
                 config.add (custom);
             } catch (Error error) {
-                custom = null;
                 warning ("Failed to add custom list %s: %s", custom_list, error.message);
             }
+            return config;
         }
 
-        public Adblock.Directive get_directive_for_uri (string request_uri, string page_uri) {
+        static Adblock.Directive get_directive_for_uri (string request_uri, string page_uri) {
+            var config = load_config ();
             if (!config.enabled)
                 return Directive.ALLOW;
 
@@ -422,11 +392,11 @@
             if (directive == null)
                 directive = Directive.ALLOW;
             else if (directive == Directive.BLOCK) {
-                status_icon.set_state (State.BLOCKED);
+                // FIXME: status_icon.set_state (State.BLOCKED);
 #if USE_CSS_SELECTOR_FOR_BLOCKED_RESOURCES
-                hider_selectors.append ("img[src*=\"%s\"] , iframe[src*=\"%s\"] , ".printf (request_uri, request_uri));
+                // FIXME: hider_selectors.append ("img[src*=\"%s\"] , iframe[src*=\"%s\"] , ".printf (request_uri, request_uri));
 #else
-                hider_selectors.append (" uris.push ('%s');\n".printf (request_uri));
+                // FIXME: hider_selectors.append (" uris.push ('%s');\n".printf (request_uri));
 #endif
             }
             return directive;
@@ -482,14 +452,10 @@
     }
 }
 
-#if HAVE_WEBKIT2
-#if !HAVE_WEBKIT2_3_91
 Adblock.Extension? filter;
-public static void webkit_web_extension_initialize (WebKit.WebExtension web_extension) {
-    filter = new Adblock.Extension.WebExtension (web_extension);
+public static void webkit_web_extension_initialize (GLib.Object extension) {
+    filter = new Adblock.Extension.WebExtension (extension);
 }
-#endif
-#endif
 
 public Midori.Extension extension_init () {
     return new Adblock.Extension ();

=== modified file 'extensions/adblock/subscriptions.vala'
--- extensions/adblock/subscriptions.vala	2015-06-12 21:43:40 +0000
+++ extensions/adblock/subscriptions.vala	2016-09-20 20:57:01 +0000
@@ -40,9 +40,6 @@
         public Options optslist;
         public Whitelist whitelist;
         public Element element;
-#if !HAVE_WEBKIT2
-        WebKit.Download? download;
-#endif
 
         public Subscription (string uri) {
             debug_parse = "adblock:parse" in (Environment.get_variable ("MIDORI_DEBUG") ?? "");
@@ -292,20 +289,6 @@
             }
         }
 
-#if !HAVE_WEBKIT2
-        void download_status (ParamSpec pspec) {
-            if (download.get_status () != WebKit.DownloadStatus.FINISHED)
-                return;
-
-            download = null;
-            try {
-                parse ();
-            } catch (Error error) {
-                warning ("Error parsing %s: %s", uri, error.message);
-            }
-        }
-#endif
-
         public void parse () throws Error
         {
             if (!active)
@@ -329,24 +312,7 @@
             try  {
                 stream = new DataInputStream (filter_file.read ());
             } catch (IOError.NOT_FOUND exist_error) {
-#if HAVE_WEBKIT2
                 /* TODO */
-#else
-                /* Don't bother trying to download local files */
-                if (!uri.has_prefix ("file://")) {
-                    if (download != null)
-                        return;
-
-                    string destination_uri = Filename.to_uri (path, null);
-                    debug ("Fetching %s to %s now", uri, destination_uri);
-                    download = new WebKit.Download (new WebKit.NetworkRequest (uri));
-                    if (!Midori.Download.has_enough_space (download, destination_uri, true))
-                         throw new FileError.EXIST ("Can't download to \"%s\"", path);
-                    download.destination_uri = destination_uri;
-                    download.notify["status"].connect (download_status);
-                    download.start ();
-                }
-#endif
                 return;
             }
 

=== modified file 'extensions/addons.c'
--- extensions/addons.c	2015-04-15 22:51:01 +0000
+++ extensions/addons.c	2016-09-20 20:57:01 +0000
@@ -1599,7 +1599,7 @@
     MidoriApp* app = midori_extension_get_app (extension);
     MidoriWebSettings* settings = katze_object_get_object (app, "settings");
     gchar* data = addons_generate_global_stylesheet (extension);
-    midori_web_settings_add_style (settings, "addons", data);
+    midori_settings_add_style (MIDORI_SETTINGS (settings), "addons", data);
     g_free (data);
     g_object_unref (settings);
 }
@@ -1738,7 +1738,7 @@
 
     addons_disable_monitors (extension);
     addons_save_settings (NULL, extension);
-    midori_web_settings_remove_style (settings, "addons");
+    midori_settings_remove_style (MIDORI_SETTINGS (settings), "addons");
 
     browsers = katze_object_get_object (app, "browsers");
     KATZE_ARRAY_FOREACH_ITEM (browser, browsers)
@@ -1860,7 +1860,7 @@
     addons_update_elements (extension, ADDONS_USER_SCRIPTS);
     addons_monitor_directories (extension, ADDONS_USER_SCRIPTS);
     data = addons_generate_global_stylesheet (extension);
-    midori_web_settings_add_style (settings, "addons", data);
+    midori_settings_add_style (MIDORI_SETTINGS (settings), "addons", data);
 
     KATZE_ARRAY_FOREACH_ITEM (browser, browsers)
         addons_app_add_browser_cb (app, browser, extension);

=== modified file 'extensions/colorful-tabs.c'
--- extensions/colorful-tabs.c	2016-02-24 21:45:09 +0000
+++ extensions/colorful-tabs.c	2016-09-20 20:57:01 +0000
@@ -244,11 +244,6 @@
 void
 extension_test (void)
 {
-    #ifndef HAVE_WEBKIT2
-    g_object_set_data (G_OBJECT (webkit_get_default_session ()),
-                       "midori-session-initialized", (void*)1);
-    #endif
-
     /* TODO: Add test which uses favicon codepath */
 
     g_test_add_func ("/extensions/colorful_tabs/hostname_colour", test_colour_for_hostname);

=== modified file 'extensions/cookie-manager/cookie-manager.c'
--- extensions/cookie-manager/cookie-manager.c	2013-07-29 21:05:02 +0000
+++ extensions/cookie-manager/cookie-manager.c	2016-09-20 20:57:01 +0000
@@ -12,7 +12,7 @@
 #include "config.h"
 #include <midori/midori.h>
 #include "katze/katze.h"
-#include <libsoup/soup-cookie-jar-sqlite.h>
+#include <libsoup/soup-cookie-jar-db.h>
 
 #include "cookie-manager.h"
 #include "cookie-manager-page.h"
@@ -280,15 +280,9 @@
 		COOKIE_MANAGER_COL_NAME, GTK_SORT_ASCENDING);
 
 	/* setup soup */
-#ifdef HAVE_WEBKIT2
 	gchar *filename = midori_paths_get_config_filename_for_writing ("cookies.db");
-	priv->jar = soup_cookie_jar_sqlite_new (filename, FALSE);
+	priv->jar = soup_cookie_jar_db_new (filename, FALSE);
 	g_free(filename);
-#else
-	SoupSession *session = webkit_get_default_session();
-	priv->jar = SOUP_COOKIE_JAR(soup_session_get_feature(session, soup_cookie_jar_get_type()));
-	g_object_ref(priv->jar);
-#endif
 	g_signal_connect(priv->jar, "changed", G_CALLBACK(cookie_manager_jar_changed_cb), self);
 
 	cookie_manager_refresh_store(self);

=== modified file 'extensions/external-download-manager.vala'
--- extensions/external-download-manager.vala	2015-08-20 06:18:50 +0000
+++ extensions/external-download-manager.vala	2016-09-20 20:57:01 +0000
@@ -36,16 +36,8 @@
             if (download_type == Midori.DownloadType.SAVE) {
                 var dlReq = new DownloadRequest ();
 
-                #if HAVE_WEBKIT2
                 dlReq.uri = download.request.get_uri ();
                 weak Soup.MessageHeaders headers = download.request.get_http_headers ();
-                #else
-                dlReq.uri = download.get_uri ();
-                var request = download.get_network_request ();
-                var message = request.get_message ();
-                weak Soup.MessageHeaders headers = message.request_headers;
-                #endif
-
                 dlReq.auth = headers.get ("Authorization");
                 dlReq.referer = headers.get ("Referer");
                 dlReq.cookie_header = this.cookie_jar.get_cookies (new Soup.URI (dlReq.uri), true);
@@ -101,11 +93,7 @@
         }
 
         construct {
-            #if HAVE_WEBKIT2
             var session= new Session ();
-            #else
-            var session = WebKit.get_default_session ();
-            #endif
             this.cookie_jar = session.get_feature (typeof (Soup.CookieJar)) as Soup.CookieJar;
         }
     }

=== modified file 'extensions/feed-panel/feed-panel.c'
--- extensions/feed-panel/feed-panel.c	2013-10-25 21:49:56 +0000
+++ extensions/feed-panel/feed-panel.c	2016-09-20 20:57:01 +0000
@@ -589,31 +589,6 @@
     return MIDORI_EVENT_CONTEXT_MENU (event);
 }
 
-#ifndef HAVE_WEBKIT2
-static gboolean
-webview_navigation_request_cb (WebKitWebView*             web_view,
-                               WebKitWebFrame*            frame,
-                               WebKitNetworkRequest*      request,
-                               WebKitWebNavigationAction* navigation_action,
-                               WebKitWebPolicyDecision*   policy_decision,
-                               FeedPanel*                 panel)
-{
-    if (webkit_web_navigation_action_get_reason (navigation_action) ==
-        WEBKIT_WEB_NAVIGATION_REASON_LINK_CLICKED)
-    {
-        MidoriBrowser* browser = midori_browser_get_for_widget (GTK_WIDGET (panel));
-        const gchar* uri = webkit_network_request_get_uri (request);
-        GtkWidget* view = midori_browser_add_uri (browser, uri);
-        midori_browser_set_current_tab (browser, view);
-        webkit_web_policy_decision_ignore (policy_decision);
-
-        return TRUE;
-    }
-
-    return FALSE;
-}
-#endif
-
 static const gchar*
 feed_panel_get_label (MidoriViewable* viewable)
 {
@@ -800,12 +775,8 @@
                       NULL);
     gtk_widget_show (treeview);
 
-#if GTK_CHECK_VERSION(3,0,0)
     font_desc = (PangoFontDescription*)gtk_style_context_get_font (
         gtk_widget_get_style_context (treeview), GTK_STATE_FLAG_NORMAL);
-#else
-    font_desc = treeview->style->font_desc;
-#endif
     family = pango_font_description_get_family (font_desc);
     size = pango_font_description_get_size (font_desc) / PANGO_SCALE;
     settings = midori_web_settings_new ();
@@ -814,10 +785,6 @@
     webview = midori_view_new_with_item (NULL, settings);
     gtk_widget_set_size_request (webview, -1, 50);
     g_object_connect (midori_tab_get_web_view (MIDORI_TAB (webview)),
-                      #ifndef HAVE_WEBKIT2
-                      "signal::navigation-policy-decision-requested",
-                      webview_navigation_request_cb, panel,
-                      #endif
                       "signal::button-press-event",
                       webview_button_press_event_cb, NULL,
                       "signal::button-release-event",

=== modified file 'extensions/feed-panel/katze-net.c'
--- extensions/feed-panel/katze-net.c	2013-08-02 17:42:29 +0000
+++ extensions/feed-panel/katze-net.c	2016-09-20 20:57:01 +0000
@@ -66,85 +66,6 @@
     KatzeNetRequest* request;
 } KatzeNetPriv;
 
-#ifndef HAVE_WEBKIT2
-static void
-katze_net_priv_free (KatzeNetPriv* priv)
-{
-    KatzeNetRequest* request = priv->request;
-    g_free (request->uri);
-    g_free (request->mime_type);
-    g_free (request->data);
-    g_slice_free (KatzeNetRequest, request);
-    g_slice_free (KatzeNetPriv, priv);
-}
-
-static void
-katze_net_got_body_cb (SoupMessage*  msg,
-                       KatzeNetPriv* priv);
-
-static void
-katze_net_got_headers_cb (SoupMessage*  msg,
-                          KatzeNetPriv* priv)
-{
-    KatzeNetRequest* request = priv->request;
-
-    switch (msg->status_code)
-    {
-    case 200:
-        request->status = KATZE_NET_VERIFIED;
-        break;
-    case 301:
-        request->status = KATZE_NET_MOVED;
-        break;
-    default:
-        request->status = KATZE_NET_NOT_FOUND;
-    }
-
-    if (!priv->status_cb (request, priv->user_data))
-    {
-        g_signal_handlers_disconnect_by_func (msg, katze_net_got_headers_cb, priv);
-        g_signal_handlers_disconnect_by_func (msg, katze_net_got_body_cb, priv);
-        soup_session_cancel_message (webkit_get_default_session (), msg, 1);
-    }
-}
-
-static void
-katze_net_got_body_cb (SoupMessage*  msg,
-                       KatzeNetPriv* priv)
-{
-    KatzeNetRequest* request = priv->request;
-
-    if (msg->response_body->length > 0)
-    {
-        request->data = g_memdup (msg->response_body->data,
-                                  msg->response_body->length);
-        request->length = msg->response_body->length;
-    }
-
-    priv->transfer_cb (request, priv->user_data);
-}
-
-static void
-katze_net_finished_cb (SoupMessage*  msg,
-                       KatzeNetPriv* priv)
-{
-    katze_net_priv_free (priv);
-}
-
-static gboolean
-katze_net_default_cb (KatzeNetPriv* priv)
-{
-    KatzeNetRequest* request;
-
-    request = priv->request;
-    request->status = KATZE_NET_NOT_FOUND;
-    if (priv->status_cb)
-        priv->status_cb (request, priv->user_data);
-    katze_net_priv_free (priv);
-    return FALSE;
-}
-#endif
-
 /**
  * katze_net_load_uri:
  * @net: a #KatzeNet, or %NULL
@@ -172,43 +93,5 @@
                     KatzeNetTransferCb transfer_cb,
                     gpointer           user_data)
 {
-#ifndef HAVE_WEBKIT2
-    KatzeNetRequest* request;
-    KatzeNetPriv* priv;
-    SoupMessage* msg;
-
-    g_return_if_fail (uri != NULL);
-
-    if (!status_cb && !transfer_cb)
-        return;
-
-    request = g_slice_new (KatzeNetRequest);
-    request->uri = g_strdup (uri);
-    request->mime_type = NULL;
-    request->data = NULL;
-
-    priv = g_slice_new (KatzeNetPriv);
-    priv->status_cb = status_cb;
-    priv->transfer_cb = transfer_cb;
-    priv->user_data = user_data;
-    priv->request = request;
-
-    if (midori_uri_is_http (uri))
-    {
-        msg = soup_message_new ("GET", uri);
-        if (status_cb)
-            g_signal_connect (msg, "got-headers",
-                G_CALLBACK (katze_net_got_headers_cb), priv);
-        if (transfer_cb)
-            g_signal_connect (msg, "got-body",
-                G_CALLBACK (katze_net_got_body_cb), priv);
-        g_signal_connect (msg, "finished",
-            G_CALLBACK (katze_net_finished_cb), priv);
-        soup_session_queue_message (webkit_get_default_session (), msg, NULL, NULL);
-        return;
-    }
-
-    g_idle_add ((GSourceFunc)katze_net_default_cb, priv);
-#endif
 }
 

=== modified file 'extensions/notes.vala'
--- extensions/notes.vala	2015-03-18 21:18:11 +0000
+++ extensions/notes.vala	2016-09-20 20:57:01 +0000
@@ -385,11 +385,6 @@
         }
 
         void add_menu_items (Midori.Tab tab, WebKit.HitTestResult hit_test_result, Midori.ContextAction menu) {
-#if !HAVE_WEBKIT2
-            if ((hit_test_result.context & WebKit.HitTestResultContext.SELECTION) == 0)
-                return;
-#endif
-
             var view = tab as Midori.View;
             var action = new Gtk.Action ("Notes", _("Copy selection as note"), null, null);
             action.activate.connect ((action)=> {

=== modified file 'extensions/open-with.vala'
--- extensions/open-with.vala	2016-02-17 20:26:51 +0000
+++ extensions/open-with.vala	2016-09-20 20:57:01 +0000
@@ -663,33 +663,7 @@
 
         /* Returns %TRUE if the attempt to download and open failed immediately, %FALSE otherwise */
         bool open_with_type (string uri, string content_type, Gtk.Widget widget, NextStep next_step) {
-            #if HAVE_WEBKIT2
             return open_now (uri, content_type, widget, next_step);
-            #else
-            if (!Midori.URI.is_http (uri))
-                return open_now (uri, content_type, widget, next_step);
-            /* Don't download websites */
-            if (content_type == "application/octet-stream")
-                return open_now (uri, content_type, widget, next_step);
-
-            var download = new WebKit.Download (new WebKit.NetworkRequest (uri));
-            download.destination_uri = Midori.Download.prepare_destination_uri (download, null);
-            if (!Midori.Download.has_enough_space (download, download.destination_uri))
-                return false;
-
-            download.notify["status"].connect ((pspec) => {
-                if (download.status == WebKit.DownloadStatus.FINISHED) {
-                    open_now (download.destination_uri, content_type, widget, next_step);
-                }
-                else if (download.status == WebKit.DownloadStatus.ERROR)
-                    Midori.show_message_dialog (Gtk.MessageType.ERROR,
-                        _("Download error"),
-                        _("Cannot open '%s' because the download failed."
-                          ).printf (download.destination_uri), false);
-            });
-            download.start ();
-            return true;
-            #endif
         }
 
         /* If @next_step is %NextStep.TRY_OPEN, tries to pick a handler automatically.
@@ -730,7 +704,6 @@
                 });
                 menu.add (action);
             }
-#if !HAVE_WEBKIT2
             if ((hit_test_result.context & WebKit.HitTestResultContext.IMAGE) != 0) {
                 string uri = hit_test_result.image_uri;
                 var action = new Gtk.Action ("OpenImageInViewer", _("Open in Image _Viewer"), null, null);
@@ -739,7 +712,6 @@
                 });
                 menu.add (action);
             }
-#endif
         }
 
         void show_preferences (Katze.Preferences preferences) {

=== modified file 'extensions/transfers.vala'
--- extensions/transfers.vala	2016-04-02 08:15:11 +0000
+++ extensions/transfers.vala	2016-09-20 20:57:01 +0000
@@ -36,23 +36,11 @@
         internal double progress { get {
             return Midori.Download.get_progress (download);
         } }
-#if HAVE_WEBKIT2
         public bool succeeded { get; protected set; default = false; }
         public bool finished { get; protected set; default = false; }
         internal string destination { get {
             return download.destination;
         } }
-#else
-        internal bool succeeded { get {
-            return download.status == WebKit.DownloadStatus.FINISHED;
-        } }
-        internal bool finished { get {
-            return Midori.Download.is_finished (download);
-        } }
-        internal string destination { get {
-            return download.destination_uri;
-        } }
-#endif
 
         internal Transfer (WebKit.Download download) {
             poll_source = Timeout.add(1000/10, () => {
@@ -60,7 +48,6 @@
                 return true;
             });
             this.download = download;
-            #if HAVE_WEBKIT2
             download.finished.connect (() => {
                 succeeded = finished = true;
                 changed ();
@@ -74,15 +61,6 @@
                 Source.remove (poll_source);
                 poll_source = 0;
             });
-            #else
-            download.notify["status"].connect (() => {
-                changed ();
-                if (download.status == WebKit.DownloadStatus.FINISHED || download.status == WebKit.DownloadStatus.ERROR) {
-                    Source.remove (poll_source);
-                    poll_source = 0;
-                }
-            });
-            #endif
         }
     }
 

=== modified file 'katze/katze-item.c'
--- katze/katze-item.c	2015-08-10 02:44:13 +0000
+++ katze/katze-item.c	2016-09-20 20:57:01 +0000
@@ -459,34 +459,11 @@
 static void
 katze_item_image_destroyed_cb (GtkWidget* image,
                                KatzeItem* item);
-#ifndef HAVE_WEBKIT2
-static void
-katze_item_icon_loaded_cb (WebKitFaviconDatabase* database,
-                           const gchar*           frame_uri,
-                           GtkWidget*             image)
-{
-    KatzeItem* item = g_object_get_data (G_OBJECT (image), "KatzeItem");
-    GdkPixbuf* pixbuf;
-    if (!g_strcmp0 (frame_uri, item->uri)
-      && (pixbuf = midori_paths_get_icon (frame_uri, image)))
-    {
-        gtk_image_set_from_pixbuf (GTK_IMAGE (image), pixbuf);
-        g_object_unref (pixbuf);
-        /* This signal fires extremely often (WebKit bug?)
-           we must throttle it (disconnect) once we have an icon */
-        katze_item_image_destroyed_cb (image, g_object_ref (item));
-    }
-}
-#endif
 
 static void
 katze_item_image_destroyed_cb (GtkWidget* image,
                                KatzeItem* item)
 {
-#ifndef HAVE_WEBKIT2
-    g_signal_handlers_disconnect_by_func (webkit_get_favicon_database (),
-        katze_item_icon_loaded_cb, image);
-#endif
     g_object_unref (item);
 }
 
@@ -521,10 +498,6 @@
     g_object_set_data (G_OBJECT (image), "KatzeItem", g_object_ref (item));
     g_signal_connect (image, "destroy",
         G_CALLBACK (katze_item_image_destroyed_cb), item);
-#ifndef HAVE_WEBKIT2
-    g_signal_connect (webkit_get_favicon_database (), "icon-loaded",
-        G_CALLBACK (katze_item_icon_loaded_cb), image);
-#endif
     return image;
 }
 

=== modified file 'katze/katze.h'
--- katze/katze.h	2013-10-22 22:38:26 +0000
+++ katze/katze.h	2016-09-20 20:57:01 +0000
@@ -18,11 +18,6 @@
 #include "katze-array.h"
 #include "katze-arrayaction.h"
 #include "katze-preferences.h"
-
-#ifndef HAVE_WEBKIT2
-    #include <webkit/webkit.h>
-#else
-    #include <webkit2/webkit2.h>
-#endif
+#include <webkit2/webkit2.h>
 
 #endif /* __KATZE_H__ */

=== modified file 'katze/midori-paths.vala'
--- katze/midori-paths.vala	2016-01-15 19:18:17 +0000
+++ katze/midori-paths.vala	2016-09-20 20:57:01 +0000
@@ -134,11 +134,9 @@
                 tmp_dir = get_runtime_dir ();
             }
             else {
-#if HAVE_WEBKIT2_3_91
                 /* Allow WebKit to spawn more than one rendering process */
                 if (!("wk2:no-multi-render-process" in (Environment.get_variable ("MIDORI_DEBUG") ?? "")))
                     WebKit.WebContext.get_default ().set_process_model (WebKit.ProcessModel.MULTIPLE_SECONDARY_PROCESSES);
-#endif
                 string? real_config = config != null && !Path.is_absolute (config)
                     ? Path.build_filename (Environment.get_current_dir (), config) : config;
                 config_dir = real_config ?? Path.build_path (Path.DIR_SEPARATOR_S,
@@ -148,11 +146,10 @@
                 user_data_dir = Environment.get_user_data_dir ();
                 tmp_dir = get_runtime_dir ();
             }
-#if HAVE_WEBKIT2
             if (cache_dir != null) {
                 /* Cache and extension dir MUST be set no later than here to work */
                 WebKit.WebContext.get_default ().set_web_extensions_directory (
-                    Path.build_path (Path.DIR_SEPARATOR_S, cache_dir, "wk2ext"));
+                    get_lib_path (PACKAGE_NAME));
                 WebKit.WebContext.get_default ().set_disk_cache_directory (
                     Path.build_path (Path.DIR_SEPARATOR_S, cache_dir, "web"));
             }
@@ -162,32 +159,25 @@
                 cookie_manager.set_persistent_storage (Path.build_filename (config_dir, "cookies.db"),
                     WebKit.CookiePersistentStorage.SQLITE);
             }
-#endif
             if (user_data_dir != null) {
                 string folder = Path.build_filename (user_data_dir, "webkit", "icondatabase");
-#if HAVE_WEBKIT2
                 WebKit.WebContext.get_default ().set_favicon_database_directory (folder);
-#else
-                WebKit.get_favicon_database ().set_path (folder);
-#endif
             }
             else
             {
-#if HAVE_WEBKIT2
                 /* with wk2 set_favicon_database_directory can only be called once and actually
                 initializes and enables the favicon database, so we do not call it in this case */
-#else
-                /* wk1 documentation claims that the favicon database is not enabled unless
-                a call to favicon_database.set_path is made, but in fact it must be explicitly
-                disabled by setting to null (verified as of webkitgtk 2.3.1) */
-                WebKit.get_favicon_database ().set_path (null);
-#endif
             }
 
             #if !HAVE_WIN32
             Gtk.IconTheme.get_default ().append_search_path (exec_path);
             #endif
 
+            if (("wk2:ignore-tls" in (Environment.get_variable ("MIDORI_DEBUG") ?? "")))
+                WebKit.WebContext.get_default ().set_tls_errors_policy (WebKit.TLSErrorsPolicy.IGNORE);
+            else
+                WebKit.WebContext.get_default ().set_tls_errors_policy (WebKit.TLSErrorsPolicy.FAIL);
+
             if (strcmp (Environment.get_variable ("MIDORI_DEBUG"), "paths") == 0) {
                 stdout.printf ("config: %s\ncache: %s\nuser_data: %s\ntmp: %s\n",
                                config_dir, cache_dir, user_data_dir, tmp_dir);
@@ -451,11 +441,7 @@
         public static void clear_icons () {
             assert (cache_dir != null);
             assert (user_data_dir != null);
-#if HAVE_WEBKIT2
             WebKit.WebContext.get_default ().get_favicon_database ().clear ();
-#else
-            WebKit.get_favicon_database ().clear ();
-#endif
             /* FIXME: Exclude search engine icons */
             remove_path (Path.build_filename (user_data_dir, "webkit", "icondatabase"));
         }
@@ -475,14 +461,7 @@
                     Gtk.IconSize.MENU, out icon_width, out icon_height);
             else
                 icon_width = icon_height = 0 /* maximum size */;
-#if HAVE_WEBKIT2
             /* There is no sync API for WebKit2 */
-#else
-            Gdk.Pixbuf? pixbuf = WebKit.get_favicon_database ()
-                .try_get_favicon_pixbuf (uri, icon_width, icon_height);
-            if (pixbuf != null)
-                return pixbuf;
-#endif
             if (widget != null)
                 return widget.render_icon (Gtk.STOCK_FILE, Gtk.IconSize.MENU, null);
             return null;

=== modified file 'katze/midori-uri.vala'
--- katze/midori-uri.vala	2015-04-12 13:30:03 +0000
+++ katze/midori-uri.vala	2016-09-20 20:57:01 +0000
@@ -248,16 +248,10 @@
          * Since: 0.5.8
          **/
         public static async GLib.Icon? get_icon (string uri, Cancellable? cancellable=null) throws Error {
-#if HAVE_WEBKIT2
             var database = WebKit.WebContext.get_default ().get_favicon_database ();
             var surface = yield database.get_favicon (uri, cancellable);
             var image = (Cairo.ImageSurface)surface;
             var pixbuf = Gdk.pixbuf_get_from_surface (image, 0, 0, image.get_width (), image.get_height ());
-#else
-            var database = WebKit.get_favicon_database ();
-            // We must not pass a Cancellable due to a crasher bug
-            var pixbuf = yield database.get_favicon_pixbuf (uri, 0, 0, null);
-#endif
             return pixbuf as GLib.Icon;
         }
 

=== modified file 'midori/main.c'
--- midori/main.c	2016-03-21 19:19:52 +0000
+++ midori/main.c	2016-09-20 20:57:01 +0000
@@ -39,6 +39,7 @@
     g_free (uri);
 }
 
+<<<<<<< TREE
 #ifndef HAVE_WEBKIT2
 static void
 snapshot_load_finished_cb (GtkWidget*      web_view,
@@ -96,6 +97,8 @@
     fclose (logfile);
 }
 
+=======
+>>>>>>> MERGE-SOURCE
 int
 main (int    argc,
       char** argv)
@@ -321,10 +324,6 @@
         else
             gtk_widget_set_size_request (web_view, 800, 600);
         gtk_widget_show_all (offscreen);
-        #ifndef HAVE_WEBKIT2
-        g_signal_connect (web_view, "load-finished",
-            G_CALLBACK (snapshot_load_finished_cb), filename);
-        #endif
         uri = sokoke_magic_uri (snapshot, FALSE, TRUE);
         webkit_web_view_load_uri (WEBKIT_WEB_VIEW (web_view), uri);
         g_free (uri);
@@ -343,19 +342,11 @@
         GtkWidget* window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
         GtkWidget* vbox = gtk_vbox_new (FALSE, 0);
         GtkWidget* entry = gtk_entry_new ();
-#ifndef HAVE_WEBKIT2
-        GtkWidget* scrolled = gtk_scrolled_window_new (NULL, NULL);
-#endif
         GtkWidget* web_view = webkit_web_view_new ();
         katze_window_set_sensible_default_size (GTK_WINDOW (window));
 
         gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, FALSE, 0);
-#ifndef HAVE_WEBKIT2
-        gtk_box_pack_start (GTK_BOX (vbox), scrolled, TRUE, TRUE, 0);
-        gtk_container_add (GTK_CONTAINER (scrolled), web_view);
-#else
         gtk_box_pack_start (GTK_BOX (vbox), web_view, TRUE, TRUE, 0);
-#endif
         gtk_container_add (GTK_CONTAINER (window), vbox);
         gtk_entry_set_text (GTK_ENTRY (entry), uris && *uris ? *uris : "http://www.example.com");
         plain_entry_activate_cb (entry, web_view);
@@ -381,9 +372,6 @@
 
             MidoriBrowser* browser = midori_browser_new ();
             MidoriWebSettings* settings = midori_browser_get_settings (browser);
-#ifndef HAVE_WEBKIT2
-            g_object_set_data (G_OBJECT (webkit_get_default_session ()), "pass-through-console", (void*)1);
-#endif
             midori_load_soup_session (settings);
 
             gchar* msg = NULL;

=== modified file 'midori/midori-browser.c'
--- midori/midori-browser.c	2016-01-23 19:21:31 +0000
+++ midori/midori-browser.c	2016-09-20 20:57:01 +0000
@@ -153,11 +153,9 @@
 static void
 midori_browser_finalize (GObject* object);
 
-#ifdef HAVE_WEBKIT2
 void download_created_destination_cb (WebKitDownload *download,
                                       gchar          *destination,
                                       gpointer        user_data);
-#endif
 
 static void
 midori_browser_set_property (GObject*      object,
@@ -1319,54 +1317,11 @@
     if (!midori_download_has_enough_space (download, uri, FALSE))
         return FALSE;
 
-#ifdef HAVE_WEBKIT2
     webkit_download_set_destination (download, uri);
-#else
-    webkit_download_set_destination_uri (download, uri);
-#endif
     g_signal_emit (browser, signals[ADD_DOWNLOAD], 0, download);
     return TRUE;
 }
 
-#ifndef HAVE_WEBKIT2
-static void
-midori_browser_save_resources (GList*       resources,
-                               const gchar* folder)
-{
-    GList* list;
-    katze_mkdir_with_parents (folder, 0700);
-
-    for (list = resources; list; list = g_list_next (list))
-    {
-        WebKitWebResource* resource = WEBKIT_WEB_RESOURCE (list->data);
-        GString* data = webkit_web_resource_get_data (resource);
-
-        /* Resource could be adblocked, skip it in that case */
-        if (!g_strcmp0 (webkit_web_resource_get_uri (resource), "about:blank"))
-            continue;
-
-        gchar* sub_filename = midori_download_get_filename_suggestion_for_uri (
-            webkit_web_resource_get_mime_type (resource),
-            webkit_web_resource_get_uri (resource));
-        gchar* sub_path = g_build_filename (folder, sub_filename, NULL);
-        sub_path = midori_download_get_unique_filename (sub_path);
-        if (data)
-        {
-            GError* error = NULL;
-            if (!g_file_set_contents (sub_path, data->str, data->len, &error))
-            {
-                g_warning ("Failed to save %s: %s", sub_filename, error->message);
-                g_error_free (error);
-            }
-        }
-        else
-            g_warning ("Skipping empty resource %s", sub_filename);
-        g_free (sub_filename);
-        g_free (sub_path);
-    }
-}
-#endif
-
 void
 midori_browser_save_uri (MidoriBrowser* browser,
                          MidoriView*    view,
@@ -1395,50 +1350,6 @@
         g_free (dirname);
     }
 
-#ifndef HAVE_WEBKIT2
-    GList* resources = midori_view_get_resources (view);
-    gboolean file_only = TRUE;
-    GtkWidget* checkbox = NULL;
-
-    if (resources != NULL && g_list_nth_data (resources, 1) != NULL)
-    {
-        file_only = FALSE;
-        checkbox = gtk_check_button_new_with_mnemonic (_("Save associated _resources"));
-        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbox), TRUE);
-        gtk_file_chooser_set_extra_widget (GTK_FILE_CHOOSER (dialog), checkbox);
-    }
-
-    if (!file_only && !g_str_equal (title, uri))
-        filename = midori_download_clean_filename (title);
-    else
-    {
-        gchar* mime_type = katze_object_get_object (view, "mime-type");
-        filename = midori_download_get_filename_suggestion_for_uri (mime_type, uri);
-        g_free (mime_type);
-    }
-    gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog), filename);
-    g_free (filename);
-
-    if (midori_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK)
-    {
-        filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
-        if (checkbox != NULL)
-            file_only = !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (checkbox));
-        if (!file_only)
-        {
-            gchar* fullname = g_strconcat (filename, ".html", NULL);
-            midori_view_save_source (view, uri, fullname, FALSE);
-            g_free (fullname);
-            midori_browser_save_resources (resources, filename);
-        }
-        else
-            midori_view_save_source (view, uri, filename, FALSE);
-        katze_assign (last_dir,
-            gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (dialog)));
-    }
-    g_list_foreach (resources, (GFunc)g_object_unref, NULL);
-    g_list_free (resources);
-#else
     filename = midori_download_clean_filename (title);
     gchar* suggested_filename = g_strconcat (filename, ".mht", NULL);
     gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog), suggested_filename);
@@ -1456,7 +1367,6 @@
         katze_assign (last_dir,
             gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (dialog)));
     }
-#endif
     gtk_widget_destroy (dialog);
 }
 
@@ -1493,28 +1403,6 @@
 midori_browser_view_copy_to_item_history (GtkWidget* view,
                                           KatzeItem* item)
 {
-#ifndef HAVE_WEBKIT2
-    WebKitWebView* copy_from;
-    WebKitWebBackForwardList* list_from;
-    guint length_from;
-    gint i;
-    GPtrArray* history;
-
-    copy_from = WEBKIT_WEB_VIEW (midori_view_get_web_view (MIDORI_VIEW (view)));
-    list_from = webkit_web_view_get_back_forward_list (copy_from);
-    length_from = webkit_web_back_forward_list_get_back_length (list_from);
-    history = g_ptr_array_new ();
-
-    for (i = -length_from; i <=  -1 ; i++)
-    {
-        WebKitWebHistoryItem* hist_item = webkit_web_back_forward_list_get_nth_item (list_from, i);
-        if (hist_item == NULL)
-            break;
-        g_object_ref ((gpointer) hist_item);
-        g_ptr_array_add (history, (gpointer) hist_item);
-    }
-    g_object_set_data (G_OBJECT (item), "tab-history", (gpointer) history);
-#endif
 }
 
 static void
@@ -1579,63 +1467,14 @@
                                   GtkWidget* view_from,
                                   gboolean   omit_last)
 {
-#ifndef HAVE_WEBKIT2
-    WebKitWebView* copy_from;
-    WebKitWebBackForwardList* list_from;
-    WebKitWebView* copy_to;
-    WebKitWebBackForwardList* list_to;
-    guint length_from;
-    gint i;
-
-    copy_from = WEBKIT_WEB_VIEW (midori_view_get_web_view (MIDORI_VIEW (view_from)));
-    list_from = webkit_web_view_get_back_forward_list (copy_from);
-    copy_to = WEBKIT_WEB_VIEW (midori_view_get_web_view (MIDORI_VIEW (view_to)));
-    list_to = webkit_web_view_get_back_forward_list (copy_to);
-    length_from = webkit_web_back_forward_list_get_back_length (list_from);
-
-    for (i = -length_from; i <= (omit_last ? -1 : 0); i++)
-    {
-        WebKitWebHistoryItem* item = webkit_web_back_forward_list_get_nth_item (list_from, i);
-        if (item == NULL)
-            break;
-        webkit_web_back_forward_list_add_item (list_to, item);
-    }
-#endif
 }
 
-
 static void
 midori_browser_view_copy_from_item_history (GtkWidget* view,
                                             KatzeItem* item)
 {
-#ifndef HAVE_WEBKIT2
-    WebKitWebView* copy_to;
-    WebKitWebBackForwardList* list_to;
-    guint i;
-    GPtrArray* list_from;
-
-    copy_to = WEBKIT_WEB_VIEW (midori_view_get_web_view (MIDORI_VIEW (view)));
-    list_to = webkit_web_view_get_back_forward_list (copy_to);
-
-    if (item == NULL)
-        return;
-    list_from = g_object_get_data (G_OBJECT (item), "tab-history");
-    if (list_from == NULL)
-        return;
-
-    for (i = 0; i < list_from->len; i++)
-    {
-        WebKitWebHistoryItem* hist_item = (WebKitWebHistoryItem*) g_ptr_array_index (list_from, i);
-        if (hist_item == NULL)
-            break;
-        webkit_web_back_forward_list_add_item (list_to, hist_item);
-    }
-    g_ptr_array_unref (list_from);
-#endif
 }
 
-
-
 static gboolean
 midori_browser_notify_new_tab_timeout_cb (MidoriBrowser *browser)
 {
@@ -1785,7 +1624,6 @@
     }
 }
 
-#ifdef HAVE_WEBKIT2
 static void
 midori_browser_close_tab_idle (GObject*      resource,
                                GAsyncResult* result,
@@ -1795,16 +1633,8 @@
         result, NULL, NULL);
     if (data != NULL)
         return;
-#else
-static gboolean
-midori_browser_close_tab_idle (gpointer view)
-{
-#endif
     MidoriBrowser* browser = midori_browser_get_for_widget (GTK_WIDGET (view));
     midori_browser_close_tab (browser, GTK_WIDGET (view));
-#ifndef HAVE_WEBKIT2
-    return G_SOURCE_REMOVE;
-#endif
 }
 
 static gboolean
@@ -1820,11 +1650,7 @@
     {
         handled = FALSE;
     }
-    #ifdef HAVE_WEBKIT2
     else if (!webkit_download_get_destination (download))
-    #else
-    else if (!webkit_download_get_destination_uri (download))
-    #endif
     {
         if (type == MIDORI_DOWNLOAD_SAVE_AS)
         {
@@ -1833,12 +1659,8 @@
 
             if (!dialog)
             {
-                #ifdef HAVE_WEBKIT2
                 const gchar* download_uri = webkit_uri_response_get_uri (
                     webkit_download_get_response (download));
-                #else
-                const gchar* download_uri = webkit_download_get_uri (download);
-                #endif
                 gchar* folder;
                 dialog = (GtkWidget*)midori_file_chooser_dialog_new (_("Save file"),
                     GTK_WINDOW (browser), GTK_FILE_CHOOSER_ACTION_SAVE);
@@ -1883,24 +1705,14 @@
             midori_browser_prepare_download (browser, download, destination_uri);
             g_free (destination_uri);
         }
-        #ifndef HAVE_WEBKIT2
-        webkit_download_start (download);
-        #endif
     }
 
     /* Close empty tabs due to download links with a target */
     if (midori_view_is_blank (MIDORI_VIEW (view)))
     {
         GtkWidget* web_view = midori_view_get_web_view (MIDORI_VIEW (view));
-        #ifdef HAVE_WEBKIT2
         WebKitWebResource* resource = webkit_web_view_get_main_resource (WEBKIT_WEB_VIEW (web_view));
         webkit_web_resource_get_data (resource, NULL, midori_browser_close_tab_idle, view);
-        #else
-        WebKitWebFrame* web_frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (web_view));
-        WebKitWebDataSource* datasource = webkit_web_frame_get_data_source (web_frame);
-        if (webkit_web_data_source_get_data (datasource) == NULL)
-            g_idle_add (midori_browser_close_tab_idle, view);
-        #endif
     }
     return handled;
 }
@@ -2145,35 +1957,6 @@
         return TRUE;
     }
 
-#ifndef HAVE_WEBKIT2
-    GtkWidget* focus = gtk_window_get_focus (GTK_WINDOW (widget));
-    if (focus == NULL)
-        gtk_widget_grab_focus (midori_browser_get_current_tab (MIDORI_BROWSER (widget)));
-    else if (G_OBJECT_TYPE (focus) == WEBKIT_TYPE_WEB_VIEW
-          && event->keyval == GDK_KEY_space
-          && (!(event->state & GDK_SHIFT_MASK))
-          && !webkit_web_view_can_cut_clipboard (WEBKIT_WEB_VIEW (focus))
-          && !webkit_web_view_can_paste_clipboard (WEBKIT_WEB_VIEW (focus)))
-    {
-        /* Space at the bottom of the page: Go to next page */
-        MidoriView* view = midori_view_get_for_widget (focus);
-        GtkScrolledWindow* scrolled = GTK_SCROLLED_WINDOW (gtk_widget_get_parent (focus));
-        GtkAdjustment* vadjust = gtk_scrolled_window_get_vadjustment (scrolled);
-        if (gtk_adjustment_get_value (vadjust)
-         == (gtk_adjustment_get_upper (vadjust) - gtk_adjustment_get_page_size (vadjust)))
-        {
-            /* Duplicate here because the URI pointer might change */
-            gchar* uri = g_strdup (midori_view_get_next_page (view));
-            if (uri != NULL)
-            {
-                midori_view_set_uri (view, uri);
-                g_free (uri);
-                return TRUE;
-            }
-        }
-    }
-#endif
-
     if (event->state & (GDK_CONTROL_MASK | GDK_MOD1_MASK))
         if (sokoke_window_activate_key (window, event))
             return TRUE;
@@ -2991,11 +2774,7 @@
 {
     GtkWidget* widget = gtk_window_get_focus (GTK_WINDOW (browser));
     if (WEBKIT_IS_WEB_VIEW (widget))
-#ifdef HAVE_WEBKIT2
         webkit_web_view_execute_editing_command (WEBKIT_WEB_VIEW (widget), WEBKIT_EDITING_COMMAND_UNDO);
-#else
-        webkit_web_view_undo (WEBKIT_WEB_VIEW (widget));
-#endif
 }
 
 static void
@@ -3004,11 +2783,7 @@
 {
     GtkWidget* widget = gtk_window_get_focus (GTK_WINDOW (browser));
     if (WEBKIT_IS_WEB_VIEW (widget))
-#ifdef HAVE_WEBKIT2
         webkit_web_view_execute_editing_command (WEBKIT_WEB_VIEW (widget), WEBKIT_EDITING_COMMAND_REDO);
-#else
-        webkit_web_view_redo (WEBKIT_WEB_VIEW (widget));
-#endif
 }
 
 static void
@@ -3018,10 +2793,8 @@
     GtkWidget* widget = gtk_window_get_focus (GTK_WINDOW (browser));
     if (G_LIKELY (widget) && g_signal_lookup ("cut-clipboard", G_OBJECT_TYPE (widget)))
         g_signal_emit_by_name (widget, "cut-clipboard");
-#ifdef HAVE_WEBKIT2
     else if (WEBKIT_IS_WEB_VIEW (widget))
         webkit_web_view_execute_editing_command (WEBKIT_WEB_VIEW (widget), WEBKIT_EDITING_COMMAND_CUT);
-#endif
 }
 
 static void
@@ -3031,10 +2804,8 @@
     GtkWidget* widget = gtk_window_get_focus (GTK_WINDOW (browser));
     if (G_LIKELY (widget) && g_signal_lookup ("copy-clipboard", G_OBJECT_TYPE (widget)))
         g_signal_emit_by_name (widget, "copy-clipboard");
-#ifdef HAVE_WEBKIT2
     else if (WEBKIT_IS_WEB_VIEW (widget))
         webkit_web_view_execute_editing_command (WEBKIT_WEB_VIEW (widget), WEBKIT_EDITING_COMMAND_COPY);
-#endif
 }
 
 static void
@@ -3044,10 +2815,8 @@
     GtkWidget* widget = gtk_window_get_focus (GTK_WINDOW (browser));
     if (G_LIKELY (widget) && g_signal_lookup ("paste-clipboard", G_OBJECT_TYPE (widget)))
         g_signal_emit_by_name (widget, "paste-clipboard");
-#ifdef HAVE_WEBKIT2
     else if (WEBKIT_IS_WEB_VIEW (widget))
         webkit_web_view_execute_editing_command (WEBKIT_WEB_VIEW (widget), WEBKIT_EDITING_COMMAND_PASTE);
-#endif
 }
 
 static void
@@ -3059,10 +2828,6 @@
     {
         if (GTK_IS_EDITABLE (widget))
             gtk_editable_delete_selection (GTK_EDITABLE (widget));
-#ifndef HAVE_WEBKIT2
-        else if (WEBKIT_IS_WEB_VIEW (widget))
-            webkit_web_view_delete_selection (WEBKIT_WEB_VIEW (widget));
-#endif
         else if (GTK_IS_TEXT_VIEW (widget))
             gtk_text_buffer_delete_selection (
                 gtk_text_view_get_buffer (GTK_TEXT_VIEW (widget)), TRUE, FALSE);
@@ -3078,10 +2843,8 @@
     {
         if (GTK_IS_EDITABLE (widget))
             gtk_editable_select_region (GTK_EDITABLE (widget), 0, -1);
-#ifdef HAVE_WEBKIT2
         else if (WEBKIT_IS_WEB_VIEW (widget))
             webkit_web_view_execute_editing_command (WEBKIT_WEB_VIEW (widget), WEBKIT_EDITING_COMMAND_SELECT_ALL);
-#endif
         else if (g_signal_lookup ("select-all", G_OBJECT_TYPE (widget)))
         {
             if (GTK_IS_TEXT_VIEW (widget))
@@ -3595,11 +3358,7 @@
         encoding = "ISO-8859-1";
     else
         g_assert_not_reached ();
-    #ifdef HAVE_WEBKIT2
     webkit_web_view_set_custom_charset (web_view, encoding);
-    #else
-    webkit_web_view_set_custom_encoding (web_view, encoding);
-    #endif
 }
 
 static void
@@ -3607,39 +3366,7 @@
                      MidoriBrowser* browser,
                      gboolean       use_dom)
 {
-    #ifdef HAVE_WEBKIT2
     /* TODO: midori_view_save_source isn't async and not WebKit2-friendly */
-    #else
-    GtkWidget* view = midori_browser_get_current_tab (browser);
-    gchar* filename = midori_view_save_source (MIDORI_VIEW (view), NULL, NULL, use_dom);
-    gchar* text_editor;
-    GAppInfo* info;
-    g_object_get (browser->settings, "text-editor", &text_editor, NULL);
-    if (text_editor && *text_editor)
-        info = g_app_info_create_from_commandline (text_editor, NULL, 0, NULL);
-    else
-        info = g_app_info_get_default_for_type ("text/plain", FALSE);
-    GFile* file = g_file_new_for_path (filename);
-    GList* files = g_list_append (NULL, file);
-    GError* error = NULL;
-    GdkDisplay* display = gtk_widget_get_display (view);
-    #if GTK_CHECK_VERSION (3, 0, 0)
-    GdkAppLaunchContext* ctx = gdk_display_get_app_launch_context (display);
-    #else
-    GdkAppLaunchContext* ctx = gdk_app_launch_context_new ();
-    gdk_app_launch_context_set_display (ctx, display);
-    #endif
-    if (!g_app_info_launch (info, files, G_APP_LAUNCH_CONTEXT (ctx), &error))
-    {
-        g_printerr ("Failed to open editor: %s", error->message);
-        g_error_free (error);
-    }
-    g_object_unref (info);
-    g_list_free (files);
-    g_object_unref (file);
-    g_free (filename);
-    g_free (text_editor);
-    #endif
 }
 
 static void
@@ -3736,20 +3463,6 @@
 _action_scroll_somewhere_activate (GtkAction*     action,
                                    MidoriBrowser* browser)
 {
-#ifndef HAVE_WEBKIT2
-    GtkWidget* view = midori_browser_get_current_tab (browser);
-    WebKitWebView* web_view = WEBKIT_WEB_VIEW (midori_view_get_web_view (MIDORI_VIEW (view)));
-    const gchar* name = gtk_action_get_name (action);
-
-    if (g_str_equal (name, "ScrollLeft"))
-        webkit_web_view_move_cursor (web_view, GTK_MOVEMENT_VISUAL_POSITIONS, -1);
-    else if (g_str_equal (name, "ScrollDown"))
-        webkit_web_view_move_cursor (web_view, GTK_MOVEMENT_DISPLAY_LINES, 1);
-    else if (g_str_equal (name, "ScrollUp"))
-        webkit_web_view_move_cursor (web_view, GTK_MOVEMENT_DISPLAY_LINES, -1);
-    else if (g_str_equal (name, "ScrollRight"))
-        webkit_web_view_move_cursor (web_view, GTK_MOVEMENT_VISUAL_POSITIONS, 1);
-#endif
 }
 
 static void
@@ -3833,15 +3546,9 @@
         if (middle_click)
         {
             WebKitWebView* web_view = WEBKIT_WEB_VIEW (midori_view_get_web_view (view));
-            #ifdef HAVE_WEBKIT2
             WebKitBackForwardList* list = webkit_web_view_get_back_forward_list (web_view);
             WebKitBackForwardListItem* item = webkit_back_forward_list_get_back_item (list);
             const gchar* back_uri = webkit_back_forward_list_item_get_uri (item);
-            #else
-            WebKitWebBackForwardList* list = webkit_web_view_get_back_forward_list (web_view);
-            WebKitWebHistoryItem* item = webkit_web_back_forward_list_get_forward_item (list);
-            const gchar* back_uri = webkit_web_history_item_get_uri (item);
-            #endif
 
             GtkWidget* new_view = midori_browser_add_uri (browser, back_uri);
             midori_browser_set_current_tab_smartly (browser, new_view);
@@ -3856,15 +3563,9 @@
         if (middle_click)
         {
             WebKitWebView* web_view = WEBKIT_WEB_VIEW (midori_view_get_web_view (view));
-            #ifdef HAVE_WEBKIT2
             WebKitBackForwardList* list = webkit_web_view_get_back_forward_list (web_view);
             WebKitBackForwardListItem* item = webkit_back_forward_list_get_forward_item (list);
             const gchar* forward_uri = webkit_back_forward_list_item_get_uri (item);
-            #else
-            WebKitWebBackForwardList* list = webkit_web_view_get_back_forward_list (web_view);
-            WebKitWebHistoryItem* item = webkit_web_back_forward_list_get_forward_item (list);
-            const gchar* forward_uri = webkit_web_history_item_get_uri (item);
-            #endif
 
             GtkWidget* new_view = midori_browser_add_uri (browser, forward_uri);
             midori_browser_set_current_tab_smartly (browser, new_view);
@@ -3963,41 +3664,10 @@
         midori_browser_get_current_uri (browser));
 }
 
-#ifndef HAVE_WEBKIT2
-static void
-midori_browser_item_icon_loaded_cb (WebKitFaviconDatabase* database,
-                                    const gchar*           frame_uri,
-                                    KatzeItem*             item)
-{
-    gchar* uri = g_object_get_data (G_OBJECT (item), "browser-queue-icon");
-    if (strcmp (frame_uri, uri))
-        return;
-
-    gchar* icon_uri = webkit_favicon_database_get_favicon_uri (
-        webkit_get_favicon_database (), frame_uri);
-    if (icon_uri != NULL)
-    {
-        g_free (icon_uri);
-        katze_item_set_icon (item, frame_uri);
-        /* This signal fires extremely often (WebKit bug?)
-           we must throttle it (disconnect) once we have an icon */
-        g_signal_handlers_disconnect_by_func (webkit_get_favicon_database (),
-            midori_browser_item_icon_loaded_cb, item);
-    }
-}
-#endif
-
 static void
 midori_browser_queue_item_for_icon (KatzeItem*     item,
                                     const gchar*   uri)
 {
-#ifndef HAVE_WEBKIT2
-    if (katze_item_get_icon (item) != NULL)
-        return;
-    g_object_set_data_full (G_OBJECT (item), "browser-queue-icon", g_strdup (uri), g_free);
-    g_signal_connect (webkit_get_favicon_database (), "icon-loaded",
-        G_CALLBACK (midori_browser_item_icon_loaded_cb), item);
-#endif
 }
 
 static void
@@ -6171,7 +5841,6 @@
     gint icon_size = 16;
     gtk_icon_size_lookup_for_settings (gtk_widget_get_settings (GTK_WIDGET (browser)),
                                        GTK_ICON_SIZE_MENU, &icon_size, NULL);
-    gtk_widget_set_size_request (throbber_box, icon_size, icon_size);
     gtk_container_add (GTK_CONTAINER (throbber_box), browser->throbber);
     gtk_widget_show (throbber_box);
     gtk_container_add (GTK_CONTAINER (menuitem), throbber_box);
@@ -6389,17 +6058,6 @@
                                     gtk_toolbar_style);
 }
 
-#ifndef HAVE_WEBKIT2
-static void
-midori_browser_toolbar_popup_context_menu_history_cb (GtkMenuItem* menu_item,
-                                                      MidoriBrowser* browser)
-{
-    gint steps = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (menu_item), "steps"));
-    MidoriView* view = MIDORI_VIEW (midori_browser_get_current_tab (browser));
-    midori_view_go_back_or_forward (view, steps);
-}
-#endif
-
 static void
 midori_browser_toolbar_popup_context_menu_history (MidoriBrowser* browser,
                                                    GtkWidget* widget,
@@ -6407,61 +6065,6 @@
                                                    gint x,
                                                    gint y)
 {
-#ifndef HAVE_WEBKIT2
-    const gint step = back ? -1 : 1;
-    gint steps = step;
-    GtkWidget* menu;
-    WebKitWebBackForwardList* list;
-    WebKitWebHistoryItem* current_item;
-    WebKitWebHistoryItem* history_item;
-    WebKitWebHistoryItem* (*history_next)(WebKitWebBackForwardList*);
-    void (*history_action)(WebKitWebBackForwardList*);
-
-    list = webkit_web_view_get_back_forward_list (
-        WEBKIT_WEB_VIEW (midori_view_get_web_view (
-        MIDORI_VIEW (midori_browser_get_current_tab (browser)))));
-
-    if (!list)
-        return;
-
-    menu = gtk_menu_new ();
-
-    history_action = back ?
-        webkit_web_back_forward_list_go_back :
-        webkit_web_back_forward_list_go_forward;
-    history_next = back ?
-        webkit_web_back_forward_list_get_back_item :
-        webkit_web_back_forward_list_get_forward_item;
-    current_item = webkit_web_back_forward_list_get_current_item (list);
-
-    for (; (history_item = history_next (list)); history_action (list), steps += step)
-    {
-        const gchar* uri = webkit_web_history_item_get_uri (history_item);
-        GtkWidget* menu_item = gtk_image_menu_item_new_with_label (
-            webkit_web_history_item_get_title (history_item));
-        GdkPixbuf* pixbuf;
-        if ((pixbuf = midori_paths_get_icon (uri, widget)))
-        {
-            gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item),
-                gtk_image_new_from_pixbuf (pixbuf));
-            g_object_unref (pixbuf);
-        }
-        g_object_set_data (G_OBJECT (menu_item), "uri", (gpointer)uri);
-        g_object_set_data (G_OBJECT (menu_item), "steps", GINT_TO_POINTER (steps));
-        gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
-        g_signal_connect (G_OBJECT (menu_item), "activate",
-            G_CALLBACK (midori_browser_toolbar_popup_context_menu_history_cb),
-            browser);
-        if (steps == (10 - 1))
-            break;
-    }
-
-    webkit_web_back_forward_list_go_to_item (list, current_item);
-    gtk_widget_show_all (menu);
-
-    katze_widget_popup (widget, GTK_MENU (menu), NULL,
-        KATZE_MENU_POSITION_LEFT);
-#endif
 }
 
 static void
@@ -7031,11 +6634,6 @@
     g_return_if_fail (MIDORI_IS_BROWSER (browser));
     g_return_if_fail (GTK_IS_WIDGET (view));
 
-#ifndef HAVE_WEBKIT2
-    if (!g_object_get_data (G_OBJECT (webkit_get_default_session ()),
-                            "midori-session-initialized"))
-        g_critical ("midori_load_soup_session was not called!");
-#endif
     g_signal_emit (browser, signals[ADD_TAB], 0, view);
 }
 

=== modified file 'midori/midori-browser.h'
--- midori/midori-browser.h	2015-05-24 00:19:21 +0000
+++ midori/midori-browser.h	2016-09-20 20:57:01 +0000
@@ -40,11 +40,7 @@
     /* Signals */
     void
     (*window_object_cleared)   (MidoriBrowser*       browser,
-#ifndef HAVE_WEBKIT2
-                                WebKitWebFrame*      web_frame,
-#else
                                 void*                web_frame,
-#endif
                                 JSContextRef*        context,
                                 JSObjectRef*         window_object);
     void

=== modified file 'midori/midori-contextaction.vala'
--- midori/midori-contextaction.vala	2015-06-06 12:20:44 +0000
+++ midori/midori-contextaction.vala	2016-09-20 20:57:01 +0000
@@ -70,7 +70,6 @@
             warning ("Action %s not known to ContextAction", name);
         }
 
-#if HAVE_WEBKIT2
         public WebKit.ContextMenu create_webkit_context_menu (WebKit.ContextMenu? default_menu) {
             var menu = default_menu ?? new WebKit.ContextMenu ();
             foreach (var action in children) {
@@ -90,7 +89,6 @@
             }
             return menu;
         }
-#endif
 
         Gtk.ToolButton toolitem;
         public override unowned Gtk.Widget create_tool_item () {

=== modified file 'midori/midori-download.vala'
--- midori/midori-download.vala	2016-01-15 19:18:17 +0000
+++ midori/midori-download.vala	2016-09-20 20:57:01 +0000
@@ -16,20 +16,9 @@
 namespace Midori {
     namespace Download {
         public static bool is_finished (WebKit.Download download) {
-#if !HAVE_WEBKIT2
-            switch (download.status) {
-                case WebKit.DownloadStatus.FINISHED:
-                case WebKit.DownloadStatus.CANCELLED:
-                case WebKit.DownloadStatus.ERROR:
-                    return true;
-                default:
-                    return false;
-            }
-#else
             if (download.estimated_progress == 1)
                 return true;
             return false;
-#endif
         }
 
         public static int get_type (WebKit.Download download) {
@@ -40,90 +29,17 @@
             download.set_data<int> ("midori-download-type", type);
         }
 
-#if HAVE_WEBKIT2
         public static string get_filename (WebKit.Download download) {
             return download.get_data<string> ("midori-download-filename");
         }
         public static void set_filename (WebKit.Download download, string name) {
             download.set_data<string> ("midori-download-filename", name);
         }
-#endif
         public static double get_progress (WebKit.Download download) {
-#if !HAVE_WEBKIT2
-            /* Avoid a bug in WebKit */
-            if (download.status == WebKit.DownloadStatus.CREATED)
-                return 0.0;
-            return download.progress;
-#else
             return download.estimated_progress;
-#endif
         }
 
         public static string calculate_tooltip (WebKit.Download download) {
-#if !HAVE_WEBKIT2
-            string filename = Midori.Download.get_basename_for_display (download.destination_uri);
-            /* i18n: Download tooltip (size): 4KB of 43MB */
-            string size = _("%s of %s").printf (
-                format_size (download.current_size),
-                format_size (download.total_size));
-
-            /* Finished, no speed or remaining time */
-            if (is_finished (download) || download.status == WebKit.DownloadStatus.CREATED)
-                return "%s\n%s".printf (filename, size);
-
-            uint64 total_size = download.total_size, current_size = download.current_size;
-            double elapsed = download.get_elapsed_time (),
-               diff = elapsed / current_size,
-               estimated = (total_size - current_size) * diff;
-            int hour = 3600, minute = 60;
-            int hours = (int)(estimated / hour),
-                minutes = (int)((estimated - (hours * hour)) / minute),
-                seconds = (int)((estimated - (hours * hour) - (minutes * minute)));
-            string hours_ = ngettext ("%d hour", "%d hours", hours).printf (hours);
-            string minutes_ = ngettext ("%d minute", "%d minutes", minutes).printf (minutes);
-            string seconds_ = ngettext ("%d second", "%d seconds", seconds).printf (seconds);
-            double last_time = download.get_data<int> ("last-time");
-
-            string eta = "";
-            if (estimated > 0) {
-                if (hours > 0)
-                    eta = hours_ + ", " + minutes_;
-                else if (minutes >= 10)
-                    eta = minutes_;
-                else if (minutes < 10 && minutes > 0)
-                    eta = minutes_ + ", " + seconds_;
-                else if (seconds > 0)
-                    eta = seconds_;
-                if (eta != "")
-            /* i18n: Download tooltip (estimated time) : - 1 hour, 5 minutes remaning */
-                    eta = _(" - %s remaining").printf (eta);
-            }
-
-            string speed = "";
-            uint64? last_size = download.get_data<uint64?> ("last-size");
-            if (last_size != null && elapsed != last_time) {
-                if (current_size != last_size) {
-                    speed = format_size ((uint64)(
-                        (current_size - last_size) / (elapsed - last_time)));
-                    download.set_data ("last-speed", speed.dup ());
-                }
-                else {
-                    speed = download.get_data ("last-speed");
-                }
-            }
-            else
-                /* i18n: Unknown number of bytes, used for transfer rate like ?B/s */
-                speed = _("?B");
-            /* i18n: Download tooltip (transfer rate): (130KB/s) */
-            speed = _(" (%s/s)").printf (speed);
-
-            if (elapsed - last_time > 0.0) {
-                download.set_data<int> ("last-time", (int)elapsed);
-                download.set_data<uint64?> ("last-size", current_size);
-            }
-
-            return "%s\n%s %s%s".printf (filename, size, speed, eta);
-#else
             string filename = Midori.Download.get_basename_for_display (download.destination);
 
             string size = "%s".printf (format_size (download.get_received_data_length ()));
@@ -134,17 +50,12 @@
             if (is_finished (download))
                 return "%s\n %s".printf (filename, size);
             return "%s\n %s - %s".printf (filename, speed, progress);
-#endif
         }
 
         public static string get_content_type (WebKit.Download download, string? mime_type) {
-#if HAVE_WEBKIT2
             string? content_type = ContentType.guess (download.response.suggested_filename == null ?
                           download.destination : download.response.suggested_filename,
                           null, null);
-#else
-            string? content_type = ContentType.guess (download.suggested_filename, null, null);
-#endif
             if (content_type == null) {
                 content_type = ContentType.from_mime_type (mime_type);
                 if (content_type == null)
@@ -157,24 +68,14 @@
             int status = download.get_data<int> ("checksum-status");
             if (status == 0) {
                 /* Link Fingerprint */
-                #if HAVE_WEBKIT2
                 string? original_uri = download.get_request ().uri;
-                #else
-                string? original_uri = download.network_request.get_data<string> ("midori-original-uri");
-                if (original_uri == null)
-                    original_uri = download.get_uri ();
-                #endif
                 string? fingerprint;
                 ChecksumType checksum_type = URI.get_fingerprint (original_uri, out fingerprint, null);
                 /* By default, no wrong checksum */
                 status = 2;
                 if (fingerprint != null) {
                     try {
-                        #if HAVE_WEBKIT2
                         string filename = Filename.from_uri (download.destination);
-                        #else
-                        string filename = Filename.from_uri (download.destination_uri);
-                        #endif
                         string contents;
                         size_t length;
                         bool y = FileUtils.get_contents (filename, out contents, out length);
@@ -194,62 +95,16 @@
         }
 
         public static bool action_clear (WebKit.Download download, Gtk.Widget widget) throws Error {
-#if !HAVE_WEBKIT2
-            switch (download.status) {
-                case WebKit.DownloadStatus.CREATED:
-                case WebKit.DownloadStatus.STARTED:
-                    download.cancel ();
-                    break;
-                case WebKit.DownloadStatus.FINISHED:
-                    if (open (download, widget))
-                        return true;
-                    break;
-                case WebKit.DownloadStatus.CANCELLED:
-                    return true;
-                default:
-                    critical ("action_clear: %d", download.status);
-                    warn_if_reached ();
-                    break;
-            }
-            #else
-
-            if (download.estimated_progress < 1) {
-                download.cancel ();
-            } else {
-                if (open (download, widget))
-                    return true;
-            }
-#endif
             return false;
         }
 
         public static string action_stock_id (WebKit.Download download) {
-#if !HAVE_WEBKIT2
-            switch (download.status) {
-                case WebKit.DownloadStatus.CREATED:
-                case WebKit.DownloadStatus.STARTED:
-                    return Gtk.Stock.CANCEL;
-                case WebKit.DownloadStatus.FINISHED:
-                    if (has_wrong_checksum (download))
-                        return Gtk.Stock.DIALOG_WARNING;
-                    return Gtk.Stock.OPEN;
-                case WebKit.DownloadStatus.CANCELLED:
-                    return Gtk.Stock.CLEAR;
-                case WebKit.DownloadStatus.ERROR:
-                    return Gtk.Stock.DIALOG_ERROR;
-                default:
-                    critical ("action_stock_id: %d", download.status);
-                    warn_if_reached ();
-                    return Gtk.Stock.MISSING_IMAGE;
-            }
-#else
             if (download.estimated_progress == 1)
                 if (has_wrong_checksum (download))
                     return Gtk.Stock.DIALOG_WARNING;
                 else
                     return Gtk.Stock.OPEN;
             return Gtk.Stock.CANCEL;
-#endif
         }
 
         /* returns whether an application was successfully launched to handle the file */
@@ -265,11 +120,7 @@
                 Tab? tab = null;
                 browser.get ("tab", &tab);
                 if (tab != null)
-                #if HAVE_WEBKIT2
                     return tab.open_uri (download.destination);
-                #else
-                    return tab.open_uri (download.destination_uri);
-                #endif
             }
             return false;
         }
@@ -297,16 +148,10 @@
         }
 
         public string get_suggested_filename (WebKit.Download download) {
-#if !HAVE_WEBKIT2
-            /* https://bugs.webkit.org/show_bug.cgi?id=83161
-               https://d19vezwu8eufl6.cloudfront.net/nlp/slides%2F03-01-FormalizingNB.pdf */
-            return clean_filename (download.get_suggested_filename ());
-#else
             string name = get_filename (download);
             if (name == null)
                 return "";
             return name;
-#endif
         }
 
         /**
@@ -397,42 +242,6 @@
          * @destination_uri, considering space on disk and permissions
          */
         public static bool has_enough_space (WebKit.Download download, string destination_uri, bool quiet=false) {
-#if !HAVE_WEBKIT2
-            var folder = File.new_for_uri (destination_uri).get_parent ();
-            bool can_write;
-            uint64 free_space;
-            try {
-                var info = folder.query_filesystem_info ("filesystem::free");
-                free_space = info.get_attribute_uint64 ("filesystem::free");
-                info = folder.query_info ("access::can-write", 0);
-                can_write = info.get_attribute_boolean ("access::can-write");
-            }
-            catch (Error error) {
-                can_write = false;
-                free_space = 0;
-            }
-
-            if (free_space < download.total_size || !can_write) {
-                string message;
-                string detailed_message;
-                if (!can_write) {
-                    message = _("The file \"%s\" can't be saved in this folder.").printf (
-                        Midori.Download.get_basename_for_display (destination_uri));
-                    detailed_message = _("You don't have permission to write in this location.");
-                }
-                else if (free_space < download.total_size) {
-                    message = _("There is not enough free space to download \"%s\".").printf (
-                        Midori.Download.get_basename_for_display (destination_uri));
-                    detailed_message = _("The file needs %s but only %s are left.").printf (
-                        format_size (download.total_size), format_size (free_space));
-                }
-                else
-                    assert_not_reached ();
-                if (!quiet)
-                    Sokoke.message_dialog (Gtk.MessageType.ERROR, message, detailed_message, false);
-                return false;
-            }
-#endif
             return true;
         }
     }

=== modified file 'midori/midori-frontend.c'
--- midori/midori-frontend.c	2016-01-23 19:21:31 +0000
+++ midori/midori-frontend.c	2016-09-20 20:57:01 +0000
@@ -175,9 +175,6 @@
     guint i;
 
     midori_paths_init (MIDORI_RUNTIME_MODE_PRIVATE, config);
-#ifndef HAVE_WEBKIT2
-    g_object_set_data (G_OBJECT (webkit_get_default_session ()), "pass-through-console", (void*)1);
-#endif
 
     /* Mask the timezone, which can be read by Javascript */
     g_setenv ("TZ", "UTC", TRUE);

=== modified file 'midori/midori-locationaction.c'
--- midori/midori-locationaction.c	2015-08-10 23:42:56 +0000
+++ midori/midori-locationaction.c	2016-09-20 20:57:01 +0000
@@ -22,6 +22,7 @@
 #include "config.h"
 #include <string.h>
 #include <glib/gi18n.h>
+#include <gdk/gdk.h>
 #include <gdk/gdkkeysyms.h>
 
 #include <sqlite3.h>
@@ -46,6 +47,10 @@
     gint completion_index;
     GtkWidget* entry;
     KatzeArray* history;
+    #if GTK_CHECK_VERSION (3, 18, 0)
+    GdkDevice* device;
+    guint32 time;
+    #endif
 };
 
 struct _MidoriLocationActionClass
@@ -738,6 +743,8 @@
         g_signal_connect (popup, "destroy",
             G_CALLBACK (gtk_widget_destroyed), &action->popup);
         gtk_widget_show_all (popup_frame);
+
+        gtk_widget_realize (action->popup);
     }
 
     if (!gtk_widget_get_visible (action->popup))
@@ -746,6 +753,21 @@
         gtk_window_set_screen (GTK_WINDOW (action->popup),
                                gtk_widget_get_screen (action->entry));
         gtk_window_set_transient_for (GTK_WINDOW (action->popup), GTK_WINDOW (toplevel));
+        gtk_window_group_add_window (gtk_window_get_group (GTK_WINDOW (toplevel)),
+                                     GTK_WINDOW (action->popup));
+
+        #if GTK_CHECK_VERSION (3, 18, 0)
+        GdkDevice* device = action->device;
+
+        if (device && gdk_device_get_source (device) == GDK_SOURCE_KEYBOARD)
+            device = gdk_device_get_associated_device (device);
+
+        gdk_device_grab (device, gtk_widget_get_window (action->popup),
+                         GDK_OWNERSHIP_WINDOW, TRUE,
+                         GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK,
+                         NULL, action->time);
+        #endif
+
         #if GTK_CHECK_VERSION (3, 4, 0)
         gtk_window_set_attached_to (GTK_WINDOW (action->popup), action->entry);
         #endif
@@ -767,6 +789,10 @@
         g_signal_connect (entry, "destroy",
             G_CALLBACK (gtk_widget_destroyed), &action->entry);
     }
+    #if GTK_CHECK_VERSION (3, 18, 0)
+    action->device = gtk_get_current_event_device ();
+    action->time = gtk_get_current_event_time ();
+    #endif
     g_idle_add (midori_location_action_popup_timeout_cb, action);
 }
 
@@ -1294,33 +1320,6 @@
     #include <gcr/gcr.h>
 #endif
 
-#ifndef HAVE_WEBKIT2
-static GHashTable* message_map = NULL;
-void
-midori_map_add_message (SoupMessage* message)
-{
-    SoupURI* uri = soup_message_get_uri (message);
-    if (message_map == NULL)
-        message_map = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref);
-    g_return_if_fail (uri && uri->host);
-    g_hash_table_insert (message_map, g_strdup (uri->host), g_object_ref (message));
-}
-
-SoupMessage*
-midori_map_get_message (SoupMessage* message)
-{
-    SoupURI* uri = soup_message_get_uri (message);
-    SoupMessage* full;
-    g_return_val_if_fail (uri && uri->host, message);
-    if (message_map == NULL)
-        message_map = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref);
-    full = g_hash_table_lookup (message_map, uri->host);
-    if (full != NULL)
-        return full;
-    return message;
-}
-#endif
-
 #ifdef HAVE_GCR
 typedef enum {
     MIDORI_CERT_TRUST,
@@ -1458,14 +1457,7 @@
 
     MidoriBrowser* browser = midori_browser_get_for_widget (widget);
     MidoriView* view = MIDORI_VIEW (midori_browser_get_current_tab (browser));
-    #ifdef HAVE_WEBKIT2
     void* request = NULL;
-    #else
-    WebKitWebView* web_view = WEBKIT_WEB_VIEW (midori_view_get_web_view (view));
-    WebKitWebFrame* web_frame = webkit_web_view_get_main_frame (web_view);
-    WebKitWebDataSource* source = webkit_web_frame_get_data_source (web_frame);
-    WebKitNetworkRequest* request = webkit_web_data_source_get_request (source);
-    #endif
     midori_view_get_tls_info (view, request, &tls_cert, &tls_flags, &hostname);
     if (tls_cert == NULL)
     {
@@ -1482,12 +1474,10 @@
         der_cert->data, der_cert->len);
     g_byte_array_unref (der_cert);
 
-    #if GTK_CHECK_VERSION (3, 0, 0)
     GtkWidget* details;
     details = (GtkWidget*)gcr_certificate_details_widget_new (gcr_cert);
     gtk_widget_show (details);
     gtk_container_add (GTK_CONTAINER (box), details);
-    #endif
 
     #if GTK_CHECK_VERSION (3, 12, 0)
     GtkWidget* button;
@@ -1527,10 +1517,6 @@
     g_object_set_data_full (G_OBJECT (dialog), "gcr-cert", gcr_cert, (GDestroyNotify)g_object_unref);
     #endif
 
-    /* With GTK+2 the scrolled contents can't communicate a natural size to the window */
-    #if !GTK_CHECK_VERSION (3, 0, 0)
-    gtk_window_set_default_size (GTK_WINDOW (dialog), 250, 200);
-    #endif
     if (!g_tls_certificate_get_issuer (tls_cert))
         gtk_box_pack_start (box, gtk_label_new (_("Self-signed")), FALSE, FALSE, 0);
 

=== modified file 'midori/midori-preferences.c'
--- midori/midori-preferences.c	2015-07-06 21:26:46 +0000
+++ midori/midori-preferences.c	2016-09-20 20:57:01 +0000
@@ -371,20 +371,6 @@
     INDENTED_ADD (button);
     button = katze_property_proxy (settings, "enable-webgl", NULL);
     gtk_button_set_label (GTK_BUTTON (button), _("Enable WebGL support"));
-    #ifndef HAVE_WEBKIT2
-    if (parent && MIDORI_IS_BROWSER (parent))
-    {
-        GtkWidget* tab = midori_browser_get_current_tab (MIDORI_BROWSER (parent));
-        WebKitWebView* web_view = midori_tab_get_web_view (MIDORI_TAB (tab));
-        WebKitWebFrame* web_frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (web_view));
-        JSContextRef js_context = webkit_web_frame_get_global_context (web_frame);
-        gchar* supports_web_gl = sokoke_js_script_eval (js_context,
-            "!!window.WebGLRenderingContext", NULL);
-        if (g_strcmp0 (supports_web_gl, "true"))
-            gtk_widget_hide (button);
-        g_free (supports_web_gl);
-    }
-    #endif
     SPANNED_ADD (button);
     button = katze_property_proxy (settings, "zoom-text-and-images", NULL);
     gtk_button_set_label (GTK_BUTTON (button), _("Zoom Text and Images"));
@@ -522,21 +508,6 @@
     g_signal_connect_object (settings, "notify::proxy-type",
         G_CALLBACK (midori_preferences_notify_proxy_type_cb), label, 0);
     midori_preferences_notify_proxy_type_cb (settings, NULL, label);
-#ifndef HAVE_WEBKIT2
-    if (soup_session_get_feature (webkit_get_default_session (), SOUP_TYPE_CACHE))
-    {
-        label = gtk_label_new (_("Web Cache"));
-        gtk_widget_set_tooltip_text (label, _("The maximum size of cached pages on disk"));
-        INDENTED_ADD (label);
-        button = katze_property_proxy (settings, "maximum-cache-size", NULL);
-        gtk_spin_button_set_range (GTK_SPIN_BUTTON (button), 0, G_MAXINT);
-        gtk_widget_set_tooltip_text (button, _("The maximum size of cached pages on disk"));
-        SPANNED_ADD (button);
-        label = gtk_label_new (_("MB"));
-        gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-        SPANNED_ADD (label);
-    }
-#endif
     /* i18n: This refers to an application, not the 'user agent' string */
     label = gtk_label_new (_("Identify as"));
     gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);

=== modified file 'midori/midori-privatedata.c'
--- midori/midori-privatedata.c	2015-07-06 21:26:46 +0000
+++ midori/midori-privatedata.c	2016-09-20 20:57:01 +0000
@@ -281,28 +281,9 @@
 static void
 midori_clear_web_cookies_cb (void)
 {
-#ifdef HAVE_WEBKIT2
     WebKitWebContext* context = webkit_web_context_get_default ();
     WebKitCookieManager* cookie_manager = webkit_web_context_get_cookie_manager (context);
     webkit_cookie_manager_delete_all_cookies (cookie_manager);
-    /* FIXME: site data policy */
-#else
-    SoupSession* session = webkit_get_default_session ();
-    MidoriWebSettings* settings = g_object_get_data (G_OBJECT (session), "midori-settings");
-    SoupSessionFeature* jar = soup_session_get_feature (session, SOUP_TYPE_COOKIE_JAR);
-    GSList* cookies = soup_cookie_jar_all_cookies (SOUP_COOKIE_JAR (jar));
-
-    /* HTTP Cookies/ Web Cookies */
-    for (; cookies != NULL; cookies = g_slist_next (cookies))
-    {
-        const gchar* domain = ((SoupCookie*)cookies->data)->domain;
-        if (midori_web_settings_get_site_data_policy (settings, domain)
-         == MIDORI_SITE_DATA_PRESERVE)
-            continue;
-        soup_cookie_jar_delete_cookie ((SoupCookieJar*)jar, cookies->data);
-    }
-    soup_cookies_free (cookies);
-#endif
 
     /* Local shared objects/ Flash cookies */
     if (midori_web_settings_has_plugin_support ())
@@ -324,17 +305,7 @@
     #endif
     }
 
-#ifdef HAVE_WEBKIT2
     /* TODO: clear databases and offline app caches */
-#else
-    /* HTML5 databases */
-    webkit_remove_all_web_databases ();
-
-    /* HTML5 offline application caches */
-    /* Changing the size implies clearing the cache */
-    webkit_application_cache_set_maximum_size (
-        webkit_application_cache_get_maximum_size () - 1);
-#endif
 }
 
 static void
@@ -358,17 +329,7 @@
 static void
 midori_clear_web_cache_cb (void)
 {
-#ifdef HAVE_WEBKIT2
     webkit_web_context_clear_cache (webkit_web_context_get_default ());
-#else
-    SoupSession* session = webkit_get_default_session ();
-    SoupSessionFeature* feature = soup_session_get_feature (session, SOUP_TYPE_CACHE);
-    gchar* cache = g_build_filename (midori_paths_get_cache_dir (), "web", NULL);
-    soup_cache_clear (SOUP_CACHE (feature));
-    soup_cache_flush (SOUP_CACHE (feature));
-    midori_paths_remove_path (cache);
-    g_free (cache);
-#endif
 }
 
 void

=== modified file 'midori/midori-searchaction.c'
--- midori/midori-searchaction.c	2015-07-06 21:26:46 +0000
+++ midori/midori-searchaction.c	2016-09-20 20:57:01 +0000
@@ -914,125 +914,8 @@
 midori_search_action_get_engine_for_form (WebKitWebView*     web_view,
                                           PangoEllipsizeMode ellipsize)
 {
-#ifndef HAVE_WEBKIT2
-    WebKitWebFrame* focused_frame;
-    WebKitDOMDocument* doc;
-    WebKitDOMHTMLFormElement* active_form;
-    WebKitDOMHTMLCollection* form_nodes;
-    WebKitDOMElement* active_element;
-    gchar* token_element;
-    const gchar* title;
-    GString* uri_str;
-    gulong form_len;
-    const gchar* action;
-    guint i;
-    KatzeItem* item;
-    gchar** parts;
-
-    focused_frame = webkit_web_view_get_focused_frame (web_view);
-    if (focused_frame == NULL)
-        return NULL;
-    #if WEBKIT_CHECK_VERSION (1, 9, 5)
-    doc = webkit_web_frame_get_dom_document (focused_frame);
-    #else
-    if (focused_frame != webkit_web_view_get_main_frame (web_view))
-        return NULL;
-    doc = webkit_web_view_get_dom_document (web_view);
-    #endif
-
-    active_element = webkit_dom_html_document_get_active_element ((WebKitDOMHTMLDocument*)doc);
-    if (!WEBKIT_DOM_IS_HTML_INPUT_ELEMENT (active_element))
-        return NULL;
-
-    active_form = webkit_dom_html_input_element_get_form ((WebKitDOMHTMLInputElement*)active_element);
-    if (!active_form)
-        return NULL;
-
-    token_element = webkit_dom_element_get_attribute (active_element, "name");
-
-    form_nodes = webkit_dom_html_form_element_get_elements (active_form);
-    form_len = webkit_dom_html_form_element_get_length (active_form);
-
-    /* action NULL or "": relative path */
-    if ((action = webkit_dom_html_form_element_get_action (active_form)) && *action)
-        uri_str = g_string_new (action);
-    else
-    {
-        gchar* hostname = midori_uri_parse_hostname (webkit_web_view_get_uri (web_view), NULL);
-        uri_str = g_string_new ("http://");
-        g_string_append (uri_str, hostname);
-        g_free (hostname);
-    }
-    g_string_append_c (uri_str, '?');
-
-    for (i = 0; i < form_len; i++)
-    {
-        WebKitDOMNode* form_node = webkit_dom_html_collection_item (form_nodes, i);
-        WebKitDOMElement* form_element = (WebKitDOMElement*) form_node;
-        gchar* name = webkit_dom_element_get_attribute (form_element, "name");
-
-        if (name && *name)
-        {
-            if (!g_strcmp0 (token_element, name))
-                g_string_append_printf (uri_str, "%s=%s&", name, "\%s");
-            else
-            {
-                gchar* value;
-                if (!g_strcmp0 (webkit_dom_element_get_tag_name (form_element), "SELECT"))
-                {
-                    WebKitDOMHTMLSelectElement* select_element = (WebKitDOMHTMLSelectElement*) form_element;
-                    gulong pos = webkit_dom_html_select_element_get_selected_index (select_element);
-                    WebKitDOMNode* selected_node = webkit_dom_html_select_element_item (select_element, pos);
-                    WebKitDOMElement* selected_element = (WebKitDOMElement*) selected_node;
-
-                    value = webkit_dom_element_get_attribute (selected_element, "value");
-                }
-                else
-                    value = webkit_dom_element_get_attribute (form_element, "value");
-
-                g_string_append_printf (uri_str, "%s=%s&", name, value);
-                g_free (value);
-            }
-            g_free (name);
-        }
-    }
-
-    if (!(title = webkit_web_view_get_title (web_view)))
-        title = webkit_web_view_get_uri (web_view);
-
-    item = katze_item_new ();
-    item->uri = g_string_free (uri_str, FALSE);
-    item->token = midori_search_action_token_for_uri (webkit_web_view_get_uri (web_view));
-
-    if (strstr (title, " - "))
-        parts = g_strsplit (title, " - ", 2);
-    else if (strstr (title, ": "))
-        parts = g_strsplit (title, ": ", 2);
-    else
-        parts = NULL;
-    if (parts != NULL)
-    {
-        /* See midori_view_set_title: title can be first or last */
-        if (ellipsize == PANGO_ELLIPSIZE_END)
-        {
-            katze_item_set_name (item, parts[0]);
-            katze_item_set_text (item, parts[1]);
-        }
-        else
-        {
-            katze_item_set_name (item, parts[1]);
-            katze_item_set_text (item, parts[2]);
-        }
-        g_strfreev (parts);
-    }
-    else
-        katze_item_set_name (item, title);
-
-    g_free (token_element);
-    return item;
-    #else
+    // TODO: Implement
     return NULL;
-    #endif
 }
 
 void

=== modified file 'midori/midori-session.c'
--- midori/midori-session.c	2015-03-23 11:33:24 +0000
+++ midori/midori-session.c	2016-09-20 20:57:01 +0000
@@ -17,300 +17,34 @@
 #include "sokoke.h"
 
 #include <glib/gi18n-lib.h>
-#include <libsoup/soup-cookie-jar-sqlite.h>
-#include <libsoup/soup-gnome-features.h>
-
-    #define LIBSOUP_USE_UNSTABLE_REQUEST_API
-    #include <libsoup/soup-cache.h>
-
-#ifndef HAVE_WEBKIT2
-static void
-midori_soup_session_set_proxy_uri (SoupSession* session,
-                                   const gchar* uri)
-{
-    SoupURI* proxy_uri;
-
-    /* soup_uri_new expects a non-NULL string with a protocol */
-    gchar* scheme = uri ? g_uri_parse_scheme (uri): NULL;
-    if (scheme)
-    {
-        proxy_uri = soup_uri_new (uri);
-        g_free (scheme);
-    }
-    else if (uri && *uri)
-    {
-        gchar* fixed_uri = g_strconcat ("http://", uri, NULL);
-        proxy_uri = soup_uri_new (fixed_uri);
-        g_free (fixed_uri);
-    }
-    else
-        proxy_uri = NULL;
-    g_object_set (session, "proxy-uri", proxy_uri, NULL);
-    if (proxy_uri)
-        soup_uri_free (proxy_uri);
-}
-
-static void
-soup_session_settings_notify_http_proxy_cb (MidoriWebSettings* settings,
-                                            GParamSpec*        pspec,
-                                            SoupSession*       session)
-{
-    gboolean uses_proxy = TRUE;
-    MidoriProxy proxy_type = katze_object_get_enum (settings, "proxy-type");
-    if (proxy_type == MIDORI_PROXY_AUTOMATIC)
-    {
-        soup_session_add_feature_by_type (session, SOUP_TYPE_PROXY_RESOLVER_GNOME);
-
-        GProxyResolver* resolver = g_proxy_resolver_get_default ();
-        gchar** proxies = g_proxy_resolver_lookup (resolver, "none", NULL, NULL);
-
-        if (!proxies || !g_strcmp0 (proxies[0], "direct://"))
-            uses_proxy = FALSE;
-        g_strfreev (proxies);
-    }
-    else if (proxy_type == MIDORI_PROXY_HTTP)
-    {
-        soup_session_remove_feature_by_type (session, SOUP_TYPE_PROXY_RESOLVER_GNOME);
-        gchar* proxy = katze_object_get_string (settings, "http-proxy");
-        GString* http_proxy = g_string_new (proxy);
-        g_string_append_printf (http_proxy, ":%d", katze_object_get_int (settings, "http-proxy-port"));
-        midori_soup_session_set_proxy_uri (session, http_proxy->str);
-        g_string_free (http_proxy, TRUE);
-        g_free (proxy);
-    }
-    else
-    {
-        uses_proxy = FALSE;
-        soup_session_remove_feature_by_type (session, SOUP_TYPE_PROXY_RESOLVER_GNOME);
-        midori_soup_session_set_proxy_uri (session, NULL);
-    }
-
-    /* If a proxy server looks to be active, we disable prefetching, otherwise
-       libSoup may be prefetching outside the proxy server beyond our control.
-     */
-
-    if (uses_proxy)
-        g_object_set (settings, "enable-dns-prefetching", FALSE, NULL);
-}
-#endif
-
-#if WEBKIT_CHECK_VERSION (1, 1, 21)
+#include <libsoup/soup-cookie-jar-db.h>
+#define LIBSOUP_USE_UNSTABLE_REQUEST_API
+#include <libsoup/soup-cache.h>
+
 static void
 soup_session_settings_notify_first_party_cb (MidoriWebSettings* settings,
                                              GParamSpec*        pspec,
                                              gpointer           user_data)
 {
     gboolean yes = katze_object_get_boolean (settings, "first-party-cookies-only");
-#ifdef HAVE_WEBKIT2
     WebKitWebContext* context = webkit_web_context_get_default ();
     WebKitCookieManager* cookie_manager = webkit_web_context_get_cookie_manager (context);
     webkit_cookie_manager_set_accept_policy (cookie_manager,
         yes ? WEBKIT_COOKIE_POLICY_ACCEPT_NO_THIRD_PARTY
             : WEBKIT_COOKIE_POLICY_ACCEPT_ALWAYS);
-#else
-    SoupSession* session = webkit_get_default_session ();
-    gpointer jar = soup_session_get_feature (session, SOUP_TYPE_COOKIE_JAR);
-    g_object_set (jar, "accept-policy",
-        yes ? SOUP_COOKIE_JAR_ACCEPT_NO_THIRD_PARTY
-            : SOUP_COOKIE_JAR_ACCEPT_ALWAYS, NULL);
-#endif
-}
-#endif
-
-#if !defined (HAVE_WEBKIT2)
-/* Implemented in MidoriLocationAction */
-void
-midori_map_add_message (SoupMessage* message);
-
-static void
-midori_soup_session_request_started_cb (SoupSession* session,
-                                        SoupMessage* message,
-                                        SoupSocket*  socket,
-                                        gpointer     user_data)
-{
-    midori_map_add_message (message);
-}
-#endif
-
-#ifndef HAVE_WEBKIT2
-const gchar*
-midori_web_settings_get_accept_language    (MidoriWebSettings* settings);
-
-static void
-midori_soup_session_settings_accept_language_cb (SoupSession*       session,
-                                                 SoupMessage*       msg,
-                                                 MidoriWebSettings* settings)
-{
-    const gchar* accept = midori_web_settings_get_accept_language (settings);
-    soup_message_headers_append (msg->request_headers, "Accept-Language", accept);
-
-    if (katze_object_get_boolean (settings, "strip-referer"))
-    {
-        const gchar* referer
-            = soup_message_headers_get_one (msg->request_headers, "Referer");
-        SoupURI* destination = soup_message_get_uri (msg);
-        SoupURI* stripped_uri;
-        if (referer && destination && !strstr (referer, destination->host)
-                    && (stripped_uri = soup_uri_new (referer)))
-        {
-            gchar* stripped_referer;
-            soup_uri_set_path (stripped_uri, "");
-            soup_uri_set_query (stripped_uri, NULL);
-            stripped_referer = soup_uri_to_string (stripped_uri, FALSE);
-            soup_uri_free (stripped_uri);
-            if (strcmp (stripped_referer, referer))
-            {
-                if (midori_debug ("referer"))
-                    g_message ("Referer '%s' stripped to '%s'", referer, stripped_referer);
-                soup_message_headers_replace (msg->request_headers, "Referer",
-                                              stripped_referer);
-            }
-            g_free (stripped_referer);
-        }
-
-        /* With HTTP, Host is optional. Strip to outsmart some filter proxies */
-        if (destination && destination->scheme == SOUP_URI_SCHEME_HTTP)
-            soup_message_headers_remove (msg->request_headers, "Host");
-    }
-}
-#endif
+}
 
 gboolean
 midori_load_soup_session (gpointer settings)
 {
-    #if WEBKIT_CHECK_VERSION (1, 1, 21)
     g_signal_connect (settings, "notify::first-party-cookies-only",
         G_CALLBACK (soup_session_settings_notify_first_party_cb), NULL);
-    #endif
-
-#ifndef HAVE_WEBKIT2
-    SoupSession* session = webkit_get_default_session ();
-
-    #ifndef G_OS_WIN32
-    g_object_set (session,
-                  "ssl-use-system-ca-file", TRUE,
-                  "ssl-strict", FALSE,
-                  NULL);
-    #else /* G_OS_WIN32 */
-    /* We cannot use "ssl-use-system-ca-file" on Windows
-     * some GTLS backend pieces are missing currently.
-     * Instead we specify the bundle we ship ourselves */
-    gchar* certificate_file = midori_paths_get_res_filename ("ca-bundle.crt");
-    g_object_set (session,
-                  "ssl-ca-file", certificate_file,
-                  "ssl-strict", FALSE,
-                  NULL);
-    g_free (certificate_file);
-    #endif
-
-    g_object_set_data (G_OBJECT (session), "midori-settings", settings);
-    soup_session_settings_notify_http_proxy_cb (settings, NULL, session);
-    g_signal_connect (settings, "notify::http-proxy",
-        G_CALLBACK (soup_session_settings_notify_http_proxy_cb), session);
-    g_signal_connect (settings, "notify::proxy-type",
-        G_CALLBACK (soup_session_settings_notify_http_proxy_cb), session);
-
-    g_signal_connect (session, "request-started",
-        G_CALLBACK (midori_soup_session_request_started_cb), session);
-    g_signal_connect (session, "request-queued",
-        G_CALLBACK (midori_soup_session_settings_accept_language_cb), settings);
-
-    soup_session_add_feature (session, SOUP_SESSION_FEATURE (midori_hsts_new ()));
-
-    if (midori_debug ("headers"))
-    {
-        SoupLogger* logger = soup_logger_new (SOUP_LOGGER_LOG_HEADERS, -1);
-        soup_logger_attach (logger, session);
-        g_object_unref (logger);
-    }
-    else if (midori_debug ("body"))
-    {
-        SoupLogger* logger = soup_logger_new (SOUP_LOGGER_LOG_BODY, -1);
-        soup_logger_attach (logger, session);
-        g_object_unref (logger);
-    }
-
-    g_object_set_data (G_OBJECT (session), "midori-session-initialized", (void*)1);
-#endif
     return FALSE;
 }
 
-#ifndef HAVE_WEBKIT2
-static void
-midori_session_cookie_jar_changed_cb (SoupCookieJar*     jar,
-                                      SoupCookie*        old_cookie,
-                                      SoupCookie*        new_cookie,
-                                      MidoriWebSettings* settings)
-{
-
-    if (midori_debug ("cookies"))
-    {
-        gchar* old = old_cookie ? soup_cookie_to_cookie_header (old_cookie) : NULL;
-        gchar* new = new_cookie ? soup_cookie_to_cookie_header (new_cookie) : NULL;
-        g_print ("cookie changed from %s to %s\n", old, new);
-        g_free (old);
-        g_free (new);
-    }
-
-    /* Don't allow revival of expiring cookies */
-    if (new_cookie && old_cookie && old_cookie->expires)
-        soup_cookie_set_expires (new_cookie, old_cookie->expires);
-
-    if (new_cookie && new_cookie->expires)
-    {
-        time_t expires = soup_date_to_time_t (new_cookie->expires);
-        gint age = katze_object_get_int (settings, "maximum-cookie-age");
-        /* An age of 0 to SoupCookie means already-expired
-           A user choosing 0 days probably expects 1 hour.
-         */
-        int seconds = age > 0 ? age * SOUP_COOKIE_MAX_AGE_ONE_DAY : SOUP_COOKIE_MAX_AGE_ONE_HOUR;
-        SoupDate* max_date = soup_date_new_from_now (seconds);
-        if (expires > soup_date_to_time_t (max_date))
-        {
-            if (midori_debug ("cookies"))
-            {
-                gchar* new_date = soup_date_to_string (max_date, SOUP_DATE_COOKIE);
-                g_print ("^^ enforcing expiry: %s\n", new_date);
-                g_free (new_date);
-            }
-            soup_cookie_set_expires (new_cookie, max_date);
-        }
-        soup_date_free (max_date);
-    }
-}
-#endif
-
 gboolean
 midori_load_soup_session_full (gpointer settings)
 {
-    #ifndef HAVE_WEBKIT2
-    SoupSession* session = webkit_get_default_session ();
-    SoupCookieJar* jar;
-    gchar* config_file;
-    SoupSessionFeature* feature;
-
-    midori_load_soup_session (settings);
-
-    config_file = midori_paths_get_config_filename_for_writing ("logins");
-    feature = g_object_new (KATZE_TYPE_HTTP_AUTH, "filename", config_file, NULL);
-    soup_session_add_feature (session, feature);
-    g_object_unref (feature);
-
-    katze_assign (config_file, midori_paths_get_config_filename_for_writing ("cookies.db"));
-    jar = soup_cookie_jar_sqlite_new (config_file, FALSE);
-    soup_session_add_feature (session, SOUP_SESSION_FEATURE (jar));
-    g_signal_connect (jar, "changed",
-                      G_CALLBACK (midori_session_cookie_jar_changed_cb), settings);
-    g_object_unref (jar);
-
-    katze_assign (config_file, g_build_filename (midori_paths_get_cache_dir (), "web", NULL));
-    feature = SOUP_SESSION_FEATURE (soup_cache_new (config_file, 0));
-    soup_session_add_feature (session, feature);
-    soup_cache_set_max_size (SOUP_CACHE (feature),
-        katze_object_get_int (settings, "maximum-cache-size") * 1024 * 1024);
-    soup_cache_load (SOUP_CACHE (feature));
-    g_free (config_file);
-    #endif
     return FALSE;
 }
 

=== modified file 'midori/midori-settings.vala'
--- midori/midori-settings.vala	2013-11-24 21:50:38 +0000
+++ midori/midori-settings.vala	2016-09-20 20:57:01 +0000
@@ -19,23 +19,6 @@
         FULLSCREEN
     }
     /* Since: 0.1.3 */
-#if !HAVE_WEBKIT2
-    public class Settings : WebKit.WebSettings {
-        /* Since: 0.5.0 */
-        public bool enable_javascript { get {
-            return enable_scripts;
-        } set {
-            enable_scripts = value;
-        } }
-        /* Since: 0.5.1 */
-        public string default_charset { owned get {
-            return default_encoding;
-        } set {
-            default_encoding = value;
-        } }
-        /* Since: 0.1.3 */
-        public bool zoom_text_and_images { get; set; default = true; }
-#else
     public class Settings : WebKit.Settings {
         public bool zoom_text_and_images { get {
             return !zoom_text_only;
@@ -47,7 +30,6 @@
         } set {
             WebKit.WebContext.get_default ().set_spell_checking_enabled (value);
         } }
-#endif
         public bool remember_last_window_size { get; set; default = true; }
         public int last_window_width { get; set; default = 0; }
         public int last_window_height { get; set; default = 0; }
@@ -62,6 +44,9 @@
         /* Since: 0.1.3 */
         public WindowState last_window_state { get; set; default = WindowState.NORMAL; }
 
+        GLib.HashTable<string, WebKit.UserStyleSheet> user_stylesheets;
+        public WebKit.UserContentManager user_content_manager { get; private set; default = new WebKit.UserContentManager(); }  
+
         /* Since: 0.4.8 */
         public uint inactivity_reset { get; set; default = 0; }
 
@@ -90,21 +75,7 @@
         public string? block_uris { get {
             return block_uris_regex != null ? block_uris_regex.get_pattern () : null;
         } set {
-#if !HAVE_WEBKIT2
-            if (value == null || value == "")
-                return;
-            if (block_uris_regex == null)
-                WebKit.get_default_session ().request_queued.connect ((msg) => {
-                    if (block_uris_regex.match (msg.uri.to_string (false)))
-                        msg.uri = new Soup.URI ("http://.invalid");
-                });
-            try {
-                block_uris_regex = new GLib.Regex (value);
-            }
-            catch (Error error) {
-                critical ("block-uris: %s", error.message);
-            }
-#endif
+            // TODO: Implement
         } }
 
         /**
@@ -189,5 +160,37 @@
                 || property == "user-stylesheet-uri"
                 || property.has_suffix ("-width");
         }
+
+        /* Adds a stylesheet to midori settings. Since: 0.5.12 */
+        public void add_style (string rule_id, string style)
+        {
+            if (user_stylesheets == null)
+                user_stylesheets = new GLib.HashTable<string, WebKit.UserStyleSheet>(str_hash, str_equal);
+
+            var ss = new WebKit.UserStyleSheet(style,
+                WebKit.UserContentInjectedFrames.ALL_FRAMES,
+                WebKit.UserStyleLevel.USER,
+                null, null);
+            user_stylesheets[rule_id]=ss;
+            user_content_manager.add_style_sheet (ss);
+        }
+
+        /* Removes a stylesheet from midori settings. Since: 0.5.12 */
+        public void remove_style (string rule_id)
+        {
+            if (user_stylesheets != null)
+            {
+                if (user_stylesheets.contains (rule_id))
+                {
+                    user_stylesheets.remove (rule_id);
+
+                    /* the API is rather silly: we have to remove all sheets and re-add all others */
+                    user_content_manager.remove_all_style_sheets ();
+                    user_stylesheets.foreach((key, ss) => {
+                        user_content_manager.add_style_sheet (ss);
+                    });
+                }
+            }
+        }
     }
 }

=== modified file 'midori/midori-speeddial.vala'
--- midori/midori-speeddial.vala	2015-06-11 22:33:48 +0000
+++ midori/midori-speeddial.vala	2016-09-20 20:57:01 +0000
@@ -32,10 +32,6 @@
         string filename;
         string? html = null;
         List<Spec> thumb_queue = null;
-#if !HAVE_WEBKIT2
-        WebKit.WebView thumb_view = null;
-        Spec? spec = null;
-#endif
 
         public GLib.KeyFile keyfile;
         public bool close_buttons_left { get; set; default = false; }
@@ -340,86 +336,7 @@
             refresh ();
         }
 
-#if !HAVE_WEBKIT2
-        void load_status (GLib.Object thumb_view_, ParamSpec pspec) {
-            if (thumb_view.load_status != WebKit.LoadStatus.FINISHED
-             && thumb_view.load_status != WebKit.LoadStatus.FAILED)
-                return;
-            thumb_view.notify["load-status"].disconnect (load_status);
-            /* Schedule an idle to give the offscreen time to draw */
-            Idle.add (save_thumbnail);
-        }
-#endif
-
-#if !HAVE_WEBKIT2
-        bool save_thumbnail () {
-            return_val_if_fail (spec != null, false);
-
-            var offscreen = (thumb_view.parent as Gtk.OffscreenWindow);
-            var pixbuf = offscreen.get_pixbuf ();
-            int image_width = pixbuf.get_width (), image_height = pixbuf.get_height ();
-            int thumb_width = 240, thumb_height = 160;
-            float image_ratio = image_width / image_height;
-            float thumb_ratio = thumb_width / thumb_height;
-            int x_offset, y_offset, computed_width, computed_height;
-            if (image_ratio > thumb_ratio) {
-                computed_width = (int)(image_height * thumb_ratio);
-                computed_height = image_height;
-                x_offset = (image_width - computed_width) / 2;
-                y_offset = 0;
-            }
-            else {
-                computed_width = image_width;
-                computed_height = (int)(image_width / thumb_ratio);
-                x_offset = 0;
-                y_offset = 0;
-            }
-            var sub = pixbuf;
-            if (y_offset + computed_height <= image_height)
-                sub = new Gdk.Pixbuf.subpixbuf (pixbuf, x_offset, y_offset, computed_width, computed_height);
-            var scaled = sub.scale_simple (thumb_width, thumb_height, Gdk.InterpType.TILES);
-            add_with_id (spec.dial_id, spec.uri, thumb_view.get_title () ?? spec.uri, scaled);
-
-            thumb_queue.remove (spec);
-            if (thumb_queue.length () > 0) {
-                spec = thumb_queue.nth_data (0);
-                thumb_view.notify["load-status"].connect (load_status);
-                thumb_view.load_uri (spec.uri);
-            }
-            return false;
-        }
-#endif
-
         void get_thumb (string dial_id, string uri) {
-#if !HAVE_WEBKIT2
-            if (thumb_view == null) {
-                thumb_view = new WebKit.WebView ();
-                thumb_view.settings.set (
-                    "enable-scripts", false,
-                    "enable-plugins", false,
-                    "auto-load-images", true,
-                    "enable-html5-database", false,
-                    "enable-html5-local-storage", false,
-                    "enable-java-applet", false);
-                var offscreen = new Gtk.OffscreenWindow ();
-                offscreen.add (thumb_view);
-                thumb_view.set_size_request (800, 600);
-                offscreen.show_all ();
-            }
-
-            /* Don't load thumbnails already queued */
-            foreach (var spec_ in thumb_queue)
-                if (spec_.dial_id == dial_id)
-                    return;
-
-            thumb_queue.append (new Spec (dial_id, uri));
-            if (thumb_queue.length () > 1)
-                return;
-
-            spec = thumb_queue.nth_data (0);
-            thumb_view.notify["load-status"].connect (load_status);
-            thumb_view.load_uri (spec.uri);
-#endif
         }
     }
 }

=== modified file 'midori/midori-tab.vala'
--- midori/midori-tab.vala	2015-04-19 14:06:12 +0000
+++ midori/midori-tab.vala	2016-09-20 20:57:01 +0000
@@ -44,6 +44,7 @@
 
     public class Tab : Gtk.VBox {
         public Tab related { get; set construct; }
+        public WebKit.UserContentManager user_content_manager { private get; set construct; }
         public WebKit.WebView web_view { get; private set; }
 
         private string current_uri = "about:blank";
@@ -133,30 +134,13 @@
             orientation = Gtk.Orientation.VERTICAL;
             #endif
 
-#if HAVE_WEBKIT2_3_91
-            web_view = related != null ?
-              new WebKit.WebView.with_related_view (related.web_view) : new WebKit.WebView ();
-#else
-            web_view = new WebKit.WebView ();
-#endif
-            /* Load something to avoid a bug where WebKit might not set a main frame */
-            web_view.load_uri ("");
+            if (related != null)
+                web_view = (WebKit.WebView)GLib.Object.new(typeof (WebKit.WebView), "user-content-manager", user_content_manager, "related-view", related.web_view);
+            else
+                web_view = (WebKit.WebView)GLib.Object.new(typeof (WebKit.WebView), "user-content-manager", user_content_manager);
         }
 
         public void inject_stylesheet (string stylesheet) {
-#if !HAVE_WEBKIT2
-            var dom = web_view.get_dom_document ();
-            return_if_fail (dom.head != null);
-            try {
-                var style = dom.create_element ("style");
-                style.set_attribute ("type", "text/css");
-                style.append_child (dom.create_text_node (stylesheet));
-                dom.head.append_child (style);
-            }
-            catch (Error error) {
-                critical (_("Failed to inject stylesheet: %s"), error.message);
-            }
-#endif
         }
 
         /* Since: 0.5.1
@@ -219,10 +203,6 @@
                 return false;
             if (view_source)
                 return false;
-#if !HAVE_WEBKIT2
-            if (web_view.get_main_frame ().get_data_source ().get_data () == null)
-                return false;
-#endif
             return true;
         }
 
@@ -239,13 +219,9 @@
         }
 
         public void unmark_text_matches () {
-#if !HAVE_WEBKIT2
-            web_view.unmark_text_matches ();
-#endif
         }
 
         public bool find (string text, bool case_sensitive, bool forward) {
-#if HAVE_WEBKIT2
             var controller = web_view.get_find_controller ();
             uint options = WebKit.FindOptions.WRAP_AROUND;
             if (!case_sensitive)
@@ -255,13 +231,6 @@
             controller.search (text, options, 0);
             // FIXME: mark matches, count matches, not found
             return true;
-#else
-            bool found = false;
-            found = web_view.search_text (text, case_sensitive, forward, true);
-            web_view.mark_text_matches (text, case_sensitive, 0);
-            web_view.set_highlight_text_matches (true);
-            return found;
-#endif
         }
 
         /*
@@ -270,7 +239,6 @@
           Since: 0.5.8
          */
         public async void update_actions (Gtk.ActionGroup actions) {
-#if HAVE_WEBKIT2
             try {
                 actions.get_action ("Undo").sensitive = yield web_view.can_execute_editing_command ("Undo", null);
                 actions.get_action ("Redo").sensitive = yield web_view.can_execute_editing_command ("Redo", null);
@@ -282,15 +250,6 @@
             } catch (Error error) {
                 critical ("Failed to update actions: %s", error.message);
             }
-#else
-            actions.get_action ("Undo").sensitive = web_view.can_undo ();
-            actions.get_action ("Redo").sensitive = web_view.can_redo ();
-            actions.get_action ("Cut").sensitive = web_view.can_cut_clipboard ();
-            actions.get_action ("Copy").sensitive = web_view.can_copy_clipboard ();
-            actions.get_action ("Paste").sensitive = web_view.can_paste_clipboard ();
-            actions.get_action ("Delete").sensitive = web_view.can_cut_clipboard ();
-            actions.get_action ("SelectAll").sensitive = true;
-#endif
         }
     }
 }

=== modified file 'midori/midori-view.c'
--- midori/midori-view.c	2016-02-28 00:07:54 +0000
+++ midori/midori-view.c	2016-09-20 20:57:01 +0000
@@ -27,11 +27,6 @@
     #include <gcr/gcr.h>
 #endif
 
-#if !defined (HAVE_WEBKIT2)
-SoupMessage*
-midori_map_get_message (SoupMessage* message);
-#endif
-
 #include <string.h>
 #include <stdlib.h>
 #include <glib/gi18n.h>
@@ -61,7 +56,6 @@
 _midori_view_set_settings (MidoriView*        view,
                            MidoriWebSettings* settings);
 
-#ifdef HAVE_WEBKIT2
 static void
 midori_view_uri_scheme_res (WebKitURISchemeRequest* request,
                             gpointer                user_data);
@@ -74,7 +68,6 @@
 midori_view_download_query_action (MidoriView*     view,
                                    WebKitDownload*   download,
                                    const gchar * suggested_filename );
-#endif
 
 static gboolean
 midori_view_display_error (MidoriView*     view,
@@ -85,11 +78,7 @@
                            const gchar*    description,
                            const gchar*    suggestions,
                            const gchar*    try_again,
-#ifndef HAVE_WEBKIT2
-                           WebKitWebFrame* web_frame);
-#else
                            void*           web_frame);
-#endif
 
 struct _MidoriView
 {
@@ -496,7 +485,6 @@
 _midori_web_view_load_icon (MidoriView* view)
 {
     GdkPixbuf* pixbuf = NULL;
-    #ifdef HAVE_WEBKIT2
     cairo_surface_t* surface = webkit_web_view_get_favicon (WEBKIT_WEB_VIEW (view->web_view));
     if (surface != NULL
      && (pixbuf = gdk_pixbuf_get_from_surface (surface, 0, 0,
@@ -505,11 +493,6 @@
     {
         midori_view_apply_icon (view, G_ICON (pixbuf), view->icon_uri);
     }
-    #else
-    if ((pixbuf = webkit_web_view_try_get_favicon_pixbuf (
-        WEBKIT_WEB_VIEW (view->web_view), 0, 0)))
-        midori_view_apply_icon (view, G_ICON (pixbuf), view->icon_uri);
-    #endif
 }
 
 static void
@@ -537,45 +520,20 @@
                           GTlsCertificateFlags* tls_flags,
                           gchar**               hostname)
 {
-    #ifdef HAVE_WEBKIT2
     WebKitWebView* web_view = WEBKIT_WEB_VIEW (view->web_view);
     *hostname = midori_uri_parse_hostname (webkit_web_view_get_uri (web_view), NULL);
     gboolean success = webkit_web_view_get_tls_info (web_view, tls_cert, tls_flags);
     if (*tls_cert != NULL)
         g_object_ref (*tls_cert);
     return success && *tls_flags == 0;
-    #else
-    SoupMessage* message = midori_map_get_message (webkit_network_request_get_message (request));
-    if (message != NULL)
-    {
-        SoupURI* uri = soup_message_get_uri (message);
-        *hostname = uri ? g_strdup (uri->host) : NULL;
-        g_object_get (message, "tls-certificate", tls_cert, "tls-errors", tls_flags, NULL);
-        if (soup_message_get_flags (message) & SOUP_MESSAGE_CERTIFICATE_TRUSTED)
-            return TRUE;
-        return *tls_flags == 0;
-    }
-    *tls_cert = NULL;
-    *tls_flags = 0;
-    *hostname = NULL;
-    return FALSE;
-    #endif
 }
 
 static gboolean
 midori_view_web_view_navigation_decision_cb (WebKitWebView*             web_view,
-                                             #ifdef HAVE_WEBKIT2
                                              WebKitPolicyDecision*      decision,
                                              WebKitPolicyDecisionType   decision_type,
-                                             #else
-                                             WebKitWebFrame*            web_frame,
-                                             WebKitNetworkRequest*      request,
-                                             WebKitWebNavigationAction* action,
-                                             WebKitWebPolicyDecision*   decision,
-                                             #endif
                                              MidoriView*                view)
 {
-    #ifdef HAVE_WEBKIT2
     if (decision_type == WEBKIT_POLICY_DECISION_TYPE_RESPONSE)
     {
         WebKitURIResponse* response = webkit_response_policy_decision_get_response (
@@ -610,9 +568,6 @@
 
     WebKitURIRequest * request = webkit_navigation_policy_decision_get_request (WEBKIT_NAVIGATION_POLICY_DECISION (decision));
     const gchar* uri = webkit_uri_request_get_uri (request);
-    #else
-    const gchar* uri = webkit_network_request_get_uri (request);
-    #endif
     if (g_str_has_prefix (uri, "geo:") && strstr (uri, ","))
     {
         gchar* new_uri = sokoke_magic_uri (uri, TRUE, FALSE);
@@ -624,42 +579,34 @@
     {
         /* For security reasons, main content served as data: is limited to images
            http://lcamtuf.coredump.cx/switch/ */
-        #ifdef HAVE_WEBKIT2
         webkit_policy_decision_ignore (decision);
-        #else
-        webkit_web_policy_decision_ignore (decision);
-        #endif
         return TRUE;
     }
-    #ifdef HAVE_GCR
-    else if (/* midori_tab_get_special (MIDORI_TAB (view)) && */ !strncmp (uri, "https", 5))
+    else if (midori_tab_get_special (MIDORI_TAB (view)) && !strncmp (uri, "https", 5))
     {
         /* We show an error page if the certificate is invalid.
            If a "special", unverified page loads a form, it must be that page.
            if (webkit_web_navigation_action_get_reason (action) == WEBKIT_WEB_NAVIGATION_REASON_FORM_SUBMITTED)
            FIXME: Verify more stricly that this cannot be eg. a simple Reload */
-        #ifdef HAVE_WEBKIT2
         if (decision_type == WEBKIT_POLICY_DECISION_TYPE_NAVIGATION_ACTION)
-        #else
-        if (webkit_web_navigation_action_get_reason (action) == WEBKIT_WEB_NAVIGATION_REASON_RELOAD)
-        #endif
         {
-            GTlsCertificate* tls_cert;
-            GTlsCertificateFlags tls_flags;
-            gchar* hostname;
-            if (!midori_view_get_tls_info (view, request, &tls_cert, &tls_flags, &hostname)
-             && tls_cert != NULL)
+            gchar* hostname = midori_uri_parse_hostname (uri, NULL);
+            g_return_val_if_fail (hostname != NULL, FALSE);
+            GTlsCertificate* cert = g_object_get_data (G_OBJECT (view->web_view), "tls-cert");
+            g_return_val_if_fail (cert != NULL, FALSE);
+            webkit_web_context_allow_tls_certificate_for_host (webkit_web_context_get_default (),
+                cert, hostname);
+            if (cert != NULL)
             {
-                GcrCertificate* gcr_cert;
-                GByteArray* der_cert;
-
-                g_object_get (tls_cert, "certificate", &der_cert, NULL);
-                gcr_cert = gcr_simple_certificate_new (der_cert->data, der_cert->len);
-                g_byte_array_unref (der_cert);
-                if (hostname && !gcr_trust_is_certificate_pinned (gcr_cert, GCR_PURPOSE_SERVER_AUTH, hostname, NULL, NULL))
+                GByteArray* der;
+                g_object_get (cert, "certificate", &der, NULL);
+                GcrCertificate* gcr = gcr_simple_certificate_new (der->data, der->len);
+                g_return_val_if_fail (gcr != NULL, FALSE);
+                // FIXME: g_object_unref (der);
+                if (hostname && !gcr_trust_is_certificate_pinned (gcr, GCR_PURPOSE_SERVER_AUTH, hostname, NULL, NULL))
                 {
                     GError* error = NULL;
-                    gcr_trust_add_pinned_certificate (gcr_cert, GCR_PURPOSE_SERVER_AUTH, hostname, NULL, &error);
+                    gcr_trust_add_pinned_certificate (gcr, GCR_PURPOSE_SERVER_AUTH, hostname, NULL, &error);
                     if (error != NULL)
                     {
                         gchar* slots = g_strjoinv (" , ", (gchar**)gcr_pkcs11_get_trust_lookup_uris ());
@@ -675,14 +622,11 @@
                         g_error_free (error);
                     }
                 }
-                g_object_unref (gcr_cert);
+                g_object_unref (gcr);
             }
-            if (tls_cert != NULL)
-                g_object_unref (tls_cert);
             g_free (hostname);
         }
     }
-    #endif
 
     if (katze_item_get_meta_integer (view->item, "delay") == MIDORI_DELAY_PENDING_UNDELAY)
     {
@@ -690,39 +634,11 @@
         katze_item_set_meta_integer (view->item, "delay", MIDORI_DELAY_UNDELAYED);
     }
 
-    #ifndef HAVE_WEBKIT2
-    /* Remove link labels */
-    JSContextRef js_context = webkit_web_frame_get_global_context (web_frame);
-    gchar* result = sokoke_js_script_eval (js_context,
-        "(function (links) {"
-        "if (links != undefined && links.length > 0) {"
-        "   for (var i = links.length - 1; i >= 0; i--) {"
-        "       var parent = links[i].parentNode;"
-        "       parent.removeChild(links[i]); } } }) ("
-        "document.getElementsByClassName ('midoriHKD87346'));",
-        NULL);
-    g_free (result);
-    result = sokoke_js_script_eval (js_context,
-        "(function (links) {"
-        "if (links != undefined && links.length > 0) {"
-        "   for (var i = links.length - 1; i >= 0; i--) {"
-        "       var parent = links[i].parentNode;"
-        "       parent.removeChild(links[i]); } } }) ("
-        "document.getElementsByClassName ('midori_access_key_fc04de'));",
-        NULL);
-    g_free (result);
-    view->find_links = -1;
-    #endif
-
     gboolean handled = FALSE;
     g_signal_emit_by_name (view, "navigation-requested", uri, &handled);
     if (handled)
     {
-        #ifdef HAVE_WEBKIT2
         webkit_policy_decision_ignore (decision);
-        #else
-        webkit_web_policy_decision_ignore (decision);
-        #endif
         return TRUE;
     }
 
@@ -764,54 +680,6 @@
     g_object_set (view, "title", NULL, NULL);
     midori_view_unset_icon (view);
 
-    if (!strncmp (uri, "https", 5))
-    {
-        #ifdef HAVE_WEBKIT2
-        void* request = NULL;
-        #else
-        WebKitWebFrame* web_frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (view->web_view));
-        WebKitWebDataSource* source = webkit_web_frame_get_data_source (web_frame);
-        WebKitNetworkRequest* request = webkit_web_data_source_get_request (source);
-        #endif
-        GTlsCertificate* tls_cert;
-        GTlsCertificateFlags tls_flags;
-        gchar* hostname;
-        if (midori_view_get_tls_info (view, request, &tls_cert, &tls_flags, &hostname))
-            midori_tab_set_security (MIDORI_TAB (view), MIDORI_SECURITY_TRUSTED);
-        #ifdef HAVE_GCR
-        else if (!midori_tab_get_special (MIDORI_TAB (view)) && tls_cert != NULL)
-        {
-            GcrCertificate* gcr_cert;
-            GByteArray* der_cert;
-
-            g_object_get (tls_cert, "certificate", &der_cert, NULL);
-            gcr_cert = gcr_simple_certificate_new (der_cert->data, der_cert->len);
-            g_byte_array_unref (der_cert);
-            if (gcr_trust_is_certificate_pinned (gcr_cert, GCR_PURPOSE_SERVER_AUTH, hostname, NULL, NULL))
-                midori_tab_set_security (MIDORI_TAB (view), MIDORI_SECURITY_TRUSTED);
-            else
-            {
-                midori_tab_set_security (MIDORI_TAB (view), MIDORI_SECURITY_UNKNOWN);
-                midori_tab_stop_loading (MIDORI_TAB (view));
-                midori_view_display_error (view, NULL, NULL, NULL, _("Security unknown"),
-                    midori_location_action_tls_flags_to_string (tls_flags), NULL,
-                    _("Trust this website"),
-                    NULL);
-            }
-            g_object_unref (gcr_cert);
-        }
-        #endif
-        else
-            midori_tab_set_security (MIDORI_TAB (view), MIDORI_SECURITY_UNKNOWN);
-        #ifdef HAVE_GCR
-        if (tls_cert != NULL)
-            g_object_unref (tls_cert);
-        g_free (hostname);
-        #endif
-    }
-    else
-        midori_tab_set_security (MIDORI_TAB (view), MIDORI_SECURITY_NONE);
-
     view->find_links = -1;
     
     midori_view_update_load_status (view, MIDORI_LOAD_COMMITTED);
@@ -828,7 +696,6 @@
     midori_tab_set_progress (MIDORI_TAB (view), progress);
 }
 
-#ifdef HAVE_WEBKIT2
 static void
 midori_view_uri_scheme_res (WebKitURISchemeRequest* request,
                             gpointer                user_data)
@@ -836,17 +703,6 @@
     const gchar* uri = webkit_uri_scheme_request_get_uri (request);
     WebKitWebView* web_view = webkit_uri_scheme_request_get_web_view (request);
     MidoriView* view = midori_view_get_for_widget (GTK_WIDGET (web_view));
-#else
-static void
-midori_view_web_view_resource_request_cb (WebKitWebView*         web_view,
-                                          WebKitWebFrame*        web_frame,
-                                          WebKitWebResource*     web_resource,
-                                          WebKitNetworkRequest*  request,
-                                          WebKitNetworkResponse* response,
-                                          MidoriView*            view)
-{
-    const gchar* uri = webkit_network_request_get_uri (request);
-#endif
 
     /* Only apply custom URIs to special pages for security purposes */
     if (!midori_tab_get_special (MIDORI_TAB (view)))
@@ -855,7 +711,6 @@
     if (g_str_has_prefix (uri, "res://"))
     {
         gchar* filepath = midori_paths_get_res_filename (&uri[6]);
-        #ifdef HAVE_WEBKIT2
         gchar* contents;
         gsize length;
         if (g_file_get_contents (filepath, &contents, &length, NULL))
@@ -868,11 +723,6 @@
             g_free (mime_type);
             g_free (content_type);
         }
-        #else
-        gchar* file_uri = g_filename_to_uri (filepath, NULL, NULL);
-        webkit_network_request_set_uri (request, file_uri);
-        g_free (file_uri);
-        #endif
         g_free (filepath);
     }
     else if (g_str_has_prefix (uri, "stock://"))
@@ -936,14 +786,9 @@
             encoded = g_base64_encode ((guchar*)buffer, buffer_size);
             data_uri = g_strconcat ("data:image/png;base64,", encoded, NULL);
             g_free (encoded);
-            #ifdef HAVE_WEBKIT2
             GInputStream* stream = g_memory_input_stream_new_from_data (buffer, buffer_size, g_free);
             webkit_uri_scheme_request_finish (request, stream, -1, "image/png");
             g_object_unref (stream);
-            #else
-            g_free (buffer);
-            webkit_network_request_set_uri (request, data_uri);
-            #endif
             g_free (data_uri);
             return;
         }
@@ -1032,7 +877,6 @@
     return infobar;
 }
 
-#ifdef HAVE_WEBKIT2
 static gboolean
 midori_view_web_view_permission_request_cb (WebKitWebView*           web_view,
                                             WebKitPermissionRequest* decision,
@@ -1044,86 +888,6 @@
     } */
     return FALSE;
 }
-#else
-static void
-midori_view_database_response_cb (GtkWidget*         infobar,
-                                  gint               response,
-                                  WebKitWebDatabase* database)
-{
-    if (response != GTK_RESPONSE_ACCEPT)
-    {
-        WebKitSecurityOrigin* origin = webkit_web_database_get_security_origin (database);
-        webkit_security_origin_set_web_database_quota (origin, 0);
-        webkit_web_database_remove (database);
-    }
-    /* TODO: Remember the decision */
-}
-
-static void
-midori_view_web_view_database_quota_exceeded_cb (WebKitWebView*     web_view,
-                                                 WebKitWebFrame*    web_frame,
-                                                 WebKitWebDatabase* database,
-                                                 MidoriView*        view)
-{
-    const gchar* uri = webkit_web_frame_get_uri (web_frame);
-    MidoriSiteDataPolicy policy = midori_web_settings_get_site_data_policy (view->settings, uri);
-
-    switch (policy)
-    {
-    case MIDORI_SITE_DATA_BLOCK:
-    {
-        WebKitSecurityOrigin* origin = webkit_web_database_get_security_origin (database);
-        webkit_security_origin_set_web_database_quota (origin, 0);
-        webkit_web_database_remove (database);
-    }
-    case MIDORI_SITE_DATA_ACCEPT:
-    case MIDORI_SITE_DATA_PRESERVE:
-        return;
-    case MIDORI_SITE_DATA_UNDETERMINED:
-    {
-        gchar* hostname = midori_uri_parse_hostname (uri, NULL);
-        gchar* message = g_strdup_printf (_("%s wants to save an HTML5 database."),
-                                          hostname && *hostname ? hostname : uri);
-        midori_view_add_info_bar (view, GTK_MESSAGE_QUESTION, message,
-            G_CALLBACK (midori_view_database_response_cb), database,
-            _("_Deny"), GTK_RESPONSE_REJECT, _("_Allow"), GTK_RESPONSE_ACCEPT,
-            NULL);
-        g_free (hostname);
-        g_free (message);
-    }
-    }
-}
-
-static void
-midori_view_location_response_cb (GtkWidget*                       infobar,
-                                  gint                             response,
-                                  WebKitGeolocationPolicyDecision* decision)
-{
-    if (response == GTK_RESPONSE_ACCEPT)
-        webkit_geolocation_policy_allow (decision);
-    else
-        webkit_geolocation_policy_deny (decision);
-}
-
-static gboolean
-midori_view_web_view_geolocation_decision_cb (WebKitWebView*                   web_view,
-                                              WebKitWebFrame*                  web_frame,
-                                              WebKitGeolocationPolicyDecision* decision,
-                                              MidoriView*                      view)
-{
-    const gchar* uri = webkit_web_frame_get_uri (web_frame);
-    gchar* hostname = midori_uri_parse_hostname (uri, NULL);
-    gchar* message = g_strdup_printf (_("%s wants to know your location."),
-                                     hostname && *hostname ? hostname : uri);
-    midori_view_add_info_bar (view, GTK_MESSAGE_QUESTION,
-        message, G_CALLBACK (midori_view_location_response_cb), decision,
-        _("_Deny"), GTK_RESPONSE_REJECT, _("_Allow"), GTK_RESPONSE_ACCEPT,
-        NULL);
-    g_free (hostname);
-    g_free (message);
-    return TRUE;
-}
-#endif
 
 void
 midori_view_set_html (MidoriView*     view,
@@ -1137,23 +901,10 @@
     WebKitWebView* web_view = WEBKIT_WEB_VIEW (view->web_view);
     if (!uri)
         uri = "about:blank";
-#ifndef HAVE_WEBKIT2
-    WebKitWebFrame* main_frame = webkit_web_view_get_main_frame (web_view);
-    if (!web_frame)
-        web_frame = main_frame;
-    if (web_frame == main_frame)
-    {
-        katze_item_set_uri (view->item, uri);
-        midori_tab_set_special (MIDORI_TAB (view), TRUE);
-    }
-    webkit_web_frame_load_alternate_string (
-        web_frame, data, uri, uri);
-#else
     /* XXX: with webkit2 ensure child frames do not set tab URI/special/html */
     katze_item_set_uri (view->item, uri);
     midori_tab_set_special (MIDORI_TAB (view), TRUE);
     webkit_web_view_load_alternate_html (web_view, data, uri, uri);
-#endif
 }
 
 static gboolean
@@ -1165,11 +916,7 @@
                            const gchar*    description,
                            const gchar*    suggestions,
                            const gchar*    try_again,
-#ifndef HAVE_WEBKIT2
-                           WebKitWebFrame* web_frame)
-#else
                            void*           web_frame)
-#endif
 {
     gchar* path = midori_paths_get_res_filename ("error.html");
     gchar* template;
@@ -1182,11 +929,7 @@
         gchar* result;
         gboolean is_main_frame;
 
-        #ifdef HAVE_WEBKIT2
         is_main_frame = TRUE;
-        #else
-        is_main_frame = web_frame && (webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (view->web_view)) == web_frame);
-        #endif
 
         #if !GTK_CHECK_VERSION (3, 0, 0)
         /* g_object_get_valist: object class `GtkSettings' has no property named `gtk-button-images' */
@@ -1234,11 +977,7 @@
 
 static gboolean
 webkit_web_view_load_error_cb (WebKitWebView*  web_view,
-#ifdef HAVE_WEBKIT2
                                WebKitLoadEvent load_event,
-#else
-                               WebKitWebFrame* web_frame,
-#endif
                                const gchar*    uri,
                                GError*         error,
                                MidoriView*     view)
@@ -1247,12 +986,8 @@
     didFailProvisionalLoadWithErrorForFrame early-returns if the frame isn't
     main, so we know that the pertinent frame here is the view's main frame--so
     it's safe for midori_view_display_error to assume it fills in a main frame*/
-    #ifdef HAVE_WEBKIT2
     void* web_frame = NULL;
     void* main_frame = NULL;
-    #else
-    WebKitWebFrame* main_frame = webkit_web_view_get_main_frame (web_view);
-    #endif
     gchar* title;
     gchar* message;
     gboolean result;
@@ -1332,95 +1067,54 @@
     }
 }
 
+static gboolean
+midori_view_web_view_tls_error_cb (WebKitWebView*       web_view,
+                                   const gchar*         failing_uri,
+                                   GTlsCertificate*     cert,
+                                   GTlsCertificateFlags errors,
+                                   MidoriView*          view)
+{
+    GByteArray* der = NULL;
+    g_object_get (cert, "certificate", &der, NULL);
+    g_return_val_if_fail (der != NULL, FALSE);
+    GcrCertificate* gcr = gcr_simple_certificate_new (der->data, der->len);
+    // FIXME: g_object_unref (der);
+    g_return_val_if_fail (gcr != NULL, FALSE);
+    gchar* hostname = midori_uri_parse_hostname (failing_uri, NULL);
+    g_return_val_if_fail (hostname != NULL, FALSE);
+    if (gcr_trust_is_certificate_pinned (gcr, GCR_PURPOSE_SERVER_AUTH, hostname, NULL, NULL))
+    {
+        webkit_web_context_allow_tls_certificate_for_host (webkit_web_context_get_default (),
+            cert, hostname);
+        webkit_web_view_load_uri (web_view, failing_uri);
+    }
+    else
+    {
+        midori_view_display_error (view, NULL, NULL, NULL, _("Security unknown"),
+            midori_location_action_tls_flags_to_string (errors), NULL,
+            _("Trust this website"), NULL);
+        g_object_set_data_full (G_OBJECT (web_view), "cert", g_object_ref (cert), (GDestroyNotify)g_object_unref);
+        // FIXME: g_object_set_data_full (G_OBJECT (web_view), "uri", g_strdup (failing_uri), (GDestroyNotify)g_free);
+        midori_tab_set_load_error (MIDORI_TAB (view), MIDORI_LOAD_ERROR_SECURITY);
+        midori_tab_set_security (MIDORI_TAB (view), MIDORI_SECURITY_UNKNOWN);
+    }
+    g_free (hostname);
+    g_object_unref (gcr);
+    return TRUE;
+}
+
 static void
 midori_view_load_finished (MidoriView* view)
 {
+    if (midori_tab_get_load_error (MIDORI_TAB (view)) == MIDORI_LOAD_ERROR_SECURITY)
+        midori_tab_set_security (MIDORI_TAB (view), MIDORI_SECURITY_UNKNOWN);
+    else if (!strncmp (midori_tab_get_uri (MIDORI_TAB (view)), "https", 5))
+        midori_tab_set_security (MIDORI_TAB (view), MIDORI_SECURITY_TRUSTED);
     midori_view_apply_scroll_position (view);
-    #ifndef HAVE_WEBKIT2
-
-    {
-        WebKitWebFrame* web_frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (view->web_view));
-        JSContextRef js_context = webkit_web_frame_get_global_context (web_frame);
-        /* Icon: URI, News Feed: $URI|title, Search: :URI|title */
-        gchar* value = sokoke_js_script_eval (js_context,
-        "(function (l) { var f = new Array (); for (var i in l) "
-        "{ var t = l[i].type; var r = l[i].rel; "
-        "if (t && (t.indexOf ('rss') != -1 || t.indexOf ('atom') != -1)) "
-        "f.push ('$' + l[i].href + '|' + l[i].title);"
-        "else if (r == 'search' && t == 'application/opensearchdescription+xml') "
-        "f.push (':' + l[i].href + '|' + l[i].title); } "
-        "return f; })("
-        "document.getElementsByTagName ('link'));", NULL);
-
-        /* FIXME: If URI or title contains , parsing will break */
-        gchar** items = g_strsplit (value, ",", 0);
-        gchar** current_item = items;
-        gchar* default_uri = NULL;
-
-        if (view->news_feeds != NULL)
-            katze_array_clear (view->news_feeds);
-        else
-            view->news_feeds = katze_array_new (KATZE_TYPE_ITEM);
-
-        while (current_item && *current_item)
-        {
-            const gchar* uri_and_title = *current_item;
-            if (uri_and_title[0] == '$')
-            {
-                const gchar* title;
-                gchar* uri;
-                KatzeItem* item;
-
-                uri_and_title++;
-                if (uri_and_title == NULL)
-                    continue;
-                title = strchr (uri_and_title, '|');
-                if (title == NULL)
-                    goto news_feeds_continue;
-                title++;
-
-                uri = g_strndup (uri_and_title, title - 1 - uri_and_title);
-                item = g_object_new (KATZE_TYPE_ITEM,
-                    "uri", uri, "name", title, NULL);
-                katze_array_add_item (view->news_feeds, item);
-                g_object_unref (item);
-                if (!default_uri)
-                    default_uri = uri;
-                else
-                    g_free (uri);
-            }
-            else if (uri_and_title[0] == ':')
-            {
-                const gchar* title;
-
-                uri_and_title++;
-                if (uri_and_title == NULL)
-                    continue;
-                title = strchr (uri_and_title, '|');
-                if (title == NULL)
-                    goto news_feeds_continue;
-                title++;
-                /* TODO: Parse search engine XML
-                midori_view_add_info_bar (view, GTK_MESSAGE_INFO, title,
-                    G_CALLBACK (midori_view_open_search_response_cb), view,
-                    _("_Save Search engine"), GTK_RESPONSE_ACCEPT, NULL); */
-            }
-
-            news_feeds_continue:
-            current_item++;
-        }
-        g_strfreev (items);
-
-        g_object_set_data_full (G_OBJECT (view), "news-feeds", default_uri, g_free);
-        g_free (value);
-    }
-    #endif
-
     midori_tab_set_progress (MIDORI_TAB (view), 1.0);
     midori_view_update_load_status (view, MIDORI_LOAD_FINISHED);
 }
 
-#ifdef HAVE_WEBKIT2
 static void
 midori_view_web_view_crashed_cb (WebKitWebView* web_view,
                                  MidoriView*    view)
@@ -1430,6 +1124,7 @@
     gchar* message = g_strdup_printf (_("Something went wrong with '%s'."), uri);
     midori_view_display_error (view, uri, NULL, title,
         message, "", NULL, _("Try again"), NULL);
+    midori_tab_set_load_error (MIDORI_TAB (view), MIDORI_LOAD_ERROR_CRASH);
     g_free (message);
     g_free (title);
 }
@@ -1461,50 +1156,16 @@
 
     g_object_thaw_notify (G_OBJECT (view));
 }
-#else
-static void
-midori_view_web_view_notify_load_status_cb (WebKitWebView* web_view,
-                                            GParamSpec*    pspec,
-                                            MidoriView*    view)
-{
-    g_object_freeze_notify (G_OBJECT (view));
-
-    switch (webkit_web_view_get_load_status (web_view))
-    {
-    case WEBKIT_LOAD_PROVISIONAL:
-        midori_view_load_started (view);
-        break;
-    case WEBKIT_LOAD_COMMITTED:
-        midori_view_load_committed (view);
-        break;
-    case WEBKIT_LOAD_FIRST_VISUALLY_NON_EMPTY_LAYOUT:
-        /* Not implemented */
-        break;
-    case WEBKIT_LOAD_FINISHED:
-    case WEBKIT_LOAD_FAILED:
-        midori_view_load_finished (view);
-        break;
-    default:
-        g_warn_if_reached ();
-    }
-
-    g_object_thaw_notify (G_OBJECT (view));
-}
-#endif
 
 static void
 midori_web_view_notify_icon_uri_cb (WebKitWebView* web_view,
                                     GParamSpec*    pspec,
                                     MidoriView*    view)
 {
-#ifdef HAVE_WEBKIT2
     const gchar* uri = webkit_web_view_get_uri (web_view);
     WebKitWebContext* context = webkit_web_context_get_default ();
     WebKitFaviconDatabase* favicon_database = webkit_web_context_get_favicon_database (context);
     gchar* icon_uri = webkit_favicon_database_get_favicon_uri (favicon_database, uri);
-#else
-    gchar* icon_uri = g_strdup (webkit_web_view_get_icon_uri (web_view));
-#endif
     katze_assign (view->icon_uri, icon_uri);
     _midori_web_view_load_icon (view);
 }
@@ -1519,17 +1180,6 @@
     g_object_notify (G_OBJECT (view), "title");
 }
 
-#ifndef HAVE_WEBKIT2
-static void
-webkit_web_view_statusbar_text_changed_cb (WebKitWebView* web_view,
-                                           const gchar*   text,
-                                           MidoriView*    view)
-{
-    midori_tab_set_statusbar_text (MIDORI_TAB (view), text);
-}
-#endif
-
-#if GTK_CHECK_VERSION(3, 2, 0)
 static gboolean
 midori_view_overlay_frame_enter_notify_event_cb (GtkOverlay*       overlay,
                                                  GdkEventCrossing* event,
@@ -1541,7 +1191,6 @@
         ? GTK_ALIGN_END : GTK_ALIGN_START);
     return FALSE;
 }
-#endif
 
 static gboolean
 midori_view_web_view_leave_notify_event_cb (WebKitWebView*    web_view,
@@ -1554,16 +1203,10 @@
 
 static void
 webkit_web_view_hovering_over_link_cb (WebKitWebView*       web_view,
-                                       #ifdef HAVE_WEBKIT2
                                        WebKitHitTestResult* hit_test_result,
                                        guint                modifiers,
-                                       #else
-                                       const gchar*         tooltip,
-                                       const gchar*         link_uri,
-                                       #endif
                                        MidoriView*          view)
 {
-    #ifdef HAVE_WEBKIT2
     katze_object_assign (view->hit_test, g_object_ref (hit_test_result));
     if (!webkit_hit_test_result_context_is_link (hit_test_result))
     {
@@ -1571,7 +1214,6 @@
         return;
     }
     const gchar* link_uri = webkit_hit_test_result_get_link_uri (hit_test_result);
-    #endif
 
     katze_assign (view->link_uri, g_strdup (link_uri));
     if (link_uri && g_str_has_prefix (link_uri, "mailto:"))
@@ -1597,25 +1239,6 @@
                              gint        *y,
                              GdkEventButton* event)
 {
-#ifndef HAVE_WEBKIT2
-    g_return_if_fail (MIDORI_IS_VIEW (view));
-
-    if (gtk_widget_get_window (view->web_view))
-    {
-
-        if (x != NULL)
-            *x = event->x;
-        if (y != NULL)
-            *y = event->y;
-
-        katze_object_assign (view->hit_test,
-            g_object_ref (
-            webkit_web_view_get_hit_test_result (
-            WEBKIT_WEB_VIEW (view->web_view), event)));
-        katze_assign (view->link_uri,
-             katze_object_get_string (view->hit_test, "link-uri"));
-    }
-#endif
 }
 
 #define MIDORI_KEYS_MODIFIER_MASK (GDK_SHIFT_MASK | GDK_CONTROL_MASK \
@@ -1678,70 +1301,6 @@
             view->button_press_handled = TRUE;
             return TRUE;
         }
-        #if GTK_CHECK_VERSION (3, 4, 0)
-        if (katze_object_get_boolean (gtk_widget_get_settings (view->web_view), "gtk-enable-primary-paste"))
-        #else
-        if (midori_settings_get_middle_click_opens_selection (MIDORI_SETTINGS (view->settings)))
-        #endif
-        {
-            #ifndef HAVE_WEBKIT2
-            WebKitHitTestResult* result = webkit_web_view_get_hit_test_result (web_view, event);
-            WebKitHitTestResultContext context = katze_object_get_int (result, "context");
-            gboolean is_editable = context & WEBKIT_HIT_TEST_RESULT_CONTEXT_EDITABLE;
-            g_object_unref (result);
-            if (!is_editable)
-            {
-                gchar* uri;
-                GtkClipboard* clipboard = gtk_clipboard_get_for_display (
-                    gtk_widget_get_display (GTK_WIDGET (view)),
-                    GDK_SELECTION_PRIMARY);
-                if ((uri = gtk_clipboard_wait_for_text (clipboard)))
-                {
-                    guint i = 0;
-                    while (uri[i++] != '\0')
-                        if (uri[i] == '\n' || uri[i] == '\r')
-                            uri[i] = ' ';
-                    g_strstrip (uri);
-
-                    /* Hold Alt to search for the selected word */
-                    if (event->state & GDK_MOD1_MASK)
-                    {
-                        gchar* new_uri = sokoke_magic_uri (uri, TRUE, FALSE);
-                        if (!new_uri)
-                        {
-                            gchar* search = katze_object_get_string (
-                                view->settings, "location-entry-search");
-                            new_uri = midori_uri_for_search (search, uri);
-                            g_free (search);
-                        }
-                        katze_assign (uri, new_uri);
-                    }
-                    else if (midori_uri_is_location (uri))
-                    {
-                        if (MIDORI_MOD_NEW_TAB (event->state))
-                        {
-                            background = view->open_tabs_in_the_background;
-                            if (MIDORI_MOD_BACKGROUND (event->state))
-                                background = !background;
-                            g_signal_emit (view, signals[NEW_TAB], 0, uri, background);
-                        }
-                        else
-                        {
-                            midori_view_set_uri (MIDORI_VIEW (view), uri);
-                            gtk_widget_grab_focus (GTK_WIDGET (view));
-                        }
-                        g_free (uri);
-                        view->button_press_handled = TRUE;
-                        return TRUE;
-                    }
-                    else
-                    {
-                        g_free (uri);
-                    }
-                }
-            }
-            #endif
-        }
         if (MIDORI_MOD_SCROLL (event->state))
         {
             midori_view_set_zoom_level (MIDORI_VIEW (view), 1.0);
@@ -1751,9 +1310,7 @@
         break;
     case 3:
         /* Older versions don't have the context-menu signal */
-        #if WEBKIT_CHECK_VERSION (1, 10, 0)
         if (event->state & GDK_CONTROL_MASK)
-        #endif
         {
             /* Ctrl + Right-click suppresses javascript button handling */
             GtkWidget* menu = gtk_menu_new ();
@@ -1814,150 +1371,6 @@
                    GdkEventKey*   event,
                    MidoriView*    view)
 {
-#ifndef HAVE_WEBKIT2
-    gint digit = g_ascii_digit_value (event->keyval);
-    gunichar uc = gdk_keyval_to_unicode (event->keyval);
-    gchar* result = NULL;
-    WebKitWebFrame* web_frame = webkit_web_view_get_main_frame (web_view);
-    JSContextRef js_context = webkit_web_frame_get_global_context (web_frame);
-
-    if (view->find_links < 0)
-    {
-        /* Links are currently off, turn them on */
-        midori_tab_inject_stylesheet (MIDORI_TAB (view), ".midoriHKD87346 {"
-            " font-size:small !important; font-weight:bold !important;"
-            " z-index:500; border-radius:0.3em; line-height:1 !important;"
-            " background: white !important; color: black !important;"
-            " border:1px solid gray; padding:0 0.1em !important;"
-            " position:absolute; display:inline !important; }");
-        midori_tab_inject_stylesheet (MIDORI_TAB (view), ".midori_access_key_fc04de {"
-            " font-size:small !important; font-weight:bold !important;"
-            " z-index:500; border-radius:0.3em; line-height:1 !important;"
-            " background: black !important; color: white !important;"
-            " border:1px solid gray; padding:0 0.1em 0.2em 0.1em !important;"
-            " position:absolute; display:inline !important; }");
-        result = sokoke_js_script_eval (js_context,
-            " var label_count = 0;"
-            " for (i in document.links) {"
-            "   if (document.links[i].href && document.links[i].insertBefore) {"
-            "       var child = document.createElement ('span');"
-            "       if (document.links[i].accessKey && isNaN (document.links[i].accessKey)) {"
-            "           child.setAttribute ('class', 'midori_access_key_fc04de');"
-            "           child.appendChild (document.createTextNode (document.links[i].accessKey));"
-            "       } else {"
-            "         child.setAttribute ('class', 'midoriHKD87346');"
-            "         child.appendChild (document.createTextNode (label_count));"
-            "         label_count++;"
-            "       }"
-            "       document.links[i].insertBefore (child); } }",
-            NULL);
-        view->find_links = 0; /* Links are now on */
-        g_free (result);
-        return;
-    }
-
-    if (event->keyval == '.')
-    {
-        /* Pressed '.' with links on, so turn them off */
-        result = sokoke_js_script_eval (js_context,
-            "var links = document.getElementsByClassName ('midoriHKD87346');"
-            "for (var i = links.length - 1; i >= 0; i--) {"
-            "   var parent = links[i].parentNode;"
-            "   parent.removeChild(links[i]); }",
-            NULL);
-        g_free (result);
-        result = sokoke_js_script_eval (js_context,
-            "var links = document.getElementsByClassName ('midori_access_key_fc04de');"
-            "if (links != undefined && links.length > 0) {"
-            "   for (var i = links.length - 1; i >= 0; i--) {"
-            "       var parent = links[i].parentNode;"
-            "       parent.removeChild(links[i]); } }",
-            NULL);
-        g_free (result);
-        view->find_links = -1;
-        return;
-    }
-
-    /* Links are already on at this point, so process the input character */
-
-    if (digit != -1 && event->keyval != GDK_KEY_Return && event->keyval != GDK_KEY_Escape)
-    {
-        /* Got a digit, add it to the link count/ number */
-        if (view->find_links > 0)
-            view->find_links *= 10;
-        view->find_links += digit;
-        return;
-    }
-
-    if (event->keyval == GDK_KEY_Escape)
-    {
-        // Clear the link count/number
-        view->find_links = 0;
-        return;
-    }
-
-    if (g_unichar_isalpha (uc))
-    {
-        /* letter pressed if we have a corresponding accessKey and grab URI */
-        gchar* script = NULL;
-        gchar* utf8 = NULL;
-        gulong sz = g_unichar_to_utf8 (uc, NULL);
-
-        utf8 = g_malloc0 (sz);
-        g_unichar_to_utf8 (uc, utf8);
-        script = g_strdup_printf (
-            "var l = 'undefined';"
-            "for (i in document.links) {"
-            "   if ( document.links[i].href &&"
-            "        document.links[i].accessKey == \"%s\" )"
-            "   {"
-            "       l = document.links[i].href;"
-            "       break;"
-            "   }"
-            "}"
-            "if (l != 'undefined') { l; }"
-            , utf8
-        );
-        g_free (utf8);
-        result = sokoke_js_script_eval (js_context, script, NULL);
-        g_free (script);
-    }
-    else if (event->keyval == GDK_KEY_Return)
-    {
-        /* Return pressed, grab URI if we have a link with the entered number */
-        gchar* script = g_strdup_printf (
-            "var links = document.getElementsByClassName ('midoriHKD87346');"
-            "var i = %d; var return_key = %d;"
-            "if (return_key) {"
-            "    if (typeof links[i] != 'undefined')"
-            "        links[i].parentNode.href; }",
-            view->find_links, event->keyval == GDK_KEY_Return
-            );
-        result = sokoke_js_script_eval (js_context, script, NULL);
-        g_free (script);
-    }
-
-    /* Check the URI we grabbed to see if it's valid, if so go there */
-    if (midori_uri_is_location (result))
-    {
-        if (MIDORI_MOD_NEW_TAB (event->state))
-        {
-            gboolean background = view->open_tabs_in_the_background;
-            if (MIDORI_MOD_BACKGROUND (event->state))
-                background = !background;
-            g_signal_emit (view, signals[NEW_TAB], 0, result, background);
-        }
-        else
-            midori_view_set_uri (view, result);
-        view->find_links = -1; /* Turn off link mode */
-    }
-    else /* Invalid URI, start over... */
-        view->find_links = 0;
-
-    if (result)
-        g_free (result);
-    return;
-#endif
 }
 
 static gboolean
@@ -1992,21 +1405,12 @@
     if (character == (event->keyval | 0x01000000))
         return FALSE;
 
-    #ifdef HAVE_WEBKIT2
     WebKitHitTestResultContext context = katze_object_get_int (view->hit_test, "context");
     if (!(context & WEBKIT_HIT_TEST_RESULT_CONTEXT_EDITABLE))
-    #else
-    if (!webkit_web_view_can_cut_clipboard (web_view)
-        && !webkit_web_view_can_paste_clipboard (web_view))
-    #endif
     {
         gchar* text = character ? g_strdup_printf ("%c", character) : NULL;
-        #if GTK_CHECK_VERSION(3, 2, 0)
         midori_findbar_search_text (MIDORI_FINDBAR (view->overlay_find),
             (GtkWidget*)view, TRUE, katze_str_non_null (text));
-        #else
-        g_signal_emit_by_name (view, "search-text", TRUE, katze_str_non_null (text));
-        #endif
         g_free (text);
         return TRUE;
     }
@@ -2058,19 +1462,10 @@
                           MidoriDownloadType type,
                           const gchar*       uri)
 {
-#ifdef HAVE_WEBKIT2
     WebKitDownload* download = webkit_web_view_download_uri (WEBKIT_WEB_VIEW (view->web_view), uri);
     WebKitWebContext * web_context = webkit_web_view_get_context (WEBKIT_WEB_VIEW (view->web_view));
     midori_download_set_type (download, type);
     g_signal_emit_by_name (web_context, "download-started", download, view);
-#else
-    WebKitNetworkRequest* request = webkit_network_request_new (uri);
-    WebKitDownload* download = webkit_download_new (request);
-    g_object_unref (request);
-    midori_download_set_type (download, type);
-    gboolean handled;
-    g_signal_emit (view, signals[DOWNLOAD_REQUESTED], 0, download, &handled);
-    #endif
 }
 
 static void
@@ -2106,19 +1501,7 @@
 GList*
 midori_view_get_resources (MidoriView* view)
 {
-#ifndef HAVE_WEBKIT2
-    g_return_val_if_fail (MIDORI_IS_VIEW (view), NULL);
-
-    WebKitWebView* web_view = WEBKIT_WEB_VIEW (view->web_view);
-    WebKitWebFrame* frame = webkit_web_view_get_main_frame (web_view);
-    WebKitWebDataSource* data_source = webkit_web_frame_get_data_source (frame);
-    GList* resources = webkit_web_data_source_get_subresources (data_source);
-    resources = g_list_prepend (resources, webkit_web_data_source_get_main_resource (data_source));
-    g_list_foreach (resources, (GFunc)g_object_ref, NULL);
-    return resources;
-#else
     return NULL;
-#endif
 }
 
 static GString*
@@ -2128,19 +1511,6 @@
     GList* resources = midori_view_get_resources (view);
     GString* result = NULL;
 
-#ifndef HAVE_WEBKIT2
-    GList* list;
-    for (list = resources; list; list = g_list_next (list))
-    {
-        WebKitWebResource* resource = WEBKIT_WEB_RESOURCE (list->data);
-        GString* data = webkit_web_resource_get_data (resource);
-        if (!g_strcmp0 (webkit_web_resource_get_uri (resource), uri))
-        {
-            result = data;
-            break;
-        }
-    }
-#endif
     g_list_foreach (resources, (GFunc)g_object_unref, NULL);
     g_list_free (resources);
     return result;
@@ -2225,20 +1595,6 @@
     g_free (uri);
 }
 
-#ifndef HAVE_WEBKIT2
-static void
-midori_view_menu_open_email_activate_cb (GtkAction* action,
-                                         gpointer   user_data)
-{
-    MidoriView* view = user_data;
-    gchar* data = (gchar*)g_object_get_data (G_OBJECT (action), "uri");
-    gchar* uri = g_strconcat ("mailto:", data, NULL);
-    gboolean handled = FALSE;
-    g_signal_emit_by_name (view, "open-uri", uri, &handled);
-    g_free (uri);
-}
-#endif
-
 static void
 midori_view_menu_open_link_tab_activate_cb (GtkAction* action,
                                             gpointer   user_data)
@@ -2262,30 +1618,6 @@
                    !view->open_tabs_in_the_background);
 }
 
-#ifndef HAVE_WEBKIT2
-static void
-midori_web_view_menu_search_web_activate_cb (GtkAction* action,
-                                             gpointer   user_data)
-{
-    MidoriView* view = user_data;
-    const gchar* search = g_object_get_data (G_OBJECT (action), "search");
-    if (search == NULL)
-        search = midori_settings_get_location_entry_search (MIDORI_SETTINGS (view->settings));
-    gchar* uri = midori_uri_for_search (search, view->selected_text);
-
-    if (view->open_new_pages_in == MIDORI_NEW_PAGE_WINDOW)
-        g_signal_emit (view, signals[NEW_WINDOW], 0, uri);
-    /* FIXME: need a way to override behavior (middle click)
-    else if (view->open_new_pages_in == MIDORI_NEW_PAGE_CURRENT)
-        midori_view_set_uri (view, uri); */
-    else
-        g_signal_emit (view, signals[NEW_TAB], 0, uri,
-            view->open_tabs_in_the_background);
-
-    g_free (uri);
-}
-#endif
-
 static void
 midori_view_tab_label_menu_window_new_cb (GtkAction* action,
                                           gpointer   user_data)
@@ -2295,30 +1627,12 @@
         midori_view_get_display_uri (MIDORI_VIEW (view)));
 }
 
-#ifndef HAVE_WEBKIT2
-static void
-midori_web_view_open_frame_in_new_tab_cb (GtkAction* action,
-                                          gpointer   user_data)
-{
-    MidoriView* view = user_data;
-    WebKitWebFrame* web_frame = webkit_web_view_get_focused_frame (WEBKIT_WEB_VIEW (view->web_view));
-    g_signal_emit (view, signals[NEW_TAB], 0,
-        webkit_web_frame_get_uri (web_frame), view->open_tabs_in_the_background);
-}
-#endif
-
 static void
 midori_view_inspect_element_activate_cb (GtkAction* action,
                                          gpointer   user_data)
 {
     MidoriView* view = user_data;
     WebKitWebInspector* inspector = webkit_web_view_get_inspector (WEBKIT_WEB_VIEW (view->web_view));
-    #ifndef HAVE_WEBKIT2
-    WebKitHitTestResult* hit_test_result = view->hit_test;
-    gint x = katze_object_get_int (hit_test_result, "x");
-    gint y = katze_object_get_int (hit_test_result, "y");
-    webkit_web_inspector_inspect_coordinates (inspector, x, y);
-    #endif
     webkit_web_inspector_show (inspector);
 }
 
@@ -2443,76 +1757,6 @@
             midori_web_view_menu_video_save_activate_cb, view);
     }
 
-    #ifndef HAVE_WEBKIT2
-    if (context & WEBKIT_HIT_TEST_RESULT_CONTEXT_SELECTION)
-    {
-        if (context & WEBKIT_HIT_TEST_RESULT_CONTEXT_LINK)
-            midori_context_action_add (menu, NULL);
-
-        /* Ensure view->selected_text */
-        midori_view_has_selection (view);
-        if (midori_uri_is_valid (view->selected_text))
-        {
-            /* :// and @ together would mean login credentials */
-            if (g_str_has_prefix (view->selected_text, "mailto:")
-             || (strchr (view->selected_text, '@') != NULL
-              && strstr (view->selected_text, "://") == NULL))
-            {
-                gchar* text = g_strdup_printf (_("Send a message to %s"), view->selected_text);
-                GtkAction* action = (GtkAction*)midori_context_action_new_escaped ("SendMessage", text, NULL, GTK_STOCK_JUMP_TO);
-                g_object_set_data_full (G_OBJECT (action), "uri", g_strdup (view->selected_text), (GDestroyNotify)g_free);
-                g_signal_connect (action, "activate", G_CALLBACK (midori_view_menu_open_email_activate_cb), view);
-                midori_context_action_add (menu, action);
-                g_free (text);
-            }
-            else
-            {
-                GtkAction* action = gtk_action_new ("OpenAddressInNewTab", _("Open Address in New _Tab"), NULL, GTK_STOCK_JUMP_TO);
-                g_object_set_data_full (G_OBJECT (action), "uri", g_strdup (view->selected_text), (GDestroyNotify)g_free);
-                g_signal_connect (action, "activate", G_CALLBACK (midori_view_menu_open_link_tab_activate_cb), view);
-                midori_context_action_add (menu, action);
-            }
-        }
-
-        KatzeArray* search_engines = katze_object_get_object (browser, "search-engines");
-        if (search_engines != NULL)
-        {
-            MidoriContextAction* searches = midori_context_action_new ("SearchWith", _("Search _with"), NULL, NULL);
-            midori_context_action_add (menu, GTK_ACTION (searches));
-
-            KatzeItem* item;
-            guint i = 0;
-            KATZE_ARRAY_FOREACH_ITEM (item, search_engines)
-            {
-                GdkPixbuf* pixbuf;
-                gchar* search_option = g_strdup_printf ("SearchWith%u", i);
-                GtkAction* action = (GtkAction*)midori_context_action_new_escaped (search_option, katze_item_get_name (item), NULL, STOCK_EDIT_FIND);
-                g_free (search_option);
-                midori_context_action_add (searches, action);
-                if ((pixbuf = midori_paths_get_icon (katze_item_get_uri (item), NULL)))
-                {
-                    gtk_action_set_gicon (action, G_ICON (pixbuf));
-                    g_object_unref (pixbuf);
-                }
-                else
-                {
-                    GIcon* icon = g_themed_icon_new_with_default_fallbacks ("edit-find-option-symbolic");
-                    gtk_action_set_gicon (action, icon);
-                }
-                gtk_action_set_always_show_image (GTK_ACTION (action), TRUE);
-                g_object_set_data (G_OBJECT (action), "search", (gchar*)katze_item_get_uri (item));
-                g_signal_connect (action, "activate",
-                    G_CALLBACK (midori_web_view_menu_search_web_activate_cb), view);
-                i++;
-            }
-            g_object_unref (search_engines);
-        }
-        if (midori_settings_get_location_entry_search (MIDORI_SETTINGS (view->settings)) != NULL)
-            midori_context_action_add_simple (menu, "SearchWeb", _("_Search the Web"), NULL, GTK_STOCK_FIND,
-                midori_web_view_menu_search_web_activate_cb, view);
-    }
-    #endif
-
     if (context == WEBKIT_HIT_TEST_RESULT_CONTEXT_DOCUMENT)
     {
         midori_context_action_add_by_name (menu, "Back");
@@ -2535,12 +1779,6 @@
     {
         midori_context_action_add (menu, NULL);
         midori_context_action_add_by_name (menu, "UndoTabClose");
-        #ifndef HAVE_WEBKIT2
-        WebKitWebView* web_view = WEBKIT_WEB_VIEW (view->web_view);
-        if (webkit_web_view_get_focused_frame (web_view) != webkit_web_view_get_main_frame (web_view))
-            midori_context_action_add_simple (menu, "OpenFrameInNewTab", _("Open _Frame in New Tab"), NULL, NULL,
-                midori_web_view_open_frame_in_new_tab_cb, view);
-        #endif
         midori_context_action_add_simple (menu, "OpenInNewWindow", _("Open in New _Window"), NULL, STOCK_WINDOW_NEW,
             midori_view_tab_label_menu_window_new_cb, view);
         midori_context_action_add_by_name (menu, "ZoomIn");
@@ -2614,26 +1852,14 @@
 #if WEBKIT_CHECK_VERSION (1, 10, 0)
 static gboolean
 midori_view_web_view_context_menu_cb (WebKitWebView*       web_view,
-                                      #ifdef HAVE_WEBKIT2
                                       WebKitContextMenu*   context_menu,
                                       GdkEvent*            event,
                                       WebKitHitTestResult* hit_test_result,
-                                      #else
-                                      GtkMenu*             default_menu,
-                                      WebKitHitTestResult* hit_test_result,
-                                      gboolean             keyboard,
-                                      #endif
                                       MidoriView*          view)
 {
-    #ifndef HAVE_WEBKIT2
-    GdkEvent* event = gtk_get_current_event();
-    midori_view_ensure_link_uri (view, NULL, NULL, (GdkEventButton *)event);
-    gdk_event_free (event);
-    #endif
     MidoriContextAction* menu = midori_view_get_page_context_action (view, hit_test_result);
     /* Retain specific menu items we can't re-create easily */
     guint guesses = 0, guesses_max = 10; /* Maximum number of spelling suggestions */
-    #ifdef HAVE_WEBKIT2
     GList* items = webkit_context_menu_get_items (context_menu), *item, *preserved = NULL;
     for (item = items; item; item = g_list_next (item))
     {
@@ -2649,21 +1875,6 @@
     }
     g_list_free (preserved);
     midori_context_action_create_webkit_context_menu (menu, context_menu);
-    #else
-    GList* items = gtk_container_get_children (GTK_CONTAINER (default_menu)), *item;
-    for (item = items; item; item = g_list_next (item))
-    {
-        /* Private API: Source/WebCore/platform/ContextMenuItem.h */
-        int stock_action = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (item->data), "webkit-context-menu"));
-        const int ContextMenuItemTagSpellingGuess = 30;
-        if (stock_action == ContextMenuItemTagSpellingGuess && guesses++ < guesses_max)
-            continue;
-        else
-            gtk_widget_destroy (item->data);
-    }
-    g_list_free (items);
-    midori_context_action_create_menu (menu, default_menu, FALSE);
-    #endif
     return FALSE;
 }
 #endif
@@ -2683,20 +1894,18 @@
     MidoriNewView where = MIDORI_NEW_VIEW_TAB;
     GtkWidget* new_view = GTK_WIDGET (midori_view_get_for_widget (web_view));
 
-#ifdef HAVE_WEBKIT2
     WebKitWindowProperties* features = webkit_web_view_get_window_properties (WEBKIT_WEB_VIEW (web_view));
-#else
-    WebKitWebWindowFeatures* features = webkit_web_view_get_window_features (WEBKIT_WEB_VIEW (web_view));
-#endif
     gboolean locationbar_visible, menubar_visible, toolbar_visible;
+    GdkRectangle* geometry = NULL;
     gint width, height;
     g_object_get (features,
                   "locationbar-visible", &locationbar_visible,
                   "menubar-visible", &menubar_visible,
                   "toolbar-visible", &toolbar_visible,
-                  "width", &width,
-                  "height", &height,
+                  "geometry", &geometry,
                   NULL);
+    width = geometry->width;
+    height = geometry->height;
     midori_tab_set_is_dialog (MIDORI_TAB (view),
      !locationbar_visible && !menubar_visible && !toolbar_visible
      && width > 0 && height > 0);
@@ -2723,32 +1932,21 @@
         GtkWidget* toplevel = gtk_widget_get_toplevel (new_view);
         if (width > 0 && height > 0)
             gtk_widget_set_size_request (toplevel, width, height);
-#ifdef HAVE_WEBKIT2
         g_signal_connect (web_view, "close",
                           G_CALLBACK (midori_view_web_view_close_cb), new_view);
-#else
-        g_signal_connect (web_view, "close-web-view",
-                          G_CALLBACK (midori_view_web_view_close_cb), new_view);
-#endif
     }
 
     return TRUE;
 }
 
 static GtkWidget*
-webkit_web_view_create_web_view_cb (GtkWidget*      web_view,
-#ifndef HAVE_WEBKIT2
-                                    WebKitWebFrame* web_frame,
-#endif
-                                    MidoriView*     view)
+webkit_web_view_create_web_view_cb (GtkWidget*              web_view,
+                                    WebKitNavigationAction* navigation_action,
+                                    MidoriView*             view)
 {
     MidoriView* new_view;
 
-#ifdef HAVE_WEBKIT2
     const gchar* uri = webkit_web_view_get_uri (WEBKIT_WEB_VIEW (web_view));
-#else
-    const gchar* uri = webkit_web_frame_get_uri (web_frame);
-#endif
     if (view->open_new_pages_in == MIDORI_NEW_PAGE_CURRENT)
         new_view = view;
     else
@@ -2756,53 +1954,13 @@
         KatzeItem* item = katze_item_new ();
         item->uri = g_strdup (uri);
         new_view = (MidoriView*)midori_view_new_from_view (view, item, NULL);
-#ifdef HAVE_WEBKIT2
         g_signal_connect (new_view->web_view, "ready-to-show",
                           G_CALLBACK (webkit_web_view_web_view_ready_cb), view);
-#else
-        g_signal_connect (new_view->web_view, "web-view-ready",
-                          G_CALLBACK (webkit_web_view_web_view_ready_cb), view);
-#endif
     }
     g_object_set_data_full (G_OBJECT (new_view), "opener-uri", g_strdup (uri), g_free);
     return new_view->web_view;
 }
 
-#ifndef HAVE_WEBKIT2
-static gboolean
-webkit_web_view_mime_type_decision_cb (GtkWidget*               web_view,
-                                       WebKitWebFrame*          web_frame,
-                                       WebKitNetworkRequest*    request,
-                                       const gchar*             mime_type,
-                                       WebKitWebPolicyDecision* decision,
-                                       MidoriView*              view)
-{
-    /* FIXME: Never download plugins from sub resources */
-    if (!strcmp (mime_type, "application/x-shockwave-flash"))
-        if (strcmp (midori_tab_get_uri (MIDORI_TAB (view)), webkit_network_request_get_uri (request)))
-            return FALSE;
-
-    if (webkit_web_view_can_show_mime_type (WEBKIT_WEB_VIEW (web_view), mime_type))
-    {
-        if (web_frame == webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (web_view)))
-        {
-            g_warn_if_fail (mime_type != NULL);
-            midori_tab_set_mime_type (MIDORI_TAB (view), mime_type);
-            katze_item_set_meta_string (view->item, "mime-type", mime_type);
-            if (view->icon == NULL)
-                midori_view_unset_icon (view);
-        }
-
-        return FALSE;
-    }
-
-    g_object_set_data(G_OBJECT (view), "download-mime-type", (gpointer)mime_type);
-    webkit_web_policy_decision_download (decision);
-    g_object_set_data(G_OBJECT (view), "download-mime-type", NULL);
-    return TRUE;
-}
-#endif
-
 gint
 midori_save_dialog (const gchar* title,
                     const gchar * hostname,
@@ -2851,7 +2009,6 @@
     return response;
 }
 
-#ifdef HAVE_WEBKIT2
 static gboolean
 midori_view_download_decide_destination_cb (WebKitDownload*   download,
                                     const gchar * suggested_filename,
@@ -2877,13 +2034,6 @@
                                    WebKitDownload*   download,
                                    const gchar * suggested_filename)
 {
-#else
-static gboolean
-midori_view_download_requested_cb (GtkWidget*      web_view,
-                                   WebKitDownload* download,
-                                   MidoriView*     view)
-{
-#endif
     gboolean handled = TRUE;
     gchar* hostname;
     gchar* content_type;
@@ -2897,27 +2047,17 @@
     hostname = midori_uri_parse_hostname (
         opener_uri ? opener_uri : midori_view_get_display_uri (view), NULL);
     
-    #ifdef HAVE_WEBKIT2
     content_type = g_content_type_guess (suggested_filename, NULL ,
                                             0 ,NULL);
     if (!content_type)
         content_type = g_strdup ("application/octet-stream");
     midori_download_set_filename (download, g_strdup (suggested_filename));
-    #else
-    content_type = midori_download_get_content_type (download,
-        g_object_get_data (G_OBJECT (view), "download-mime-type"));
-    #endif
     description = g_content_type_get_description (content_type);
 
     details = g_string_sized_new (20 * 4);
-    #ifdef HAVE_WEBKIT2
     const gchar * suggestion = webkit_uri_response_get_suggested_filename (webkit_download_get_response (download));
     g_string_append_printf (details, _("File Name: %s"),
                 suggestion ? suggestion : suggested_filename);
-    #else
-    g_string_append_printf (details, _("File Name: %s"),
-        webkit_download_get_suggested_filename (download));
-    #endif
     g_string_append_c (details, '\n');
 
     if (g_strrstr (description, content_type))
@@ -2926,51 +2066,8 @@
         g_string_append_printf (details, _("File Type: %s ('%s')"), description, content_type);
     g_string_append_c (details, '\n');
 
-    #ifndef HAVE_WEBKIT2
-    /* Link Fingerprint */
-    /* We look at the original URI because redirection would lose the fragment */
-    WebKitWebFrame* web_frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (web_view));
-    WebKitWebDataSource* datasource = webkit_web_frame_get_provisional_data_source (web_frame);
-    if (datasource)
-    {
-        gchar* fingerprint;
-        gchar* fplabel;
-        WebKitNetworkRequest* original_request = webkit_web_data_source_get_initial_request (datasource);
-        const gchar* original_uri = webkit_network_request_get_uri (original_request);
-        midori_uri_get_fingerprint (original_uri, &fingerprint, &fplabel);
-        if (fplabel && fingerprint)
-        {
-            WebKitNetworkRequest* request = webkit_download_get_network_request (download);
-
-            g_string_append (details, fplabel);
-            g_string_append_c (details, ' ');
-            g_string_append (details, fingerprint);
-            g_string_append_c (details, '\n');
-
-            /* Propagate original URI to make it available when the download finishes */
-            g_object_set_data_full (G_OBJECT (request), "midori-original-uri",
-                                    g_strdup (original_uri), g_free);
-        }
-        g_free (fplabel);
-        g_free (fingerprint);
-
-    }
-
-    if (webkit_download_get_total_size (download) > webkit_download_get_current_size (download))
-    {
-        gchar* total = g_format_size (webkit_download_get_total_size (download));
-        g_string_append_printf (details, _("Size: %s"), total);
-        g_string_append_c (details, '\n');
-        g_free (total);
-    }
-    #endif
-
-    #ifdef HAVE_WEBKIT2
     /* i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz" */
     title = g_strdup_printf (_("Open %s"), webkit_uri_request_get_uri (webkit_download_get_request (download)));
-    #else
-    title = g_strdup_printf (_("Open %s"), webkit_download_get_uri (download));
-    #endif
     response = midori_save_dialog (title,
             hostname, details, content_type); //We prompt a dialog
     g_free (title);
@@ -2983,147 +2080,6 @@
     return handled;
 }
 
-#ifndef HAVE_WEBKIT2
-static gboolean
-webkit_web_view_console_message_cb (GtkWidget*   web_view,
-                                    const gchar* message,
-                                    guint        line,
-                                    const gchar* source_id,
-                                    MidoriView*  view)
-{
-    if (g_object_get_data (G_OBJECT (webkit_get_default_session ()),
-                           "pass-through-console"))
-        return FALSE;
-
-    if (!strncmp (message, "speed_dial-save", 13))
-    {
-        MidoriBrowser* browser = midori_browser_get_for_widget (GTK_WIDGET (view));
-        MidoriSpeedDial* dial = katze_object_get_object (browser, "speed-dial");
-        GError* error = NULL;
-        midori_speed_dial_save_message (dial, message, &error);
-        if (error != NULL)
-        {
-            g_critical ("Failed speed dial message: %s\n", error->message);
-            g_error_free (error);
-        }
-    }
-    else
-        g_signal_emit_by_name (view, "console-message", message, line, source_id);
-    return TRUE;
-}
-
-static void
-midori_view_script_response_cb (GtkWidget*  infobar,
-                                gint        response,
-                                MidoriView* view)
-{
-    view->alerts--;
-}
-
-static gboolean
-midori_view_web_view_script_alert_cb (GtkWidget*      web_view,
-                                      WebKitWebFrame* web_frame,
-                                      const gchar*    message,
-                                      MidoriView*     view)
-{
-    gchar* text;
-
-    /* Allow a maximum of 5 alerts */
-    if (view->alerts > 4)
-        return TRUE;
-
-    view->alerts++;
-    /* i18n: The text of an infobar for JavaScript alert messages */
-    text = g_strdup_printf ("JavaScript: %s", message);
-    midori_view_add_info_bar (view, GTK_MESSAGE_WARNING, text,
-        G_CALLBACK (midori_view_script_response_cb), view,
-        GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL);
-    g_free (text);
-    return TRUE;
-}
-
-static gboolean
-midori_view_web_view_print_requested_cb (GtkWidget*      web_view,
-                                         WebKitWebFrame* web_frame,
-                                         MidoriView*     view)
-{
-    midori_view_print (view);
-    return TRUE;
-}
-
-static void
-webkit_web_view_window_object_cleared_cb (GtkWidget*      web_view,
-                                          WebKitWebFrame* web_frame,
-                                          JSContextRef    js_context,
-                                          JSObjectRef     js_window,
-                                          MidoriView*     view)
-{
-    const gchar* page_uri;
-
-    page_uri = webkit_web_frame_get_uri (web_frame);
-    if (!midori_uri_is_http (page_uri))
-        return;
-
-    if (midori_paths_get_runtime_mode () == MIDORI_RUNTIME_MODE_PRIVATE)
-    {
-        /* Mask language, architecture, no plugin list */
-        gchar* result = sokoke_js_script_eval (js_context,
-            "navigator = { 'appName': 'Netscape',"
-                          "'appCodeName': 'Mozilla',"
-                          "'appVersion': '5.0 (X11)',"
-                          "'userAgent': navigator.userAgent,"
-                          "'language': 'en-US',"
-                          "'platform': 'Linux i686',"
-                          "'cookieEnabled': true,"
-                          "'javaEnabled': function () { return true; },"
-                          "'mimeTypes': {},"
-                          "'plugins': {'refresh': function () { } } };",
-            NULL);
-        g_free (result);
-    }
-}
-
-static void
-midori_view_hadjustment_notify_value_cb (GtkAdjustment* hadjustment,
-                                         GParamSpec*    pspec,
-                                         MidoriView*    view)
-{
-    gint value = (gint)gtk_adjustment_get_value (hadjustment);
-    katze_item_set_meta_integer (view->item, "scrollh", value);
-}
-
-static void
-midori_view_notify_hadjustment_cb (MidoriView* view,
-                                   GParamSpec* pspec,
-                                   gpointer    data)
-{
-    GtkScrolledWindow* scrolled = GTK_SCROLLED_WINDOW (view->scrolled_window);
-    GtkAdjustment* hadjustment = gtk_scrolled_window_get_hadjustment (scrolled);
-    g_signal_connect (hadjustment, "notify::value",
-        G_CALLBACK (midori_view_hadjustment_notify_value_cb), view);
-}
-
-static void
-midori_view_vadjustment_notify_value_cb (GtkAdjustment* vadjustment,
-                                         GParamSpec*    pspec,
-                                         MidoriView*    view)
-{
-    gint value = (gint)gtk_adjustment_get_value (vadjustment);
-    katze_item_set_meta_integer (view->item, "scrollv", value);
-}
-
-static void
-midori_view_notify_vadjustment_cb (MidoriView* view,
-                                   GParamSpec* pspec,
-                                   gpointer    data)
-{
-    GtkScrolledWindow* scrolled = GTK_SCROLLED_WINDOW (view->scrolled_window);
-    GtkAdjustment* vadjustment = gtk_scrolled_window_get_vadjustment (scrolled);
-    g_signal_connect (vadjustment, "notify::value",
-        G_CALLBACK (midori_view_vadjustment_notify_value_cb), view);
-}
-#endif
-
 static void
 midori_view_init (MidoriView* view)
 {
@@ -3140,18 +2096,6 @@
     view->item = katze_item_new ();
 
     view->scrollh = view->scrollv = -2;
-    #ifndef HAVE_WEBKIT2
-    /* Adjustments are not created initially, but overwritten later */
-    view->scrolled_window = gtk_scrolled_window_new (NULL, NULL);
-    gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (view->scrolled_window), GTK_POLICY_NEVER, GTK_POLICY_NEVER);
-    gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (view->scrolled_window),
-                                         GTK_SHADOW_NONE);
-    g_signal_connect (view->scrolled_window, "notify::hadjustment",
-        G_CALLBACK (midori_view_notify_hadjustment_cb), view);
-    g_signal_connect (view->scrolled_window, "notify::vadjustment",
-        G_CALLBACK (midori_view_notify_vadjustment_cb), view);
-    #endif
-
     g_signal_connect (view->item, "meta-data-changed",
         G_CALLBACK (midori_view_item_meta_data_changed), view);
 }
@@ -3282,10 +2226,6 @@
         NULL);
 
     webkit_web_view_set_settings (WEBKIT_WEB_VIEW (view->web_view), (void*)settings);
-    #ifndef HAVE_WEBKIT2
-    webkit_web_view_set_full_content_zoom (WEBKIT_WEB_VIEW (view->web_view),
-        zoom_text_and_images);
-    #endif
     midori_view_set_zoom_level (view, zoom_level);
 }
 
@@ -3368,12 +2308,15 @@
                            KatzeItem*         item,
                            MidoriWebSettings* settings)
 {
-    MidoriView* view = g_object_new (MIDORI_TYPE_VIEW,
-                                     "related", MIDORI_TAB (related),
-                                     "title", item ? katze_item_get_name (item) : NULL,
-                                     NULL);
+    MidoriView* view;
+
     if (!settings && related)
         settings = related->settings;
+    view = g_object_new (MIDORI_TYPE_VIEW,
+        "user-content-manager", midori_settings_get_user_content_manager (MIDORI_SETTINGS (settings)),
+        "related", MIDORI_TAB (related),
+        "title", item ? katze_item_get_name (item) : NULL,
+        NULL);
     if (settings)
         _midori_view_set_settings (view, settings);
     if (item)
@@ -3400,14 +2343,6 @@
 
     if (name == g_intern_string ("open-new-pages-in"))
         view->open_new_pages_in = g_value_get_enum (&value);
-    #ifndef HAVE_WEBKIT2
-    else if (name == g_intern_string ("zoom-text-and-images"))
-    {
-        if (view->web_view)
-            webkit_web_view_set_full_content_zoom (WEBKIT_WEB_VIEW (view->web_view),
-                g_value_get_boolean (&value));
-    }
-    #endif
     else if (name == g_intern_string ("open-tabs-in-the-background"))
         view->open_tabs_in_the_background = g_value_get_boolean (&value);
     else if (name == g_intern_string ("enable-javascript"))
@@ -3475,184 +2410,6 @@
     return midori_tab_get_progress (MIDORI_TAB (view));
 }
 
-#ifndef HAVE_WEBKIT2
-static gboolean
-midori_view_inspector_window_key_press_event_cb (GtkWidget*   window,
-                                                 GdkEventKey* event,
-                                                 gpointer     user_data)
-{
-    /* Close window on Ctrl+W */
-    if (event->keyval == 'w' && (event->state & GDK_CONTROL_MASK))
-        gtk_widget_destroy (window);
-
-    return FALSE;
-}
-
-static void
-midori_view_web_inspector_construct_window (gpointer       inspector,
-                                            WebKitWebView* web_view,
-                                            GtkWidget*     inspector_view,
-                                            MidoriView*    view)
-{
-    gchar* title;
-    const gchar* label;
-    GtkWidget* window;
-    GtkWidget* toplevel;
-    const gchar* icon_name;
-    GtkIconTheme* icon_theme;
-    GdkPixbuf* icon;
-    GdkPixbuf* gray_icon;
-    #if GTK_CHECK_VERSION (3, 0, 0)
-    GtkWidget* scrolled;
-    #endif
-
-    label = midori_view_get_display_title (view);
-    title = g_strdup_printf (_("Inspect page - %s"), label);
-    window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-    gtk_window_set_title (GTK_WINDOW (window), title);
-    g_free (title);
-
-    toplevel = gtk_widget_get_toplevel (GTK_WIDGET (view));
-    if (gtk_widget_is_toplevel (toplevel))
-    {
-        gtk_window_set_screen (GTK_WINDOW (window), gtk_window_get_screen (GTK_WINDOW (toplevel)));
-        katze_window_set_sensible_default_size (GTK_WINDOW (window));
-    }
-
-    /* Attempt to make a gray version of the icon on the fly */
-    icon_name = gtk_window_get_icon_name (GTK_WINDOW (toplevel));
-    icon_theme = gtk_icon_theme_get_for_screen (
-        gtk_widget_get_screen (GTK_WIDGET (view)));
-    icon = gtk_icon_theme_load_icon (icon_theme, icon_name, 32,
-        GTK_ICON_LOOKUP_USE_BUILTIN, NULL);
-    if (icon)
-    {
-        gray_icon = gdk_pixbuf_copy (icon);
-        if (gray_icon)
-        {
-            gdk_pixbuf_saturate_and_pixelate (gray_icon, gray_icon, 0.1f, FALSE);
-            gtk_window_set_icon (GTK_WINDOW (window), gray_icon);
-            g_object_unref (gray_icon);
-        }
-        g_object_unref (icon);
-    }
-    else
-        gtk_window_set_icon_name (GTK_WINDOW (window), icon_name);
-    gtk_widget_set_size_request (GTK_WIDGET (inspector_view), 700, 100);
-    #if GTK_CHECK_VERSION (3, 0, 0)
-    scrolled = gtk_scrolled_window_new (NULL, NULL);
-    gtk_container_add (GTK_CONTAINER (scrolled), inspector_view);
-    gtk_container_add (GTK_CONTAINER (window), scrolled);
-    gtk_widget_show_all (scrolled);
-    #else
-    gtk_container_add (GTK_CONTAINER (window), inspector_view);
-    gtk_widget_show_all (inspector_view);
-    #endif
-
-    g_signal_connect (window, "key-press-event",
-        G_CALLBACK (midori_view_inspector_window_key_press_event_cb), NULL);
-
-    /* FIXME: Update window title with URI */
-}
-
-static WebKitWebView*
-midori_view_web_inspector_inspect_web_view_cb (gpointer       inspector,
-                                               WebKitWebView* web_view,
-                                               MidoriView*    view)
-{
-    GtkWidget* inspector_view = webkit_web_view_new ();
-    midori_view_web_inspector_construct_window (inspector,
-        web_view, inspector_view, view);
-    return WEBKIT_WEB_VIEW (inspector_view);
-}
-
-static gboolean
-midori_view_web_inspector_show_window_cb (WebKitWebInspector* inspector,
-                                          MidoriView*         view)
-{
-    GtkWidget* inspector_view = GTK_WIDGET (webkit_web_inspector_get_web_view (inspector));
-    GtkWidget* window = gtk_widget_get_toplevel (inspector_view);
-    if (!window)
-        return FALSE;
-    if (katze_object_get_boolean (view->settings, "last-inspector-attached"))
-    {
-        gboolean handled = FALSE;
-        g_signal_emit_by_name (inspector, "attach-window", &handled);
-    }
-    else
-    {
-        gtk_widget_show (window);
-        gtk_window_present (GTK_WINDOW (window));
-    }
-    return TRUE;
-}
-
-static gboolean
-midori_view_web_inspector_attach_window_cb (gpointer    inspector,
-                                            MidoriView* view)
-{
-    GtkWidget* inspector_view = GTK_WIDGET (webkit_web_inspector_get_web_view (inspector));
-    g_signal_emit_by_name (view, "attach-inspector", inspector_view);
-    return TRUE;
-}
-
-/**
- * midori_view_web_inspector_get_own_window:
- * @inspector: the inspector instance
- *
- * Get the widget containing the inspector, generally either a GtkWindow