From 97eb3522b50b17d7b00c32209b04a3f285c45d4e Mon Sep 17 00:00:00 2001
From: Christian Dywan <christian@twotoasts.de>
Date: Wed, 18 Sep 2019 21:58:30 +0200
Subject: [PATCH] Adblock filter list needs to be scrollable

---
 extensions/adblock/extension.vala    | 12 +++++++++---
 extensions/adblock/subscription.vala |  8 +++++++-
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/extensions/adblock/extension.vala b/extensions/adblock/extension.vala
index d34b991ab..fa9d33f67 100644
--- a/extensions/adblock/extension.vala
+++ b/extensions/adblock/extension.vala
@@ -162,9 +162,15 @@ namespace Adblock {
                 Application.get_default ().open (files, "");
                 return true;
             });
-            listbox.insert (label, -1);
-
-            box.add (listbox);
+            var vbox = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
+            vbox.pack_end (label, false, false);
+
+            var scrolled = new Gtk.ScrolledWindow (null, null);
+            scrolled.hscrollbar_policy = Gtk.PolicyType.NEVER;
+            scrolled.min_content_height = 150;
+            scrolled.add (listbox);
+            vbox.pack_start (scrolled, true, true);
+            box.add (vbox);
             box.show_all ();
             preferences.add (_("Privacy"), box);
             deactivate.connect (() => {
diff --git a/extensions/adblock/subscription.vala b/extensions/adblock/subscription.vala
index d262ba81e..63736de7d 100644
--- a/extensions/adblock/subscription.vala
+++ b/extensions/adblock/subscription.vala
@@ -182,7 +182,7 @@ namespace Adblock {
             try {
                 yield parse (headers_only);
             } catch (Error error) {
-                critical ("Failed to parse %s%s: %s", headers_only ? "headers for " : "", uri, error.message);
+                debug ("Failed to parse %s%s: %s", headers_only ? "headers for " : "", uri, error.message);
             }
         }
 
@@ -218,6 +218,12 @@ namespace Adblock {
             string key = header;
             string value = "";
             if (header.contains (":")) {
+                // FIXME: Unsupported format
+                // !:partner_token=example.com
+                if (header.has_prefix ("!:")) {
+                    debug ("Unsupported header '%s'", header);
+                    return;
+                }
                 string[] parts = header.split (":", 2);
                 if (parts[0] != null && parts[0] != ""
                  && parts[1] != null && parts[1] != "") {