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

diff --git a/src/daemon/main.c b/src/daemon/main.c
index e2e4a810a3d23375f820b11def360289d925a259..c32f7c7de7c275b34129d8bebdda8b9e953de1bc 100644 (file)
--- 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 45796e7281c3e83ecc5b3ab0321fefb181da70d4..9bdc699198f2584ce66339ad07b0d446f6b107f9 100644 (file)
--- 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;
     }