[pulseaudio-commits] r2180 - /trunk/src/daemon/default.pa.in

[svnmailer-noreply at 0pointer.de]

Author: lennart
Date: Fri Mar 28 00:48:14 2008
New Revision: 2180

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=2180&root=pulseaudio&view=rev
Log:
merge r2179 from prepare-0.9.10

Modified:
    trunk/src/daemon/default.pa.in

Modified: trunk/src/daemon/default.pa.in
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/daemon/default.pa.in?rev=2180&root=pulseaudio&r1=2179&r2=2180&view=diff
==============================================================================
--- trunk/src/daemon/default.pa.in (original)
+++ trunk/src/daemon/default.pa.in Fri Mar 28 00:48:14 2008
@@ -80,13 +80,6 @@
 ### Load X11 bell module
 #load-module module-x11-bell sample=x11-bell
 
-### Publish connection data in the X11 root window
-.ifexists module-x11-publish at PA_SOEXT@
-.nofail
-load-module module-x11-publish
-.fail
-.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
@@ -101,6 +94,13 @@
 .fail
 .endif
 
+### Publish connection data in the X11 root window
+.ifexists module-x11-publish at PA_SOEXT@
+.nofail
+load-module module-x11-publish
+.fail
+.endif
+
 ### Make some devices default
 #set-default-sink output
 #set-default-source input