diff options
author | Tanu Kaskinen <tanuk@iki.fi> | 2009-08-09 08:37:33 +0300 |
---|---|---|
committer | Tanu Kaskinen <tanuk@iki.fi> | 2009-08-09 08:37:33 +0300 |
commit | fcf68752e687123a171b1144f78f8eba1625a204 (patch) | |
tree | 2970a44e556502c107e3c266ff911c4790a26dc0 /src/modules/dbus/iface-memstats.c | |
parent | 1457df40eee692834d1c5faf95ca0057d74f86d1 (diff) |
dbus: Three entangled changes:
* Make the dbus object constructors take a pa_dbusiface_core pointer
as an argument. Remove the path_prefix argument.
* Expose the core object path as a constant in protocol-dbus.h.
* Move the core interface name constant from iface-core.h to
protocol-dbus.h.
Diffstat (limited to 'src/modules/dbus/iface-memstats.c')
-rw-r--r-- | src/modules/dbus/iface-memstats.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/modules/dbus/iface-memstats.c b/src/modules/dbus/iface-memstats.c index d3412a25..73a84be8 100644 --- a/src/modules/dbus/iface-memstats.c +++ b/src/modules/dbus/iface-memstats.c @@ -195,15 +195,15 @@ static void handle_get_all(DBusConnection *conn, DBusMessage *msg, void *userdat dbus_message_unref(reply); } -pa_dbusiface_memstats *pa_dbusiface_memstats_new(pa_core *core, const char *path_prefix) { +pa_dbusiface_memstats *pa_dbusiface_memstats_new(pa_dbusiface_core *dbus_core, pa_core *core) { pa_dbusiface_memstats *m; + pa_assert(dbus_core); pa_assert(core); - pa_assert(path_prefix); m = pa_xnew(pa_dbusiface_memstats, 1); m->core = pa_core_ref(core); - m->path = pa_sprintf_malloc("%s/%s", path_prefix, OBJECT_NAME); + m->path = pa_sprintf_malloc("%s/%s", PA_DBUS_CORE_OBJECT_PATH, OBJECT_NAME); m->dbus_protocol = pa_dbus_protocol_get(core); pa_assert_se(pa_dbus_protocol_add_interface(m->dbus_protocol, m->path, &memstats_interface_info, m) >= 0); |