aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2013-04-18 11:25:13 -0500
committerCharles Kerr <charles.kerr@canonical.com>2013-04-18 11:25:13 -0500
commit75d79800ffbc0bdc8598b2b34164c4dabc9888c8 (patch)
treeae00f75b92f4c331f1e34ef0dc465f85eddffe54 /src
parent348a5c53f4ca0d1ee197bc0822f0c8d712cd8972 (diff)
downloadayatana-indicator-session-75d79800ffbc0bdc8598b2b34164c4dabc9888c8.tar.gz
ayatana-indicator-session-75d79800ffbc0bdc8598b2b34164c4dabc9888c8.tar.bz2
ayatana-indicator-session-75d79800ffbc0bdc8598b2b34164c4dabc9888c8.zip
in the service's dispose() function, unown the busname before unexporting the actions and menus.
Diffstat (limited to 'src')
-rw-r--r--src/service.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/service.c b/src/service.c
index 14d41cd..9a4e561 100644
--- a/src/service.c
+++ b/src/service.c
@@ -1102,6 +1102,12 @@ my_dispose (GObject * o)
IndicatorSessionService * self = INDICATOR_SESSION_SERVICE(o);
priv_t * p = self->priv;
+ if (p->own_id)
+ {
+ g_bus_unown_name (p->own_id);
+ p->own_id = 0;
+ }
+
unexport (self);
if (p->cancellable != NULL)
@@ -1116,12 +1122,6 @@ my_dispose (GObject * o)
p->rebuild_id = 0;
}
- if (p->own_id)
- {
- g_bus_unown_name (p->own_id);
- p->own_id = 0;
- }
-
g_clear_pointer (&p->users, g_hash_table_destroy);
g_clear_object (&p->backend_users);
g_clear_object (&p->backend_guest);