diff options
author | Lennart Poettering <lennart@poettering.net> | 2009-03-30 21:07:41 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2009-03-30 21:07:41 +0200 |
commit | b6135b34b3d8a9ff04cdf4359d33b54f97823037 (patch) | |
tree | 63ed23ee1f24af6d78a1ff24118c35be927b1248 /src/pulse/context.c | |
parent | 3df9eef9d0deb4f5216d024163fe966befeca908 (diff) |
minor cleanups
Diffstat (limited to 'src/pulse/context.c')
-rw-r--r-- | src/pulse/context.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/pulse/context.c b/src/pulse/context.c index 40fa808c..13b6d573 100644 --- a/src/pulse/context.c +++ b/src/pulse/context.c @@ -874,16 +874,20 @@ static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *message, vo if (c->state != PA_CONTEXT_CONNECTING) goto finish; + if (!c->no_fail) + goto finish; + + /* 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); - pa_log_debug("Rock!! PulseAudio is baack 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) /* The user instance via PF_LOCAL */ c->server_list = prepend_per_user(c->server_list); - } else { + else /* The system wide instance via PF_LOCAL */ c->server_list = pa_strlist_prepend(c->server_list, PA_SYSTEM_RUNTIME_PATH PA_PATH_SEP PA_NATIVE_DEFAULT_UNIX_SOCKET); - } try_next_connection(c); |