From fcd052a49adf44c55a689a03fd5ced85369c7a5a Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Wed, 6 Jun 2012 14:47:08 -0500 Subject: if self->cancellable is non-NULL in dispose(), pass it to g_cancellable_cancel() before clearing the listener's reference --- src/dbus-listener.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/dbus-listener.c b/src/dbus-listener.c index 4923fe1..34df925 100644 --- a/src/dbus-listener.c +++ b/src/dbus-listener.c @@ -110,7 +110,12 @@ indicator_power_dbus_listener_dispose (GObject *object) IndicatorPowerDbusListenerPrivate * priv = self->priv; g_clear_object (&priv->proxy); - g_clear_object (&priv->cancellable); + + if (priv->cancellable != NULL) + { + g_cancellable_cancel (priv->cancellable); + g_clear_object (&priv->cancellable); + } if (priv->watcher_id) { -- cgit v1.2.3