diff options
| author | Colin Guthrie <cguthrie@mandriva.org> | 2010-09-18 11:12:56 +0100 |
|---|---|---|
| committer | Colin Guthrie <cguthrie@mandriva.org> | 2010-09-18 12:05:38 +0100 |
| commit | f73e9c19f7fd4f7aaecd06a283b125078d8ad884 (patch) | |
| tree | 3570ed5c99ccbe0d5b040bbdd4b82100bf9136a6 /src/pulse | |
| parent | c0e045d003b52c5edf8dbee10ff1545435bce297 (diff) | |
x11: Use the default screen for X11 properties.
This commit restores the functionality originally included in 65e807
by Leszek Koltunski.
Diffstat (limited to 'src/pulse')
| -rw-r--r-- | src/pulse/client-conf-x11.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/pulse/client-conf-x11.c b/src/pulse/client-conf-x11.c index 0348a2fd..76b1b7b3 100644 --- a/src/pulse/client-conf-x11.c +++ b/src/pulse/client-conf-x11.c @@ -39,7 +39,7 @@ int pa_client_conf_from_x11(pa_client_conf *c, const char *dname) { xcb_connection_t *xcb = NULL; - int ret = -1; + int ret = -1, screen = 0; char t[1024]; pa_assert(c); @@ -60,13 +60,13 @@ int pa_client_conf_from_x11(pa_client_conf *c, const char *dname) { goto finish; } - if (pa_x11_get_prop(xcb, "PULSE_SERVER", t, sizeof(t))) { + if (pa_x11_get_prop(xcb, screen, "PULSE_SERVER", t, sizeof(t))) { pa_bool_t disable_autospawn = TRUE; pa_xfree(c->default_server); c->default_server = pa_xstrdup(t); - if (pa_x11_get_prop(xcb, "PULSE_SESSION_ID", t, sizeof(t))) { + if (pa_x11_get_prop(xcb, screen, "PULSE_SESSION_ID", t, sizeof(t))) { char *id; if ((id = pa_session_id())) { @@ -80,17 +80,17 @@ int pa_client_conf_from_x11(pa_client_conf *c, const char *dname) { c->autospawn = FALSE; } - if (pa_x11_get_prop(xcb, "PULSE_SINK", t, sizeof(t))) { + if (pa_x11_get_prop(xcb, screen, "PULSE_SINK", t, sizeof(t))) { pa_xfree(c->default_sink); c->default_sink = pa_xstrdup(t); } - if (pa_x11_get_prop(xcb, "PULSE_SOURCE", t, sizeof(t))) { + if (pa_x11_get_prop(xcb, screen, "PULSE_SOURCE", t, sizeof(t))) { pa_xfree(c->default_source); c->default_source = pa_xstrdup(t); } - if (pa_x11_get_prop(xcb, "PULSE_COOKIE", t, sizeof(t))) { + 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)) { |