Revert "bluetooth: Support ObjectManager interface add/remove"

This reverts commit 114edb0696ce979ad10f5616067afda1b76ae4e2.

This is part of the reversion of BlueZ 5 support so it can be added back
in a separate set of modules. This makes the code easier to maintain and
decrease PulseAudio's binary size.

diff --git a/src/modules/bluetooth/bluetooth-util.c b/src/modules/bluetooth/bluetooth-util.c
index ddbf6a293a738f376612505328bb95c76fbff117..d5ff12fecfebfdc31687c8bfd760e33ca38d71e7 100644 (file)
--- a/src/modules/bluetooth/bluetooth-util.c
+++ b/src/modules/bluetooth/bluetooth-util.c
@@ -1228,62 +1228,6 @@ static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *m, void *us
         if (transport_parse_property(t, &arg_i) < 0)
             goto fail;
 
-        return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-    } else if (dbus_message_is_signal(m, "org.freedesktop.DBus.ObjectManager", "InterfacesAdded")) {
-        DBusMessageIter arg_i;
-
-        if (y->version != BLUEZ_VERSION_5)
-            return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; /* No reply received yet from GetManagedObjects */
-
-        if (!dbus_message_iter_init(m, &arg_i) || !pa_streq(dbus_message_get_signature(m), "oa{sa{sv}}")) {
-            pa_log("Invalid signature found in InterfacesAdded");
-            goto fail;
-        }
-
-        if (parse_interfaces_and_properties(y, &arg_i) < 0)
-            goto fail;
-
-        return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-    } else if (dbus_message_is_signal(m, "org.freedesktop.DBus.ObjectManager", "InterfacesRemoved")) {
-        const char *path;
-        DBusMessageIter arg_i;
-        DBusMessageIter element_i;
-
-        if (y->version != BLUEZ_VERSION_5)
-            return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; /* No reply received yet from GetManagedObjects */
-
-        if (!dbus_message_iter_init(m, &arg_i) || !pa_streq(dbus_message_get_signature(m), "oas")) {
-            pa_log("Invalid signature found in InterfacesRemoved");
-            goto fail;
-        }
-
-        dbus_message_iter_get_basic(&arg_i, &path);
-
-        pa_assert_se(dbus_message_iter_next(&arg_i));
-        pa_assert(dbus_message_iter_get_arg_type(&arg_i) == DBUS_TYPE_ARRAY);
-
-        dbus_message_iter_recurse(&arg_i, &element_i);
-
-        while (dbus_message_iter_get_arg_type(&element_i) == DBUS_TYPE_STRING) {
-            const char *interface;
-
-            dbus_message_iter_get_basic(&element_i, &interface);
-
-            if (pa_streq(interface, "org.bluez.Device1")) {
-                pa_bluetooth_device *d;
-
-                if (!(d = pa_hashmap_remove(y->devices, path)))
-                    pa_log_warn("Unknown device removed %s", path);
-                else {
-                    pa_log_debug("Device %s removed", path);
-                    run_callback(d, true);
-                    device_free(d);
-                }
-            }
-
-            dbus_message_iter_next(&element_i);
-        }
-
         return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
     }
 
@@ -1942,8 +1886,6 @@ pa_bluetooth_discovery* pa_bluetooth_discovery_get(pa_core *c) {
                 "type='signal',sender='org.bluez',interface='org.bluez.AudioSource',member='PropertyChanged'",
                 "type='signal',sender='org.bluez',interface='org.bluez.HandsfreeGateway',member='PropertyChanged'",
                 "type='signal',sender='org.bluez',interface='org.bluez.MediaTransport',member='PropertyChanged'",
-                "type='signal',sender='org.bluez',interface='org.freedesktop.DBus.ObjectManager',member='InterfacesAdded'",
-                "type='signal',sender='org.bluez',interface='org.freedesktop.DBus.ObjectManager',member='InterfacesRemoved'",
                 NULL) < 0) {
         pa_log("Failed to add D-Bus matches: %s", err.message);
         goto fail;
@@ -2017,8 +1959,6 @@ void pa_bluetooth_discovery_unref(pa_bluetooth_discovery *y) {
             "type='signal',sender='org.bluez',interface='org.bluez.AudioSource',member='PropertyChanged'",
             "type='signal',sender='org.bluez',interface='org.bluez.HandsfreeGateway',member='PropertyChanged'",
             "type='signal',sender='org.bluez',interface='org.bluez.MediaTransport',member='PropertyChanged'",
-            "type='signal',sender='org.bluez',interface='org.freedesktop.DBus.ObjectManager',member='InterfacesAdded'",
-            "type='signal',sender='org.bluez',interface='org.freedesktop.DBus.ObjectManager',member='InterfacesRemoved'",
             NULL);
 
         if (y->filter_added)