[pulseaudio-commits] 2 commits - src/modules

[Arun Raghavan]

 src/modules/module-role-cork.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit b7f7eb5657d17dd8ba9540e7af4c21a2f04d7c97
Author: Arun Raghavan <arun.raghavan at collabora.co.uk>
Date:   Tue Jul 3 17:52:36 2012 +0530

    role-cork: Fix incorrect check at deinitialisation time

diff --git a/src/modules/module-role-cork.c b/src/modules/module-role-cork.c
index a4270a4..70e1628 100644
--- a/src/modules/module-role-cork.c
+++ b/src/modules/module-role-cork.c
@@ -289,7 +289,7 @@ void pa__done(pa_module *m) {
             pa_xfree(role);
         pa_idxset_free(u->trigger_roles, NULL, NULL);
     }
-    if (u->trigger_roles) {
+    if (u->cork_roles) {
         while ((role = pa_idxset_steal_first(u->cork_roles, NULL)))
             pa_xfree(role);
         pa_idxset_free(u->cork_roles, NULL, NULL);

commit a2c4bf22e0813d529f153c01d7421345a792f3bc
Author: Arun Raghavan <arun.raghavan at collabora.co.uk>
Date:   Tue Jul 3 18:00:36 2012 +0530

    Revert "role-cork: Fix a minor leak"
    
    This reverts commit 51c8d5a477d36f0646243a092994036b3781e9c1.
    
    As David points out, this was incorrect.

diff --git a/src/modules/module-role-cork.c b/src/modules/module-role-cork.c
index 8d003da..a4270a4 100644
--- a/src/modules/module-role-cork.c
+++ b/src/modules/module-role-cork.c
@@ -227,7 +227,7 @@ int pa__init(pa_module *m) {
         char *n = NULL;
         while ((n = pa_split(roles, ",", &split_state)))
             if (n[0] != '\0')
-                pa_idxset_put(u->trigger_roles, n, NULL);
+                pa_idxset_put(u->trigger_roles, pa_xstrdup(n), NULL);
     }
     if (pa_idxset_isempty(u->trigger_roles)) {
         pa_log_debug("Using role 'phone' as trigger role.");
@@ -241,7 +241,7 @@ int pa__init(pa_module *m) {
         char *n = NULL;
         while ((n = pa_split(roles, ",", &split_state)))
             if (n[0] != '\0')
-                pa_idxset_put(u->cork_roles, n, NULL);
+                pa_idxset_put(u->cork_roles, pa_xstrdup(n), NULL);
     }
     if (pa_idxset_isempty(u->cork_roles)) {
         pa_log_debug("Using roles 'music' and 'video' as cork roles.");