summaryrefslogtreecommitdiff
path: root/src/utils
diff options
context:
space:
mode:
authorTanu Kaskinen <tanu.kaskinen@linux.intel.com>2014-06-08 16:32:54 +0300
committerTanu Kaskinen <tanu.kaskinen@linux.intel.com>2014-06-24 13:13:50 +0300
commit5141188ca8659b19a877cec6c7e6892804a85e26 (patch)
tree87513964ddc8614c7588b5b88c1d9aa48f870e6b /src/utils
parent067e61cb668c426e3a03c54cead2e2102485d5f7 (diff)
downloadpulseaudio-5141188ca8659b19a877cec6c7e6892804a85e26.tar.gz
client-conf: Move x11 and env loading to pa_client_conf_load()
This simplifies the code a bit.
Diffstat (limited to 'src/utils')
-rw-r--r--src/utils/pax11publish.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/utils/pax11publish.c b/src/utils/pax11publish.c
index e4f9943b9..8c9ce7d5f 100644
--- a/src/utils/pax11publish.c
+++ b/src/utils/pax11publish.c
@@ -152,8 +152,7 @@ int main(int argc, char *argv[]) {
char hx[PA_NATIVE_COOKIE_LENGTH*2+1];
assert(conf);
- pa_client_conf_load(conf);
- pa_client_conf_env(conf);
+ pa_client_conf_load(conf, false, true);
pa_x11_del_prop(xcb, screen, "PULSE_SERVER");
pa_x11_del_prop(xcb, screen, "PULSE_SINK");