Merge lp:~midori/midori/wk2ab into lp:midori

[Cris Dywan]

Rewrite Adblock more modularly, add Whitelist support

TODO:
- Expose filter metadata to user (name, last updated, time to next update)
- Check checksum hash of the subscription after downloading
- Remove subscriptions
- Open local files in editor
- Ability to disable adblock for site/for all sites via icon
- Save pre-parsed pre filtered ruleset into file as .preparsed
- Save matched/ cached uris from previous runs

[https://easylist-downloads.adblockplus.org/easylist.txt]
enabled=1
expires=48206903549424
retries=1
homepage=https://easylist-downloads.adblockplus.org
title=EasyList

Test cases https://hg.adblockplus.org/adblockplustests/file/3e166c282a1d/chrome/content/tests/elemhide.js

[lp:~midori/midori/wk2ab]

6325. By Cris Dywan on 2014-02-20

Rename adblock2 to adblock

[Paweł Forysiuk (tuxator)]

review: Approve

=== added file 'data/adblock.list'
--- data/adblock.list	1970-01-01 00:00:00 +0000
+++ data/adblock.list	2014-02-20 20:31:17 +0000
@@ -0,0 +1,54 @@
+[Adblock Plus 2.0]
+! Version: 201402142200
+! Title: Exercise
+! Last modified: 11 Feb 2014 22:00 UTC
+! Expires: 3 days (update frequency)
+! Homepage: http://www.midori-browser.org
+! Licence: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
+! Copyright (C) 2014 Christian Dywan <[e-mail]>
+!
+! Yadayada http://example.com/ e-mail ([e-mail]).
+!
+!-----Spam eggs--------!
+! *** la:le/lu_foo_bar.txt ***
+|/http://ads.blub.boing/*$domain=xxx.com
+|/http://ads.blub.boing/*$domain=xxx.com,foo.fr,coco.at
+/market.php?$domain=adf.ly|foo.com
+/?placement=$script,domain=putlocker.com|sockshare.com
+
+! Some basic filters
+*ads.foo.bar*
+*ads.bogus.name*
+||^http://ads.bla.blub/*
+engine.adct.ru/*?
+/addyn|*|adtech;
+doubleclick.net/pfadx/*.mtvi
+objects.tremormedia.com/embed/xml/*.xml?r=
+videostrip.com^*/admatcherclient.
+test.dom/test?var
+/adpage.
+br.gcl.ru/cgi-bin/br/
+_300x600.
+_rectangle_ads.
++adverts/
+-2/ads/
+
+! CSS elements
+old.tv,delicio.us,longc.at###box
+##.zRightAdNote
+###advertisingModule160x600
+##a[href$="/vghd.shtml"]
+imagetwist.com###left[align="center"] > center > a[target="_blank"]
+
+! Options
+||videobox.com/?tid=$popup
+||sexsearchcom.com^$popup,third-party
+||206.217.206.137^$third-party
+/spopunder^$popup
+||putlocker.com^*.php?*title$subdocument
+://ads.$popup
+
+! Whitelist
+@@||hortifor.com/images/*120x60$~third-party
+@@||stickam.com/wb/www/category/300x250/$image
+@@||adultadworld.com/adhandler/$subdocument
 
=== modified file 'extensions/CMakeLists.txt'
--- extensions/CMakeLists.txt	2013-09-08 19:56:46 +0000
+++ extensions/CMakeLists.txt	2014-02-20 20:31:17 +0000
@@ -15,7 +15,6 @@
 file(GLOB EXTENSIONS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *)
 if (HALF_BRO_INCOM_WEBKIT2)
     list(REMOVE_ITEM EXTENSIONS
-         "adblock.c"
          "cookie-permissions"
          "addons.c"
          "formhistory"
@@ -46,13 +45,30 @@
     string(FIND ${UNIT_SRC} "." UNIT_EXTENSION)
     if (UNIT_EXTENSION EQUAL -1)
         file(GLOB UNIT_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${UNIT_SRC}/*.c")
+        file(GLOB UNIT_FILES_VALA RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${UNIT_SRC}/*.vala")
+        if (UNIT_FILES_VALA)
+            include(ValaPrecompile)
+            vala_precompile(UNIT_SRC_C ${UNIT_SRC}
+                ${UNIT_FILES_VALA}
+            PACKAGES
+                ${PKGS}
+            OPTIONS
+                ${VALAFLAGS}
+            CUSTOM_VAPIS
+                ${EXTRA_VAPIS}
+                "${CMAKE_SOURCE_DIR}/midori/midori.vapi"
+                "${CMAKE_SOURCE_DIR}/katze/katze.vapi"
+                "${CMAKE_BINARY_DIR}/midori/${LIBMIDORI}.vapi"
+            )
+            set(UNIT_FILES ${UNIT_FILES} ${UNIT_SRC_C})
+        endif ()
         if (UNIT_FILES)
             add_library(${UNIT_SRC} MODULE ${UNIT_FILES})
             target_link_libraries(${UNIT_SRC}
                                   ${LIBMIDORI}
                                   )
             set_target_properties(${UNIT_SRC} PROPERTIES
-                                  COMPILE_FLAGS ${CFLAGS}
+                                  COMPILE_FLAGS ${VALA_CFLAGS}
                                   )
             install(TARGETS ${UNIT_SRC}
                     LIBRARY DESTINATION ${EXTENSIONDIR}
 
=== added directory 'extensions/adblock'
=== removed file 'extensions/adblock.c'
--- extensions/adblock.c	2013-11-09 17:56:58 +0000
+++ extensions/adblock.c	1970-01-01 00:00:00 +0000
@@ -1,1930 +0,0 @@
-/*
- Copyright (C) 2009-2012 Christian Dywan <[e-mail]>
- Copyright (C) 2009-2012 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 "midori-core.h"
-#include <glib/gstdio.h>
-
-#include "config.h"
-#if HAVE_UNISTD_H
-    #include <unistd.h>
-#endif
-
-#define SIGNATURE_SIZE 8
-#define USE_PATTERN_MATCHING 1
-#define CUSTOM_LIST_NAME "custom.list"
-#define ADBLOCK_FILTER_VALID(__filter) \
-    (__filter && (g_str_has_prefix (__filter, "http") \
-               || g_str_has_prefix (__filter, "file")))
-#define ADBLOCK_FILTER_SET(__filter,__active) \
-    __filter[4] = __active ? (__filter[5] == ':' ? 's' : ':') : '-'
-#define ADBLOCK_FILTER_IS_SET(__filter) \
-    (__filter[4] != '-' && __filter[5] != '-')
-    #define adblock_debug(dmsg, darg1, darg2) \
-        do { if (midori_debug ("adblock:match")) g_debug (dmsg, darg1, darg2); } while (0)
-
-static GHashTable* pattern = NULL;
-static GHashTable* keys = NULL;
-static GHashTable* optslist = NULL;
-static GHashTable* urlcache = NULL;
-static GHashTable* blockcssprivate = NULL;
-static GHashTable* navigationwhitelist = NULL;
-static GString* blockcss = NULL;
-static GList* update_list = NULL;
-static gboolean update_done = FALSE;
-
-static void
-adblock_parse_file (gchar* path);
-
-static gboolean
-adblock_file_is_up_to_date (gchar* path);
-
-static void
-adblock_reload_rules (MidoriExtension* extension,
-                      gboolean         custom_only);
-
-static gchar*
-adblock_build_js (const gchar* uri)
-{
-    gchar* domain;
-    const gchar* style;
-    GString* subdomain;
-    GString* code;
-    int cnt = 0, blockscnt = 0;
-    gchar** subdomains;
-
-    domain = midori_uri_parse_hostname (uri, NULL);
-    subdomains = g_strsplit (domain, ".", -1);
-    g_free (domain);
-    if (!subdomains)
-        return NULL;
-
-    code = g_string_new (
-        "window.addEventListener ('DOMContentLoaded',"
-        "function () {"
-        "   if (document.getElementById('madblock'))"
-        "       return;"
-        "   public = '");
-
-    cnt = g_strv_length (subdomains) - 1;
-    subdomain = g_string_new (subdomains [cnt]);
-    g_string_prepend_c (subdomain, '.');
-    cnt--;
-    while (cnt >= 0)
-    {
-        g_string_prepend (subdomain, subdomains[cnt]);
-        if ((style = g_hash_table_lookup (blockcssprivate, subdomain->str)))
-        {
-            g_string_append (code, style);
-            g_string_append_c (code, ',');
-            blockscnt++;
-        }
-        g_string_prepend_c (subdomain, '.');
-        cnt--;
-    }
-    g_string_free (subdomain, TRUE);
-    g_strfreev (subdomains);
-
-    if (blockscnt == 0)
-        return g_string_free (code, TRUE);
-
-    g_string_append (code,
-        "   zz-non-existent {display: none !important}';"
-        "   var mystyle = document.createElement('style');"
-        "   mystyle.setAttribute('type', 'text/css');"
-        "   mystyle.setAttribute('id', 'madblock');"
-        "   mystyle.appendChild(document.createTextNode(public));"
-        "   var head = document.getElementsByTagName('head')[0];"
-        "   if (head) head.appendChild(mystyle);"
-        "}, true);");
-    return g_string_free (code, FALSE);
-}
-
-static GString*
-adblock_fixup_regexp (const gchar* prefix,
-                      gchar*       src);
-
-static void
-adblock_destroy_db ()
-{
-    g_string_free (blockcss, TRUE);
-    blockcss = NULL;
-
-    g_hash_table_destroy (pattern);
-    pattern = NULL;
-    g_hash_table_destroy (optslist);
-    optslist = NULL;
-    g_hash_table_destroy (urlcache);
-    urlcache = NULL;
-    g_hash_table_destroy (blockcssprivate);
-    blockcssprivate = NULL;
-    g_hash_table_destroy (navigationwhitelist);
-    navigationwhitelist = NULL;
-}
-
-static void
-adblock_init_db ()
-{
-    pattern = g_hash_table_new_full (g_str_hash, g_str_equal,
-                   (GDestroyNotify)g_free,
-                   (GDestroyNotify)g_regex_unref);
-    keys = g_hash_table_new_full (g_str_hash, g_str_equal,
-                   (GDestroyNotify)g_free,
-                   (GDestroyNotify)g_regex_unref);
-    optslist = g_hash_table_new_full (g_str_hash, g_str_equal,
-                   NULL,
-                   (GDestroyNotify)g_free);
-    urlcache = g_hash_table_new_full (g_str_hash, g_str_equal,
-                   (GDestroyNotify)g_free,
-                   (GDestroyNotify)g_free);
-    blockcssprivate = g_hash_table_new_full (g_str_hash, g_str_equal,
-                   (GDestroyNotify)g_free,
-                   (GDestroyNotify)g_free);
-    navigationwhitelist = g_hash_table_new_full (g_direct_hash, g_str_equal,
-                   NULL,
-                   (GDestroyNotify)g_free);
-
-    blockcss = g_string_new ("z-non-exist");
-}
-
-static void
-adblock_download_notify_status_cb (WebKitDownload*  download,
-                                   GParamSpec*      pspec,
-                                   MidoriExtension* extension)
-{
-    if (update_done)
-        return;
-
-    if (webkit_download_get_status (download) == WEBKIT_DOWNLOAD_STATUS_FINISHED)
-    {
-        GList* li = NULL;
-        for (li = update_list; li != NULL; li = g_list_next (li))
-        {
-            gchar* uri = g_strdup (webkit_download_get_destination_uri (download) + 7);
-            if (g_strcmp0 (li->data, uri))
-                update_list = g_list_remove (update_list, li->data);
-            g_free (uri);
-        }
-    }
-
-    if (g_list_length (update_list) == 0)
-    {
-        adblock_reload_rules (extension, FALSE);
-        update_done = TRUE;
-    }
-}
-
-static gchar*
-adblock_get_filename_for_uri (const gchar* uri)
-{
-    gchar* filename;
-    gchar* folder;
-    gchar* path;
-
-    if (!ADBLOCK_FILTER_IS_SET (uri))
-        return NULL;
-
-    if (!strncmp (uri, "file", 4))
-        return g_strndup (uri + 7, strlen (uri) - 7);
-
-    folder = g_build_filename (midori_paths_get_cache_dir (), "adblock", NULL);
-    katze_mkdir_with_parents (folder, 0700);
-
-    filename = g_compute_checksum_for_string (G_CHECKSUM_MD5, uri, -1);
-    path = g_build_filename (folder, filename, NULL);
-
-    g_free (filename);
-    g_free (folder);
-    return path;
-}
-
-static void
-adblock_reload_rules (MidoriExtension* extension,
-                      gboolean         custom_only)
-{
-    gchar* path;
-    gchar* custom_list;
-    gchar** filters;
-    guint i = 0;
-    MidoriApp* app = midori_extension_get_app (extension);
-    MidoriWebSettings* settings = katze_object_get_object (app, "settings");
-
-    if (pattern)
-        adblock_destroy_db ();
-    adblock_init_db ();
-
-    custom_list = g_build_filename (midori_extension_get_config_dir (extension),
-                                    CUSTOM_LIST_NAME, NULL);
-    adblock_parse_file (custom_list);
-    g_free (custom_list);
-
-    filters = midori_extension_get_string_list (extension, "filters", NULL);
-    if (!custom_only && filters && *filters)
-    {
-        while (filters[i] != NULL)
-        {
-            path = adblock_get_filename_for_uri (filters[i]);
-            if (!path)
-            {
-                i++;
-                continue;
-            }
-
-            if (!adblock_file_is_up_to_date (path))
-            {
-                WebKitNetworkRequest* request;
-                WebKitDownload* download;
-                gchar* destination = g_filename_to_uri (path, NULL, NULL);
-
-                request = webkit_network_request_new (filters[i]);
-                download = webkit_download_new (request);
-                g_object_unref (request);
-                webkit_download_set_destination_uri (download, destination);
-                update_list = g_list_prepend (update_list, path);
-                g_free (destination);
-                g_signal_connect (download, "notify::status",
-                    G_CALLBACK (adblock_download_notify_status_cb), extension);
-                webkit_download_start (download);
-            }
-            else
-                adblock_parse_file (path);
-            g_free (path);
-            i++;
-        }
-    }
-    g_strfreev (filters);
-    g_string_append (blockcss, " {display: none !important}\n");
-
-    midori_web_settings_add_style (settings, "adblock-blockcss", blockcss->str);
-    g_object_unref (settings);
-}
-
-static void
-adblock_preferences_render_tick_cb (GtkTreeViewColumn* column,
-                                    GtkCellRenderer*   renderer,
-                                    GtkTreeModel*      model,
-                                    GtkTreeIter*       iter,
-                                    MidoriExtension*   extension)
-{
-    gchar* filter;
-
-    gtk_tree_model_get (model, iter, 0, &filter, -1);
-
-    g_object_set (renderer,
-        "activatable", ADBLOCK_FILTER_VALID (filter),
-        "active", ADBLOCK_FILTER_VALID (filter) && ADBLOCK_FILTER_IS_SET (filter),
-        NULL);
-
-    g_free (filter);
-}
-
-static void
-adblock_preferences_renderer_text_edited_cb (GtkCellRenderer* renderer,
-                                             const gchar*     tree_path,
-                                             const gchar*     new_text,
-                                             GtkTreeModel*    model)
-{
-    GtkTreeIter iter;
-
-    if (gtk_tree_model_get_iter_from_string (model, &iter, tree_path))
-        gtk_list_store_set (GTK_LIST_STORE (model), &iter, 0, new_text, -1);
-}
-
-static void
-adblock_preferences_renderer_toggle_toggled_cb (GtkCellRendererToggle* renderer,
-                                                const gchar*           path,
-                                                GtkTreeModel*          model)
-{
-    GtkTreeIter iter;
-
-    if (gtk_tree_model_get_iter_from_string (model, &iter, path))
-    {
-        gchar* filter;
-
-        gtk_tree_model_get (model, &iter, 0, &filter, -1);
-
-        if (ADBLOCK_FILTER_VALID (filter))
-        {
-            ADBLOCK_FILTER_SET (filter, TRUE);
-            if (gtk_cell_renderer_toggle_get_active (renderer))
-            {
-                if (midori_uri_is_http (filter))
-                {
-                    gchar* filename = adblock_get_filename_for_uri (filter);
-                    g_unlink (filename);
-                    g_free (filename);
-                }
-                ADBLOCK_FILTER_SET (filter, FALSE);
-            }
-
-            gtk_list_store_set (GTK_LIST_STORE (model), &iter, 0, filter, -1);
-
-            g_free (filter);
-        }
-    }
-}
-
-static void
-adblock_preferences_render_text_cb (GtkTreeViewColumn* column,
-                                    GtkCellRenderer*   renderer,
-                                    GtkTreeModel*      model,
-                                    GtkTreeIter*       iter,
-                                    MidoriExtension*   extension)
-{
-    gchar* filter;
-
-    gtk_tree_model_get (model, iter, 0, &filter, -1);
-
-    if (ADBLOCK_FILTER_VALID (filter))
-        ADBLOCK_FILTER_SET (filter, TRUE);
-
-    g_object_set (renderer,
-        "text", filter,
-        NULL);
-
-    g_free (filter);
-}
-
-static void
-adblock_preferences_model_row_changed_cb (GtkTreeModel*    model,
-                                          GtkTreePath*     path,
-                                          GtkTreeIter*     iter,
-                                          MidoriExtension* extension)
-{
-    gsize length = gtk_tree_model_iter_n_children (model, NULL);
-    gchar** filters = g_new (gchar*, length + 1);
-    guint i = 0;
-    gboolean need_reload = FALSE;
-
-    if (gtk_tree_model_iter_children (model, iter, NULL))
-        do
-        {
-            gchar* filter;
-            gtk_tree_model_get (model, iter, 0, &filter, -1);
-            if (filter && *filter)
-            {
-                filters[i++] = filter;
-                need_reload = TRUE;
-            }
-            else
-                g_free (filter);
-        }
-        while (gtk_tree_model_iter_next (model, iter));
-    filters[i] = NULL;
-    midori_extension_set_string_list (extension, "filters", filters, i);
-    g_free (filters);
-    if (need_reload)
-        adblock_reload_rules (extension, FALSE);
-}
-
-static void
-adblock_preferences_model_row_deleted_cb (GtkTreeModel*    model,
-                                          GtkTreePath*     path,
-                                          MidoriExtension* extension)
-{
-    GtkTreeIter iter;
-    adblock_preferences_model_row_changed_cb (model, path, &iter, extension);
-}
-
-static void
-adblock_preferences_add_clicked_cb (GtkWidget*    button,
-                                    GtkTreeModel* model)
-{
-    GtkEntry* entry = GTK_IS_ENTRY (button)
-        ? button : g_object_get_data (G_OBJECT (button), "entry");
-    gtk_list_store_insert_with_values (GTK_LIST_STORE (model),
-        NULL, 0, 0, gtk_entry_get_text (entry), -1);
-    gtk_entry_set_text (entry, "");
-}
-
-static void
-adblock_preferences_edit_clicked_cb (GtkWidget*         button,
-                                     GtkTreeViewColumn* column)
-{
-    GdkEvent* event = gtk_get_current_event ();
-    GtkTreeView* treeview = g_object_get_data (G_OBJECT (button), "treeview");
-    GtkTreeModel* model;
-    GtkTreeIter iter;
-    if (katze_tree_view_get_selected_iter (treeview, &model, &iter))
-    {
-        gchar* path = gtk_tree_model_get_string_from_iter (model, &iter);
-        GtkTreePath* tree_path = gtk_tree_path_new_from_string (path);
-        /* gtk_cell_renderer_start_editing */
-        gtk_tree_view_set_cursor (treeview, tree_path, column, TRUE);
-        gtk_tree_path_free (tree_path);
-        g_free (path);
-    }
-    gdk_event_free (event);
-}
-
-static void
-adblock_preferences_remove_clicked_cb (GtkWidget*   button,
-                                       GtkTreeView* treeview)
-{
-    GtkTreeModel* model;
-    GtkTreeIter iter;
-    if (katze_tree_view_get_selected_iter (treeview, &model, &iter))
-        gtk_list_store_remove (GTK_LIST_STORE (model), &iter);
-}
-
-static gboolean
-adblock_activate_link_cb (GtkWidget*   label,
-                          const gchar* uri)
-{
-    MidoriBrowser* browser = midori_browser_get_for_widget (label);
-    GtkWidget* view = midori_browser_add_uri (browser, uri);
-    midori_browser_set_current_tab (browser, view);
-    return TRUE;
-}
-
-static GtkWidget*
-adblock_get_preferences_dialog (MidoriExtension* extension)
-{
-    MidoriApp* app;
-    GtkWidget* browser;
-    const gchar* dialog_title;
-    GtkWidget* dialog;
-    GtkWidget* content_area;
-    gint width, height;
-    GtkWidget* xfce_heading;
-    GtkWidget* hbox;
-    GtkListStore* liststore;
-    GtkWidget* treeview;
-    GtkTreeViewColumn* column;
-    GtkCellRenderer* renderer_text;
-    GtkCellRenderer* renderer_toggle;
-    GtkWidget* scrolled;
-    gchar** filters;
-    GtkWidget* vbox;
-    GtkWidget* button;
-    gchar* description;
-    GtkWidget* entry;
-    #if HAVE_OSX
-    GtkWidget* icon;
-    #endif
-
-    app = midori_extension_get_app (extension);
-    browser = katze_object_get_object (app, "browser");
-
-    dialog_title = _("Configure Advertisement filters");
-    dialog = gtk_dialog_new_with_buttons (dialog_title, GTK_WINDOW (browser),
-        GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
-        #if !HAVE_OSX
-        GTK_STOCK_HELP, GTK_RESPONSE_HELP,
-        GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
-        #endif
-        NULL);
-    katze_widget_add_class (gtk_dialog_get_widget_for_response (
-        GTK_DIALOG (dialog), GTK_RESPONSE_HELP), "help_button");
-    content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
-    gtk_window_set_icon_name (GTK_WINDOW (dialog), GTK_STOCK_PROPERTIES);
-    /* TODO: Implement some kind of help function */
-    gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog),
-                                       GTK_RESPONSE_HELP, FALSE);
-    sokoke_widget_get_text_size (dialog, "M", &width, &height);
-    gtk_window_set_default_size (GTK_WINDOW (dialog), width * 52, -1);
-    g_signal_connect_swapped (dialog, "response",
-                      G_CALLBACK (gtk_widget_destroy), dialog);
-    /* TODO: We need mnemonics */
-    if ((xfce_heading = sokoke_xfce_header_new (
-        gtk_window_get_icon_name (GTK_WINDOW (dialog)), dialog_title)))
-        gtk_box_pack_start (GTK_BOX (content_area), xfce_heading, FALSE, FALSE, 0);
-    hbox = gtk_hbox_new (FALSE, 0);
-    gtk_box_pack_start (GTK_BOX (content_area), hbox, TRUE, TRUE, 12);
-    vbox = gtk_vbox_new (FALSE, 0);
-    gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 4);
-    button = gtk_label_new (NULL);
-    description = g_strdup_printf (_(
-        "Type the address of a preconfigured filter list in the text entry "
-        "and click \"Add\" to add it to the list. "
-        "You can find more lists at %s."),
-        "<a href=\"http://adblockplus.org/en/subscriptions\">adblockplus.org/en/subscriptions</a> "
-        "<a href=\"http://easylist.adblockplus.org/\">easylist.adblockplus.org</a>");
-    g_signal_connect (button, "activate-link",
-        G_CALLBACK (adblock_activate_link_cb), NULL);
-    gtk_label_set_markup (GTK_LABEL (button), description);
-    g_free (description);
-    gtk_label_set_line_wrap (GTK_LABEL (button), TRUE);
-    gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 4);
-    entry = katze_uri_entry_new (NULL);
-    gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, FALSE, 4);
-    liststore = gtk_list_store_new (1, G_TYPE_STRING);
-    treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (liststore));
-    gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeview), FALSE);
-    column = gtk_tree_view_column_new ();
-    renderer_toggle = gtk_cell_renderer_toggle_new ();
-    gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (column), renderer_toggle, FALSE);
-    gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (column), renderer_toggle,
-        (GtkCellLayoutDataFunc)adblock_preferences_render_tick_cb,
-        extension, NULL);
-    g_signal_connect (renderer_toggle, "toggled",
-        G_CALLBACK (adblock_preferences_renderer_toggle_toggled_cb), liststore);
-    gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), column);
-    column = gtk_tree_view_column_new ();
-    renderer_text = gtk_cell_renderer_text_new ();
-    gtk_tree_view_column_pack_start (column, renderer_text, TRUE);
-    g_object_set (renderer_text, "editable", TRUE, NULL);
-    g_signal_connect (renderer_text, "edited",
-        G_CALLBACK (adblock_preferences_renderer_text_edited_cb), liststore);
-    gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (column), renderer_text,
-        (GtkCellLayoutDataFunc)adblock_preferences_render_text_cb,
-        extension, NULL);
-    gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), column);
-    scrolled = gtk_scrolled_window_new (NULL, NULL);
-    gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled),
-                                    GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-    gtk_container_add (GTK_CONTAINER (scrolled), treeview);
-    gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled),
-                                         GTK_SHADOW_IN);
-    gtk_box_pack_start (GTK_BOX (vbox), scrolled, TRUE, TRUE, 5);
-
-    filters = midori_extension_get_string_list (extension, "filters", NULL);
-    if (filters != NULL)
-    {
-        gsize i = 0;
-        while (filters[i++] != NULL)
-            gtk_list_store_insert_with_values (GTK_LIST_STORE (liststore),
-                                               NULL, i - 1, 0, filters[i -1], -1);
-    }
-    g_strfreev (filters);
-    g_object_connect (liststore,
-        "signal::row-inserted",
-        adblock_preferences_model_row_changed_cb, extension,
-        "signal::row-changed",
-        adblock_preferences_model_row_changed_cb, extension,
-        "signal::row-deleted",
-        adblock_preferences_model_row_deleted_cb, extension,
-        NULL);
-
-    g_object_unref (liststore);
-    vbox = gtk_vbox_new (FALSE, 4);
-    gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 4);
-    button = gtk_button_new_from_stock (GTK_STOCK_ADD);
-    g_object_set_data (G_OBJECT (dialog), "entry", entry);
-    g_object_set_data (G_OBJECT (button), "entry", entry);
-    g_signal_connect (button, "clicked",
-        G_CALLBACK (adblock_preferences_add_clicked_cb), liststore);
-    g_signal_connect (entry, "activate",
-        G_CALLBACK (adblock_preferences_add_clicked_cb), liststore);
-    gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
-    button = gtk_button_new_from_stock (GTK_STOCK_EDIT);
-    g_object_set_data (G_OBJECT (button), "treeview", treeview);
-    g_signal_connect (button, "clicked",
-        G_CALLBACK (adblock_preferences_edit_clicked_cb), column);
-    gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
-    button = gtk_button_new_from_stock (GTK_STOCK_REMOVE);
-    g_signal_connect (button, "clicked",
-        G_CALLBACK (adblock_preferences_remove_clicked_cb), treeview);
-    gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
-    button = gtk_label_new (""); /* This is an invisible separator */
-    gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE, 8);
-    gtk_widget_set_sensitive (button, FALSE);
-    button = gtk_label_new (""); /* This is an invisible separator */
-    gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE, 12);
-    button = gtk_button_new_from_stock (GTK_STOCK_GO_DOWN);
-    gtk_widget_set_sensitive (button, FALSE);
-    gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE, 0);
-    button = gtk_button_new_from_stock (GTK_STOCK_GO_UP);
-    gtk_widget_set_sensitive (button, FALSE);
-    gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE, 0);
-
-    #if HAVE_OSX
-    hbox = gtk_hbox_new (FALSE, 0);
-    button = gtk_button_new ();
-    icon = gtk_image_new_from_stock (GTK_STOCK_HELP, GTK_ICON_SIZE_BUTTON);
-    gtk_button_set_image (GTK_BUTTON (button), icon);
-    /* TODO: Implement some kind of help function */
-    gtk_widget_set_sensitive (button, FALSE);
-    /* g_signal_connect (button, "clicked",
-        G_CALLBACK (adblock_preferences_help_clicked_cb), dialog); */
-    gtk_box_pack_end (GTK_BOX (hbox),
-        button, FALSE, FALSE, 4);
-    gtk_box_pack_end (GTK_BOX (content_area),
-        hbox, FALSE, FALSE, 0);
-    #endif
-    gtk_widget_show_all (content_area);
-
-    g_object_unref (browser);
-
-    return dialog;
-}
-
-static GtkWidget*
-adblock_show_preferences_dialog (MidoriExtension* extension,
-                                 const gchar*     uri)
-{
-    static GtkWidget* dialog = NULL;
-
-    if (!dialog)
-    {
-        dialog = adblock_get_preferences_dialog (extension);
-        g_signal_connect (dialog, "destroy",
-            G_CALLBACK (gtk_widget_destroyed), &dialog);
-        gtk_widget_show (dialog);
-    }
-    else
-        gtk_window_present (GTK_WINDOW (dialog));
-
-    if (uri != NULL)
-    {
-        GtkWidget* entry = g_object_get_data (G_OBJECT (dialog), "entry");
-        gtk_entry_set_text (GTK_ENTRY (entry), uri);
-    }
-    return dialog;
-}
-
-static void
-adblock_open_preferences_cb (MidoriExtension* extension)
-{
-    adblock_show_preferences_dialog (extension, NULL);
-}
-
-static gint
-adblock_check_rule (GRegex*      regex,
-                    const gchar* patt,
-                    const gchar* req_uri,
-                    const gchar* page_uri)
-{
-    gchar* opts;
-
-    if (!g_regex_match_full (regex, req_uri, -1, 0, 0, NULL, NULL))
-        return FALSE;
-
-    opts = g_hash_table_lookup (optslist, patt);
-    if (opts && g_regex_match_simple (",third-party", opts,
-                              G_REGEX_CASELESS, G_REGEX_MATCH_NOTEMPTY))
-    {
-        if (page_uri && g_regex_match_full (regex, page_uri, -1, 0, 0, NULL, NULL))
-            return FALSE;
-    }
-    /* TODO: Domain opt check */
-    adblock_debug ("blocked by pattern regexp=%s -- %s", g_regex_get_pattern (regex), req_uri);
-    return TRUE;
-}
-
-static gboolean
-adblock_is_matched_by_pattern (const gchar* req_uri,
-                               const gchar* page_uri)
-{
-    GHashTableIter iter;
-    gpointer patt, regex;
-
-    if (USE_PATTERN_MATCHING == 0)
-        return FALSE;
-
-    g_hash_table_iter_init (&iter, pattern);
-    while (g_hash_table_iter_next (&iter, &patt, &regex))
-    {
-        if (adblock_check_rule (regex, patt, req_uri, page_uri))
-            return TRUE;
-    }
-    return FALSE;
-}
-
-static gboolean
-adblock_is_matched_by_key (const gchar* req_uri,
-                           const gchar* page_uri)
-{
-    gchar* uri;
-    gint len;
-    int pos = 0;
-    GList* regex_bl = NULL;
-    GString* guri;
-    gboolean ret = FALSE;
-    gchar sig[SIGNATURE_SIZE + 1];
-
-    memset (&sig[0], 0, sizeof (sig));
-    /* Signatures are made on pattern, so we need to convert url to a pattern as well */
-    guri = adblock_fixup_regexp ("", (gchar*)req_uri);
-    uri = guri->str;
-    len = guri->len;
-
-    for (pos = len - SIGNATURE_SIZE; pos >= 0; pos--)
-    {
-        GRegex* regex;
-        strncpy (sig, uri + pos, SIGNATURE_SIZE);
-        regex = g_hash_table_lookup (keys, sig);
-
-        /* Dont check if regex is already blacklisted */
-        if (!regex || g_list_find (regex_bl, regex))
-            continue;
-        ret = adblock_check_rule (regex, sig, req_uri, page_uri);
-        if (ret)
-            break;
-        regex_bl = g_list_prepend (regex_bl, regex);
-    }
-    g_string_free (guri, TRUE);
-    g_list_free (regex_bl);
-    return ret;
-}
-
-static gboolean
-adblock_is_matched (const gchar*  req_uri,
-                    const gchar*  page_uri)
-{
-    gchar* value;
-
-    if ((value = g_hash_table_lookup (urlcache, req_uri)))
-    {
-        if (value[0] == '0')
-            return FALSE;
-        else
-            return TRUE;
-    }
-
-    if (adblock_is_matched_by_key (req_uri, page_uri))
-    {
-        g_hash_table_insert (urlcache, g_strdup (req_uri), g_strdup("1"));
-        return TRUE;
-    }
-
-    if (adblock_is_matched_by_pattern (req_uri, page_uri))
-    {
-        g_hash_table_insert (urlcache, g_strdup (req_uri), g_strdup("1"));
-        return TRUE;
-    }
-    g_hash_table_insert (urlcache, g_strdup (req_uri), g_strdup("0"));
-    return FALSE;
-}
-
-static gchar*
-adblock_prepare_urihider_js (GList* uris)
-{
-    GList* li = NULL;
-    GString* js = g_string_new (
-        "(function() {"
-        "function getElementsByAttribute (strTagName, strAttributeName, arrAttributeValue) {"
-        "    var arrElements = document.getElementsByTagName (strTagName);"
-        "    var arrReturnElements = new Array();"
-        "    for (var j=0; j<arrAttributeValue.length; j++) {"
-        "        var strAttributeValue = arrAttributeValue[j];"
-        "        for (var i=0; i<arrElements.length; i++) {"
-        "             var oCurrent = arrElements[i];"
-        "             var oAttribute = oCurrent.getAttribute && oCurrent.getAttribute (strAttributeName);"
-        "             if (oAttribute && oAttribute.length > 0 && strAttributeValue.indexOf (oAttribute) != -1)"
-        "                 arrReturnElements.push (oCurrent);"
-        "        }"
-        "    }"
-        "    return arrReturnElements;"
-        "};"
-        "function hideElementBySrc (uris) {"
-        "    var oElements = getElementsByAttribute('img', 'src', uris);"
-        "    if (oElements.length == 0)"
-        "        oElements = getElementsByAttribute ('iframe', 'src', uris);"
-        "    for (var i=0; i<oElements.length; i++) {"
-        "        oElements[i].style.visibility = 'hidden !important';"
-        "        oElements[i].style.width = '0';"
-        "        oElements[i].style.height = '0';"
-        "    }"
-        "};"
-        "var uris=new Array ();");
-
-    for (li = uris; li != NULL; li = g_list_next (li))
-        g_string_append_printf (js, "uris.push ('%s');", (gchar*)li->data);
-
-    g_string_append (js, "hideElementBySrc (uris);})();");
-
-    return g_string_free (js, FALSE);
-}
-
-static gboolean
-adblock_navigation_policy_decision_requested_cb (WebKitWebView*             web_view,
-                                                 WebKitWebFrame*            web_frame,
-                                                 WebKitNetworkRequest*      request,
-                                                 WebKitWebNavigationAction* action,
-                                                 WebKitWebPolicyDecision*   decision,
-                                                 MidoriExtension*           extension)
-{
-    const gchar* uri = webkit_network_request_get_uri (request);
-    if (g_str_has_prefix (uri, "abp:"))
-    {
-        gchar** parts;
-        gchar* filter;
-        if (g_str_has_prefix (uri, "abp:subscribe?location="))
-            uri = &uri[23];
-        else if (g_str_has_prefix (uri, "abp://subscribe?location="))
-            uri = &uri[25];
-        else
-            return FALSE;
-
-        parts = g_strsplit (uri, "&", 2);
-        filter = soup_uri_decode (parts[0]);
-        webkit_web_policy_decision_ignore (decision);
-        adblock_show_preferences_dialog (extension, filter);
-        g_free (filter);
-        g_strfreev (parts);
-        return TRUE;
-    }
-
-    if (web_frame == webkit_web_view_get_main_frame (web_view))
-    {
-        const gchar* req_uri = webkit_network_request_get_uri (request);
-        g_hash_table_replace (navigationwhitelist, web_view, g_strdup (req_uri));
-    }
-    return false;
-}
-
-
-static void
-adblock_resource_request_starting_cb (WebKitWebView*         web_view,
-                                      WebKitWebFrame*        web_frame,
-                                      WebKitWebResource*     web_resource,
-                                      WebKitNetworkRequest*  request,
-                                      WebKitNetworkResponse* response,
-                                      MidoriView*            view)
-{
-    SoupMessage* msg;
-    GList* blocked_uris;
-    const gchar* req_uri;
-    const char *page_uri;
-
-    page_uri = webkit_web_view_get_uri (web_view);
-    /* Skip checks on about: pages */
-    if (midori_uri_is_blank (page_uri))
-        return;
-
-    req_uri = webkit_network_request_get_uri (request);
-
-    if (!g_strcmp0 (req_uri, g_hash_table_lookup (navigationwhitelist, web_view)))
-        return;
-
-    if (!midori_uri_is_http (req_uri)
-     || g_str_has_suffix (req_uri, "favicon.ico"))
-        return;
-
-    msg = webkit_network_request_get_message (request);
-    if (!(msg && !g_strcmp0 (msg->method, "GET")))
-        return;
-
-    if (response != NULL) /* request is caused by redirect */
-    {
-        if (web_frame == webkit_web_view_get_main_frame (web_view))
-        {
-            g_hash_table_replace (navigationwhitelist, web_view, g_strdup (req_uri));
-            return;
-        }
-    }
-
-    if (midori_debug ("adblock:time"))
-        g_test_timer_start ();
-    if (adblock_is_matched (req_uri, page_uri))
-    {
-        blocked_uris = g_object_get_data (G_OBJECT (web_view), "blocked-uris");
-        blocked_uris = g_list_prepend (blocked_uris, g_strdup (req_uri));
-        webkit_network_request_set_uri (request, "about:blank");
-        g_object_set_data (G_OBJECT (web_view), "blocked-uris", blocked_uris);
-    }
-    if (midori_debug ("adblock:time"))
-        g_debug ("match: %f%s", g_test_timer_elapsed (), "seconds");
-}
-
-static void
-adblock_custom_block_image_cb (GtkWidget*       widget,
-                               MidoriExtension* extension)
-{
-    gchar* custom_list;
-    FILE* list;
-    MidoriApp* app;
-    GtkWidget* browser;
-    GtkWidget* dialog;
-    GtkWidget* content_area;
-    GtkSizeGroup* sizegroup;
-    GtkWidget* hbox;
-    GtkWidget* label;
-    GtkWidget* entry;
-    gchar* title;
-
-    app = midori_extension_get_app (extension);
-    browser = katze_object_get_object (app, "browser");
-
-    title = _("Edit rule");
-    dialog = gtk_dialog_new_with_buttons (title, GTK_WINDOW (browser),
-            GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
-            GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-            GTK_STOCK_ADD, GTK_RESPONSE_ACCEPT,
-            NULL);
-    content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
-    gtk_window_set_icon_name (GTK_WINDOW (dialog), GTK_STOCK_ADD);
-    gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
-    gtk_container_set_border_width (GTK_CONTAINER (content_area), 5);
-    sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
-
-    hbox = gtk_hbox_new (FALSE, 8);
-    gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
-    label = gtk_label_new_with_mnemonic (_("_Rule:"));
-    gtk_size_group_add_widget (sizegroup, label);
-    gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-    entry = gtk_entry_new ();
-    gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE);
-    gtk_entry_set_text (GTK_ENTRY (entry),
-                        g_object_get_data (G_OBJECT (widget), "uri"));
-    gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0);
-    gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE, TRUE, 0);
-    gtk_widget_show_all (hbox);
-
-    gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
-    if (gtk_dialog_run (GTK_DIALOG (dialog)) != GTK_RESPONSE_ACCEPT)
-    {
-        gtk_widget_destroy (dialog);
-        return;
-    }
-
-    custom_list = g_build_filename (midori_extension_get_config_dir (extension),
-                                    CUSTOM_LIST_NAME, NULL);
-    katze_mkdir_with_parents (midori_extension_get_config_dir (extension), 0700);
-    if ((list = g_fopen (custom_list, "a+")))
-    {
-        g_fprintf (list, "%s\n", gtk_entry_get_text (GTK_ENTRY (entry)));
-        fclose (list);
-        adblock_reload_rules (extension, TRUE);
-        g_debug ("%s: Updated custom list\n", G_STRFUNC);
-    }
-    else
-        g_debug ("%s: Failed to open custom list %s\n", G_STRFUNC, custom_list);
-    g_free (custom_list);
-    gtk_widget_destroy (dialog);
-}
-
-static void
-adblock_populate_popup_cb (WebKitWebView*   web_view,
-                           GtkWidget*       menu,
-                           MidoriExtension* extension)
-{
-    GtkWidget* menuitem;
-    gchar *uri;
-    gint x, y;
-    GdkEventButton event;
-    WebKitHitTestResultContext context;
-    WebKitHitTestResult* hit_test;
-
-    gdk_window_get_pointer (gtk_widget_get_window(GTK_WIDGET (web_view)), &x, &y, NULL);
-    event.x = x;
-    event.y = y;
-    hit_test = webkit_web_view_get_hit_test_result (web_view, &event);
-    context = katze_object_get_int (hit_test, "context");
-    if (context & WEBKIT_HIT_TEST_RESULT_CONTEXT_IMAGE)
-    {
-        uri = katze_object_get_string (hit_test, "image-uri");
-        menuitem = gtk_menu_item_new_with_mnemonic (_("Bl_ock image"));
-    }
-    else if (context & WEBKIT_HIT_TEST_RESULT_CONTEXT_LINK)
-    {
-        uri = katze_object_get_string (hit_test, "link-uri");
-        menuitem = gtk_menu_item_new_with_mnemonic (_("Bl_ock link"));
-    }
-    else
-        return;
-    gtk_widget_show (menuitem);
-    gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
-    g_object_set_data_full (G_OBJECT (menuitem), "uri", uri, (GDestroyNotify)g_free);
-    g_signal_connect (menuitem, "activate",
-        G_CALLBACK (adblock_custom_block_image_cb), extension);
-}
-
-static void
-adblock_load_finished_cb (WebKitWebView  *web_view,
-                          WebKitWebFrame *web_frame,
-                          gpointer        user_data)
-{
-    GList* uris = g_object_get_data (G_OBJECT (web_view), "blocked-uris");
-    gchar* script;
-    GList* li;
-
-    if (g_list_nth_data (uris, 0) == NULL)
-        return;
-
-    script = adblock_prepare_urihider_js (uris);
-    webkit_web_view_execute_script (web_view, script);
-    li = NULL;
-    for (li = uris; li != NULL; li = g_list_next (li))
-        uris = g_list_remove (uris, li->data);
-    g_free (script);
-    g_object_set_data (G_OBJECT (web_view), "blocked-uris", uris);
-}
-
-static void
-adblock_window_object_cleared_cb (WebKitWebView*  web_view,
-                                  WebKitWebFrame* web_frame,
-                                  JSContextRef    js_context,
-                                  JSObjectRef     js_window)
-{
-    const char *page_uri;
-    gchar* script;
-
-    page_uri = webkit_web_frame_get_uri (web_frame);
-    /* Don't add adblock css into speeddial and about: pages */
-    if (!midori_uri_is_http (page_uri))
-        return;
-
-    script = adblock_build_js (page_uri);
-    if (!script)
-        return;
-
-    g_free (sokoke_js_script_eval (js_context, script, NULL));
-    g_free (script);
-}
-
-static void
-adblock_add_tab_cb (MidoriBrowser*   browser,
-                    MidoriView*      view,
-                    MidoriExtension* extension)
-{
-    GtkWidget* web_view = midori_view_get_web_view (view);
-
-    g_signal_connect (web_view, "window-object-cleared",
-        G_CALLBACK (adblock_window_object_cleared_cb), 0);
-
-    g_signal_connect_after (web_view, "populate-popup",
-        G_CALLBACK (adblock_populate_popup_cb), extension);
-    g_signal_connect (web_view, "navigation-policy-decision-requested",
-        G_CALLBACK (adblock_navigation_policy_decision_requested_cb), extension);
-    g_signal_connect (web_view, "resource-request-starting",
-        G_CALLBACK (adblock_resource_request_starting_cb), view);
-    g_signal_connect (web_view, "load-finished",
-        G_CALLBACK (adblock_load_finished_cb), view);
-}
-
-static void
-adblock_remove_tab_cb (MidoriBrowser*   browser,
-                       MidoriView*      view,
-                       MidoriExtension* extension)
-{
-    GtkWidget* web_view = midori_view_get_web_view (view);
-    g_hash_table_remove (navigationwhitelist, web_view);
-}
-
-static void
-adblock_deactivate_cb (MidoriExtension* extension,
-                       MidoriBrowser*   browser);
-
-static void
-adblock_app_add_browser_cb (MidoriApp*       app,
-                            MidoriBrowser*   browser,
-                            MidoriExtension* extension)
-{
-    GtkWidget* statusbar;
-    GtkWidget* image;
-    GList* children;
-
-    statusbar = katze_object_get_object (browser, "statusbar");
-    image = NULL;
-    /* image = gtk_image_new_from_stock (STOCK_IMAGE, GTK_ICON_SIZE_MENU);
-    gtk_widget_show (image);
-    gtk_box_pack_start (GTK_BOX (statusbar), image, FALSE, FALSE, 3); */
-    g_object_set_data_full (G_OBJECT (browser), "status-image", image,
-                            (GDestroyNotify)gtk_widget_destroy);
-
-    children = midori_browser_get_tabs (MIDORI_BROWSER (browser));
-    for (; children; children = g_list_next (children))
-        adblock_add_tab_cb (browser, children->data, extension);
-    g_list_free (children);
-
-    g_signal_connect (browser, "add-tab",
-        G_CALLBACK (adblock_add_tab_cb), extension);
-    g_signal_connect (browser, "remove-tab",
-        G_CALLBACK (adblock_remove_tab_cb), extension);
-    g_signal_connect (extension, "open-preferences",
-        G_CALLBACK (adblock_open_preferences_cb), extension);
-    g_signal_connect (extension, "deactivate",
-        G_CALLBACK (adblock_deactivate_cb), browser);
-    g_object_unref (statusbar);
-}
-
-static GString*
-adblock_fixup_regexp (const gchar* prefix,
-                      gchar*       src)
-{
-    GString* str;
-    int len = 0;
-
-    if (!src)
-        return NULL;
-
-    str = g_string_new (prefix);
-
-    /* lets strip first .* */
-    if (src[0] == '*')
-    {
-        (void)*src++;
-    }
-
-    do
-    {
-        switch (*src)
-        {
-        case '*':
-            g_string_append (str, ".*");
-            break;
-        /*case '.':
-            g_string_append (str, "\\.");
-            break;*/
-        case '?':
-            g_string_append (str, "\\?");
-            break;
-        case '|':
-        /* FIXME: We actually need to match :[0-9]+ or '/'. Sign means
-           "here could be port number or nothing". So bla.com^ will match
-           bla.com/ or bla.com:8080/ but not bla.com.au/ */
-        case '^':
-        case '+':
-            break;
-        case '[':
-            g_string_append (str, "\\[");
-            break;
-        case ']':
-            g_string_append (str, "\\]");
-            break;
-        case '(':
-            g_string_append (str, "\\(");
-            break;
-        case ')':
-            g_string_append (str, "\\)");
-            break;
-        default:
-            g_string_append_printf (str,"%c", *src);
-            break;
-        }
-        src++;
-    }
-    while (*src);
-
-    len = str->len;
-    /* We dont need .* in the end of url. Thats stupid */
-    if (str->str && str->str[len-1] == '*' && str->str[len-2] == '.')
-        g_string_erase (str, len-2, 2);
-
-    return str;
-}
-
-static gboolean
-adblock_compile_regexp (GString* gpatt,
-                        gchar*   opts)
-{
-    GRegex* regex;
-    GError* error = NULL;
-    int pos = 0;
-    gchar *sig;
-    gchar *patt;
-    int len;
-
-    if (!gpatt)
-        return FALSE;
-
-    patt = gpatt->str;
-    len = gpatt->len;
-
-    /* TODO: Play with optimization flags */
-    regex = g_regex_new (patt, G_REGEX_OPTIMIZE,
-                         G_REGEX_MATCH_NOTEMPTY, &error);
-    if (error)
-    {
-        g_warning ("%s: %s", G_STRFUNC, error->message);
-        g_error_free (error);
-        return TRUE;
-    }
-
-    if (!g_regex_match_simple ("^/.*[\\^\\$\\*].*/$", patt, G_REGEX_UNGREEDY, G_REGEX_MATCH_NOTEMPTY))
-    {
-        int signature_count = 0;
-
-        for (pos = len - SIGNATURE_SIZE; pos >= 0; pos--) {
-            sig = g_strndup (patt + pos, SIGNATURE_SIZE);
-            if (!g_regex_match_simple ("[\\*]", sig, G_REGEX_UNGREEDY, G_REGEX_MATCH_NOTEMPTY) &&
-                !g_hash_table_lookup (keys, sig))
-            {
-                adblock_debug ("sig: %s %s", sig, patt);
-                g_hash_table_insert (keys, sig, regex);
-                g_hash_table_insert (optslist, sig, g_strdup (opts));
-                signature_count++;
-            }
-            else
-            {
-                if (g_regex_match_simple ("^\\*", sig, G_REGEX_UNGREEDY, G_REGEX_MATCH_NOTEMPTY) &&
-                    !g_hash_table_lookup (pattern, patt))
-                {
-                    adblock_debug ("patt2: %s %s", sig, patt);
-                    g_hash_table_insert (pattern, patt, regex);
-                    g_hash_table_insert (optslist, patt, g_strdup (opts));
-                }
-                g_free (sig);
-            }
-        }
-        if (signature_count > 1 && g_hash_table_lookup (pattern, patt))
-        {
-            g_hash_table_steal (pattern, patt);
-            return TRUE;
-        }
-        return FALSE;
-    }
-    else
-    {
-        adblock_debug ("patt: %s%s", patt, "");
-        /* Pattern is a regexp chars */
-        g_hash_table_insert (pattern, patt, regex);
-        g_hash_table_insert (optslist, patt, g_strdup (opts));
-        return FALSE;
-    }
-}
-
-static gchar*
-adblock_add_url_pattern (gchar* prefix,
-                         gchar* type,
-                         gchar* line)
-{
-    gchar** data;
-    gchar* patt;
-    GString* format_patt;
-    gchar* opts;
-    gboolean should_free;
-
-    data = g_strsplit (line, "$", -1);
-    if (!data || !data[0])
-    {
-        g_strfreev (data);
-        return NULL;
-    }
-
-    if (data[1] && data[2])
-    {
-        patt = g_strconcat (data[0], data[1], NULL);
-        opts = g_strconcat (type, ",", data[2], NULL);
-    }
-    else if (data[1])
-    {
-        patt = data[0];
-        opts = g_strconcat (type, ",", data[1], NULL);
-    }
-    else
-    {
-        patt = data[0];
-        opts = type;
-    }
-
-    if (g_regex_match_simple ("subdocument", opts,
-                              G_REGEX_CASELESS, G_REGEX_MATCH_NOTEMPTY))
-    {
-        if (data[1] && data[2])
-            g_free (patt);
-        if (data[1])
-            g_free (opts);
-        g_strfreev (data);
-        return NULL;
-    }
-
-    format_patt = adblock_fixup_regexp (prefix, patt);
-
-    adblock_debug ("got: %s opts %s", format_patt->str, opts);
-    should_free = adblock_compile_regexp (format_patt, opts);
-
-    if (data[1] && data[2])
-        g_free (patt);
-    if (data[1])
-        g_free (opts);
-    g_strfreev (data);
-
-    return g_string_free (format_patt, should_free);
-}
-
-static void
-adblock_frame_add (gchar* line)
-{
-    const gchar* separator = " , ";
-
-    (void)*line++;
-    (void)*line++;
-    if (strchr (line, '\'')
-    || (strchr (line, ':')
-    && !g_regex_match_simple (".*\\[.*:.*\\].*", line,
-                              G_REGEX_CASELESS, G_REGEX_MATCH_NOTEMPTY)))
-    {
-        return;
-    }
-    g_string_append (blockcss, separator);
-    g_string_append (blockcss, line);
-}
-
-static void
-adblock_update_css_hash (gchar* domain,
-                         gchar* value)
-{
-    const gchar* olddata;
-    gchar* newdata;
-
-    if ((olddata = g_hash_table_lookup (blockcssprivate, domain)))
-    {
-        newdata = g_strconcat (olddata, " , ", value, NULL);
-        g_hash_table_replace (blockcssprivate, g_strdup (domain), newdata);
-    }
-    else
-        g_hash_table_insert (blockcssprivate, g_strdup (domain), g_strdup (value));
-}
-
-static void
-adblock_frame_add_private (const gchar* line,
-                           const gchar* sep)
-{
-    gchar** data;
-    data = g_strsplit (line, sep, 2);
-
-    if (!(data[1] && *data[1])
-     ||  strchr (data[1], '\'')
-     || (strchr (data[1], ':')
-     && !g_regex_match_simple (".*\\[.*:.*\\].*", data[1],
-                               G_REGEX_CASELESS, G_REGEX_MATCH_NOTEMPTY)))
-    {
-        g_strfreev (data);
-        return;
-    }
-
-    if (strchr (data[0], ','))
-    {
-        gchar** domains;
-        gint i;
-
-        domains = g_strsplit (data[0], ",", -1);
-        for (i = 0; domains[i]; i++)
-        {
-            gchar* domain;
-
-            domain = domains[i];
-            /* Ignore Firefox-specific option */
-            if (!g_strcmp0 (domain, "~pregecko2"))
-                continue;
-            /* FIXME: ~ should negate match */
-            if (domain[0] == '~')
-                domain++;
-            adblock_update_css_hash (g_strstrip (domain), data[1]);
-        }
-        g_strfreev (domains);
-    }
-    else
-    {
-        adblock_update_css_hash (data[0], data[1]);
-    }
-    g_strfreev (data);
-}
-
-static gchar*
-adblock_parse_line (gchar* line)
-{
-    /*
-     * AdblockPlus rule reference based on http://adblockplus.org/en/filters
-     * Block URL:
-     *   http://example.com/ads/banner123.gif
-     *   http://example.com/ads/banner*.gif
-     * Partial match for "ad":
-     *   *ad*
-     *   ad
-     * Block example.com/annoyingflash.swf but not example.com/swf/:
-     *   swf|
-     * Block bad.example/banner.gif but not good.example/analyze?http://bad.example:
-     *   |http://baddomain.example/
-     * Block http(s) example.com but not badexample.com or good.example/analyze?http://bad.example:
-     *   ||example.com/banner.gif
-     * Block example.com/ and example.com:8000/ but not example.com.ar/:
-     *   http://example.com^
-     * A ^ matches anything that isn't A-Za-z0-0_-.%
-     * Block example.com:8000/foo.bar?a=12&b=%D1%82%D0%B5:
-     *   ^example.com^
-     *   ^%D1%82%D0%B5^
-     *   ^foo.bar^
-     * TODO: ^ is partially supported by Midori
-     * Block banner123 and banner321 with a regex:
-     *   /banner\d+/
-     * Never block URIs with "advice":
-     *   @@advice
-     * No blocking at all:
-     *   @@http://example.com
-     *   @@|http://example.com
-     * TODO: @@ is currently ignored by Midori.
-     * Element hiding by class:
-     *   ##textad
-     *   ##div.textad
-     * Element hiding by id:
-     *   ##div#sponsorad
-     *   ##*#sponsorad
-     * Match example.com/ and something.example.com/ but not example.org/
-     *   example.com##*.sponsor
-     * Match multiple domains:
-     *   domain1.example,domain2.example,domain3.example##*.sponsor
-     * Match on any domain but "example.com":
-     *  ~example.com##*.sponsor
-     * Match on "example.com" except "foo.example.com":
-     *   example.com,~foo.example.com##*.sponsor
-     * By design rules only apply to full domain names:
-     *   "domain" is NOT equal to "domain.example,domain.test."
-     * In Firefox rules can apply to browser UI:
-     *   browser##menuitem#javascriptConsole will hide the Console menuitem
-     * Hide tables with width attribute 80%:
-     *   ##table[width="80%"]
-     * Hide all div with title attribute containing "adv":
-     *   ##div[title*="adv"]
-     * Hide div with title starting with "adv" and ending with "ert":
-     *   ##div[title^="adv"][title$="ert"]
-     * Match tables with width attribute 80% and bgcolor attribute white:
-     *   table[width="80%"][bgcolor="white"]
-     * TODO: [] is currently ignored by Midori
-     * Hide anything following div with class "adheader":
-     *   ##div.adheader + *
-     * Old CSS element hiding syntax, officially deprecated:
-     *   #div(id=foo)
-     * Match anything but "example.com"
-     *   ~example.com##*.sponsor
-     * TODO: ~ is currently ignored by Midori
-     * Match "example.com" domain except "foo.example.com":
-     *   example.com,~foo.example.com##*.sponsor
-     * ! Comment
-     * Supported options after a trailing $:
-     *   domain,third-party,~pregecko2
-     * Official options (not all supported by Midori):
-     *   script,image,stylesheet,object,xmlhttprequest,object-subrequest,
-     *   subdocument,document,elemhide,popup,third-party,sitekey,match-case
-     *   collapse,donottrack,pregecko2
-     * Deprecated:
-     *   background,xbl,ping,dtd
-     * Inverse options:
-     *   ~script,~image,~stylesheet,~object,~xmlhttprequest,~collapse,
-     *   ~object-subrequest,~subdocument,~document,~elemhide,~third-party,
-     *   ~pregecko2
-     **/
-
-    /* Skip invalid, empty and comment lines */
-    if (!(line && line[0] != ' ' && line[0] != '!' && line[0]))
-        return NULL;
-
-    /* FIXME: No support for whitelisting */
-    if (line[0] == '@' && line[1] == '@')
-        return NULL;
-    /* FIXME: No support for [include] and [exclude] tags */
-    if (line[0] == '[')
-        return NULL;
-
-    g_strchomp (line);
-
-    /* Got CSS block hider */
-    if (line[0] == '#' && line[1] == '#' )
-    {
-        adblock_frame_add (line);
-        return NULL;
-    }
-    /* Got CSS block hider. Workaround */
-    if (line[0] == '#')
-        return NULL;
-
-    /* Got per domain CSS hider rule */
-    if (strstr (line, "##"))
-    {
-        adblock_frame_add_private (line, "##");
-        return NULL;
-    }
-    /* Got per domain CSS hider rule. Workaround */
-    if (strchr (line, '#'))
-    {
-        adblock_frame_add_private (line, "#");
-        return NULL;
-    }
-
-    /* Got URL blocker rule */
-    if (line[0] == '|' && line[1] == '|' )
-    {
-        (void)*line++;
-        (void)*line++;
-        return adblock_add_url_pattern ("", "fulluri", line);
-    }
-    if (line[0] == '|')
-    {
-        (void)*line++;
-        return adblock_add_url_pattern ("^", "fulluri", line);
-    }
-    return adblock_add_url_pattern ("", "uri", line);
-}
-
-static GDateMonth
-str_month_name_to_gdate (const gchar* month)
-{
-    guint i;
-    const gchar* months[] = {
-        "", "January", "February", "March", "April", "May", "June",
-        "July", "August", "September", "October", "November", "December"
-    };
-
-    for (i = 0; i < G_N_ELEMENTS (months); i++)
-    {
-        if (strncmp (month, months[i], 3) == 0)
-            return i;
-    }
-    return 0;
-}
-
-static gboolean
-adblock_file_is_up_to_date (gchar* path)
-{
-    FILE* file;
-    gchar line[2000];
-
-    /* Check a chunk of header for update info */
-    if ((file = g_fopen (path, "r")))
-    {
-        gint days_to_expire = 0;
-        gchar* timestamp = NULL;
-        guint i;
-        gboolean found_meta = FALSE;
-        gint fs_days_elapsed, days_elapsed = 0, least_days;
-
-        for (i = 0; i <= 15; i++)
-        {
-            if (!fgets (line, 2000, file))
-                break;
-
-            if (strncmp ("! Expires", line, 9) == 0)
-            {
-                gchar** parts = g_strsplit (line, " ", 4);
-                days_to_expire = atoi (parts[2]);
-                g_strfreev (parts);
-                found_meta = TRUE;
-            }
-            if (strncmp ("! This list expires after", line, 25) == 0)
-            {
-                gchar** parts = g_strsplit (line, " ", 7);
-
-                if (strncmp (parts[6], "days", 4) == 0)
-                    days_to_expire = atoi (parts[5]);
-                if (strncmp (parts[6], "hours", 5) == 0)
-                    days_to_expire = (atoi (parts[5])) / 24;
-
-                g_strfreev (parts);
-                found_meta = TRUE;
-            }
-
-            if (strncmp ("! Last mod", line, 10) == 0
-            ||  strncmp ("! Updated", line, 9) == 0)
-            {
-                gchar** parts = g_strsplit (line, ":", 2);
-                timestamp = g_strdup (parts[1] + 1);
-                g_strchomp (timestamp);
-                g_strfreev (parts);
-                found_meta = TRUE;
-            }
-        }
-
-        if (!found_meta)
-        {
-            g_print ("Adblock: no metadata found in %s (broken download?)\n", path);
-            return FALSE;
-        }
-
-        /* query filesystem about file change, maybe there is no update yet
-         * or there is no "modified" metadata to check, otherwise we will repeatedly
-         * download files that have no new updates */
-        {
-            GDate* current = g_date_new ();
-            GDate* fs_mod_date = g_date_new ();
-            GTimeVal mod_time;
-            GFile* filter_file = g_file_new_for_path (path);
-            GFileInfo* info = g_file_query_info (filter_file, "time:modified", 0, NULL, NULL);
-
-            g_file_info_get_modification_time (info, &mod_time);
-            g_date_set_time_t (current, time (NULL));
-            g_date_set_time_val (fs_mod_date, &mod_time);
-
-            fs_days_elapsed = g_date_days_between (fs_mod_date, current);
-
-            g_date_free (current);
-            g_date_free (fs_mod_date);
-        }
-
-        /* If there is no update metadata but file is valid, assume one week */
-        if ((!days_to_expire && !timestamp) && fs_days_elapsed < 7)
-            return TRUE;
-
-        if (days_to_expire && timestamp != NULL)
-        {
-            GDate* current = g_date_new ();
-            GDate* mod_date = g_date_new ();
-            gchar** parts;
-            gboolean use_dots = FALSE;
-
-            /* Common dates are 20 Mar 2012, 20.08.2012 */
-            if (strrchr (timestamp, '.'))
-            {
-                use_dots = TRUE;
-                /* In case of date like '20.08.2012 12:34'
-                 * we should also nuke the time part */
-                if (strrchr (timestamp, ' '))
-                {
-                    gchar** part = g_strsplit (timestamp, " ", 2);
-                    parts = g_strsplit (part[0], ".", 4);
-                    g_strfreev (part);
-                }
-                else
-                    parts = g_strsplit (timestamp, ".", 4);
-            }
-            else
-                parts = g_strsplit (timestamp, " ", 4);
-
-            if (use_dots)
-                g_date_set_month (mod_date, atoi (parts[1]));
-            else
-                g_date_set_month (mod_date, str_month_name_to_gdate (parts[1]));
-
-            /* check if first part is year 201(2) or day */
-            if (strncmp (parts[0], "201", 3) == 0)
-            {
-                g_date_set_day (mod_date, atoi (parts[2]));
-                g_date_set_year (mod_date, atoi (parts[0]));
-            }
-            else
-            {
-                g_date_set_day (mod_date, atoi (parts[0]));
-                g_date_set_year (mod_date, atoi (parts[2]));
-            }
-            g_strfreev (parts);
-
-            g_date_set_time_t (current, time (NULL));
-            days_elapsed = g_date_days_between (mod_date, current);
-
-            g_date_free (current);
-            g_date_free (mod_date);
-            g_free (timestamp);
-        }
-
-        /* File from the future? Assume up to date */
-        if (days_elapsed < 0)
-        {
-            g_print ("Adblock: file %s appears to be from the future,"
-                     "check your system clock!\n", path);
-            return TRUE;
-        }
-
-        least_days = days_elapsed < fs_days_elapsed ? days_elapsed : fs_days_elapsed;
-        if (least_days < days_to_expire)
-            return TRUE;
-        else
-            return FALSE;
-
-        return TRUE;
-    }
-    return FALSE;
-}
-
-static void
-adblock_parse_file (gchar* path)
-{
-    FILE* file;
-    gchar line[2000];
-
-    if ((file = g_fopen (path, "r")))
-    {
-        while (fgets (line, 2000, file))
-            adblock_parse_line (line);
-        fclose (file);
-    }
-}
-
-static void
-adblock_deactivate_tabs (MidoriView*      view,
-                         MidoriBrowser*   browser,
-                         MidoriExtension* extension)
-{
-    GtkWidget* web_view = midori_view_get_web_view (view);
-
-    g_signal_handlers_disconnect_by_func (
-       web_view, adblock_window_object_cleared_cb, 0);
-    g_signal_handlers_disconnect_by_func (
-       web_view, adblock_populate_popup_cb, extension);
-    g_signal_handlers_disconnect_by_func (
-       web_view, adblock_resource_request_starting_cb, view);
-    g_signal_handlers_disconnect_by_func (
-       web_view, adblock_load_finished_cb, view);
-    g_signal_handlers_disconnect_by_func (
-       web_view, adblock_navigation_policy_decision_requested_cb, extension);
-}
-
-static void
-adblock_deactivate_cb (MidoriExtension* extension,
-                       MidoriBrowser*   browser)
-{
-    GList* children;
-    MidoriApp* app = midori_extension_get_app (extension);
-    MidoriWebSettings* settings = katze_object_get_object (app, "settings");
-
-    g_signal_handlers_disconnect_by_func (
-        browser, adblock_open_preferences_cb, extension);
-    g_signal_handlers_disconnect_by_func (
-        extension, adblock_deactivate_cb, browser);
-    g_signal_handlers_disconnect_by_func (
-        app, adblock_app_add_browser_cb, extension);
-    g_signal_handlers_disconnect_by_func (
-        browser, adblock_add_tab_cb, extension);
-    g_signal_handlers_disconnect_by_func (
-        browser, adblock_remove_tab_cb, extension);
-
-    children = midori_browser_get_tabs (MIDORI_BROWSER (browser));
-    for (; children; children = g_list_next (children))
-        adblock_deactivate_tabs (children->data, browser, extension);
-    g_list_free (children);
-
-    adblock_destroy_db ();
-    midori_web_settings_remove_style (settings, "adblock-blockcss");
-    g_object_unref (settings);
-}
-
-static void
-adblock_activate_cb (MidoriExtension* extension,
-                     MidoriApp*       app)
-{
-    KatzeArray* browsers;
-    MidoriBrowser* browser;
-
-    adblock_reload_rules (extension, FALSE);
-
-    browsers = katze_object_get_object (app, "browsers");
-    KATZE_ARRAY_FOREACH_ITEM (browser, browsers)
-        adblock_app_add_browser_cb (app, browser, extension);
-    g_signal_connect (app, "add-browser",
-        G_CALLBACK (adblock_app_add_browser_cb), extension);
-
-    g_object_unref (browsers);
-}
-
-static void
-test_adblock_parse (void)
-{
-    adblock_init_db ();
-    g_assert (!adblock_parse_line (NULL));
-    g_assert (!adblock_parse_line ("!"));
-    g_assert (!adblock_parse_line ("@@"));
-    g_assert (!adblock_parse_line ("##"));
-    g_assert (!adblock_parse_line ("["));
-
-    g_assert_cmpstr (adblock_parse_line ("+advert/"), ==, "advert/");
-    g_assert_cmpstr (adblock_parse_line ("*foo"), ==, "foo");
-    g_assert_cmpstr (adblock_parse_line ("f*oo"), ==, "f.*oo");
-    g_assert_cmpstr (adblock_parse_line ("?foo"), ==, "\\?foo");
-    g_assert_cmpstr (adblock_parse_line ("foo?"), ==, "foo\\?");
-
-    g_assert_cmpstr (adblock_parse_line (".*foo/bar"), ==, "..*foo/bar");
-    g_assert_cmpstr (adblock_parse_line ("http://bla.blub/*"), ==, "http://bla.blub/");
-    g_assert_cmpstr (adblock_parse_line ("bag?r[]=*cpa"), ==, "bag\\?r\\[\\]=.*cpa");
-    g_assert_cmpstr (adblock_parse_line ("(facebookLike,"), ==, "\\(facebookLike,");
-    adblock_destroy_db ();
-}
-
-static void
-test_subscription_update (void)
-{
-    gint temp;
-    gchar* filename;
-
-    adblock_init_db ();
-    temp = g_file_open_tmp ("midori_adblock_update_test_XXXXXX", &filename, NULL);
-    close (temp);
-
-    g_file_set_contents (filename, "", -1, NULL);
-    g_assert (!adblock_file_is_up_to_date (filename));
-
-    g_file_set_contents (filename,
-        "[Adblock Plus 1.1]\n"
-        "! Checksum: 48f6Qdo4PsNogsurLvQ71w\n"
-        "! Title: EasyList\n"
-        "! Last modified: 05 Sep 2010 11:00 UTC\n"
-        "! This list expires after 48 hours\n",
-            -1, NULL);
-    g_assert (!adblock_file_is_up_to_date (filename));
-
-    g_file_set_contents (filename,
-        "[Adblock Plus 1.1]\n"
-        "! Checksum: 48f6Qdo4PsNogsurLvQ71w\n"
-        "! Title: EasyList\n"
-        "! Last modified: 05.09.2010 11:00 UTC\n"
-        "! Expires: 2 days (update frequency)\n",
-            -1, NULL);
-    g_assert (!adblock_file_is_up_to_date (filename));
-
-    g_file_set_contents (filename,
-        "[Adblock Plus 1.1]\n"
-        "! Checksum: 48f6Qdo4PsNogsurLvQ71w\n"
-        "! Title: EasyList\n"
-        "! Updated: 05 Nov 2014 11:00 UTC\n"
-        "! Expires: 5 days (update frequency)\n",
-            -1, NULL);
-    g_assert (adblock_file_is_up_to_date (filename));
-
-    g_file_set_contents (filename,
-        "[Adblock]\n"
-        "! dutchblock v3\n"
-        "! This list expires after 14 days\n"
-        "|http://b*.mookie1.com/\n",
-        -1, NULL);
-    g_assert (adblock_file_is_up_to_date (filename));
-
-    g_file_set_contents (filename,
-        "[Adblock Plus 2.0]\n"
-        "! Checksum: S4reE8XaYTtAFxe2RjgBPg\n"
-        "! Last modification time (GMT): 2012.11.05 13:33\n"
-        "! Expires: 5 days (update frequency)\n",
-        -1, NULL);
-    g_assert (!adblock_file_is_up_to_date (filename));
-
-    g_file_set_contents (filename,
-        "[Adblock Plus 2.0]\n"
-        "! Checksum: S4reE8XaYTtAFxe2RjgBPg\n"
-        "! Last modification time (GMT): 2012.11.05 13:33\n",
-        -1, NULL);
-    g_assert (!adblock_file_is_up_to_date (filename));
-
-    g_unlink (filename);
-    g_free (filename);
-    adblock_destroy_db ();
-}
-
-static void
-test_adblock_pattern (void)
-{
-    gint temp;
-    gchar* filename;
-
-    adblock_init_db ();
-    temp = g_file_open_tmp ("midori_adblock_match_test_XXXXXX", &filename, NULL);
-
-    /* TODO: Update some tests and add new ones. */
-    g_file_set_contents (filename,
-        "*ads.foo.bar*\n"
-        "*ads.bogus.name*\n"
-        "||^http://ads.bla.blub/*\n"
-        "|http://ads.blub.boing/*$domain=xxx.com\n"
-        "engine.adct.ru/*?\n"
-        "/addyn|*|adtech;\n"
-        "doubleclick.net/pfadx/*.mtvi\n"
-        "objects.tremormedia.com/embed/xml/*.xml?r=\n"
-        "videostrip.com^*/admatcherclient.\n"
-        "test.dom/test?var\n"
-        "/adpage.\n"
-        "br.gcl.ru/cgi-bin/br/",
-        -1, NULL);
-
-    adblock_parse_file (filename);
-
-    g_test_timer_start ();
-    g_assert (adblock_is_matched ("http://www.engadget.com/_uac/adpage.html", ""));
-    g_assert (adblock_is_matched ("http://test.dom/test?var=1", ""));
-    g_assert (adblock_is_matched ("http://ads.foo.bar/teddy", ""));
-    g_assert (!adblock_is_matched ("http://ads.fuu.bar/teddy", ""));
-    g_assert (adblock_is_matched ("https://ads.bogus.name/blub", ""));
-    g_assert (adblock_is_matched ("http://ads.bla.blub/kitty", ""));
-    g_assert (adblock_is_matched ("http://ads.blub.boing/soda", ""));
-    g_assert (!adblock_is_matched ("http://ads.foo.boing/beer", ""));
-    g_assert (adblock_is_matched ("https://testsub.engine.adct.ru/test?id=1", ""));
-    if (USE_PATTERN_MATCHING)
-        g_assert (adblock_is_matched ("http://test.ltd/addyn/test/test?var=adtech;&var2=1", ""));
-    g_assert (adblock_is_matched ("http://add.doubleclick.net/pfadx/aaaa.mtvi", ""));
-    g_assert (!adblock_is_matched ("http://add.doubleclick.net/pfadx/aaaa.mtv", ""));
-    g_assert (adblock_is_matched ("http://objects.tremormedia.com/embed/xml/list.xml?r=", ""));
-    g_assert (!adblock_is_matched ("http://qq.videostrip.c/sub/admatcherclient.php", ""));
-    g_assert (adblock_is_matched ("http://qq.videostrip.com/sub/admatcherclient.php", ""));
-    g_assert (adblock_is_matched ("http://qq.videostrip.com/sub/admatcherclient.php", ""));
-    g_assert (adblock_is_matched ("http://br.gcl.ru/cgi-bin/br/test", ""));
-    g_assert (!adblock_is_matched ("https://bugs.webkit.org/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&long_desc_type=substring&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&keywords_type=allwords&keywords=&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&emailassigned_to1=1&emailtype1=substring&email1=&emailassigned_to2=1&emailreporter2=1&emailcc2=1&emailtype2=substring&email2=&bugidtype=include&bug_id=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&query_based_on=gtkport&field0-0-0=keywords&type0-0-0=anywordssubstr&value0-0-0=Gtk%20Cairo%20soup&field0-0-1=short_desc&type0-0-1=anywordssubstr&value0-0-1=Gtk%20Cairo%20soup%20autoconf%20automake%20autotool&field0-0-2=component&type0-0-2=equals&value0-0-2=WebKit%20Gtk", ""));
-    g_assert (!adblock_is_matched ("http://www.engadget.com/2009/09/24/google-hits-android-rom-modder-with-a-cease-and-desist-letter/", ""));
-    g_assert (!adblock_is_matched ("http://karibik-invest.com/es/bienes_raices/search.php?sqT=19&sqN=&sqMp=&sqL=0&qR=1&sqMb=&searchMode=1&action=B%FAsqueda", ""));
-    g_assert (!adblock_is_matched ("http://google.com", ""));
-
-    g_print ("Search took %f seconds\n", g_test_timer_elapsed ());
-
-    close (temp);
-    g_unlink (filename);
-    adblock_destroy_db ();
-}
-
-void
-extension_test (void)
-{
-    g_test_add_func ("/extensions/adblock/parse", test_adblock_parse);
-    g_test_add_func ("/extensions/adblock/pattern", test_adblock_pattern);
-    g_test_add_func ("/extensions/adblock/update", test_subscription_update);
-}
-
-MidoriExtension*
-extension_init (void)
-{
-    MidoriExtension* extension = g_object_new (MIDORI_TYPE_EXTENSION,
-        "name", _("Advertisement blocker"),
-        "description", _("Block advertisements according to a filter list"),
-        "version", "0.6" MIDORI_VERSION_SUFFIX,
-        "authors", "Christian Dywan <[e-mail]>",
-        NULL);
-    midori_extension_install_string_list (extension, "filters", NULL, G_MAXSIZE);
-
-    g_signal_connect (extension, "activate",
-        G_CALLBACK (adblock_activate_cb), NULL);
-
-    return extension;
-}
 
=== added file 'extensions/adblock/config.vala'
--- extensions/adblock/config.vala	1970-01-01 00:00:00 +0000
+++ extensions/adblock/config.vala	2014-02-20 20:31:17 +0000
@@ -0,0 +1,107 @@
+/*
+ Copyright (C) 2014 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.
+*/
+
+namespace Adblock {
+    public class Config : GLib.Object {
+        List<Subscription> subscriptions;
+        string? path;
+        KeyFile keyfile;
+        Subscription? custom;
+
+        public Config (string? path) {
+            subscriptions = new GLib.List<Subscription> ();
+
+            this.path = path;
+            if (path == null)
+                return;
+
+            string custom_list = GLib.Path.build_filename (path, "custom.list");
+            try {
+                custom = new Subscription (Filename.to_uri (custom_list, null));
+                subscriptions.append (custom);
+            } catch (Error error) {
+                custom = null;
+                warning ("Failed to add custom list %s: %s", custom_list, error.message);
+            }
+
+            string filename = GLib.Path.build_filename (path, "config");
+            keyfile = new GLib.KeyFile ();
+            try {
+                keyfile.load_from_file (filename, GLib.KeyFileFlags.NONE);
+                string[] filters = keyfile.get_string_list ("settings", "filters");
+                foreach (string filter in filters) {
+                    bool active = false;
+                    string uri = filter;
+                    if (filter.has_prefix ("http-"))
+                        uri = "http:" + filter.substring (6);
+                    else if (filter.has_prefix ("file-"))
+                        uri = "file:" + filter.substring (6);
+                    else if (filter.has_prefix ("https-"))
+                        uri = "https:" + filter.substring (7);
+                    else
+                        active = true;
+                    Subscription sub = new Subscription (uri);
+                    sub.active = active;
+                    sub.add_feature (new Updater ());
+                    sub.notify["active"].connect (active_changed);
+                    subscriptions.append (sub);
+                }
+            } catch (FileError.NOENT exist_error) {
+                /* It's no error if no config file exists */
+            } catch (GLib.Error settings_error) {
+                warning ("Error reading settings from %s: %s\n", filename, settings_error.message);
+            }
+
+            size = subscriptions.length ();
+        }
+
+        void active_changed (Object subscription, ParamSpec pspec) {
+            var filters = new StringBuilder ();
+            foreach (var sub in subscriptions) {
+                if (sub == custom)
+                    continue;
+                if (sub.uri.has_prefix ("http:") && !sub.active)
+                    filters.append ("http-" + sub.uri.substring (4));
+                else if (sub.uri.has_prefix ("file:") && !sub.active)
+                    filters.append ("file-" + sub.uri.substring (4));
+                else if (sub.uri.has_prefix ("https:") && !sub.active)
+                    filters.append ("https-" + sub.uri.substring (5));
+                else
+                    filters.append (sub.uri);
+                filters.append_c (';');
+            }
+
+            string[] list = (filters.str.slice (0, -1)).split (";");
+            keyfile.set_string_list ("settings", "filters", list);
+            try {
+                string filename = GLib.Path.build_filename (path, "config");
+                FileUtils.set_contents (filename, keyfile.to_data ());
+            } catch (Error error) {
+                warning ("Failed to save settings: %s", error.message);
+            }
+        }
+
+        public void add_custom_rule (string rule) {
+            try {
+                var file = File.new_for_uri (custom.uri);
+                file.append_to (FileCreateFlags.NONE).write (("%s\n".printf (rule)).data);
+            } catch (Error error) {
+                warning ("Failed to add custom rule: %s", error.message);
+            }
+        }
+
+        /* foreach support */
+        public new Subscription? get (uint index) {
+            return subscriptions.nth_data (index);
+        }
+        public uint size { get; private set; }
+    }
+}
 
=== added file 'extensions/adblock/element.vala'
--- extensions/adblock/element.vala	1970-01-01 00:00:00 +0000
+++ extensions/adblock/element.vala	2014-02-20 20:31:17 +0000
@@ -0,0 +1,36 @@
+/*
+ Copyright (C) 2014 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.
+*/
+
+namespace Adblock {
+    public class Element : Feature {
+        public HashTable<string, string> blockcssprivate;
+        bool debug_element;
+
+        public Element () {
+            base ();
+            debug_element = "adblock:element" in (Environment.get_variable ("MIDORI_DEBUG") ?? "");
+        }
+
+        public override void clear () {
+            blockcssprivate = new HashTable<string, string> (str_hash, str_equal);
+        }
+
+        public string? lookup (string domain) {
+            return blockcssprivate.lookup (domain);
+        }
+
+        public void insert (string domain, string value) {
+            if (debug_element)
+                stdout.printf ("Element to be blocked %s => %s\n", domain, value);
+            blockcssprivate.insert (domain, value);
+        }
+    }
+}
 
=== added file 'extensions/adblock/extension.vala'
--- extensions/adblock/extension.vala	1970-01-01 00:00:00 +0000
+++ extensions/adblock/extension.vala	2014-02-20 20:31:17 +0000
@@ -0,0 +1,545 @@
+/*
+ Copyright (C) 2009-2014 Christian Dywan <[e-mail]>
+ Copyright (C) 2009-2012 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.
+*/
+
+namespace Adblock {
+    public enum Directive {
+        ALLOW,
+        BLOCK
+    }
+
+    public class Extension : Midori.Extension {
+        Config config;
+        HashTable<string, Directive?> cache;
+
+#if HAVE_WEBKIT2
+        public Extension (WebKit.WebExtension web_extension) {
+            init ();
+            web_extension.page_created.connect (page_created);
+        }
+
+        void page_created (WebKit.WebPage web_page) {
+            web_page.send_request.connect (send_request);
+        }
+
+        bool send_request (WebKit.WebPage web_page, WebKit.URIRequest request, WebKit.URIResponse? redirected_response) {
+            return request_handled (web_page.uri, request.uri);
+        }
+#else
+        public Extension () {
+            GLib.Object (name: _("Advertisement blocker"),
+                         description: _("Block advertisements according to a filter list"),
+                         version: "2.0",
+                         authors: "Christian Dywan <[e-mail]>");
+            activate.connect (extension_activated);
+            open_preferences.connect (extension_preferences);
+        }
+
+        void extension_preferences () {
+            open_dialog (null);
+        }
+
+        void open_dialog (string? uri) {
+            var dialog = new Gtk.Dialog.with_buttons (_("Configure Advertisement filters"),
+                null,
+#if !HAVE_GTK3
+                Gtk.DialogFlags.NO_SEPARATOR |
+#endif
+                Gtk.DialogFlags.DESTROY_WITH_PARENT,
+                Gtk.STOCK_HELP, Gtk.ResponseType.HELP,
+                Gtk.STOCK_CLOSE, Gtk.ResponseType.CLOSE);
+#if HAVE_GTK3
+            dialog.get_widget_for_response (Gtk.ResponseType.HELP).get_style_context ().add_class ("help_button");
+#endif
+            dialog.set_icon_name (Gtk.STOCK_PROPERTIES);
+            dialog.set_response_sensitive (Gtk.ResponseType.HELP, false);
+
+            var hbox = new Gtk.HBox (false, 0);
+            (dialog.get_content_area () as Gtk.Box).pack_start (hbox, true, true, 12);
+            var vbox = new Gtk.VBox (false, 0);
+            hbox.pack_start (vbox, true, true, 4);
+            var button = new Gtk.Label (null);
+            string description = """
+                Type the address of a preconfigured filter list in the text entry
+                and click "Add" to add it to the list.
+                You can find more lists at %s %s.
+                """.printf (
+                "<a href=\"http://adblockplus.org/en/subscriptions\">adblockplus.org/en/subscriptions</a>",
+                "<a href=\"http://easylist.adblockplus.org/\">easylist.adblockplus.org</a>");
+            button.activate_link.connect ((uri)=>{
+                var browser = Midori.Browser.get_for_widget (button);
+                var view = browser.add_uri (uri);
+                browser.tab = view;
+                return true;
+            });
+            button.set_markup (description);
+            button.set_line_wrap (true);
+            vbox.pack_start (button, false, false, 4);
+
+            var entry = new Gtk.Entry ();
+            if (uri != null)
+                entry.set_text (uri);
+            vbox.pack_start (entry, false, false, 4);
+
+            var liststore = new Gtk.ListStore (1, typeof (Subscription));
+            var treeview = new Gtk.TreeView.with_model (liststore);
+            treeview.set_headers_visible (false);
+            var column = new Gtk.TreeViewColumn ();
+            var renderer_toggle = new Gtk.CellRendererToggle ();
+            column.pack_start (renderer_toggle, false);
+            column.set_cell_data_func (renderer_toggle, (column, renderer, model, iter) => {
+                Subscription sub;
+                liststore.get (iter, 0, out sub);
+                renderer.set ("active", sub.active,
+                              "sensitive", !sub.uri.has_suffix ("custom.list"));
+            });
+            renderer_toggle.toggled.connect ((path) => {
+                Gtk.TreeIter iter;
+                if (liststore.get_iter_from_string (out iter, path)) {
+                    Subscription sub;
+                    liststore.get (iter, 0, out sub);
+                    sub.active = !sub.active;
+                }
+            });
+            treeview.append_column (column);
+
+            column = new Gtk.TreeViewColumn ();
+            var renderer_text = new Gtk.CellRendererText ();
+            column.pack_start (renderer_text, false);
+            renderer_text.set ("editable", true);
+            // TODO: renderer_text.edited.connect
+            column.set_cell_data_func (renderer_text, (column, renderer, model, iter) => {
+                Subscription sub;
+                liststore.get (iter, 0, out sub);
+                renderer.set ("text", sub.uri);
+            });
+            treeview.append_column (column);
+
+            var scrolled = new Gtk.ScrolledWindow (null, null);
+            scrolled.set_policy (Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC);
+            scrolled.add (treeview);
+            vbox.pack_start (scrolled);
+
+            foreach (Subscription sub in config)
+                liststore.insert_with_values (null, 0, 0, sub);
+            // TODO: row-inserted row-changed row-deleted
+            // TODO vbox with add/ edit/ remove/ down/ up
+
+            dialog.get_content_area ().show_all ();
+
+            dialog.response.connect ((response)=>{ dialog.destroy (); });
+            dialog.show ();
+        }
+
+        void extension_activated (Midori.App app) {
+            init ();
+            foreach (var browser in app.get_browsers ())
+                browser_added (browser);
+            app.add_browser.connect (browser_added);
+        }
+
+        void browser_added (Midori.Browser browser) {
+            foreach (var tab in browser.get_tabs ())
+                tab_added (tab);
+            browser.add_tab.connect (tab_added);
+        }
+
+        void tab_added (Midori.View view) {
+            view.web_view.resource_request_starting.connect (resource_requested);
+            view.web_view.navigation_policy_decision_requested.connect (navigation_requested);
+            view.notify["load-status"].connect ((pspec) => {
+                if (view.load_status == Midori.LoadStatus.FINISHED)
+                    inject_css (view, view.uri);
+            });
+            view.context_menu.connect (context_menu);
+        }
+
+        void context_menu (WebKit.HitTestResult hit_test_result, Midori.ContextAction menu) {
+            string label, uri;
+            if ((hit_test_result.context & WebKit.HitTestResultContext.IMAGE) != 0) {
+                label = _("Bl_ock image");
+                uri = hit_test_result.image_uri;
+            } else if ((hit_test_result.context & WebKit.HitTestResultContext.LINK) != 0)  {
+                label = _("Bl_ock link");
+                uri = hit_test_result.link_uri;
+            } else
+                return;
+            var action = new Gtk.Action ("BlockElement", label, null, null);
+            action.activate.connect ((action) => {
+                edit_rule_dialog (uri);
+            });
+            menu.add (action);
+        }
+
+        void edit_rule_dialog (string uri) {
+            var dialog = new Gtk.Dialog.with_buttons (_("Edit rule"),
+                null,
+#if !HAVE_GTK3
+                Gtk.DialogFlags.NO_SEPARATOR |
+#endif
+                Gtk.DialogFlags.DESTROY_WITH_PARENT,
+                Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL,
+                Gtk.STOCK_ADD, Gtk.ResponseType.ACCEPT);
+            dialog.set_icon_name (Gtk.STOCK_ADD);
+            dialog.resizable = false;
+
+            var hbox = new Gtk.HBox (false, 8);
+            var sizegroup = new Gtk.SizeGroup (Gtk.SizeGroupMode.HORIZONTAL);
+            hbox.border_width = 5;
+            var label = new Gtk.Label.with_mnemonic (_("_Rule:"));
+            sizegroup.add_widget (label);
+            hbox.pack_start (label, false, false, 0);
+            (dialog.get_content_area () as Gtk.Box).pack_start (hbox, false, true, 0);
+
+            var entry = new Gtk.Entry ();
+            sizegroup.add_widget (entry);
+            entry.activates_default = true;
+            entry.set_text (uri);
+            hbox.pack_start (entry, true, true, 0);
+
+            dialog.get_content_area ().show_all ();
+
+            dialog.set_default_response (Gtk.ResponseType.ACCEPT);
+            if (dialog.run () != Gtk.ResponseType.ACCEPT)
+                return;
+
+            string new_rule = entry.get_text ();
+            dialog.destroy ();
+            config.add_custom_rule (new_rule);
+        }
+
+
+        void resource_requested (WebKit.WebView web_view, WebKit.WebFrame frame,
+            WebKit.WebResource resource, WebKit.NetworkRequest request, WebKit.NetworkResponse? response) {
+
+            if (request_handled (web_view.uri, request.uri))
+                request.set_uri ("about:blank");
+        }
+
+        bool navigation_requested (WebKit.WebFrame frame, WebKit.NetworkRequest request,
+            WebKit.WebNavigationAction action, WebKit.WebPolicyDecision decision) {
+
+            string uri = request.uri;
+            if (uri.has_prefix ("abp:")) {
+                uri = uri.replace ("abp://", "abp:");
+                if (uri.has_prefix ("abp:subscribe?location=")) {
+                    /* abp://subscripe?location=http://example.com&title=foo */
+                    string[] parts = uri.substring (23, -1).split ("&", 2);
+                    decision.ignore ();
+                    open_dialog (parts[0]);
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        void inject_css (Midori.View view, string page_uri) {
+            /* Don't block ads on internal pages */
+            if (!Midori.URI.is_http (page_uri))
+                return;
+            string domain = Midori.URI.parse_hostname (page_uri, null);
+            string[] subdomains = domain.split (".");
+            if (subdomains == null)
+                return;
+            int cnt = subdomains.length - 1;
+            var subdomain = new StringBuilder (subdomains[cnt]);
+            subdomain.prepend_c ('.');
+            cnt--;
+            var code = new StringBuilder ();
+            bool debug_element = "adblock:element" in (Environment.get_variable ("MIDORI_DEBUG") ?? "");
+            string hider_css;
+
+            /* Hide elements that were blocked, otherwise we will get "broken image" icon */
+            cache.foreach ((key, val) => {
+                if (val == Adblock.Directive.BLOCK)
+                    code.append ("img[src*=\"%s\"] , iframe[src*=\"%s\"] , ".printf (key, key));
+            });
+            if (debug_element)
+                hider_css = " { background-color: red; border: 4px solid green; }";
+            else
+                hider_css = " { visiblility: hidden; width: 0; height: 0; }";
+
+            code.truncate (code.len -3);
+            code.append (hider_css);
+            if (debug_element)
+                stdout.printf ("hider css: %s\n", code.str);
+            view.inject_stylesheet (code.str);
+
+            code.erase ();
+            int blockscnt = 0;
+            while (cnt >= 0) {
+                subdomain.prepend (subdomains[cnt]);
+                string? style = null;
+                foreach (Subscription sub in config) {
+                    foreach (var feature in sub) {
+                        if (feature is Adblock.Element) {
+                            style = (feature as Adblock.Element).lookup (subdomain.str);
+                            break;
+                        }
+                    }
+                }
+                if (style != null) {
+                    code.append (style);
+                    code.append_c (',');
+                    blockscnt++;
+                }
+                subdomain.prepend_c ('.');
+                cnt--;
+            }
+            if (blockscnt == 0)
+                return;
+            code.truncate (code.len - 1);
+
+            if (debug_element)
+                hider_css = " { background-color: red !important; border: 4px solid green !important; }";
+            else
+                hider_css = " { display: none !important }";
+
+            code.append (hider_css);
+            view.inject_stylesheet (code.str);
+            if (debug_element)
+                stdout.printf ("css: %s\n", code.str);
+        }
+#endif
+
+        internal void init () {
+            debug ("Adblock2");
+
+            string config_dir = Midori.Paths.get_extension_config_dir ("libadblock.so");
+            config = new Config (config_dir);
+            reload_rules ();
+        }
+
+        void reload_rules () {
+            cache = new HashTable<string, Directive?> (str_hash, str_equal);
+            foreach (Subscription sub in config) {
+                try {
+                    sub.parse ();
+                } catch (GLib.Error error) {
+                    warning ("Error parsing %s: %s", sub.uri, error.message);
+                }
+            }
+       }
+
+        bool request_handled (string page_uri, string request_uri) {
+            /* Always allow the main page */
+            if (request_uri == page_uri)
+                return false;
+
+            Directive? directive = cache.lookup (request_uri);
+            if (directive == null) {
+                foreach (Subscription sub in config) {
+                    directive = sub.get_directive (request_uri, page_uri);
+                    if (directive != null)
+                        break;
+                }
+                if (directive == null)
+                    directive = Directive.ALLOW;
+                cache.insert (request_uri, directive);
+            }
+            return directive == Directive.BLOCK;
+        }
+    }
+
+    static void debug (string format, ...) {
+        bool debug_match = "adblock:match" in (Environment.get_variable ("MIDORI_DEBUG") ?? "");
+        if (!debug_match)
+            return;
+
+        var args = va_list ();
+        stdout.vprintf (format + "\n", args);
+    }
+
+    internal static string? fixup_regex (string prefix, string? src) {
+        if (src == null)
+            return null;
+
+        var fixed = new StringBuilder ();
+        fixed.append(prefix);
+
+        uint i = 0;
+        if (src[0] == '*')
+            i++;
+        uint l = src.length;
+        while (i < l) {
+            char c = src[i];
+            switch (c) {
+                case '*':
+                    fixed.append (".*"); break;
+                case '|':
+                case '^':
+                case '+':
+                    break;
+                case '?':
+                case '[':
+                case ']':
+                    fixed.append_printf ("\\%c", c); break;
+                default:
+                    fixed.append_c (c); break;
+            }
+            i++;
+        }
+        return fixed.str;
+    }
+}
+
+#if HAVE_WEBKIT2
+Adblock.Extension? filter;
+public static void webkit_web_extension_initialize (WebKit.WebExtension web_extension) {
+    filter = new Adblock.Extension (web_extension);
+}
+#else
+public Midori.Extension extension_init () {
+    return new Adblock.Extension ();
+}
+#endif
+
+#if !HAVE_WEBKIT2
+struct TestCaseLine {
+    public string line;
+    public string fixed;
+}
+
+const TestCaseLine[] lines = {
+    { null, null },
+    { "!", "!" },
+    { "@@", "@@" },
+    { "##", "##" },
+    { "[", "\\[" },
+    { "+advert/", "advert/" },
+    { "*foo", "foo" },
+    { "f*oo", "f.*oo" },
+    { "?foo", "\\?foo" },
+    { "foo?", "foo\\?" },
+    { ".*foo/bar", "..*foo/bar" },
+    { "http://bla.blub/*", "http://bla.blub/.*" },
+    { "bag?r[]=*cpa", "bag\\?r\\[\\]=.*cpa" },
+    { "(facebookLike,", "(facebookLike," },
+};
+
+void test_adblock_fixup_regexp () {
+    foreach (var line in lines) {
+        Katze.assert_str_equal (line.line, Adblock.fixup_regex ("", line.line), line.fixed);
+    }
+}
+
+struct TestCasePattern {
+    public string uri;
+    public Adblock.Directive directive;
+}
+
+const TestCasePattern[] patterns = {
+    { "http://www.engadget.com/_uac/adpage.html", Adblock.Directive.BLOCK },
+    { "http://test.dom/test?var=1", Adblock.Directive.BLOCK },
+    { "http://ads.foo.bar/teddy", Adblock.Directive.BLOCK },
+    { "http://ads.fuu.bar/teddy", Adblock.Directive.ALLOW },
+    { "https://ads.bogus.name/blub", Adblock.Directive.BLOCK },
+    // FIXME { "http://ads.bla.blub/kitty", Adblock.Directive.BLOCK },
+    // FIXME { "http://ads.blub.boing/soda", Adblock.Directive.BLOCK },
+    { "http://ads.foo.boing/beer", Adblock.Directive.ALLOW },
+    { "https://testsub.engine.adct.ru/test?id=1", Adblock.Directive.BLOCK },
+    { "http://test.ltd/addyn/test/test?var=adtech;&var2=1", Adblock.Directive.BLOCK },
+    { "http://add.doubleclick.net/pfadx/aaaa.mtvi", Adblock.Directive.BLOCK },
+    { "http://add.doubleclick.net/pfadx/aaaa.mtv", Adblock.Directive.ALLOW },
+    { "http://objects.tremormedia.com/embed/xml/list.xml?r=", Adblock.Directive.BLOCK },
+    { "http://qq.videostrip.c/sub/admatcherclient.php", Adblock.Directive.ALLOW },
+    { "http://qq.videostrip.com/sub/admatcherclient.php", Adblock.Directive.BLOCK },
+    { "http://qq.videostrip.com/sub/admatcherclient.php", Adblock.Directive.BLOCK },
+    { "http://br.gcl.ru/cgi-bin/br/test", Adblock.Directive.BLOCK },
+    { "https://bugs.webkit.org/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&long_desc_type=substring&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&keywords_type=allwords&keywords=&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&emailassigned_to1=1&emailtype1=substring&email1=&emailassigned_to2=1&emailreporter2=1&emailcc2=1&emailtype2=substring&email2=&bugidtype=include&bug_id=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&query_based_on=gtkport&field0-0-0=keywords&type0-0-0=anywordssubstr&value0-0-0=Gtk%20Cairo%20soup&field0-0-1=short_desc&type0-0-1=anywordssubstr&value0-0-1=Gtk%20Cairo%20soup%20autoconf%20automake%20autotool&field0-0-2=component&type0-0-2=equals&value0-0-2=WebKit%20Gtk", Adblock.Directive.ALLOW },
+    { "http://www.engadget.com/2009/09/24/google-hits-android-rom-modder-with-a-cease-and-desist-letter/", Adblock.Directive.ALLOW },
+    { "http://karibik-invest.com/es/bienes_raices/search.php?sqT=19&sqN=&sqMp=&sqL=0&qR=1&sqMb=&searchMode=1&action=B%FAsqueda", Adblock.Directive.ALLOW },
+    { "http://google.com", Adblock.Directive.ALLOW },
+};
+
+string pretty_directive (Adblock.Directive? directive) {
+    if (directive == null)
+        return "none";
+    return directive.to_string ();
+}
+ 
+void test_adblock_pattern () {
+    string path = Midori.Paths.get_res_filename ("adblock.list");
+    string uri;
+    try {
+        uri = Filename.to_uri (path, null);
+    } catch (Error error) {
+        GLib.error (error.message);
+    }
+    var sub = new Adblock.Subscription (uri);
+    try {
+        sub.parse ();
+    } catch (Error error) {
+        GLib.error (error.message);
+    }
+    foreach (var pattern in patterns) {
+        Adblock.Directive? directive = sub.get_directive (pattern.uri, "");
+        if (directive == null)
+            directive = Adblock.Directive.ALLOW;
+        if (directive != pattern.directive) {
+            error ("%s expected for %s but got %s",
+                   pretty_directive (pattern.directive), pattern.uri, pretty_directive (directive));
+        }
+    }
+}
+
+struct TestUpdateExample {
+    public string content;
+    public bool result;
+}
+
+ const TestUpdateExample[] examples = {
+        { "[Adblock Plus 1.1]\n! Last modified: 05 Sep 2010 11:00 UTC\n! This list expires after 48 hours\n", true },
+        { "[Adblock Plus 1.1]\n! Last modified: 05.09.2010 11:00 UTC\n! Expires: 2 days (update frequency)\n", true },
+        { "[Adblock Plus 1.1]\n! Updated: 05 Nov 2024 11:00 UTC\n! Expires: 5 days (update frequency)\n", false },
+        { "[Adblock]\n! dutchblock v3\n! This list expires after 14 days\n|http://b*.mookie1.com/\n", false },
+        { "[Adblock Plus 2.0]\n! Last modification time (GMT): 2012.11.05 13:33\n! Expires: 5 days (update frequency)\n", true },
+        { "[Adblock Plus 2.0]\n! Last modification time (GMT): 2012.11.05 13:33\n", true },
+        { "[Adblock]\n ! dummy,  i dont have any dates\n", false },
+    };
+
+void test_subscription_update () {
+    string uri;
+    FileIOStream iostream;
+    File file;
+    try {
+        file = File.new_tmp ("midori_adblock_update_test_XXXXXX", out iostream);
+        uri = file.get_uri ();
+    } catch (Error error) {
+        GLib.error (error.message);
+    }
+    var sub = new Adblock.Subscription (uri);
+    var updater = new Adblock.Updater ();
+    sub.add_feature (updater);
+
+    foreach (var example in examples) {
+        try {
+            file.replace_contents (example.content.data, null, false, FileCreateFlags.NONE, null);
+            updater.last_mod_meta = null;
+            updater.expires_meta = null;
+            sub.parse ();
+        } catch (Error error) {
+            GLib.error (error.message);
+        }
+        if (example.result == true)
+            assert (updater.needs_updating());
+        else
+            assert (!updater.needs_updating());
+    }
+}
+
+public void extension_test () {
+    Test.add_func ("/extensions/adblock2/parse", test_adblock_fixup_regexp);
+    Test.add_func ("/extensions/adblock2/pattern", test_adblock_pattern);
+    Test.add_func ("/extensions/adblock2/update", test_subscription_update);
+}
+#endif
+
 
=== added file 'extensions/adblock/filter.vala'
--- extensions/adblock/filter.vala	1970-01-01 00:00:00 +0000
+++ extensions/adblock/filter.vala	2014-02-20 20:31:17 +0000
@@ -0,0 +1,52 @@
+/*
+ Copyright (C) 2009-2014 Christian Dywan <[e-mail]>
+ Copyright (C) 2009-2012 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.
+*/
+
+namespace Adblock {
+    public abstract class Filter : Feature {
+        Options optslist;
+        protected HashTable<string, Regex?> rules;
+
+        public virtual void insert (string sig, Regex regex) {
+            rules.insert (sig, regex);
+        }
+
+        public virtual Regex? lookup (string sig) {
+            return rules.lookup (sig);
+        }
+
+        public virtual uint size () {
+            return rules.size ();
+        }
+
+        protected Filter (Options options) {
+            optslist = options;
+            clear ();
+        }
+
+        public override void clear () {
+            rules = new HashTable<string, Regex> (str_hash, str_equal);
+        }
+
+        protected bool check_rule (Regex regex, string pattern, string request_uri, string page_uri) throws Error {
+            if (!regex.match_full (request_uri))
+                return false;
+
+            var opts = optslist.lookup (pattern);
+            if (opts != null && Regex.match_simple (",third-party", opts,
+                RegexCompileFlags.CASELESS, RegexMatchFlags.NOTEMPTY))
+                if (page_uri != null && regex.match_full (page_uri))
+                    return false;
+            debug ("blocked by pattern regexp=%s -- %s", regex.get_pattern (), request_uri);
+            return true;
+        }
+    }
+}
 
=== added file 'extensions/adblock/keys.vala'
--- extensions/adblock/keys.vala	1970-01-01 00:00:00 +0000
+++ extensions/adblock/keys.vala	2014-02-20 20:31:17 +0000
@@ -0,0 +1,47 @@
+/*
+ Copyright (C) 2009-2014 Christian Dywan <[e-mail]>
+ Copyright (C) 2009-2012 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.
+*/
+
+namespace Adblock {
+    public class Keys : Filter {
+        List<Regex> blacklist;
+
+        public Keys (Options options) {
+            base (options);
+        }
+
+        public override void clear () {
+            base.clear ();
+            blacklist = new List<Regex> ();
+        }
+
+        public override Directive? match (string request_uri, string page_uri) throws Error {
+            string? uri = fixup_regex ("", request_uri);
+            if (uri == null)
+                return null;
+
+            int signature_size = 8;
+            int pos, l = uri.length;
+            for (pos = l - signature_size; pos >= 0; pos--) {
+                string signature = uri.offset (pos).ndup (signature_size);
+                var regex = rules.lookup (signature);
+                if (regex == null || blacklist.find (regex) != null)
+                    continue;
+
+                if (check_rule (regex, uri, request_uri, page_uri))
+                    return Directive.BLOCK;
+                blacklist.prepend (regex);
+            }
+
+            return null;
+        }
+    }
+}
 
=== added file 'extensions/adblock/options.vala'
--- extensions/adblock/options.vala	1970-01-01 00:00:00 +0000
+++ extensions/adblock/options.vala	2014-02-20 20:31:17 +0000
@@ -0,0 +1,32 @@
+/*
+ Copyright (C) 2014 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.
+*/
+
+namespace Adblock {
+    public class Options : GLib.Object {
+        HashTable<string, string?> optslist;
+
+        public Options () {
+            clear ();
+        }
+
+        public void insert (string sig, string? opts) {
+            optslist.insert (sig, opts);
+        }
+
+        public string? lookup (string sig) {
+            return optslist.lookup (sig);
+        }
+
+        public void clear () {
+            optslist = new HashTable<string, string?> (str_hash, str_equal);
+        }
+    }
+}
 
=== added file 'extensions/adblock/pattern.vala'
--- extensions/adblock/pattern.vala	1970-01-01 00:00:00 +0000
+++ extensions/adblock/pattern.vala	2014-02-20 20:31:17 +0000
@@ -0,0 +1,26 @@
+/*
+ Copyright (C) 2009-2014 Christian Dywan <[e-mail]>
+ Copyright (C) 2009-2012 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.
+*/
+
+namespace Adblock {
+    public class Pattern : Filter {
+        public Pattern (Options options) {
+            base (options);
+        }
+
+        public override Directive? match (string request_uri, string page_uri) throws Error {
+            foreach (var patt in rules.get_keys ())
+                if (check_rule (rules.lookup (patt), patt, request_uri, page_uri))
+                    return Directive.BLOCK;
+            return null;
+        }
+    }
+}
 
=== added file 'extensions/adblock/subscriptions.vala'
--- extensions/adblock/subscriptions.vala	1970-01-01 00:00:00 +0000
+++ extensions/adblock/subscriptions.vala	2014-02-20 20:31:17 +0000
@@ -0,0 +1,328 @@
+/*
+ Copyright (C) 2009-2014 Christian Dywan <[e-mail]>
+ Copyright (C) 2009-2012 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.
+*/
+
+namespace Adblock {
+    public abstract class Feature : GLib.Object {
+        public virtual bool header (string key, string value) {
+            return false;
+        }
+        public virtual Directive? match (string request_uri, string page_uri) throws Error {
+            return null;
+        }
+        public virtual void clear () {
+        }
+    }
+
+    public class Subscription : GLib.Object {
+        public string? path;
+        public string uri { get; set; default = null; }
+        public bool active { get; set; default = true; }
+        List<Feature> features;
+        public Pattern pattern;
+        public Keys keys;
+        public Options optslist;
+        public Whitelist whitelist;
+        public Element element;
+        WebKit.Download? download;
+
+        public Subscription (string uri) {
+            this.uri = uri;
+
+            this.optslist = new Options ();
+            this.whitelist = new Whitelist (optslist);
+            add_feature (this.whitelist);
+            this.keys = new Keys (optslist);
+            add_feature (this.keys);
+            this.pattern = new Pattern (optslist);
+            add_feature (this.pattern);
+            this.element = new Element ();
+            add_feature (this.element);
+            clear ();
+        }
+
+        public void add_feature (Feature feature) {
+            features.append (feature);
+            size++;
+        }
+
+        /* foreach support */
+        public new Feature? get (uint index) {
+            return features.nth_data (index);
+        }
+        public uint size { get; private set; }
+
+        public void clear () {
+            foreach (var feature in features)
+                feature.clear ();
+            optslist.clear ();
+        }
+
+        internal void parse_line (string? line) throws Error {
+            if (line.has_prefix ("@@")) {
+                if (line.contains("$") && line.contains ("domain"))
+                    return;
+                if (line.has_prefix ("@@||"))
+                    add_url_pattern ("^", "whitelist", line.offset (4));
+                else if (line.has_prefix ("@@|"))
+                    add_url_pattern ("^", "whitelist", line.offset (3));
+                else
+                    add_url_pattern ("", "whitelist", line.offset (2));
+                return;
+            }
+            /* TODO: [include] [exclude] */
+            if (line[0] == '[')
+                return;
+
+            /* CSS block hider */
+            if (line.has_prefix ("##")) {
+                /* TODO */
+                return;
+            }
+            if (line[0] == '#')
+                return;
+
+            /* Per domain CSS hider rule */
+            if ("##" in line) {
+                frame_add_private (line, "##");
+                return;
+            }
+            if ("#" in line) {
+                frame_add_private (line, "#");
+                return;
+            }
+
+            /* URL blocker rule */
+            if (line.has_prefix ("|")) {
+                /* TODO: handle options and domains excludes */
+                if (line.contains("$"))
+                    return;
+
+                if (line.has_prefix ("||"))
+                    add_url_pattern ("", "fulluri", line.offset (2));
+                else
+                    add_url_pattern ("^", "fulluri", line.offset (1));
+                return /* add_url_pattern */;
+            }
+
+            add_url_pattern ("", "uri", line);
+            return /* add_url_pattern */;
+        }
+
+        void frame_add_private (string line, string sep) {
+            string[] data = line.split (sep, 2);
+            if (!(data[1] != null && data[1] != "")
+             ||  data[1].chr (-1, '\'') != null
+             || (data[1].chr (-1, ':') != null
+             && !Regex.match_simple (".*\\[.*:.*\\].*", data[1],
+                RegexCompileFlags.CASELESS, RegexMatchFlags.NOTEMPTY))) {
+                return;
+            }
+
+            if (data[0].chr (-1, ',') != null) {
+                string[] domains = data[0].split (",", -1);
+
+                foreach (string domain in domains) {
+                    /* Ignore Firefox-specific option */
+                    if (domain == "~pregecko2")
+                        continue;
+                    /* FIXME: ~ should negate match */
+                    if (domain[0] == '~')
+                        domain = domain.substring (1, -1);
+                    update_css_hash (domain.strip (), data[1]);
+                }
+            }
+            else {
+                update_css_hash (data[0], data[1]);
+            }
+        }
+
+        void update_css_hash (string domain, string value) {
+            string? olddata = element.lookup (domain);
+            if (olddata != null) {
+                string newdata = olddata + " , " + value;
+                element.insert (domain, newdata);
+            } else {
+                element.insert (domain, value);
+            }
+        }
+
+        void add_url_pattern (string prefix, string type, string line) throws Error {
+            string[]? data = line.split ("$", 2);
+            if (data == null || data[0] == null)
+                return;
+
+            string patt, opts;
+            patt = data[0];
+            opts = type;
+
+            if (data[1] != null)
+                opts = type + "," + data[1];
+
+            if (Regex.match_simple ("subdocument", opts,
+                RegexCompileFlags.CASELESS, RegexMatchFlags.NOTEMPTY))
+                return;
+
+            string format_patt = fixup_regex (prefix, patt);
+            debug ("got: %s opts %s", format_patt, opts);
+            compile_regexp (format_patt, opts);
+            /* return format_patt */
+        }
+
+        bool compile_regexp (string? patt, string opts) throws Error {
+            if (patt == null)
+                return false;
+            try {
+                var regex = new Regex (patt, RegexCompileFlags.OPTIMIZE, RegexMatchFlags.NOTEMPTY);
+                /* is pattern is already a regex? */
+                if (Regex.match_simple ("^/.*[\\^\\$\\*].*/$", patt,
+                    RegexCompileFlags.UNGREEDY, RegexMatchFlags.NOTEMPTY)
+                 || opts != null && opts.contains ("whitelist")) {
+                    debug ("patt: %s", patt);
+                    if (opts.contains ("whitelist"))
+                        this.whitelist.insert (patt, regex);
+                    else
+                        this.pattern.insert (patt, regex);
+                    this.optslist.insert (patt, opts);
+                    return false;
+                } else { /* nope, no regex */
+                    int pos = 0, len;
+                    int signature_size = 8;
+                    string sig;
+                    len = patt.length;
+
+                    /* chop up pattern into substrings for faster matching */
+                    for (pos = len - signature_size; pos>=0; pos--)
+                    {
+                        sig = patt.offset (pos).ndup (signature_size);
+                        /* we don't have a * nor \\, does not look like regex, save chunk as "key" */
+                        if (!Regex.match_simple ("[\\*]", sig, RegexCompileFlags.UNGREEDY, RegexMatchFlags.NOTEMPTY) && keys.lookup (sig) == null) {
+                            this.keys.insert (sig, regex);
+                            this.optslist.insert (sig, opts);
+                        } else {
+                            /* starts with * or \\ - save as regex */
+                            if ((sig.has_prefix ("*") || sig.has_prefix("\\")) && this.pattern.lookup (sig) == null) {
+                                this.pattern.insert (sig, regex);
+                                this.optslist.insert (sig, opts);
+                            }
+                        }
+                    }
+                }
+                return false;
+            }
+            catch (Error error) {
+                warning ("Adblock compile regexp: %s", error.message);
+                return true;
+            }
+        }
+
+        public void parse_header (string header) throws Error {
+            /* Headers come in two forms
+               ! Foo: Bar
+               ! Some freeform text
+             */
+            string key = header;
+            string value = "";
+            if (header.contains (":")) {
+                string[] parts = header.split (":", 2);
+                if (parts[0] != null) {
+                    key = parts[0].substring (2, -1);
+                    value = parts[1].substring (1, -1);
+                }
+            }
+            debug ("Header '%s' says '%s'", key, value);
+            foreach (var feature in features) {
+                if (feature.header (key, value))
+                    break;
+            }
+        }
+
+        void download_status (ParamSpec pspec) {
+            if (download.get_status () != WebKit.DownloadStatus.FINISHED)
+                return;
+
+            download = null;
+            try {
+                parse ();
+            } catch (Error error) {
+                warning ("Error parsing %s: %s", uri, error.message);
+            }
+        }
+
+        public void parse () throws Error
+        {
+            if (!active)
+                return;
+
+            debug ("Parsing %s (%s)", uri, path);
+
+            clear ();
+
+            if (uri.has_prefix ("file://"))
+                path = Filename.from_uri (uri);
+            else {
+                string cache_dir = GLib.Path.build_filename (GLib.Environment.get_home_dir (), ".cache", "midori", "adblock");
+                Midori.Paths.mkdir_with_parents (cache_dir);
+                string filename = Checksum.compute_for_string (ChecksumType.MD5, this.uri, -1);
+                path = GLib.Path.build_filename (cache_dir, filename);
+            }
+
+            File filter_file = File.new_for_path (path);
+            DataInputStream stream;
+            try  {
+                stream = new DataInputStream (filter_file.read ());
+            } catch (IOError.NOT_FOUND exist_error) {
+#if HAVE_WEBKIT2
+                /* TODO */
+#else
+                if (download != null)
+                    return;
+
+                download = new WebKit.Download (new WebKit.NetworkRequest (uri));
+                download.destination_uri = Filename.to_uri (path, null);
+                download.notify["status"].connect (download_status);
+                debug ("Fetching %s to %s now", uri, download.destination_uri);
+                download.start ();
+#endif
+                return;
+            }
+
+            string? line;
+            while ((line = stream.read_line (null)) != null) {
+                if (line == null)
+                    continue;
+                string chomped = line.chomp ();
+                if (chomped == "")
+                    continue;
+                if (line[0] == '!')
+                    parse_header (chomped);
+                else
+                    parse_line (chomped);
+            }
+        }
+
+        public Directive? get_directive (string request_uri, string page_uri) {
+            try {
+                foreach (var feature in features) {
+                    Directive? directive = feature.match (request_uri, page_uri);
+                    if (directive != null) {
+                        debug ("%s gave %s for %s (%s)\n",
+                               feature.get_type ().name (), directive.to_string (), request_uri, page_uri);
+                        return directive;
+                    }
+                }
+            } catch (Error error) {
+                warning ("Adblock match error: %s\n", error.message);
+            }
+            return null;
+        }
+    }
+}
 
=== added file 'extensions/adblock/updater.vala'
--- extensions/adblock/updater.vala	1970-01-01 00:00:00 +0000
+++ extensions/adblock/updater.vala	2014-02-20 20:31:17 +0000
@@ -0,0 +1,139 @@
+/*
+ Copyright (C) 2014 Paweł Forysiuk <[e-mail]>
+ Copyright (C) 2014 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.
+*/
+
+namespace Adblock {
+    public class Updater : Feature {
+        public string expires_meta { get; set; default = null; }
+        public string last_mod_meta { get; set; default = null; }
+        public int64 update_tstamp { get; set; default = 0; }
+        public int64 last_mod_tstamp { get; set; default = 0; }
+        public int64 last_check_tstamp { get; set; default = 0; }
+
+        public Updater () {
+        }
+
+        public override bool header (string key, string value) {
+            if (key.has_prefix ("Last mod") || key == "Updated") {
+                last_mod_meta = value;
+                return true;
+            } else if (key == "Expires") {
+                /* ! Expires: 5 days (update frequency) */
+                expires_meta = value;
+                return true;
+            } else if (key.has_prefix ("! This list expires after")) {
+                /* ! This list expires after 14 days */
+                expires_meta = key.substring (26, -1);
+                return true;
+            }
+            return false;
+        }
+
+        int get_month_from_string (string? month) {
+            if (month == null)
+                return 0;
+
+            string[] months = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" };
+            for (int i = 0; i<= months.length; i++)
+            {
+                if (month.has_prefix (months[i]))
+                    return i+1;
+            }
+            return 0;
+        }
+
+        public bool needs_updating () {
+            DateTime now = new DateTime.now_local ();
+            DateTime expire_date = null;
+            DateTime last_mod_date = null;
+            string? last_mod = last_mod_meta;
+            string? expires = expires_meta;
+
+            /* We have "last modification" metadata */
+            if (last_mod != null) {
+                int h = 0, min = 0, d, m, y;
+                /* Date in a form of: 20.08.2012 12:34 */
+                if (last_mod.contains (".") || last_mod.contains("-")) {
+                    string[] parts = last_mod.split (" ", 2);
+                    string[] date_parts;
+                    string split_char = " ";
+
+                    /* contains time part ? */
+                    if (parts[1] != "" && parts[1].contains (":")) {
+                        string[] time_parts = parts[1].split (":", 2);
+                        h = int.parse(time_parts[0]);
+                        min = int.parse(time_parts[1]);
+                    }
+
+                    /* check if dot or dash was used as a delimiter */
+                    if (parts[0].contains ("."))
+                        split_char = ".";
+                    else if (parts[0].contains ("-"))
+                        split_char = "-";
+
+                    date_parts = parts[0].split (split_char, 3);
+                    m = int.parse(date_parts[1]);
+                    if (date_parts[2].length == 4) {
+                        y = int.parse(date_parts[2]);
+                        d = int.parse(date_parts[0]);
+                    } else {
+                        y = int.parse(date_parts[0]);
+                        d = int.parse(date_parts[2]);
+                    }
+                } else { /* Date in a form of: 20 Mar 2012 12:34 */
+                    string[] parts = last_mod.split (" ", 4);
+                    /* contains time part ? */
+                    if (parts[3] != null && parts[3].contains (":")) {
+                        string[] time_parts = parts[3].split (":", 2);
+                        h = int.parse(time_parts[0]);
+                        min = int.parse(time_parts[1]);
+                    }
+
+                    m = get_month_from_string (parts[1]);
+                    if (parts[2].length == 4) {
+                        y = int.parse(parts[2]);
+                        d = int.parse(parts[0]);
+                    } else {
+                        y = int.parse(parts[0]);
+                        d = int.parse(parts[2]);
+                    }
+                }
+
+                last_mod_date = new DateTime.local (y, m, d, h, min, 0.0);
+            }
+
+            if (last_mod_date == null)
+                last_mod_date = now;
+
+            /* We have "expires" metadata */
+            if (expires != null) {
+                if (expires.contains ("days")) {
+                    string[] parts = expires.split (" ");
+                    expire_date = last_mod_date.add_days (int.parse (parts[0]));
+                } else if (expires.contains ("hours")) {
+                    string[] parts = expires.split (" ");
+                    expire_date = last_mod_date.add_hours (int.parse (parts[0]));
+                }
+            } else {
+                /* No expire metadata found, assume x days */
+                int days_to_expire = 7;
+                expire_date = last_mod_date.add_days (days_to_expire);
+            }
+
+            last_mod_tstamp = last_mod_date.to_unix ();
+            last_check_tstamp = now.to_unix ();
+            update_tstamp = expire_date.to_unix ();
+
+            /* Check if we are past expire date */
+            return now.compare (expire_date) == 1;
+        }
+    }
+}
 
=== added file 'extensions/adblock/whitelist.vala'
--- extensions/adblock/whitelist.vala	1970-01-01 00:00:00 +0000
+++ extensions/adblock/whitelist.vala	2014-02-20 20:31:17 +0000
@@ -0,0 +1,30 @@
+/*
+ Copyright (C) 2014 Christian Dywan <[e-mail]>
+ Copyright (C) 2014 Paweł Forysiuk <[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.
+*/
+
+namespace Adblock {
+    public class Whitelist : Filter {
+        public Whitelist (Options options) {
+            base (options);
+        }
+
+        public override Directive? match (string request_uri, string page_uri) throws Error {
+            foreach (var white in rules.get_keys ()) {
+                var regex = rules.lookup (white);
+                if (!regex.match_full (request_uri))
+                    return null;
+                if (Regex.match_simple (regex.get_pattern (), request_uri, RegexCompileFlags.UNGREEDY, RegexMatchFlags.NOTEMPTY))
+                    return Directive.ALLOW;
+            }
+            return null;
+        }
+    }
+}
 
=== modified file 'katze/midori-paths.vala'
--- katze/midori-paths.vala	2013-11-22 18:14:18 +0000
+++ katze/midori-paths.vala	2014-02-20 20:31:17 +0000
@@ -143,6 +143,7 @@
 #if HAVE_WEBKIT2
                 WebKit.WebContext.get_default ().set_disk_cache_directory (
                     Path.build_path (Path.DIR_SEPARATOR_S, cache_dir, "web"));
+
                 var cookie_manager = WebKit.WebContext.get_default ().get_cookie_manager ();
                 cookie_manager.set_persistent_storage (Path.build_filename (config, "cookies.db"),
                     WebKit.CookiePersistentStorage.SQLITE);
 
=== modified file 'midori/midori-app.c'
--- midori/midori-app.c	2014-01-12 18:14:15 +0000
+++ midori/midori-app.c	2014-02-20 20:31:17 +0000
@@ -1256,7 +1256,7 @@
 midori_debug (const gchar* token)
 {
     static const gchar* debug_token = NULL;
-    const gchar* debug_tokens = "adblock:match adblock:time startup headers body referer cookies paths hsts unarmed bookmarks mouse app ";
+    const gchar* debug_tokens = "adblock:match adblock:time adblock:element startup headers body referer cookies paths hsts unarmed bookmarks mouse app ";
     if (debug_token == NULL)
     {
         gchar* found_token;
 
=== modified file 'midori/midori.vapi'
--- midori/midori.vapi	2014-01-26 11:33:02 +0000
+++ midori/midori.vapi	2014-02-20 20:31:17 +0000
@@ -135,6 +135,7 @@
         public void install_boolean (string name, bool default_value);
         public void install_integer (string name, int default_value);
         public void install_string (string name, string default_value);
+        public void install_string_list (string name, string[]? default_value);
 
         public bool get_boolean (string name);
         public int get_integer (string name);
 
=== modified file 'midori/webkit2gtk-3.0.vapi'
--- midori/webkit2gtk-3.0.vapi	2013-04-08 18:35:37 +0000
+++ midori/webkit2gtk-3.0.vapi	2014-02-20 20:31:17 +0000
@@ -552,6 +552,22 @@
 		[CCode (has_construct_function = false)]
 		protected WebViewBase ();
 	}
+	[CCode (cheader_filename = "webkit2/webkit-web-extension.h", type_id = "webkit_web_extension_get_type ()")]
+	public class WebExtension : GLib.Object {
+		[CCode (has_construct_function = false)]
+		protected WebExtension ();
+		public WebKit.WebPage get_page (uint64 page_id);
+		public signal void page_created (WebKit.WebPage web_page);
+	}
+	[CCode (cheader_filename = "webkit2/webkit-web-extension.h", type_id = "webkit_web_extension_get_type ()")]
+	public class WebPage : GLib.Object {
+		[CCode (has_construct_function = false)]
+		protected WebPage ();
+		public uint64 get_id ();
+		public string uri { get; }
+		public signal bool send_request (WebKit.URIRequest request, WebKit.URIResponse? redirected_response);
+		public signal void document_loaded ();
+	}
 	[CCode (cheader_filename = "webkit2/webkit2.h", type_id = "webkit_window_properties_get_type ()")]
 	public class WindowProperties : GLib.Object {
 		[CCode (has_construct_function = false)]
 
=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2013-12-13 17:34:40 +0000
+++ po/POTFILES.in	2014-02-20 20:31:17 +0000
@@ -36,7 +36,6 @@
 katze/katze-preferences.c
 katze/midori-uri.vala
 katze/midori-paths.vala
-extensions/adblock.c
 extensions/addons.c
 extensions/colorful-tabs.c
 extensions/cookie-manager/cookie-manager.c
@@ -92,3 +91,13 @@
 extensions/tabby.vala
 extensions/flummi.vala
 extensions/notes.vala
+extensions/adblock/extension.vala
+extensions/adblock/filter.vala
+extensions/adblock/keys.vala
+extensions/adblock/pattern.vala
+extensions/adblock/options.vala
+extensions/adblock/whitelist.vala
+extensions/adblock/subscriptions.vala
+extensions/adblock/config.vala
+extensions/adblock/updater.vala
+extensions/adblock/element.vala