]> code.delx.au - pulseaudio/commitdiff
allow overwriting of process properties with environment variables
authorLennart Poettering <lennart@poettering.net>
Thu, 5 Feb 2009 03:09:09 +0000 (04:09 +0100)
committerLennart Poettering <lennart@poettering.net>
Thu, 5 Feb 2009 03:09:09 +0000 (04:09 +0100)
src/pulsecore/proplist-util.c

index 522c7afe95de768943caebe85f0046057146ef2c..c09c8af5c2fd2bc398c42ba2a975aa6f24e3dfff 100644 (file)
@@ -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);
         }
     }