From: Tanu Kaskinen <tanuk@iki.fi>
Date: Sun, 1 Jan 2012 17:44:27 +0000 (+0200)
Subject: bluetooth: Remove the right match in the proximity module.
X-Git-Tag: 1.0_branch~124
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8846239be730b3f99c982b54a4171b20e68bcc00;p=profile%2Fivi%2Fpulseaudio.git

bluetooth: Remove the right match in the proximity module.

The original intention of this code was probably that if
adding filter1 succeeded but adding filter2 failed, then
filter1 should be removed so that either both or none of the
filters get added.
---

diff --git a/src/modules/bluetooth/module-bluetooth-proximity.c b/src/modules/bluetooth/module-bluetooth-proximity.c
index 7560f5a..9ba3fd8 100644
--- a/src/modules/bluetooth/module-bluetooth-proximity.c
+++ b/src/modules/bluetooth/module-bluetooth-proximity.c
@@ -352,7 +352,7 @@ static int add_matches(struct userdata *u, pa_bool_t add) {
 
         if (dbus_error_is_set(&e)) {
             pa_log("dbus_bus_add_match(%s) failed: %s", filter2, e.message);
-            dbus_bus_remove_match(pa_dbus_connection_get(u->dbus_connection), filter2, NULL);
+            dbus_bus_remove_match(pa_dbus_connection_get(u->dbus_connection), filter1, NULL);
             goto finish;
         }
     } else