From edc56a7f7a993aa60b979a4093e39f66e7f7a8c8 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 1 Aug 2008 01:56:09 +0300 Subject: rename pa_property_xxx to pa_shared_xxx to avoid confusion with property lists --- src/modules/dbus-util.c | 6 +++--- src/modules/module-x11-publish.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/modules') diff --git a/src/modules/dbus-util.c b/src/modules/dbus-util.c index 905be13f..e18b6ab9 100644 --- a/src/modules/dbus-util.c +++ b/src/modules/dbus-util.c @@ -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))) diff --git a/src/modules/module-x11-publish.c b/src/modules/module-x11-publish.c index 705d90f4..d0ce344f 100644 --- a/src/modules/module-x11-publish.c +++ b/src/modules/module-x11-publish.c @@ -152,7 +152,7 @@ int pa__init(pa_module*m) { if (!(u->x11_wrapper = pa_x11_wrapper_get(m->core, pa_modargs_get_value(ma, "display", NULL)))) goto fail; - if (!(l = pa_property_get(m->core, PA_NATIVE_SERVER_PROPERTY_NAME))) + if (!(l = pa_shared_get(m->core, PA_NATIVE_SERVER_PROPERTY_NAME))) goto fail; l = pa_strlist_reverse(l); -- cgit