diff options
| author | Tanu Kaskinen <tanuk@iki.fi> | 2009-06-16 19:03:22 +0300 |
|---|---|---|
| committer | Tanu Kaskinen <tanuk@iki.fi> | 2009-06-16 19:03:22 +0300 |
| commit | c8d819a5adbe32e14d7f03a252bca6f7df01d795 (patch) | |
| tree | 4e7cd5ac628b2128f3925cb25b99675adcec2fec /src/daemon/main.c | |
| parent | 5babbaafb26ac4f83db0d8bca53006a843472b8f (diff) | |
dbus-protocol: Connection handling for local connections.
Diffstat (limited to 'src/daemon/main.c')
| -rw-r--r-- | src/daemon/main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/daemon/main.c b/src/daemon/main.c index 1b6ed793..62214a56 100644 --- a/src/daemon/main.c +++ b/src/daemon/main.c @@ -1028,6 +1028,7 @@ after_caps_setup: c->running_as_daemon = !!conf->daemonize; c->disallow_exit = conf->disallow_exit; c->flat_volumes = conf->flat_volumes; + c->server_type = conf->local_server_type; pa_assert_se(pa_signal_init(pa_mainloop_get_api(mainloop)) == 0); pa_signal_new(SIGINT, signal_callback, c); @@ -1105,7 +1106,7 @@ after_caps_setup: #ifdef HAVE_DBUS if (!conf->system_instance) { - if (!(server_lookup = pa_dbusobj_server_lookup_new(c, conf->local_server_type))) + if (!(server_lookup = pa_dbusobj_server_lookup_new(c))) goto finish; if (!(lookup_service_bus = register_dbus_name(c, DBUS_BUS_SESSION, "org.pulseaudio.PulseAudio"))) goto finish; |