Sophie

Sophie

distrib > Mandriva > 2008.1 > i586 > media > main-release-src > by-pkgid > 5a95a25af2dd93cff676a7787a248cfa > files > 6

pulseaudio-0.9.9-7mdv2008.1.src.rpm

diff -p -up pulseaudio-0.9.8/src/daemon/default.pa.in.x11 pulseaudio-0.9.8/src/daemon/default.pa.in
--- pulseaudio-0.9.8/src/daemon/default.pa.in.x11	2007-10-28 18:18:27.000000000 +0100
+++ pulseaudio-0.9.8/src/daemon/default.pa.in	2008-02-05 13:39:41.000000000 +0100
@@ -78,11 +78,6 @@ load-module module-suspend-on-idle
 ### Load X11 bell module
 #load-module module-x11-bell sample=x11-bell
 
-### Publish connection data in the X11 root window
-.ifexists @PA_DLSEARCHPATH@/module-x11-publish@PA_SOEXT@
-load-module module-x11-publish
-.endif
-
 ### 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
@@ -95,6 +90,13 @@ load-module module-x11-publish
 load-module module-gconf
 .endif
 
+### Publish connection data in the X11 root window
+.nofail
+.ifexists @PA_DLSEARCHPATH@/module-x11-publish@PA_SOEXT@
+load-module module-x11-publish
+.endif
+.fail
+
 ### Make some devices default
 #set-default-sink output
 #set-default-source input