mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-04 13:29:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

client-conf: Move x11 and env loading to pa_client_conf_load()

Browse source 
This simplifies the code a bit.
This commit is contained in:
Tanu Kaskinen 2014-06-08 16:32:54 +03:00
parent 067e61cb66
commit 5141188ca8
6 changed files with 58 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/daemon/main.c
View file

@ -59,9 +59,6 @@
#endif
#include <pulse/client-conf.h>
#ifdef HAVE_X11
#include <pulse/client-conf-x11.h>
#endif
#include <pulse/mainloop.h>
#include <pulse/mainloop-signal.h>
#include <pulse/timeval.h>
@ -325,11 +322,7 @@ static char *check_configured_address(void) {
char *default_server = NULL;
pa_client_conf *c = pa_client_conf_new();
pa_client_conf_load(c);
#ifdef HAVE_X11
pa_client_conf_from_x11(c);
#endif
pa_client_conf_env(c);
pa_client_conf_load(c, true, true);
if (c->default_server && *c->default_server)
default_server = pa_xstrdup(c->default_server);