[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.13-92-g5a5d288

[Lennart Poettering]

This is an automated email from the git hooks/post-receive script. It was
generated because of a push to the "PulseAudio Sound Server" repository.

The master branch has been updated
      from  8e3e88df8b4f9eb82d305e04b23b22574fb7847d (commit)

- Log -----------------------------------------------------------------
5a5d288... properly remove dbus matches an filters when unloading m-b-d
65ea1a2... correctly load module-flat-volume instead of module-flat-volumes
-----------------------------------------------------------------------

Summary of changes:
 src/daemon/default.pa.in                          |    2 +-
 src/modules/bluetooth/module-bluetooth-discover.c |   17 ++++++++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

-----------------------------------------------------------------------

commit 65ea1a282b88ab263efdf940a10ca20c405d37a1
Author: Lennart Poettering <lennart at poettering.net>
Date:   Mon Oct 13 19:28:14 2008 +0200

    correctly load module-flat-volume instead of module-flat-volumes

diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in
index ae54c0a..a831876 100755
--- a/src/daemon/default.pa.in
+++ b/src/daemon/default.pa.in
@@ -73,7 +73,7 @@ load-module module-native-protocol-unix
 #load-module module-rtp-send source=rtp.monitor
 
 ### Enable flat volumes where possible
-load-module module-flat-volumes
+load-module module-flat-volume
 
 ### Automatically restore the volume of streams and devices
 load-module module-device-restore

commit 5a5d2884e08e964a8d94302bd065b2187732cb94
Author: Lennart Poettering <lennart at poettering.net>
Date:   Mon Oct 13 19:52:02 2008 +0200

    properly remove dbus matches an filters when unloading m-b-d

diff --git a/src/modules/bluetooth/module-bluetooth-discover.c b/src/modules/bluetooth/module-bluetooth-discover.c
index a33ca64..ad436f3 100644
--- a/src/modules/bluetooth/module-bluetooth-discover.c
+++ b/src/modules/bluetooth/module-bluetooth-discover.c
@@ -485,8 +485,23 @@ void pa__done(pa_module* m) {
         device_free(i);
     }
 
-    if (u->conn)
+    if (u->conn) {
+        DBusError error;
+        dbus_error_init(&error);
+
+        dbus_bus_remove_match(pa_dbus_connection_get(u->conn), "type='signal',sender='org.bluez',interface='org.bluez.Adapter',member='DeviceRemoved'", &error);
+        dbus_error_free(&error);
+
+        dbus_bus_remove_match(pa_dbus_connection_get(u->conn), "type='signal',sender='org.bluez',interface='org.bluez.Headset',member='PropertyChanged'", &error);
+        dbus_error_free(&error);
+
+        dbus_bus_remove_match(pa_dbus_connection_get(u->conn), "type='signal',sender='org.bluez',interface='org.bluez.AudioSink',member='PropertyChanged'", &error);
+        dbus_error_free(&error);
+
+        dbus_connection_remove_filter(pa_dbus_connection_get(u->conn), filter_cb, u);
+
         pa_dbus_connection_unref(u->conn);
+    }
 
     pa_xfree(u);
 }

-- 
hooks/post-receive
PulseAudio Sound Server