[epiphany] uri-tester: Fix misuse of GCancellable
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany] uri-tester: Fix misuse of GCancellable
- Date: Wed, 2 Nov 2016 00:17:13 +0000 (UTC)
commit aa9e90aeff7ea49b6783871fdce050ec0e6308fe
Author: Michael Catanzaro <mcatanzaro gnome org>
Date: Tue Nov 1 18:56:38 2016 -0500
uri-tester: Fix misuse of GCancellable
embed/ephy-uri-tester.c | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/embed/ephy-uri-tester.c b/embed/ephy-uri-tester.c
index c645bfe..37604ff 100644
--- a/embed/ephy-uri-tester.c
+++ b/embed/ephy-uri-tester.c
@@ -1043,6 +1043,8 @@ https_everywhere_context_init_cb (HTTPSEverywhereContext *context,
g_list_free_full (tester->deferred_requests, (GDestroyNotify)deferred_request_free);
ephy_uri_tester_update_https_everywhere_rulesets (tester);
+
+ g_object_unref (tester);
}
static void
@@ -1111,7 +1113,7 @@ ephy_uri_tester_constructed (GObject *object)
https_everywhere_context_init (tester->https_everywhere_context,
tester->cancellable,
(GAsyncReadyCallback)https_everywhere_context_init_cb,
- tester);
+ g_object_ref (tester));
ephy_uri_tester_load_filters (tester);
ephy_uri_tester_load_patterns (tester);
@@ -1145,7 +1147,10 @@ ephy_uri_tester_dispose (GObject *object)
LOG ("EphyUriTester disposing %p", object);
- g_clear_object (&tester->cancellable);
+ if (tester->cancellable) {
+ g_cancellable_cancel (tester->cancellable);
+ g_clear_object (&tester->cancellable);
+ }
G_OBJECT_CLASS (ephy_uri_tester_parent_class)->dispose (object);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]