[pulseaudio-commits] r2177 - /branches/prepare-0.9.10/src/daemon/default.pa.in

[svnmailer-noreply at 0pointer.de]

Author: lennart
Date: Fri Mar 28 00:41:03 2008
New Revision: 2177

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=2177&root=pulseaudio&view=rev
Log:
merge r2134 from trunk

Modified:
    branches/prepare-0.9.10/src/daemon/default.pa.in

Modified: branches/prepare-0.9.10/src/daemon/default.pa.in
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/prepare-0.9.10/src/daemon/default.pa.in?rev=2177&root=pulseaudio&r1=2176&r2=2177&view=diff
==============================================================================
--- branches/prepare-0.9.10/src/daemon/default.pa.in (original)
+++ branches/prepare-0.9.10/src/daemon/default.pa.in Fri Mar 28 00:41:03 2008
@@ -46,7 +46,9 @@
 .endif
 
 ### Load several protocols
+.ifexists module-esound-protocol-unix at PA_SOEXT@
 load-module module-esound-protocol-unix
+.endif
 load-module module-native-protocol-unix
 
 ### Network access (may be configured with paprefs, so leave this commented
@@ -80,7 +82,9 @@
 
 ### Publish connection data in the X11 root window
 .ifexists module-x11-publish at PA_SOEXT@
+.nofail
 load-module module-x11-publish
+.fail
 .endif
 
 ### Register ourselves in the X11 session manager
@@ -92,7 +96,9 @@
 ### Please keep in mind that the modules configured by paprefs might conflict with manually
 ### loaded modules.
 .ifexists module-gconf at PA_SOEXT@
+.nofail
 load-module module-gconf
+.fail
 .endif
 
 ### Make some devices default