load module-x11-xsmp from a /etc/xdg/autostart file, to make sure it is loaded when...

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

diff --git a/src/Makefile.am b/src/Makefile.am
index aa5160a4f0c272e6fef5d71d5541e2f1eaf9e489..a962826abe58d530137940446d4bb378d90eb421 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -30,6 +30,7 @@ pulseincludedir=$(includedir)/pulse
 pulsecoreincludedir=$(includedir)/pulsecore
 pulseconfdir=$(sysconfdir)/pulse
 pulselibexecdir=$(libexecdir)/pulse
+xdgautostartdir=$(sysconfdir)/xdg/autostart
 
 ###################################
 #            Defines              #
@@ -103,13 +104,19 @@ EXTRA_DIST = \
                depmod.py \
                daemon/esdcompat.in \
                utils/padsp \
-               modules/module-defs.h.m4
+               modules/module-defs.h.m4 \
+               daemon/pulseaudio-module-xsmp.desktop
 
 pulseconf_DATA = \
                default.pa \
                daemon.conf \
                client.conf
 
+if HAVE_X11
+xdgautostart_DATA = \
+               daemon/pulseaudio-module-xsmp.desktop
+endif
+
 BUILT_SOURCES = \
                pulse/version.h
 

diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in
index c472c09bf25e72b588e8230bb7144f9272831b91..6ece607d2191fcadd04d8bca1c26f736ade36c1a 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
-# Deactivated by default, to avoid deadlock when PA is started from gnome-session
+# 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
 
 ### Load additional modules from GConf settings. This can be configured with the paprefs tool.

diff --git a/src/daemon/pulseaudio-module-xsmp.desktop b/src/daemon/pulseaudio-module-xsmp.desktop
new file mode 100644 (file)
index 0000000..fa719a7
--- /dev/null
+++ b/src/daemon/pulseaudio-module-xsmp.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Name=PulseAudio Session Management
+Comment=Load module-x11-xsmp into PulseAudio
+Exec=pactl load-module module-x11-xsmp
+Terminal=false
+Type=Application
+Categories=
+GenericName=