[pulseaudio-commits] r1657 - /branches/lennart/src/daemon/default.pa.in

[svnmailer-noreply at 0pointer.de]

Author: lennart
Date: Mon Aug 13 01:29:12 2007
New Revision: 1657

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=3D1657&root=3Dpulseaudio&vi=
ew=3Drev
Log:
deactivate module-x11-xsmp by default, due to a deadlock when pa is being s=
tarted from gnome-session

Modified:
    branches/lennart/src/daemon/default.pa.in

Modified: branches/lennart/src/daemon/default.pa.in
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/lennart/src/daemon/def=
ault.pa.in?rev=3D1657&root=3Dpulseaudio&r1=3D1656&r2=3D1657&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/lennart/src/daemon/default.pa.in (original)
+++ branches/lennart/src/daemon/default.pa.in Mon Aug 13 01:29:12 2007
@@ -77,7 +77,8 @@
 load-module module-x11-publish
 =

 ### Register ourselves in the X11 session manager
-load-module module-x11-xsmp
+# Deactivated by default, to avoid deadlock when PA is started from gnome-=
session
+# load-module module-x11-xsmp
 =

 ### Load additional modules from GConf settings. This can be configured wi=
th the paprefs tool.
 ### Please keep in mind that the modules configured by paprefs might confl=
ict with manually