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

context: don't fail if session bus is not there

Browse source 
Also invert the order of bus tracking since we expect session_bus to
be present when we check for it. Although that should not change
anything in practise.
This commit is contained in:
Marc-André Lureau 2009-05-12 01:39:55 +03:00 • committed by Lennart Poettering
parent 4c3aef367b
commit 86caf4520f
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/pulse/context.c
View file

@ -811,10 +811,10 @@ static int try_next_connection(pa_context *c) {
#ifdef HAVE_DBUS #ifdef HAVE_DBUS
if (c->no_fail && !c->server_specified) { if (c->no_fail && !c->server_specified) {
if (!c->system_bus)
track_pulseaudio_on_dbus(c, DBUS_BUS_SYSTEM, &c->system_bus);
if (!c->session_bus) if (!c->session_bus)
track_pulseaudio_on_dbus(c, DBUS_BUS_SESSION, &c->session_bus); track_pulseaudio_on_dbus(c, DBUS_BUS_SESSION, &c->session_bus);
if (!c->system_bus)
track_pulseaudio_on_dbus(c, DBUS_BUS_SYSTEM, &c->system_bus);
} else } else
#endif #endif
pa_context_fail(c, PA_ERR_CONNECTIONREFUSED); pa_context_fail(c, PA_ERR_CONNECTIONREFUSED);
@ -892,7 +892,7 @@ static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *message, vo
/* FIXME: We probably should check if this is actually the NameOwnerChanged we were looking for */ /* FIXME: We probably should check if this is actually the NameOwnerChanged we were looking for */
is_session = bus == pa_dbus_wrap_connection_get(c->session_bus); is_session = c->session_bus && bus == pa_dbus_wrap_connection_get(c->session_bus);
pa_log_debug("Rock!! PulseAudio is back on %s bus", is_session ? "session" : "system"); pa_log_debug("Rock!! PulseAudio is back on %s bus", is_session ? "session" : "system");
if (is_session) if (is_session)