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

[svnmailer-noreply at 0pointer.de]

Author: lennart
Date: Thu Jul 27 20:35:17 2006
New Revision: 1159

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=1159&root=pulseaudio&view=rev
Log:
load module-gconf in default install

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=1159&root=pulseaudio&r1=1158&r2=1159&view=diff
==============================================================================
--- trunk/src/daemon/default.pa.in (original)
+++ trunk/src/daemon/default.pa.in Thu Jul 27 20:35:17 2006
@@ -39,9 +39,11 @@
 
 ### Load several protocols
 load-module module-esound-protocol-unix
+load-module module-native-protocol-unix
+
 #load-module module-esound-protocol-tcp
-load-module module-native-protocol-unix
 #load-module module-native-protocol-tcp
+#load-module module-zeroconf-publish
 
 ### Load the RTP reciever module
 #load-module module-rtp-recv
@@ -69,3 +71,7 @@
 ### Publish connection data in the X11 root window
 load-module module-x11-publish
 
+### 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
+### loaded modules.
+load-module module-gconf