Merge lp:~kalikiana/midori/webkit1.8.3 into lp:midori

[Cris Dywan]

Bump WebKit requirement to 1.8.3 and drop support for earlier versions

Bump WebKit requirement to 1.8.3 and drop support for earlier versions

[Paweł Forysiuk (tuxator)]

Seems to work fine

review: Approve

=== modified file 'README'
--- README	2013-05-30 11:08:14 +0000
+++ README	2013-06-19 20:32:28 +0000
@@ -11,7 +11,7 @@
 * Straightforward bookmark management.
 * Customizable interface, extensions written in C and Vala.
 
-Requirements: GLib 2.22, GTK+ 2.16, WebkitGTK+ 1.1.17, libXML2,
+Requirements: GLib 2.22, GTK+ 2.16, WebkitGTK+ 1.8.3, libXML2,
               libsoup 2.27.90, sqlite 3.0, Vala 0.14, libnotify
 
 Optional: GTK+ 3.0, Unique 0.9, gcr, Granite 0.2, WebKit2GTK+ 1.11.91/ 2.0.0

=== modified file 'extensions/formhistory/formhistory-frontend.h'
--- extensions/formhistory/formhistory-frontend.h	2012-02-19 22:18:41 +0000
+++ extensions/formhistory/formhistory-frontend.h	2013-06-19 20:32:28 +0000
@@ -18,17 +18,11 @@
     #include <unistd.h>
 #endif
 
-#if WEBKIT_CHECK_VERSION (1, 3, 1)
-    #define FORMHISTORY_USE_GDOM 1
-#else
-    #define FORMHISTORY_USE_JS 1
-#endif
 #define MAXPASSSIZE 64
 
 typedef struct
 {
     sqlite3* db;
-    #ifdef FORMHISTORY_USE_GDOM
     WebKitDOMElement* element;
     int completion_timeout;
     GtkTreeModel* completion_model;
@@ -36,9 +30,6 @@
     GtkWidget* popup;
     gchar* oldkeyword;
     glong selection_index;
-    #else
-    gchar* jsforms;
-    #endif
     gchar* master_password;
     int master_password_canceled;
 } FormHistoryPriv;
@@ -64,11 +55,9 @@
                                JSContextRef     js_context,
                                MidoriExtension* extension);
 
-#ifdef FORMHISTORY_USE_GDOM
 void
 formhistory_suggestions_hide_cb (WebKitDOMElement* element,
                                  WebKitDOMEvent*   dom_event,
                                  FormHistoryPriv*  priv);
-#endif
 
 #endif

=== modified file 'extensions/formhistory/formhistory-gdom-frontend.c'
--- extensions/formhistory/formhistory-gdom-frontend.c	2012-12-08 02:30:39 +0000
+++ extensions/formhistory/formhistory-gdom-frontend.c	2013-06-19 20:32:28 +0000
@@ -8,7 +8,6 @@
  version 2.1 of the License, or (at your option) any later version.
 */
 #include "formhistory-frontend.h"
-#ifdef FORMHISTORY_USE_GDOM
 #define COMPLETION_DELAY 200
 
 FormHistoryPriv*
@@ -393,14 +392,12 @@
     for (i = 0; i < webkit_dom_node_list_get_length (inputs); i++)
     {
         WebKitDOMNode* element = webkit_dom_node_list_item (inputs, i);
-        #if WEBKIT_CHECK_VERSION (1, 6, 1)
         gchar* autocomplete = webkit_dom_html_input_element_get_autocomplete (
             WEBKIT_DOM_HTML_INPUT_ELEMENT (element));
         gboolean off = !g_strcmp0 (autocomplete, "off");
         g_free (autocomplete);
         if (off)
             continue;
-        #endif
 
         g_object_set_data (G_OBJECT (element), "doc", doc);
         g_object_set_data (G_OBJECT (element), "webview", web_view);
@@ -511,4 +508,3 @@
         G_CALLBACK (formhistory_suggestion_selected_cb), priv);
     return TRUE;
 }
-#endif

=== removed file 'extensions/formhistory/formhistory-js-frontend.c'
--- extensions/formhistory/formhistory-js-frontend.c	2012-12-07 19:18:26 +0000
+++ extensions/formhistory/formhistory-js-frontend.c	1970-01-01 00:00:00 +0000
@@ -1,141 +0,0 @@
-/*
- Copyright (C) 2009-2012 Alexander Butenko <[e-mail]>
- Copyright (C) 2009-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.
-*/
-#include "formhistory-frontend.h"
-#ifdef FORMHISTORY_USE_JS
-
-FormHistoryPriv*
-formhistory_private_new ()
-{
-    FormHistoryPriv* priv = g_slice_new (FormHistoryPriv);
-    return priv;
-}
-
-gboolean
-formhistory_construct_popup_gui (FormHistoryPriv* priv)
-{
-    gchar* autosuggest;
-    gchar* style;
-    guint i;
-    gchar* file;
-
-    file = midori_app_find_res_filename ("autosuggestcontrol.js");
-    if (!g_file_get_contents (file, &autosuggest, NULL, NULL))
-    {
-        g_free (file);
-        return FALSE;
-    }
-    g_strchomp (autosuggest);
-
-    katze_assign (file, midori_app_find_res_filename ("autosuggestcontrol.css"));
-    if (!g_file_get_contents (file, &style, NULL, NULL))
-    {
-        g_free (file);
-        return FALSE;
-    }
-    g_strchomp (style);
-    g_free (file);
-
-    i = 0;
-    while (style[i])
-    {
-        if (style[i] == '\n')
-            style[i] = ' ';
-        i++;
-    }
-
-    priv->jsforms = g_strdup_printf (
-         "%s"
-         "window.addEventListener ('DOMContentLoaded',"
-         "function () {"
-         "   if (document.getElementById('formhistory'))"
-         "       return;"
-         "   if (!initSuggestions ())"
-         "       return;"
-         "   var mystyle = document.createElement('style');"
-         "   mystyle.setAttribute('type', 'text/css');"
-         "   mystyle.setAttribute('id', 'formhistory');"
-         "   mystyle.appendChild(document.createTextNode('%s'));"
-         "   var head = document.getElementsByTagName('head')[0];"
-         "   if (head) head.appendChild(mystyle);"
-         "}, true);",
-         autosuggest,
-         style);
-    g_strstrip (priv->jsforms);
-    g_free (style);
-    g_free (autosuggest);
-    return TRUE;
-}
-
-void
-formhistory_setup_suggestions (WebKitWebView*   web_view,
-                               JSContextRef     js_context,
-                               MidoriExtension* extension)
-{
-    GString* suggestions;
-    FormHistoryPriv* priv;
-    static sqlite3_stmt* stmt;
-    const char* sqlcmd;
-    const unsigned char* key;
-    const unsigned char* value;
-
-    gint result, pos;
-
-    priv = g_object_get_data (G_OBJECT (extension), "priv");
-    if (!priv->db)
-        return;
-
-    if (!stmt)
-    {
-        sqlcmd = "SELECT DISTINCT group_concat(value,'\",\"'), field FROM forms \
-                         GROUP BY field ORDER BY field";
-        sqlite3_prepare_v2 (priv->db, sqlcmd, strlen (sqlcmd) + 1, &stmt, NULL);
-    }
-    result = sqlite3_step (stmt);
-    if (result != SQLITE_ROW)
-    {
-        if (result == SQLITE_ERROR)
-            g_print (_("Failed to select suggestions\n"));
-        sqlite3_reset (stmt);
-        return;
-    }
-    suggestions = g_string_new (
-        "function FormSuggestions(eid) { "
-        "arr = new Array();");
-
-    while (result == SQLITE_ROW)
-    {
-        pos++;
-        value = sqlite3_column_text (stmt, 0);
-        key = sqlite3_column_text (stmt, 1);
-        if (value)
-        {
-            g_string_append_printf (suggestions, " arr[\"%s\"] = [\"%s\"]; ",
-                                (gchar*)key, (gchar*)value);
-        }
-        result = sqlite3_step (stmt);
-    }
-    g_string_append (suggestions, "this.suggestions = arr[eid]; }");
-    g_string_append (suggestions, priv->jsforms);
-    sokoke_js_script_eval (js_context, suggestions->str, NULL);
-    g_string_free (suggestions, TRUE);
-}
-
-void
-formhistory_private_destroy (FormHistoryPriv *priv)
-{
-    if (priv->db)
-    {
-        sqlite3_close (priv->db);
-        priv->db = NULL;
-    }
-    katze_assign (priv->jsforms, NULL);
-    g_slice_free (FormHistoryPriv, priv);
-}
-#endif

=== modified file 'extensions/formhistory/formhistory.c'
--- extensions/formhistory/formhistory.c	2012-12-16 12:59:46 +0000
+++ extensions/formhistory/formhistory.c	2013-06-19 20:32:28 +0000
@@ -221,9 +221,7 @@
     js_context = webkit_web_frame_get_global_context (web_frame);
     value = sokoke_js_script_eval (js_context, script, NULL);
 
-#ifdef FORMHISTORY_USE_GDOM
     formhistory_suggestions_hide_cb (NULL, NULL, priv);
-#endif
     if (value && *value)
     {
         gchar** inputs = g_strsplit (value, "|||", 0);
@@ -235,7 +233,6 @@
             {
                 if (strcmp (parts[2], "password"))
                     formhistory_update_database (priv->db, NULL, parts[0], parts[1]);
-                #if WEBKIT_CHECK_VERSION (1, 3, 8)
                 else
                 {
                     #if 0
@@ -256,7 +253,6 @@
                     g_object_set_data (G_OBJECT (web_view), "FormHistoryPasswordEntry", entry);
                     #endif
                 }
-                #endif
             }
             g_strfreev (parts);
             i++;
@@ -287,7 +283,6 @@
 
     formhistory_setup_suggestions (web_view, js_context, extension);
 
-    #if WEBKIT_CHECK_VERSION (1, 3, 8)
     entry = g_object_get_data (G_OBJECT (web_view), "FormHistoryPasswordEntry");
     if (entry)
     {
@@ -301,10 +296,8 @@
                                   _("Never for this page"), GTK_RESPONSE_CANCEL, NULL);
         g_object_set_data (G_OBJECT (web_view), "FormHistoryPasswordEntry", NULL);
     }
-    #endif
 }
 
-#if WEBKIT_CHECK_VERSION (1, 3, 8)
 static gchar*
 formhistory_decrypt (const gchar* data,
                      const gchar* password)
@@ -391,7 +384,6 @@
     formhistory_fill_login_data (js_context, priv, data);
     g_free (data);
 }
-#endif
 
 static void
 formhistory_deactivate_cb (MidoriExtension* extension,
@@ -408,11 +400,8 @@
         G_CALLBACK (formhistory_window_object_cleared_cb), extension);
     g_signal_connect (web_view, "navigation-policy-decision-requested",
         G_CALLBACK (formhistory_navigation_decision_cb), extension);
-
-    #if WEBKIT_CHECK_VERSION (1, 3, 8)
     g_signal_connect (web_view, "onload-event",
         G_CALLBACK (formhistory_frame_loaded_cb), extension);
-    #endif
 }
 
 static void
@@ -460,10 +449,8 @@
        web_view, formhistory_window_object_cleared_cb, extension);
     g_signal_handlers_disconnect_by_func (
        web_view, formhistory_navigation_decision_cb, extension);
-    #if WEBKIT_CHECK_VERSION (1, 3, 8)
     g_signal_handlers_disconnect_by_func (
        web_view, formhistory_frame_loaded_cb, extension);
-    #endif
 }
 
 static void

=== modified file 'extensions/nsplugin-manager.vala'
--- extensions/nsplugin-manager.vala	2013-04-04 21:31:07 +0000
+++ extensions/nsplugin-manager.vala	2013-06-19 20:32:28 +0000
@@ -9,7 +9,6 @@
    See the file COPYING for the full license text.
 */
 
-#if HAVE_WEBKIT_1_3_8
 namespace NSPlugins {
     private int active_plugins = 0;
 
@@ -53,10 +52,8 @@
         }
     }
 }
-#endif
 
 public Katze.Array? extension_init () {
-#if HAVE_WEBKIT_1_3_8
     if (!Midori.WebSettings.has_plugin_support ())
         return null;
 
@@ -70,8 +67,5 @@
         extensions.add_item (new NSPlugins.Extension (plugin));
     }
     return extensions;
-#else
-    return null;
-#endif
 }
 

=== removed file 'extensions/web-cache.c'
--- extensions/web-cache.c	2012-11-22 01:01:42 +0000
+++ extensions/web-cache.c	1970-01-01 00:00:00 +0000
@@ -1,475 +0,0 @@
-/*
- Copyright (C) 2009 Christian Dywan <[e-mail]>
- Copyright (C) 2009 Alexander Butenko <[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 <midori/midori.h>
-#include <glib/gstdio.h>
-#include <stdlib.h>
-
-#include "config.h"
-#if HAVE_UNISTD_H
-    #include <unistd.h>
-#endif
-
-#if !WEBKIT_CHECK_VERSION (1, 3, 11)
-
-#define MAXLENGTH 1024 * 1024
-
-static gchar*
-web_cache_get_cache_dir (void)
-{
-    static gchar* cache_dir = NULL;
-    if (!cache_dir)
-        cache_dir = g_build_filename (midori_paths_get_cache_dir (), "web", NULL);
-    return cache_dir;
-}
-
-static gchar*
-web_cache_get_cached_path (MidoriExtension* extension,
-                           const gchar*     uri)
-{
-    gchar* checksum;
-    gchar* folder;
-    gchar* sub_path;
-    gchar* encoded;
-    gchar* ext;
-    gchar* cached_filename;
-    gchar* cached_path;
-
-    checksum = g_compute_checksum_for_string (G_CHECKSUM_MD5, uri, -1);
-    folder = g_strdup_printf ("%c%c", checksum[0], checksum[1]);
-    sub_path = g_build_path (G_DIR_SEPARATOR_S,
-                             web_cache_get_cache_dir (), folder, NULL);
-    katze_mkdir_with_parents (sub_path, 0700);
-    g_free (folder);
-
-    encoded = soup_uri_encode (uri, "/");
-    ext = g_strdup (g_strrstr (encoded, "."));
-    /* Make sure ext isn't becoming too long */
-    if (ext && ext[0] && ext[1] && ext[2] && ext[3] && ext[4])
-        ext[4] = '\0';
-    cached_filename = g_strdup_printf ("%s%s", checksum, ext ? ext : "");
-    g_free (ext);
-    g_free (encoded);
-    g_free (checksum);
-    cached_path = g_build_filename (sub_path, cached_filename, NULL);
-    g_free (cached_filename);
-    return cached_path;
-}
-
-static gboolean
-web_cache_save_headers (SoupMessage* msg,
-                        gchar*       filename)
-{
-      gchar* dsc_filename = g_strdup_printf ("%s.dsc.tmp", filename);
-      SoupMessageHeaders* hdrs = msg->response_headers;
-      SoupMessageHeadersIter iter;
-      const gchar* name, *value;
-      FILE* dscfd;
-
-      soup_message_headers_iter_init (&iter, hdrs);
-      dscfd = g_fopen (dsc_filename, "w");
-      g_free (dsc_filename);
-      if (!dscfd)
-          return FALSE;
-
-      while (soup_message_headers_iter_next (&iter, &name, &value))
-          g_fprintf (dscfd, "%s: %s\n", name, value);
-      fclose (dscfd);
-
-      return TRUE;
-}
-
-static GHashTable*
-web_cache_get_headers (gchar* filename)
-{
-    GHashTable* headers;
-    FILE* file;
-    gchar* dsc_filename;
-    gchar line[128];
-
-    if (!filename)
-        return NULL;
-
-    /* use g_access() instead of g_file_test for better performance */
-    if (g_access (filename, F_OK) != 0)
-        return NULL;
-
-    dsc_filename = g_strdup_printf ("%s.dsc", filename);
-    headers = g_hash_table_new_full (g_str_hash, g_str_equal,
-                               (GDestroyNotify)g_free,
-                               (GDestroyNotify)g_free);
-
-    if (!(file = g_fopen (dsc_filename, "r")))
-    {
-        g_hash_table_destroy (headers);
-        g_free (dsc_filename);
-        return NULL;
-    }
-    while (fgets (line, 128, file))
-    {
-        gchar** data;
-
-        if (line == NULL)
-            continue;
-
-        g_strchomp (line);
-        data = g_strsplit (line, ":", 2);
-        if (data[0] && data[1])
-            g_hash_table_insert (headers, g_strdup (data[0]),
-                                 g_strdup (g_strchug (data[1])));
-        g_strfreev (data);
-    }
-    fclose (file);
-    g_free (dsc_filename);
-    return headers;
-}
-
-static GFile*
-web_cache_tmp_prepare (gchar* filename)
-{
-    GFile *file;
-
-    gchar* tmp_filename = g_strdup_printf ("%s.tmp", filename);
-    if (g_access (tmp_filename, F_OK) == 0)
-    {
-        g_free (tmp_filename);
-        return NULL;
-    }
-    file = g_file_new_for_path (tmp_filename);
-    g_free (tmp_filename);
-
-    return file;
-}
-
-static void
-web_cache_set_content_type (SoupMessage* msg,
-                            SoupBuffer*  buffer)
-{
-    gchar* sniffed_type;
-    SoupContentSniffer* sniffer = soup_content_sniffer_new ();
-    if ((sniffed_type = soup_content_sniffer_sniff (sniffer, msg, buffer, NULL)))
-    {
-        g_signal_emit_by_name (msg, "content-sniffed", sniffed_type, NULL);
-        g_free (sniffed_type);
-    }
-    else
-    {
-        const gchar* content_type = soup_message_headers_get_one (
-            msg->response_headers, "Content-Type");
-        g_signal_emit_by_name (msg, "content-sniffed", content_type, NULL);
-    }
-}
-
-static void
-web_cache_message_finished_cb (SoupMessage*   msg,
-                               GOutputStream* stream)
-{
-    gchar* headers;
-    gchar* tmp_headers;
-    gchar* tmp_data;
-    gchar* filename;
-
-    filename = g_object_get_data (G_OBJECT (stream), "filename");
-    headers = g_strdup_printf ("%s.dsc", filename);
-    tmp_headers = g_strdup_printf ("%s.dsc.tmp", filename);
-    tmp_data = g_strdup_printf ("%s.tmp", filename);
-    g_output_stream_close (stream, NULL, NULL);
-
-    if (msg->status_code == SOUP_STATUS_OK)
-    {
-        g_rename (tmp_data, filename);
-        g_rename (tmp_headers, headers);
-    }
-    else
-    {
-        g_unlink (tmp_data);
-        g_unlink (tmp_headers);
-    }
-
-    g_object_unref (stream);
-    g_free (headers);
-    g_free (tmp_headers);
-    g_free (tmp_data);
-}
-
-static void web_cache_pause_message (SoupMessage* msg)
-{
-    SoupSession* session;
-    session = g_object_get_data (G_OBJECT (msg), "session");
-    soup_session_pause_message (session, msg);
-}
-
-static void web_cache_unpause_message (SoupMessage* msg)
-{
-    SoupSession* session;
-    session = g_object_get_data (G_OBJECT (msg), "session");
-    soup_session_unpause_message (session, msg);
-}
-
-static void
-web_cache_message_got_chunk_cb (SoupMessage* msg,
-                                SoupBuffer*  chunk,
-                                GOutputStream* stream)
-{
-    if (!chunk->data || !chunk->length)
-        return;
-    /* FIXME g_output_stream_write_async (stream, chunk->data, chunk->length,
-        G_PRIORITY_DEFAULT, NULL, NULL, (gpointer)chunk->length); */
-    g_output_stream_write (stream, chunk->data, chunk->length, NULL, NULL);
-}
-
-static void
-web_cache_message_rewrite_async_cb (GFile *file,
-                                    GAsyncResult* res,
-                                    SoupMessage*  msg)
-{
-    SoupBuffer *buffer;
-    char *data;
-    gsize length;
-    GError *error = NULL;
-
-    if (g_file_load_contents_finish (file, res, &data, &length, NULL, &error))
-    {
-        buffer = soup_buffer_new (SOUP_MEMORY_TEMPORARY, data, length);
-        web_cache_set_content_type (msg, buffer);
-        soup_message_body_append_buffer (msg->response_body, buffer);
-        /* FIXME? */
-        web_cache_unpause_message (msg);
-        g_signal_emit_by_name (msg, "got-chunk", buffer, NULL);
-        soup_buffer_free (buffer);
-        g_free (data);
-        soup_message_got_body (msg);
-        soup_message_finished (msg);
-    }
-    g_object_unref (file);
-    g_object_unref (msg);
-}
-
-static void
-web_cache_message_rewrite (SoupMessage*  msg,
-                           gchar*        filename)
-{
-    GHashTableIter iter;
-    gpointer key, value;
-    GFile *file;
-
-    GHashTable* cache_headers = web_cache_get_headers (filename);
-    if (!cache_headers)
-        return;
-
-    soup_message_set_status (msg, SOUP_STATUS_OK);
-    g_hash_table_iter_init (&iter, cache_headers);
-    while (g_hash_table_iter_next (&iter, &key, &value))
-        soup_message_headers_replace (msg->response_headers, key, value);
-    g_signal_emit_by_name (msg, "got-headers", NULL);
-    g_hash_table_destroy (cache_headers);
-
-    /* FIXME? It seems libsoup already said "goodbye" by the time
-       the asynchronous function is starting to send data */
-    web_cache_pause_message (msg);
-    file = g_file_new_for_path (filename);
-    g_free (filename);
-    g_object_ref (msg);
-    g_file_load_contents_async (file, NULL,
-        (GAsyncReadyCallback)web_cache_message_rewrite_async_cb, msg);
-}
-
-static void
-web_cache_mesage_got_headers_cb (SoupMessage* msg,
-                                 gchar*       filename)
-{
-    const gchar* nocache;
-    SoupMessageHeaders *hdrs = msg->response_headers;
-    const char* cl;
-
-    /* Skip files downloaded by the user */
-    if (g_object_get_data (G_OBJECT (msg), "midori-web-cache-download"))
-        return;
-
-    /* Skip big files */
-    cl = soup_message_headers_get_one (hdrs, "Content-Length");
-    if (cl && atoi (cl) > MAXLENGTH)
-        return;
-
-    nocache = soup_message_headers_get_one (hdrs, "Pragma");
-    if (!nocache)
-        nocache = soup_message_headers_get_one (hdrs, "Cache-Control");
-    if (nocache && g_regex_match_simple ("no-cache|no-store", nocache,
-                                         G_REGEX_CASELESS, G_REGEX_MATCH_NOTEMPTY))
-    {
-        return;
-    }
-
-    if (msg->status_code == SOUP_STATUS_NOT_MODIFIED)
-    {
-        /* g_debug ("loading from cache: %s", filename); */
-        g_signal_handlers_disconnect_by_func (msg,
-            web_cache_mesage_got_headers_cb, filename);
-        web_cache_message_rewrite (msg, filename);
-    }
-    else if (msg->status_code == SOUP_STATUS_OK)
-    {
-        GFile* file;
-        GOutputStream* ostream;
-
-        /* g_debug ("updating cache: %s", filename); */
-        if (!(file = web_cache_tmp_prepare (filename)))
-            return;
-        if (!web_cache_save_headers (msg, filename))
-            return;
-
-        ostream = (GOutputStream*)g_file_append_to (file,
-            G_FILE_CREATE_PRIVATE | G_FILE_CREATE_REPLACE_DESTINATION, NULL, NULL);
-        g_object_unref (file);
-
-        if (!ostream)
-            return;
-
-        g_object_set_data_full (G_OBJECT (ostream), "filename",
-                                filename, (GDestroyNotify)g_free);
-        g_signal_connect (msg, "got-chunk",
-            G_CALLBACK (web_cache_message_got_chunk_cb), ostream);
-        g_signal_connect (msg, "finished",
-            G_CALLBACK (web_cache_message_finished_cb), ostream);
-    }
-}
-
-static void
-web_cache_session_request_queued_cb (SoupSession*     session,
-                                     SoupMessage*     msg,
-                                     MidoriExtension* extension)
-{
-    SoupURI* soup_uri = soup_message_get_uri (msg);
-    gchar* uri = soup_uri_to_string (soup_uri, FALSE);
-
-    if (midori_uri_is_http (uri) && !g_strcmp0 (msg->method, "GET"))
-    {
-        gchar* filename = web_cache_get_cached_path (extension, uri);
-        GHashTable* cache_headers;
-        gchar* etag;
-        gchar* last_modified;
-
-        cache_headers = web_cache_get_headers (filename);
-        if (cache_headers)
-        {
-            etag = g_hash_table_lookup (cache_headers, "ETag");
-            last_modified = g_hash_table_lookup (cache_headers, "Last-Modified");
-            if (etag)
-                soup_message_headers_replace (msg->request_headers,
-                                             "If-None-Match", etag);
-            if (last_modified)
-                soup_message_headers_replace (msg->request_headers,
-                                              "If-Modified-Since", last_modified);
-            g_hash_table_destroy (cache_headers);
-        }
-        g_object_set_data (G_OBJECT (msg), "session", session);
-        g_signal_connect (msg, "got-headers",
-                G_CALLBACK (web_cache_mesage_got_headers_cb), filename);
-
-    }
-    g_free (uri);
-}
-
-static void
-web_cache_add_download_cb (MidoriBrowser*   browser,
-                           WebKitDownload*  download,
-                           MidoriExtension* extension)
-{
-    WebKitNetworkRequest* request = webkit_download_get_network_request (download);
-    SoupMessage* msg = webkit_network_request_get_message (request);
-    if (msg)
-        g_object_set_data (G_OBJECT (msg), "midori-web-cache-download",
-                           (gpointer)0xdeadbeef);
-}
-
-static void
-web_cache_deactivate_cb (MidoriExtension* extension,
-                         MidoriBrowser*   browser);
-
-static void
-web_cache_app_add_browser_cb (MidoriApp*       app,
-                              MidoriBrowser*   browser,
-                              MidoriExtension* extension)
-{
-    g_signal_connect (browser, "add-download",
-        G_CALLBACK (web_cache_add_download_cb), extension);
-    g_signal_connect (extension, "deactivate",
-        G_CALLBACK (web_cache_deactivate_cb), browser);
-}
-
-static void
-web_cache_deactivate_cb (MidoriExtension* extension,
-                         MidoriBrowser*   browser)
-{
-    MidoriApp* app = midori_extension_get_app (extension);
-    SoupSession* session = webkit_get_default_session ();
-
-    g_signal_handlers_disconnect_by_func (
-        session, web_cache_session_request_queued_cb, extension);
-    g_signal_handlers_disconnect_by_func (
-        extension, web_cache_deactivate_cb, browser);
-    g_signal_handlers_disconnect_by_func (
-        app, web_cache_app_add_browser_cb, extension);
-    g_signal_handlers_disconnect_by_func (
-        browser, web_cache_add_download_cb, extension);
-}
-
-static void
-web_cache_activate_cb (MidoriExtension* extension,
-                       MidoriApp*       app)
-{
-    KatzeArray* browsers;
-    MidoriBrowser* browser;
-    SoupSession* session = webkit_get_default_session ();
-
-    katze_mkdir_with_parents (web_cache_get_cache_dir (), 0700);
-    g_signal_connect (session, "request-queued",
-                      G_CALLBACK (web_cache_session_request_queued_cb), extension);
-
-    browsers = katze_object_get_object (app, "browsers");
-    KATZE_ARRAY_FOREACH_ITEM (browser, browsers)
-        web_cache_app_add_browser_cb (app, browser, extension);
-    g_signal_connect (app, "add-browser",
-        G_CALLBACK (web_cache_app_add_browser_cb), extension);
-
-    g_object_unref (browsers);
-}
-
-static void
-web_cache_clear_cache_cb (void)
-{
-    midori_paths_remove_path (web_cache_get_cache_dir ());
-}
-#endif
-
-MidoriExtension*
-extension_init (void)
-{
-    #if WEBKIT_CHECK_VERSION (1, 3, 11)
-    return NULL;
-    #else
-    MidoriExtension* extension = g_object_new (MIDORI_TYPE_EXTENSION,
-        "name", _("Web Cache"),
-        "description", _("Cache HTTP communication on disk"),
-        "version", "0.1" MIDORI_VERSION_SUFFIX,
-        "authors", "Christian Dywan <[e-mail]>",
-        NULL);
-
-    g_signal_connect (extension, "activate",
-        G_CALLBACK (web_cache_activate_cb), NULL);
-
-    midori_private_data_register_item ("web-cache", _("Web Cache"),
-        G_CALLBACK (web_cache_clear_cache_cb));
-
-    return extension;
-    #endif
-}

=== modified file 'katze/katze-item.c'
--- katze/katze-item.c	2013-05-31 22:00:38 +0000
+++ katze/katze-item.c	2013-06-19 20:32:28 +0000
@@ -458,14 +458,8 @@
 katze_item_image_destroyed_cb (GtkWidget* image,
                                KatzeItem* item);
 #ifndef HAVE_WEBKIT2
-#if WEBKIT_CHECK_VERSION (1, 3, 13)
 static void
-#if WEBKIT_CHECK_VERSION (1, 8, 0)
 katze_item_icon_loaded_cb (WebKitFaviconDatabase* database,
-#elif WEBKIT_CHECK_VERSION (1, 3, 13)
-katze_item_icon_loaded_cb (WebKitIconDatabase*    database,
-                           WebKitWebFrame*        web_frame,
-#endif
                            const gchar*           frame_uri,
                            GtkWidget*             image)
 {
@@ -482,20 +476,14 @@
     }
 }
 #endif
-#endif
 
 static void
 katze_item_image_destroyed_cb (GtkWidget* image,
                                KatzeItem* item)
 {
 #ifndef HAVE_WEBKIT2
-    #if WEBKIT_CHECK_VERSION (1, 8, 0)
     g_signal_handlers_disconnect_by_func (webkit_get_favicon_database (),
         katze_item_icon_loaded_cb, image);
-    #elif WEBKIT_CHECK_VERSION (1, 3, 13)
-    g_signal_handlers_disconnect_by_func (webkit_get_icon_database (),
-        katze_item_icon_loaded_cb, image);
-    #endif
 #endif
     g_object_unref (item);
 }
@@ -532,13 +520,8 @@
     g_signal_connect (image, "destroy",
         G_CALLBACK (katze_item_image_destroyed_cb), item);
 #ifndef HAVE_WEBKIT2
-    #if WEBKIT_CHECK_VERSION (1, 8, 0)
     g_signal_connect (webkit_get_favicon_database (), "icon-loaded",
         G_CALLBACK (katze_item_icon_loaded_cb), image);
-    #elif WEBKIT_CHECK_VERSION (1, 3, 13)
-    g_signal_connect (webkit_get_icon_database (), "icon-loaded",
-        G_CALLBACK (katze_item_icon_loaded_cb), image);
-    #endif
 #endif
     return image;
 }

=== modified file 'katze/katze-net.c'
--- katze/katze-net.c	2013-02-21 19:18:50 +0000
+++ katze/katze-net.c	2013-06-19 20:32:28 +0000
@@ -77,41 +77,6 @@
     g_slice_free (KatzeNetPriv, priv);
 }
 
-#if !WEBKIT_CHECK_VERSION (1, 3, 13)
-gchar*
-katze_net_get_cached_path (KatzeNet*    net,
-                           const gchar* uri,
-                           const gchar* subfolder)
-{
-    gchar* checksum;
-    gchar* extension;
-    gchar* cached_filename;
-    gchar* cached_path;
-
-    if (uri == NULL)
-        return NULL;
-
-    checksum = g_compute_checksum_for_string (G_CHECKSUM_MD5, uri, -1);
-    extension = g_strrstr (uri, ".");
-    cached_filename = g_strdup_printf ("%s%s", checksum,
-                                       extension ? extension : "");
-    g_free (checksum);
-
-    if (subfolder)
-    {
-        gchar* cache_path = g_build_filename (midori_paths_get_cache_dir_for_reading (), subfolder, NULL);
-        katze_mkdir_with_parents (cache_path, 0700);
-        cached_path = g_build_filename (cache_path, cached_filename, NULL);
-        g_free (cache_path);
-    }
-    else
-        cached_path = g_build_filename (midori_paths_get_cache_dir (), cached_filename, NULL);
-
-    g_free (cached_filename);
-    return cached_path;
-}
-#endif
-
 static void
 katze_net_got_body_cb (SoupMessage*  msg,
                        KatzeNetPriv* priv);

=== modified file 'katze/katze-net.h'
--- katze/katze-net.h	2013-02-21 21:36:30 +0000
+++ katze/katze-net.h	2013-06-19 20:32:28 +0000
@@ -71,13 +71,6 @@
                                           KatzeNetTransferCb transfer_cb,
                                           gpointer           user_data);
 
-#if !WEBKIT_CHECK_VERSION (1, 3, 13)
-gchar*
-katze_net_get_cached_path                (KatzeNet*          net,
-                                          const gchar*       uri,
-                                          const gchar*       subfolder);
-#endif
-
 G_END_DECLS
 
 #endif /* __KATZE_NET_H__ */

=== modified file 'katze/midori-paths.vala'
--- katze/midori-paths.vala	2013-05-22 21:56:59 +0000
+++ katze/midori-paths.vala	2013-06-19 20:32:28 +0000
@@ -151,18 +151,14 @@
 #endif
                 tmp_dir = get_runtime_dir ();
             }
-#if HAVE_WEBKIT_1_3_13
             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);
-#elif HAVE_WEBKIT_1_8_0
+#else
                 WebKit.get_favicon_database ().set_path (folder);
-#elif HAVE_WEBKIT_1_3_13
-                WebKit.get_icon_database ().set_path (folder);
 #endif
             }
-#endif
             if (strcmp (Environment.get_variable ("MIDORI_DEBUG"), "paths") == 0) {
                 stdout.printf ("config: %s\ncache: %s\nuser_data: %s\ntmp: %s\n",
                                config_dir, cache_dir, user_data_dir, tmp_dir);
@@ -420,13 +416,10 @@
             assert (user_data_dir != null);
 #if HAVE_WEBKIT2
             WebKit.WebContext.get_default ().get_favicon_database ().clear ();
-#elif HAVE_WEBKIT_1_8_0
+#else
             WebKit.get_favicon_database ().clear ();
-#elif HAVE_WEBKIT_1_3_13
-            WebKit.get_icon_database ().clear ();
 #endif
             /* FIXME: Exclude search engine icons */
-            remove_path (Path.build_filename (cache_dir, "icons"));
             remove_path (Path.build_filename (user_data_dir, "webkit", "icondatabase"));
         }
 
@@ -441,33 +434,11 @@
             /* TODO async
             var database = WebKit.WebContext.get_default ().get_favicon_database ();
             database.get_favicon.begin (uri, null); */
-#elif HAVE_WEBKIT_1_8_0
+#else
             Gdk.Pixbuf? pixbuf = WebKit.get_favicon_database ()
                 .try_get_favicon_pixbuf (uri, icon_width, icon_height);
             if (pixbuf != null)
                 return pixbuf;
-#elif HAVE_WEBKIT_1_3_13
-            Gdk.Pixbuf? pixbuf = WebKit.get_icon_database ().get_icon_pixbuf (uri);
-            if (pixbuf != null)
-                return pixbuf.scale_simple (icon_width, icon_height, Gdk.InterpType.BILINEAR);
-#else
-            if (Midori.URI.is_http (uri)) {
-                try {
-                    uint i = 8;
-                    while (uri[i] != '\0' && uri[i] != '/')
-                        i++;
-                    string icon_uri = (uri[i] == '/')
-                        ? uri.substring (0, i) + "/favicon.ico"
-                        : uri + "/favicon.ico";
-                    string checksum = Checksum.compute_for_string (ChecksumType.MD5, icon_uri, -1);
-                    string filename = checksum + Midori.Download.get_extension_for_uri (icon_uri) ?? "";
-                    string path = Path.build_filename (get_cache_dir_for_reading (), "icons", filename);
-                    Gdk.Pixbuf? pixbuf = new Gdk.Pixbuf.from_file_at_size (path, icon_width, icon_height);
-                    if (pixbuf != null)
-                        return pixbuf;
-                }
-                catch (GLib.Error error) { }
-            }
 #endif
             if (widget != null)
                 return widget.render_icon (Gtk.STOCK_FILE, Gtk.IconSize.MENU, null);

=== modified file 'midori/midori-browser.c'
--- midori/midori-browser.c	2013-06-09 20:00:41 +0000
+++ midori/midori-browser.c	2013-06-19 20:32:28 +0000
@@ -2748,17 +2748,6 @@
                        MidoriBrowser* browser)
 {
     GtkWidget* widget = gtk_window_get_focus (GTK_WINDOW (browser));
-#if !WEBKIT_CHECK_VERSION (1, 4, 3)
-    /* Work around broken clipboard handling for the sake of the user */
-    if (WEBKIT_IS_WEB_VIEW (widget))
-    {
-        GtkWidget* scrolled = gtk_widget_get_parent (widget);
-        GtkWidget* view = gtk_widget_get_parent (scrolled);
-        const gchar* selected = midori_view_get_selected_text (MIDORI_VIEW (view));
-        sokoke_widget_copy_clipboard (widget, selected, NULL, NULL);
-        return;
-    }
-#endif
     if (G_LIKELY (widget) && g_signal_lookup ("copy-clipboard", G_OBJECT_TYPE (widget)))
         g_signal_emit_by_name (widget, "copy-clipboard");
 }
@@ -3797,14 +3786,8 @@
 }
 
 #ifndef HAVE_WEBKIT2
-#if WEBKIT_CHECK_VERSION (1, 3, 13)
 static void
-#if WEBKIT_CHECK_VERSION (1, 8, 0)
 midori_browser_item_icon_loaded_cb (WebKitFaviconDatabase* database,
-#elif WEBKIT_CHECK_VERSION (1, 3, 13)
-midori_browser_item_icon_loaded_cb (WebKitIconDatabase*    database,
-                                    WebKitWebFrame*        web_frame,
-#endif
                                     const gchar*           frame_uri,
                                     KatzeItem*             item)
 {
@@ -3812,30 +3795,19 @@
     if (strcmp (frame_uri, uri))
         return;
 
-    #if WEBKIT_CHECK_VERSION (1, 8, 0)
     gchar* icon_uri = webkit_favicon_database_get_favicon_uri (
         webkit_get_favicon_database (), frame_uri);
-    #elif WEBKIT_CHECK_VERSION (1, 3, 13)
-    gchar* icon_uri = webkit_icon_database_get_icon_uri (
-        webkit_get_icon_database (), frame_uri);
-    #endif
     if (icon_uri != NULL)
     {
         g_free (icon_uri);
         katze_item_set_icon (item, frame_uri);
         /* This signal fires extremely often (WebKit bug?)
            we must throttle it (disconnect) once we have an icon */
-        #if WEBKIT_CHECK_VERSION (1, 8, 0)
         g_signal_handlers_disconnect_by_func (webkit_get_favicon_database (),
             midori_browser_item_icon_loaded_cb, item);
-        #elif WEBKIT_CHECK_VERSION (1, 3, 13)
-        g_signal_handlers_disconnect_by_func (webkit_get_icon_database (),
-            midori_browser_item_icon_loaded_cb, item);
-        #endif
     }
 }
 #endif
-#endif
 
 static void
 midori_browser_queue_item_for_icon (KatzeItem*     item,
@@ -3845,13 +3817,8 @@
     if (katze_item_get_icon (item) != NULL)
         return;
     g_object_set_data_full (G_OBJECT (item), "browser-queue-icon", g_strdup (uri), g_free);
-    #if WEBKIT_CHECK_VERSION (1, 8, 0)
     g_signal_connect (webkit_get_favicon_database (), "icon-loaded",
         G_CALLBACK (midori_browser_item_icon_loaded_cb), item);
-    #elif WEBKIT_CHECK_VERSION (1, 3, 13)
-    g_signal_connect (webkit_get_icon_database (), "icon-loaded",
-        G_CALLBACK (midori_browser_item_icon_loaded_cb), item);
-    #endif
 #endif
 }
 

=== modified file 'midori/midori-frontend.c'
--- midori/midori-frontend.c	2013-05-23 22:15:27 +0000
+++ midori/midori-frontend.c	2013-06-19 20:32:28 +0000
@@ -170,9 +170,7 @@
                   "enable-offline-web-application-cache", FALSE,
     /* Arguably DNS prefetching is or isn't a privacy concern. For the
      * lack of more fine-grained control we'll go the safe route. */
-    #if WEBKIT_CHECK_VERSION (1, 3, 11)
                   "enable-dns-prefetching", FALSE,
-    #endif
                   "strip-referer", TRUE,
                   "show-panel", FALSE,
                   "last-window-state", MIDORI_WINDOW_NORMAL,

=== modified file 'midori/midori-preferences.c'
--- midori/midori-preferences.c	2013-04-04 21:34:29 +0000
+++ midori/midori-preferences.c	2013-06-19 20:32:28 +0000
@@ -21,10 +21,8 @@
 #include <glib/gi18n.h>
 #include <libsoup/soup.h>
 
-#if WEBKIT_CHECK_VERSION (1, 3, 11)
     #define LIBSOUP_USE_UNSTABLE_REQUEST_API
     #include <libsoup/soup-cache.h>
-#endif
 
 #include <config.h>
 #if HAVE_LIBNOTIFY
@@ -381,7 +379,6 @@
     button = katze_property_proxy (settings, "enable-javascript", NULL);
     gtk_button_set_label (GTK_BUTTON (button), _("Enable scripts"));
     INDENTED_ADD (button);
-    #if WEBKIT_CHECK_VERSION (1, 3, 8)
     button = katze_property_proxy (settings, "enable-webgl", NULL);
     gtk_button_set_label (GTK_BUTTON (button), _("Enable WebGL support"));
     #ifndef HAVE_WEBKIT2
@@ -398,11 +395,6 @@
         g_free (supports_web_gl);
     }
     #endif
-    #else
-    button = katze_property_proxy (settings, "enable-plugins", NULL);
-    gtk_button_set_label (GTK_BUTTON (button), _("Enable Netscape plugins"));
-    gtk_widget_set_sensitive (button, midori_web_settings_has_plugin_support ());
-    #endif
     SPANNED_ADD (button);
     button = katze_property_proxy (settings, "zoom-text-and-images", NULL);
     gtk_button_set_label (GTK_BUTTON (button), _("Zoom Text and Images"));
@@ -513,7 +505,6 @@
         G_CALLBACK (midori_preferences_notify_proxy_type_cb), label);
     midori_preferences_notify_proxy_type_cb (settings, NULL, label);
     #endif
-    #if WEBKIT_CHECK_VERSION (1, 3, 11)
 #ifndef HAVE_WEBKIT2
     if (soup_session_get_feature (webkit_get_default_session (), SOUP_TYPE_CACHE))
     {
@@ -528,7 +519,6 @@
         SPANNED_ADD (label);
     }
 #endif
-    #endif
     /* i18n: This refers to an application, not the 'user agent' string */
     label = gtk_label_new (_("Identify as"));
     gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);

=== modified file 'midori/midori-privatedata.c'
--- midori/midori-privatedata.c	2013-05-19 09:33:02 +0000
+++ midori/midori-privatedata.c	2013-06-19 20:32:28 +0000
@@ -22,10 +22,8 @@
 #include <gdk/gdkkeysyms.h>
 #include <sqlite3.h>
 
-#if WEBKIT_CHECK_VERSION (1, 3, 11)
     #define LIBSOUP_USE_UNSTABLE_REQUEST_API
     #include <libsoup/soup-cache.h>
-#endif
 
 static void
 #ifdef HAVE_GRANITE
@@ -273,11 +271,9 @@
     webkit_remove_all_web_databases ();
 
     /* HTML5 offline application caches */
-    #if WEBKIT_CHECK_VERSION (1, 3, 13)
     /* Changing the size implies clearing the cache */
     webkit_application_cache_set_maximum_size (
         webkit_application_cache_get_maximum_size () - 1);
-    #endif
 #endif
 }
 
@@ -299,7 +295,6 @@
     g_free (filename);
 }
 
-#if WEBKIT_CHECK_VERSION (1, 3, 11)
 static void
 midori_clear_web_cache_cb (void)
 {
@@ -315,7 +310,6 @@
     g_free (cache);
 #endif
 }
-#endif
 
 void
 midori_private_data_register_built_ins ()
@@ -325,11 +319,9 @@
         G_CALLBACK (midori_clear_saved_logins_cb));
     midori_private_data_register_item ("web-cookies", _("Cookies and Website data"),
         G_CALLBACK (midori_clear_web_cookies_cb));
-    #if WEBKIT_CHECK_VERSION (1, 3, 11)
     /* TODO: Preserve page icons of search engines and merge privacy items */
     midori_private_data_register_item ("web-cache", _("Web Cache"),
         G_CALLBACK (midori_clear_web_cache_cb));
-    #endif
     midori_private_data_register_item ("page-icons", _("Website icons"),
         G_CALLBACK (midori_paths_clear_icons));
 }

=== modified file 'midori/midori-searchaction.c'
--- midori/midori-searchaction.c	2013-03-26 07:37:23 +0000
+++ midori/midori-searchaction.c	2013-06-19 20:32:28 +0000
@@ -905,7 +905,6 @@
                                           PangoEllipsizeMode ellipsize)
 {
 #ifndef HAVE_WEBKIT2
-    #if WEBKIT_CHECK_VERSION (1, 5, 0)
     WebKitDOMDocument* doc;
     WebKitDOMHTMLFormElement* active_form;
     WebKitDOMHTMLCollection* form_nodes;
@@ -1020,9 +1019,6 @@
     #else
     return NULL;
     #endif
-#else
-    return NULL;
-#endif
 }
 
 void

=== modified file 'midori/midori-session.c'
--- midori/midori-session.c	2013-05-23 22:15:27 +0000
+++ midori/midori-session.c	2013-06-19 20:32:28 +0000
@@ -18,10 +18,8 @@
 
 #include <glib/gi18n-lib.h>
 
-#if WEBKIT_CHECK_VERSION (1, 3, 11)
     #define LIBSOUP_USE_UNSTABLE_REQUEST_API
     #include <libsoup/soup-cache.h>
-#endif
 
 static void
 midori_soup_session_set_proxy_uri (SoupSession* session,
@@ -209,13 +207,6 @@
     g_free (certificate_file);
     #endif
 
-    #if !WEBKIT_CHECK_VERSION (1, 3, 5)
-    /* See http://stevesouders.com/ua/index.php */
-    g_object_set (session, "max-conns", 60,
-                           "max-conns-per-host", 6,
-                           NULL);
-    #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",
@@ -301,14 +292,12 @@
         }
     }
 
-    #if WEBKIT_CHECK_VERSION (1, 3, 11)
     katze_assign (config_file, g_build_filename (midori_paths_get_cache_dir (), "web", NULL));
     feature = SOUP_SESSION_FEATURE (soup_cache_new (config_file, 0));
     soup_session_add_feature (session, feature);
     soup_cache_set_max_size (SOUP_CACHE (feature),
         katze_object_get_int (settings, "maximum-cache-size") * 1024 * 1024);
     soup_cache_load (SOUP_CACHE (feature));
-    #endif
     g_free (config_file);
 #endif
     return FALSE;

=== modified file 'midori/midori-view.c'
--- midori/midori-view.c	2013-06-19 00:20:33 +0000
+++ midori/midori-view.c	2013-06-19 20:32:28 +0000
@@ -56,12 +56,6 @@
     #include <sys/utsname.h>
 #endif
 
-#if !WEBKIT_CHECK_VERSION (1, 4, 3)
-/* This is unstable API, so we need to declare it */
-gchar*
-webkit_web_view_get_selected_text (WebKitWebView* web_view);
-#endif
-
 static void
 midori_view_item_meta_data_changed (KatzeItem*   item,
                                     const gchar* key,
@@ -492,129 +486,6 @@
     g_object_unref (icon);
 }
 
-#if !WEBKIT_CHECK_VERSION (1, 3, 13)
-static GdkPixbuf*
-katze_pixbuf_new_from_buffer (const guchar* buffer,
-                              gsize         length,
-                              const gchar*  mime_type,
-                              GError**      error)
-{
-    /* Proposed for inclusion in GdkPixbuf
-       See http://bugzilla.gnome.org/show_bug.cgi?id=74291 */
-    GdkPixbufLoader* loader;
-    GdkPixbuf* pixbuf;
-
-    g_return_val_if_fail (buffer != NULL, NULL);
-    g_return_val_if_fail (length > 0, NULL);
-
-    if (mime_type)
-    {
-        loader = gdk_pixbuf_loader_new_with_mime_type (mime_type, error);
-        if (!loader)
-            return NULL;
-    }
-    else
-        loader = gdk_pixbuf_loader_new ();
-    if (!gdk_pixbuf_loader_write (loader, buffer, length, error))
-    {
-        g_object_unref (loader);
-        return NULL;
-    }
-    if (!gdk_pixbuf_loader_close (loader, error))
-    {
-        g_object_unref (loader);
-        return NULL;
-    }
-
-    pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
-    g_object_ref (pixbuf);
-    g_object_unref (loader);
-    return pixbuf;
-}
-
-static void
-katze_net_object_maybe_unref (gpointer object)
-{
-    if (object)
-        g_object_unref (object);
-}
-
-static GHashTable*
-midori_view_get_memory (void)
-{
-    static GHashTable* memory = NULL;
-    if (!memory)
-        memory = g_hash_table_new_full (g_str_hash, g_str_equal,
-            g_free, katze_net_object_maybe_unref);
-    return (memory);
-}
-
-static gboolean
-katze_net_icon_status_cb (KatzeNetRequest*  request,
-                          MidoriView*       view)
-{
-    switch (request->status)
-    {
-        case KATZE_NET_VERIFIED:
-            if (request->mime_type && strncmp (request->mime_type, "image/", 6))
-            {
-                return FALSE;
-            }
-            break;
-        case KATZE_NET_MOVED:
-            break;
-        default:
-            return FALSE;
-    }
-    return TRUE;
-}
-
-static void
-katze_net_icon_transfer_cb (KatzeNetRequest*  request,
-                            MidoriView*       view)
-{
-    GdkPixbuf* pixbuf;
-    FILE* fp;
-    GdkPixbuf* pixbuf_scaled;
-    gint icon_width, icon_height;
-    size_t ret;
-    GtkSettings* settings;
-
-    if (request->status == KATZE_NET_MOVED)
-        return;
-
-    pixbuf = NULL;
-    if (request->data)
-    {
-        gchar* icon_file = katze_net_get_cached_path (NULL, view->icon_uri, "icons");
-        if (icon_file && (fp = fopen (icon_file, "wb")))
-        {
-            ret = fwrite (request->data, 1, request->length, fp);
-            fclose (fp);
-            if ((ret - request->length != 0))
-                g_warning ("Error writing to file %s in %s", icon_file, G_STRFUNC);
-        }
-        g_free (icon_file);
-
-        pixbuf = katze_pixbuf_new_from_buffer ((guchar*)request->data,
-                            request->length, request->mime_type, NULL);
-
-    }
-
-    if (!pixbuf)
-    {
-        midori_view_unset_icon (view);
-        return;
-    }
-
-    g_hash_table_insert (midori_view_get_memory (), g_strdup (view->icon_uri), pixbuf);
-    settings = gtk_widget_get_settings (view->web_view);
-    gtk_icon_size_lookup_for_settings (settings, GTK_ICON_SIZE_MENU, &icon_width, &icon_height);
-    pixbuf_scaled = gdk_pixbuf_scale_simple (pixbuf, icon_width, icon_height, GDK_INTERP_BILINEAR);
-    midori_view_apply_icon (view, pixbuf_scaled, view->icon_uri);
-}
-#endif
-
 static void
 _midori_web_view_load_icon (MidoriView* view)
 {
@@ -634,74 +505,10 @@
         g_object_unref (pixbuf);
         midori_view_apply_icon (view, pixbuf_scaled, view->icon_uri);
     }
-    #elif WEBKIT_CHECK_VERSION (1, 8, 0)
+    #else
     if ((pixbuf = webkit_web_view_try_get_favicon_pixbuf (
         WEBKIT_WEB_VIEW (view->web_view), icon_width, icon_height)))
         midori_view_apply_icon (view, pixbuf, view->icon_uri);
-    #elif WEBKIT_CHECK_VERSION (1, 3, 13)
-    if ((pixbuf = webkit_web_view_get_icon_pixbuf (
-        WEBKIT_WEB_VIEW (view->web_view))))
-    {
-        GdkPixbuf* pixbuf_scaled = gdk_pixbuf_scale_simple (pixbuf,
-            icon_width, icon_height, GDK_INTERP_BILINEAR);
-        g_object_unref (pixbuf);
-        midori_view_apply_icon (view, pixbuf_scaled, view->icon_uri);
-    }
-    #else
-    GdkPixbuf* pixbuf_scaled;
-    const gchar* uri = midori_tab_get_uri (MIDORI_TAB (view));
-
-    if (!midori_uri_is_http (view->icon_uri))
-        katze_assign (view->icon_uri, NULL);
-
-    if (midori_uri_is_http (uri) || g_str_has_prefix (uri, "file://"))
-    {
-        gchar* icon_file = NULL;
-        if (!view->icon_uri)
-        {
-            guint i = 8;
-            while (uri[i] != '\0' && uri[i] != '/')
-                i++;
-            if (uri[i] == '/')
-            {
-                gchar* path = g_strndup (uri, i);
-                view->icon_uri = g_strdup_printf ("%s/favicon.ico", path);
-                g_free (path);
-            }
-            else
-                view->icon_uri = g_strdup_printf ("%s/favicon.ico", uri);
-        }
-
-        if (g_hash_table_lookup_extended (midori_view_get_memory (),
-                                          view->icon_uri, NULL, (gpointer)&pixbuf))
-        {
-            g_warn_if_fail (pixbuf != NULL);
-            g_object_ref (pixbuf);
-        }
-        else if ((icon_file = katze_net_get_cached_path (NULL, view->icon_uri, "icons")) &&
-                 (pixbuf = gdk_pixbuf_new_from_file (icon_file, NULL)))
-        {
-            g_hash_table_insert (midori_view_get_memory (),
-                g_strdup (view->icon_uri), g_object_ref (pixbuf));
-        }
-        else if (!midori_tab_get_special (MIDORI_TAB (view)))
-        {
-            katze_net_load_uri (NULL, view->icon_uri,
-                (KatzeNetStatusCb)katze_net_icon_status_cb,
-                (KatzeNetTransferCb)katze_net_icon_transfer_cb, view);
-        }
-
-        g_free (icon_file);
-    }
-
-    if (pixbuf)
-    {
-        pixbuf_scaled = gdk_pixbuf_scale_simple (pixbuf,
-            icon_width,  icon_height, GDK_INTERP_BILINEAR);
-        g_object_unref (pixbuf);
-        pixbuf = pixbuf_scaled;
-        midori_view_apply_icon (view, pixbuf, view->icon_uri);
-    }
     #endif
 }
 
@@ -1347,7 +1154,6 @@
     }
 }
 
-#if WEBKIT_CHECK_VERSION (1, 1, 23)
 static void
 midori_view_location_response_cb (GtkWidget*                       infobar,
                                   gint                             response,
@@ -1378,7 +1184,6 @@
     return TRUE;
 }
 #endif
-#endif
 
 void
 midori_view_set_html (MidoriView*     view,
@@ -1549,9 +1354,6 @@
         "f.push ('$' + l[i].href + '|' + l[i].title);"
         "else if (r == 'search' && t == 'application/opensearchdescription+xml') "
         "f.push (':' + l[i].href + '|' + l[i].title); "
-        #if !WEBKIT_CHECK_VERSION (1, 1, 18)
-        "else if (r && r.indexOf ('icon') != -1) f.push (l[i].href); "
-        #endif
         "} if (document.location.href.indexOf ('twitter') != -1)"
         "{ var s = document.location.href.split('/'); "
         "var u = 'https://api.twitter.com/1/statuses/user_timeline.rss"
@@ -1613,10 +1415,6 @@
                     G_CALLBACK (midori_view_open_search_response_cb), view,
                     _("_Save Search engine"), GTK_RESPONSE_ACCEPT, NULL); */
             }
-            #if !WEBKIT_CHECK_VERSION (1, 1, 18)
-            else
-                katze_assign (view->icon_uri, g_strdup (uri_and_title));
-            #endif
 
             news_feeds_continue:
             current_item++;
@@ -1625,10 +1423,6 @@
 
         g_object_set_data_full (G_OBJECT (view), "news-feeds", default_uri, g_free);
         g_free (value);
-
-        #if !WEBKIT_CHECK_VERSION (1, 4, 3)
-        _midori_web_view_load_icon (view);
-        #endif
     }
     #endif
 
@@ -1708,8 +1502,6 @@
 }
 #endif
 
-
-#if WEBKIT_CHECK_VERSION (1, 1, 18)
 static void
 midori_web_view_notify_icon_uri_cb (WebKitWebView* web_view,
                                     GParamSpec*    pspec,
@@ -1726,7 +1518,6 @@
     katze_assign (view->icon_uri, icon_uri);
     _midori_web_view_load_icon (view);
 }
-#endif
 
 static void
 webkit_web_view_notify_uri_cb (WebKitWebView* web_view,
@@ -1783,10 +1574,6 @@
     const gchar* link_uri = webkit_hit_test_result_get_link_uri (hit_test_result);
     #endif
 
-    #if !(WEBKIT_CHECK_VERSION (1, 3, 1) && defined (HAVE_LIBSOUP_2_29_91))
-    sokoke_prefetch_uri (view->settings, link_uri, NULL, NULL);
-    #endif
-
     katze_assign (view->link_uri, g_strdup (link_uri));
     if (link_uri && g_str_has_prefix (link_uri, "mailto:"))
     {
@@ -2511,7 +2298,6 @@
 #endif
 }
 
-#if WEBKIT_CHECK_VERSION (1, 5, 0)
 static void
 midori_view_menu_add_search_engine_cb (GtkWidget*  widget,
                                        MidoriView* view)
@@ -2522,7 +2308,6 @@
     KatzeItem* item = g_object_get_data (G_OBJECT (widget), "item");
     midori_search_action_get_editor (MIDORI_SEARCH_ACTION (action), item, TRUE);
 }
-#endif
 
 static GtkWidget*
 midori_view_insert_menu_item (GtkMenuShell* menu,
@@ -2637,7 +2422,6 @@
             webkit_web_view_can_undo (web_view));
         gtk_menu_shell_prepend (menu_shell, menuitem);
 
-        #if WEBKIT_CHECK_VERSION (1, 5, 0)
         {
             KatzeItem* item = midori_search_action_get_engine_for_form (
                 WEBKIT_WEB_VIEW (view->web_view), view->ellipsize);
@@ -2650,7 +2434,6 @@
                 gtk_widget_show (menuitem);
             }
         }
-        #endif
 
         if (manual)
         {
@@ -3923,14 +3706,10 @@
                       midori_view_web_view_resource_request_cb, view,
                       "signal::database-quota-exceeded",
                       midori_view_web_view_database_quota_exceeded_cb, view,
-                      #if WEBKIT_CHECK_VERSION (1, 1, 23)
                       "signal::geolocation-policy-decision-requested",
                       midori_view_web_view_geolocation_decision_cb, view,
-                      #endif
-                      #if WEBKIT_CHECK_VERSION (1, 1, 18)
                       "signal::notify::icon-uri",
                       midori_web_view_notify_icon_uri_cb, view,
-                      #endif
                       "signal::hovering-over-link",
                       webkit_web_view_hovering_over_link_cb, view,
                       "signal::status-bar-text-changed",
@@ -4119,7 +3898,7 @@
                     webkit_plugin_get_name (plugins->data),
                     html ? webkit_plugin_get_description (plugins->data) : ""));
         }
-    #elif WEBKIT_CHECK_VERSION (1, 3, 8)
+    #else
     WebKitWebPluginDatabase* pdb = webkit_get_web_plugin_database ();
     GSList* plugins = webkit_web_plugin_database_get_plugins (pdb);
     GSList* plugin = plugins;
@@ -4132,36 +3911,6 @@
             html ? webkit_web_plugin_get_description (plugin->data) : ""));
     }
     webkit_web_plugin_database_plugins_list_free (plugins);
-    #else
-    if (view == NULL)
-        return;
-
-    WebKitWebFrame* web_frame = webkit_web_view_get_main_frame (WEBKIT_WEB_VIEW (view->web_view));
-    JSContextRef js_context = webkit_web_frame_get_global_context (web_frame);
-    /* Joins available plugins like this: URI1|title1,URI2|title2 */
-    gchar* value = sokoke_js_script_eval (js_context,
-        "function plugins (l) { var f = new Array (); for (var i in l) "
-        "{ var p = l[i].name + '|' + l[i].filename; "
-        "if (f.indexOf (p) == -1) f.push (p); } return f; }"
-        "plugins (navigator.plugins)", NULL);
-    gchar** items = g_strsplit (value, ",", 0);
-    guint i = 0;
-    if (items != NULL)
-        while (items[i] != NULL)
-        {
-            gchar** parts = g_strsplit (items[i], "|", 2);
-            if (parts[0] && !g_str_equal (parts[1], "undefined")
-             && !midori_web_settings_skip_plugin (parts[1]))
-                midori_view_add_version (ns_plugins, html, g_strdup_printf ("%s\t%s",
-                    parts[1], html ? parts[0] : ""));
-            g_strfreev (parts);
-            i++;
-        }
-        if (g_str_has_prefix (value, "undefined"))
-            midori_view_add_version (ns_plugins, html, g_strdup_printf ("%s",
-                "No plugins found"));
-        g_strfreev (items);
-        g_free (value);
     #endif
 }
 
@@ -4700,17 +4449,14 @@
 midori_view_has_selection (MidoriView* view)
 {
 #ifndef HAVE_WEBKIT2
-#if WEBKIT_CHECK_VERSION (1, 4, 3)
     WebKitDOMDocument* doc;
     WebKitDOMDOMWindow* window;
     WebKitDOMDOMSelection* selection;
     WebKitDOMRange* range;
-#endif
 
     g_return_val_if_fail (MIDORI_IS_VIEW (view), FALSE);
 
 
-#if WEBKIT_CHECK_VERSION (1, 4, 3)
     doc = webkit_web_view_get_dom_document (WEBKIT_WEB_VIEW (view->web_view));
     window = webkit_dom_document_get_default_view (doc);
     selection = webkit_dom_dom_window_get_selection (window);
@@ -4723,10 +4469,6 @@
         return FALSE;
 
     katze_assign (view->selected_text, webkit_dom_range_get_text (range));
-#else
-    katze_assign (view->selected_text, webkit_web_view_get_selected_text (
-        WEBKIT_WEB_VIEW (view->web_view)));
-#endif
 
     if (view->selected_text && *view->selected_text)
         return TRUE;

=== modified file 'midori/midori-websettings.c'
--- midori/midori-websettings.c	2013-05-19 09:33:02 +0000
+++ midori/midori-websettings.c	2013-06-19 20:32:28 +0000
@@ -60,9 +60,6 @@
     gint clear_private_data;
     gchar* clear_data;
     gchar* site_data_rules;
-    #if !WEBKIT_CHECK_VERSION (1, 3, 13)
-    gboolean enable_dns_prefetching;
-    #endif
     gboolean enforce_font_family;
     gchar* user_stylesheet_uri;
     gchar* user_stylesheet_uri_cached;
@@ -376,7 +373,6 @@
                                      TRUE,
                                      flags));
 
-    #if WEBKIT_CHECK_VERSION (1, 1, 18)
     g_object_class_install_property (gobject_class,
                                      PROP_ENABLE_PAGE_CACHE,
                                      g_param_spec_boolean ("enable-page-cache",
@@ -384,7 +380,7 @@
                                                            "Whether the page cache should be used",
         !midori_web_settings_low_memory_profile (),
                                                            flags));
-    #endif
+
     if (g_object_class_find_property (gobject_class, "enable-fullscreen"))
     g_object_class_install_property (gobject_class,
                                      PROP_ENABLE_FULLSCREEN,
@@ -478,23 +474,6 @@
         "Cookies, HTML5 databases, local storage and application cache blocking",
                                      NULL,
                                      flags));
-    #if !WEBKIT_CHECK_VERSION (1, 3, 13)
-    /**
-     * MidoriWebSettings:enable-dns-prefetching:
-     *
-     * Whether to resolve host names in advance.
-     *
-     * Since: 0.3.4
-     */
-    g_object_class_install_property (gobject_class,
-                                     PROP_ENABLE_DNS_PREFETCHING,
-                                     g_param_spec_boolean (
-                                     "enable-dns-prefetching",
-        "Whether to resolve host names in advance",
-        "Whether host names on a website or in bookmarks should be prefetched",
-                                     TRUE,
-                                     flags));
-    #endif
 
     /**
      * MidoriWebSettings:enforc-font-family:
@@ -567,13 +546,7 @@
     web_settings->user_stylesheet_uri = web_settings->user_stylesheet_uri_cached = NULL;
     web_settings->user_stylesheets = NULL;
 
-    #if WEBKIT_CHECK_VERSION (1, 2, 6) && !WEBKIT_CHECK_VERSION (1, 2, 8)
-    /* Shadows are very slow with WebKitGTK+ 1.2.7 */
-    midori_web_settings_add_style (web_settings, "box-shadow-workaround",
-        "* { -webkit-box-shadow: none !important; }");
-    #endif
-
-    #if defined (_WIN32) && WEBKIT_CHECK_VERSION (1, 7, 1) && !GTK_CHECK_VERSION (3, 0, 0)
+    #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 }"
@@ -617,11 +590,7 @@
 gboolean
 midori_web_settings_has_plugin_support (void)
 {
-    #if !WEBKIT_CHECK_VERSION (1, 8, 2) && defined G_OS_WIN32
-    return FALSE;
-    #else
     return !midori_debug ("unarmed")  && g_strcmp0 (g_getenv ("MOZ_PLUGIN_PATH"), "/");
-    #endif
 }
 
 /**
@@ -798,10 +767,8 @@
     const int webcore_minor = 32;
     #endif
 
-    #if WEBKIT_CHECK_VERSION (1, 1, 18)
     g_object_set (web_settings, "enable-site-specific-quirks",
         identify_as != MIDORI_IDENT_GENUINE, NULL);
-    #endif
 
     switch (identify_as)
     {
@@ -1013,17 +980,15 @@
            WEB_SETTINGS_STRING ("enable-plugins"), g_value_get_boolean (value),
         #if HAVE_WEBKIT2
             "enable-java", g_value_get_boolean (value),
-        #elif WEBKIT_CHECK_VERSION (1, 1, 22)
+        #else
             "enable-java-applet", g_value_get_boolean (value),
         #endif
             NULL);
         break;
-    #if WEBKIT_CHECK_VERSION (1, 1, 18)
     case PROP_ENABLE_PAGE_CACHE:
         g_object_set (web_settings, WEB_SETTINGS_STRING ("enable-page-cache"),
                       g_value_get_boolean (value), NULL);
         break;
-    #endif
 
     case PROP_PROXY_TYPE:
         web_settings->proxy_type = g_value_get_enum (value);
@@ -1067,11 +1032,6 @@
     case PROP_SITE_DATA_RULES:
         katze_assign (web_settings->site_data_rules, g_value_dup_string (value));
         break;
-    #if !WEBKIT_CHECK_VERSION (1, 3, 13)
-    case PROP_ENABLE_DNS_PREFETCHING:
-        web_settings->enable_dns_prefetching = g_value_get_boolean (value);
-        break;
-    #endif
     case PROP_ENFORCE_FONT_FAMILY:
         if ((web_settings->enforce_font_family = g_value_get_boolean (value)))
         {
@@ -1189,12 +1149,10 @@
         g_value_set_boolean (value, katze_object_get_boolean (web_settings,
                              WEB_SETTINGS_STRING ("enable-plugins")));
         break;
-    #if WEBKIT_CHECK_VERSION (1, 1, 18)
     case PROP_ENABLE_PAGE_CACHE:
         g_value_set_boolean (value, katze_object_get_boolean (web_settings,
                              WEB_SETTINGS_STRING ("enable-page-cache")));
         break;
-    #endif
 
     case PROP_PROXY_TYPE:
         g_value_set_enum (value, web_settings->proxy_type);
@@ -1219,11 +1177,6 @@
     case PROP_SITE_DATA_RULES:
         g_value_set_string (value, web_settings->site_data_rules);
         break;
-    #if !WEBKIT_CHECK_VERSION (1, 3, 13)
-    case PROP_ENABLE_DNS_PREFETCHING:
-        g_value_set_boolean (value, web_settings->enable_dns_prefetching);
-        break;
-    #endif
     case PROP_ENFORCE_FONT_FAMILY:
         g_value_set_boolean (value, web_settings->enforce_font_family);
         break;

=== modified file 'wscript'
--- wscript	2013-06-03 19:37:36 +0000
+++ wscript	2013-06-19 20:32:28 +0000
@@ -253,22 +253,20 @@
             conf.define ('HAVE_WEBKIT2', 1)
             conf.env.append_value ('VALAFLAGS', '-D HAVE_WEBKIT2')
         else:
-            check_pkg ('webkitgtk-3.0', '1.1.17', var='WEBKIT', mandatory=False)
+            check_pkg ('webkitgtk-3.0', '1.8.3', var='WEBKIT', mandatory=False)
         if not conf.env['HAVE_GTK'] or not conf.env['HAVE_WEBKIT']:
             Utils.pprint ('RED', 'GTK+3 was not found.\n' \
                 'Pass --disable-gtk3 to build without GTK+3.')
             sys.exit (1)
-        if check_version (conf.env['WEBKIT_VERSION'], 1, 5, 1):
-            check_pkg ('javascriptcoregtk-3.0', '1.5.1', args=args)
+        check_pkg ('javascriptcoregtk-3.0', '1.8.3', args=args)
         conf.env.append_value ('VALAFLAGS', '-D HAVE_GTK3')
         conf.env.append_value ('VALAFLAGS', '-D HAVE_OFFSCREEN')
         conf.env.append_value ('VALAFLAGS', '-D HAVE_DOM')
     else:
         check_pkg ('gtk+-2.0', '2.16.0', var='GTK')
-        check_pkg ('webkit-1.0', '1.1.17', args=args)
+        check_pkg ('webkit-1.0', '1.8.3', args=args)
         conf.define ('GCR_VERSION', 'No')
-        if check_version (conf.env['WEBKIT_VERSION'], 1, 5, 1):
-            check_pkg ('javascriptcoregtk-1.0', '1.5.1', args=args)
+        check_pkg ('javascriptcoregtk-1.0', '1.8.3', args=args)
         if check_version (conf.env['GTK_VERSION'], 2, 20, 0):
             conf.env.append_value ('VALAFLAGS', '-D HAVE_OFFSCREEN')
     conf.env['HAVE_GTK3'] = have_gtk3