diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/daemon/main.c | 6 | ||||
| -rw-r--r-- | src/pulse/context.c | 4 | 
2 files changed, 5 insertions, 5 deletions
diff --git a/src/daemon/main.c b/src/daemon/main.c index 1d543481..2faf6508 100644 --- a/src/daemon/main.c +++ b/src/daemon/main.c @@ -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) diff --git a/src/pulse/context.c b/src/pulse/context.c index 9fb9e726..40fa808c 100644 --- a/src/pulse/context.c +++ b/src/pulse/context.c @@ -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);  | 
