From c21f88cb9020caca5a45a6c899d9d0a66b0d3200 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 27 Jul 2006 18:35:17 +0000
Subject: load module-gconf in default install

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1159 fefdeb5f-60dc-0310-8127-8f9354f1896f
---
 src/daemon/default.pa.in | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src/daemon/default.pa.in')

diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in
index ac10c0ca..ef6048d6 100755
--- a/src/daemon/default.pa.in
+++ b/src/daemon/default.pa.in
@@ -39,9 +39,11 @@ load-module module-detect
 
 ### Load several protocols
 load-module module-esound-protocol-unix
-#load-module module-esound-protocol-tcp
 load-module module-native-protocol-unix
+
+#load-module module-esound-protocol-tcp
 #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 @@ load-module module-x11-bell sample=x11-bell
 ### 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
-- 
cgit