[pulseaudio-commits] 2 commits - src/modules src/pulsecore

[Tanu Kaskinen]

 src/modules/dbus/module-dbus-protocol.c |    1 +
 src/pulsecore/protocol-dbus.c           |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 4ffb6fd617bce6f54d12f067d90d2b0a3faae219
Author: Tanu Kaskinen <tanuk at iki.fi>
Date:   Wed Feb 6 12:34:06 2013 +0200

    dbus: Fix cleanup when removing signal listeners

diff --git a/src/pulsecore/protocol-dbus.c b/src/pulsecore/protocol-dbus.c
index adc1f38..c82ea4a 100644
--- a/src/pulsecore/protocol-dbus.c
+++ b/src/pulsecore/protocol-dbus.c
@@ -1051,7 +1051,7 @@ void pa_dbus_protocol_remove_signal_listener(pa_dbus_protocol *p, DBusConnection
     pa_assert_se((conn_entry = pa_hashmap_get(p->connections, conn)));
 
     if (signal_name) {
-        if ((signal_paths_entry = pa_hashmap_get(conn_entry->listening_signals, signal_name)))
+        if ((signal_paths_entry = pa_hashmap_remove(conn_entry->listening_signals, signal_name)))
             signal_paths_entry_free(signal_paths_entry);
 
     } else {

commit 10262197d08451db3079cbc8e6be43c3006626c5
Author: Tanu Kaskinen <tanuk at iki.fi>
Date:   Wed Feb 6 12:31:33 2013 +0200

    dbus: Fix connection cleanup when killing clients

diff --git a/src/modules/dbus/module-dbus-protocol.c b/src/modules/dbus/module-dbus-protocol.c
index f81c254..e77f13b 100644
--- a/src/modules/dbus/module-dbus-protocol.c
+++ b/src/modules/dbus/module-dbus-protocol.c
@@ -117,6 +117,7 @@ static void client_kill_cb(pa_client *c) {
     pa_assert(c->userdata);
 
     conn = c->userdata;
+    pa_idxset_remove_by_data(conn->server->userdata->connections, conn, NULL);
     connection_free(conn);
     c->userdata = NULL;