summaryrefslogtreecommitdiff
path: root/src/pulse/client-conf.c
diff options
context:
space:
mode:
authorDavid Henningsson <david.henningsson@canonical.com>2014-12-19 13:46:11 +0100
committerDavid Henningsson <david.henningsson@canonical.com>2014-12-19 13:46:11 +0100
commitd9854577c3046d631ac47fb84c800e3e87aea397 (patch)
tree5e84f00cf89d987522c41f22b1eb7b21f4aba704 /src/pulse/client-conf.c
parent1d3fd4f8627942b931ab6db4137186a567fe6939 (diff)
downloadpulseaudio-d9854577c3046d631ac47fb84c800e3e87aea397.tar.gz
Revert "launch: Disable autospawn by default when systemd daemon support is enabled."v5.99.2
This reverts commit 7276faca72e9696d4891daff139aee52509f43bf. Using the new systemd socket activation for PulseAudio will cause PulseAudio to not have any connection with D-Bus, breaking device reservation protocol, module-jackdbus-detect and module-dbus-protocol. Therefore, autospawn is now still enabled by default even if you build with systemd daemon headers.
Diffstat (limited to 'src/pulse/client-conf.c')
-rw-r--r--src/pulse/client-conf.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/pulse/client-conf.c b/src/pulse/client-conf.c
index 80ddae02f..e0acc237d 100644
--- a/src/pulse/client-conf.c
+++ b/src/pulse/client-conf.c
@@ -65,11 +65,7 @@ static const pa_client_conf default_conf = {
.cookie_from_x11_valid = false,
.cookie_file_from_application = NULL,
.cookie_file_from_client_conf = NULL,
-#ifdef HAVE_SYSTEMD_DAEMON
- .autospawn = false,
-#else
.autospawn = true,
-#endif
.disable_shm = false,
.shm_size = 0,
.auto_connect_localhost = false,