diff options
| author | Lennart Poettering <lennart@poettering.net> | 2008-07-22 19:45:18 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2008-07-22 19:45:18 +0200 |
| commit | 3888bfcccd8324d23a7bc31ebb2d8063d9da1aaf (patch) | |
| tree | 31244bcbe53c107958ec01147e9df618e0c64cde /src/daemon/default.pa.in | |
| parent | c1f9f95fa2bbd9ea93d7e32c095626ace7b5d6f9 (diff) | |
enable exit-on-idle by default
Diffstat (limited to 'src/daemon/default.pa.in')
| -rwxr-xr-x | src/daemon/default.pa.in | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in index aad9f5d6..498499e7 100755 --- a/src/daemon/default.pa.in +++ b/src/daemon/default.pa.in @@ -80,14 +80,6 @@ load-module module-always-sink ### Automatically suspend sinks/sources that become idle for too long load-module module-suspend-on-idle -### Load X11 bell module -#load-module module-x11-bell sample=bell-windowing-system - -### 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 -#load-module module-x11-xsmp - ### If autoexit on idle is enabled we want to make sure we only quit ### when no local session needs us anymore. load-module module-console-kit @@ -104,12 +96,21 @@ load-module module-gconf .fail .endif +# X11 modules should not be started from default.pa so that one daemon +# can be shared by multiple sessions. + +### Load X11 bell module +#load-module module-x11-bell sample=bell-windowing-system + +### Register ourselves in the X11 session manager +#load-module module-x11-xsmp + ### Publish connection data in the X11 root window -.ifexists module-x11-publish@PA_SOEXT@ -.nofail -load-module module-x11-publish -.fail -.endif +#.ifexists module-x11-publish@PA_SOEXT@ +#.nofail +#load-module module-x11-publish +#.fail +#.endif ### Make some devices default #set-default-sink output |