summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2009-02-05 04:09:09 +0100
committerLennart Poettering <lennart@poettering.net>2009-02-05 04:09:09 +0100
commit291589ecc1ce237b5e43d28cfd890305d815fc89 (patch)
tree76d13d3656f5353ae9713a54f5698f779d9daf5e
parentf42afc4883f4a6670e6fff7719beeca481831f9b (diff)
allow overwriting of process properties with environment variables
-rw-r--r--src/pulsecore/proplist-util.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/pulsecore/proplist-util.c b/src/pulsecore/proplist-util.c
index 522c7afe..c09c8af5 100644
--- a/src/pulsecore/proplist-util.c
+++ b/src/pulsecore/proplist-util.c
@@ -65,11 +65,6 @@ void pa_init_proplist(pa_proplist *p) {
k = pa_xstrndup(*e+11, kl);
- if (pa_proplist_contains(p, k)) {
- pa_xfree(k);
- continue;
- }
-
pa_proplist_sets(p, k, *e+11+kl+1);
pa_xfree(k);
}
@@ -80,7 +75,7 @@ void pa_init_proplist(pa_proplist *p) {
pa_proplist *t;
if ((t = pa_proplist_from_string(pp))) {
- pa_proplist_update(p, PA_UPDATE_MERGE, t);
+ pa_proplist_update(p, PA_UPDATE_REPLACE, t);
pa_proplist_free(t);
}
}