[pulseaudio-commits] Branch 'stable-1.x' - 3 commits - configure.ac src/daemon

[Colin Guthrie]

 configure.ac               |    2 +-
 src/daemon/default.pa.in   |    2 ++
 src/daemon/main.c          |   12 ++++++------
 src/daemon/server-lookup.c |    2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)

New commits:
commit 43f8feb449f54b04395f65db6d2bc465b6a8687e
Author: Colin Guthrie <colin at mageia.org>
Date:   Thu Oct 20 12:25:48 2011 +0100

    build-sys: bump soname

diff --git a/configure.ac b/configure.ac
index 6b358cb..a91daf4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,7 +40,7 @@ AC_SUBST(PA_PROTOCOL_VERSION, 23)
 
 # The stable ABI for client applications, for the version info x:y:z
 # always will hold y=z
-AC_SUBST(LIBPULSE_VERSION_INFO, [13:4:13])
+AC_SUBST(LIBPULSE_VERSION_INFO, [13:5:13])
 
 # A simplified, synchronous, ABI-stable interface for client
 # applications, for the version info x:y:z always will hold y=z

commit 2fde64c7866098747b5517290f8bc87b143b6c69
Author: Colin Guthrie <colin at mageia.org>
Date:   Thu Oct 20 14:11:53 2011 +0100

    conf: Use .nofail when loading module-jackdbus-detect
    
    When starting via a console login, PA will likely not have a session DBus
    to play with. As there is no X11 environment, libdbus will be unable
    to launch a session DBus for us and thus the module will fail to load
    which in turn prevents PA from loading.
    
    If the user subsequently logs into X11 this it will still not be possible
    to load the module as the server will be ignorant of the X11 and DBus
    environment variables so a longer term solution for handling this should
    be found.

diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in
index 57f259c..c6ec29c 100755
--- a/src/daemon/default.pa.in
+++ b/src/daemon/default.pa.in
@@ -81,7 +81,9 @@ load-module module-detect
 
 ### Automatically connect sink and source if JACK server is present
 .ifexists module-jackdbus-detect at PA_SOEXT@
+.nofail
 load-module module-jackdbus-detect
+.fail
 .endif
 
 ifelse(@HAVE_BLUEZ@, 1, [dnl

commit 22e63b9edf33957d9b5b5adcdea2a39d84a9c2bb
Author: Tanu Kaskinen <tanuk at iki.fi>
Date:   Thu Oct 6 23:28:37 2011 +0300

    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 e2e4a81..c32f7c7 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 45796e7..9bdc699 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;
     }