From c36a4eb024cc9b595c6ff77c009acb7530ead15e Mon Sep 17 00:00:00 2001 From: Michael Terry Date: Tue, 11 Jan 2011 12:59:35 -0600 Subject: and cancel the cancel object --- src/indicator-session.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/indicator-session.c b/src/indicator-session.c index 8d3ce61..d2e679c 100644 --- a/src/indicator-session.c +++ b/src/indicator-session.c @@ -184,16 +184,17 @@ indicator_session_dispose (GObject *object) self->service = NULL; } - if (self->service_proxy_cancel != NULL) { - g_object_unref(self->service_proxy_cancel); - self->service_proxy_cancel = NULL; - } - if (self->service_proxy != NULL) { g_object_unref(self->service_proxy); self->service_proxy = NULL; } + if (self->service_proxy_cancel != NULL) { + g_cancellable_cancel(self->service_proxy_cancel); + g_object_unref(self->service_proxy_cancel); + self->service_proxy_cancel = NULL; + } + G_OBJECT_CLASS (indicator_session_parent_class)->dispose (object); return; } -- cgit v1.2.3