[epiphany] filters-manager: Delete adblock files only if adblocker is enabled

[Michael Catanzaro <mcatanzaro src gnome org>]

commit e9ad3db75cfd0c210943e11db6c5e38380a71cb5
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Mon Jan 23 08:02:57 2017 -0600

    filters-manager: Delete adblock files only if adblocker is enabled
    
    This was requested by Carlos to avoid extra downloads when toggling the
    setting.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=776286

 lib/ephy-filters-manager.c |   14 +++++---------
 1 files changed, 5 insertions(+), 9 deletions(-)
---
diff --git a/lib/ephy-filters-manager.c b/lib/ephy-filters-manager.c
index 04504e1..b171efa 100644
--- a/lib/ephy-filters-manager.c
+++ b/lib/ephy-filters-manager.c
@@ -228,16 +228,11 @@ update_adblock_filter_files (EphyFiltersManager *manager)
   char **filters;
   GList *files = NULL;
 
-  /* One at a time please! */
-  if (manager->cancellable)
-    g_cancellable_cancel (manager->cancellable);
-  else
-    manager->cancellable = g_cancellable_new ();
-
-  if (!g_settings_get_boolean (EPHY_SETTINGS_WEB, EPHY_PREFS_WEB_ENABLE_ADBLOCK)) {
-    remove_old_adblock_filters (manager, files);
+  if (!g_settings_get_boolean (EPHY_SETTINGS_WEB, EPHY_PREFS_WEB_ENABLE_ADBLOCK))
     return;
-  }
+
+  /* One at a time please! */
+  g_cancellable_cancel (manager->cancellable);
 
   filters = g_settings_get_strv (EPHY_SETTINGS_WEB, EPHY_PREFS_WEB_ADBLOCK_FILTERS);
   for (guint i = 0; filters[i]; i++) {
@@ -371,6 +366,7 @@ ephy_filters_manager_class_init (EphyFiltersManagerClass *klass)
 static void
 ephy_filters_manager_init (EphyFiltersManager *manager)
 {
+  manager->cancellable = g_cancellable_new ();
 }
 
 EphyFiltersManager *