diff options
author | Colin Guthrie <pulse@colin.guthr.ie> | 2008-08-03 19:56:49 +0100 |
---|---|---|
committer | Colin Guthrie <pulse@colin.guthr.ie> | 2008-08-03 19:56:49 +0100 |
commit | 5744237a066186be305be9ea3ecb3ccccadcceca (patch) | |
tree | 6a08957a66fb308a8f1b37232d9b2d24a246e394 /src/modules/dbus-util.c | |
parent | b30a5d601eaffd98914ca0b9fdecd863eade0b4f (diff) | |
parent | 04ffac57a67eee9640f248b6fab33ee8367b0eab (diff) |
Merge branch 'master' of git://git.0pointer.de/pulseaudio
Diffstat (limited to 'src/modules/dbus-util.c')
-rw-r--r-- | src/modules/dbus-util.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/modules/dbus-util.c b/src/modules/dbus-util.c index 905be13f..8e0066bc 100644 --- a/src/modules/dbus-util.c +++ b/src/modules/dbus-util.c @@ -27,7 +27,7 @@ #include <pulse/xmalloc.h> #include <pulse/timeval.h> #include <pulsecore/log.h> -#include <pulsecore/props.h> +#include <pulsecore/shared.h> #include "dbus-util.h" @@ -254,7 +254,7 @@ static pa_dbus_connection* pa_dbus_connection_new(pa_core* c, DBusConnection *co pconn->connection = conn; pconn->dispatch_event = c->mainloop->defer_new(c->mainloop, dispatch_cb, conn); - pa_property_set(c, name, pconn); + pa_shared_set(c, name, pconn); return pconn; } @@ -282,7 +282,7 @@ void pa_dbus_connection_unref(pa_dbus_connection *c) { } /* already disconnected, just free */ - pa_property_remove(c->core, c->property_name); + pa_shared_remove(c->core, c->property_name); c->core->mainloop->defer_free(c->dispatch_event); dbus_connection_unref(c->connection); pa_xfree(c); @@ -309,7 +309,7 @@ pa_dbus_connection* pa_dbus_bus_get(pa_core *c, DBusBusType type, DBusError *err pa_assert(type == DBUS_BUS_SYSTEM || type == DBUS_BUS_SESSION || type == DBUS_BUS_STARTER); - if ((pconn = pa_property_get(c, prop_name[type]))) + if ((pconn = pa_shared_get(c, prop_name[type]))) return pa_dbus_connection_ref(pconn); if (!(conn = dbus_bus_get_private(type, error))) |