Merge lp:~kalikiana/midori/cookieswk2 into lp:midori

[Cris Dywan]

WebKit2 cookie support

[lp:~kalikiana/midori/cookieswk2]

6267. By Cris Dywan on 2013-07-29

Move gchar* cache and disable cookie/ session callbacks

6268. By Cris Dywan on 2013-07-29

Unblock cookie manager from WebKit2 build

[Cris Dywan (kalikiana)]

As the question come up in IRC: the cookie manager does show cookies. It won't yet update in real-time. I haven't made up my mind what the best approach is since the WebKit2 API has a "changed" signal but doesn't say what happens…

[André Stösel (ivaldi)]

Looks good!

review: Approve

=== modified file 'extensions/cookie-manager/cookie-manager.c'
--- extensions/cookie-manager/cookie-manager.c	2013-02-21 21:36:30 +0000
+++ extensions/cookie-manager/cookie-manager.c	2013-07-29 21:07:25 +0000
@@ -12,6 +12,7 @@
 #include "config.h"
 #include <midori/midori.h>
 #include "katze/katze.h"
+#include <libsoup/soup-cookie-jar-sqlite.h>
 
 #include "cookie-manager.h"
 #include "cookie-manager-page.h"
@@ -259,6 +260,7 @@
 
 	g_object_unref(priv->store);
 	g_free(priv->filter_text);
+	g_object_unref(priv->jar);
 
 	G_OBJECT_CLASS(cookie_manager_parent_class)->finalize(object);
 }
@@ -267,7 +269,6 @@
 static void cookie_manager_init(CookieManager *self)
 {
 	CookieManagerPrivate *priv;
-	SoupSession *session;
 
 	self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
 	    COOKIE_MANAGER_TYPE, CookieManagerPrivate);
@@ -279,8 +280,15 @@
 		COOKIE_MANAGER_COL_NAME, GTK_SORT_ASCENDING);
 
 	/* setup soup */
-	session = webkit_get_default_session();
+#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/wscript_build'
--- extensions/wscript_build	2013-06-03 19:37:36 +0000
+++ extensions/wscript_build	2013-07-29 21:07:25 +0000
@@ -32,7 +32,7 @@
         source = extension
 
     # FIXME
-    if bld.env['HAVE_WEBKIT2'] and target in ['external-download-manager', 'nsplugin-manager', 'formhistory', 'adblock', 'cookie-permissions', 'addons', 'cookie-manager']:
+    if bld.env['HAVE_WEBKIT2'] and target in ['external-download-manager', 'nsplugin-manager', 'formhistory', 'adblock', 'cookie-permissions', 'addons']:
         continue
 
     obj = bld.new_task_gen ('cc', 'shlib')

=== removed file 'katze/katze-http-cookies-sqlite.c'
--- katze/katze-http-cookies-sqlite.c	2012-07-19 19:14:09 +0000
+++ katze/katze-http-cookies-sqlite.c	1970-01-01 00:00:00 +0000
@@ -1,292 +0,0 @@
-/*
- Copyright (C) 2008-2010 Christian Dywan <[e-mail]>
- Copyright (C) 2011 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.
-*/
-
-#if HAVE_CONFIG_H
-    #include <config.h>
-#endif
-
-#include "katze-http-cookies-sqlite.h"
-
-#include <stdlib.h>
-#ifdef HAVE_UNISTD_H
-    #include <unistd.h>
-#endif
-#include <glib/gi18n.h>
-#include <libsoup/soup.h>
-#include <gtk/gtk.h>
-#include <glib/gstdio.h>
-#include <sqlite3.h>
-
-#define QUERY_ALL "SELECT id, name, value, host, path, expiry, lastAccessed, isSecure, isHttpOnly FROM moz_cookies;"
-#define CREATE_TABLE "CREATE TABLE IF NOT EXISTS moz_cookies (id INTEGER PRIMARY KEY, name TEXT, value TEXT, host TEXT, path TEXT,expiry INTEGER, lastAccessed INTEGER, isSecure INTEGER, isHttpOnly INTEGER)"
-#define QUERY_INSERT "INSERT INTO moz_cookies VALUES(NULL, %Q, %Q, %Q, %Q, %d, NULL, %d, %d);"
-#define QUERY_DELETE "DELETE FROM moz_cookies WHERE name=%Q AND host=%Q;"
-
-enum {
-    COL_ID,
-    COL_NAME,
-    COL_VALUE,
-    COL_HOST,
-    COL_PATH,
-    COL_EXPIRY,
-    COL_LAST_ACCESS,
-    COL_SECURE,
-    COL_HTTP_ONLY,
-    N_COL,
-};
-
-struct _KatzeHttpCookiesSqlite
-{
-    GObject parent_instance;
-    gchar* filename;
-    SoupCookieJar* jar;
-    sqlite3 *db;
-    guint counter;
-};
-
-struct _KatzeHttpCookiesSqliteClass
-{
-    GObjectClass parent_class;
-};
-
-static void
-katze_http_cookies_sqlite_session_feature_iface_init (SoupSessionFeatureInterface *iface,
-                                                      gpointer                     data);
-
-G_DEFINE_TYPE_WITH_CODE (KatzeHttpCookiesSqlite, katze_http_cookies_sqlite, G_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (SOUP_TYPE_SESSION_FEATURE,
-                         katze_http_cookies_sqlite_session_feature_iface_init));
-
-/* Cookie jar saving into sqlite database
-   Copyright (C) 2008 Diego Escalante Urrelo
-   Copyright (C) 2009 Collabora Ltd.
-   Mostly copied from libSoup 2.30, coding style retained */
-
-/* Follows sqlite3 convention; returns TRUE on error */
-static gboolean
-katze_http_cookies_sqlite_open_db (KatzeHttpCookiesSqlite* http_cookies)
-{
-    char *error = NULL;
-
-   if (sqlite3_open (http_cookies->filename, &http_cookies->db)) {
-        sqlite3_close (http_cookies->db);
-        g_warning ("Can't open %s", http_cookies->filename);
-        return TRUE;
-    }
-
-    if (sqlite3_exec (http_cookies->db, CREATE_TABLE, NULL, NULL, &error)) {
-        g_warning ("Failed to execute query: %s", error);
-        sqlite3_free (error);
-    }
-
-    if (sqlite3_exec (http_cookies->db, "PRAGMA secure_delete = 1;",
-        NULL, NULL, &error)) {
-        g_warning ("Failed to execute query: %s", error);
-        sqlite3_free (error);
-    }
-
-    sqlite3_exec (http_cookies->db,
-        /* Arguably cookies are like a cache, so performance over integrity */
-        "PRAGMA synchronous = OFF; PRAGMA temp_store = MEMORY;"
-        "PRAGMA count_changes = OFF; PRAGMA journal_mode = TRUNCATE;",
-        NULL, NULL, &error);
-
-    return FALSE;
-}
-
-static void
-katze_http_cookies_sqlite_load (KatzeHttpCookiesSqlite* http_cookies)
-{
-    const char *name, *value, *host, *path;
-    sqlite3_stmt* stmt;
-    SoupCookie *cookie = NULL;
-    gint64 expire_time;
-    time_t now;
-    int max_age;
-    gboolean http_only = FALSE, secure = FALSE;
-    char *query;
-    int result;
-
-    if (http_cookies->db == NULL) {
-        if (katze_http_cookies_sqlite_open_db (http_cookies))
-            return;
-    }
-
-    sqlite3_prepare_v2 (http_cookies->db, QUERY_ALL, strlen (QUERY_ALL) + 1, &stmt, NULL);
-    result = sqlite3_step (stmt);
-    if (result != SQLITE_ROW)
-    {
-        if (result == SQLITE_ERROR)
-            g_print (_("Failed to load cookies\n"));
-        sqlite3_reset (stmt);
-        return;
-    }
-
-    while (result == SQLITE_ROW)
-    {
-        now = time (NULL);
-        name = (const char*)sqlite3_column_text (stmt, COL_NAME);
-        value = (const char*)sqlite3_column_text (stmt, COL_VALUE);
-        host = (const char*)sqlite3_column_text (stmt, COL_HOST);
-        path = (const char*)sqlite3_column_text (stmt, COL_PATH);
-        expire_time = sqlite3_column_int64 (stmt,COL_EXPIRY);
-        secure = sqlite3_column_int (stmt, COL_SECURE);
-        http_only = sqlite3_column_int (stmt, COL_HTTP_ONLY);
-
-        if (now >= expire_time)
-        {
-            /* Cookie expired, remove it from database */
-            query = sqlite3_mprintf (QUERY_DELETE, name, host);
-            sqlite3_exec (http_cookies->db, QUERY_DELETE, NULL, NULL, NULL);
-            sqlite3_free (query);
-            result = sqlite3_step (stmt);
-            continue;
-        }
-        max_age = (expire_time - now <= G_MAXINT ? expire_time - now : G_MAXINT);
-        cookie = soup_cookie_new (name, value, host, path, max_age);
-
-        if (secure)
-            soup_cookie_set_secure (cookie, TRUE);
-        if (http_only)
-            soup_cookie_set_http_only (cookie, TRUE);
-
-        soup_cookie_jar_add_cookie (http_cookies->jar, cookie);
-        result = sqlite3_step (stmt);
-    }
-
-    if (stmt)
-    {
-        sqlite3_reset (stmt);
-        sqlite3_clear_bindings (stmt);
-    }
-}
-static void
-katze_http_cookies_sqlite_jar_changed_cb (SoupCookieJar*    jar,
-                                          SoupCookie*       old_cookie,
-                                          SoupCookie*       new_cookie,
-                                          KatzeHttpCookiesSqlite* http_cookies)
-{
-    GObject* settings;
-    char *query;
-    time_t expires = 0; /* Avoid warning */
-
-    if (http_cookies->db == NULL) {
-        if (katze_http_cookies_sqlite_open_db (http_cookies))
-            return;
-    }
-
-    if (new_cookie && new_cookie->expires)
-    {
-        gint age;
-
-        expires = soup_date_to_time_t (new_cookie->expires);
-        settings = g_object_get_data (G_OBJECT (jar), "midori-settings");
-        age = katze_object_get_int (settings, "maximum-cookie-age");
-        if (age > 0)
-        {
-            SoupDate* max_date = soup_date_new_from_now (
-                   age * SOUP_COOKIE_MAX_AGE_ONE_DAY);
-            if (soup_date_to_time_t (new_cookie->expires)
-                > soup_date_to_time_t (max_date))
-                   soup_cookie_set_expires (new_cookie, max_date);
-        }
-        else
-        {
-            /* An age of 0 to SoupCookie means already-expired
-            A user choosing 0 days probably expects 1 hour. */
-            soup_cookie_set_max_age (new_cookie, SOUP_COOKIE_MAX_AGE_ONE_HOUR);
-        }
-    }
-
-    if (!g_strcmp0 (g_getenv ("MIDORI_DEBUG"), "cookies"))
-        http_cookies->counter++;
-
-    if (old_cookie) {
-        query = sqlite3_mprintf (QUERY_DELETE,
-                     old_cookie->name,
-                     old_cookie->domain);
-        sqlite3_exec (http_cookies->db, query, NULL, NULL, NULL);
-        sqlite3_free (query);
-    }
-
-    if (new_cookie && new_cookie->expires) {
-
-        query = sqlite3_mprintf (QUERY_INSERT,
-                     new_cookie->name,
-                     new_cookie->value,
-                     new_cookie->domain,
-                     new_cookie->path,
-                     expires,
-                     new_cookie->secure,
-                     new_cookie->http_only);
-        sqlite3_exec (http_cookies->db, query, NULL, NULL, NULL);
-        sqlite3_free (query);
-    }
-}
-
-static void
-katze_http_cookies_sqlite_attach (SoupSessionFeature* feature,
-                                  SoupSession*        session)
-{
-    KatzeHttpCookiesSqlite* http_cookies = (KatzeHttpCookiesSqlite*)feature;
-    const gchar* filename = g_object_get_data (G_OBJECT (feature), "filename");
-    SoupSessionFeature* jar = soup_session_get_feature (session, SOUP_TYPE_COOKIE_JAR);
-    g_return_if_fail (jar != NULL);
-    g_return_if_fail (filename != NULL);
-    katze_assign (http_cookies->filename, g_strdup (filename));
-    http_cookies->jar = g_object_ref (jar);
-    katze_http_cookies_sqlite_open_db (http_cookies);
-    katze_http_cookies_sqlite_load (http_cookies);
-    g_signal_connect (jar, "changed",
-        G_CALLBACK (katze_http_cookies_sqlite_jar_changed_cb), feature);
-
-}
-
-static void
-katze_http_cookies_sqlite_detach (SoupSessionFeature* feature,
-                                  SoupSession*        session)
-{
-    KatzeHttpCookiesSqlite* http_cookies = (KatzeHttpCookiesSqlite*)feature;
-    katze_assign (http_cookies->filename, NULL);
-    katze_object_assign (http_cookies->jar, NULL);
-    sqlite3_close (http_cookies->db);
-}
-
-static void
-katze_http_cookies_sqlite_session_feature_iface_init (SoupSessionFeatureInterface *iface,
-                                                      gpointer                     data)
-{
-    iface->attach = katze_http_cookies_sqlite_attach;
-    iface->detach = katze_http_cookies_sqlite_detach;
-}
-
-static void
-katze_http_cookies_sqlite_finalize (GObject* object)
-{
-    katze_http_cookies_sqlite_detach ((SoupSessionFeature*)object, NULL);
-}
-
-static void
-katze_http_cookies_sqlite_class_init (KatzeHttpCookiesSqliteClass* class)
-{
-    GObjectClass* gobject_class = (GObjectClass*)class;
-    gobject_class->finalize = katze_http_cookies_sqlite_finalize;
-}
-
-static void
-katze_http_cookies_sqlite_init (KatzeHttpCookiesSqlite* http_cookies)
-{
-    http_cookies->filename = NULL;
-    http_cookies->jar = NULL;
-    http_cookies->db = NULL;
-    http_cookies->counter = 0;
-}

=== removed file 'katze/katze-http-cookies-sqlite.h'
--- katze/katze-http-cookies-sqlite.h	2011-10-10 21:22:27 +0000
+++ katze/katze-http-cookies-sqlite.h	1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
-/*
- Copyright (C) 2009 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.
-*/
-
-#ifndef __KATZE_HTTP_COOKIES_SQLITE_H__
-#define __KATZE_HTTP_COOKIES_SQLITE_H__
-
-#include "katze-utils.h"
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-#define KATZE_TYPE_HTTP_COOKIES_SQLITE \
-    (katze_http_cookies_sqlite_get_type ())
-#define KATZE_HTTP_COOKIES_SQLITE(obj) \
-    (G_TYPE_CHECK_INSTANCE_CAST ((obj), KATZE_TYPE_HTTP_COOKIES_SQLITE, KatzeHttpCookiesSqlite))
-#define KATZE_HTTP_COOKIES_SQLITE_CLASS(klass) \
-    (G_TYPE_CHECK_CLASS_CAST ((klass), KATZE_TYPE_HTTP_COOKIES_SQLITE, KatzeHttpCookiesSqliteClass))
-#define KATZE_IS_HTTP_COOKIES_SQLITE(obj) \
-    (G_TYPE_CHECK_INSTANCE_TYPE ((obj), KATZE_TYPE_HTTP_COOKIES_SQLITE))
-#define KATZE_IS_HTTP_COOKIES_SQLITE_CLASS(klass) \
-    (G_TYPE_CHECK_CLASS_TYPE ((klass), KATZE_TYPE_HTTP_COOKIES_SQLITE))
-#define KATZE_HTTP_COOKIES_SQLITE_GET_CLASS(obj) \
-    (G_TYPE_INSTANCE_GET_CLASS ((obj), KATZE_TYPE_HTTP_COOKIES_SQLITE, KatzeHttpCookiesSqliteClass))
-
-typedef struct _KatzeHttpCookiesSqlite                KatzeHttpCookiesSqlite;
-typedef struct _KatzeHttpCookiesSqliteClass           KatzeHttpCookiesSqliteClass;
-
-GType
-katze_http_cookies_sqlite_get_type                       (void) G_GNUC_CONST;
-
-G_END_DECLS
-
-#endif /* __KATZE_HTTP_COOKIES_SQLITE_H__ */

=== removed file 'katze/katze-http-cookies.c'
--- katze/katze-http-cookies.c	2013-04-16 23:16:24 +0000
+++ katze/katze-http-cookies.c	1970-01-01 00:00:00 +0000
@@ -1,331 +0,0 @@
-/*
- Copyright (C) 2008-2010 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.
-*/
-
-#if HAVE_CONFIG_H
-    #include <config.h>
-#endif
-
-#include "katze-http-cookies.h"
-#include "midori/midori-core.h"
-
-#include <stdlib.h>
-#ifdef HAVE_UNISTD_H
-    #include <unistd.h>
-#endif
-#include <glib/gi18n.h>
-#include <libsoup/soup.h>
-#include <gtk/gtk.h>
-#include <glib/gstdio.h>
-
-struct _KatzeHttpCookies
-{
-    GObject parent_instance;
-    gchar* filename;
-    SoupCookieJar* jar;
-    guint timeout;
-    guint counter;
-};
-
-struct _KatzeHttpCookiesClass
-{
-    GObjectClass parent_class;
-};
-
-static void
-katze_http_cookies_session_feature_iface_init (SoupSessionFeatureInterface *iface,
-                                               gpointer                     data);
-
-G_DEFINE_TYPE_WITH_CODE (KatzeHttpCookies, katze_http_cookies, G_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (SOUP_TYPE_SESSION_FEATURE,
-                         katze_http_cookies_session_feature_iface_init));
-
-/* Cookie jar saving to Mozilla format
-   Copyright (C) 2008 Xan Lopez <[e-mail]>
-   Copyright (C) 2008 Dan Winship <[e-mail]>
-   Mostly copied from libSoup 2.24, coding style adjusted */
-static SoupCookie*
-parse_cookie (gchar* line,
-              time_t now)
-{
-    gchar** result;
-    SoupCookie *cookie = NULL;
-    gboolean http_only;
-    time_t max_age;
-    gchar* host/*, *is_domain*/, *path, *secure, *expires, *name, *value;
-
-    if (g_str_has_prefix (line, "#HttpOnly_"))
-    {
-        http_only = TRUE;
-        line += strlen ("#HttpOnly_");
-    }
-    else if (*line == '#' || g_ascii_isspace (*line))
-        return cookie;
-    else
-        http_only = FALSE;
-
-    result = g_strsplit (line, "\t", -1);
-    if (g_strv_length (result) != 7)
-        goto out;
-
-    /* Check this first */
-    expires = result[4];
-    max_age = strtoul (expires, NULL, 10) - now;
-    if (max_age <= 0)
-        goto out;
-
-    host = result[0];
-    /* is_domain = result[1]; */
-    path = result[2];
-    secure = result[3];
-
-    name = result[5];
-    value = result[6];
-
-    cookie = soup_cookie_new (name, value, host, path, max_age);
-
-    if (strcmp (secure, "FALSE"))
-        soup_cookie_set_secure (cookie, TRUE);
-    if (http_only)
-        soup_cookie_set_http_only (cookie, TRUE);
-
-    out:
-        g_strfreev (result);
-
-    return cookie;
-}
-
-/* Cookie jar saving to Mozilla format
-   Copyright (C) 2008 Xan Lopez <[e-mail]>
-   Copyright (C) 2008 Dan Winship <[e-mail]>
-   Mostly copied from libSoup 2.24, coding style adjusted */
-static void
-parse_line (SoupCookieJar* jar,
-            gchar*         line,
-            time_t         now)
-{
-    SoupCookie* cookie;
-
-    if ((cookie = parse_cookie (line, now)))
-        soup_cookie_jar_add_cookie (jar, cookie);
-}
-
-/* Cookie jar saving to Mozilla format
-   Copyright (C) 2008 Xan Lopez <[e-mail]>
-   Copyright (C) 2008 Dan Winship <[e-mail]>
-   Mostly copied from libSoup 2.24, coding style adjusted */
-static void
-cookie_jar_load (SoupCookieJar* jar,
-                 const gchar*   filename)
-{
-    char* contents = NULL;
-    gchar* line;
-    gchar* p;
-    gsize length = 0;
-    time_t now;
-
-    if (!g_file_get_contents (filename, &contents, &length, NULL))
-        return;
-
-    now = time (NULL);
-    line = contents;
-    for (p = contents; *p; p++)
-    {
-        /* \r\n comes out as an extra empty line and gets ignored */
-        if (*p == '\r' || *p == '\n')
-        {
-            *p = '\0';
-            parse_line (jar, line, now);
-            line = p + 1;
-        }
-    }
-    parse_line (jar, line, now);
-
-    g_free (contents);
-}
-
-/* Cookie jar saving to Mozilla format
-   Copyright (C) 2008 Xan Lopez <[e-mail]>
-   Copyright (C) 2008 Dan Winship <[e-mail]>
-   Copied from libSoup 2.24, coding style preserved */
-static gboolean
-write_cookie (FILE *out, SoupCookie *cookie)
-{
-	if (fprintf (out, "%s%s\t%s\t%s\t%s\t%lu\t%s\t%s\n",
-		 cookie->http_only ? "#HttpOnly_" : "",
-		 cookie->domain,
-		 *cookie->domain == '.' ? "TRUE" : "FALSE",
-		 cookie->path,
-		 cookie->secure ? "TRUE" : "FALSE",
-		 (gulong)soup_date_to_time_t (cookie->expires),
-		 cookie->name,
-		 cookie->value) < 0)
-            return FALSE;
-        return TRUE;
-}
-
-static gboolean
-katze_http_cookies_update_jar (KatzeHttpCookies* http_cookies)
-{
-    gint fn = 0;
-    FILE* f = NULL;
-    gchar* temporary_filename = NULL;
-    GSList* cookies;
-
-    if (http_cookies->timeout > 0)
-    {
-        g_source_remove (http_cookies->timeout);
-        http_cookies->timeout = 0;
-    }
-
-    temporary_filename = g_strconcat (http_cookies->filename, ".XXXXXX", NULL);
-    if ((fn = g_mkstemp (temporary_filename)) == -1)
-        goto failed;
-    if (!((f = fdopen (fn, "wb"))))
-        goto failed;
-
-    cookies = soup_cookie_jar_all_cookies (http_cookies->jar);
-    for (; cookies != NULL; cookies = g_slist_next (cookies))
-    {
-        SoupCookie* cookie = cookies->data;
-        if (cookie->expires && !soup_date_is_past (cookie->expires))
-            write_cookie (f, cookie);
-        soup_cookie_free (cookie);
-    }
-    g_slist_free (cookies);
-
-    if (fclose (f) != 0)
-    {
-        f = NULL;
-        goto failed;
-    }
-    f = NULL;
-
-    if (g_rename (temporary_filename, http_cookies->filename) == -1)
-        goto failed;
-    g_free (temporary_filename);
-
-    if (!g_strcmp0 (g_getenv ("MIDORI_DEBUG"), "cookies"))
-    {
-        g_print ("KatzeHttpCookies: %d cookies changed\n", http_cookies->counter);
-        http_cookies->counter = 0;
-    }
-    return FALSE;
-
-failed:
-    if (f)
-        fclose (f);
-    g_unlink (temporary_filename);
-    g_free (temporary_filename);
-    if (!g_strcmp0 (g_getenv ("MIDORI_DEBUG"), "cookies"))
-        g_print ("KatzeHttpCookies: Failed to write '%s'\n",
-                 http_cookies->filename);
-    return FALSE;
-}
-
-static void
-katze_http_cookies_jar_changed_cb (SoupCookieJar*    jar,
-                                   SoupCookie*       old_cookie,
-                                   SoupCookie*       new_cookie,
-                                   KatzeHttpCookies* http_cookies)
-{
-    GObject* settings;
-
-    if (old_cookie)
-        soup_cookie_set_max_age (old_cookie, 0);
-
-    if (new_cookie)
-    {
-        settings = g_object_get_data (G_OBJECT (jar), "midori-settings");
-        if (new_cookie->expires)
-        {
-            gint age = katze_object_get_int (settings, "maximum-cookie-age");
-            if (age > 0)
-            {
-                SoupDate* max_date = soup_date_new_from_now (
-                    age * SOUP_COOKIE_MAX_AGE_ONE_DAY);
-                if (soup_date_to_time_t (new_cookie->expires)
-                  > soup_date_to_time_t (max_date))
-                    soup_cookie_set_expires (new_cookie, max_date);
-            }
-            else
-            {
-                /* An age of 0 to SoupCookie means already-expired
-                   A user choosing 0 days probably expects 1 hour. */
-                soup_cookie_set_max_age (new_cookie, SOUP_COOKIE_MAX_AGE_ONE_HOUR);
-            }
-        }
-    }
-
-    if (!g_strcmp0 (g_getenv ("MIDORI_DEBUG"), "cookies"))
-        http_cookies->counter++;
-
-    if (!http_cookies->timeout && (old_cookie || (new_cookie && new_cookie->expires)))
-        http_cookies->timeout = midori_timeout_add_seconds (
-            5, (GSourceFunc)katze_http_cookies_update_jar, http_cookies, NULL);
-}
-
-static void
-katze_http_cookies_attach (SoupSessionFeature* feature,
-                           SoupSession*        session)
-{
-    KatzeHttpCookies* http_cookies = (KatzeHttpCookies*)feature;
-    const gchar* filename = g_object_get_data (G_OBJECT (feature), "filename");
-    SoupSessionFeature* jar = soup_session_get_feature (session, SOUP_TYPE_COOKIE_JAR);
-    g_return_if_fail (jar != NULL);
-    g_return_if_fail (filename != NULL);
-    katze_assign (http_cookies->filename, g_strdup (filename));
-    http_cookies->jar = g_object_ref (jar);
-    cookie_jar_load (http_cookies->jar, http_cookies->filename);
-    g_signal_connect (jar, "changed",
-        G_CALLBACK (katze_http_cookies_jar_changed_cb), feature);
-
-}
-
-static void
-katze_http_cookies_detach (SoupSessionFeature* feature,
-                           SoupSession*        session)
-{
-    KatzeHttpCookies* http_cookies = (KatzeHttpCookies*)feature;
-    if (http_cookies->timeout > 0)
-        katze_http_cookies_update_jar (http_cookies);
-    katze_assign (http_cookies->filename, NULL);
-    katze_object_assign (http_cookies->jar, NULL);
-}
-
-static void
-katze_http_cookies_session_feature_iface_init (SoupSessionFeatureInterface *iface,
-                                               gpointer                     data)
-{
-    iface->attach = katze_http_cookies_attach;
-    iface->detach = katze_http_cookies_detach;
-}
-
-static void
-katze_http_cookies_finalize (GObject* object)
-{
-    katze_http_cookies_detach ((SoupSessionFeature*)object, NULL);
-}
-
-static void
-katze_http_cookies_class_init (KatzeHttpCookiesClass* class)
-{
-    GObjectClass* gobject_class = (GObjectClass*)class;
-    gobject_class->finalize = katze_http_cookies_finalize;
-}
-
-static void
-katze_http_cookies_init (KatzeHttpCookies* http_cookies)
-{
-    http_cookies->filename = NULL;
-    http_cookies->jar = NULL;
-    http_cookies->timeout = 0;
-    http_cookies->counter = 0;
-}

=== removed file 'katze/katze-http-cookies.h'
--- katze/katze-http-cookies.h	2010-01-17 17:14:48 +0000
+++ katze/katze-http-cookies.h	1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
-/*
- Copyright (C) 2009 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.
-*/
-
-#ifndef __KATZE_HTTP_COOKIES_H__
-#define __KATZE_HTTP_COOKIES_H__
-
-#include "katze-utils.h"
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-#define KATZE_TYPE_HTTP_COOKIES \
-    (katze_http_cookies_get_type ())
-#define KATZE_HTTP_COOKIES(obj) \
-    (G_TYPE_CHECK_INSTANCE_CAST ((obj), KATZE_TYPE_HTTP_COOKIES, KatzeHttpCookies))
-#define KATZE_HTTP_COOKIES_CLASS(klass) \
-    (G_TYPE_CHECK_CLASS_CAST ((klass), KATZE_TYPE_HTTP_COOKIES, KatzeHttpCookiesClass))
-#define KATZE_IS_HTTP_COOKIES(obj) \
-    (G_TYPE_CHECK_INSTANCE_TYPE ((obj), KATZE_TYPE_HTTP_COOKIES))
-#define KATZE_IS_HTTP_COOKIES_CLASS(klass) \
-    (G_TYPE_CHECK_CLASS_TYPE ((klass), KATZE_TYPE_HTTP_COOKIES))
-#define KATZE_HTTP_COOKIES_GET_CLASS(obj) \
-    (G_TYPE_INSTANCE_GET_CLASS ((obj), KATZE_TYPE_HTTP_COOKIES, KatzeHttpCookiesClass))
-
-typedef struct _KatzeHttpCookies                KatzeHttpCookies;
-typedef struct _KatzeHttpCookiesClass           KatzeHttpCookiesClass;
-
-GType
-katze_http_cookies_get_type                       (void) G_GNUC_CONST;
-
-G_END_DECLS
-
-#endif /* __KATZE_HTTP_COOKIES_H__ */

=== modified file 'katze/katze.h'
--- katze/katze.h	2013-07-27 12:35:55 +0000
+++ katze/katze.h	2013-07-29 21:07:25 +0000
@@ -13,8 +13,6 @@
 #define __KATZE_H__
 
 #include "katze-http-auth.h"
-#include "katze-http-cookies.h"
-#include "katze-http-cookies-sqlite.h"
 #include "katze-throbber.h"
 #include "katze-utils.h"
 #include "katze-item.h"

=== modified file 'midori/midori-frontend.c'
--- midori/midori-frontend.c	2013-06-30 14:58:59 +0000
+++ midori/midori-frontend.c	2013-07-29 21:07:25 +0000
@@ -600,11 +600,6 @@
     midori_bookmarks_on_quit (bookmarks);
     midori_history_on_quit (history, settings);
     midori_private_data_on_quit (settings);
-    /* Removing KatzeHttpCookies makes it save outstanding changes */
-#ifndef HAVE_WEBKIT2
-    soup_session_remove_feature_by_type (webkit_get_default_session (),
-                                         KATZE_TYPE_HTTP_COOKIES);
-#endif
 
     MidoriStartup load_on_startup = katze_object_get_int (settings, "load-on-startup");
     if (load_on_startup < MIDORI_STARTUP_LAST_OPEN_PAGES)

=== modified file 'midori/midori-privatedata.c'
--- midori/midori-privatedata.c	2013-06-19 20:23:55 +0000
+++ midori/midori-privatedata.c	2013-07-29 21:07:25 +0000
@@ -221,13 +221,17 @@
 static void
 midori_clear_web_cookies_cb (void)
 {
-#ifndef HAVE_WEBKIT2
+#ifdef HAVE_WEBKIT2
+    WebKitWebContext* context = webkit_web_context_get_default ();
+    WebKitCookieManager* cookie_manager = webkit_web_context_get_cookie_manager (context);
+    webkit_cookie_manager_delete_all_cookies (cookie_manager);
+    /* FIXME: site data policy */
+#else
     SoupSession* session = webkit_get_default_session ();
     MidoriWebSettings* settings = g_object_get_data (G_OBJECT (session), "midori-settings");
     SoupSessionFeature* jar = soup_session_get_feature (session, SOUP_TYPE_COOKIE_JAR);
     GSList* cookies = soup_cookie_jar_all_cookies (SOUP_COOKIE_JAR (jar));
     SoupSessionFeature* feature;
-    gchar* cache;
 
     /* HTTP Cookies/ Web Cookies */
     for (; cookies != NULL; cookies = g_slist_next (cookies))
@@ -239,18 +243,12 @@
         soup_cookie_jar_delete_cookie ((SoupCookieJar*)jar, cookies->data);
     }
     soup_cookies_free (cookies);
-    /* Removing KatzeHttpCookies makes it save outstanding changes */
-    if ((feature = soup_session_get_feature (session, KATZE_TYPE_HTTP_COOKIES)))
-    {
-        g_object_ref (feature);
-        soup_session_remove_feature (session, feature);
-        soup_session_add_feature (session, feature);
-        g_object_unref (feature);
-    }
+#endif
 
     /* Local shared objects/ Flash cookies */
     if (midori_web_settings_has_plugin_support ())
     {
+    gchar* cache;
     #ifdef GDK_WINDOWING_X11
     cache = g_build_filename (g_get_home_dir (), ".macromedia", "Flash_Player", NULL);
     midori_paths_remove_path (cache);
@@ -267,6 +265,9 @@
     #endif
     }
 
+#ifdef HAVE_WEBKIT2
+    /* TODO: clear databases and offline app caches */
+#else
     /* HTML5 databases */
     webkit_remove_all_web_databases ();
 

=== modified file 'midori/midori-session.c'
--- midori/midori-session.c	2013-07-11 08:40:04 +0000
+++ midori/midori-session.c	2013-07-29 21:07:25 +0000
@@ -17,10 +17,12 @@
 #include "sokoke.h"
 
 #include <glib/gi18n-lib.h>
+#include <libsoup/soup-cookie-jar-sqlite.h>
 
     #define LIBSOUP_USE_UNSTABLE_REQUEST_API
     #include <libsoup/soup-cache.h>
 
+#ifndef HAVE_WEBKIT2
 static void
 midori_soup_session_set_proxy_uri (SoupSession* session,
                                    const gchar* uri)
@@ -83,18 +85,28 @@
     else
         midori_soup_session_set_proxy_uri (session, NULL);
 }
+#endif
 
-#ifdef HAVE_LIBSOUP_2_29_91
+#if defined(HAVE_LIBSOUP_2_29_91) && WEBKIT_CHECK_VERSION (1, 1, 21)
 static void
 soup_session_settings_notify_first_party_cb (MidoriWebSettings* settings,
                                              GParamSpec*        pspec,
-                                             SoupSession*       session)
+                                             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);
-    gboolean yes = katze_object_get_boolean (settings, "first-party-cookies-only");
     g_object_set (jar, "accept-policy",
         yes ? SOUP_COOKIE_JAR_ACCEPT_NO_THIRD_PARTY
             : SOUP_COOKIE_JAR_ACCEPT_ALWAYS, NULL);
+#endif
 }
 #endif
 
@@ -116,17 +128,14 @@
 #ifndef HAVE_WEBKIT2
 const gchar*
 midori_web_settings_get_accept_language    (MidoriWebSettings* settings);
-#endif
 
 static void
 midori_soup_session_settings_accept_language_cb (SoupSession*       session,
                                                  SoupMessage*       msg,
                                                  MidoriWebSettings* settings)
 {
-    #ifndef HAVE_WEBKIT2
     const gchar* accept = midori_web_settings_get_accept_language (settings);
     soup_message_headers_append (msg->request_headers, "Accept-Language", accept);
-    #endif
 
     if (katze_object_get_boolean (settings, "strip-referer"))
     {
@@ -157,10 +166,16 @@
             soup_message_headers_remove (msg->request_headers, "Host");
     }
 }
+#endif
 
 gboolean
 midori_load_soup_session (gpointer settings)
 {
+    #if defined(HAVE_LIBSOUP_2_29_91) && 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 ();
 
@@ -213,12 +228,6 @@
         G_CALLBACK (soup_session_settings_notify_http_proxy_cb), session);
     g_signal_connect (settings, "notify::proxy-type",
         G_CALLBACK (soup_session_settings_notify_http_proxy_cb), session);
-    #ifdef HAVE_LIBSOUP_2_29_91
-    if (g_object_class_find_property (G_OBJECT_GET_CLASS (settings),
-        "enable-file-access-from-file-uris")) /* WebKitGTK+ >= 1.1.21 */
-        g_signal_connect (settings, "notify::first-party-cookies-only",
-            G_CALLBACK (soup_session_settings_notify_first_party_cb), session);
-    #endif
 
     #if defined (HAVE_LIBSOUP_2_34_0)
     g_signal_connect (session, "request-started",
@@ -247,10 +256,42 @@
     return FALSE;
 }
 
+#ifndef HAVE_WEBKIT2
+static void
+midori_session_cookie_jar_changed_cb (SoupCookieJar*     jar,
+                                      SoupCookie*        old_cookie,
+                                      SoupCookie*        new_cookie,
+                                      MidoriWebSettings* settings)
+{
+    if (new_cookie && new_cookie->expires)
+    {
+        time_t expires = soup_date_to_time_t (new_cookie->expires);
+        gint age = katze_object_get_int (settings, "maximum-cookie-age");
+        if (age > 0)
+        {
+            SoupDate* max_date = soup_date_new_from_now (
+                   age * SOUP_COOKIE_MAX_AGE_ONE_DAY);
+            if (soup_date_to_time_t (new_cookie->expires)
+                > soup_date_to_time_t (max_date))
+                   soup_cookie_set_expires (new_cookie, max_date);
+        }
+        else
+        {
+            /* An age of 0 to SoupCookie means already-expired
+            A user choosing 0 days probably expects 1 hour. */
+            soup_cookie_set_max_age (new_cookie, SOUP_COOKIE_MAX_AGE_ONE_HOUR);
+        }
+    }
+
+    if (midori_debug ("cookies"))
+        g_print ("cookie changed: old %p new %p\n", old_cookie, new_cookie);
+}
+#endif
+
 gboolean
 midori_load_soup_session_full (gpointer settings)
 {
-#ifndef HAVE_WEBKIT2
+    #ifndef HAVE_WEBKIT2
     SoupSession* session = webkit_get_default_session ();
     SoupCookieJar* jar;
     gchar* config_file;
@@ -265,33 +306,13 @@
     soup_session_add_feature (session, feature);
     g_object_unref (feature);
 
-    jar = soup_cookie_jar_new ();
-    g_object_set_data (G_OBJECT (jar), "midori-settings", settings);
+    katze_assign (config_file, midori_paths_get_config_filename_for_writing ("cookies.db"));
+    jar = soup_cookie_jar_sqlite_new (config_file, FALSE);
     soup_session_add_feature (session, SOUP_SESSION_FEATURE (jar));
+    g_signal_connect (jar, "changed",
+                      G_CALLBACK (midori_session_cookie_jar_changed_cb), settings);
     g_object_unref (jar);
 
-    katze_assign (config_file, midori_paths_get_config_filename_for_writing ("cookies.db"));
-    have_new_cookies = g_access (config_file, F_OK) == 0;
-    feature = g_object_new (KATZE_TYPE_HTTP_COOKIES_SQLITE, NULL);
-    g_object_set_data_full (G_OBJECT (feature), "filename",
-                            config_file, (GDestroyNotify)g_free);
-    soup_session_add_feature (session, feature);
-    g_object_unref (feature);
-
-    if (!have_new_cookies)
-    {
-        katze_assign (config_file, midori_paths_get_config_filename_for_writing ("cookies.txt"));
-        if (g_access (config_file, F_OK) == 0)
-        {
-            g_message ("Importing cookies from txt to sqlite3");
-            feature_import = g_object_new (KATZE_TYPE_HTTP_COOKIES, NULL);
-            g_object_set_data_full (G_OBJECT (feature_import), "filename",
-                                    config_file, (GDestroyNotify)g_free);
-            soup_session_add_feature (session, SOUP_SESSION_FEATURE (feature_import));
-            soup_session_remove_feature (session, SOUP_SESSION_FEATURE (feature_import));
-        }
-    }
-
     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);
@@ -299,7 +320,7 @@
         katze_object_get_int (settings, "maximum-cache-size") * 1024 * 1024);
     soup_cache_load (SOUP_CACHE (feature));
     g_free (config_file);
-#endif
+    #endif
     return FALSE;
 }
 

=== modified file 'wscript'
--- wscript	2013-07-16 14:20:37 +0000
+++ wscript	2013-07-29 21:07:25 +0000
@@ -278,7 +278,7 @@
         conf.check_message_custom ('unique', '', 'disabled')
     conf.define ('HAVE_UNIQUE', [0,1][conf.env['UNIQUE_VERSION'] != 'No'])
 
-    check_pkg ('libsoup-2.4', '2.27.90', var='LIBSOUP')
+    check_pkg ('libsoup-gnome-2.4', '2.27.90', var='LIBSOUP')
     if check_version (conf.env['LIBSOUP_VERSION'], 2, 29, 91):
         conf.define ('HAVE_LIBSOUP_2_29_91', 1)
     if check_version (conf.env['LIBSOUP_VERSION'], 2, 34, 0):