projects
/
profile
/
ivi
/
pulseaudio-panda.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f42afc4
)
allow overwriting of process properties with environment variables
author
Lennart Poettering
<lennart@poettering.net>
Thu, 5 Feb 2009 03:09:09 +0000
(
04:09
+0100)
committer
Lennart Poettering
<lennart@poettering.net>
Thu, 5 Feb 2009 03:09:09 +0000
(
04:09
+0100)
src/pulsecore/proplist-util.c
patch
|
blob
|
history
diff --git
a/src/pulsecore/proplist-util.c
b/src/pulsecore/proplist-util.c
index
522c7af
..
c09c8af
100644
(file)
--- 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_
MERG
E, t);
+ pa_proplist_update(p, PA_UPDATE_
REPLAC
E, t);
pa_proplist_free(t);
}
}