[pulseaudio-commits] src/daemon

[Colin Guthrie]

 src/daemon/default.pa.in |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 9af153574cdc4718f5c9901d23dae003478558dd
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