summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rwxr-xr-xsrc/daemon/default.pa.in3
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