diff options
| author | Tanu Kaskinen <tanuk@iki.fi> | 2011-10-06 23:28:37 +0300 |
|---|---|---|
| committer | Colin Guthrie <colin@mageia.org> | 2011-10-20 13:35:34 +0100 |
| commit | 22e63b9edf33957d9b5b5adcdea2a39d84a9c2bb (patch) | |
| tree | 2ee7d4c9e4cce5c6eeebc9e788786e47a5154594 | |
| parent | 610d63e3f4faea307e585deb061c7e63e952e535 (diff) | |
daemon: Don't treat it as a fatal error if we can't connect to the session bus
http://lists.freedesktop.org/archives/pulseaudio-discuss/2011-June/010276.html
| -rw-r--r-- | src/daemon/main.c | 12 | ||||
| -rw-r--r-- | src/daemon/server-lookup.c | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/daemon/main.c b/src/daemon/main.c index e2e4a810..c32f7c7d 100644 --- a/src/daemon/main.c +++ b/src/daemon/main.c @@ -1107,14 +1107,14 @@ int main(int argc, char *argv[]) { #ifdef HAVE_DBUS if (!conf->system_instance) { - if (!(server_lookup = pa_dbusobj_server_lookup_new(c))) - goto finish; - if (!(lookup_service_bus = register_dbus_name(c, DBUS_BUS_SESSION, "org.PulseAudio1"))) - goto finish; + if ((server_lookup = pa_dbusobj_server_lookup_new(c))) { + if (!(lookup_service_bus = register_dbus_name(c, DBUS_BUS_SESSION, "org.PulseAudio1"))) + goto finish; + } } - if (start_server && !(server_bus = register_dbus_name(c, conf->system_instance ? DBUS_BUS_SYSTEM : DBUS_BUS_SESSION, "org.pulseaudio.Server"))) - goto finish; + if (start_server) + server_bus = register_dbus_name(c, conf->system_instance ? DBUS_BUS_SYSTEM : DBUS_BUS_SESSION, "org.pulseaudio.Server"); #endif #ifdef HAVE_FORK diff --git a/src/daemon/server-lookup.c b/src/daemon/server-lookup.c index 45796e72..9bdc6991 100644 --- a/src/daemon/server-lookup.c +++ b/src/daemon/server-lookup.c @@ -485,7 +485,7 @@ pa_dbusobj_server_lookup *pa_dbusobj_server_lookup_new(pa_core *c) { sl->path_registered = FALSE; 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; } |