Merge lp:~midori/midori/listStoreRemoveRef into lp:midori

[Christian Dywan]

Use ref with Gtk.ListStore.remove method

With Vala 0.36 using Gtk.ListStore.remove without 'ref' is an error.

Unmerged revisions

7174. By Christian Dywan on 2017-12-17

Use ref with Gtk.ListStore.remove method

7173. By Christian Dywan on 2017-11-26

Drop pass-through-console flag

7172. By Christian Dywan on 2017-11-25

Unconditionally include WebKit2 headers

7171. By Christian Dywan on 2017-11-07

Drop non-WebKit2 website saving code path

7170. By Christian Dywan on 2017-11-06

Non-conditional skipping of non-WebKit2 extensions

7169. By Christian Dywan on 2017-11-06

Drop non-WebKit2/ non-libnotify code paths

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-02-04 19:54:52 +0000
+++ CMakeLists.txt	2017-12-17 17:18:01 +0000
@@ -39,7 +39,7 @@
 set(CMAKE_SKIP_INSTALL_ALL_DEPENDENCY 1)
 
 find_package(Vala REQUIRED)
-vala_require("0.16.0")
+vala_require("0.17.0")
 set(VALAFLAGS ${VALAFLAGS}
     --enable-deprecated
     --debug
@@ -111,50 +111,20 @@
                   libxml-2.0>=2.6
                   sqlite3>=3.6.19
                   gmodule-2.0
-                  gio-2.0>=2.32.3
-                  libsoup-gnome-2.4>=2.37.1
+                  gio-2.0>=2.40.0
+                  libsoup-gnome-2.4>=2.48.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")
-    # 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")
-        add_definitions("-DHAVE_LIBSOUP_2_40_0")
-        set(VALAFLAGS ${VALAFLAGS} -D HAVE_LIBSOUP_2_40_0)
-    endif ()
-endif ()
-if (${DEPS_libsoup-gnome-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 ()
-
-if (${DEPS_gio-2.0_VERSION} VERSION_GREATER "2.40.0" OR WIN32)
-    add_definitions("-DLIBNOTIFY_VERSION=\"No\"")
-else ()
-    pkg_check_modules(NOTIFY REQUIRED libnotify)
-    add_definitions("-DLIBNOTIFY_VERSION=\"${NOTIFY_VERSION}\"")
-    add_definitions("-DHAVE_LIBNOTIFY")
-    set(OPTS_INCLUDE_DIRS "${OPTS_INCLUDE_DIRS};${NOTIFY_INCLUDE_DIRS}")
-    set(OPTS_LIBRARIES "${OPTS_LIBRARIES};${NOTIFY_LIBRARIES}")
-    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)
     set(OPTS_INCLUDE_DIRS "${OPTS_INCLUDE_DIRS};${GRANITE_INCLUDE_DIRS}")
@@ -178,53 +148,24 @@
 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.12.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-4.0.vapi")
+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 'HACKING'
--- HACKING	2015-08-30 10:19:52 +0000
+++ HACKING	2017-12-17 17:18:01 +0000
@@ -380,4 +380,4 @@
     * MR: merge request, a branch proposed for review
     * ninja: an internal tab, usually empty label, used for taking screenshots
     * fortress: user of an ancient release like 0.4.3 as found on Raspberry Pie, Debian, Ubuntu
-    * katze, sokoke, tabby: API names and coincidentally cat breeds
\ No newline at end of file
+    * katze, sokoke, tabby: API names and coincidentally cat breeds

=== modified file 'extensions/CMakeLists.txt'
--- extensions/CMakeLists.txt	2015-04-19 14:06:12 +0000
+++ extensions/CMakeLists.txt	2017-12-17 17:18:01 +0000
@@ -13,17 +13,16 @@
                     "${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 ()
+# FIXME: no support for WebKit2
+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
@@ -88,7 +87,7 @@
                     )
             # extensions with vala code get the lenient VALA_CFLAGS
             # others get the usual CFLAGS with -Wall and -Werror
-	    if (UNIT_FILES_VALA)
+    if (UNIT_FILES_VALA)
 		set_target_properties(${UNIT_SRC} PROPERTIES
 				      COMPILE_FLAGS ${VALA_CFLAGS}
 				      )

=== modified file 'extensions/about.vala'
--- extensions/about.vala	2015-06-11 22:33:48 +0000
+++ extensions/about.vala	2017-12-17 17:18: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
+            view.web_view.load_html (content, uri);
         }
     }
 

=== modified file 'extensions/adblock/extension.vala'
--- extensions/adblock/extension.vala	2016-02-01 19:48:47 +0000
+++ extensions/adblock/extension.vala	2017-12-17 17:18:01 +0000
@@ -55,7 +55,6 @@
         internal string? js_hider_function_body;
 #endif
 
-#if HAVE_WEBKIT2
 #if !HAVE_WEBKIT2_3_91
         public Extension.WebExtension (WebKit.WebExtension web_extension) {
             init ();
@@ -70,7 +69,6 @@
             return request_handled (request.uri, web_page.uri);
         }
 #endif
-#endif
 
         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);
@@ -375,12 +348,8 @@
         }
 
         void load_config () {
-#if HAVE_WEBKIT2
             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);
@@ -482,14 +451,12 @@
     }
 }
 
-#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);
 }
 #endif
-#endif
 
 public Midori.Extension extension_init () {
     return new Adblock.Extension ();

=== modified file 'extensions/adblock/widgets.vala'
--- extensions/adblock/widgets.vala	2015-08-09 20:44:57 +0000
+++ extensions/adblock/widgets.vala	2017-12-17 17:18:01 +0000
@@ -95,15 +95,10 @@
         public void add_subscription (string? uri) {
             var dialog = new Gtk.Dialog.with_buttons (_("Configure Advertisement filters"),
                 null,
-#if !HAVE_GTK3
-                Gtk.DialogFlags.NO_SEPARATOR |
-#endif
                 Gtk.DialogFlags.DESTROY_WITH_PARENT,
                 Gtk.STOCK_HELP, Gtk.ResponseType.HELP,
                 Gtk.STOCK_CLOSE, Gtk.ResponseType.CLOSE);
-#if HAVE_GTK3
             dialog.get_widget_for_response (Gtk.ResponseType.HELP).get_style_context ().add_class ("help_button");
-#endif
             dialog.set_icon_name (Gtk.STOCK_PROPERTIES);
             dialog.set_response_sensitive (Gtk.ResponseType.HELP, false);
 
@@ -227,7 +222,7 @@
                             liststore.get (iter, 0, out sub);
                             if (sub.mutable) {
                                 config.remove (sub);
-                                liststore.remove (iter);
+                                liststore.remove (ref iter);
                                 return true;
                             }
                         }
@@ -254,9 +249,6 @@
         public void show () {
              this.dialog = new Gtk.Dialog.with_buttons (_("Edit rule"),
                 null,
-#if !HAVE_GTK3
-                Gtk.DialogFlags.NO_SEPARATOR |
-#endif
                 Gtk.DialogFlags.DESTROY_WITH_PARENT,
                 Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL,
                 Gtk.STOCK_ADD, Gtk.ResponseType.ACCEPT);

=== modified file 'extensions/apps.vala'
--- extensions/apps.vala	2016-01-15 19:18:17 +0000
+++ extensions/apps.vala	2017-12-17 17:18:01 +0000
@@ -262,7 +262,7 @@
                             store.get (iter, 0, out launcher);
                             try {
                                 launcher.file.trash (null);
-                                store.remove (iter);
+                                store.remove (ref iter);
 
                                 string filename = Midori.Download.clean_filename (launcher.name);
 #if HAVE_WIN32

=== modified file 'extensions/colorful-tabs.c'
--- extensions/colorful-tabs.c	2016-02-24 21:45:09 +0000
+++ extensions/colorful-tabs.c	2017-12-17 17:18: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	2017-12-17 17:18:01 +0000
@@ -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);
 	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/cookie-permissions/cookie-permission-manager-preferences-window.c'
--- extensions/cookie-permissions/cookie-permission-manager-preferences-window.c	2014-01-01 22:39:30 +0000
+++ extensions/cookie-permissions/cookie-permission-manager-preferences-window.c	2017-12-17 17:18:01 +0000
@@ -735,12 +735,8 @@
 
 	/* Get content area to add gui controls to */
 	priv->contentArea=gtk_dialog_get_content_area(GTK_DIALOG(self));
-#ifdef HAVE_GTK3
 	vbox=gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
 	gtk_box_set_homogeneous(GTK_BOX(vbox), FALSE);
-#else
-	vbox=gtk_vbox_new(FALSE, 0);
-#endif
 
 	/* Set up dialog */
 	dialogTitle=_("Configure cookie permission");
@@ -786,12 +782,8 @@
 	gtk_tree_sortable_set_sort_column_id(sortableList, DOMAIN_COLUMN, GTK_SORT_ASCENDING);
 
 	/* Set up domain addition widgets */
-#ifdef HAVE_GTK3
 	hbox=gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
 	gtk_box_set_homogeneous(GTK_BOX(hbox), FALSE);
-#else
-	hbox=gtk_hbox_new(FALSE, 0);
-#endif
 
 	priv->addDomainEntry=gtk_entry_new();
 	gtk_entry_set_max_length(GTK_ENTRY(priv->addDomainEntry), 64);
@@ -824,10 +816,6 @@
 	/* Set up cookie domain list */
 	priv->list=gtk_tree_view_new_with_model(GTK_TREE_MODEL(priv->listStore));
 
-#ifndef HAVE_GTK3
-	gtk_widget_set_size_request(priv->list, -1, 300);
-#endif
-
 	priv->listSelection=gtk_tree_view_get_selection(GTK_TREE_VIEW(priv->list));
 	gtk_tree_selection_set_mode(priv->listSelection, GTK_SELECTION_MULTIPLE);
 	g_signal_connect_swapped(priv->listSelection, "changed", G_CALLBACK(_cookie_permission_manager_preferences_changed_selection), self);
@@ -853,21 +841,15 @@
 	gtk_tree_view_append_column(GTK_TREE_VIEW(priv->list), column);
 
 	scrolled=gtk_scrolled_window_new(NULL, NULL);
-#ifdef HAVE_GTK3
 	gtk_scrolled_window_set_min_content_height(GTK_SCROLLED_WINDOW(scrolled), height*10);
-#endif
 	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 	gtk_container_add(GTK_CONTAINER(scrolled), priv->list);
 	gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_IN);
 	gtk_box_pack_start(GTK_BOX(vbox), scrolled, TRUE, TRUE, 5);
 
 	/* Set up cookie domain list management buttons */
-#ifdef HAVE_GTK3
 	hbox=gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
 	gtk_box_set_homogeneous(GTK_BOX(hbox), FALSE);
-#else
-	hbox=gtk_hbox_new(FALSE, 0);
-#endif
 
 	priv->deleteButton=gtk_button_new_from_stock(GTK_STOCK_DELETE);
 	gtk_widget_set_sensitive(priv->deleteButton, FALSE);
@@ -883,12 +865,8 @@
 	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 5);
 
 	/* Add "unknown-policy" combo */
-#ifdef HAVE_GTK3
 	hbox=gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
 	gtk_box_set_homogeneous(GTK_BOX(hbox), FALSE);
-#else
-	hbox=gtk_hbox_new(FALSE, 0);
-#endif
 	widget=gtk_label_new(_("Policy for cookies from domains not in the list: "));
 	gtk_container_add(GTK_CONTAINER(hbox), widget);
 	

=== modified file 'extensions/cookie-permissions/cookie-permission-manager.c'
--- extensions/cookie-permissions/cookie-permission-manager.c	2014-06-14 03:40:37 +0000
+++ extensions/cookie-permissions/cookie-permission-manager.c	2017-12-17 17:18:01 +0000
@@ -219,7 +219,6 @@
 			gchar		*domain=(gchar*)sqlite3_column_text(statement, 0);
 			GSList		*cookies, *cookie;
 
-#ifdef HAVE_LIBSOUP_2_40_0
 			SoupURI		*uri;
 
 			uri=soup_uri_new(NULL);
@@ -232,17 +231,6 @@
 			}
 			soup_cookies_free(cookies);
 			soup_uri_free(uri);
-#else
-			cookies=soup_cookie_jar_all_cookies(priv->cookieJar);
-			for(cookie=cookies; cookie; cookie=cookie->next)
-			{
-				if(soup_cookie_domain_matches((SoupCookie*)cookie->data, domain))
-				{
-					soup_cookie_jar_delete_cookie(priv->cookieJar, (SoupCookie*)cookie->data);
-				}
-			}
-			soup_cookies_free(cookies);
-#endif
 		}
 	}
 		else g_warning(_("SQL fails: %s"), sqlite3_errmsg(priv->database));
@@ -545,9 +533,6 @@
 
 	/* Create list and set up columns of list */
 	list=gtk_tree_view_new_with_model(GTK_TREE_MODEL(listStore));
-#ifndef HAVE_GTK3
-	gtk_widget_set_size_request(list, -1, 100);
-#endif
 
 	renderer=gtk_cell_renderer_text_new();
 	column=gtk_tree_view_column_new_with_attributes(_("Domain"),
@@ -589,9 +574,7 @@
 	gtk_tree_view_append_column(GTK_TREE_VIEW(list), column);
 
 	scrolled=gtk_scrolled_window_new(NULL, NULL);
-#ifdef HAVE_GTK3
 	gtk_scrolled_window_set_min_content_height(GTK_SCROLLED_WINDOW(scrolled), 100);
-#endif
 	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 	gtk_container_add(GTK_CONTAINER(scrolled), list);
 	gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_IN);

=== modified file 'extensions/external-download-manager.vala'
--- extensions/external-download-manager.vala	2015-08-20 06:18:50 +0000
+++ extensions/external-download-manager.vala	2017-12-17 17:18:01 +0000
@@ -35,16 +35,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");
@@ -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;
         }
     }
@@ -271,14 +259,9 @@
             this.input.set_text (this.commandline.get_string ("commandline"));
 
 
-#if HAVE_GTK3
             Gtk.Box vbox = get_content_area () as Gtk.Box;
             vbox.pack_start (text, false, false, 0);
             vbox.pack_start (this.input, false, true, 0);
-#else
-            this.vbox.pack_start (text, false, false, 0);
-            this.vbox.pack_start (this.input, false, true, 0);
-#endif
 
             this.add_button (Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL);
             this.add_button (Gtk.STOCK_APPLY, Gtk.ResponseType.APPLY);

=== 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	2017-12-17 17:18:01 +0000
@@ -84,10 +84,10 @@
     if ((uri = katze_item_get_uri (pitem)))
     {
         if (!(pixbuf = midori_paths_get_icon (uri, NULL)))
-            pixbuf = gtk_widget_render_icon (panel->treeview, STOCK_NEWS_FEED, GTK_ICON_SIZE_MENU, NULL);
+            pixbuf = gtk_widget_render_icon_pixbuf (panel->treeview, STOCK_NEWS_FEED, GTK_ICON_SIZE_MENU);
     }
     else
-        pixbuf = gtk_widget_render_icon (panel->treeview, GTK_STOCK_DIALOG_ERROR, GTK_ICON_SIZE_MENU, NULL);
+        pixbuf = gtk_widget_render_icon_pixbuf (panel->treeview, GTK_STOCK_DIALOG_ERROR, GTK_ICON_SIZE_MENU);
 
     g_object_set (renderer, "pixbuf", pixbuf, NULL);
 
@@ -800,12 +800,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 ();

=== modified file 'extensions/feed-panel/main.c'
--- extensions/feed-panel/main.c	2013-08-12 19:21:06 +0000
+++ extensions/feed-panel/main.c	2017-12-17 17:18:01 +0000
@@ -348,7 +348,7 @@
 
     dialog = gtk_dialog_new_with_buttons (
             _("New feed"), GTK_WINDOW (priv->browser),
-            GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
+            GTK_DIALOG_DESTROY_WITH_PARENT,
             GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
             GTK_STOCK_ADD, GTK_RESPONSE_ACCEPT,
             NULL);

=== modified file 'extensions/formhistory/formhistory.c'
--- extensions/formhistory/formhistory.c	2013-11-26 19:08:06 +0000
+++ extensions/formhistory/formhistory.c	2017-12-17 17:18:01 +0000
@@ -99,7 +99,7 @@
     alive = 1;
     title = _("Form history");
     dialog = gtk_dialog_new_with_buttons (title, GTK_WINDOW (parent),
-            GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
+            GTK_DIALOG_DESTROY_WITH_PARENT,
             GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
             GTK_STOCK_OK, GTK_RESPONSE_OK,
             NULL);

=== modified file 'extensions/history-list.vala'
--- extensions/history-list.vala	2015-03-20 16:24:07 +0000
+++ extensions/history-list.vala	2017-12-17 17:18:01 +0000
@@ -102,12 +102,8 @@
             Gtk.Requisition requisition;
             int height;
             int max_lines = 10;
-#if HAVE_GTK3
             requisition = Gtk.Requisition();
             this.treeview.get_preferred_size(out requisition, null);
-#else
-            this.treeview.size_request (out requisition);
-#endif
             Gtk.ListStore model = this.treeview.get_model () as Gtk.ListStore;
             int length = model.iter_n_children(null);
             if (length > max_lines) {
@@ -212,18 +208,12 @@
 
                 model.get_iter (out iter, path);
                 model.get (iter, TabTreeCells.TREE_CELL_POINTER, out view);
-#if !HAVE_GTK3
-                /* removing the selected cursor causes a segfault when using GTK2 */
-                if (path.prev () == false)
-                    path.next ();
-                this.treeview.set_cursor (path, column, false);
-#endif
 
                 /*
                     FixMe: the retrun value of `Gtk.ListStore.remove` should be checked
                     Note:  in some cases the return value of `Gtk.ListStore.remove` is wrong
                 */
-                model.remove (iter);
+                model.remove (ref iter);
                 this.browser.close_tab (view);
                 if (length > 2)
                     this.resize_treeview ();
@@ -359,11 +349,7 @@
             table.attach_defaults (proxy, 0, 2, 1, 2);
 #endif
 
-#if HAVE_GTK3
             (get_content_area() as Gtk.Box).pack_start (table, false, true, 0);
-#else
-            this.vbox.pack_start (table, false, true, 0);
-#endif
 
             this.add_button (Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL);
             this.add_button (Gtk.STOCK_APPLY, Gtk.ResponseType.APPLY);

=== modified file 'extensions/nojs/nojs-preferences.c'
--- extensions/nojs/nojs-preferences.c	2014-05-09 14:47:53 +0000
+++ extensions/nojs/nojs-preferences.c	2017-12-17 17:18:01 +0000
@@ -839,12 +839,8 @@
 
 	/* Get content area to add gui controls to */
 	priv->contentArea=gtk_dialog_get_content_area(GTK_DIALOG(self));
-#if GTK_CHECK_VERSION (3, 0, 0)
 	vbox=gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
 	gtk_box_set_homogeneous(GTK_BOX(vbox), FALSE);
-#else
-	vbox=gtk_vbox_new(FALSE, 0);
-#endif
 
 	/* Set up dialog */
 	dialogTitle=_("Configure NoJS");
@@ -887,12 +883,8 @@
 	gtk_tree_sortable_set_sort_column_id(sortableList, DOMAIN_COLUMN, GTK_SORT_ASCENDING);
 
 	/* Set up domain addition widgets */
-#ifdef HAVE_GTK3
 	hbox=gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
 	gtk_box_set_homogeneous(GTK_BOX(hbox), FALSE);
-#else
-	hbox=gtk_hbox_new(FALSE, 0);
-#endif
 
 	priv->addDomainEntry=gtk_entry_new();
 	gtk_entry_set_max_length(GTK_ENTRY(priv->addDomainEntry), 64);
@@ -925,10 +917,6 @@
 	/* Set up domain list view */
 	priv->list=gtk_tree_view_new_with_model(GTK_TREE_MODEL(priv->listStore));
 
-#if !GTK_CHECK_VERSION (3, 0, 0)
-	gtk_widget_set_size_request(priv->list, -1, 300);
-#endif
-
 	priv->listSelection=gtk_tree_view_get_selection(GTK_TREE_VIEW(priv->list));
 	gtk_tree_selection_set_mode(priv->listSelection, GTK_SELECTION_MULTIPLE);
 	g_signal_connect_swapped(priv->listSelection, "changed", G_CALLBACK(_nojs_preferences_changed_selection), self);
@@ -954,21 +942,15 @@
 	gtk_tree_view_append_column(GTK_TREE_VIEW(priv->list), column);
 
 	scrolled=gtk_scrolled_window_new(NULL, NULL);
-#if GTK_CHECK_VERSION (3, 0, 0)
 	gtk_scrolled_window_set_min_content_height(GTK_SCROLLED_WINDOW(scrolled), height*10);
-#endif
 	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 	gtk_container_add(GTK_CONTAINER(scrolled), priv->list);
 	gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_IN);
 	gtk_box_pack_start(GTK_BOX(vbox), scrolled, TRUE, TRUE, 5);
 
 	/* Set up JavaScript domain list management buttons */
-#if GTK_CHECK_VERSION (3, 0, 0)
 	hbox=gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
 	gtk_box_set_homogeneous(GTK_BOX(hbox), FALSE);
-#else
-	hbox=gtk_hbox_new(FALSE, 0);
-#endif
 
 	priv->deleteButton=gtk_button_new_from_stock(GTK_STOCK_DELETE);
 	gtk_widget_set_sensitive(priv->deleteButton, FALSE);

=== modified file 'extensions/notes.vala'
--- extensions/notes.vala	2015-03-18 21:18:11 +0000
+++ extensions/notes.vala	2017-12-17 17:18:01 +0000
@@ -116,7 +116,7 @@
                     if (current_note == note) {
                         current_note = null;
                     }
-                    notes_list_store.remove (iter);
+                    notes_list_store.remove (ref iter);
                     break;
                 }
             } while (notes_list_store.iter_next (ref iter));

=== modified file 'extensions/open-with.vala'
--- extensions/open-with.vala	2016-02-17 20:26:51 +0000
+++ extensions/open-with.vala	2017-12-17 17:18:01 +0000
@@ -157,9 +157,6 @@
             transient_for = browser;
 
             title = _("Custom…");
-#if !HAVE_GTK3
-            has_separator = false;
-#endif
             destroy_with_parent = true;
             set_icon_name (Gtk.STOCK_OPEN);
             resizable = false;
@@ -370,9 +367,6 @@
             transient_for = browser;
 
             title = _("Choose application");
-#if !HAVE_GTK3
-            has_separator = false;
-#endif
             destroy_with_parent = true;
             set_icon_name (Gtk.STOCK_OPEN);
             resizable = true;
@@ -393,11 +387,7 @@
             get_content_area ().show_all ();
 
             Gtk.Requisition req;
-#if HAVE_GTK3
             get_content_area ().get_preferred_size (null, out req);
-#else
-            get_content_area ().size_request (out req);
-#endif
             (this as Gtk.Window).set_default_size (req.width*2, req.height*3/2);
 
             set_default_response (Gtk.ResponseType.ACCEPT);
@@ -558,9 +548,7 @@
             renderer.set ("markup",
                 Markup.printf_escaped ("<b>%s</b>\n%s",
                     desc, mime_type),
-#if HAVE_GTK3
                           "max-width-chars", 30,
-#endif
                           "width-chars", 30,
                           "ellipsize", Pango.EllipsizeMode.END);
         }
@@ -582,9 +570,7 @@
             AppInfo app_info;
             model.get (iter, 1, out app_info);
             renderer.set ("markup", describe_app_info (app_info),
-#if HAVE_GTK3
                           "max-width-chars", 30,
-#endif
                           "width-chars", 30,
                           "ellipsize", Pango.EllipsizeMode.END);
         }

=== modified file 'extensions/shortcuts.c'
--- extensions/shortcuts.c	2013-03-23 01:37:12 +0000
+++ extensions/shortcuts.c	2017-12-17 17:18:01 +0000
@@ -167,7 +167,7 @@
 
     dialog_title = _("Customize Keyboard shortcuts");
     dialog = gtk_dialog_new_with_buttons (dialog_title, GTK_WINDOW (browser),
-        GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
+        GTK_DIALOG_DESTROY_WITH_PARENT,
         #if !HAVE_OSX
         GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
         #endif

=== modified file 'extensions/tabby.vala'
--- extensions/tabby.vala	2015-06-23 19:25:13 +0000
+++ extensions/tabby.vala	2017-12-17 17:18:01 +0000
@@ -236,11 +236,7 @@
                 }
             }
 
-#if HAVE_GTK3
             protected bool delete_event (Gtk.Widget widget, Gdk.EventAny event) {
-#else
-            protected bool delete_event (Gtk.Widget widget, Gdk.Event event) {
-#endif
 
                 this.close ();
                 return false;

=== modified file 'extensions/transfers.vala'
--- extensions/transfers.vala	2017-02-15 18:50:47 +0000
+++ extensions/transfers.vala	2017-12-17 17:18:01 +0000
@@ -9,10 +9,6 @@
    See the file COPYING for the full license text.
 */
 
-namespace Gtk {
-    extern static void widget_size_request (Gtk.Widget widget, out Gtk.Requisition requisition);
-}
-
 namespace Sokoke {
     extern static void widget_get_text_size (Gtk.Widget widget, string sample, out int width, out int height);
 }
@@ -275,7 +271,7 @@
                     Transfer found;
                     store.get (iter, 0, out found);
                     if (transfer == found) {
-                        store.remove (iter);
+                        store.remove (ref iter);
                         break;
                     }
                 } while (store.iter_next (ref iter));
@@ -328,9 +324,7 @@
 
             var box = new Gtk.HBox (false, 0);
             progress = new Gtk.ProgressBar ();
-#if HAVE_GTK3
             progress.show_text = true;
-#endif
             progress.ellipsize = Pango.EllipsizeMode.MIDDLE;
             string filename = Midori.Download.get_basename_for_display (transfer.destination);
             progress.text = filename;
@@ -418,7 +412,7 @@
             show ();
 
             Gtk.Requisition req;
-            Gtk.widget_size_request (parent, out req);
+            parent.get_preferred_size (out req, null);
             int reqwidth = req.width;
             int winwidth;
             (get_toplevel () as Gtk.Window).get_size (out winwidth, null);
@@ -501,11 +495,7 @@
             transfer.removed ();
         }
 
-#if HAVE_GTK3
         bool browser_closed (Gtk.Widget widget, Gdk.EventAny event) {
-#else
-        bool browser_closed (Gtk.Widget widget, Gdk.Event event) {
-#endif
             var browser = widget as Midori.Browser;
             if (pending_transfers (array)) {
                 var dialog = new Gtk.MessageDialog (browser,
@@ -531,11 +521,7 @@
             browser.panel.append_page (viewable);
             widgets.append (viewable);
             var toolbar = new Toolbar (array);
-#if HAVE_GTK3
             browser.statusbar.pack_end (toolbar, false, false);
-#else
-            browser.statusbar.pack_start (toolbar, false, false);
-#endif
             widgets.append (toolbar);
             // TODO: popover
             // TODO: progress in dock item

=== removed file 'katze/gtk3-compat.c'
--- katze/gtk3-compat.c	2015-08-10 23:42:56 +0000
+++ katze/gtk3-compat.c	1970-01-01 00:00:00 +0000
@@ -1,243 +0,0 @@
-/*
- Copyright (C) 2011-2012 Christian Dywan <[e-mail]>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- See the file COPYING for the full license text.
-*/
-
-#include "katze/gtk3-compat.h"
-
-#if !GTK_CHECK_VERSION (3, 2, 0)
-static void
-sokoke_widget_set_pango_font_style (GtkWidget* widget,
-                                    PangoStyle style)
-{
-    /* Conveniently change the pango font style
-       For some reason we need to reset if we actually want the normal style */
-    if (style == PANGO_STYLE_NORMAL)
-        gtk_widget_modify_font (widget, NULL);
-    else
-    {
-        PangoFontDescription* font_description = pango_font_description_new ();
-        pango_font_description_set_style (font_description, PANGO_STYLE_ITALIC);
-        gtk_widget_modify_font (widget, font_description);
-        pango_font_description_free (font_description);
-    }
-}
-
-/* returns TRUE if the entry is currently showing its placeholder text */
-static gboolean
-sokoke_entry_is_showing_default (GtkEntry* entry)
-{
-    gint showing_default = GPOINTER_TO_INT (
-        g_object_get_data (G_OBJECT (entry), "sokoke_showing_default"));
-
-    const gchar* text = gtk_entry_get_text (entry);
-    const gchar* default_text = (const gchar*)g_object_get_data (
-        G_OBJECT (entry), "sokoke_default_text");
-
-    return showing_default && !g_strcmp0(text, default_text);
-}
-
-/* returns TRUE if the entry is not being used by the user to perform entry or
-hold data at a given moment */
-static gboolean
-sokoke_entry_is_idle (GtkEntry* entry)
-{
-    const gchar* text = gtk_entry_get_text (entry);
-    
-    /* if the default is visible or the user has left the entry blank */
-    return sokoke_entry_is_showing_default(entry) ||
-        (text && !*text && !gtk_widget_has_focus (GTK_WIDGET (entry)));
-}
-
-static gboolean
-sokoke_on_entry_text_changed (GtkEntry*   entry,
-                              GParamSpec* pspec,
-                              gpointer    userdata);
-
-static void
-sokoke_hide_placeholder_text (GtkEntry* entry)
-{
-    if(sokoke_entry_is_showing_default (entry))
-    {
-        g_signal_handlers_block_by_func (entry, sokoke_on_entry_text_changed, NULL);
-        gtk_entry_set_text (entry, "");
-        g_signal_handlers_unblock_by_func (entry, sokoke_on_entry_text_changed, NULL);
-    }
-    g_object_set_data (G_OBJECT (entry), "sokoke_showing_default",
-                       GINT_TO_POINTER (0));
-    sokoke_widget_set_pango_font_style (GTK_WIDGET (entry),
-                                        PANGO_STYLE_NORMAL);
-}
-
-static gboolean
-sokoke_on_entry_focus_in_event (GtkEntry*      entry,
-                                GdkEventFocus* event,
-                                gpointer       userdata)
-{
-    sokoke_hide_placeholder_text (entry);
-    return FALSE;
-}
-
-static void
-sokoke_show_placeholder_text (GtkEntry* entry)
-{
-    /* no need to do work if the widget is unfocused with placeholder */
-    if(sokoke_entry_is_showing_default (entry))
-        return;
-
-    /* no need to do work if the placeholder is already visible */
-    const gchar* text = gtk_entry_get_text (entry);
-    if (text && !*text)
-    {
-        const gchar* default_text = (const gchar*)g_object_get_data (
-            G_OBJECT (entry), "sokoke_default_text");
-        g_object_set_data (G_OBJECT (entry),
-                           "sokoke_showing_default", GINT_TO_POINTER (1));
-        g_signal_handlers_block_by_func (entry, sokoke_on_entry_text_changed, NULL);
-        gtk_entry_set_text (entry, default_text);
-        g_signal_handlers_unblock_by_func (entry, sokoke_on_entry_text_changed, NULL);
-        sokoke_widget_set_pango_font_style (GTK_WIDGET (entry),
-                                            PANGO_STYLE_ITALIC);
-    }
-}
-
-static void
-sokoke_on_entry_drag_leave (GtkEntry*       entry,
-                             GdkDragContext* drag_context,
-                             guint           timestamp,
-                             gpointer        user_data)
-{
-    sokoke_show_placeholder_text (entry);
-}
-
-static gboolean
-sokoke_on_entry_text_changed (GtkEntry*   entry,
-                              GParamSpec* pspec,
-                              gpointer    userdata)
-{
-    if(sokoke_entry_is_idle (entry))
-    {
-        sokoke_show_placeholder_text (entry);
-    }
-    else
-    {
-        sokoke_hide_placeholder_text (entry);
-    }
-
-    return TRUE;
-}
-
-static gboolean
-sokoke_on_entry_focus_out_event (GtkEntry*      entry,
-                                 GdkEventFocus* event,
-                                 gpointer       userdata)
-{
-    sokoke_show_placeholder_text (entry);
-    return FALSE;
-}
-
-static gboolean
-sokoke_on_entry_drag_motion (GtkEntry*       entry,
-                             GdkDragContext* drag_context,
-                             gint            x,
-                             gint            y,
-                             guint           timestamp,
-                             gpointer        user_data)
-{
-    sokoke_hide_placeholder_text (entry);
-    return FALSE;
-}
-
-static gboolean
-sokoke_on_entry_drag_drop (GtkEntry*       entry,
-                           GdkDragContext* drag_context,
-                           gint            x,
-                           gint            y,
-                           guint           timestamp,
-                           gpointer        user_data)
-{
-    sokoke_hide_placeholder_text (entry);
-    return FALSE;
-}
-
-static void
-sokoke_on_entry_popup (GtkEntry  *entry,
-                       GtkWidget *popup,
-                       gpointer   user_data)
-{
-    /* If the user selects paste in the popup, we should hide the default
-    when the menu closes so it pastes into a clean entry */
-    g_signal_connect_swapped (popup, "destroy", G_CALLBACK (
-        sokoke_hide_placeholder_text), entry);
-}
-
-void
-gtk_entry_set_placeholder_text (GtkEntry*    entry,
-                                const gchar* default_text)
-{
-    /* Note: The default text initially overwrites any previous text */
-    gchar* old_default_text = g_object_get_data (G_OBJECT (entry), "sokoke_default_text");
-    g_object_set_data (G_OBJECT (entry), "sokoke_default_text", (gpointer)default_text);
-
-    if (default_text == NULL)
-    {
-        g_object_set_data (G_OBJECT (entry), "sokoke_showing_default", GINT_TO_POINTER (0));
-        g_signal_handlers_disconnect_by_func (entry,
-            G_CALLBACK (sokoke_on_entry_drag_motion), NULL);
-        g_signal_handlers_disconnect_by_func (entry,
-            G_CALLBACK (sokoke_on_entry_focus_in_event), NULL);
-        g_signal_handlers_disconnect_by_func (entry,
-            G_CALLBACK (sokoke_on_entry_drag_leave), NULL);
-        g_signal_handlers_disconnect_by_func (entry,
-            G_CALLBACK (sokoke_on_entry_drag_drop), NULL);
-        g_signal_handlers_disconnect_by_func (entry,
-           G_CALLBACK (sokoke_on_entry_focus_out_event), NULL);
-        g_signal_handlers_disconnect_by_func (entry,
-            G_CALLBACK (sokoke_on_entry_text_changed), NULL);
-        g_signal_handlers_disconnect_by_func (entry,
-            G_CALLBACK (sokoke_on_entry_popup), NULL);
-    }
-    else if (old_default_text == NULL)
-    {
-        g_object_set_data (G_OBJECT (entry), "sokoke_showing_default", GINT_TO_POINTER (1));
-        sokoke_widget_set_pango_font_style (GTK_WIDGET (entry), PANGO_STYLE_ITALIC);
-        gtk_entry_set_text (entry, default_text);
-        g_signal_connect (entry, "drag-motion",
-            G_CALLBACK (sokoke_on_entry_drag_motion), NULL);
-        g_signal_connect (entry, "focus-in-event",
-            G_CALLBACK (sokoke_on_entry_focus_in_event), NULL);
-        g_signal_connect (entry, "drag-leave",
-            G_CALLBACK (sokoke_on_entry_drag_leave), NULL);
-        g_signal_connect (entry, "drag-drop",
-            G_CALLBACK (sokoke_on_entry_drag_drop), NULL);
-        g_signal_connect (entry, "focus-out-event",
-           G_CALLBACK (sokoke_on_entry_focus_out_event), NULL);
-        g_signal_connect (entry, "notify::text",
-            G_CALLBACK (sokoke_on_entry_text_changed), NULL);
-        g_signal_connect (entry, "populate-popup",
-            G_CALLBACK (sokoke_on_entry_popup), NULL);
-    }
-    else if (!gtk_widget_has_focus (GTK_WIDGET (entry)))
-    {
-        gint showing_default = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (entry), "sokoke_showing_default"));
-        if (showing_default)
-        {
-            gtk_entry_set_text (entry, default_text);
-            sokoke_widget_set_pango_font_style (GTK_WIDGET (entry), PANGO_STYLE_ITALIC);
-        }
-    }
-}
-
-const gchar*
-gtk_entry_get_placeholder_text (GtkEntry* entry)
-{
-    return g_object_get_data (G_OBJECT (entry), "sokoke_default_text");
-}
-#endif
-

=== removed file 'katze/gtk3-compat.h'
--- katze/gtk3-compat.h	2013-06-26 21:54:50 +0000
+++ katze/gtk3-compat.h	1970-01-01 00:00:00 +0000
@@ -1,93 +0,0 @@
-/*
- Copyright (C) 2011-2012 Christian Dywan <[e-mail]>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- See the file COPYING for the full license text.
-*/
-
-#include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
-
-#ifndef H_GTK3_COMPAT_20110110
-#define H_GTK3_COMPAT_20110110
-
-G_BEGIN_DECLS
-
-#if GTK_CHECK_VERSION (3, 2, 0) && defined (GTK_DISABLE_DEPRECATED)
-    #define GTK_TYPE_VBOX GTK_TYPE_BOX
-    #define GtkVBox GtkBox
-    #define GtkVBoxClass GtkBoxClass
-    #define gtk_vbox_new(hmg,spc) g_object_new (GTK_TYPE_BOX, \
-        "homogeneous", hmg, "spacing", spc, \
-        "orientation", GTK_ORIENTATION_VERTICAL, NULL)
-    #define GTK_TYPE_HBOX GTK_TYPE_BOX
-    #define GtkHBox GtkBox
-    #define GtkHBoxClass GtkBoxClass
-    #define gtk_hbox_new(hmg,spc) g_object_new (GTK_TYPE_BOX, \
-        "homogeneous", hmg, "spacing", spc, \
-        "orientation", GTK_ORIENTATION_HORIZONTAL, NULL)
-    #define gtk_hseparator_new() g_object_new (GTK_TYPE_SEPARATOR, NULL)
-    #define gtk_hpaned_new() g_object_new (GTK_TYPE_PANED, NULL)
-    #define gtk_vpaned_new() g_object_new (GTK_TYPE_PANED, \
-        "orientation", GTK_ORIENTATION_VERTICAL, NULL)
-    /* FIXME */
-    #define gtk_widget_render_icon(wdgt, stk, sz, dtl) \
-        gtk_widget_render_icon_pixbuf(wdgt, stk, sz)
-    #define gtk_widget_size_request(wdgt, req) \
-        gtk_widget_get_preferred_size(wdgt, req, NULL)
-#endif
-
-#if GTK_CHECK_VERSION (3, 0, 0)
-    #define GTK_DIALOG_NO_SEPARATOR 0
-#endif
-
-#if !GTK_CHECK_VERSION (3, 2, 0)
-    void gtk_entry_set_placeholder_text (GtkEntry* entry, const gchar* text);
-    const gchar* gtk_entry_get_placeholder_text (GtkEntry* entry);
-#endif
-
-#ifndef GDK_KEY_Return
-    #define GDK_KEY_0 GDK_0
-    #define GDK_KEY_BackSpace GDK_BackSpace
-    #define GDK_KEY_space GDK_space
-    #define GDK_KEY_F5 GDK_F5
-    #define GDK_KEY_KP_Equal GDK_KP_Equal
-    #define GDK_KEY_KP_Enter GDK_KP_Enter
-    #define GDK_KEY_KP_Left GDK_KP_Left
-    #define GDK_KEY_KP_Right GDK_KP_Right
-    #define GDK_KEY_KP_Delete GDK_KP_Delete
-    #define GDK_KEY_KP_Down GDK_KP_Down
-    #define GDK_KEY_KP_Up GDK_KP_Up
-    #define GDK_KEY_KP_Divide GDK_KP_Divide
-    #define GDK_KEY_Tab GDK_Tab
-    #define GDK_KEY_ISO_Left_Tab GDK_ISO_Left_Tab
-    #define GDK_KEY_equal GDK_equal
-    #define GDK_KEY_ISO_Enter GDK_ISO_Enter
-    #define GDK_KEY_Left GDK_Left
-    #define GDK_KEY_Right GDK_Right
-    #define GDK_KEY_Escape GDK_Escape
-    #define GDK_KEY_Page_Up GDK_Page_Up
-    #define GDK_KEY_Page_Down GDK_Page_Down
-    #define GDK_KEY_Delete GDK_Delete
-    #define GDK_KEY_Down GDK_Down
-    #define GDK_KEY_Up GDK_Up
-    #define GDK_KEY_B GDK_B
-    #define GDK_KEY_H GDK_H
-    #define GDK_KEY_J GDK_J
-    #define GDK_KEY_Return GDK_Return
-#endif
-
-#ifdef GDK_WINDOWING_X11
-    #include <gdk/gdkx.h>
-    #ifndef GDK_IS_X11_DISPLAY
-        #define GDK_IS_X11_DISPLAY(display) TRUE
-    #endif
-#endif
-
-G_END_DECLS
-
-#endif

=== modified file 'katze/katze-cellrenderercomboboxtext.c'
--- katze/katze-cellrenderercomboboxtext.c	2014-05-20 02:15:05 +0000
+++ katze/katze-cellrenderercomboboxtext.c	2017-12-17 17:18:01 +0000
@@ -39,16 +39,11 @@
 static void
 katze_cell_renderer_combobox_text_get_size (GtkCellRenderer* cell,
     GtkWidget*       widget,
-#if GTK_CHECK_VERSION(3,0,0)
     const GdkRectangle*      cell_area,
-#else
-    GdkRectangle*            cell_area,
-#endif
     gint*            x_offset,
     gint*            y_offset,
     gint*            width,
     gint*            height);
-#if GTK_CHECK_VERSION(3,0,0)
 static void
 katze_cell_renderer_combobox_text_render (GtkCellRenderer      *cell,
     cairo_t*             cr,
@@ -56,16 +51,6 @@
     const GdkRectangle   *background_area,
     const GdkRectangle   *cell_area,
     GtkCellRendererState  flags);
-#else
-static void
-katze_cell_renderer_combobox_text_render (GtkCellRenderer      *cell,
-    GdkDrawable          *window,
-    GtkWidget            *widget,
-    GdkRectangle         *background_area,
-    GdkRectangle         *cell_area,
-    GdkRectangle         *expose_area,
-    GtkCellRendererState  flags);
-#endif
 
 enum {
     PROP_0,
@@ -425,11 +410,7 @@
 static void
 katze_cell_renderer_combobox_text_get_size (GtkCellRenderer *cell,
 				 GtkWidget       *widget,
-#if GTK_CHECK_VERSION(3,0,0)
                                  const GdkRectangle* cell_area,
-#else
-                                 GdkRectangle*       cell_area,
-#endif
 				 gint            *x_offset,
 				 gint            *y_offset,
 				 gint            *width,
@@ -450,22 +431,12 @@
 }
 
 static void
-#if GTK_CHECK_VERSION(3,0,0)
 katze_cell_renderer_combobox_text_render (GtkCellRenderer      *cell,
 			       cairo_t*             cr,
 			       GtkWidget            *widget,
 			       const GdkRectangle   *background_area,
 			       const GdkRectangle   *cell_area,
 			       GtkCellRendererState  flags)
-#else
-katze_cell_renderer_combobox_text_render (GtkCellRenderer      *cell,
-			       GdkDrawable          *window,
-			       GtkWidget            *widget,
-			       GdkRectangle         *background_area,
-			       GdkRectangle         *cell_area,
-			       GdkRectangle         *expose_area,
-			       GtkCellRendererState  flags)
-#endif
 {
     const gchar *text = NULL;
 
@@ -473,22 +444,12 @@
 
     set_text (KATZE_CELL_RENDERER_COMBOBOX_TEXT (cell), widget, text);
 
-#if GTK_CHECK_VERSION(3,0,0)
     GTK_CELL_RENDERER_CLASS (katze_cell_renderer_combobox_text_parent_class)->render (cell,
         cr,
         widget,
         background_area,
         cell_area,
         flags);
-#else
-    GTK_CELL_RENDERER_CLASS (katze_cell_renderer_combobox_text_parent_class)->render (cell,
-        window,
-        widget,
-        background_area,
-        cell_area,
-        expose_area,
-        flags);
-#endif
 
     g_object_set (G_OBJECT (cell), "text", text, NULL);
     g_free ((gpointer)text);

=== modified file 'katze/katze-http-auth.c'
--- katze/katze-http-auth.c	2013-08-12 19:21:06 +0000
+++ katze/katze-http-auth.c	2017-12-17 17:18:01 +0000
@@ -14,7 +14,6 @@
 #endif
 
 #include "katze-http-auth.h"
-#include "gtk3-compat.h"
 
 #include <libsoup/soup.h>
 #include <gtk/gtk.h>
@@ -209,7 +208,7 @@
 
     dialog = gtk_dialog_new_with_buttons (_("Authentication Required"),
         NULL,
-        GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
+        GTK_DIALOG_DESTROY_WITH_PARENT,
         GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
         GTK_STOCK_OK, GTK_RESPONSE_OK,
         NULL);

=== modified file 'katze/katze-item.c'
--- katze/katze-item.c	2015-08-10 02:44:13 +0000
+++ katze/katze-item.c	2017-12-17 17:18:01 +0000
@@ -450,7 +450,7 @@
     g_return_val_if_fail (KATZE_IS_ITEM (item), NULL);
 
     if (widget && KATZE_ITEM_IS_FOLDER (item))
-        return gtk_widget_render_icon (widget, GTK_STOCK_DIRECTORY, GTK_ICON_SIZE_MENU, NULL);
+        return gtk_widget_render_icon_pixbuf (widget, GTK_STOCK_DIRECTORY, GTK_ICON_SIZE_MENU);
     if ((pixbuf = midori_paths_get_icon (item->uri, widget)))
         return pixbuf;
     return NULL;

=== modified file 'katze/katze-preferences.c'
--- katze/katze-preferences.c	2015-04-19 14:40:59 +0000
+++ katze/katze-preferences.c	2017-12-17 17:18:01 +0000
@@ -67,9 +67,6 @@
     g_object_set (preferences,
                   "icon-name", GTK_STOCK_PREFERENCES,
                   "title", dialog_title,
-#if !GTK_CHECK_VERSION (2, 22, 0)
-                  "has-separator", FALSE,
-#endif
                   NULL);
     g_free (dialog_title);
 
@@ -143,15 +140,8 @@
 katze_preferences_prepare (KatzePreferences* preferences)
 {
     KatzePreferencesPrivate* priv = preferences->priv;
-    
-    #if GTK_CHECK_VERSION (3, 10, 0) && !HAVE_OSX
-    priv->notebook = gtk_stack_new ();
-    #else
+    #if HAVE_OSX
     priv->notebook = gtk_notebook_new ();
-    #endif
-    gtk_container_set_border_width (GTK_CONTAINER (priv->notebook), 6);
-
-    #if HAVE_OSX
     gtk_notebook_set_show_tabs (GTK_NOTEBOOK (priv->notebook), FALSE);
     gtk_notebook_set_show_border (GTK_NOTEBOOK (priv->notebook), FALSE);
     priv->toolbar = gtk_toolbar_new ();
@@ -160,17 +150,15 @@
     gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (preferences))),
                         priv->toolbar, FALSE, FALSE, 0);
     #else
-    #if GTK_CHECK_VERSION (3, 10, 0) && !HAVE_OSX
+    priv->notebook = gtk_stack_new ();
         priv->toolbar = gtk_stack_switcher_new ();
         gtk_stack_switcher_set_stack (GTK_STACK_SWITCHER (priv->toolbar), GTK_STACK (priv->notebook));
         gtk_widget_set_halign (priv->toolbar, GTK_ALIGN_CENTER);
         gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (preferences))),
                         priv->toolbar, FALSE, FALSE, 0);
-    #else
-        priv->toolbar = NULL;
     #endif
 
-    #endif
+    gtk_container_set_border_width (GTK_CONTAINER (priv->notebook), 6);
     priv->toolbutton = NULL;
     gtk_box_pack_end (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (preferences))),
                       priv->notebook, TRUE, TRUE, 4);
@@ -200,7 +188,7 @@
     gtk_widget_show_all (gtk_dialog_get_content_area (GTK_DIALOG (preferences)));
 }
 
-#if GTK_CHECK_VERSION (3, 10, 0) & !HAVE_OSX
+#if !HAVE_OSX
 /* these functions are used to clear the 100-px width set in GTK3's
 update_button function in gtk/gtkstackswitcher.c */
 
@@ -252,17 +240,10 @@
     priv->sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
     gtk_widget_show (priv->page);
     gtk_container_set_border_width (GTK_CONTAINER (priv->page), 4);
-    #if GTK_CHECK_VERSION (3, 10, 0) & !HAVE_OSX
-    gtk_stack_add_titled (GTK_STACK (priv->notebook), 
-                         priv->page, label, label);
-    workaround_stack_switcher_sizing (GTK_STACK_SWITCHER (priv->toolbar));
-    #else
+
+    #if HAVE_OSX
     gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook),
                               priv->page, gtk_label_new (label));
-
-    #endif
-
-    #if HAVE_OSX
     priv->toolbutton = GTK_WIDGET (priv->toolbutton ?
         gtk_radio_tool_button_new_from_widget (
         GTK_RADIO_TOOL_BUTTON (priv->toolbutton))
@@ -276,6 +257,10 @@
         G_CALLBACK (katze_preferences_toolbutton_clicked_cb), priv->page);
     if (priv->toolbutton)
         g_object_set_data (G_OBJECT (priv->toolbutton), "notebook", priv->notebook);
+    #else
+    gtk_stack_add_titled (GTK_STACK (priv->notebook), 
+                         priv->page, label, label);
+    workaround_stack_switcher_sizing (GTK_STACK_SWITCHER (priv->toolbar));
     #endif
 
     return priv->page;

=== modified file 'katze/katze-utils.c'
--- katze/katze-utils.c	2014-05-20 02:15:05 +0000
+++ katze/katze-utils.c	2017-12-17 17:18:01 +0000
@@ -9,8 +9,6 @@
  See the file COPYING for the full license text.
 */
 
-#include "gtk3-compat.h"
-
 #include "katze-utils.h"
 #include "katze-array.h"
 #include "midori-core.h"
@@ -70,7 +68,6 @@
     g_object_set (object, property, file, NULL);
 }
 
-#if GTK_CHECK_VERSION (3, 2, 0)
 static void
 proxy_font_chooser_font_activated_cb (GtkFontChooser* chooser,
                                       GObject*        object)
@@ -89,17 +86,6 @@
     gboolean monospace = GPOINTER_TO_INT (data);
     return monospace == pango_font_family_is_monospace (family);
 }
-#else
-static void
-proxy_combo_box_text_changed_cb (GtkComboBoxText* button,
-                                 GObject*         object)
-{
-    gchar* text = gtk_combo_box_text_get_active_text (button);
-    const gchar* property = g_object_get_data (G_OBJECT (button), "property");
-    g_object_set (object, property, text, NULL);
-    g_free (text);
-}
-#endif
 
 static gboolean
 proxy_entry_focus_out_event_cb (GtkEntry*      entry,
@@ -423,7 +409,6 @@
             katze_assign (string, g_strdup ("sans"));
         gboolean monospace = _hint == I_("font-monospace");
 
-        #if GTK_CHECK_VERSION (3, 2, 0)
         widget = gtk_font_button_new ();
         gtk_font_button_set_show_size (GTK_FONT_BUTTON (widget), FALSE);
         gtk_font_chooser_set_font (GTK_FONT_CHOOSER (widget), string);
@@ -432,36 +417,6 @@
                           G_CALLBACK (proxy_font_chooser_font_activated_cb), object);
         gtk_font_chooser_set_filter_func (GTK_FONT_CHOOSER (widget),
             (GtkFontFilterFunc)proxy_font_chooser_filter_monospace_cb, GINT_TO_POINTER (monospace), NULL);
-        #else
-        GtkComboBox* combo;
-        gint n_families, i;
-        PangoContext* context;
-        PangoFontFamily** families;
-
-        widget = gtk_combo_box_text_new ();
-        combo = GTK_COMBO_BOX (widget);
-        context = gtk_widget_get_pango_context (widget);
-        pango_context_list_families (context, &families, &n_families);
-        if (string)
-        {
-            gint j = 0;
-            for (i = 0; i < n_families; i++)
-            {
-                if (monospace != pango_font_family_is_monospace (families[i]))
-                    continue;
-                const gchar* font = pango_font_family_get_name (families[i]);
-                gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), font);
-                if (!g_ascii_strcasecmp (font, string))
-                    gtk_combo_box_set_active (combo, j);
-                j++;
-            }
-        }
-        gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (
-            gtk_combo_box_get_model (combo)), 0, GTK_SORT_ASCENDING);
-        g_signal_connect (widget, "changed",
-                          G_CALLBACK (proxy_combo_box_text_changed_cb), object);
-        g_free (families);
-        #endif
     }
     else if (type == G_TYPE_PARAM_STRING)
     {
@@ -656,23 +611,13 @@
     if (!window)
         return;
 
-    #if !GTK_CHECK_VERSION (3, 0, 0)
-    if (GTK_IS_ENTRY (widget))
-        window = gdk_window_get_parent (window);
-    #endif
-
     /* Retrieve size and position of both widget and menu */
     gtk_widget_get_allocation (widget, &allocation);
     gdk_window_get_origin (window, &wx, &wy);
     wx += allocation.x;
     wy += allocation.y;
-    #if GTK_CHECK_VERSION (3, 0, 0)
     gtk_widget_get_preferred_size (GTK_WIDGET (menu), &menu_req, NULL);
     gtk_widget_get_preferred_size (widget, &widget_req, NULL);
-    #else
-    gtk_widget_size_request (GTK_WIDGET (menu), &menu_req);
-    gtk_widget_size_request (widget, &widget_req);
-    #endif
     menu_width = menu_req.width;
     widget_height = widget_req.height; /* Better than allocation.height */
 
@@ -1037,31 +982,13 @@
     if (!valid)
         valid = midori_uri_is_ip_address (uri);
 
-    #if GTK_CHECK_VERSION (3, 2, 0)
     g_object_set_data (G_OBJECT (entry), "invalid", GINT_TO_POINTER (uri && *uri && !valid));
     gtk_widget_queue_draw (entry);
-    #else
-    if (uri && *uri && !valid)
-    {
-        GdkColor bg_color = { 0 };
-        GdkColor fg_color = { 0 };
-        gdk_color_parse ("#ef7070", &bg_color);
-        gdk_color_parse ("#000", &fg_color);
-        gtk_widget_modify_base (entry, GTK_STATE_NORMAL, &bg_color);
-        gtk_widget_modify_text (entry, GTK_STATE_NORMAL, &fg_color);
-    }
-    else
-    {
-        gtk_widget_modify_base (entry, GTK_STATE_NORMAL, NULL);
-        gtk_widget_modify_text (entry, GTK_STATE_NORMAL, NULL);
-    }
-    #endif
 
     if (other_widget != NULL)
         gtk_widget_set_sensitive (other_widget, valid);
 }
 
-#if GTK_CHECK_VERSION (3, 2, 0)
 static gboolean
 katze_uri_entry_draw_cb (GtkWidget* entry,
                          cairo_t*   cr,
@@ -1081,7 +1008,6 @@
         width * 0.75, height / 1.9 / 2);
     return TRUE;
 }
-#endif
 
 /**
  * katze_uri_entry_new:
@@ -1100,18 +1026,14 @@
 katze_uri_entry_new (GtkWidget* other_widget)
 {
     GtkWidget* entry = gtk_entry_new ();
-    #if GTK_CHECK_VERSION (3, 6, 0)
     gtk_entry_set_input_purpose (GTK_ENTRY (entry), GTK_INPUT_PURPOSE_URL);
-    #endif
 
     gtk_entry_set_icon_from_gicon (GTK_ENTRY (entry), GTK_ENTRY_ICON_PRIMARY,
         g_themed_icon_new_with_default_fallbacks ("text-html-symbolic"));
     g_signal_connect (entry, "changed",
         G_CALLBACK (katze_uri_entry_changed_cb), other_widget);
-    #if GTK_CHECK_VERSION (3, 2, 0)
     g_signal_connect_after (entry, "draw",
         G_CALLBACK (katze_uri_entry_draw_cb), other_widget);
-    #endif
     return entry;
 }
 
@@ -1119,10 +1041,8 @@
 katze_widget_add_class (GtkWidget*   widget,
                         const gchar* class_name)
 {
-    #if GTK_CHECK_VERSION (3,0,0)
     GtkStyleContext* context = gtk_widget_get_style_context (widget);
     gtk_style_context_add_class (context, class_name);
-    #endif
 }
 
 /**

=== modified file 'katze/katze-utils.h'
--- katze/katze-utils.h	2013-04-16 22:10:56 +0000
+++ katze/katze-utils.h	2017-12-17 17:18:01 +0000
@@ -15,7 +15,6 @@
 
 #include <gtk/gtk.h>
 #include "katze-array.h"
-#include "gtk3-compat.h"
 
 G_BEGIN_DECLS
 

=== modified file 'katze/katze.h'
--- katze/katze.h	2013-10-22 22:38:26 +0000
+++ katze/katze.h	2017-12-17 17:18:01 +0000
@@ -19,10 +19,6 @@
 #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	2017-12-17 17:18: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,7 +146,6 @@
                 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 (
@@ -162,26 +159,9 @@
                 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
@@ -451,11 +431,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"));
         }
@@ -484,7 +460,7 @@
                 return pixbuf;
 #endif
             if (widget != null)
-                return widget.render_icon (Gtk.STOCK_FILE, Gtk.IconSize.MENU, null);
+                return widget.render_icon_pixbuf (Gtk.STOCK_FILE, Gtk.IconSize.MENU);
             return null;
         }
     }

=== modified file 'katze/midori-uri.vala'
--- katze/midori-uri.vala	2015-04-12 13:30:03 +0000
+++ katze/midori-uri.vala	2017-12-17 17:18:01 +0000
@@ -51,14 +51,12 @@
             return uri;
         }
         public static string get_base_domain (string uri) {
-#if HAVE_LIBSOUP_2_40_0
             try {
                 string ascii = to_ascii (uri);
                 return Soup.tld_get_base_domain (ascii);
             } catch (Error error) {
                 /* This is fine, we fallback to hostname */
             }
-#endif
             return parse_hostname (uri, null);
         }
 

=== modified file 'midori/main.c'
--- midori/main.c	2016-03-21 19:19:52 +0000
+++ midori/main.c	2017-12-17 17:18:01 +0000
@@ -343,19 +343,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 +373,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-app.c'
--- midori/midori-app.c	2017-09-03 22:40:01 +0000
+++ midori/midori-app.c	2017-12-17 17:18:01 +0000
@@ -34,13 +34,6 @@
     #include <locale.h>
 #endif
 
-#ifdef HAVE_LIBNOTIFY
-    #include <libnotify/notify.h>
-    #ifndef NOTIFY_CHECK_VERSION
-        #define NOTIFY_CHECK_VERSION(x,y,z) 0
-    #endif
-#endif
-
 #ifdef HAVE_SIGNAL_H
     #include <signal.h>
 #endif
@@ -202,7 +195,6 @@
         G_CALLBACK (midori_app_send_notification), app);
     katze_array_add_item (app->browsers, browser);
 
-    #if GTK_CHECK_VERSION (3, 0, 0)
     if (app->browser == NULL)
     {
         gchar* filename;
@@ -226,7 +218,6 @@
             g_free (filename);
         }
     }
-    #endif
 
     app->browser = browser;
 }
@@ -678,10 +669,6 @@
     app->speeddial = NULL;
     app->extensions = katze_array_new (KATZE_TYPE_ARRAY);
     app->browsers = katze_array_new (MIDORI_TYPE_BROWSER);
-
-    #ifdef HAVE_LIBNOTIFY
-    notify_init (PACKAGE_NAME);
-    #endif
 }
 
 static void
@@ -699,11 +686,6 @@
     katze_object_assign (app->extensions, NULL);
     katze_object_assign (app->browsers, NULL);
 
-    #ifdef HAVE_LIBNOTIFY
-    if (notify_is_initted ())
-        notify_uninit ();
-    #endif
-
     G_OBJECT_CLASS (midori_app_parent_class)->finalize (object);
 }
 
@@ -1117,18 +1099,7 @@
     g_return_if_fail (MIDORI_IS_APP (app));
     g_return_if_fail (title);
 
-    #ifdef HAVE_LIBNOTIFY
-    if (notify_is_initted ())
-    {
-        #if NOTIFY_CHECK_VERSION (0, 7, 0)
-        NotifyNotification* note = notify_notification_new (title, message, "midori");
-        #else
-        NotifyNotification* note = notify_notification_new (title, message, "midori", NULL);
-        #endif
-        notify_notification_show (note, NULL);
-        g_object_unref (note);
-    }
-    #elif !defined(G_OS_WIN32)
+    #if !defined(G_OS_WIN32)
     GNotification* notification = g_notification_new (title);
     g_notification_set_body (notification, message);
     GIcon* icon = g_themed_icon_new ("midori");
@@ -1241,13 +1212,8 @@
     textdomain (GETTEXT_PACKAGE);
     #endif
 
-    #if GTK_CHECK_VERSION (3, 0, 0)
     success = gtk_init_with_args (argc, argument_vector, _("[Addresses]"),
                                   entries, GETTEXT_PACKAGE, &error);
-    #else
-    success = gtk_init_with_args (argc, argument_vector, _("[Addresses]"),
-                                  (GOptionEntry*)entries, GETTEXT_PACKAGE, &error);
-    #endif
 
     factory = gtk_icon_factory_new ();
     for (i = 0; i < G_N_ELEMENTS (items); i++)

=== modified file 'midori/midori-browser.c'
--- midori/midori-browser.c	2016-01-23 19:21:31 +0000
+++ midori/midori-browser.c	2017-12-17 17:18: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,
@@ -350,13 +348,7 @@
                                     MidoriView*    view,
                                     const gchar*   text)
 {
-    #if GTK_CHECK_VERSION (3, 2, 0)
     gboolean is_location = FALSE;
-    #else
-    GtkWidget* widget = gtk_window_get_focus (GTK_WINDOW (browser));
-    gboolean is_location = widget && GTK_IS_ENTRY (widget)
-        && GTK_IS_ALIGNMENT (gtk_widget_get_parent (widget));
-    #endif
 
     katze_assign (browser->statusbar_text, midori_uri_format_for_display (text));
     if (view == NULL)
@@ -365,26 +357,11 @@
     if (!gtk_widget_get_visible (browser->statusbar) && !is_location
      && text && *text)
     {
-        #if GTK_CHECK_VERSION (3, 2, 0)
         midori_view_set_overlay_text (view, browser->statusbar_text);
-        #else
-        GtkAction* action = _action_by_name (browser, "Location");
-        MidoriLocationAction* location_action = MIDORI_LOCATION_ACTION (action);
-        midori_location_action_set_text (location_action, browser->statusbar_text);
-        midori_location_action_set_secondary_icon (location_action, NULL);
-        #endif
     }
     else if (!gtk_widget_get_visible (browser->statusbar) && !is_location)
     {
-        #if GTK_CHECK_VERSION (3, 2, 0)
         midori_view_set_overlay_text (view, NULL);
-        #else
-        GtkAction* action = _action_by_name (browser, "Location");
-        MidoriLocationAction* location_action = MIDORI_LOCATION_ACTION (action);
-        midori_browser_update_secondary_icon (browser, view, action);
-        midori_location_action_set_text (location_action,
-            midori_view_get_display_uri (view));
-        #endif
     }
     else
     {
@@ -1127,11 +1104,7 @@
 {
     MidoriBrowser* browser = midori_browser_get_for_widget (button);
     midori_browser_add_speed_dial (browser);
-    #if GTK_CHECK_VERSION (3, 12, 0)
     GtkWidget* dialog = gtk_widget_get_ancestor (button, GTK_TYPE_POPOVER);
-    #else
-    GtkWidget* dialog = gtk_widget_get_toplevel (button);
-    #endif
     midori_browser_edit_bookmark_response_cb (dialog, GTK_RESPONSE_DELETE_EVENT, browser);
 }
 
@@ -1142,15 +1115,10 @@
     MidoriBrowser* browser = midori_browser_get_for_widget (button);
     GtkAction* action = g_object_get_data (G_OBJECT (button), "midori-action");
     gtk_action_activate (action);
-    #if GTK_CHECK_VERSION (3, 12, 0)
     GtkWidget* dialog = gtk_widget_get_ancestor (button, GTK_TYPE_POPOVER);
-    #else
-    GtkWidget* dialog = gtk_widget_get_toplevel (button);
-    #endif
     midori_browser_edit_bookmark_response_cb (dialog, GTK_RESPONSE_DELETE_EVENT, browser);
 }
 
-#if GTK_CHECK_VERSION (3, 12, 0)
 static void
 midori_browser_edit_bookmark_button_cb (GtkWidget*     button,
                                         MidoriBrowser* browser)
@@ -1158,7 +1126,6 @@
     GtkWidget* dialog = gtk_widget_get_ancestor (button, GTK_TYPE_POPOVER);
     midori_browser_edit_bookmark_response_cb (dialog, GTK_RESPONSE_ACCEPT, browser);
 }
-#endif
 
 /* Private function, used by MidoriBookmarks and MidoriHistory */
 /* static */ gboolean
@@ -1189,7 +1156,6 @@
         title = new_bookmark ? _("New Folder") : _("Edit Folder");
     else
         title = new_bookmark ? _("New Bookmark") : _("Edit Bookmark");
-    #if GTK_CHECK_VERSION (3, 12, 0)
     if (proxy != NULL)
     {
         dialog = gtk_popover_new (proxy);
@@ -1202,10 +1168,9 @@
         g_signal_connect (accept, "clicked", G_CALLBACK (midori_browser_edit_bookmark_button_cb), browser);
     }
     else
-    #endif
     {
         dialog = gtk_dialog_new_with_buttons (title, GTK_WINDOW (browser),
-            GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, NULL, NULL);
+            GTK_DIALOG_DESTROY_WITH_PARENT, NULL, NULL);
         content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
         actions = gtk_hbox_new (FALSE, 0);
         gtk_box_pack_end (GTK_BOX (content_area), actions, TRUE, TRUE, 0);
@@ -1319,11 +1284,7 @@
     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;
 }
@@ -1395,50 +1356,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 +1373,6 @@
         katze_assign (last_dir,
             gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (dialog)));
     }
-#endif
     gtk_widget_destroy (dialog);
 }
 
@@ -1785,7 +1701,6 @@
     }
 }
 
-#ifdef HAVE_WEBKIT2
 static void
 midori_browser_close_tab_idle (GObject*      resource,
                                GAsyncResult* result,
@@ -1795,16 +1710,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 +1727,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 +1736,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 +1782,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;
 }
@@ -2690,17 +2579,6 @@
                                      "Whether or not to show tabs",
                                      TRUE,
                                      flags));
-
-    #if !GTK_CHECK_VERSION (3, 0, 0)
-    /* Add 2px space between tool buttons */
-    gtk_rc_parse_string (
-        "style \"tool-button-style\"\n {\n"
-        "GtkToolButton::icon-spacing = 2\n }\n"
-        "widget \"MidoriBrowser.*.MidoriBookmarkbar.Gtk*ToolButton\" "
-        "style \"tool-button-style\"\n"
-        "widget \"MidoriBrowser.*.MidoriFindbar.Gtk*ToolButton\" "
-        "style \"tool-button-style\"\n");
-    #endif
 }
 
 static void
@@ -2729,10 +2607,6 @@
 _action_open_activate (GtkAction*     action,
                        MidoriBrowser* browser)
 {
-    #if !GTK_CHECK_VERSION (3, 1, 10)
-    static gchar* last_dir = NULL;
-    gboolean folder_set = FALSE;
-    #endif
     gchar* uri = NULL;
     GtkWidget* dialog;
     GtkWidget* view;
@@ -2751,9 +2625,6 @@
              if (dirname && g_file_test (dirname, G_FILE_TEST_IS_DIR))
              {
                  gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), dirname);
-                 #if !GTK_CHECK_VERSION (3, 1, 10)
-                 folder_set = TRUE;
-                 #endif
              }
 
              g_free (dirname);
@@ -2761,18 +2632,8 @@
          }
      }
 
-     #if !GTK_CHECK_VERSION (3, 1, 10)
-     if (!folder_set && last_dir && *last_dir)
-         gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), last_dir);
-     #endif
-
      if (midori_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK)
      {
-         #if !GTK_CHECK_VERSION (3, 1, 10)
-         gchar* folder;
-         folder = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (dialog));
-         katze_assign (last_dir, folder);
-         #endif
          uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dialog));
          midori_browser_set_current_uri (browser, uri);
          g_free (uri);
@@ -2991,11 +2852,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 +2861,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 +2871,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 +2882,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 +2893,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 +2906,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 +2921,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 +3436,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
@@ -3623,12 +3460,7 @@
     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);
@@ -3667,7 +3499,7 @@
     if (!katze_object_get_boolean (browser->settings, "enable-caret-browsing"))
     {
         dialog = gtk_message_dialog_new (GTK_WINDOW (browser),
-            GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
+            GTK_DIALOG_DESTROY_WITH_PARENT,
             GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE,
             _("Toggle text cursor navigation"));
         gtk_window_set_title (GTK_WINDOW (dialog), _("Toggle text cursor navigation"));
@@ -3833,15 +3665,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,16 +3682,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);
         }
@@ -4538,7 +4357,7 @@
 
     dialog = gtk_dialog_new_with_buttons (
         _("Import bookmarks…"), GTK_WINDOW (browser),
-        GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
+        GTK_DIALOG_DESTROY_WITH_PARENT,
         GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
         _("_Import bookmarks"), GTK_RESPONSE_ACCEPT,
         NULL);
@@ -6175,13 +5994,6 @@
     gtk_container_add (GTK_CONTAINER (throbber_box), browser->throbber);
     gtk_widget_show (throbber_box);
     gtk_container_add (GTK_CONTAINER (menuitem), throbber_box);
-    #if GTK_CHECK_VERSION (3, 2, 0)
-    /* FIXME: Doesn't work */
-    gtk_widget_set_hexpand (menuitem, TRUE);
-    gtk_widget_set_halign (menuitem, GTK_ALIGN_END);
-    #else
-    gtk_menu_item_set_right_justified (GTK_MENU_ITEM (menuitem), TRUE);
-    #endif
     gtk_menu_shell_append (GTK_MENU_SHELL (browser->menubar), menuitem);
 
     gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (
@@ -7031,11 +6843,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	2017-12-17 17:18: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-download.vala'
--- midori/midori-download.vala	2016-01-15 19:18:17 +0000
+++ midori/midori-download.vala	2017-12-17 17:18: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,23 +29,14 @@
             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) {
@@ -138,13 +118,9 @@
         }
 
         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 +133,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);
@@ -265,11 +231,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;
         }

=== modified file 'midori/midori-frontend.c'
--- midori/midori-frontend.c	2016-01-23 19:21:31 +0000
+++ midori/midori-frontend.c	2017-12-17 17:18: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);
@@ -223,11 +220,9 @@
     midori_browser_set_action_visible (browser, "Tools", FALSE);
     midori_browser_set_action_visible (browser, "ClearPrivateData", FALSE);
     midori_browser_set_action_visible (browser, "AddSpeedDial", FALSE);
-    #if GTK_CHECK_VERSION (3, 0, 0)
     g_object_set (gtk_widget_get_settings (GTK_WIDGET (browser)),
                   "gtk-application-prefer-dark-theme", TRUE,
                   NULL);
-    #endif
 
     if (webapp != NULL)
     {
@@ -420,7 +415,7 @@
     GtkWidget* label = (GtkWidget*)g_list_nth_data (ch, 0);
     g_list_free (ch);
     GtkRequisition req;
-    gtk_widget_size_request (content_area, &req);
+    gtk_widget_get_preferred_size (content_area, &req, NULL);
     gtk_widget_set_size_request (label, req.width * 0.9, -1);
 
     response = midori_dialog_run (GTK_DIALOG (dialog));

=== modified file 'midori/midori-locationaction.c'
--- midori/midori-locationaction.c	2015-08-10 23:42:56 +0000
+++ midori/midori-locationaction.c	2017-12-17 17:18:01 +0000
@@ -480,17 +480,11 @@
         return;
 
     gtk_widget_get_allocation (widget, &alloc);
-    #if GTK_CHECK_VERSION (3, 0, 0)
     gtk_widget_get_preferred_size (widget, &widget_req, NULL);
-    #else
-    gtk_widget_size_request (widget, &widget_req);
-    #endif
     gdk_window_get_origin (window, &wx, &wy);
 
-    #if GTK_CHECK_VERSION (3, 0, 0)
     wx += alloc.x;
     wy += alloc.y + (alloc.height - widget_req.height) / 2;
-    #endif
 
     gtk_tree_view_column_cell_get_size (
         gtk_tree_view_get_column (GTK_TREE_VIEW (action->treeview), 0),
@@ -514,15 +508,10 @@
     width = MIN (alloc.width, monitor.width);
 
     gtk_tree_view_columns_autosize (GTK_TREE_VIEW (action->treeview));
-    #if GTK_CHECK_VERSION (3, 0, 0)
     gtk_widget_set_size_request (scrolled, width, -1);
     gtk_scrolled_window_set_min_content_width (GTK_SCROLLED_WINDOW (scrolled), width);
     gtk_scrolled_window_set_min_content_height (GTK_SCROLLED_WINDOW (scrolled), items * height);
     gtk_widget_get_preferred_size (popup, &menu_req, NULL);
-    #else
-    gtk_widget_set_size_request (scrolled, width, items * height);
-    gtk_widget_size_request (popup, &menu_req);
-    #endif
 
     if (wx < monitor.x)
         wx = monitor.x;
@@ -704,9 +693,6 @@
         gtk_widget_set_size_request (gtk_scrolled_window_get_vscrollbar (
             GTK_SCROLLED_WINDOW (scrolled)), -1, 0);
         action->treeview = treeview;
-        #if !GTK_CHECK_VERSION (3, 4, 0)
-        gtk_widget_realize (action->treeview);
-        #endif
 
         column = gtk_tree_view_column_new ();
         renderer = gtk_cell_renderer_pixbuf_new ();
@@ -746,9 +732,7 @@
         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));
-        #if GTK_CHECK_VERSION (3, 4, 0)
         gtk_window_set_attached_to (GTK_WINDOW (action->popup), action->entry);
-        #endif
         gtk_widget_show (action->popup);
     }
 
@@ -950,9 +934,7 @@
     gtk_container_add (GTK_CONTAINER (toolitem), alignment);
 
     entry = gtk_entry_new ();
-    #if GTK_CHECK_VERSION (3, 6, 0)
     gtk_entry_set_input_purpose (GTK_ENTRY (entry), GTK_INPUT_PURPOSE_URL);
-    #endif
     gtk_entry_set_icon_activatable (GTK_ENTRY (entry),
          GTK_ENTRY_ICON_PRIMARY, TRUE);
     gtk_entry_set_icon_activatable (GTK_ENTRY (entry),
@@ -1292,36 +1274,7 @@
 #ifdef HAVE_GCR
     #define GCR_API_SUBJECT_TO_CHANGE
     #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,
     MIDORI_CERT_REVOKE,
@@ -1369,7 +1322,6 @@
     gtk_widget_hide (dialog);
 }
 
-#if GTK_CHECK_VERSION (3, 12, 0)
 static void
 midori_location_action_button_cb (GtkWidget* button,
                                   GtkWidget* dialog)
@@ -1388,9 +1340,7 @@
     midori_location_action_cert_response_cb (dialog, response, gcr_cert);
 }
 #endif
-#endif
 
-#if GTK_CHECK_VERSION (3, 12, 0)
 static gboolean
 midori_location_action_popover_button_press_event_cb (GtkWidget*      widget,
                                                       GdkEventButton* event,
@@ -1423,7 +1373,6 @@
         gtk_widget_hide (widget);
     return GDK_EVENT_STOP;
 }
-#endif
 
 const gchar*
 midori_location_action_tls_flags_to_string (GTlsCertificateFlags tls_flags)
@@ -1458,14 +1407,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,14 +1424,11 @@
         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;
     GtkWidget* actions = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
     gtk_box_pack_start (GTK_BOX (box), actions, FALSE, FALSE, 0);
@@ -1509,28 +1448,11 @@
     g_signal_connect (button, "clicked", G_CALLBACK (midori_location_action_button_cb), dialog);
     gtk_box_pack_end (GTK_BOX (actions), button, FALSE, FALSE, 0);
     gtk_widget_show_all (actions);
-    #else
-    if (gcr_trust_is_certificate_pinned (gcr_cert, GCR_PURPOSE_SERVER_AUTH, hostname, NULL, NULL))
-        gtk_dialog_add_buttons (GTK_DIALOG (dialog),
-            ("_Don't trust this website"), MIDORI_CERT_REVOKE, NULL);
-    else if (tls_flags > 0)
-        gtk_dialog_add_buttons (GTK_DIALOG (dialog),
-            ("_Trust this website"), MIDORI_CERT_TRUST, NULL);
-    gtk_container_child_set (GTK_CONTAINER (gtk_dialog_get_action_area (GTK_DIALOG (dialog))),
-        gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Export certificate"), MIDORI_CERT_EXPORT),
-        "secondary", TRUE, NULL);
-    g_signal_connect (dialog, "response",
-        G_CALLBACK (midori_location_action_cert_response_cb), gcr_cert);
-    #endif
 
     g_object_set_data_full (G_OBJECT (gcr_cert), "peer", hostname, (GDestroyNotify)g_free);
     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);
 
@@ -1588,7 +1510,6 @@
         GtkWidget* content_area;
         GtkWidget* hbox;
 
-        #if GTK_CHECK_VERSION (3, 12, 0)
         dialog = gtk_popover_new (widget);
         content_area = gtk_vbox_new (FALSE, 6);
         gtk_container_add (GTK_CONTAINER (dialog), content_area);
@@ -1602,13 +1523,6 @@
         gtk_popover_set_relative_to (GTK_POPOVER (dialog), widget);
         gtk_popover_set_pointing_to (GTK_POPOVER (dialog), &icon_rect);
         g_signal_connect (dialog, "closed", G_CALLBACK (gtk_widget_destroyed), &dialog);
-        #else
-        const gchar* title = _("Security details");
-        dialog = gtk_dialog_new_with_buttons (title, GTK_WINDOW (gtk_widget_get_toplevel (widget)),
-            GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, NULL, NULL);
-        content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
-        g_signal_connect (dialog, "destroy", G_CALLBACK (gtk_widget_destroyed), &dialog);
-        #endif
         gtk_container_set_border_width (GTK_CONTAINER (dialog), 6);
         hbox = gtk_hbox_new (FALSE, 6);
         gtk_box_pack_start (GTK_BOX (hbox), gtk_image_new_from_gicon (

=== modified file 'midori/midori-notebook.vala'
--- midori/midori-notebook.vala	2017-02-15 18:50:47 +0000
+++ midori/midori-notebook.vala	2017-12-17 17:18:01 +0000
@@ -42,10 +42,6 @@
             close = new Gtk.Button ();
             close.relief = Gtk.ReliefStyle.NONE;
             close.set_focus_on_click (false);
-#if !HAVE_GTK3
-            close.name = "midori-close-button";
-            close.style_set.connect (close_style_set);
-#endif
             icon = new Gtk.Image.from_gicon (new ThemedIcon.with_default_fallbacks ("window-close-symbolic"), Gtk.IconSize.MENU);
             close.add (icon);
             align = new Gtk.Alignment (1.0f, 0.5f, 0.0f, 0.0f);
@@ -74,14 +70,6 @@
             notify_property ("close-button-visible");
         }
 
-#if !HAVE_GTK3
-        void close_style_set (Gtk.Style? previous_style) {
-            Gtk.Requisition size;
-            close.child.size_request (out size);
-            close.set_size_request (size.width, size.height);
-        }
-#endif
-
         void close_clicked () {
             tab.destroy ();
         }
@@ -103,7 +91,6 @@
             tooltip_text = label.label;
         }
 
-#if HAVE_GTK3
         GLib.Icon? scale_if_needed (GLib.Icon? icon, int scale) {
             if (icon is Gdk.Pixbuf) {
                 var pixbuf = icon as Gdk.Pixbuf;
@@ -117,16 +104,11 @@
             }
             return icon;
         }
-#endif
 
         void icon_changed (GLib.ParamSpec pspec) {
             GLib.Icon? icon;
             tab.get ("icon", out icon);
-#if HAVE_GTK3
             this.icon.set_from_gicon (scale_if_needed (icon, scale_factor), Gtk.IconSize.MENU);
-#else
-            this.icon.set_from_gicon (icon, Gtk.IconSize.MENU);
-#endif
         }
 
         void colors_changed () {
@@ -174,19 +156,6 @@
         public Gtk.Notebook notebook;
         int last_tab_size = 0;
 
-#if !HAVE_GTK3
-        const string style_fixup = """
-            style "midori-close-button-style"
-            {
-            GtkWidget::focus-padding = 0
-            GtkWidget::focus-line-width = 0
-            xthickness = 0
-            ythickness = 0
-            }
-            widget "*.midori-close-button" style "midori-close-button-style"
-            """;
-#endif
-
         /* Since: 0.5.7 */
         public uint count { get; private set; default = 0; }
         /* Since: 0.5.7 */
@@ -228,15 +197,7 @@
             notebook.set ("group-name", PACKAGE_NAME);
             add (notebook);
 
-#if HAVE_GTK3
             get_style_context ().add_class ("dynamic-notebook");
-#else
-            /* Remove the inner border between scrollbars and window border */
-            Gtk.RcStyle rcstyle = new Gtk.RcStyle ();
-            rcstyle.xthickness = 0;
-            notebook.modify_style (rcstyle);
-            Gtk.rc_parse_string (style_fixup);
-#endif
             notify["index"].connect (index_changed);
             notify["tab"].connect (tab_changed);
             notify["labels-visible"].connect (labels_visible_changed);
@@ -443,17 +404,10 @@
         }
 
         /* Chain up drawing manually to circumvent parent checks */
-#if HAVE_GTK3
         public override bool draw (Cairo.Context cr) {
             notebook.draw (cr);
             return true;
         }
-#else
-        public override bool expose_event (Gdk.EventExpose event) {
-            notebook.expose_event (event);
-            return true;
-        }
-#endif
 
         public override void forall_internal (bool include_internal, Gtk.Callback callback) {
             if (include_internal)
@@ -512,20 +466,12 @@
             }
         }
 
-#if HAVE_GTK3
         void size_allocated (Gtk.Allocation allocation) {
-#else
-        void size_allocated (Gdk.Rectangle allocation) {
-#endif
             if (labels_visible && count > 0)
                 resize (allocation.width);
         }
 
-#if HAVE_GTK3
         void page_switched (Gtk.Widget new_tab, uint new_index) {
-#else
-        void page_switched (Gtk.NotebookPage new_tab, uint new_index) {
-#endif
             tab_switched (previous, new_tab as Tab);
             previous = (Midori.Tab)new_tab;
 

=== modified file 'midori/midori-panel.c'
--- midori/midori-panel.c	2015-07-06 21:26:46 +0000
+++ midori/midori-panel.c	2017-12-17 17:18:01 +0000
@@ -572,9 +572,6 @@
                           MidoriViewable* viewable)
 {
     GtkWidget* scrolled;
-    #if !GTK_CHECK_VERSION (3, 0, 0)
-    GObjectClass* gobject_class;
-    #endif
     GtkWidget* widget;
     GtkWidget* toolbar;
     GtkToolItem* toolitem;
@@ -585,11 +582,9 @@
     g_return_val_if_fail (MIDORI_IS_PANEL (panel), -1);
     g_return_val_if_fail (MIDORI_IS_VIEWABLE (viewable), -1);
 
-    #if GTK_CHECK_VERSION (3, 2, 0)
     if (GTK_IS_ORIENTABLE (viewable))
         gtk_orientable_set_orientation (GTK_ORIENTABLE (viewable),
                                         GTK_ORIENTATION_VERTICAL);
-    #endif
 
     if (GTK_IS_SCROLLED_WINDOW (viewable))
         scrolled = (GtkWidget*)viewable;
@@ -601,12 +596,7 @@
                                         GTK_POLICY_AUTOMATIC);
         gtk_widget_set_can_focus (scrolled, TRUE);
         gtk_widget_show (scrolled);
-        #if GTK_CHECK_VERSION (3, 0, 0)
         if (GTK_IS_SCROLLABLE (viewable))
-        #else
-        gobject_class = G_OBJECT_GET_CLASS (viewable);
-        if (GTK_WIDGET_CLASS (gobject_class)->set_scroll_adjustments_signal)
-        #endif
             widget = (GtkWidget*)viewable;
         else
         {

=== modified file 'midori/midori-platform.h'
--- midori/midori-platform.h	2013-06-21 20:49:53 +0000
+++ midori/midori-platform.h	2017-12-17 17:18:01 +0000
@@ -13,7 +13,6 @@
 #define __MIDORI_PLATFORM_H__ 1
 
 #include "midori/midori-stock.h"
-#include "katze/gtk3-compat.h"
 #include "midori/sokoke.h"
 
 /* Common behavior modifiers */

=== modified file 'midori/midori-privatedata.c'
--- midori/midori-privatedata.c	2015-07-06 21:26:46 +0000
+++ midori/midori-privatedata.c	2017-12-17 17:18:01 +0000
@@ -191,7 +191,7 @@
     /* i18n: Dialog: Clear Private Data, in the Tools menu */
     dialog = gtk_dialog_new_with_buttons (_("Clear Private Data"),
         GTK_WINDOW (browser),
-        GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
+        GTK_DIALOG_DESTROY_WITH_PARENT,
         GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
         _("_Clear private data"), GTK_RESPONSE_ACCEPT, NULL);
     button = gtk_dialog_get_widget_for_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);

=== modified file 'midori/midori-searchaction.c'
--- midori/midori-searchaction.c	2015-07-06 21:26:46 +0000
+++ midori/midori-searchaction.c	2017-12-17 17:18:01 +0000
@@ -932,13 +932,7 @@
     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))
@@ -1058,7 +1052,7 @@
     dialog = gtk_dialog_new_with_buttons (
         new_engine ? _("Add search engine") : _("Edit search engine"),
         toplevel ? GTK_WINDOW (toplevel) : NULL,
-        GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
+        GTK_DIALOG_DESTROY_WITH_PARENT,
         GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
         new_engine ? GTK_STOCK_ADD : GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
         NULL);
@@ -1422,7 +1416,7 @@
         gtk_widget_get_toplevel (search_action->last_proxy) : NULL;
     dialog = gtk_dialog_new_with_buttons (dialog_title,
         toplevel ? GTK_WINDOW (toplevel) : NULL,
-        GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
+        GTK_DIALOG_DESTROY_WITH_PARENT,
         #if !HAVE_OSX
         GTK_STOCK_HELP, GTK_RESPONSE_HELP,
         GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,

=== modified file 'midori/midori-session.c'
--- midori/midori-session.c	2015-03-23 11:33:24 +0000
+++ midori/midori-session.c	2017-12-17 17:18:01 +0000
@@ -94,43 +94,18 @@
 }
 #endif
 
-#if WEBKIT_CHECK_VERSION (1, 1, 21)
 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*
@@ -178,31 +153,12 @@
 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",
@@ -230,7 +186,6 @@
         g_object_unref (logger);
     }
 
-    g_object_set_data (G_OBJECT (session), "midori-session-initialized", (void*)1);
 #endif
     return FALSE;
 }

=== modified file 'midori/midori-settings.vala'
--- midori/midori-settings.vala	2013-11-24 21:50:38 +0000
+++ midori/midori-settings.vala	2017-12-17 17:18: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; }

=== modified file 'midori/midori-tab.vala'
--- midori/midori-tab.vala	2015-04-19 14:06:12 +0000
+++ midori/midori-tab.vala	2017-12-17 17:18:01 +0000
@@ -129,16 +129,9 @@
         }
 
         construct {
-            #if HAVE_GTK3
             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 ("");
         }
@@ -245,7 +238,6 @@
         }
 
         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 +247,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 +255,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 +266,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	2017-10-05 23:13:58 +0000
+++ midori/midori-view.c	2017-12-17 17:18: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,
@@ -84,12 +77,7 @@
                            const gchar*    message,
                            const gchar*    description,
                            const gchar*    suggestions,
-                           const gchar*    try_again,
-#ifndef HAVE_WEBKIT2
-                           WebKitWebFrame* web_frame);
-#else
-                           void*           web_frame);
-#endif
+                           const gchar*    try_again);
 
 struct _MidoriView
 {
@@ -120,11 +108,9 @@
     gint scrollh, scrollv;
     GtkWidget* scrolled_window;
 
-    #if GTK_CHECK_VERSION (3, 2, 0)
     GtkWidget* overlay;
     GtkWidget* overlay_label;
     GtkWidget* overlay_find;
-    #endif
 };
 
 struct _MidoriViewClass
@@ -429,17 +415,11 @@
         g_object_get (icon, "names", &icon_names, NULL);
 
         icon_info = 
-#if GTK_CHECK_VERSION (3, 0, 0)
         gtk_icon_theme_choose_icon_for_scale (
-#else
-        gtk_icon_theme_choose_icon (
-#endif
             icon_theme,
             (const char **)icon_names,
             16, /* Favicon-sized */
-#if GTK_CHECK_VERSION (3, 0, 0)
             gtk_widget_get_scale_factor (GTK_WIDGET (view)),
-#endif
             0);
 
         if (icon_info)
@@ -499,7 +479,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,
@@ -508,11 +487,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
@@ -540,45 +514,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 (
@@ -613,9 +562,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);
@@ -627,11 +573,7 @@
     {
         /* 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
@@ -641,11 +583,7 @@
            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;
@@ -672,7 +610,7 @@
                            "<a href=\"http://midori-browser.org/faqs/\" target=\"_blank\">FAQ</a>, section "
                            "\"<a href=\"http://midori-browser.org/faqs/#security_features\" target=\"_blank\">"
                            "Security Features</a>\", to understand how you can solve this problem."),
-                            _("Trust this website"), NULL);
+                            _("Trust this website"));
                         g_free (title);
                         g_free (slots);
                         g_error_free (error);
@@ -721,11 +659,7 @@
     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;
     }
 
@@ -798,8 +732,7 @@
                 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);
+                    _("Trust this website"));
             }
             g_object_unref (gcr_cert);
         }
@@ -919,10 +852,10 @@
         }
 
         /* Render icon as a PNG at the desired size */
-        pixbuf = gtk_widget_render_icon (GTK_WIDGET (view), icon_name, icon_size, NULL);
+        pixbuf = gtk_widget_render_icon_pixbuf (GTK_WIDGET (view), icon_name, icon_size);
         if (!pixbuf)
-            pixbuf = gtk_widget_render_icon (GTK_WIDGET (view),
-                GTK_STOCK_MISSING_IMAGE, icon_size, NULL);
+            pixbuf = gtk_widget_render_icon_pixbuf (GTK_WIDGET (view),
+                GTK_STOCK_MISSING_IMAGE, icon_size);
         if (pixbuf)
         {
             gboolean success;
@@ -939,14 +872,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;
         }
@@ -1167,12 +1095,7 @@
                            const gchar*    message,
                            const gchar*    description,
                            const gchar*    suggestions,
-                           const gchar*    try_again,
-#ifndef HAVE_WEBKIT2
-                           WebKitWebFrame* web_frame)
-#else
-                           void*           web_frame)
-#endif
+                           const gchar*    try_again)
 {
     gchar* path = midori_paths_get_res_filename ("error.html");
     gchar* template;
@@ -1191,11 +1114,6 @@
         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' */
-        g_type_class_unref (g_type_class_ref (GTK_TYPE_BUTTON));
-        #endif
-
         GtkSettings* gtk_settings = gtk_widget_get_settings (view->web_view);
         gboolean show_button_images = gtk_settings != NULL
           && katze_object_get_boolean (gtk_settings, "gtk-button-images");
@@ -1223,7 +1141,7 @@
         g_free (title_escaped);
         g_free (template);
 
-        midori_view_set_html (view, result, uri, web_frame);
+        midori_view_set_html (view, result, uri, NULL);
 
         g_free (result);
         g_free (path);
@@ -1237,11 +1155,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)
@@ -1250,12 +1164,6 @@
     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;
@@ -1299,11 +1207,10 @@
 
     result = midori_view_display_error (view, uri, "stock://dialog/network-error", title,
                                         message, error->message, NULL,
-                                        _("Try Again"), web_frame);
+                                        _("Try Again"));
 
-    /* if the main frame for the whole tab has a network error, set tab error status */
-    if (web_frame == main_frame)
-        midori_tab_set_load_error (MIDORI_TAB (view), MIDORI_LOAD_ERROR_NETWORK);
+    // FIXME: do this on the main frame only
+    midori_tab_set_load_error (MIDORI_TAB (view), MIDORI_LOAD_ERROR_NETWORK);
 
     g_free (message);
     g_free (title);
@@ -1423,7 +1330,6 @@
     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)
@@ -1432,7 +1338,7 @@
     gchar* title = g_strdup_printf (_("Oops - %s"), uri);
     gchar* message = g_strdup_printf (_("Something went wrong with '%s'."), uri);
     midori_view_display_error (view, uri, NULL, title,
-        message, "", NULL, _("Try again"), NULL);
+        message, "", NULL, _("Try again"));
     g_free (message);
     g_free (title);
 }
@@ -1464,50 +1370,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);
 }
@@ -1522,17 +1394,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,
@@ -1544,7 +1405,6 @@
         ? GTK_ALIGN_END : GTK_ALIGN_START);
     return FALSE;
 }
-#endif
 
 static gboolean
 midori_view_web_view_leave_notify_event_cb (WebKitWebView*    web_view,
@@ -1557,16 +1417,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))
     {
@@ -1574,7 +1428,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:"))
@@ -1594,33 +1447,6 @@
     return g_str_has_prefix (uri, "javascript:") || g_str_has_prefix (uri, "mailto:");
 }
 
-static void
-midori_view_ensure_link_uri (MidoriView* view,
-                             gint        *x,
-                             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 \
     | GDK_MOD1_MASK | GDK_META_MASK | GDK_SUPER_MASK | GDK_HYPER_MASK )
 
@@ -1633,7 +1459,6 @@
     gboolean background;
 
     event->state = event->state & MIDORI_KEYS_MODIFIER_MASK;
-    midori_view_ensure_link_uri (view, NULL, NULL, event);
     link_uri = midori_view_get_link_uri (view);
     view->button_press_handled = FALSE;
 
@@ -1681,11 +1506,7 @@
             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);
@@ -1754,9 +1575,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 ();
@@ -1995,21 +1814,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;
     }
@@ -2061,19 +1871,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
@@ -2607,14 +2408,10 @@
     g_return_if_fail (MIDORI_IS_VIEW (view));
     g_return_if_fail (GTK_IS_MENU_SHELL (menu));
 
-    GdkEvent* event = gtk_get_current_event();
-    midori_view_ensure_link_uri (view, NULL, NULL, (GdkEventButton *)event);
-    gdk_event_free (event);
     MidoriContextAction* context_action = midori_view_get_page_context_action (view, view->hit_test);
     midori_context_action_create_menu (context_action, GTK_MENU (menu), FALSE);
 }
 
-#if WEBKIT_CHECK_VERSION (1, 10, 0)
 static gboolean
 midori_view_web_view_context_menu_cb (WebKitWebView*       web_view,
                                       #ifdef HAVE_WEBKIT2
@@ -2628,11 +2425,6 @@
                                       #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 */
@@ -2669,7 +2461,6 @@
     #endif
     return FALSE;
 }
-#endif
 
 static gboolean
 midori_view_web_view_close_cb (WebKitWebView* web_view,
@@ -2994,10 +2785,6 @@
                                     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));
@@ -3505,9 +3292,7 @@
     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);
@@ -3542,15 +3327,10 @@
     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);
@@ -3615,14 +3395,10 @@
 {
     GtkWidget* inspector_view = GTK_WIDGET (webkit_web_inspector_get_web_view (inspector));
 
-    #if defined(HAVE_WEBKIT2) || GTK_CHECK_VERSION (3, 0, 0)
     GtkWidget* scrolled = gtk_widget_get_parent (inspector_view);
     if (!scrolled)
         return NULL;
     return gtk_widget_get_parent (scrolled);
-    #else
-    return gtk_widget_get_parent (inspector_view);
-    #endif
 }
 
 static gboolean
@@ -3667,7 +3443,6 @@
 
     view->web_view = GTK_WIDGET (midori_tab_get_web_view (MIDORI_TAB (view)));
     g_object_connect (view->web_view,
-                      #ifdef HAVE_WEBKIT2
                       "signal::load-failed",
                       webkit_web_view_load_error_cb, view,
                       "signal::load-changed",
@@ -3686,47 +3461,6 @@
                       midori_view_web_view_context_menu_cb, view,
                       "signal::create",
                       webkit_web_view_create_web_view_cb, view,
-                      #else
-                      "signal::notify::load-status",
-                      midori_view_web_view_notify_load_status_cb, view,
-                      "signal::notify::progress",
-                      webkit_web_view_progress_changed_cb, view,
-                      "signal::script-alert",
-                      midori_view_web_view_script_alert_cb, view,
-                      "signal::window-object-cleared",
-                      webkit_web_view_window_object_cleared_cb, view,
-                      "signal::create-web-view",
-                      webkit_web_view_create_web_view_cb, view,
-                      "signal-after::mime-type-policy-decision-requested",
-                      webkit_web_view_mime_type_decision_cb, view,
-                      "signal::print-requested",
-                      midori_view_web_view_print_requested_cb, view,
-                      "signal-after::load-error",
-                      webkit_web_view_load_error_cb, view,
-                      "signal::navigation-policy-decision-requested",
-                      midori_view_web_view_navigation_decision_cb, view,
-                      "signal::resource-request-starting",
-                      midori_view_web_view_resource_request_cb, view,
-                      "signal::database-quota-exceeded",
-                      midori_view_web_view_database_quota_exceeded_cb, view,
-                      "signal::geolocation-policy-decision-requested",
-                      midori_view_web_view_geolocation_decision_cb, view,
-                      "signal::notify::icon-uri",
-                      midori_web_view_notify_icon_uri_cb, view,
-                      "signal::hovering-over-link",
-                      webkit_web_view_hovering_over_link_cb, view,
-                      "signal::status-bar-text-changed",
-                      webkit_web_view_statusbar_text_changed_cb, view,
-                      #if WEBKIT_CHECK_VERSION (1, 10, 0)
-                      "signal::context-menu",
-                      midori_view_web_view_context_menu_cb, view,
-                      #endif
-                      "signal::console-message",
-                      webkit_web_view_console_message_cb, view,
-                      "signal::download-requested",
-                      midori_view_download_requested_cb, view,
-                      #endif
-
                       "signal::notify::title",
                       webkit_web_view_notify_title_cb, view,
                       "signal::leave-notify-event",
@@ -3750,7 +3484,6 @@
         #endif
     }
 
-    #ifdef HAVE_WEBKIT2
     if (g_signal_lookup ("web-process-crashed", WEBKIT_TYPE_WEB_VIEW))
         g_signal_connect (view->web_view, "web-process-crashed",
             (GCallback)midori_view_web_view_crashed_cb, view);
@@ -3762,9 +3495,7 @@
         "stock", midori_view_uri_scheme_res, NULL, NULL);
     g_signal_connect (context, "download-started",
         G_CALLBACK (midori_view_download_started_cb), view);
-    #endif
 
-    #if GTK_CHECK_VERSION(3, 2, 0)
     view->overlay = gtk_overlay_new ();
     gtk_widget_show (view->overlay);
     gtk_container_add (GTK_CONTAINER (view->overlay), view->scrolled_window);
@@ -3791,9 +3522,6 @@
     gtk_overlay_add_overlay (GTK_OVERLAY (view->overlay),
                              view->overlay_find);
     gtk_widget_set_no_show_all (view->overlay_find, TRUE);
-    #else
-    gtk_box_pack_start (GTK_BOX (view), view->scrolled_window, TRUE, TRUE, 0);
-    #endif
 
     #ifndef HAVE_WEBKIT2
     gtk_container_add (GTK_CONTAINER (view->scrolled_window), view->web_view);
@@ -3840,22 +3568,15 @@
     midori_view_add_version (markup, html, g_strdup_printf ("GTK+ %s (%u.%u.%u)\tGlib %s (%u.%u.%u)",
         GTK_VERSION, gtk_major_version, gtk_minor_version, gtk_micro_version,
         GIO_VERSION, glib_major_version, glib_minor_version, glib_micro_version));
-#ifndef HAVE_WEBKIT2
-    midori_view_add_version (markup, html, g_strdup_printf ("WebKitGTK+ %s (%u.%u.%u)\tlibSoup %s",
-        WEBKIT_VERSION, webkit_major_version (), webkit_minor_version (), webkit_micro_version (),
-#else
     midori_view_add_version (markup, html, g_strdup_printf ("WebKit2GTK+ %s (%u.%u.%u)\tlibSoup %s",
         WEBKIT_VERSION, webkit_get_major_version (), webkit_get_minor_version (), webkit_get_micro_version (),
-#endif
         LIBSOUP_VERSION));
-    midori_view_add_version (markup, html, g_strdup_printf ("cairo %s (%s)\tlibnotify %s",
-        CAIRO_VERSION_STRING, cairo_version_string (),
-        LIBNOTIFY_VERSION));
+    midori_view_add_version (markup, html, g_strdup_printf ("cairo %s (%s)",
+        CAIRO_VERSION_STRING, cairo_version_string ()));
     midori_view_add_version (markup, html, g_strdup_printf ("gcr %s\tgranite %s",
         GCR_VERSION, GRANITE_VERSION));
 }
 
-#ifdef HAVE_WEBKIT2
 static void
 midori_view_get_plugins_cb (GObject*      object,
                             GAsyncResult* result,
@@ -3865,7 +3586,6 @@
     g_object_set_data (object, "nsplugins", plugins);
     midori_view_reload (view, FALSE);
 }
-#endif
 
 void
 midori_view_list_plugins (MidoriView* view,
@@ -3880,7 +3600,6 @@
     else
         g_string_append_c (ns_plugins, '\n');
 
-    #ifdef HAVE_WEBKIT2
     WebKitWebContext* context = webkit_web_context_get_default ();
     GList* plugins = g_object_get_data (G_OBJECT (context), "nsplugins");
     if (plugins == NULL)
@@ -3896,20 +3615,6 @@
                     webkit_plugin_get_name (plugins->data),
                     html ? webkit_plugin_get_description (plugins->data) : ""));
         }
-    #else
-    WebKitWebPluginDatabase* pdb = webkit_get_web_plugin_database ();
-    GSList* plugins = webkit_web_plugin_database_get_plugins (pdb);
-    GSList* plugin = plugins;
-    for (; plugin != NULL; plugin = g_slist_next (plugin))
-    {
-        if (midori_web_settings_skip_plugin (webkit_web_plugin_get_path (plugin->data)))
-            continue;
-        midori_view_add_version (ns_plugins, html, g_strdup_printf ("%s\t%s",
-            webkit_web_plugin_get_name (plugin->data),
-            html ? webkit_web_plugin_get_description (plugin->data) : ""));
-    }
-    webkit_web_plugin_database_plugins_list_free (plugins);
-    #endif
 }
 
 void
@@ -3984,8 +3689,7 @@
                 _("Page loading delayed:"),
                 _("Loading delayed either due to a recent crash or startup preferences."),
                 NULL,
-                _("Load Page"),
-                NULL);
+                _("Load Page"));
         }
         else if (g_str_has_prefix (uri, "javascript:"))
         {
@@ -4031,7 +3735,6 @@
 {
     g_return_if_fail (MIDORI_IS_VIEW (view));
 
-    #if GTK_CHECK_VERSION (3, 2, 0)
     if (text == NULL)
         gtk_widget_hide (gtk_widget_get_parent (view->overlay_label));
     else
@@ -4039,7 +3742,6 @@
         gtk_label_set_text (GTK_LABEL (view->overlay_label), text);
         gtk_widget_show (gtk_widget_get_parent (view->overlay_label));
     }
-    #endif
 }
 
 /**
@@ -4532,69 +4234,6 @@
     if (g_str_has_prefix (uri, "file:///"))
         return g_filename_from_uri (uri, NULL, NULL);
 
-#ifndef HAVE_WEBKIT2
-    WebKitWebFrame *frame;
-    WebKitWebDataSource *data_source;
-    const GString *data;
-    gchar* unique_filename;
-    gint fd;
-    FILE* fp;
-    size_t ret;
-
-    frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (view->web_view));
-
-    if (use_dom)
-    {
-        WebKitDOMDocument* doc;
-
-        #if WEBKIT_CHECK_VERSION (1, 9, 5)
-        doc = webkit_web_frame_get_dom_document (frame);
-        #else
-        doc = webkit_web_view_get_dom_document (WEBKIT_WEB_VIEW (view->web_view));
-        #endif
-
-        WebKitDOMElement* root = webkit_dom_document_query_selector (doc, ":root", NULL);
-        const gchar* content = webkit_dom_html_element_get_outer_html (WEBKIT_DOM_HTML_ELEMENT (root));
-        data = g_string_new (content);
-    } else {
-        data_source = webkit_web_frame_get_data_source (frame);
-        data = webkit_web_data_source_get_data (data_source);
-    }
-
-    if (!outfile)
-    {
-        gchar* extension = midori_download_get_extension_for_uri (uri, NULL);
-        const gchar* mime_type = midori_tab_get_mime_type (MIDORI_TAB (view));
-        unique_filename = g_strdup_printf ("%s/%uXXXXXX%s", midori_paths_get_tmp_dir (),
-            g_str_hash (uri), midori_download_fallback_extension (extension, mime_type));
-        g_free (extension);
-        katze_mkdir_with_parents (midori_paths_get_tmp_dir (), 0700);
-        fd = g_mkstemp (unique_filename);
-    }
-    else
-    {
-        unique_filename = g_strdup (outfile);
-        fd = g_open (unique_filename, O_WRONLY|O_CREAT, 0644);
-    }
-
-    if (fd != -1)
-    {
-        if ((fp = fdopen (fd, "w")))
-        {
-            ret = fwrite (data ? data->str : "", 1, data ? data->len : 0, fp);
-            fclose (fp);
-            if (ret - (data ? data->len : 0) != 0)
-            {
-                midori_view_add_info_bar (view, GTK_MESSAGE_ERROR,
-                    unique_filename, NULL, view,
-                    GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL);
-                katze_assign (unique_filename, NULL);
-            }
-        }
-        close (fd);
-    }
-    return unique_filename;
-#else
     GFile *file;
     char *converted = NULL;
     WebKitWebView * web_view = WEBKIT_WEB_VIEW (view->web_view);
@@ -4619,7 +4258,6 @@
     g_free (converted);
     g_object_unref (file);
     return converted;
-#endif
 }
 
 /**
@@ -4835,11 +4473,8 @@
     g_return_if_fail (MIDORI_IS_VIEW (view));
 
     GtkPrintSettings* settings = gtk_print_settings_new ();
-    #if GTK_CHECK_VERSION (3, 6, 0)
     gtk_print_settings_set (settings, GTK_PRINT_SETTINGS_OUTPUT_BASENAME, midori_view_get_display_title (view));
-    #endif
 
-#ifdef HAVE_WEBKIT2
     WebKitPrintOperation* operation = webkit_print_operation_new (WEBKIT_WEB_VIEW (view->web_view));
     webkit_print_operation_set_print_settings (operation, settings);
     g_object_unref (settings);
@@ -4852,41 +4487,6 @@
             GTK_WINDOW (midori_browser_get_for_widget (view->web_view)));
     }
     g_object_unref (operation);
-#else
-    WebKitWebFrame* frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (view->web_view));
-    GtkPrintOperation* operation = gtk_print_operation_new ();
-    gtk_print_operation_set_print_settings (operation, settings);
-    g_object_unref (settings);
-    gtk_print_operation_set_custom_tab_label (operation, _("Features"));
-    gtk_print_operation_set_embed_page_setup (operation, TRUE);
-    g_signal_connect (operation, "create-custom-widget",
-        G_CALLBACK (midori_view_print_create_custom_widget_cb), view);
-    GError* error = NULL;
-
-    if (katze_object_get_boolean (view->settings, "print-without-dialog")) {
-        webkit_web_frame_print_full (frame, operation,
-            GTK_PRINT_OPERATION_ACTION_PRINT, &error);
-    }
-    else {
-        webkit_web_frame_print_full (frame, operation,
-            GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, &error);
-    }
-    g_object_unref (operation);
-
-    if (error)
-    {
-        GtkWidget* window = gtk_widget_get_toplevel (GTK_WIDGET (view));
-        GtkWidget* dialog = gtk_message_dialog_new (
-            gtk_widget_is_toplevel (window) ? GTK_WINDOW (window) : NULL,
-            GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR,
-            GTK_BUTTONS_CLOSE, "%s", error->message);
-        g_error_free (error);
-
-        g_signal_connect_swapped (dialog, "response",
-            G_CALLBACK (gtk_widget_destroy), dialog);
-        gtk_widget_show (dialog);
-    }
-#endif
 }
 
 /**
@@ -4906,14 +4506,12 @@
 {
     g_return_if_fail (MIDORI_IS_VIEW (view));
 
-    #if GTK_CHECK_VERSION (3, 2, 0)
     if (gtk_widget_get_visible (view->overlay_find))
     {
         text = midori_findbar_get_text (MIDORI_FINDBAR (view->overlay_find));
         midori_tab_find (MIDORI_TAB (view), text, case_sensitive, forward);
         return;
     }
-    #endif
     g_signal_emit_by_name (view, "search-text",
         midori_tab_find (MIDORI_TAB (view), text, case_sensitive, forward), NULL);
 }
@@ -5019,17 +4617,9 @@
 {
     g_return_val_if_fail (GTK_IS_WIDGET (web_view), NULL);
 
-    #ifdef HAVE_WEBKIT2
     GtkWidget* scrolled = web_view;
-    #else
-    GtkWidget* scrolled = gtk_widget_get_parent (web_view);
-    #endif
-    #if GTK_CHECK_VERSION(3, 2, 0)
     GtkWidget* overlay = gtk_widget_get_parent (scrolled);
     GtkWidget* view = gtk_widget_get_parent (overlay);
-    #else
-    GtkWidget* view = gtk_widget_get_parent (scrolled);
-    #endif
     return MIDORI_VIEW (view);
 }
 /**

=== modified file 'midori/midori-websettings.c'
--- midori/midori-websettings.c	2016-01-15 19:18:17 +0000
+++ midori/midori-websettings.c	2017-12-17 17:18:01 +0000
@@ -37,11 +37,7 @@
     #include <windows.h>
 #endif
 
-#ifdef HAVE_WEBKIT2
 #define WEB_SETTINGS_STRING(x) "WebKitSettings::"x""
-#else
-#define WEB_SETTINGS_STRING(x) "WebKitWebSettings::"x""
-#endif
 
 struct _MidoriWebSettings
 {
@@ -569,14 +565,6 @@
     web_settings->user_stylesheet_uri = web_settings->user_stylesheet_uri_cached = NULL;
     web_settings->user_stylesheets = NULL;
 
-    #if defined (_WIN32) && !GTK_CHECK_VERSION (3, 0, 0)
-    /* Try to work-around black borders on native widgets and GTK+2 on Win32 */
-    midori_web_settings_add_style (web_settings, "black-widgets-workaround",
-    "input[type='checkbox'] { -webkit-appearance: checkbox !important }"
-    " input[type='radio'] { -webkit-appearance: radio !important }"
-    " * { -webkit-appearance: none !important }");
-    #endif
-
     g_signal_connect (web_settings, "notify::default-charset",
                       G_CALLBACK (notify_default_encoding_cb), NULL);
     g_signal_connect (web_settings, "notify::default-font-family",
@@ -818,13 +806,9 @@
     gchar* platform;
     const gchar* os = midori_web_settings_get_system_name (NULL, &platform);
 
-    #ifndef HAVE_WEBKIT2
-    const int webcore_major = WEBKIT_USER_AGENT_MAJOR_VERSION;
-    const int webcore_minor = WEBKIT_USER_AGENT_MINOR_VERSION;
-    #else
+    // FIXME: use version from WebKit
     const int webcore_major = 537;
     const int webcore_minor = 32;
-    #endif
 
     g_object_set (web_settings, "enable-site-specific-quirks",
         identify_as != MIDORI_IDENT_GENUINE, NULL);
@@ -858,124 +842,6 @@
     }
 }
 
-#ifndef HAVE_WEBKIT2
-/* Provide a new way for SoupSession to assume an 'Accept-Language'
-   string automatically from the return value of g_get_language_names(),
-   properly formatted according to RFC2616.
-   Copyright (C) 2009 Mario Sanchez Prada <[e-mail]>
-   Copyright (C) 2009 Dan Winship <[e-mail]>
-   Mostly copied from libSoup 2.29, coding style adjusted */
-
-/* Converts a language in POSIX format and to be RFC2616 compliant    */
-/* Based on code from epiphany-webkit (ephy_langs_append_languages()) */
-
-static gchar *
-sokoke_posix_lang_to_rfc2616 (const gchar *language)
-{
-    if (!strchr (language, '.') && !strchr (language, '@') && language[0] != 'C')
-        /* change to lowercase and '_' to '-' */
-        return g_strdelimit (g_ascii_strdown (language, -1), "_", '-');
-
-    return NULL;
-}
-
-/* Adds a quality value to a string (any value between 0 and 1). */
-static gchar *
-sokoke_add_quality_value (const gchar *str,
-                          float        qvalue)
-{
-    if ((qvalue >= 0.0) && (qvalue <= 1.0))
-    {
-        int qv_int = (qvalue * 1000 + 0.5);
-        return g_strdup_printf ("%s;q=%d.%d",
-                                str, (int) (qv_int / 1000), qv_int % 1000);
-    }
-
-    return g_strdup (str);
-}
-
-/* Returns a RFC2616 compliant languages list from system locales */
-static gchar *
-sokoke_accept_languages (const gchar* const * lang_names)
-{
-    GString* langs = NULL;
-    char *cur_lang = NULL;
-    char *prev_lang = NULL;
-    float delta;
-    int i, n_lang_names;
-
-    /* Calculate delta for setting the quality values */
-    n_lang_names = g_strv_length ((gchar **)lang_names);
-    delta = 0.999 / (n_lang_names - 1);
-
-    /* Build the array of languages */
-    langs = g_string_sized_new (n_lang_names);
-    for (i = 0; lang_names[i] != NULL; i++)
-    {
-        cur_lang = sokoke_posix_lang_to_rfc2616 (lang_names[i]);
-
-        /* Apart from getting a valid RFC2616 compliant
-           language, also get rid of extra variants */
-        if (cur_lang && (!prev_lang ||
-           (!strcmp (prev_lang, cur_lang) || !strstr (prev_lang, cur_lang))))
-        {
-
-            gchar *qv_lang = NULL;
-
-            /* Save reference for further comparison */
-            prev_lang = cur_lang;
-
-            /* Add the quality value and append it */
-            qv_lang = sokoke_add_quality_value (cur_lang, 1 - i * delta);
-            if (langs->len > 0)
-                g_string_append_c (langs, ',');
-            g_string_append (langs, qv_lang);
-        }
-    }
-
-    /* Fallback: add "en" if list is empty */
-    if (langs->len == 0)
-        g_string_append (langs, "en");
-
-    return g_string_free (langs, FALSE);
-}
-
-
-static void
-midori_web_settings_update_accept_language (MidoriWebSettings* settings)
-{
-    gchar* languages = settings->http_accept_language;
-    /* Empty, use the system locales */
-    if (!(languages && *languages))
-        katze_assign (settings->accept, sokoke_accept_languages (g_get_language_names ()));
-    /* No =, no ., looks like a list of language names */
-    else if (!(strchr (languages, '=') && strchr (languages, '.')))
-    {
-        gchar ** lang_names = g_strsplit_set (languages, ",; ", -1);
-        katze_assign (settings->accept, sokoke_accept_languages ((const gchar* const *)lang_names));
-        g_strfreev (lang_names);
-    }
-    /* Presumably a well formatted list including priorities */
-    else
-        katze_assign (settings->accept, g_strdup (languages));
-}
-
-/**
- * midori_web_settings_get_accept_language:
- *
- * Returns the value of the accept-language header to send to web servers
- *
- * Returns: the accept-language string
- **/
-const gchar*
-midori_web_settings_get_accept_language (MidoriWebSettings* settings)
-{
-    if (!settings->accept)
-        midori_web_settings_update_accept_language (settings);
-    return settings->accept;
-}
-#endif
-
 static void
 midori_web_settings_process_stylesheets (MidoriWebSettings* settings,
                                          gint               delta_len);
@@ -1038,11 +904,7 @@
     case PROP_ENABLE_PLUGINS:
         g_object_set (web_settings,
            WEB_SETTINGS_STRING ("enable-plugins"), g_value_get_boolean (value),
-        #ifdef HAVE_WEBKIT2
             "enable-java", g_value_get_boolean (value),
-        #else
-            "enable-java-applet", g_value_get_boolean (value),
-        #endif
             NULL);
         break;
     case PROP_ENABLE_PAGE_CACHE:
@@ -1075,7 +937,6 @@
         break;
     case PROP_PREFERRED_LANGUAGES:
         katze_assign (web_settings->http_accept_language, g_value_dup_string (value));
-        #ifdef HAVE_WEBKIT2
         WebKitWebContext* context = webkit_web_context_get_default ();
         gchar** languages = web_settings->http_accept_language
             ? g_strsplit_set (web_settings->http_accept_language, ",; ", -1)
@@ -1083,11 +944,6 @@
         webkit_web_context_set_preferred_languages (context, (const gchar* const*)languages);
         webkit_web_context_set_spell_checking_languages (context, (const gchar* const*)languages);
         g_strfreev (languages);
-        #else
-        g_object_set (web_settings, "spell-checking-languages",
-                      web_settings->http_accept_language, NULL);
-        midori_web_settings_update_accept_language (web_settings);
-        #endif
         break;
     case PROP_SITE_DATA_RULES:
         katze_assign (web_settings->site_data_rules, g_value_dup_string (value));
@@ -1248,12 +1104,7 @@
             WEB_SETTINGS_STRING ("enable-fullscreen")));
         break;
     case PROP_USER_STYLESHEET_URI:
-#ifdef HAVE_WEBKIT2
         g_value_set_string (value, web_settings->user_stylesheet_uri);
-#else
-        g_value_take_string (value, katze_object_get_string (web_settings,
-            WEB_SETTINGS_STRING ("user-stylesheet-uri")));
-#endif
         break;
     case PROP_PRINT_WITHOUT_DIALOG:
         g_value_set_boolean (value, web_settings->print_without_dialog);
@@ -1312,11 +1163,7 @@
 
     /* data: uri prefix from Source/WebCore/page/Page.cpp:700 in WebKit */
     encoded = g_strconcat ("data:text/css;charset=utf-8;base64,", css->str, NULL);
-    #ifdef HAVE_WEBKIT2
     /* TODO: webkit_web_view_group_add_user_style_sheet */
-    #else
-    g_object_set (settings, WEB_SETTINGS_STRING ("user-stylesheet-uri"), encoded, NULL);
-    #endif
     g_free (encoded);
     g_string_free (css, TRUE);
 }

=== modified file 'midori/midori-window.vala'
--- midori/midori-window.vala	2015-09-25 21:30:31 +0000
+++ midori/midori-window.vala	2017-12-17 17:18:01 +0000
@@ -14,7 +14,6 @@
         Gtk.Widget? _toolbar = null;
         public Gtk.Widget? toolbar { get {
             if (_toolbar == null) {
-#if HAVE_GTK3
                 if (strcmp (Environment.get_variable ("GTK_CSD"), "1") == 0) {
                     var toolbar = new Gtk.HeaderBar ();
                     toolbar.show_close_button = true;
@@ -23,12 +22,10 @@
                     _toolbar = toolbar;
                     return _toolbar;
                 }
-#endif
+
                 var toolbar = new Gtk.Toolbar ();
                 toolbar.show_arrow = true;
-#if HAVE_GTK3
                 toolbar.get_style_context ().add_class ("primary-toolbar");
-#endif
                 toolbar.popup_context_menu.connect ((x, y, button) => {
                     return button == 3 && context_menu (toolbar); });
                 _toolbar = toolbar;
@@ -136,7 +133,6 @@
                 all_actions = actions + "," + extra_actions + ",CompactMenu";
             string[] names = all_actions.split (",");
 
-#if HAVE_GTK3
             var headerbar = _toolbar as Gtk.HeaderBar;
             if (headerbar != null) {
                 var tail = new List<Gtk.ToolItem> ();
@@ -171,7 +167,6 @@
                 set_titlebar (headerbar);
                 return;
             }
-#endif
 
             var toolbar = (Gtk.Toolbar)_toolbar;
             string? previous = null;
@@ -211,9 +206,7 @@
         public void add_toolbar (Gtk.Widget toolbar) {
             var _toolbar = toolbar as Gtk.Toolbar;
             if (_toolbar != null) {
-#if HAVE_GTK3
                 get_style_context ().add_class ("secondary-toolbar");
-#endif
                 _toolbar.popup_context_menu.connect ((x, y, button) => {
                     return button == 3 && context_menu (toolbar);
                 });

=== modified file 'midori/sokoke.c'
--- midori/sokoke.c	2015-12-29 21:41:07 +0000
+++ midori/sokoke.c	2017-12-17 17:18:01 +0000
@@ -562,16 +562,6 @@
         g_free (markup);
         gtk_widget_destroy (entry);
 
-        #if !GTK_CHECK_VERSION (3, 0, 0)
-        {
-        GtkStyle* style = gtk_widget_get_style (entry);
-        gtk_widget_modify_bg (xfce_heading, GTK_STATE_NORMAL,
-            &style->base[GTK_STATE_NORMAL]);
-        gtk_widget_modify_fg (label, GTK_STATE_NORMAL
-         , &style->text[GTK_STATE_NORMAL]);
-        }
-        #endif
-
         vbox = gtk_vbox_new (FALSE, 0);
         gtk_box_pack_start (GTK_BOX (vbox), xfce_heading, FALSE, FALSE, 0);
 
@@ -752,14 +742,6 @@
                      gpointer            user_data)
 {
     gchar* hostname;
-#ifndef HAVE_WEBKIT2
-    SoupURI* soup_uri;
-    SoupSession* session = webkit_get_default_session ();
-
-    g_object_get (G_OBJECT (session), "proxy-uri", &soup_uri, NULL);
-    if (soup_uri)
-        return FALSE;
-#endif
 
     if (settings && !katze_object_get_boolean (settings, "enable-dns-prefetching"))
         return FALSE;
@@ -772,41 +754,10 @@
         return FALSE;
     }
 
-#ifdef HAVE_WEBKIT2
     WebKitWebContext* context = webkit_web_context_get_default ();
     webkit_web_context_prefetch_dns (context, hostname);
     g_free (hostname);
     return FALSE;
-#else
-    #define MAXHOSTS 50
-    static gchar* hosts = NULL;
-    static gint host_count = G_MAXINT;
-
-    if (!hosts ||
-        !g_regex_match_simple (hostname, hosts,
-                               G_REGEX_CASELESS, G_REGEX_MATCH_NOTEMPTY))
-    {
-        SoupAddress* address;
-        gchar* new_hosts;
-
-        address = soup_address_new (hostname, SOUP_ADDRESS_ANY_PORT);
-        soup_address_resolve_async (address, 0, 0, (SoupAddressCallback)callback, user_data);
-        g_object_unref (address);
-
-        if (host_count > MAXHOSTS)
-        {
-            katze_assign (hosts, g_strdup (""));
-            host_count = 0;
-        }
-        host_count++;
-        new_hosts = g_strdup_printf ("%s|%s", hosts, hostname);
-        katze_assign (hosts, new_hosts);
-    }
-    else if (callback)
-        ((SoupAddressCallback)callback) (NULL, SOUP_STATUS_OK, user_data);
-    g_free (hostname);
-    return TRUE;
-#endif
 }
 
 static void
@@ -1009,11 +960,7 @@
     if (hIcon == NULL)
         return NULL;
 
-#if GTK_CHECK_VERSION (3, 9, 12)
     pixbuf = gdk_win32_icon_to_pixbuf_libgtk_only (hIcon, NULL, NULL);
-#else
-    pixbuf = gdk_win32_icon_to_pixbuf_libgtk_only (hIcon);
-#endif
     DestroyIcon (hIcon);
 
     return pixbuf;

=== modified file 'midori/sokoke.h'
--- midori/sokoke.h	2015-12-29 21:41:07 +0000
+++ midori/sokoke.h	2017-12-17 17:18:01 +0000
@@ -16,7 +16,6 @@
 #include <JavaScriptCore/JavaScript.h>
 #include "katze/katze.h"
 #include <midori/midori-websettings.h>
-#include <katze/gtk3-compat.h>
 
 gchar*
 sokoke_js_script_eval                   (JSContextRef    js_context,

=== removed file 'midori/webkit2gtk-web-extension-4.0.vapi'
--- midori/webkit2gtk-web-extension-4.0.vapi	2015-04-19 14:06:12 +0000
+++ midori/webkit2gtk-web-extension-4.0.vapi	1970-01-01 00:00:00 +0000
@@ -1,2801 +0,0 @@
-/* webkit2gtk-web-extension-4.0.vapi generated by vapigen, do not modify. */
-
-[CCode (cprefix = "WebKit", gir_namespace = "WebKit2WebExtension", gir_version = "4.0", lower_case_cprefix = "webkit_")]
-namespace WebKit {
-	namespace DOM {
-		[CCode (cheader_filename = "webkit2/webkit-web-extension.h", type_id = "webkit_dom_attr_get_type ()")]
-		[GIR (name = "DOMAttr")]
-		public class Attr : WebKit.DOM.Node, WebKit.DOM.EventTarget {
-			[CCode (has_construct_function = false)]
-			protected Attr ();
-			public string get_name ();
-			public unowned WebKit.DOM.Element get_owner_element ();
-			public bool get_specified ();
-			public string get_value ();
-			public void set_value (string value) throws GLib.Error;
-			[NoAccessorMethod]
-			public bool is_id { get; }
-			public string name { owned get; }
-			public WebKit.DOM.Element owner_element { get; }
-			public bool specified { get; }
-			public string value { owned get; set; }
-		}
-		[CCode (cheader_filename = "webkit2/webkit-web-extension.h", type_id = "webkit_dom_blob_get_type ()")]
-		[GIR (name = "DOMBlob")]
-		public class Blob : WebKit.DOM.Object {
-			[CCode (has_construct_function = false)]
-			protected Blob ();
-			public uint64 get_size ();
-			public uint64 size { get; }
-			[NoAccessorMethod]
-			public string type { owned get; }
-		}
-		[CCode (cheader_filename = "webkit2/webkit-web-extension.h", type_id = "webkit_dom_cdata_section_get_type ()")]
-		[GIR (name = "DOMCDATASection")]
-		public class CDATASection : WebKit.DOM.Text, WebKit.DOM.EventTarget {
-			[CCode (has_construct_function = false)]
-			protected CDATASection ();
-		}
-		[CCode (cheader_filename = "webkit2/webkit-web-extension.h", type_id = "webkit_dom_css_rule_get_type ()")]
-		[GIR (name = "DOMCSSRule")]
-		public class CSSRule : WebKit.DOM.Object {
-			[CCode (has_construct_function = false)]
-			protected CSSRule ();
-			public string get_css_text ();
-			public WebKit.DOM.CSSRule get_parent_rule ();
-			public WebKit.DOM.CSSStyleSheet get_parent_style_sheet ();
-			public ushort get_rule_type ();
-			public void set_css_text (string value) throws GLib.Error;
-			public string css_text { owned get; set; }
-			public WebKit.DOM.CSSRule parent_rule { owned get; }
-			public WebKit.DOM.CSSStyleSheet parent_style_sheet { owned get; }
-			[NoAccessorMethod]
-			public uint type { get; }
-		}
-		[CCode (cheader_filename = "webkit2/webkit-web-extension.h", type_id = "webkit_dom_css_rule_list_get_type ()")]
-		[GIR (name = "DOMCSSRuleList")]
-		public class CSSRuleList : WebKit.DOM.Object {
-			[CCode (has_construct_function = false)]
-			protected CSSRuleList ();
-			public ulong get_length ();
-			public WebKit.DOM.CSSRule item (ulong index);
-			public ulong length { get; }
-		}
-		[CCode (cheader_filename = "webkit2/webkit-web-extension.h", type_id = "webkit_dom_css_style_declaration_get_type ()")]
-		[GIR (name = "DOMCSSStyleDeclaration")]
-		public class CSSStyleDeclaration : WebKit.DOM.Object {
-			[CCode (has_construct_function = false)]
-			protected CSSStyleDeclaration ();
-			public string get_css_text ();
-			public ulong get_length ();
-			public WebKit.DOM.CSSRule get_parent_rule ();
-			public string get_property_priority (string propertyName);
-			public string get_property_shorthand (string propertyName);
-			public string get_property_value (string propertyName);
-			public bool is_property_implicit (string propertyName);
-			public string item (ulong index);
-			public string remove_property (string propertyName) throws GLib.Error;
-			public void set_css_text (string value) throws GLib.Error;
-			public void set_property (string propertyName, string value, string priority) throws GLib.Error;
-			public string css_text { owned get; set; }
-			public ulong length { get; }
-			public WebKit.DOM.CSSRule parent_rule { owned get; }
-		}
-		[CCode (cheader_filename = "webkit2/webkit-web-extension.h", type_id = "webkit_dom_css_style_sheet_get_type ()")]
-		[GIR (name = "DOMCSSStyleSheet")]
-		public class CSSStyleSheet : WebKit.DOM.StyleSheet {
-			[CCode (has_construct_function = false)]
-			protected CSSStyleSheet ();
-			public long add_rule (string selector, string style, ulong index) throws GLib.Error;
-			public void delete_rule (ulong index) throws GLib.Error;
-			public WebKit.DOM.CSSRuleList get_css_rules ();
-			public WebKit.DOM.CSSRule get_owner_rule ();
-			public WebKit.DOM.CSSRuleList get_rules ();
-			public ulong insert_rule (string rule, ulong index) throws GLib.Error;
-			public void remove_rule (ulong index) throws GLib.Error;
-			public WebKit.DOM.CSSRuleList css_rules { owned get; }
-			public WebKit.DOM.CSSRule owner_rule { owned get; }
-			public WebKit.DOM.CSSRuleList rules { owned get; }
-		}
-		[CCode (cheader_filename = "webkit2/webkit-web-extension.h", type_id = "webkit_dom_css_value_get_type ()")]
-		[GIR (name = "DOMCSSValue")]
-		public class CSSValue : WebKit.DOM.Object {
-			[CCode (has_construct_function = false)]
-			protected CSSValue ();
-			public string get_css_text ();
-			public ushort get_css_value_type ();
-			public void set_css_text (string value) throws GLib.Error;
-			public string css_text { owned get; set; }
-			public uint css_value_type { get; }
-		}
-		[CCode (cheader_filename = "webkit2/webkit-web-extension.h", type_id = "webkit_dom_character_data_get_type ()")]
-		[GIR (name = "DOMCharacterData")]
-		public class CharacterData : WebKit.DOM.Node, WebKit.DOM.EventTarget {
-			[CCode (has_construct_function = false)]
-			protected CharacterData ();
-			public void append_data (string data) throws GLib.Error;
-			public void delete_data (ulong offset, ulong length) throws GLib.Error;
-			public string get_data ();
-			public ulong get_length ();
-			public void insert_data (ulong offset, string data) throws GLib.Error;
-			public void replace_data (ulong offset, ulong length, string data) throws GLib.Error;
-			public void set_data (string value) throws GLib.Error;
-			public string substring_data (ulong offset, ulong length) throws GLib.Error;
-			public string data { owned get; set; }
-			public ulong length { get; }
-		}
-		[CCode (cheader_filename = "webkit2/webkit-web-extension.h", type_id = "webkit_dom_comment_get_type ()")]
-		[GIR (name = "DOMComment")]
-		public class Comment : WebKit.DOM.CharacterData, WebKit.DOM.EventTarget {
-			[CCode (has_construct_function = false)]
-			protected Comment ();
-		}
-		[CCode (cheader_filename = "webkit2/webkit-web-extension.h", type_id = "webkit_dom_dom_implementation_get_type ()")]
-		[GIR (name = "DOMDOMImplementation")]
-		public class DOMImplementation : WebKit.DOM.Object {
-			[CCode (has_construct_function = false)]
-			protected DOMImplementation ();
-			public WebKit.DOM.CSSStyleSheet create_css_style_sheet (string title, string media) throws GLib.Error;
-			public unowned WebKit.DOM.Document create_document (string? namespaceURI, string qualifiedName, WebKit.DOM.DocumentType? doctype) throws GLib.Error;
-			public unowned WebKit.DOM.DocumentType create_document_type (string qualifiedName, string publicId, string systemId) throws GLib.Error;
-			public unowned WebKit.DOM.HTMLDocument create_html_document (string title);
-			public bool has_feature (string feature, string version);
-		}
-		[CCode (cheader_filename = "webkit2/webkit-web-extension.h", type_id = "webkit_dom_dom_window_get_type ()")]
-		[GIR (name = "DOMDOMWindow")]
-		public class DOMWindow : WebKit.DOM.Object, WebKit.DOM.EventTarget {
-			[CCode (has_construct_function = false)]
-			protected DOMWindow ();
-			public bool webkit_message_handlers_post_message (string handler, string message);
-			[NoAccessorMethod]
-			public bool closed { get; }
-			[NoAccessorMethod]
-			public string default_status { owned get; set; }
-			[NoAccessorMethod]
-			public double device_pixel_ratio { get; }
-			[NoAccessorMethod]
-			public WebKit.DOM.Document document { owned get; }
-			[NoAccessorMethod]
-			public WebKit.DOM.Element frame_element { owned get; }
-			[NoAccessorMethod]
-			public WebKit.DOM.DOMWindow frames { owned get; }
-			[NoAccessorMethod]
-			public long inner_height { get; }
-			[NoAccessorMethod]
-			public long inner_width { get; }
-			[NoAccessorMethod]
-			public ulong length { get; }
-			[NoAccessorMethod]
-			public string name { owned get; set; }
-			[NoAccessorMethod]
-			public bool offscreen_buffering { get; }
-			[NoAccessorMethod]
-			public WebKit.DOM.DOMWindow opener { owned get; }
-			[NoAccessorMethod]
-			public long outer_height { get; }
-			[NoAccessorMethod]
-			public long outer_width { get; }
-			[NoAccessorMethod]
-			public long page_x_offset { get; }
-			[NoAccessorMethod]
-			public long page_y_offset { get; }
-			[NoAccessorMethod]
-			public WebKit.DOM.DOMWindow parent { owned get; }
-			[NoAccessorMethod]
-			public long screen_left { get; }
-			[NoAccessorMethod]
-			public long screen_top { get; }
-			[NoAccessorMethod]
-			public long screen_x { get; }
-			[NoAccessorMethod]
-			public long screen_y { get; }
-			[NoAccessorMethod]
-			public long scroll_x { get; }
-			[NoAccessorMethod]
-			public long scroll_y { get; }
-			[NoAccessorMethod]
-			public WebKit.DOM.DOMWindow self { owned get; }
-			[NoAccessorMethod]
-			public string status { owned get; set; }
-			[NoAccessorMethod]
-			public WebKit.DOM.DOMWindow top { owned get; }
-			[NoAccessorMethod]
-			public WebKit.DOM.DOMWindow window { owned get; }
-		}
-		[CCode (cheader_filename = "webkit2/webkit-web-extension.h", type_id = "webkit_dom_document_get_type ()")]
-		[GIR (name = "DOMDocument")]
-		public class Document : WebKit.DOM.Node, WebKit.DOM.EventTarget {
-			[CCode (has_construct_function = false)]
-			protected Document ();
-			public unowned WebKit.DOM.Node adopt_node (WebKit.DOM.Node source) throws GLib.Error;
-			public unowned WebKit.DOM.Attr create_attribute (string name) throws GLib.Error;
-			public unowned WebKit.DOM.Attr create_attribute_ns (string? namespaceURI, string qualifiedName) throws GLib.Error;
-			public unowned WebKit.DOM.CDATASection create_cdata_section (string data) throws GLib.Error;
-			public unowned WebKit.DOM.Comment create_comment (string data);
-			public WebKit.DOM.CSSStyleDeclaration create_css_style_declaration ();
-			public unowned WebKit.DOM.DocumentFragment create_document_fragment ();
-			public unowned WebKit.DOM.Element create_element (string tagName) throws GLib.Error;
-			public unowned WebKit.DOM.Element create_element_ns (string? namespaceURI, string qualifiedName) throws GLib.Error;
-			public unowned WebKit.DOM.EntityReference create_entity_reference (string? name) throws GLib.Error;
-			public WebKit.DOM.Event create_event (string eventType) throws GLib.Error;
-			public WebKit.DOM.XPathExpression create_expression (string expression, WebKit.DOM.XPathNSResolver resolver) throws GLib.Error;
-			public WebKit.DOM.NodeIterator create_node_iterator (WebKit.DOM.Node root, ulong whatToShow, WebKit.DOM.NodeFilter? filter, bool expandEntityReferences) throws GLib.Error;
-			public WebKit.DOM.XPathNSResolver create_ns_resolver (WebKit.DOM.Node nodeResolver);
-			public unowned WebKit.DOM.ProcessingInstruction create_processing_instruction (string target, string data) throws GLib.Error;
-			public WebKit.DOM.Range create_range ();
-			public unowned WebKit.DOM.Text create_text_node (string data);
-			public WebKit.DOM.TreeWalker create_tree_walker (WebKit.DOM.Node root, ulong whatToShow, WebKit.DOM.NodeFilter? filter, bool expandEntityReferences) throws GLib.Error;
-			public unowned WebKit.DOM.Element element_from_point (long x, long y);
-			public WebKit.DOM.XPathResult evaluate (string expression, WebKit.DOM.Node contextNode, WebKit.DOM.XPathNSResolver? resolver, ushort type, WebKit.DOM.XPathResult? inResult) throws GLib.Error;
-			public bool exec_command (string command, bool userInterface, string value);
-			public unowned WebKit.DOM.Element get_active_element ();
-			public WebKit.DOM.HTMLCollection get_anchors ();
-			public WebKit.DOM.HTMLCollection get_applets ();
-			public unowned WebKit.DOM.HTMLElement get_body ();
-			public string get_character_set ();
-			public string get_charset ();
-			public string get_cookie () throws GLib.Error;
-			public string get_default_charset ();
-			public WebKit.DOM.DOMWindow get_default_view ();
-			public unowned WebKit.DOM.DocumentType get_doctype ();
-			public unowned WebKit.DOM.Element get_document_element ();
-			public string get_document_uri ();
-			public string get_domain ();
-			public unowned WebKit.DOM.Element get_element_by_id (string elementId);
-			public WebKit.DOM.NodeList get_elements_by_class_name (string tagname);
-			public WebKit.DOM.NodeList get_elements_by_name (string elementName);
-			public WebKit.DOM.NodeList get_elements_by_tag_name (string tagname);
-			public WebKit.DOM.NodeList get_elements_by_tag_name_ns (string namespaceURI, string localName);
-			public WebKit.DOM.HTMLCollection get_forms ();
-			public unowned WebKit.DOM.HTMLHeadElement get_head ();
-			public WebKit.DOM.HTMLCollection get_images ();
-			public WebKit.DOM.DOMImplementation get_implementation ();
-			public string get_input_encoding ();
-			public string get_last_modified ();
-			public WebKit.DOM.HTMLCollection get_links ();
-			public WebKit.DOM.CSSStyleDeclaration get_override_style (WebKit.DOM.Element element, string? pseudoElement);
-			public string get_preferred_stylesheet_set ();
-			public string get_ready_state ();
-			public string get_referrer ();
-			public string get_selected_stylesheet_set ();
-			public unowned WebKit.DOM.StyleSheetList get_style_sheets ();
-			public string get_title ();
-			public string get_url ();
-			public string get_xml_encoding ();
-			public bool get_xml_standalone ();
-			public string get_xml_version ();
-			public bool has_focus ();
-			public unowned WebKit.DOM.Node import_node (WebKit.DOM.Node importedNode, bool deep) throws GLib.Error;
-			public bool query_command_enabled (string command);
-			public bool query_command_indeterm (string command);
-			public bool query_command_state (string command);
-			public bool query_command_supported (string command);
-			public string query_command_value (string command);
-			public unowned WebKit.DOM.Element query_selector (string selectors) throws GLib.Error;
-			public WebKit.DOM.NodeList query_selector_all (string selectors) throws GLib.Error;
-			public void set_body (WebKit.DOM.HTMLElement value) throws GLib.Error;
-			public void set_charset (string value);
-			public void set_cookie (string value) throws GLib.Error;
-			public void set_document_uri (string value);
-			public void set_selected_stylesheet_set (string value);
-			public void set_title (string value);
-			public void set_xml_standalone (bool value) throws GLib.Error;
-			public void set_xml_version (string value) throws GLib.Error;
-			public WebKit.DOM.Element active_element { get; }
-			public WebKit.DOM.HTMLCollection anchors { owned get; }
-			public WebKit.DOM.HTMLCollection applets { owned get; }
-			public WebKit.DOM.HTMLElement body { get; }
-			public string character_set { owned get; }
-			public string charset { owned get; set; }
-			[NoAccessorMethod]
-			public string compat_mode { owned get; }
-			[NoAccessorMethod]
-			public string content_type { owned get; }
-			public string cookie { owned get; set; }
-			[NoAccessorMethod]
-			public WebKit.DOM.HTMLScriptElement current_script { owned get; }
-			public string default_charset { owned get; }
-			public WebKit.DOM.DOMWindow default_view { owned get; }
-			public WebKit.DOM.DocumentType doctype { get; }
-			public WebKit.DOM.Element document_element { get; }
-			public string document_uri { owned get; set; }
-			public string domain { owned get; }
-			public WebKit.DOM.HTMLCollection forms { owned get; }
-			public WebKit.DOM.HTMLHeadElement head { get; }
-			[NoAccessorMethod]
-			public bool hidden { get; }
-			public WebKit.DOM.HTMLCollection images { owned get; }
-			public WebKit.DOM.DOMImplementation implementation { owned get; }
-			public string input_encoding { owned get; }
-			public string last_modified { owned get; }
-			public WebKit.DOM.HTMLCollection links { owned get; }
-			[NoAccessorMethod]
-			public string origin { owned get; }
-			[NoAccessorMethod]
-			public WebKit.DOM.Element pointer_lock_element { owned get; }
-			public string preferred_stylesheet_set { owned get; }
-			public string ready_state { owned get; }
-			public string referrer { owned get; }
-			public string selected_stylesheet_set { owned get; set; }
-			public WebKit.DOM.StyleSheetList style_sheets { get; }
-			public string title { owned get; set; }
-			public string url { owned get; }
-			[NoAccessorMethod]
-			public string visibility_state { owned get; }
-			[NoAccessorMethod]
-			public WebKit.DOM.Element webkit_current_full_screen_element { owned get; }
-			[NoAccessorMethod]
-			public bool webkit_full_screen_keyboard_input_allowed { get; }
-			[NoAccessorMethod]
-			public WebKit.DOM.Element webkit_fullscreen_element { owned get; }
-			[NoAccessorMethod]
-			public bool webkit_fullscreen_enabled { get; }
-			[NoAccessorMethod]
-			public bool webkit_is_full_screen { get; }
-			public string xml_encoding { owned get; }
-			public bool xml_standalone { get; set; }
-			public string xml_version { owned get; set; }
-		}
-		[CCode (cheader_filename = "webkit2/webkit-web-extension.h", type_id = "webkit_dom_document_fragment_get_type ()")]
-		[GIR (name = "DOMDocumentFragment")]
-		public class DocumentFragment : WebKit.DOM.Node, WebKit.DOM.EventTarget {
-			[CCode (has_construct_function = false)]
-			protected DocumentFragment ();
-		}
-		[CCode (cheader_filename = "webkit2/webkit-web-extension.h", type_id = "webkit_dom_document_type_get_type ()")]
-		[GIR (name = "DOMDocumentType")]
-		public class DocumentType : WebKit.DOM.Node, WebKit.DOM.EventTarget {
-			[CCode (has_construct_function = false)]
-			protected DocumentType ();
-			public WebKit.DOM.NamedNodeMap get_entities ();
-			public string get_internal_subset ();
-			public string get_name ();
-			public WebKit.DOM.NamedNodeMap get_notations ();
-			public string get_public_id ();
-			public string get_system_id ();
-			public WebKit.DOM.NamedNodeMap entities { owned get; }
-			public string internal_subset { owned get; }
-			public string name { owned get; }
-			public WebKit.DOM.NamedNodeMap notations { owned get; }
-			public string public_id { owned get; }
-			public string system_id { owned get; }
-		}
-		[CCode (cheader_filename = "webkit2/webkit-web-extension.h", type_id = "webkit_dom_element_get_type ()")]
-		[GIR (name = "DOMElement")]
-		public class Element : WebKit.DOM.Node, WebKit.DOM.EventTarget {
-			[CCode (has_construct_function = false)]
-			protected Element ();
-			public void blur ();
-			public void focus ();
-			public string get_attribute (string name);
-			public unowned WebKit.DOM.Attr get_attribute_node (string name);
-			public unowned WebKit.DOM.Attr get_attribute_node_ns (string namespaceURI, string localName);
-			public string get_attribute_ns (string namespaceURI, string localName);
-			public WebKit.DOM.NamedNodeMap get_attributes ();
-			public ulong get_child_element_count ();
-			public string get_class_name ();
-			public double get_client_height ();
-			public double get_client_left ();
-			public double get_client_top ();
-			public double get_client_width ();
-			public WebKit.DOM.NodeList get_elements_by_class_name (string name);
-			public WebKit.DOM.NodeList get_elements_by_tag_name (string name);
-			public WebKit.DOM.NodeList get_elements_by_tag_name_ns (string namespaceURI, string localName);
-			public unowned WebKit.DOM.Element get_first_element_child ();
-			public string get_id ();
-			public string get_inner_html ();
-			public unowned WebKit.DOM.Element get_last_element_child ();
-			public unowned WebKit.DOM.Element get_next_element_sibling ();
-			public double get_offset_height ();
-			public double get_offset_left ();
-			public unowned WebKit.DOM.Element get_offset_parent ();
-			public double get_offset_top ();
-			public double get_offset_width ();
-			public string get_outer_html ();
-			public unowned WebKit.DOM.Element get_previous_element_sibling ();
-			public long get_scroll_height ();
-			public long get_scroll_left ();
-			public long get_scroll_top ();
-			public long get_scroll_width ();
-			public WebKit.DOM.CSSStyleDeclaration get_style ();
-			public string get_tag_name ();
-			public bool has_attribute (string name);
-			public bool has_attribute_ns (string namespaceURI, string localName);
-			public bool has_attributes ();
-			public unowned WebKit.DOM.Element query_selector (string selectors) throws GLib.Error;
-			public WebKit.DOM.NodeList query_selector_all (string selectors) throws GLib.Error;
-			public void remove_attribute (string name);
-			public unowned WebKit.DOM.Attr remove_attribute_node (WebKit.DOM.Attr oldAttr) throws GLib.Error;
-			public void remove_attribute_ns (string namespaceURI, string localName);
-			public void scroll_by_lines (long lines);
-			public void scroll_by_pages (long pages);
-			public void scroll_into_view (bool alignWithTop);
-			public void scroll_into_view_if_needed (bool centerIfNeeded);
-			public void set_attribute (string name, string value) throws GLib.Error;
-			public unowned WebKit.DOM.Attr set_attribute_node (WebKit.DOM.Attr newAttr) throws GLib.Error;
-			public unowned WebKit.DOM.Attr set_attribute_node_ns (WebKit.DOM.Attr newAttr) throws GLib.Error;
-			public void set_attribute_ns (string? namespaceURI, string qualifiedName, string value) throws GLib.Error;
-			public void set_class_name (string value);
-			public void set_id (string value);
-			public void set_inner_html (string value) throws GLib.Error;
-			public void set_outer_html (string value) throws GLib.Error;
-			public void set_scroll_left (long value);
-			public void set_scroll_top (long value);
-			public WebKit.DOM.NamedNodeMap attributes { owned get; }
-			public ulong child_element_count { get; }
-			public string class_name { owned get; set; }
-			public double client_height { get; }
-			public double client_left { get; }
-			public double client_top { get; }
-			public double client_width { get; }
-			public WebKit.DOM.Element first_element_child { get; }
-			public string id { owned get; set; }
-			public string inner_html { owned get; set; }
-			public WebKit.DOM.Element last_element_child { get; }
-			public WebKit.DOM.Element next_element_sibling { get; }
-			public double offset_height { get; }
-			public double offset_left { get; }
-			public WebKit.DOM.Element offset_parent { get; }
-			public double offset_top { get; }
-			public double offset_width { get; }
-			public string outer_html { owned get; set; }
-			public WebKit.DOM.Element previous_element_sibling { get; }
-			public long scroll_height { get; }
-			public long scroll_left { get; set; }
-			public long scroll_top { get; set; }
-			public long scroll_width { get; }
-			public WebKit.DOM.CSSStyleDeclaration style { owned get; }
-			public string tag_name { owned get; }
-			[NoAccessorMethod]
-			public string webkit_region_overset { owned get; }
-		}
-		[CCode (cheader_filename = "webkit2/webkit-web-extension.h", type_id = "webkit_dom_entity_reference_get_type ()")]
-		[GIR (name = "DOMEntityReference")]
-		public class EntityReference : WebKit.DOM.Node, WebKit.DOM.EventTarget {
-			[CCode (has_construct_function = false)]
-			protected EntityReference ();
-		}
-		[CCode (cheader_filename = "webkit2/webkit-web-extension.h", type_id = "webkit_dom_event_get_type ()")]
-		[GIR (name = "DOMEvent")]
-		public class Event : WebKit.DOM.Object {
-			[CCode (has_construct_function = false)]
-			protected Event ();
-			public bool get_bubbles ();
-			public bool get_cancel_bubble ();
-			public bool get_cancelable ();
-			public WebKit.DOM.EventTarget get_current_target ();
-			public ushort get_event_phase ();
-			public string get_event_type ();
-			public bool get_return_value ();
-			public WebKit.DOM.EventTarget get_src_element ();
-			public WebKit.DOM.EventTarget get_target ();
-			public uint32 get_time_stamp ();
-			public void init_event (string eventTypeArg, bool canBubbleArg, bool cancelableArg);
-			public void prevent_default ();
-			public void set_cancel_bubble (bool value);
-			public void set_return_value (bool value);
-			public void stop_propagation ();
-			public bool bubbles { get; }