deactivate module-x11-xsmp by default, due to a deadlock when pa is being started...

git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1657 fefdeb5f-60dc-0310-8127-8f9354f1896f

diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in
index 583b26cb8df93eaaed2031d3d2a896c63eac5d5a..c472c09bf25e72b588e8230bb7144f9272831b91 100755 (executable)
--- 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