mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-11 13:30:02 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge r2179 from prepare-0.9.10

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@2180 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2008-03-27 23:48:14 +00:00
parent 1908e82bea
commit 8298b6b12f
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/daemon/default.pa.in
View file

@ -80,13 +80,6 @@ load-module module-suspend-on-idle
### Load X11 bell module ### Load X11 bell module
#load-module module-x11-bell sample=x11-bell #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 ### Register ourselves in the X11 session manager
# Deactivated by default, to avoid deadlock when PA is started as esd from gnome-session # 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 # Instead we load this via /etc/xdg/autostart/ and "pactl load-module" now
@ -101,6 +94,13 @@ load-module module-gconf
.fail .fail
.endif .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 ### Make some devices default
#set-default-sink output #set-default-sink output
#set-default-source input #set-default-source input