diff options
| author | Lennart Poettering <lennart@poettering.net> | 2009-10-07 03:39:30 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2009-10-07 03:39:30 +0200 |
| commit | 692ce73899285c6ed07e93084a5f830a9a8effcc (patch) | |
| tree | fb57aacd95086eb35787f902353857daf3f8fe95 /src/pulse/client-conf.c | |
| parent | b3592a160f0d2a28605048a81c0261bf7c45acbb (diff) | |
| parent | 019331d25b6af107fb8cacc3ada552e7567a64bf (diff) | |
Merge remote branch 'tanuk/dbus-work'
Diffstat (limited to 'src/pulse/client-conf.c')
| -rw-r--r-- | src/pulse/client-conf.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/pulse/client-conf.c b/src/pulse/client-conf.c index 4aa4ba1f..62c06f6a 100644 --- a/src/pulse/client-conf.c +++ b/src/pulse/client-conf.c @@ -57,6 +57,7 @@ static const pa_client_conf default_conf = { .default_sink = NULL, .default_source = NULL, .default_server = NULL, + .default_dbus_server = NULL, .autospawn = TRUE, .disable_shm = FALSE, .cookie_file = NULL, @@ -81,6 +82,7 @@ void pa_client_conf_free(pa_client_conf *c) { pa_xfree(c->default_sink); pa_xfree(c->default_source); pa_xfree(c->default_server); + pa_xfree(c->default_dbus_server); pa_xfree(c->cookie_file); pa_xfree(c); } @@ -97,6 +99,7 @@ int pa_client_conf_load(pa_client_conf *c, const char *filename) { { "default-sink", pa_config_parse_string, &c->default_sink, NULL }, { "default-source", pa_config_parse_string, &c->default_source, NULL }, { "default-server", pa_config_parse_string, &c->default_server, NULL }, + { "default-dbus-server", pa_config_parse_string, &c->default_dbus_server, NULL }, { "autospawn", pa_config_parse_bool, &c->autospawn, NULL }, { "cookie-file", pa_config_parse_string, &c->cookie_file, NULL }, { "disable-shm", pa_config_parse_bool, &c->disable_shm, NULL }, |