From 1e381fbffc190fdede27d6f27a2d113daf3e791d Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Fri, 25 Mar 2011 23:43:26 +0000 Subject: 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). --- src/modules/dbus/iface-core.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/modules/dbus/iface-core.c') 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); } -- cgit