Commit 7a01645a authored by Michael Catanzaro's avatar Michael Catanzaro

Revert "Add social media and annoyance blocking by default"

This reverts commit 8edafec7.

It's breaking a bunch of websites. This fixes a lot of bugs.
parent b64ae61b
......@@ -96,7 +96,7 @@
<key type="as" name="adblock-filters">
<default>['', '', '']</default>
<default>['', '']</default>
<summary>List of adblock filters</summary>
<description>List of URLs with filter rules to be used by the adblock.</description>
......@@ -26,8 +26,6 @@ G_BEGIN_DECLS
/* The annoyance filter includes the social button filter, which is important for privacy too. */
GFile *ephy_uri_tester_get_adblock_filter_file (const char *adblock_data_dir,
const char *filter_url);
......@@ -1463,21 +1463,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 {
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
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment