[pulseaudio-commits] r2315 - /branches/glitch-free/src/pulse/client-conf-x11.c

[svnmailer-noreply at 0pointer.de]

Author: lennart
Date: Thu May  1 20:59:25 2008
New Revision: 2315

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=2315&root=pulseaudio&view=rev
Log:
make check for $DISPLAY=="" more readable, pa_bool_tization

Modified:
    branches/glitch-free/src/pulse/client-conf-x11.c

Modified: branches/glitch-free/src/pulse/client-conf-x11.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/glitch-free/src/pulse/client-conf-x11.c?rev=2315&root=pulseaudio&r1=2314&r2=2315&view=diff
==============================================================================
--- branches/glitch-free/src/pulse/client-conf-x11.c (original)
+++ branches/glitch-free/src/pulse/client-conf-x11.c Thu May  1 20:59:25 2008
@@ -46,7 +46,10 @@
 
     pa_assert(c);
 
-    if (!dname && (!(dname = getenv("DISPLAY")) || *dname == '\0'))
+    if (!dname && !(dname = getenv("DISPLAY")))
+        goto finish;
+
+    if (*dname == 0)
         goto finish;
 
     if (!(d = XOpenDisplay(dname))) {
@@ -80,7 +83,7 @@
         pa_assert(sizeof(cookie) == sizeof(c->cookie));
         memcpy(c->cookie, cookie, sizeof(cookie));
 
-        c->cookie_valid = 1;
+        c->cookie_valid = TRUE;
 
         pa_xfree(c->cookie_file);
         c->cookie_file = NULL;