From 3a7f69685901c5fcdada21e758b3b156550464d5 Mon Sep 17 00:00:00 2001 From: Peter Hofmann Date: Sun, 3 Jan 2021 10:00:03 +0100 Subject: "adblock.black" has been renamed to "adblock" --- CHANGES | 4 ++++ browser.c | 2 +- man1/lariza.1 | 2 +- man1/lariza.usage.1 | 2 +- we_adblock.c | 2 +- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGES b/CHANGES index 513b285..1eba7bf 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,9 @@ Release history for lariza +next + [Changed] + - The file "adblock.black" has been renamed to "adblock". + v20.08 2020-08-29 [Fixed] - Middle-click to open in a new tab has been improved. In certain diff --git a/browser.c b/browser.c index 2ebcaff..ebab7fb 100644 --- a/browser.c +++ b/browser.c @@ -838,7 +838,7 @@ init_default_web_context(void) wc = webkit_web_context_get_default(); - p = g_build_filename(g_get_user_config_dir(), __NAME__, "adblock.black", NULL); + p = g_build_filename(g_get_user_config_dir(), __NAME__, "adblock", NULL); webkit_web_context_set_sandbox_enabled(wc, TRUE); webkit_web_context_add_path_to_sandbox(wc, p, TRUE); g_free(p); diff --git a/man1/lariza.1 b/man1/lariza.1 index 077bd25..eaba719 100644 --- a/man1/lariza.1 +++ b/man1/lariza.1 @@ -83,7 +83,7 @@ Zoom level for WebKit viewports. Defaults to \fB1.0\fP. .SH FILES XDG variables will be used to construct these paths. .TP -\fI~/.config\:/lariza\:/adblock.black\fP +\fI~/.config\:/lariza\:/adblock\fP Adblock patterns. See \fBlariza.usage\fP(1). .TP \fI~/.config\:/lariza\:/certs\fP diff --git a/man1/lariza.usage.1 b/man1/lariza.usage.1 index 6e571cb..d193eaf 100644 --- a/man1/lariza.usage.1 +++ b/man1/lariza.usage.1 @@ -139,7 +139,7 @@ for further information on these extensions. .TP \fBwe_adblock.so\fP Generic adblock. Reads patterns from the file -\fI~/.config/lariza/adblock.black\fP. Each line can contain a regular +\fI~/.config/lariza/adblock\fP. Each line can contain a regular expression. These expressions match case-insensitive and partially, i.e. \fB.*foo.*\fP is the same as \fB.*FOO.*\fP and you can use anchors like \fB^https?://...\fP. Please refer to diff --git a/we_adblock.c b/we_adblock.c index 79dd691..4714fb4 100644 --- a/we_adblock.c +++ b/we_adblock.c @@ -15,7 +15,7 @@ adblock_load(void) GIOChannel *channel = NULL; gchar *path = NULL, *buf = NULL; - path = g_build_filename(g_get_user_config_dir(), __NAME__, "adblock.black", + path = g_build_filename(g_get_user_config_dir(), __NAME__, "adblock", NULL); channel = g_io_channel_new_file(path, "r", &err); if (channel != NULL) -- cgit v1.2.3