summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2008-03-27 23:47:09 +0000
committerLennart Poettering <lennart@poettering.net>2008-03-27 23:47:09 +0000
commit4ddc3271e16d893c4743ce9470601a42fd3cd936 (patch)
tree57ba5bb71f7e887b7e4e5f17fa2629baf452de72
parente21a69eb0bb3d0fbf301e35eee75a32c20114477 (diff)
initialize gconf module before we publish our X11 credentials -- because gconf might cause network support enabled in the first place
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/prepare-0.9.10@2179 fefdeb5f-60dc-0310-8127-8f9354f1896f
-rwxr-xr-xsrc/daemon/default.pa.in14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in
index c1324a03..064a6cc9 100755
--- a/src/daemon/default.pa.in
+++ b/src/daemon/default.pa.in
@@ -80,13 +80,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 module-x11-publish@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 @@ load-module module-gconf
.fail
.endif
+### Publish connection data in the X11 root window
+.ifexists module-x11-publish@PA_SOEXT@
+.nofail
+load-module module-x11-publish
+.fail
+.endif
+
### Make some devices default
#set-default-sink output
#set-default-source input