[epiphany/gnome-3-28] Revert "Add social media and annoyance blocking by default"

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 7a38ff15bfa34d08fd468f553d75206ba0bfc91b
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Mon May 21 13:36:34 2018 -0500

    Revert "Add social media and annoyance blocking by default"
    
    This reverts commit 8edafec78cbb99eef99fe7fc7b1dfdf021bbfe23.
    
    It's breaking a bunch of websites. This fixes a lot of bugs.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=796245

 data/org.gnome.epiphany.gschema.xml |    2 +-
 lib/ephy-uri-tester-shared.h        |    2 --
 src/prefs-dialog.c                  |   11 +++--------
 3 files changed, 4 insertions(+), 11 deletions(-)
---
diff --git a/data/org.gnome.epiphany.gschema.xml b/data/org.gnome.epiphany.gschema.xml
index a802099..c9b5cce 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', 'https://easylist.to/easylist/fanboy-annoyance.txt']</default>
+                        <default>['https://easylist.to/easylist/easylist.txt', 
'https://easylist.to/easylist/easyprivacy.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 ae307ad..038417d 100644
--- a/lib/ephy-uri-tester-shared.h
+++ b/lib/ephy-uri-tester-shared.h
@@ -26,8 +26,6 @@ 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 1c9913f..1af522c 100644
--- a/src/prefs-dialog.c
+++ b/src/prefs-dialog.c
@@ -1420,21 +1420,16 @@ 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);
-    newer_filters = ephy_strv_append ((const char * const *)new_filters, ADBLOCK_ANNOYANCE_FILTER_URL);
-  } else {
+  else
     new_filters = ephy_strv_remove ((const char * const *)filters, ADBLOCK_PRIVACY_FILTER_URL);
-    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_settings_set_strv (EPHY_SETTINGS_MAIN, EPHY_PREFS_ADBLOCK_FILTERS, (const char * const *)new_filters);
 
   g_strfreev (filters);
   g_strfreev (new_filters);
-  g_strfreev (newer_filters);
 }
 
 static void