Skip to content

Adblock filter list needs to be scrollable #380

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kalikiana wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Adblock filter list needs to be scrollable #380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions extensions/adblock/extension.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (() => {
Expand Down
8 changes: 7 additions & 1 deletion extensions/adblock/subscription.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand Down Expand Up @@ -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] != "") {
Expand Down