"adblock.black" has been renamed to "adblock"

diff --git a/CHANGES b/CHANGES
index 513b2850815ca6cbf7648e8236363fda2595cf34..1eba7bfe162ec25c7045fbebb6fe12c421f9dcd3 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,9 @@
 Release history for lariza
 
 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
 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 2ebcaff6de0a084bf823076649b4942bfdbcfd52..ebab7fb82e66a265ef6fcc3e294ad4beb1d2a5cc 100644 (file)
--- a/browser.c
+++ b/browser.c
@@ -838,7 +838,7 @@ init_default_web_context(void)
 
     wc = webkit_web_context_get_default();
 
 
     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);
     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 077bd2570f1f4e75ad7c27efa82d48dc10ff16b3..eaba719264cad4203b0d5ae71d279fb4dca69d91 100644 (file)
--- 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
 .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
 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 6e571cb751e2aa3b16476ec0b9846c98b7444a1f..d193eaf7618dc9680ebfaeeae02b385487c71d0b 100644 (file)
--- 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
 .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
 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 79dd691208c2360de030b7041dfd7f8845939ac1..4714fb4bc60df8989bc0eaa39c67426566ea456c 100644 (file)
--- a/we_adblock.c
+++ b/we_adblock.c
@@ -15,7 +15,7 @@ adblock_load(void)
     GIOChannel *channel = NULL;
     gchar *path = NULL, *buf = NULL;
 
     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)
                             NULL);
     channel = g_io_channel_new_file(path, "r", &err);
     if (channel != NULL)