[epiphany] filters-manager: Fix misuse of GCancellable
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany] filters-manager: Fix misuse of GCancellable
- Date: Tue, 24 Jan 2017 02:14:20 +0000 (UTC)
commit 503155111ae77dd83c62f37ca9fa056bba12ac86
Author: Michael Catanzaro <mcatanzaro gnome org>
Date: Mon Jan 23 20:13:47 2017 -0600
filters-manager: Fix misuse of GCancellable
This completely broke the adblocker.
lib/ephy-filters-manager.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/lib/ephy-filters-manager.c b/lib/ephy-filters-manager.c
index 989414f..8067560 100644
--- a/lib/ephy-filters-manager.c
+++ b/lib/ephy-filters-manager.c
@@ -235,8 +235,10 @@ update_adblock_filter_files (EphyFiltersManager *manager)
if (!g_settings_get_boolean (EPHY_SETTINGS_WEB, EPHY_PREFS_WEB_ENABLE_ADBLOCK))
return;
- /* One at a time please! */
+ /* Only once at a time please! Newest set of filters wins. */
g_cancellable_cancel (manager->cancellable);
+ g_object_unref (manager->cancellable);
+ manager->cancellable = g_cancellable_new ();
filters = g_settings_get_strv (EPHY_SETTINGS_WEB, EPHY_PREFS_WEB_ADBLOCK_FILTERS);
for (guint i = 0; filters[i]; i++) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]