aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichael Terry <mike@mterry.name>2011-01-11 12:59:35 -0600
committerMichael Terry <mike@mterry.name>2011-01-11 12:59:35 -0600
commitc36a4eb024cc9b595c6ff77c009acb7530ead15e (patch)
tree9faadba0bc59b078ba8aaca7887d315c7a9aa67f /src
parent3f91473b3a8d052c6f73117eaa708c59f1e8c3c1 (diff)
downloadayatana-indicator-session-c36a4eb024cc9b595c6ff77c009acb7530ead15e.tar.gz
ayatana-indicator-session-c36a4eb024cc9b595c6ff77c009acb7530ead15e.tar.bz2
ayatana-indicator-session-c36a4eb024cc9b595c6ff77c009acb7530ead15e.zip
and cancel the cancel object
Diffstat (limited to 'src')
-rw-r--r--src/indicator-session.c11
1 files 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;
}