diff options
| author | Lennart Poettering <lennart@poettering.net> | 2007-08-12 23:29:12 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2007-08-12 23:29:12 +0000 |
| commit | 1d5e9f0205330207c37203d21ff642946f043bf7 (patch) | |
| tree | c9223f6e0e113402b5ca2218c9644cf096a1fb70 | |
| parent | e381dd9e4d6e4f518af49e244ad03ed093200938 (diff) | |
deactivate module-x11-xsmp by default, due to a deadlock when pa is being started from gnome-session
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1657 fefdeb5f-60dc-0310-8127-8f9354f1896f
| -rwxr-xr-x | src/daemon/default.pa.in | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in index 583b26cb..c472c09b 100755 --- a/src/daemon/default.pa.in +++ b/src/daemon/default.pa.in @@ -77,7 +77,8 @@ load-module module-x11-bell sample=x11-bell load-module module-x11-publish ### Register ourselves in the X11 session manager -load-module module-x11-xsmp +# Deactivated by default, to avoid deadlock when PA is started from gnome-session +# load-module module-x11-xsmp ### Load additional modules from GConf settings. This can be configured with the paprefs tool. ### Please keep in mind that the modules configured by paprefs might conflict with manually |