diff options
| author | Lennart Poettering <lennart@poettering.net> | 2008-03-27 23:48:14 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2008-03-27 23:48:14 +0000 |
| commit | 8298b6b12f5dbe5e16937e085106e795ec6c891f (patch) | |
| tree | b88d3cd31dbd2c1a2a1cf43283ab86e9f8907e37 /src | |
| parent | 1908e82bea7a98cb21ea7419cf963e9a874cd6d6 (diff) | |
merge r2179 from prepare-0.9.10
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@2180 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src')
| -rwxr-xr-x | src/daemon/default.pa.in | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in index c1324a03..064a6cc9 100755 --- a/src/daemon/default.pa.in +++ b/src/daemon/default.pa.in @@ -80,13 +80,6 @@ load-module module-suspend-on-idle ### Load X11 bell module #load-module module-x11-bell sample=x11-bell -### 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 # Deactivated by default, to avoid deadlock when PA is started as esd from gnome-session # Instead we load this via /etc/xdg/autostart/ and "pactl load-module" now @@ -101,6 +94,13 @@ load-module module-gconf .fail .endif +### Publish connection data in the X11 root window +.ifexists module-x11-publish@PA_SOEXT@ +.nofail +load-module module-x11-publish +.fail +.endif + ### Make some devices default #set-default-sink output #set-default-source input |