[epiphany] Add social media and annoyance blocking by default
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany] Add social media and annoyance blocking by default
- Date: Sun, 6 Aug 2017 18:37:09 +0000 (UTC)
commit 8edafec78cbb99eef99fe7fc7b1dfdf021bbfe23
Author: Michael Catanzaro <mcatanzaro igalia com>
Date: Sun Aug 6 13:36:40 2017 -0500
Add social media and annoyance blocking by default
data/org.gnome.epiphany.gschema.xml | 2 +-
lib/ephy-uri-tester-shared.h | 2 ++
src/prefs-dialog.c | 11 ++++++++---
3 files changed, 11 insertions(+), 4 deletions(-)
---
diff --git a/data/org.gnome.epiphany.gschema.xml b/data/org.gnome.epiphany.gschema.xml
index e415d90..45d70bc 100644
--- a/data/org.gnome.epiphany.gschema.xml
+++ b/data/org.gnome.epiphany.gschema.xml
@@ -101,7 +101,7 @@
</key>
<key type="as" name="adblock-filters">
- <default>['https://easylist.to/easylist/easylist.txt',
'https://easylist.to/easylist/easyprivacy.txt']</default>
+ <default>['https://easylist.to/easylist/easylist.txt',
'https://easylist.to/easylist/easyprivacy.txt', 'https://easylist.to/easylist/fanboy-annoyance.txt']</default>
<summary>List of adblock filters</summary>
<description>List of URLs with filter rules to be used by the adblock.</description>
</key>
diff --git a/lib/ephy-uri-tester-shared.h b/lib/ephy-uri-tester-shared.h
index 038417d..ae307ad 100644
--- a/lib/ephy-uri-tester-shared.h
+++ b/lib/ephy-uri-tester-shared.h
@@ -26,6 +26,8 @@ G_BEGIN_DECLS
#define ADBLOCK_DEFAULT_FILTER_URL "https://easylist.to/easylist/easylist.txt"
#define ADBLOCK_PRIVACY_FILTER_URL "https://easylist.to/easylist/easyprivacy.txt"
+/* The annoyance filter includes the social button filter, which is important for privacy too. */
+#define ADBLOCK_ANNOYANCE_FILTER_URL "https://easylist.to/easylist/fanboy-annoyance.txt"
GFile *ephy_uri_tester_get_adblock_filter_file (const char *adblock_data_dir,
const char *filter_url);
diff --git a/src/prefs-dialog.c b/src/prefs-dialog.c
index 448ba37..6bd9abb 100644
--- a/src/prefs-dialog.c
+++ b/src/prefs-dialog.c
@@ -1389,16 +1389,21 @@ do_not_track_button_clicked_cb (GtkWidget *button,
{
char **filters;
char **new_filters;
+ char **newer_filters;
filters = g_settings_get_strv (EPHY_SETTINGS_MAIN, EPHY_PREFS_ADBLOCK_FILTERS);
- if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button)))
+ if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button))) {
new_filters = ephy_strv_append ((const char * const *)filters, ADBLOCK_PRIVACY_FILTER_URL);
- else
+ newer_filters = ephy_strv_append ((const char * const *)new_filters, ADBLOCK_ANNOYANCE_FILTER_URL);
+ } else {
new_filters = ephy_strv_remove ((const char * const *)filters, ADBLOCK_PRIVACY_FILTER_URL);
- g_settings_set_strv (EPHY_SETTINGS_MAIN, EPHY_PREFS_ADBLOCK_FILTERS, (const char * const *)new_filters);
+ newer_filters = ephy_strv_remove ((const char * const *)new_filters, ADBLOCK_ANNOYANCE_FILTER_URL);
+ }
+ g_settings_set_strv (EPHY_SETTINGS_MAIN, EPHY_PREFS_ADBLOCK_FILTERS, (const char * const *)newer_filters);
g_strfreev (filters);
g_strfreev (new_filters);
+ g_strfreev (newer_filters);
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]