mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-03 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

server-lookup: Update the D-Bus identifiers to be versioned.

Browse source
This commit is contained in:
Tanu Kaskinen 2009-06-30 15:21:20 +03:00
parent 3bff2eee4b
commit 6e2fec05dd
2 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/daemon/main.c
View file

@ -943,7 +943,7 @@ int main(int argc, char *argv[]) {
if (!conf->system_instance) { if (!conf->system_instance) {
if (!(server_lookup = pa_dbusobj_server_lookup_new(c))) if (!(server_lookup = pa_dbusobj_server_lookup_new(c)))
goto finish; goto finish;
if (!(lookup_service_bus = register_dbus_name(c, DBUS_BUS_SESSION, "org.pulseaudio.PulseAudio"))) if (!(lookup_service_bus = register_dbus_name(c, DBUS_BUS_SESSION, "org.pulseaudio.PulseAudio1")))
goto finish; goto finish;
} }

15
src/daemon/server-lookup.c
View file

@ -36,6 +36,9 @@
#include "server-lookup.h" #include "server-lookup.h"
#define OBJECT_PATH "/org/pulseaudio1/server_lookup"
#define INTERFACE "org.pulseaudio.ServerLookup1"
struct pa_dbusobj_server_lookup { struct pa_dbusobj_server_lookup {
pa_core *core; pa_core *core;
pa_dbus_connection *conn; pa_dbus_connection *conn;
@ -47,7 +50,7 @@ static const char introspection[] =
"<node>" "<node>"
" <!-- If you are looking for documentation make sure to check out\n" " <!-- If you are looking for documentation make sure to check out\n"
" http://pulseaudio.org/wiki/DBusInterface -->\n" " http://pulseaudio.org/wiki/DBusInterface -->\n"
" <interface name=\"org.pulseaudio.ServerLookup\">" " <interface name=\"" INTERFACE "\">"
" <method name=\"GetAddress\">" " <method name=\"GetAddress\">"
" <arg name=\"result\" type=\"s\" direction=\"out\"/>" " <arg name=\"result\" type=\"s\" direction=\"out\"/>"
" </method>" " </method>"
@ -182,7 +185,7 @@ static DBusHandlerResult message_cb(DBusConnection *conn, DBusMessage *msg, void
if (dbus_message_is_method_call(msg, "org.freedesktop.DBus.Introspectable", "Introspect")) if (dbus_message_is_method_call(msg, "org.freedesktop.DBus.Introspectable", "Introspect"))
return handle_introspect(conn, msg, sl); return handle_introspect(conn, msg, sl);
if (dbus_message_is_method_call(msg, "org.pulseaudio.ServerLookup", "GetAddress")) if (dbus_message_is_method_call(msg, INTERFACE, "GetAddress"))
return handle_get_address(conn, msg, sl); return handle_get_address(conn, msg, sl);
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
@ -212,8 +215,8 @@ pa_dbusobj_server_lookup *pa_dbusobj_server_lookup_new(pa_core *c) {
goto fail; goto fail;
} }
if (!dbus_connection_register_object_path(pa_dbus_connection_get(sl->conn), "/org/pulseaudio/server_lookup", &vtable, sl)) { if (!dbus_connection_register_object_path(pa_dbus_connection_get(sl->conn), OBJECT_PATH, &vtable, sl)) {
pa_log("dbus_connection_register_object_path() failed for /org/pulseaudio/server_lookup."); pa_log("dbus_connection_register_object_path() failed for " OBJECT_PATH ".");
goto fail; goto fail;
} }
@ -234,8 +237,8 @@ void pa_dbusobj_server_lookup_free(pa_dbusobj_server_lookup *sl) {
if (sl->path_registered) { if (sl->path_registered) {
pa_assert(sl->conn); pa_assert(sl->conn);
if (!dbus_connection_unregister_object_path(pa_dbus_connection_get(sl->conn), "/org/pulseaudio/server_lookup")) if (!dbus_connection_unregister_object_path(pa_dbus_connection_get(sl->conn), OBJECT_PATH))
pa_log_debug("dbus_connection_unregister_object_path() failed for /org/pulseaudio/server_lookup."); pa_log_debug("dbus_connection_unregister_object_path() failed for " OBJECT_PATH ".");
} }
if (sl->conn) if (sl->conn)