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

take org.pulseaudio.Server instead of org.pulseaudio to match the interface name already used in the HAL module

Browse source
This commit is contained in:
Lennart Poettering 2009-03-30 21:07:23 +02:00
parent 857a1f4909
commit 3df9eef9d0
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/daemon/main.c
View file

@ -345,10 +345,10 @@ static void register_org_pulseaudio(pa_core *c)
goto finish_dbus;
}
if (dbus_bus_request_name (pa_dbus_connection_get(conn), "org.pulseaudio", 0, &error) == DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER)
pa_log_debug("Got org.pulseaudio!");
if (dbus_bus_request_name (pa_dbus_connection_get(conn), "org.pulseaudio.Server", DBUS_NAME_FLAG_DO_NOT_QUEUE, &error) == DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER)
pa_log_debug("Got org.pulseaudio.Server!");
else if (dbus_error_is_set(&error))
pa_log_warn("Unable to get org.pulseaudio: %s: %s", error.name, error.message);
pa_log_warn("Unable to get org.pulseaudio.Server: %s: %s", error.name, error.message);
finish_dbus:
if (conn)

4
src/pulse/context.c
View file

@ -760,8 +760,8 @@ static void track_pulseaudio_on_dbus(pa_context *c, DBusBusType type, pa_dbus_wr
if (pa_dbus_add_matches(
pa_dbus_wrap_connection_get(*conn), &error,
"type='signal',sender='" DBUS_SERVICE_DBUS "',interface='" DBUS_INTERFACE_DBUS "',member='NameOwnerChanged',arg0='org.pulseaudio',arg1=''", NULL) < 0)
pa_log_warn("Unable to track org.pulseaudio: %s: %s", error.name, error.message);
"type='signal',sender='" DBUS_SERVICE_DBUS "',interface='" DBUS_INTERFACE_DBUS "',member='NameOwnerChanged',arg0='org.pulseaudio.Server',arg1=''", NULL) < 0)
pa_log_warn("Unable to track org.pulseaudio.Server: %s: %s", error.name, error.message);
finish:
dbus_error_free(&error);