1
From 08cd4f12dfce31abceb617e82caaf76384541d06 Mon Sep 17 00:00:00 2001
2
From: Colin Guthrie <pulse@colin.guthr.ie>
3
Date: Tue, 3 Jun 2008 19:22:29 +0000
4
Subject: [PATCH] Perfer client.conf over X11 property variables.
5
To explain: X11 properties are always set on the root window if pulseaudio is started
6
during X11 login (which is the most likey time to start it). This means that any settings
7
specified in client.conf will almost never be used. As the default client.conf is empty
8
it makes more sense to listen to it if a user cares to bother altering it.
10
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@2494 fefdeb5f-60dc-0310-8127-8f9354f1896f
12
src/pulse/context.c | 2 +-
13
1 files changed, 1 insertions(+), 1 deletions(-)
15
diff --git a/src/pulse/context.c b/src/pulse/context.c
16
index 7243a29..97432a4 100644
17
--- a/src/pulse/context.c
18
+++ b/src/pulse/context.c
19
@@ -151,10 +151,10 @@ pa_context *pa_context_new(pa_mainloop_api *mainloop, const char *name) {
22
c->conf = pa_client_conf_new();
23
- pa_client_conf_load(c->conf, NULL);
25
pa_client_conf_from_x11(c->conf, NULL);
27
+ pa_client_conf_load(c->conf, NULL);
28
pa_client_conf_env(c->conf);
30
if (!(c->mempool = pa_mempool_new(!c->conf->disable_shm))) {