mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-24 06:59:57 -05:00
make check for $DISPLAY=="" more readable, pa_bool_tization
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/glitch-free@2315 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
parent
06a05bc66c
commit
563f4b63cd
1 changed files with 5 additions and 2 deletions
|
|
@ -46,7 +46,10 @@ int pa_client_conf_from_x11(pa_client_conf *c, const char *dname) {
|
||||||
|
|
||||||
pa_assert(c);
|
pa_assert(c);
|
||||||
|
|
||||||
if (!dname && (!(dname = getenv("DISPLAY")) || *dname == '\0'))
|
if (!dname && !(dname = getenv("DISPLAY")))
|
||||||
|
goto finish;
|
||||||
|
|
||||||
|
if (*dname == 0)
|
||||||
goto finish;
|
goto finish;
|
||||||
|
|
||||||
if (!(d = XOpenDisplay(dname))) {
|
if (!(d = XOpenDisplay(dname))) {
|
||||||
|
|
@ -80,7 +83,7 @@ int pa_client_conf_from_x11(pa_client_conf *c, const char *dname) {
|
||||||
pa_assert(sizeof(cookie) == sizeof(c->cookie));
|
pa_assert(sizeof(cookie) == sizeof(c->cookie));
|
||||||
memcpy(c->cookie, cookie, sizeof(cookie));
|
memcpy(c->cookie, cookie, sizeof(cookie));
|
||||||
|
|
||||||
c->cookie_valid = 1;
|
c->cookie_valid = TRUE;
|
||||||
|
|
||||||
pa_xfree(c->cookie_file);
|
pa_xfree(c->cookie_file);
|
||||||
c->cookie_file = NULL;
|
c->cookie_file = NULL;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue