Move pa_format_info_to_sample_spec_fake() to core-format

[pulseaudio] / src / pulse / client-conf-x11.c

diff --git a/src/pulse/client-conf-x11.c b/src/pulse/client-conf-x11.c
index 76b9f6fbb2665c31a69b2abbd058b934b492d702..8d0c612b63e9b286b02435b2da00fac7d050ed66 100644 (file)
--- a/src/pulse/client-conf-x11.c
+++ b/src/pulse/client-conf-x11.c
@@ -61,7 +61,7 @@ int pa_client_conf_from_x11(pa_client_conf *c, const char *dname) {
     }
 
     if (pa_x11_get_prop(xcb, screen, "PULSE_SERVER", t, sizeof(t))) {
-        pa_bool_t disable_autospawn = TRUE;
+        bool disable_autospawn = true;
 
         pa_xfree(c->default_server);
         c->default_server = pa_xstrdup(t);
@@ -71,13 +71,13 @@ int pa_client_conf_from_x11(pa_client_conf *c, const char *dname) {
 
             if ((id = pa_session_id())) {
                 if (pa_streq(t, id))
-                    disable_autospawn = FALSE;
+                    disable_autospawn = false;
                 pa_xfree(id);
             }
         }
 
         if (disable_autospawn)
-            c->autospawn = FALSE;
+            c->autospawn = false;
     }
 
     if (pa_x11_get_prop(xcb, screen, "PULSE_SINK", t, sizeof(t))) {
@@ -91,20 +91,10 @@ int pa_client_conf_from_x11(pa_client_conf *c, const char *dname) {
     }
 
     if (pa_x11_get_prop(xcb, screen, "PULSE_COOKIE", t, sizeof(t))) {
-        uint8_t cookie[PA_NATIVE_COOKIE_LENGTH];
-
-        if (pa_parsehex(t, cookie, sizeof(cookie)) != sizeof(cookie)) {
+        if (pa_client_conf_load_cookie_from_hex(c, t) < 0) {
             pa_log(_("Failed to parse cookie data"));
             goto finish;
         }
-
-        pa_assert(sizeof(cookie) == sizeof(c->cookie));
-        memcpy(c->cookie, cookie, sizeof(cookie));
-
-        c->cookie_valid = TRUE;
-
-        pa_xfree(c->cookie_file);
-        c->cookie_file = NULL;
     }
 
     ret = 0;