summaryrefslogtreecommitdiffstats
path: root/src/modules/dbus/iface-core.c
diff options
context:
space:
mode:
authorColin Guthrie <cguthrie@mandriva.org>2011-03-25 23:43:26 +0000
committerColin Guthrie <cguthrie@mandriva.org>2011-03-25 23:43:26 +0000
commit1e381fbffc190fdede27d6f27a2d113daf3e791d (patch)
tree4a74a0e2fef5be3d374bdc3e5b63aec141b34350 /src/modules/dbus/iface-core.c
parent7aa8a3fa8015d17240e5fc27bf44eb7d22e7e13a (diff)
dbus: Do not refcnt the core.
We should not call pa_core_ref() anywhere in the code. Doing so will prevent proper daemon shutdown as the only call (in daemon/main.c) to pa_core_unref() should always call free_core() and perform a normal shutdown (i.e. unload all modules gracefully).
Diffstat (limited to 'src/modules/dbus/iface-core.c')
-rw-r--r--src/modules/dbus/iface-core.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/modules/dbus/iface-core.c b/src/modules/dbus/iface-core.c
index 268a87ed..bb43df9b 100644
--- a/src/modules/dbus/iface-core.c
+++ b/src/modules/dbus/iface-core.c
@@ -1975,7 +1975,7 @@ pa_dbusiface_core *pa_dbusiface_core_new(pa_core *core) {
pa_assert(core);
c = pa_xnew(pa_dbusiface_core, 1);
- c->core = pa_core_ref(core);
+ c->core = core;
c->subscription = pa_subscription_new(core, PA_SUBSCRIPTION_MASK_ALL, subscription_cb, c);
c->dbus_protocol = pa_dbus_protocol_get(core);
c->cards = pa_hashmap_new(pa_idxset_trivial_hash_func, pa_idxset_trivial_compare_func);
@@ -2124,7 +2124,6 @@ void pa_dbusiface_core_free(pa_dbusiface_core *c) {
pa_source_unref(c->fallback_source);
pa_dbus_protocol_unref(c->dbus_protocol);
- pa_core_unref(c->core);
pa_xfree(c);
}