[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.13-479-g921882d

[Lennart Poettering]

This is an automated email from the git hooks/post-receive script. It was
generated because of a push to the "PulseAudio Sound Server" repository.

The master branch has been updated
      from  fc31d21353ef3b50c6b47371b8cb10c173bc3a14 (commit)

- Log -----------------------------------------------------------------
921882d... Load module gconf earlier
-----------------------------------------------------------------------

Summary of changes:
 src/daemon/default.pa.in |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

-----------------------------------------------------------------------

commit 921882de548e17bbdd79bd8eb2c2ce7d36412cf4
Author: Sjoerd Simons <sjoerd at debian.org>
Date:   Sun Oct 19 13:39:50 2008 +0100

    Load module gconf earlier
    
    This makes sure that module-default-device-restore can actually work
    when GConf enables additional sinks.
    
    Signed-off-by: Lennart Poettering <lennart at poettering.net>

diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in
index 5d69926..91a1c61 100755
--- a/src/daemon/default.pa.in
+++ b/src/daemon/default.pa.in
@@ -77,6 +77,15 @@ load-module module-native-protocol-unix
 #load-module module-null-sink sink_name=rtp format=s16be channels=2 rate=44100 description="RTP Multicast Sink"
 #load-module module-rtp-send source=rtp.monitor
 
+### 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.
+.ifexists module-gconf at PA_SOEXT@
+.nofail
+load-module module-gconf
+.fail
+.endif
+
 ### Automatically restore the default sink/source when changed by the user during runtime
 load-module module-default-device-restore
 
@@ -97,15 +106,6 @@ load-module module-console-kit
 ### Enable positioned event sounds
 load-module module-position-event-sounds
 
-### 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.
-.ifexists module-gconf at PA_SOEXT@
-.nofail
-load-module module-gconf
-.fail
-.endif
-
 # X11 modules should not be started from default.pa so that one daemon
 # can be shared by multiple sessions.
 

-- 
hooks/post-receive
PulseAudio Sound Server