mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-04 13:29:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

daemon: Don't treat it as a fatal error if we can't connect to the session bus

Browse source 
http://lists.freedesktop.org/archives/pulseaudio-discuss/2011-June/010276.html
This commit is contained in:
Tanu Kaskinen 2011-10-06 23:28:37 +03:00 • committed by Arun Raghavan
parent 3c4d43d9dc
commit 6d58497dd1
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/daemon/main.c
View file

@ -1107,14 +1107,14 @@ int main(int argc, char *argv[]) {
#ifdef HAVE_DBUS #ifdef HAVE_DBUS
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;
if (!(lookup_service_bus = register_dbus_name(c, DBUS_BUS_SESSION, "org.PulseAudio1"))) if (!(lookup_service_bus = register_dbus_name(c, DBUS_BUS_SESSION, "org.PulseAudio1")))
goto finish; goto finish;
} }
}
if (start_server && !(server_bus = register_dbus_name(c, conf->system_instance ? DBUS_BUS_SYSTEM : DBUS_BUS_SESSION, "org.pulseaudio.Server"))) if (start_server)
goto finish; server_bus = register_dbus_name(c, conf->system_instance ? DBUS_BUS_SYSTEM : DBUS_BUS_SESSION, "org.pulseaudio.Server");
#endif #endif
#ifdef HAVE_FORK #ifdef HAVE_FORK

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

@ -485,7 +485,7 @@ pa_dbusobj_server_lookup *pa_dbusobj_server_lookup_new(pa_core *c) {
sl->path_registered = FALSE; sl->path_registered = FALSE;
if (!(sl->conn = pa_dbus_bus_get(c, DBUS_BUS_SESSION, &error)) || dbus_error_is_set(&error)) { if (!(sl->conn = pa_dbus_bus_get(c, DBUS_BUS_SESSION, &error)) || dbus_error_is_set(&error)) {
pa_log("Unable to contact D-Bus: %s: %s", error.name, error.message); pa_log_warn("Unable to contact D-Bus: %s: %s", error.name, error.message);
goto fail; goto fail;
} }