diff options
author | Lennart Poettering <lennart@poettering.net> | 2008-03-27 23:41:03 +0000 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2008-03-27 23:41:03 +0000 |
commit | 2b593d2fca2e7fb5ee84109cad45c54e3808f95e (patch) | |
tree | 0e1c54b24f8ab2cbea806bdc54241eb692e7f3e9 | |
parent | e5e9ed6d721d5c4758176c468af939578064203f (diff) | |
download | pulseaudio-2b593d2fca2e7fb5ee84109cad45c54e3808f95e.tar.gz |
merge r2134 from trunk
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/prepare-0.9.10@2177 fefdeb5f-60dc-0310-8127-8f9354f1896f
-rwxr-xr-x | src/daemon/default.pa.in | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in index 56904f560..c1324a03e 100755 --- a/src/daemon/default.pa.in +++ b/src/daemon/default.pa.in @@ -46,7 +46,9 @@ load-module module-detect .endif ### Load several protocols +.ifexists module-esound-protocol-unix@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 @@ load-module module-suspend-on-idle ### Publish connection data in the X11 root window .ifexists module-x11-publish@PA_SOEXT@ +.nofail load-module module-x11-publish +.fail .endif ### Register ourselves in the X11 session manager @@ -92,7 +96,9 @@ load-module module-x11-publish ### Please keep in mind that the modules configured by paprefs might conflict with manually ### loaded modules. .ifexists module-gconf@PA_SOEXT@ +.nofail load-module module-gconf +.fail .endif ### Make some devices default |