Merge lp:~midori/midori/addingDefaultsAndFilters into lp:midori

[Cris Dywan]

Add filters and defaults

TODO:
- Statusbar icon [x] Debug Matching
- Edit/ view custom rules
- Check checksum hash of the subscription after downloading
- Open local files in editor
- Ability to disable adblock for the current domain
- 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/addingDefaultsAndFilters]

6582. By Cris Dywan on 2014-03-04

Only truncate filters string if there's a trailing ;

6583. By Cris Dywan on 2014-03-04

Get browser from app instead of get_for_widget

We don't actually get a window we could use as a reference

6584. By Paweł Forysiuk on 2014-03-04

Don't show scarry warning if 'disabled' setting is not found

6585. By Paweł Forysiuk on 2014-03-04

Don't bother downloading local files

6586. By Cris Dywan on 2014-03-04

Refactor Updater properties and show update in treeview

6587. By Cris Dywan on 2014-03-04

Handling presets within Config and add first unit tests

6588. By Cris Dywan on 2014-03-04

Move enabled switch into Config and add unit tests

6589. By Cris Dywan on 2014-03-05

Unit test parsing of subscriptions in Config

6590. By Paweł Forysiuk on 2014-03-05

Toggle displaying of hidden elements from adblock icon

6591. By Paweł Forysiuk on 2014-03-05

Display current adblock state in a tooltip

6592. By Paweł Forysiuk on 2014-03-05

Fix building with older vala version

6593. By Paweł Forysiuk on 2014-03-05

Don't reuse menu item variables

6594. By Cris Dywan on 2014-03-05

Unit test that saving and loading gives back the same results

6595. By Cris Dywan on 2014-03-05

Add adblock:parse for patt/ got messages

6596. By Cris Dywan on 2014-03-05

Add fallback to empty string to debug variable checks

6597. By Cris Dywan on 2014-03-05

Unit test init, add, remove and request on the whole Extension

6598. By Cris Dywan on 2014-03-05

Correct request_handled test case and custom rule test

6599. By Cris Dywan on 2014-03-05

Check header parts more carefully in Subscription.parse_header

6600. By Cris Dywan on 2014-03-05

Implement a notion of validity in subscriptions if there're no date headers

6601. By Cris Dywan on 2014-03-06

Fix and unit test writing of disabled URLs with dashes

6602. By Cris Dywan on 2014-03-06

Consider a subscription valid if anything at all gets picked up

There's no requirement to have any update or expiry header.

6603. By Cris Dywan on 2014-03-06

Merge lp:midori

6604. By Paweł Forysiuk on 2014-03-09

Extract widgets into separate file

6605. By Cris Dywan on 2014-03-09

preset_filename needs to fallback to build folder

6606. By Paweł Forysiuk on 2014-03-09

Parse subscription uris with a helper function

6607. By Paweł Forysiuk on 2014-03-09

Separate subscription parsing helper from subscription manager

6608. By Paweł Forysiuk on 2014-03-10

Split preparing hider css into helper functions

6609. By Paweł Forysiuk on 2014-03-10

Return if there is no blocked element to hide

6610. By Paweł Forysiuk on 2014-03-10

Split getting domains for uri into a separate function

[Cris Dywan (kalikiana)]

review: Approve

=== added directory 'data/adblock'
=== modified file 'data/adblock.list'
--- data/adblock.list	2014-02-17 20:43:55 +0000
+++ data/adblock.list	2014-03-10 10:27:25 +0000
@@ -7,6 +7,7 @@
 ! Licence: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
 ! Copyright (C) 2014 Christian Dywan <[e-mail]>
 !
+! Some freeform text:
 ! Yadayada http://example.com/ e-mail ([e-mail]).
 !
 !-----Spam eggs--------!

=== added file 'data/adblock/blocked.svg'
--- data/adblock/blocked.svg	1970-01-01 00:00:00 +0000
+++ data/adblock/blocked.svg	2014-03-10 10:27:25 +0000
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="16"
+   height="16"
+   id="svg7384">
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <defs
+     id="defs10" />
+  <metadata
+     id="metadata90">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(-111.61542,-601.4038)"
+     id="layer12">
+    <path
+       d="m 228.01,607.02 c -3.86,0 -7.0073,3.166 -7.0073,7.0103 0,3.8443 3.1472,6.9787 7.0073,6.9787 3.86,0 7.0073,-3.1344 7.0073,-6.9787 0,-3.8443 -3.1472,-7.0103 -7.0073,-7.0103 z m 0,2.021 c 2.7769,0 5.0097,2.2237 5.0097,4.9893 0,2.7656 -2.2328,4.9577 -5.0097,4.9577 -2.777,0 -5.0097,-2.1921 -5.0097,-4.9577 0,-2.7656 2.2328,-4.9893 5.0097,-4.9893 z"
+       id="path4222"
+       style="text-indent:0;text-transform:none;block-progression:tb;color:#000000;fill:#bebebe" />
+    <path
+       d="m 231.41,609.44 -8,8 1.4062,1.4062 8,-8 -1.4062,-1.4062 z"
+       id="path4992"
+       style="text-indent:0;text-transform:none;block-progression:tb;color:#000000;fill:#bebebe" />
+  </g>
+  <path
+     d="m 7.96875,0.6875 c -2.8420838,0 -2.8771973,1.9949742 -6.625,2.3125 0,0 -0.98752557,2.5363552 0.34375,6 0.8399195,2.18526 4.3935259,5.981297 6.1875,6 l 0.25,0 C 9.9189736,14.9813 13.472581,11.18526 14.3125,9 15.643775,5.5363552 14.65625,3 14.65625,3 10.908448,2.6824742 10.873333,0.6875 8.03125,0.6875 l -0.0625,0 z m -0.625,2 c 0.1719617,-0.02159 0.3665606,0 0.625,0 l 0.0625,0 c 1.0337572,0 1.1746055,0.1513488 2.03125,0.625 0.133299,0.073703 0.361318,0.1808693 0.53125,0.28125 L 4.0625,9.25 C 3.8118632,8.860346 3.6127069,8.4931804 3.53125,8.28125 2.8541774,6.5196771 2.8806279,5.4183698 3,4.65625 4.2800363,4.3579974 5.3166759,3.6557627 5.9375,3.3125 6.5799833,2.9572616 6.8278648,2.7522692 7.34375,2.6875 z m 5.21875,1.84375 c 0.146121,0.046432 0.28409,0.089255 0.4375,0.125 0.119372,0.7621199 0.145822,1.863427 -0.53125,3.625 -0.223946,0.5826518 -1.210812,2.079776 -2.28125,3.15625 -0.535219,0.538237 -1.0931989,0.993886 -1.53125,1.28125 -0.2903916,0.190498 -0.5086712,0.283423 -0.5625,0.3125 l -0.15625,0 C 7.9117131,13.007739 7.6583409,12.925123 7.34375,12.71875 6.905699,12.431386 6.3477189,11.975737 5.8125,11.4375 5.6307383,11.254713 5.4548666,11.044257 5.28125,10.84375 l 7.28125,-6.3125 z"
+     id="path3016-2"
+     style="color:#000000;fill:#ffa500;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+</svg>

=== added file 'data/adblock/disabled.svg'
--- data/adblock/disabled.svg	1970-01-01 00:00:00 +0000
+++ data/adblock/disabled.svg	2014-03-10 10:27:25 +0000
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="16"
+   height="16"
+   id="svg7384">
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <defs
+     id="defs10" />
+  <metadata
+     id="metadata90">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(-111.61542,-601.4038)"
+     id="layer12">
+    <path
+       d="m 228.01,607.02 c -3.86,0 -7.0073,3.166 -7.0073,7.0103 0,3.8443 3.1472,6.9787 7.0073,6.9787 3.86,0 7.0073,-3.1344 7.0073,-6.9787 0,-3.8443 -3.1472,-7.0103 -7.0073,-7.0103 z m 0,2.021 c 2.7769,0 5.0097,2.2237 5.0097,4.9893 0,2.7656 -2.2328,4.9577 -5.0097,4.9577 -2.777,0 -5.0097,-2.1921 -5.0097,-4.9577 0,-2.7656 2.2328,-4.9893 5.0097,-4.9893 z"
+       id="path4222"
+       style="text-indent:0;text-transform:none;block-progression:tb;color:#000000;fill:#bebebe" />
+    <path
+       d="m 231.41,609.44 -8,8 1.4062,1.4062 8,-8 -1.4062,-1.4062 z"
+       id="path4992"
+       style="text-indent:0;text-transform:none;block-progression:tb;color:#000000;fill:#bebebe" />
+  </g>
+  <path
+     d="m 7.96875,0.6875 c -2.8420838,0 -2.8771973,1.9949742 -6.625,2.3125 0,0 -0.98752557,2.5363552 0.34375,6 0.8399195,2.18526 4.3935259,5.981297 6.1875,6 l 0.25,0 C 9.9189736,14.9813 13.472581,11.18526 14.3125,9 15.643775,5.5363552 14.65625,3 14.65625,3 10.908448,2.6824742 10.873333,0.6875 8.03125,0.6875 l -0.0625,0 z m -0.625,2 c 0.1719617,-0.02159 0.3665606,0 0.625,0 l 0.0625,0 c 1.0337572,0 1.1746055,0.1513488 2.03125,0.625 0.133299,0.073703 0.361318,0.1808693 0.53125,0.28125 L 4.0625,9.25 C 3.8118632,8.860346 3.6127069,8.4931804 3.53125,8.28125 2.8541774,6.5196771 2.8806279,5.4183698 3,4.65625 4.2800363,4.3579974 5.3166759,3.6557627 5.9375,3.3125 6.5799833,2.9572616 6.8278648,2.7522692 7.34375,2.6875 z m 5.21875,1.84375 c 0.146121,0.046432 0.28409,0.089255 0.4375,0.125 0.119372,0.7621199 0.145822,1.863427 -0.53125,3.625 -0.223946,0.5826518 -1.210812,2.079776 -2.28125,3.15625 -0.535219,0.538237 -1.0931989,0.993886 -1.53125,1.28125 -0.2903916,0.190498 -0.5086712,0.283423 -0.5625,0.3125 l -0.15625,0 C 7.9117131,13.007739 7.6583409,12.925123 7.34375,12.71875 6.905699,12.431386 6.3477189,11.975737 5.8125,11.4375 5.6307383,11.254713 5.4548666,11.044257 5.28125,10.84375 l 7.28125,-6.3125 z"
+     id="path3016-2"
+     style="color:#000000;fill:#cc0000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+</svg>

=== added file 'data/adblock/enabled.svg'
--- data/adblock/enabled.svg	1970-01-01 00:00:00 +0000
+++ data/adblock/enabled.svg	2014-03-10 10:27:25 +0000
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="16"
+   height="16"
+   id="svg7384"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="adblock-enabled.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1026"
+     id="namedview10"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="32"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg7384" />
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <defs
+     id="defs10" />
+  <metadata
+     id="metadata90">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(-111.61542,-601.4038)"
+     id="layer12">
+    <path
+       d="m 228.01,607.02 c -3.86,0 -7.0073,3.166 -7.0073,7.0103 0,3.8443 3.1472,6.9787 7.0073,6.9787 3.86,0 7.0073,-3.1344 7.0073,-6.9787 0,-3.8443 -3.1472,-7.0103 -7.0073,-7.0103 z m 0,2.021 c 2.7769,0 5.0097,2.2237 5.0097,4.9893 0,2.7656 -2.2328,4.9577 -5.0097,4.9577 -2.777,0 -5.0097,-2.1921 -5.0097,-4.9577 0,-2.7656 2.2328,-4.9893 5.0097,-4.9893 z"
+       id="path4222"
+       style="text-indent:0;text-transform:none;block-progression:tb;color:#000000;fill:#bebebe" />
+    <path
+       d="m 231.41,609.44 -8,8 1.4062,1.4062 8,-8 -1.4062,-1.4062 z"
+       id="path4992"
+       style="text-indent:0;text-transform:none;block-progression:tb;color:#000000;fill:#bebebe" />
+  </g>
+  <path
+     d="m 7.96875,0.6875 c -2.8420838,0 -2.8771973,1.9949742 -6.625,2.3125 0,0 -0.98752557,2.5363552 0.34375,6 0.8399195,2.18526 4.3935259,5.981297 6.1875,6 l 0.25,0 C 9.9189736,14.9813 13.472581,11.18526 14.3125,9 15.643775,5.5363552 14.65625,3 14.65625,3 10.908448,2.6824742 10.873333,0.6875 8.03125,0.6875 l -0.0625,0 z m -0.625,2 c 0.1719617,-0.02159 0.3665606,0 0.625,0 l 0.0625,0 c 1.0337572,0 1.1746055,0.1513488 2.03125,0.625 0.133299,0.073703 0.361318,0.1808693 0.53125,0.28125 L 4.0625,9.25 C 3.8118632,8.860346 3.6127069,8.4931804 3.53125,8.28125 2.8541774,6.5196771 2.8806279,5.4183698 3,4.65625 4.2800363,4.3579974 5.3166759,3.6557627 5.9375,3.3125 6.5799833,2.9572616 6.8278648,2.7522692 7.34375,2.6875 z m 5.21875,1.84375 c 0.146121,0.046432 0.28409,0.089255 0.4375,0.125 0.119372,0.7621199 0.145822,1.863427 -0.53125,3.625 -0.223946,0.5826518 -1.210812,2.079776 -2.28125,3.15625 -0.535219,0.538237 -1.0931989,0.993886 -1.53125,1.28125 -0.2903916,0.190498 -0.5086712,0.283423 -0.5625,0.3125 l -0.15625,0 C 7.9117131,13.007739 7.6583409,12.925123 7.34375,12.71875 6.905699,12.431386 6.3477189,11.975737 5.8125,11.4375 5.6307383,11.254713 5.4548666,11.044257 5.28125,10.84375 l 7.28125,-6.3125 z"
+     id="path3016-2"
+     style="color:#000000;fill:#4e9a06;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <path
+     style="fill:#000000;fill-opacity:0"
+     d="M 3.8914706,8.8841635 C 3.4103263,8.1221753 3.0583616,6.8749414 3.003735,5.7383534 2.9786317,5.2160416 2.9904131,4.8722447 3.036357,4.7863976 3.0800139,4.7048241 3.2418563,4.6177843 3.4482218,4.5648944 3.8914458,4.4512995 4.5265161,4.1442388 5.8961843,3.3812883 L 7.0127075,2.7593478 7.7697676,2.7353155 C 8.6627475,2.7069685 9.052772,2.7983017 9.8276868,3.2172249 10.1089,3.3692502 10.375652,3.52161 10.420468,3.5558023 10.491273,3.609822 8.8213493,5.090833 4.1912034,9.0803713 4.0886836,9.1687069 4.0587803,9.149132 3.8914706,8.8841635 l 0,0 z"
+     id="path2987"
+     inkscape:connector-curvature="0" />
+  <path
+     style="fill:#000000;fill-opacity:0"
+     d="M 7.5676774,12.795393 C 7.0256619,12.469009 6.4290755,11.979639 5.8305085,11.370422 5.33023,10.861243 5.3242581,10.851054 5.4600194,10.738315 5.5359114,10.675293 7.1641368,9.2661017 9.0782981,7.6067797 11.684369,5.3476641 12.594872,4.5953246 12.703024,4.6117025 c 0.291451,0.044135 0.329784,0.1886522 0.290923,1.0967721 -0.07204,1.6834953 -0.589725,2.9526655 -1.866622,4.5762714 -0.495094,0.629525 -1.366327,1.526375 -1.8854314,1.94087 C 8.8466967,12.541173 8.091686,13.030508 8,13.030508 c -0.023031,0 -0.2175765,-0.105802 -0.4323226,-0.235115 z"
+     id="path2989"
+     inkscape:connector-curvature="0" />
+</svg>

=== modified file 'extensions/adblock/config.vala'
--- extensions/adblock/config.vala	2014-02-20 18:27:01 +0000
+++ extensions/adblock/config.vala	2014-03-10 10:27:25 +0000
@@ -12,27 +12,26 @@
 namespace Adblock {
     public class Config : GLib.Object {
         List<Subscription> subscriptions;
-        string? path;
+        public string? path { get; private set; }
         KeyFile keyfile;
-        Subscription? custom;
+        bool should_save;
+        public bool enabled { get; set; }
 
-        public Config (string? path) {
+        public Config (string? path, string? presets) {
+            should_save = false;
             subscriptions = new GLib.List<Subscription> ();
-
+            enabled = true;
             this.path = path;
-            if (path == null)
+            size = 0;
+            load_file (path);
+            load_file (presets);
+            should_save = true;
+        }
+
+        void load_file (string? filename) {
+            if (filename == 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);
@@ -40,68 +39,108 @@
                 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);
+                    if (filter.has_prefix ("http-/"))
+                        uri = "http:" + filter.substring (5);
+                    else if (filter.has_prefix ("file-/"))
+                        uri = "file:" + filter.substring (5);
+                    else if (filter.has_prefix ("http-:"))
+                        uri = "https" + filter.substring (5);
                     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);
+                    add (sub);
                 }
+                enabled = !keyfile.get_boolean ("settings", "disabled");
+            } catch (KeyFileError.KEY_NOT_FOUND key_error) {
+                /* It's no error if a key is missing */
+            } catch (KeyFileError.GROUP_NOT_FOUND group_error) {
+                /* It's no error if a group is missing */
             } 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 ();
+            notify["enabled"].connect (enabled_changed);
+        }
+
+        void enabled_changed (ParamSpec pspec) {
+            keyfile.set_boolean ("settings", "disabled", !enabled);
+            save ();
         }
 
         void active_changed (Object subscription, ParamSpec pspec) {
+            update_filters ();
+        }
+
+        void update_filters () {
             var filters = new StringBuilder ();
             foreach (var sub in subscriptions) {
-                if (sub == custom)
+                if (!sub.mutable)
                     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));
+                    filters.append ("file-" + sub.uri.substring (5));
                 else if (sub.uri.has_prefix ("https:") && !sub.active)
-                    filters.append ("https-" + sub.uri.substring (5));
+                    filters.append ("http-" + sub.uri.substring (5));
                 else
                     filters.append (sub.uri);
                 filters.append_c (';');
             }
 
-            string[] list = (filters.str.slice (0, -1)).split (";");
+            if (filters.str.has_suffix (";"))
+                filters.truncate (filters.len - 1);
+            string[] list = filters.str.split (";");
             keyfile.set_string_list ("settings", "filters", list);
+
+            save ();
+        }
+
+
+        public void save () {
             try {
-                string filename = GLib.Path.build_filename (path, "config");
-                FileUtils.set_contents (filename, keyfile.to_data ());
+                FileUtils.set_contents (path, 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; }
+
+        bool contains (Subscription subscription) {
+            foreach (var sub in subscriptions)
+                if (sub.uri == subscription.uri)
+                    return true;
+            return false;
+        }
+
+        public bool add (Subscription sub) {
+            if (contains (sub))
+                return false;
+
+            sub.notify["active"].connect (active_changed);
+            subscriptions.append (sub);
+            size++;
+            if (should_save)
+                update_filters ();
+            return true;
+        }
+
+        public void remove (Subscription sub) {
+            if (!contains (sub))
+                return;
+
+            subscriptions.remove (sub);
+            sub.notify["active"].disconnect (active_changed);
+            update_filters ();
+            size--;
+        }
     }
 }

=== modified file 'extensions/adblock/extension.vala'
--- extensions/adblock/extension.vala	2014-02-24 00:06:18 +0000
+++ extensions/adblock/extension.vala	2014-03-10 10:27:25 +0000
@@ -16,9 +16,42 @@
         BLOCK
     }
 
+    public enum State {
+        ENABLED,
+        DISABLED,
+        BLOCKED
+    }
+
+    public string? parse_subscription_uri (string? uri) {
+        if (uri == null)
+            return null;
+
+        if (uri.has_prefix ("http") || uri.has_prefix ("abp") || uri.has_prefix ("file"))
+        {
+            string sub_uri = uri;
+            if (uri.has_prefix ("abp:")) {
+                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);
+                    sub_uri = parts[0];
+                }
+            }
+
+            string decoded_uri = Soup.URI.decode (sub_uri);
+            return decoded_uri;
+        }
+        return null;
+    }
+
     public class Extension : Midori.Extension {
-        Config config;
-        HashTable<string, Directive?> cache;
+        internal Config config;
+        internal Subscription custom;
+        internal HashTable<string, Directive?> cache;
+        internal StatusIcon status_icon;
+        internal SubscriptionManager manager;
+        internal State state;
+        internal bool debug_element;
 
 #if HAVE_WEBKIT2
         public Extension (WebKit.WebExtension web_extension) {
@@ -44,99 +77,7 @@
         }
 
         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 ();
+            manager.add_subscription (null);
         }
 
         void extension_activated (Midori.App app) {
@@ -150,14 +91,24 @@
             foreach (var tab in browser.get_tabs ())
                 tab_added (tab);
             browser.add_tab.connect (tab_added);
+
+            var toggle_button = new StatusIcon.IconButton ();
+            toggle_button.set_status (config.enabled ? "enabled" : "disabled");
+            browser.statusbar.pack_start (toggle_button, false, false, 3);
+            toggle_button.show ();
+            toggle_button.clicked.connect (status_icon.icon_clicked);
+            status_icon.toggle_buttons.append (toggle_button);
         }
 
+
         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);
+                if (config.enabled) {
+                    if (view.load_status == Midori.LoadStatus.FINISHED)
+                        inject_css (view, view.uri);
+                }
             });
             view.context_menu.connect (context_menu);
         }
@@ -174,54 +125,31 @@
                 return;
             var action = new Gtk.Action ("BlockElement", label, null, null);
             action.activate.connect ((action) => {
-                edit_rule_dialog (uri);
+                CustomRulesEditor custom_rules_editor = new CustomRulesEditor (custom);
+                custom_rules_editor.set_uri (uri);
+                custom_rules_editor.show();
             });
             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);
+        Adblock.State adblock_get_state (Adblock.Directive directive)
+        {
+            if (directive == Directive.BLOCK)
+                return State.BLOCKED;
+            if (config.enabled)
+                return State.ENABLED;
+            else
+                return State.DISABLED;
         }
 
-
         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))
+            if (request_handled (web_view.uri, request.uri)) {
                 request.set_uri ("about:blank");
+                state = adblock_get_state (get_directive_for_uri (web_view.uri));
+                status_icon.set_state (state);
+            }
         }
 
         bool navigation_requested (WebKit.WebFrame frame, WebKit.NetworkRequest request,
@@ -229,39 +157,28 @@
 
             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;
-                }
+                decision.ignore ();
+                string parsed_uri = parse_subscription_uri (uri);
+                manager.add_subscription (parsed_uri);
+                return true;
             }
+            state = adblock_get_state (get_directive_for_uri (request.uri));
+            status_icon.set_state (state);
             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;
-
+        string? get_hider_css_for_blocked_resources () {
             /* Hide elements that were blocked, otherwise we will get "broken image" icon */
+            var code = new StringBuilder ();
             cache.foreach ((key, val) => {
                 if (val == Adblock.Directive.BLOCK)
                     code.append ("img[src*=\"%s\"] , iframe[src*=\"%s\"] , ".printf (key, key));
             });
+
+            if (code.str == "")
+                return null;
+
+            string hider_css;
             if (debug_element)
                 hider_css = " { background-color: red; border: 4px solid green; }";
             else
@@ -271,55 +188,96 @@
             code.append (hider_css);
             if (debug_element)
                 stdout.printf ("hider css: %s\n", code.str);
-            view.inject_stylesheet (code.str);
+            return code.str;
+        }
 
-            code.erase ();
-            int blockscnt = 0;
+        string[]? get_domains_for_uri (string uri) {
+            if (uri == null)
+                return null;
+            string[]? domains = null;
+            string domain = Midori.URI.parse_hostname (uri, null);
+            string[] subdomains = domain.split (".");
+            if (subdomains == null)
+                return null;
+            int cnt = subdomains.length - 1;
+            var subdomain = new StringBuilder (subdomains[cnt]);
+            subdomain.prepend_c ('.');
+            cnt--;
             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;
+                domains += subdomain.str;
+                subdomain.prepend_c ('.');
+                cnt--;
+            }
+            return domains;
+        }
+
+        string? get_hider_css_rules_for_uri (string page_uri) {
+            if (page_uri == null)
+                return null;
+            string[]? domains = get_domains_for_uri (page_uri);
+            if (domains == null)
+                return null;
+            var code = new StringBuilder ();
+            int blockscnt = 0;
+            string? style = null;
+            foreach (Subscription sub in config) {
+                foreach (var feature in sub) {
+                    if (feature is Adblock.Element) {
+                        foreach (var subdomain in domains) {
+                            style = (feature as Adblock.Element).lookup (subdomain);
+                            if (style != null) {
+                                code.append (style);
+                                code.append_c (',');
+                                blockscnt++;
+                            }
                         }
                     }
                 }
-                if (style != null) {
-                    code.append (style);
-                    code.append_c (',');
-                    blockscnt++;
-                }
-                subdomain.prepend_c ('.');
-                cnt--;
             }
+
             if (blockscnt == 0)
-                return;
+                return null;
             code.truncate (code.len - 1);
 
+            string hider_css;
             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);
+
+            return code.str;
+        }
+
+        void inject_css (Midori.View view, string page_uri) {
+            /* Don't block ads on internal pages */
+            if (!Midori.URI.is_http (page_uri))
+                return;
+
+            if ("adblock:element" in (Environment.get_variable ("MIDORI_DEBUG") ?? ""))
+                debug_element = true;
+            else
+                debug_element = status_icon.debug_element_toggled;
+
+            string? blocked_css = get_hider_css_for_blocked_resources ();
+            if (blocked_css != null)
+                view.inject_stylesheet (blocked_css);
+
+            string? style = get_hider_css_rules_for_uri (page_uri);
+            if (style != null)
+                view.inject_stylesheet (style);
         }
 #endif
 
         internal void init () {
-            debug ("Adblock2");
-
-            string config_dir = Midori.Paths.get_extension_config_dir ("adblock");
-            config = new Config (config_dir);
-            reload_rules ();
-        }
-
-        void reload_rules () {
             cache = new HashTable<string, Directive?> (str_hash, str_equal);
+            load_config ();
+            status_icon = new StatusIcon (config);
+            manager = new SubscriptionManager (config);
             foreach (Subscription sub in config) {
                 try {
                     sub.parse ();
@@ -327,24 +285,61 @@
                     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;
-
-            /* Skip adblock on internal pages */
-            if (Midori.URI.is_blank (page_uri))
-                return false;
+            config.notify["size"].connect (subscriptions_added_removed);
+            manager.description_label.activate_link.connect (open_link);
+        }
+
+        bool open_link (string uri) {
+            var browser = get_app ().browser;
+            var view = browser.add_uri (uri);
+            browser.tab = view;
+            return true;
+        }
+
+        void subscriptions_added_removed (ParamSpec pspec) {
+            cache.remove_all ();
+        }
+
+        void load_config () {
+            string config_dir = Midori.Paths.get_extension_config_dir ("adblock");
+            string presets = Midori.Paths.get_extension_preset_filename ("adblock", "config");
+            string filename = Path.build_filename (config_dir, "config");
+            config = new Config (filename, presets);
+            string custom_list = GLib.Path.build_filename (config_dir, "custom.list");
+            try {
+                custom = new Subscription (Filename.to_uri (custom_list, null));
+                custom.mutable = false;
+                custom.title = _("Custom");
+                config.add (custom);
+            } catch (Error error) {
+                custom = null;
+                warning ("Failed to add custom list %s: %s", custom_list, error.message);
+            }
+        }
+
+        public Adblock.Directive get_directive_for_uri (string request_uri, string? page_uri = null) {
+            if (!config.enabled)
+                return Directive.ALLOW;
+
+            if (page_uri != null) {
+                /* Always allow the main page */
+                if (request_uri == page_uri)
+                    return Directive.ALLOW;
+
+                /* Skip adblock on internal pages */
+                if (Midori.URI.is_blank (page_uri))
+                    return Directive.ALLOW;
+            }
 
             /* Skip adblock on favicons and non http schemes */
             if (!Midori.URI.is_http (request_uri) || request_uri.has_suffix ("favicon.ico"))
-                return false;
+                return Directive.ALLOW;
 
             Directive? directive = cache.lookup (request_uri);
             if (directive == null) {
                 foreach (Subscription sub in config) {
+                    if (page_uri == null)
+                        page_uri = request_uri;
                     directive = sub.get_directive (request_uri, page_uri);
                     if (directive != null)
                         break;
@@ -352,8 +347,14 @@
                 if (directive == null)
                     directive = Directive.ALLOW;
                 cache.insert (request_uri, directive);
+                if (directive == Directive.BLOCK)
+                    cache.insert (page_uri, directive);
             }
-            return directive == Directive.BLOCK;
+            return directive;
+        }
+
+        internal bool request_handled (string page_uri, string request_uri) {
+            return get_directive_for_uri (request_uri, page_uri) == Directive.BLOCK;
         }
     }
 
@@ -411,6 +412,179 @@
 #endif
 
 #if !HAVE_WEBKIT2
+static string? tmp_folder = null;
+string get_test_file (string contents) {
+    if (tmp_folder == null)
+        tmp_folder = Midori.Paths.make_tmp_dir ("adblockXXXXXX");
+    string checksum = Checksum.compute_for_string (ChecksumType.MD5, contents);
+    string file = Path.build_path (Path.DIR_SEPARATOR_S, tmp_folder, checksum);
+    try {
+        FileUtils.set_contents (file, contents, -1);
+    } catch (Error file_error) {
+        GLib.error (file_error.message);
+    }
+    return file;
+}
+
+struct TestCaseConfig {
+    public string content;
+    public uint size;
+    public bool enabled;
+}
+
+const TestCaseConfig[] configs = {
+    { "", 0, true },
+    { "[settings]", 0, true },
+    { "[settings]\nfilters=foo;", 1, true },
+    { "[settings]\nfilters=foo;\ndisabled=true", 1, false }
+};
+
+void test_adblock_config () {
+    assert (new Adblock.Config (null, null).size == 0);
+
+    foreach (var conf in configs) {
+        var config = new Adblock.Config (get_test_file (conf.content), null);
+        if (config.size != conf.size)
+            error ("Wrong size %s rather than %s:\n%s",
+                   config.size.to_string (), conf.size.to_string (), conf.content);
+        if (config.enabled != conf.enabled)
+            error ("Wrongly got enabled=%s rather than %s:\n%s",
+                   config.enabled.to_string (), conf.enabled.to_string (), conf.content);
+    }
+}
+
+struct TestCaseSub {
+    public string uri;
+    public bool active;
+}
+
+const TestCaseSub[] subs = {
+    { "http://foo.com", true },
+    { "http://bar.com", false },
+    { "https://spam.com", true },
+    { "https://eggs.com", false },
+    { "file:///bla", true },
+    { "file:///blub", false }
+};
+
+void test_adblock_subs () {
+    var config = new Adblock.Config (get_test_file ("""
+[settings]
+filters=http://foo.com;http-//bar.com;https://spam.com;http-://eggs.com;file:///bla;file-///blub;http://foo.com;
+"""), null);
+
+    assert (config.enabled);
+    foreach (var sub in subs) {
+        bool found = false;
+        foreach (var subscription in config) {
+            if (subscription.uri == sub.uri) {
+                assert (subscription.active == sub.active);
+                found = true;
+            }
+        }
+        if (!found)
+            error ("%s not found", sub.uri);
+    }
+
+    /* 6 unique URLs, 1 duplicate */
+    assert (config.size == 6);
+    /* Duplicates aren't added again either */
+    assert (!config.add (new Adblock.Subscription ("https://spam.com")));
+
+    /* Saving the config and loading it should give back identical results */
+    config.save ();
+    var copy = new Adblock.Config (config.path, null);
+    assert (copy.size == config.size);
+    assert (copy.enabled == config.enabled);
+    for (int i = 0; i < config.size; i++) {
+        assert (copy[i].uri == config[i].uri);
+        assert (copy[i].active == config[i].active);
+    }
+    /* Enabled status should be saved and loaded */
+    config.enabled = false;
+    copy = new Adblock.Config (config.path, null);
+    assert (copy.enabled == config.enabled);
+    /* Flipping individual active values should be retained after saving */
+    foreach (var sub in config)
+        sub.active = !sub.active;
+    copy = new Adblock.Config (config.path, null);
+    for (uint i = 0; i < config.size; i++) {
+        if (config[i].active != copy[i].active) {
+            string contents;
+            try {
+                FileUtils.get_contents (config.path, out contents, null);
+            } catch (Error file_error) {
+                error (file_error.message);
+            }
+            error ("%s is %s but should be %s:\n%s",
+                   copy[i].uri, copy[i].active ? "active" : "disabled", config[i].active ? "active" : "disabled", contents);
+        }
+    }
+
+    /* Adding and removing works, changes size */
+    var s = new Adblock.Subscription ("http://en.de");
+    assert (config.add (s));
+    assert (config.size == 7);
+    config.remove (s);
+    assert (config.size == 6);
+    /* If it was removed before we should be able to add it again */
+    assert (config.add (s));
+    assert (config.size == 7);
+}
+
+void test_adblock_init () {
+    /* No config */
+    var extension = new Adblock.Extension ();
+    extension.init ();
+    assert (extension.config.enabled);
+    /* Defaults plus custom */
+    if (extension.config.size != 3)
+        error ("Expected 3 initial subs, got %s".printf (
+               extension.config.size.to_string ()));
+    assert (extension.cache.size () == 0);
+
+    /* Add new subscription */
+    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);
+    extension.config.add (sub);
+    assert (extension.cache.size () == 0);
+    assert (extension.config.size == 4);
+    try {
+        sub.parse ();
+    } catch (GLib.Error error) {
+        GLib.error (error.message);
+    }
+    /* The page itself never hits */
+    assert (!extension.request_handled ("https://ads.bogus.name/blub", "https://ads.bogus.name/blub"));
+    /* Favicons don't either */
+    assert (!extension.request_handled ("https://foo.com", "https://ads.bogus.name/blub/favicon.ico"));
+    assert (extension.cache.size () == 0);
+    /* Some sanity checks to be sure there's no earlier problem */
+    assert (sub.title == "Exercise");
+    assert (sub.get_directive ("https://ads.bogus.name/blub", "") == Adblock.Directive.BLOCK);
+    /* A rule hit should add to the cache */
+    assert (extension.request_handled ("https://foo.com", "https://ads.bogus.name/blub"));
+    assert (extension.cache.size () > 0);
+    /* Disabled means no request should be handled */
+    extension.config.enabled = false;
+    assert (!extension.request_handled ("https://foo.com", "https://ads.bogus.name/blub"));
+    /* Removing a subscription should clear the cache */
+    extension.config.remove (sub);
+    assert (extension.cache.size () == 0);
+    assert (extension.config.size == 3);
+    /* Now let's add a custom rule */
+    extension.config.enabled = true;
+    extension.custom.add_rule ("*.png");
+    assert (!extension.request_handled ("https://foo.com", "http://alpha.beta.com/images/yota.png"));
+    assert (extension.cache.size () > 0);
+ }
+
 struct TestCaseLine {
     public string line;
     public string fixed;
@@ -499,19 +673,27 @@
     }
 }
 
+string pretty_date (DateTime? date) {
+    if (date == null)
+        return "N/A";
+    return date.to_string ();
+}
+
 struct TestUpdateExample {
     public string content;
     public bool result;
+    public bool valid;
 }
 
  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 }
+        { "[Adblock Plus 1.1]\n! Last modified: 05 Sep 2010 11:00 UTC\n! This list expires after 48 hours\n", true, true },
+        { "[Adblock Plus 1.1]\n! Last modified: 05.09.2010 11:00 UTC\n! Expires: 2 days (update frequency)\n", true, true },
+        { "[Adblock Plus 1.1]\n! Updated: 05 Nov 2024 11:00 UTC\n! Expires: 5 days (update frequency)\n", false, true },
+        { "[Adblock]\n! dutchblock v3\n! This list expires after 14 days\n|http://b*.mookie1.com/\n", false, true },
+        { "[Adblock Plus 2.0]\n! Last modification time (GMT): 2012.11.05 13:33\n! Expires: 5 days (update frequency)\n", true, true },
+        { "[Adblock Plus 2.0]\n! Last modification time (GMT): 2012.11.05 13:33\n", true, true },
+        { "[Adblock]\n ! dummy,  i dont have any dates\n", false, true },
+        { "\n", false, false }
     };
 
 void test_subscription_update () {
@@ -531,23 +713,52 @@
     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.clear ();
             sub.parse ();
         } catch (Error error) {
             GLib.error (error.message);
         }
-        if (example.result == true)
-            assert (updater.needs_updating());
-        else
-            assert (!updater.needs_updating());
+        if (example.valid != sub.valid)
+            error ("Subscription expected to be %svalid but %svalid:\n%s",
+                   example.valid ? "" : "in", sub.valid ? "" : "in", example.content);
+        if (example.result != updater.needs_update)
+            error ("Update%s expected for:\n%s\nLast Updated: %s\nExpires: %s",
+                   example.result ? "" : " not", example.content,
+                   pretty_date (updater.last_updated), pretty_date (updater.expires));
+    }
+}
+
+struct TestSubUri {
+    public string? src_uri;
+    public string? dst_uri;
+}
+
+const TestSubUri[] suburis =
+{
+    { null, null },
+    { "not-a-link", null },
+    { "http://some.uri", "http://some.uri" },
+    { "abp:subscribe?location=https%3A%2F%2Feasylist-downloads.adblockplus.org%2Fabpindo%2Beasylist.txt&title=ABPindo%2BEasyList", "https://easylist-downloads.adblockplus.org/abpindo+easylist.txt" }
+};
+
+void test_subscription_uri_parsing () {
+    string? parsed_uri;
+    foreach (var example in suburis) {
+        parsed_uri = Adblock.parse_subscription_uri (example.src_uri);
+        if (parsed_uri != example.dst_uri)
+            error ("Subscription expected to be %svalid but %svalid:\n%s",
+                   example.dst_uri, parsed_uri, example.src_uri);
     }
 }
 
 public void extension_test () {
+    Test.add_func ("/extensions/adblock2/config", test_adblock_config);
+    Test.add_func ("/extensions/adblock2/subs", test_adblock_subs);
+    Test.add_func ("/extensions/adblock2/init", test_adblock_init);
     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);
+    Test.add_func ("/extensions/adblock2/subsparse", test_subscription_uri_parsing);
 }
 #endif
 

=== modified file 'extensions/adblock/subscriptions.vala'
--- extensions/adblock/subscriptions.vala	2014-02-20 18:27:01 +0000
+++ extensions/adblock/subscriptions.vala	2014-03-10 10:27:25 +0000
@@ -15,6 +15,9 @@
         public virtual bool header (string key, string value) {
             return false;
         }
+        public virtual bool parsed (File file) {
+            return true;
+        }
         public virtual Directive? match (string request_uri, string page_uri) throws Error {
             return null;
         }
@@ -24,8 +27,12 @@
 
     public class Subscription : GLib.Object {
         public string? path;
+        bool debug_parse;
         public string uri { get; set; default = null; }
+        public string title { get; set; default = null; }
         public bool active { get; set; default = true; }
+        public bool mutable { get; set; default = true; }
+        public bool valid { get; private set; default = true; }
         List<Feature> features;
         public Pattern pattern;
         public Keys keys;
@@ -35,6 +42,8 @@
         WebKit.Download? download;
 
         public Subscription (string uri) {
+            debug_parse = "adblock:parse" in (Environment.get_variable ("MIDORI_DEBUG") ?? "");
+
             this.uri = uri;
 
             this.optslist = new Options ();
@@ -172,7 +181,8 @@
                 return;
 
             string format_patt = fixup_regex (prefix, patt);
-            debug ("got: %s opts %s", format_patt, opts);
+            if (debug_parse)
+                stdout.printf ("got: %s opts %s\n", format_patt, opts);
             compile_regexp (format_patt, opts);
             /* return format_patt */
         }
@@ -186,7 +196,8 @@
                 if (Regex.match_simple ("^/.*[\\^\\$\\*].*/$", patt,
                     RegexCompileFlags.UNGREEDY, RegexMatchFlags.NOTEMPTY)
                  || opts != null && opts.contains ("whitelist")) {
-                    debug ("patt: %s", patt);
+                    if (debug_parse)
+                        stdout.printf ("patt: %s\n", patt);
                     if (opts.contains ("whitelist"))
                         this.whitelist.insert (patt, regex);
                     else
@@ -233,12 +244,15 @@
             string value = "";
             if (header.contains (":")) {
                 string[] parts = header.split (":", 2);
-                if (parts[0] != null) {
+                if (parts[0] != null && parts[0] != ""
+                 && parts[1] != null && parts[1] != "") {
                     key = parts[0].substring (2, -1);
                     value = parts[1].substring (1, -1);
                 }
             }
             debug ("Header '%s' says '%s'", key, value);
+            if (key == "Title")
+                title = value;
             foreach (var feature in features) {
                 if (feature.header (key, value))
                     break;
@@ -283,18 +297,25 @@
 #if HAVE_WEBKIT2
                 /* TODO */
 #else
-                if (download != null)
-                    return;
+                /* Don't bother trying to download local files */
+                if (!uri.has_prefix ("file://")) {
+                    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 ();
+                    string destination_uri = Filename.to_uri (path, null);
+                    debug ("Fetching %s to %s now", uri, destination_uri);
+                    download = new WebKit.Download (new WebKit.NetworkRequest (uri));
+                    if (!Midori.Download.has_enough_space (download, destination_uri, true))
+                         throw new FileError.EXIST ("Can't download to \"%s\"", path);
+                    download.destination_uri = destination_uri;
+                    download.notify["status"].connect (download_status);
+                    download.start ();
 #endif
+                }
                 return;
             }
 
+            valid = false;
             string? line;
             while ((line = stream.read_line (null)) != null) {
                 if (line == null)
@@ -306,6 +327,13 @@
                     parse_header (chomped);
                 else
                     parse_line (chomped);
+                /* The file isn't completely empty */
+                valid = true;
+            }
+
+            foreach (var feature in features) {
+                if (!feature.parsed (filter_file))
+                    valid = false;
             }
         }
 
@@ -324,5 +352,15 @@
             }
             return null;
         }
+
+        public void add_rule (string rule) {
+            try {
+                var file = File.new_for_uri (uri);
+                file.append_to (FileCreateFlags.NONE).write (("%s\n".printf (rule)).data);
+                parse ();
+            } catch (Error error) {
+                warning ("Failed to add custom rule: %s", error.message);
+            }
+        }
     }
 }

=== modified file 'extensions/adblock/updater.vala'
--- extensions/adblock/updater.vala	2014-02-20 00:14:15 +0000
+++ extensions/adblock/updater.vala	2014-03-10 10:27:25 +0000
@@ -12,15 +12,23 @@
 
 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; }
+        string expires_meta;
+        string last_mod_meta;
+        public DateTime last_updated { get; set; }
+        public DateTime expires { get; set; }
+        public bool needs_update { get; set; }
 
         public Updater () {
         }
 
+        public override void clear () {
+            expires_meta = null;
+            last_mod_meta = null;
+            last_updated = null;
+            expires = null;
+            needs_update = false;
+        }
+
         public override bool header (string key, string value) {
             if (key.has_prefix ("Last mod") || key == "Updated") {
                 last_mod_meta = value;
@@ -37,6 +45,12 @@
             return false;
         }
 
+        public override bool parsed (File file) {
+            process_dates (file);
+            /* It's not an error to have no update headers, we go for defaults */
+            return true;
+        }
+
         int get_month_from_string (string? month) {
             if (month == null)
                 return 0;
@@ -50,19 +64,17 @@
             return 0;
         }
 
-        public bool needs_updating () {
+        void process_dates (File file) {
             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;
+            last_updated = null;
+            expires = null;
 
             /* We have "last modification" metadata */
-            if (last_mod != null) {
+            if (last_mod_meta != 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);
+                if (last_mod_meta.contains (".") || last_mod_meta.contains("-")) {
+                    string[] parts = last_mod_meta.split (" ", 2);
                     string[] date_parts;
                     string split_char = " ";
 
@@ -89,7 +101,7 @@
                         d = int.parse(date_parts[2]);
                     }
                 } else { /* Date in a form of: 20 Mar 2012 12:34 */
-                    string[] parts = last_mod.split (" ", 4);
+                    string[] parts = last_mod_meta.split (" ", 4);
                     /* contains time part ? */
                     if (parts[3] != null && parts[3].contains (":")) {
                         string[] time_parts = parts[3].split (":", 2);
@@ -107,33 +119,37 @@
                     }
                 }
 
-                last_mod_date = new DateTime.local (y, m, d, h, min, 0.0);
+                last_updated = new DateTime.local (y, m, d, h, min, 0.0);
+            } else {
+                /* FIXME: use file modification date if there's no update header
+                try {
+                    string modified = FileAttribute.TIME_MODIFIED;
+                    var info = file.query_filesystem_info (modified);
+                    last_updated = new DateTime.from_timeval_local (info.get_modification_time ());
+                } catch (Error error) {
+                    last_updated = now;
+                }
+                 */
+                last_updated = now;
             }
 
-            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]));
+            if (expires_meta != null) {
+                if (expires_meta.contains ("days")) {
+                    string[] parts = expires_meta.split (" ");
+                    expires = last_updated.add_days (int.parse (parts[0]));
+                } else if (expires_meta.contains ("hours")) {
+                    string[] parts = expires_meta.split (" ");
+                    expires = last_updated.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);
+                expires = last_updated.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;
+            needs_update = now.compare (expires) == 1;
         }
     }
 }

=== added file 'extensions/adblock/widgets.vala'
--- extensions/adblock/widgets.vala	1970-01-01 00:00:00 +0000
+++ extensions/adblock/widgets.vala	2014-03-10 10:27:25 +0000
@@ -0,0 +1,310 @@
+/*
+ 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 StatusIcon {
+        Config config;
+        State state;
+        public bool debug_element_toggled;
+        public List<IconButton> toggle_buttons;
+
+        public StatusIcon (Adblock.Config config) {
+            this.config = config;
+            this.debug_element_toggled = false;
+        }
+
+        public void set_state (Adblock.State state) {
+            this.state = state;
+            update_buttons ();
+        }
+
+        public class IconButton : Gtk.Button {
+            Gtk.Image icon;
+
+            public IconButton () {
+                icon = new Gtk.Image ();
+                add (icon);
+                icon.show ();
+            }
+
+            public void set_status (string status) {
+                string filename = Midori.Paths.get_res_filename ("adblock/%s.svg".printf (status));
+                icon.set_from_file (filename);
+            }
+        }
+
+        public void update_buttons () {
+            string state = "";
+            foreach (var toggle_button in toggle_buttons) {
+                if (this.state == State.BLOCKED) {
+                    toggle_button.set_status ("blocked");
+                    state = _("Blocking");
+                }
+                if (this.state == State.ENABLED) {
+                    toggle_button.set_status ("enabled");
+                    state = _("Enabled");
+                }
+                if (this.state == State.DISABLED) {
+                    toggle_button.set_status ("disabled");
+                    state = _("Disabled");
+                }
+                toggle_button.set_tooltip_text (_("Adblock state: %s").printf (state));
+            }
+        }
+
+        public void icon_clicked (Gtk.Button toggle_button) {
+            var menu = new Gtk.Menu ();
+            var checkitem = new Gtk.CheckMenuItem.with_label (_("Disabled"));
+            checkitem.set_active (!config.enabled);
+            checkitem.toggled.connect (() => {
+                config.enabled = !checkitem.active;
+                set_state (config.enabled ? Adblock.State.ENABLED : Adblock.State.DISABLED);
+            });
+            menu.append (checkitem);
+
+            var hideritem = new Gtk.CheckMenuItem.with_label (_("Display hidden elements"));
+            hideritem.set_active (debug_element_toggled);
+            hideritem.toggled.connect (() => {
+                this.debug_element_toggled = hideritem.active;
+            });
+            menu.append (hideritem);
+
+            var menuitem = new Gtk.ImageMenuItem.with_label (_("Preferences"));
+            var image = new Gtk.Image.from_stock (Gtk.STOCK_PREFERENCES, Gtk.IconSize.MENU);
+            menuitem.always_show_image = true;
+            menuitem.set_image (image);
+            menuitem.activate.connect (() => {
+                SubscriptionManager manager = new SubscriptionManager (config);
+                manager.add_subscription (null);
+            });
+            menu.append (menuitem);
+
+            menu.show_all ();
+            Katze.widget_popup (toggle_button, menu, null, Katze.MenuPos.CURSOR);
+        }
+    }
+
+    public class SubscriptionManager {
+        Gtk.TreeView treeview;
+        Gtk.ListStore liststore;
+        Adblock.Config config;
+        public Gtk.Label description_label;
+        string description;
+
+        public SubscriptionManager (Config config) {
+            this.config = config;
+            this.liststore = new Gtk.ListStore (1, typeof (Subscription));
+            this.description_label = new Gtk.Label (null);
+            this.description = _("Type the address of a preconfigured filter list in the text entry and hit Enter.\n");
+            this.description += _("You can find more lists by visiting following sites:\n %s, %s\n".printf (
+                "<a href=\"http://adblockplus.org/en/subscriptions\">adblockplus.org/en/subscriptions</a>",
+                "<a href=\"http://easylist.adblockplus.org/\">easylist.adblockplus.org</a>"
+            ));
+        }
+
+        public void add_subscription (string? uri) {
+            var dialog = new Gtk.Dialog.with_buttons (_("Configure Advertisement filters"),
+                null,
+#if !HAVE_GTK3
+                Gtk.DialogFlags.NO_SEPARATOR |
+#endif
+                Gtk.DialogFlags.DESTROY_WITH_PARENT,
+                Gtk.STOCK_HELP, Gtk.ResponseType.HELP,
+                Gtk.STOCK_CLOSE, Gtk.ResponseType.CLOSE);
+#if HAVE_GTK3
+            dialog.get_widget_for_response (Gtk.ResponseType.HELP).get_style_context ().add_class ("help_button");
+#endif
+            dialog.set_icon_name (Gtk.STOCK_PROPERTIES);
+            dialog.set_response_sensitive (Gtk.ResponseType.HELP, false);
+
+            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);
+            this.description_label.set_markup (this.description);
+            this.description_label.set_line_wrap (true);
+            vbox.pack_start (this.description_label, false, false, 4);
+
+            var entry = new Gtk.Entry ();
+            if (uri != null)
+                entry.set_text (uri);
+            vbox.pack_start (entry, false, false, 4);
+
+            liststore = new Gtk.ListStore (1, typeof (Subscription));
+            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.mutable);
+            });
+            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);
+                string status = "";
+                foreach (var feature in sub) {
+                    if (feature is Adblock.Updater) {
+                        var updater = feature as Adblock.Updater;
+                        if (updater.last_updated != null)
+                            status = updater.last_updated.format (_("Last update: %x %X"));
+                    }
+                }
+                if (!sub.valid)
+                    status = _("File incomplete - broken download?");
+                renderer.set ("markup", (Markup.printf_escaped ("<b>%s</b>\n%s",
+                    sub.title ?? sub.uri, status)));
+            });
+            treeview.append_column (column);
+
+            column = new Gtk.TreeViewColumn ();
+            Gtk.CellRendererPixbuf renderer_button = new Gtk.CellRendererPixbuf ();
+            column.pack_start (renderer_button, false);
+            column.set_cell_data_func (renderer_button, on_render_button);
+            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);
+            treeview.button_release_event.connect (button_released);
+
+            entry.activate.connect (() => {
+                string? parsed_uri = Adblock.parse_subscription_uri (entry.text);
+                if (parsed_uri != null) {
+                    var sub = new Subscription (parsed_uri);
+                    if (config.add (sub)) {
+                        liststore.insert_with_values (null, 0, 0, sub);
+                        try {
+                            sub.parse ();
+                        } catch (GLib.Error error) {
+                            warning ("Error parsing %s: %s", sub.uri, error.message);
+                        }
+                    }
+                }
+                entry.text = "";
+            });
+
+            dialog.get_content_area ().show_all ();
+
+            dialog.response.connect ((response)=>{ dialog.destroy (); });
+            dialog.show ();
+        }
+
+        void on_render_button (Gtk.CellLayout column, Gtk.CellRenderer renderer,
+            Gtk.TreeModel model, Gtk.TreeIter iter) {
+
+            Subscription sub;
+            liststore.get (iter, 0, out sub);
+
+            renderer.set ("stock-id", sub.mutable ? Gtk.STOCK_DELETE : null,
+                          "stock-size", Gtk.IconSize.MENU);
+        }
+
+        public bool button_released (Gdk.EventButton event) {
+            Gtk.TreePath? path;
+            Gtk.TreeViewColumn column;
+            if (treeview.get_path_at_pos ((int)event.x, (int)event.y, out path, out column, null, null)) {
+                if (path != null) {
+                    if (column == treeview.get_column (2)) {
+                        Gtk.TreeIter iter;
+                        if (liststore.get_iter (out iter, path)) {
+                            Subscription sub;
+                            liststore.get (iter, 0, out sub);
+                            if (sub.mutable) {
+                                config.remove (sub);
+                                liststore.remove (iter);
+                                return true;
+                            }
+                        }
+                    }
+                }
+            }
+            return false;
+        }
+    }
+
+    class CustomRulesEditor {
+        Gtk.Dialog dialog;
+        Subscription custom;
+        public string? rule { get; set; }
+
+        public CustomRulesEditor (Subscription custom) {
+            this.custom = custom;
+        }
+
+        public void set_uri (string uri) {
+            this.rule = uri;
+        }
+
+        public void show () {
+             this.dialog = new Gtk.Dialog.with_buttons (_("Edit rule"),
+                null,
+#if !HAVE_GTK3
+                Gtk.DialogFlags.NO_SEPARATOR |
+#endif
+                Gtk.DialogFlags.DESTROY_WITH_PARENT,
+                Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL,
+                Gtk.STOCK_ADD, Gtk.ResponseType.ACCEPT);
+            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 (this.rule);
+            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;
+
+            this.rule = entry.get_text ();
+            this.dialog.destroy ();
+            custom.add_rule (this.rule);
+        }
+    }
+
+}

=== modified file 'katze/midori-paths.vala'
--- katze/midori-paths.vala	2014-02-20 18:27:01 +0000
+++ katze/midori-paths.vala	2014-03-10 10:27:25 +0000
@@ -366,17 +366,24 @@
             if (Posix.access (path, Posix.F_OK) == 0)
                 return path;
 
+            return build_folder ("data", null, filename) ??
+              Path.build_filename (MDATADIR, PACKAGE_NAME, "res", filename);
+            #endif
+        }
+
+        string? build_folder (string folder, string? middle, string filename) {
             /* Fallback to build folder */
             File? parent = File.new_for_path (exec_path);
             while (parent != null) {
-                var data = parent.get_child ("data");
+                var data = parent.get_child (folder);
+                if (middle != null)
+                    data = data.get_child (middle);
                 var child = data.get_child (filename);
                 if (child.query_exists ())
                     return child.get_path ();
                 parent = parent.get_parent ();
             }
-            return Path.build_filename (MDATADIR, PACKAGE_NAME, "res", filename);
-            #endif
+            return null;
         }
 
         /* returns the path to a file containing read-only data installed with the application
@@ -416,7 +423,8 @@
                     return path;
             }
 
-            return Path.build_filename (SYSCONFDIR, "xdg", PACKAGE_NAME, folder ?? "", filename);
+            return build_folder ("config", folder, filename) ??
+              Path.build_filename (SYSCONFDIR, "xdg", PACKAGE_NAME, folder ?? "", filename);
             #endif
         }
 

=== modified file 'midori/midori-app.c'
--- midori/midori-app.c	2014-02-24 22:16:00 +0000
+++ midori/midori-app.c	2014-03-10 10:27:25 +0000
@@ -1257,7 +1257,7 @@
 midori_debug (const gchar* token)
 {
     static const gchar* debug_token = NULL;
-    const gchar* debug_tokens = "adblock:match adblock:time adblock:element startup headers body referer cookies paths hsts unarmed bookmarks mouse app ";
+    const gchar* debug_tokens = "adblock:match adblock:parse 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-browser.c'
--- midori/midori-browser.c	2014-03-03 21:28:53 +0000
+++ midori/midori-browser.c	2014-03-10 10:27:25 +0000
@@ -1237,7 +1237,7 @@
 
 {
 #ifndef HAVE_WEBKIT2
-    if (!midori_download_has_enough_space (download, uri))
+    if (!midori_download_has_enough_space (download, uri, FALSE))
         return FALSE;
     webkit_download_set_destination_uri (download, uri);
     g_signal_emit (browser, signals[ADD_DOWNLOAD], 0, download);

=== modified file 'midori/midori-download.vala'
--- midori/midori-download.vala	2014-03-05 07:17:45 +0000
+++ midori/midori-download.vala	2014-03-10 10:27:25 +0000
@@ -348,7 +348,7 @@
          * Returns whether it seems possible to save @download to the path specified by
          * @destination_uri, considering space on disk and permissions
          */
-        public static bool has_enough_space (WebKit.Download download, string destination_uri) {
+        public static bool has_enough_space (WebKit.Download download, string destination_uri, bool quiet=false) {
 #if !HAVE_WEBKIT2
             var folder = File.new_for_uri (destination_uri).get_parent ();
             bool can_write;
@@ -380,7 +380,8 @@
                 }
                 else
                     assert_not_reached ();
-                Sokoke.message_dialog (Gtk.MessageType.ERROR, message, detailed_message, false);
+                if (!quiet)
+                    Sokoke.message_dialog (Gtk.MessageType.ERROR, message, detailed_message, false);
                 return false;
             }
 #endif

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2014-03-02 23:15:34 +0000
+++ po/POTFILES.in	2014-03-10 10:27:25 +0000
@@ -102,4 +102,5 @@
 extensions/adblock/config.vala
 extensions/adblock/updater.vala
 extensions/adblock/element.vala
+extensions/adblock/widgets.vala
 extensions/domain-keys.vala