Merge lp:~midori/midori/finishingTouches into lp:midori

[Cris Dywan]

Finishing touches for Adblock

Short Term:
x open link in label
- Parse *.png style rules
x Extend known tag list in update_css_hash
x gui sizing
x deactivating
x popup menu roll-up

Long Term:
- 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

[Cris Dywan (kalikiana)]

review: Approve

=== added file 'data/adblock/element_hider.js'
--- data/adblock/element_hider.js	1970-01-01 00:00:00 +0000
+++ data/adblock/element_hider.js	2014-03-14 21:32:33 +0000
@@ -0,0 +1,25 @@
+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';
+    }
+};

=== modified file 'extensions/adblock/extension.vala'
--- extensions/adblock/extension.vala	2014-03-10 10:26:53 +0000
+++ extensions/adblock/extension.vala	2014-03-14 21:32:33 +0000
@@ -47,11 +47,13 @@
     public class Extension : Midori.Extension {
         internal Config config;
         internal Subscription custom;
-        internal HashTable<string, Directive?> cache;
+        internal StringBuilder hider_selectors;
         internal StatusIcon status_icon;
         internal SubscriptionManager manager;
-        internal State state;
         internal bool debug_element;
+#if !USE_CSS_SELECTOR_FOR_BLOCKED_RESOURCES
+        internal string? js_hider_function_body;
+#endif
 
 #if HAVE_WEBKIT2
         public Extension (WebKit.WebExtension web_extension) {
@@ -64,7 +66,7 @@
         }
 
         bool send_request (WebKit.WebPage web_page, WebKit.URIRequest request, WebKit.URIResponse? redirected_response) {
-            return request_handled (web_page.uri, request.uri);
+            return request_handled (request.uri, web_page.uri);
         }
 #else
         public Extension () {
@@ -73,6 +75,7 @@
                          version: "2.0",
                          authors: "Christian Dywan <[e-mail]>");
             activate.connect (extension_activated);
+            deactivate.connect (extension_deactivated);
             open_preferences.connect (extension_preferences);
         }
 
@@ -85,34 +88,59 @@
             foreach (var browser in app.get_browsers ())
                 browser_added (browser);
             app.add_browser.connect (browser_added);
+            app.remove_browser.connect (browser_removed);
+        }
+
+        void extension_deactivated () {
+            var app = get_app ();
+            foreach (var browser in app.get_browsers ())
+                browser_removed (browser);
+            app.add_browser.disconnect (browser_added);
+            app.remove_browser.disconnect (browser_removed);
+            foreach (var button in status_icon.toggle_buttons)
+                button.destroy ();
         }
 
         void browser_added (Midori.Browser browser) {
             foreach (var tab in browser.get_tabs ())
                 tab_added (tab);
             browser.add_tab.connect (tab_added);
+            browser.remove_tab.connect (tab_removed);
 
-            var toggle_button = new StatusIcon.IconButton ();
-            toggle_button.set_status (config.enabled ? "enabled" : "disabled");
+            var toggle_button = status_icon.add_button ();
             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 browser_removed (Midori.Browser browser) {
+            foreach (var tab in browser.get_tabs ())
+                tab_removed (tab);
+            browser.add_tab.disconnect (tab_added);
+            browser.remove_tab.disconnect (tab_removed);
+        }
 
         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 (config.enabled) {
-                    if (view.load_status == Midori.LoadStatus.FINISHED)
-                        inject_css (view, view.uri);
-                }
-            });
+            view.notify["load-status"].connect (load_status_changed);
             view.context_menu.connect (context_menu);
         }
 
+        void tab_removed (Midori.View view) {
+            view.web_view.resource_request_starting.disconnect (resource_requested);
+            view.web_view.navigation_policy_decision_requested.disconnect (navigation_requested);
+            view.notify["load-status"].disconnect (load_status_changed);
+            view.context_menu.disconnect (context_menu);
+        }
+
+        void load_status_changed (Object object, ParamSpec pspec) {
+            var view = object as Midori.View;
+            if (config.enabled) {
+                if (view.load_status == Midori.LoadStatus.FINISHED)
+                    inject_css (view, view.uri);
+            }
+        }
+
         void context_menu (WebKit.HitTestResult hit_test_result, Midori.ContextAction menu) {
             string label, uri;
             if ((hit_test_result.context & WebKit.HitTestResultContext.IMAGE) != 0) {
@@ -132,23 +160,11 @@
             menu.add (action);
         }
 
-        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 (request.uri, web_view.uri)) {
                 request.set_uri ("about:blank");
-                state = adblock_get_state (get_directive_for_uri (web_view.uri));
-                status_icon.set_state (state);
             }
         }
 
@@ -162,22 +178,17 @@
                 manager.add_subscription (parsed_uri);
                 return true;
             }
-            state = adblock_get_state (get_directive_for_uri (request.uri));
-            status_icon.set_state (state);
+            status_icon.set_state (config.enabled ? State.ENABLED : State.DISABLED);
             return false;
         }
 
+#if USE_CSS_SELECTOR_FOR_BLOCKED_RESOURCES
         string? get_hider_css_for_blocked_resources () {
+            if (hider_selectors.str == "")
+                return null;
+
             /* 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;
-
+            var code = new StringBuilder (hider_selectors.str);
             string hider_css;
             if (debug_element)
                 hider_css = " { background-color: red; border: 4px solid green; }";
@@ -190,6 +201,37 @@
                 stdout.printf ("hider css: %s\n", code.str);
             return code.str;
         }
+#else
+        string? fetch_js_hider_function_body () {
+            string filename = Midori.Paths.get_res_filename ("adblock/element_hider.js");
+            File js_file = GLib.File.new_for_path (filename);
+            try {
+                uint8[] function_body;
+                js_file.load_contents (null, out function_body, null);
+                return (string)function_body;
+            }
+            catch (Error error) {
+                warning ("Error while loading adblock hider js: %s\n", error.message);
+            }
+            return null;
+        }
+
+        string? get_hider_js_for_blocked_resorces () {
+            if (hider_selectors.str == "")
+                return null;
+
+            if (js_hider_function_body == null || js_hider_function_body == "")
+                return null;
+
+            var js =  new StringBuilder ("(function() {");
+            js.append (js_hider_function_body);
+            js.append ("var uris=new Array ();");
+            js.append (hider_selectors.str);
+            js.append (" hideElementBySrc (uris);})();");
+
+            return js.str;
+        }
+#endif
 
         string[]? get_domains_for_uri (string uri) {
             if (uri == null)
@@ -263,10 +305,15 @@
             else
                 debug_element = status_icon.debug_element_toggled;
 
+#if USE_CSS_SELECTOR_FOR_BLOCKED_RESOURCES
             string? blocked_css = get_hider_css_for_blocked_resources ();
             if (blocked_css != null)
                 view.inject_stylesheet (blocked_css);
-
+#else
+            string? blocked_js = get_hider_js_for_blocked_resorces ();
+            if (blocked_js != null)
+                view.execute_script (blocked_js, null);
+#endif
             string? style = get_hider_css_rules_for_uri (page_uri);
             if (style != null)
                 view.inject_stylesheet (style);
@@ -274,10 +321,10 @@
 #endif
 
         internal void init () {
-            cache = new HashTable<string, Directive?> (str_hash, str_equal);
+            hider_selectors = new StringBuilder ();
             load_config ();
-            status_icon = new StatusIcon (config);
             manager = new SubscriptionManager (config);
+            status_icon = new StatusIcon (config, manager);
             foreach (Subscription sub in config) {
                 try {
                     sub.parse ();
@@ -287,6 +334,9 @@
             }
             config.notify["size"].connect (subscriptions_added_removed);
             manager.description_label.activate_link.connect (open_link);
+#if !USE_CSS_SELECTOR_FOR_BLOCKED_RESOURCES
+            js_hider_function_body = fetch_js_hider_function_body ();
+#endif
         }
 
         bool open_link (string uri) {
@@ -297,7 +347,7 @@
         }
 
         void subscriptions_added_removed (ParamSpec pspec) {
-            cache.remove_all ();
+            hider_selectors = new StringBuilder ();
         }
 
         void load_config () {
@@ -317,43 +367,43 @@
             }
         }
 
-        public Adblock.Directive get_directive_for_uri (string request_uri, string? page_uri = null) {
+        public Adblock.Directive get_directive_for_uri (string request_uri, string page_uri) {
             if (!config.enabled)
                 return Directive.ALLOW;
 
-            if (page_uri != null) {
-                /* Always allow the main page */
-                if (request_uri == page_uri)
-                    return Directive.ALLOW;
+            /* 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 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 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;
-                }
-                if (directive == null)
-                    directive = Directive.ALLOW;
-                cache.insert (request_uri, directive);
-                if (directive == Directive.BLOCK)
-                    cache.insert (page_uri, directive);
+            Directive? 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;
+            else if (directive == Directive.BLOCK) {
+                status_icon.set_state (State.BLOCKED);
+#if USE_CSS_SELECTOR_FOR_BLOCKED_RESOURCES
+                hider_selectors.append ("img[src*=\"%s\"] , iframe[src*=\"%s\"] , ".printf (request_uri, request_uri));
+#else
+                hider_selectors.append (" uris.push ('%s');\n".printf (request_uri));
+#endif
             }
             return directive;
         }
 
-        internal bool request_handled (string page_uri, string request_uri) {
+        internal bool request_handled (string request_uri, string page_uri) {
             return get_directive_for_uri (request_uri, page_uri) == Directive.BLOCK;
         }
     }
@@ -541,7 +591,7 @@
     if (extension.config.size != 3)
         error ("Expected 3 initial subs, got %s".printf (
                extension.config.size.to_string ()));
-    assert (extension.cache.size () == 0);
+    assert (extension.status_icon.state == Adblock.State.ENABLED);
 
     /* Add new subscription */
     string path = Midori.Paths.get_res_filename ("adblock.list");
@@ -553,7 +603,7 @@
     }
     var sub = new Adblock.Subscription (uri);
     extension.config.add (sub);
-    assert (extension.cache.size () == 0);
+    assert (extension.status_icon.state == Adblock.State.ENABLED);
     assert (extension.config.size == 4);
     try {
         sub.parse ();
@@ -564,25 +614,48 @@
     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);
+    assert (extension.status_icon.state == Adblock.State.ENABLED);
     /* 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);
+    assert (extension.request_handled ("https://ads.bogus.name/blub", "https://foo.com"));
+    assert (extension.status_icon.state == Adblock.State.BLOCKED);
+    assert (extension.hider_selectors.str != "");
     /* 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 */
+    assert (!extension.request_handled ("https://ads.bogus.name/blub", "https://foo.com"));
+    // FIXME: assert (extension.status_icon.state == Adblock.State.DISABLED);
+    /* Removing a subscription should clear the cached CSS */
     extension.config.remove (sub);
-    assert (extension.cache.size () == 0);
+    assert (extension.hider_selectors.str == "");
     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);
+    extension.custom.add_rule ("/adpage.");
+    assert (extension.custom.get_directive ("http://www.engadget.com/_uac/adpage.html", "http://foo.com") == Adblock.Directive.BLOCK);
+    assert (extension.request_handled ("http://www.engadget.com/_uac/adpage.html", "http://foo.com"));
+    assert (extension.status_icon.state == Adblock.State.BLOCKED);
+    /* Second attempt, from cache, same result */
+    assert (extension.custom.get_directive ("http://www.engadget.com/_uac/adpage.html", "http://foo.com") == Adblock.Directive.BLOCK);
+    assert (extension.request_handled ("http://www.engadget.com/_uac/adpage.html", "http://foo.com"));
+    /* Another custom rule */
+    extension.custom.add_rule ("/images/*.png");
+    assert (extension.custom.get_directive ("http://alpha.beta.com/images/yota.png", "https://foo.com") == Adblock.Directive.BLOCK);
+    assert (extension.request_handled ("http://alpha.beta.com/images/yota.png", "https://foo.com"));
+    /* Second attempt, from cache, same result */
+    assert (extension.request_handled ("http://alpha.beta.com/images/yota.png", "https://foo.com"));
+    /* Similar uri but .jpg should pass */
+    assert (!extension.request_handled ("http://alpha.beta.com/images/yota.jpg", "https://foo.com"));
+    assert (extension.custom.get_directive ("http://alpha.beta.com/images/yota.jpg", "https://foo.com") != Adblock.Directive.BLOCK);
+    /* Add whitelist rule */
+    extension.custom.add_rule ("@@http://alpha.beta.com/images/drop*bear.png");
+    assert (!extension.request_handled ("http://alpha.beta.com/images/drop-bear.png", "https://foo.com"));
+    assert (!extension.request_handled ("http://alpha.beta.com/images/dropzone_bear.png", "https://foo.com"));
+    assert (extension.custom.get_directive ("http://alpha.beta.com/images/drop-bear.png", "https://foo.com") != Adblock.Directive.BLOCK);
+    /* Doesn't match whitelist, matches *.png rule, should be blocked */
+    assert (extension.request_handled ("http://alpha.beta.com/images/bear.png", "https://foo.com"));
+    assert (extension.custom.get_directive ("http://alpha.beta.com/images/bear.png", "https://foo.com") == Adblock.Directive.BLOCK);
  }
 
 struct TestCaseLine {
@@ -647,7 +720,7 @@
         return "none";
     return directive.to_string ();
 }
- 
+
 void test_adblock_pattern () {
     string path = Midori.Paths.get_res_filename ("adblock.list");
     string uri;

=== modified file 'extensions/adblock/subscriptions.vala'
--- extensions/adblock/subscriptions.vala	2014-03-06 21:33:43 +0000
+++ extensions/adblock/subscriptions.vala	2014-03-14 21:32:33 +0000
@@ -33,6 +33,7 @@
         public bool active { get; set; default = true; }
         public bool mutable { get; set; default = true; }
         public bool valid { get; private set; default = true; }
+        HashTable<string, Directive?> cache;
         List<Feature> features;
         public Pattern pattern;
         public Keys keys;
@@ -70,6 +71,7 @@
         public uint size { get; private set; }
 
         public void clear () {
+            cache = new HashTable<string, Directive?> (str_hash, str_equal);
             foreach (var feature in features)
                 feature.clear ();
             optslist.clear ();
@@ -99,6 +101,10 @@
             if (line[0] == '#')
                 return;
 
+            /* TODO: CSS hider whitelist */
+            if ("#@#" in line)
+                return;
+
             /* Per domain CSS hider rule */
             if ("##" in line) {
                 frame_add_private (line, "##");
@@ -155,6 +161,16 @@
         }
 
         void update_css_hash (string domain, string value) {
+            string[] valid_elements = { "::after", "::before", "a", "abbr", "address", "article", "aside",
+                "b", "blockquote", "caption", "center", "cite", "code", "div", "dl", "dt", "dd", "em",
+                "feed", "fieldset", "figcaption", "figure", "font", "footer", "form", "h1", "h2", "h3", "h4", "h5", "h6",
+                "header", "hgroup", "i", "iframe", "iframe html *", "img", "kbd", "label", "legend", "li",
+                "m", "main", "marquee", "menu", "nav", "ol", "option", "p", "pre", "q", "samp", "section",
+                "small", "span", "strong", "summary", "table", "tr", "tbody", "td", "th", "thead", "tt", "ul" };
+
+            if (!value.has_prefix (".") && !value.has_prefix ("#")
+             && !(value.split("[")[0] in valid_elements))
+                  message ("Adblock: Invalid selector: %s", value);
             string? olddata = element.lookup (domain);
             if (olddata != null) {
                 string newdata = olddata + " , " + value;
@@ -195,7 +211,7 @@
                 /* is pattern is already a regex? */
                 if (Regex.match_simple ("^/.*[\\^\\$\\*].*/$", patt,
                     RegexCompileFlags.UNGREEDY, RegexMatchFlags.NOTEMPTY)
-                 || opts != null && opts.contains ("whitelist")) {
+                 || (opts != null && opts.contains ("whitelist"))) {
                     if (debug_parse)
                         stdout.printf ("patt: %s\n", patt);
                     if (opts.contains ("whitelist"))
@@ -339,8 +355,11 @@
 
         public Directive? get_directive (string request_uri, string page_uri) {
             try {
+                Directive? directive = cache.lookup (request_uri);
+                if (directive != null)
+                    return directive;
                 foreach (var feature in features) {
-                    Directive? directive = feature.match (request_uri, page_uri);
+                    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);

=== modified file 'extensions/adblock/widgets.vala'
--- extensions/adblock/widgets.vala	2014-03-09 21:37:56 +0000
+++ extensions/adblock/widgets.vala	2014-03-14 21:32:33 +0000
@@ -15,12 +15,14 @@
 
     public class StatusIcon {
         Config config;
-        State state;
+        SubscriptionManager manager;
+        public State state;
         public bool debug_element_toggled;
         public List<IconButton> toggle_buttons;
 
-        public StatusIcon (Adblock.Config config) {
+        public StatusIcon (Adblock.Config config, SubscriptionManager manager) {
             this.config = config;
+            this.manager = manager;
             this.debug_element_toggled = false;
         }
 
@@ -44,6 +46,15 @@
             }
         }
 
+        public IconButton add_button () {
+            var button = new IconButton ();
+            button.set_status (config.enabled ? "enabled" : "disabled");
+            button.clicked.connect (icon_clicked);
+            button.destroy.connect (()=> { toggle_buttons.remove (button); });
+            toggle_buttons.append (button);
+            return button;
+        }
+
         public void update_buttons () {
             string state = "";
             foreach (var toggle_button in toggle_buttons) {
@@ -65,7 +76,20 @@
 
         public void icon_clicked (Gtk.Button toggle_button) {
             var menu = new Gtk.Menu ();
-            var checkitem = new Gtk.CheckMenuItem.with_label (_("Disabled"));
+
+            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 (() => {
+                manager.add_subscription (null);
+            });
+            menu.append (menuitem);
+
+            var separator = new Gtk.SeparatorMenuItem ();
+            menu.append (separator);
+
+            var checkitem = new Gtk.CheckMenuItem.with_label (_("Disable"));
             checkitem.set_active (!config.enabled);
             checkitem.toggled.connect (() => {
                 config.enabled = !checkitem.active;
@@ -80,18 +104,9 @@
             });
             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);
+            menu.attach_to_widget (toggle_button, null);
+            menu.popup (null, null, null, 1, Gtk.get_current_event_time ());
         }
     }
 
@@ -196,6 +211,9 @@
             scrolled.set_policy (Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC);
             scrolled.add (treeview);
             vbox.pack_start (scrolled);
+            int height;
+            treeview.create_pango_layout ("a\nb").get_pixel_size (null, out height);
+            scrolled.set_size_request (-1, height * 5);
 
             foreach (Subscription sub in config)
                 liststore.insert_with_values (null, 0, 0, sub);

=== modified file 'midori/midori-browser.c'
--- midori/midori-browser.c	2014-03-06 22:22:37 +0000
+++ midori/midori-browser.c	2014-03-14 21:32:33 +0000
@@ -1523,7 +1523,8 @@
         return;
 
     GtkWidget* new_view = midori_browser_add_uri (browser, uri);
-    midori_browser_view_copy_history (new_view, view, FALSE);
+    if (view != NULL)
+        midori_browser_view_copy_history (new_view, view, FALSE);
 
     if (!background)
         midori_browser_set_current_tab (browser, new_view);
@@ -1536,7 +1537,9 @@
                            const gchar*   uri,
                            MidoriBrowser* browser)
 {
-    if (midori_view_forward_external (view, uri, MIDORI_NEW_VIEW_WINDOW))
+    if (midori_view_forward_external (
+        view ? view : midori_browser_get_current_tab (browser),
+        uri, MIDORI_NEW_VIEW_WINDOW))
         return;
 
     MidoriBrowser* new_browser;