dbus: Three entangled changes:

[pulseaudio] / src / modules / dbus / iface-client.c

diff --git a/src/modules/dbus/iface-client.c b/src/modules/dbus/iface-client.c
index cfa36d0ca1a9fd28c564f3ad4083d93c0cd45f3a..d9c8653f22103aec563352eb46040f76fcc4415b 100644 (file)
--- a/src/modules/dbus/iface-client.c
+++ b/src/modules/dbus/iface-client.c
@@ -24,6 +24,7 @@
 #endif
 
 #include <pulsecore/core-util.h>
+#include <pulsecore/protocol-dbus.h>
 
 #include "iface-client.h"
 
@@ -34,15 +35,15 @@ struct pa_dbusiface_client {
     char *path;
 };
 
-pa_dbusiface_client *pa_dbusiface_client_new(pa_client *client, const char *path_prefix) {
+pa_dbusiface_client *pa_dbusiface_client_new(pa_dbusiface_core *core, pa_client *client) {
     pa_dbusiface_client *c;
 
+    pa_assert(core);
     pa_assert(client);
-    pa_assert(path_prefix);
 
     c = pa_xnew(pa_dbusiface_client, 1);
     c->client = client;
-    c->path = pa_sprintf_malloc("%s/%s%u", path_prefix, OBJECT_NAME, client->index);
+    c->path = pa_sprintf_malloc("%s/%s%u", PA_DBUS_CORE_OBJECT_PATH, OBJECT_NAME, client->index);
 
     return c;
 }