summaryrefslogtreecommitdiff
path: root/src/pulse
diff options
context:
space:
mode:
authorTanu Kaskinen <tanuk@iki.fi>2015-12-07 23:22:41 +0200
committerDavid Henningsson <david.henningsson@canonical.com>2015-12-14 13:45:39 +0100
commit1d7ce901398b4e65bfac991aa7a351ac15c4910e (patch)
tree25275d8b6d20f8f86ca307a5418d3b02e0123373 /src/pulse
parentd97460045ceb71a0c3541c2753bb7fe519950285 (diff)
conf-parser: add support for .d directories
This allows a configuration scheme where after loading configuration from "somefile", the parser loads configuration from files in directory "somefile.d". This feature needs to be enabled on a per-file basis, though, and this patch doesn't yet enable the feature for any files.
Diffstat (limited to 'src/pulse')
-rw-r--r--src/pulse/client-conf.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/pulse/client-conf.c b/src/pulse/client-conf.c
index 47fe183a..c2ece90e 100644
--- a/src/pulse/client-conf.c
+++ b/src/pulse/client-conf.c
@@ -149,7 +149,7 @@ void pa_client_conf_load(pa_client_conf *c, bool load_from_x11, bool load_from_e
f = pa_open_config_file(DEFAULT_CLIENT_CONFIG_FILE, DEFAULT_CLIENT_CONFIG_FILE_USER, ENV_CLIENT_CONFIG_FILE, &fn);
if (f) {
- pa_config_parse(fn, f, table, NULL, NULL);
+ pa_config_parse(fn, f, table, NULL, false, NULL);
pa_xfree(fn);
fclose(f);
}