[gnome-bluetooth/wip/hadess/fix-keyboard-cancel: 6/7] lib: Remove DiscoveryFilter fallback code

[Bastien Nocera <hadess src gnome org>]

commit 93284ca07ac2c330f0323eda6d51eb21b497ef5e
Author: Bastien Nocera <hadess hadess net>
Date:   Thu Feb 18 17:46:11 2021 +0100

    lib: Remove DiscoveryFilter fallback code
    
    Now that we require a new enough version of BlueZ.

 lib/bluetooth-client.c | 68 ++++++--------------------------------------------
 1 file changed, 7 insertions(+), 61 deletions(-)
---
diff --git a/lib/bluetooth-client.c b/lib/bluetooth-client.c
index 3f1080e8..5a149353 100644
--- a/lib/bluetooth-client.c
+++ b/lib/bluetooth-client.c
@@ -967,77 +967,25 @@ _bluetooth_client_get_default_adapter_name (BluetoothClient *self)
        return ret;
 }
 
-/**
- * _bluetooth_client_set_discoverable:
- * @client: a #BluetoothClient object
- * @discoverable: whether the device should be discoverable
- *
- * Sets the default adapter's discoverable status.
- *
- * Return value: Whether setting the state on the default adapter was successful.
- **/
-static gboolean
-_bluetooth_client_set_discoverable (BluetoothClient *client,
-                                   gboolean discoverable)
-{
-       BluetoothClientPrivate *priv = BLUETOOTH_CLIENT_GET_PRIVATE (client);
-       GtkTreePath *path;
-       GObject *adapter;
-       GtkTreeIter iter;
-
-       g_return_val_if_fail (BLUETOOTH_IS_CLIENT (client), FALSE);
-
-       if (priv->default_adapter == NULL)
-               return FALSE;
-
-       path = gtk_tree_row_reference_get_path (priv->default_adapter);
-       gtk_tree_model_get_iter (GTK_TREE_MODEL (priv->store), &iter, path);
-       gtk_tree_model_get (GTK_TREE_MODEL (priv->store), &iter,
-                            BLUETOOTH_COLUMN_PROXY, &adapter, -1);
-        gtk_tree_path_free (path);
-
-       if (adapter == NULL)
-               return FALSE;
-
-       if (discoverable) {
-               g_object_set (adapter,
-                             "discoverable", discoverable,
-                             "discoverable-timeout", 0,
-                             NULL);
-       } else {
-               /* Work-around race in bluetoothd which would reset the discoverable
-                * flag if a timeout change was requested before discoverable finished
-                * being set to off:
-                * https://bugzilla.redhat.com/show_bug.cgi?id=1602985 */
-               g_object_set (adapter,
-                             "discoverable", FALSE,
-                             NULL);
-       }
-       g_object_unref (adapter);
-
-       return TRUE;
-}
-
 static void
 _bluetooth_client_set_default_adapter_discovering (BluetoothClient *client,
                                                   gboolean         discovering,
                                                   gboolean         discoverable)
 {
        BluetoothClientPrivate *priv = BLUETOOTH_CLIENT_GET_PRIVATE (client);
-       GDBusProxy *adapter;
+       g_autoptr(GDBusProxy) adapter = NULL;
        GVariantBuilder builder;
 
        adapter = _bluetooth_client_get_default_adapter (client);
        if (adapter == NULL)
                return;
 
-       g_variant_builder_init (&builder, G_VARIANT_TYPE_VARDICT);
-       g_variant_builder_add (&builder, "{sv}",
-                              "Discoverable", g_variant_new_boolean (discoverable));
-       if (!adapter1_call_set_discovery_filter_sync (ADAPTER1 (adapter),
-                                                     g_variant_builder_end (&builder), NULL, NULL)) {
-               /* BlueZ too old? */
-               _bluetooth_client_set_discoverable (client, discoverable);
+       if (discovering) {
+               g_variant_builder_init (&builder, G_VARIANT_TYPE_VARDICT);
+               g_variant_builder_add (&builder, "{sv}",
+                                      "Discoverable", g_variant_new_boolean (discoverable));
+               adapter1_call_set_discovery_filter_sync (ADAPTER1 (adapter),
+                                                        g_variant_builder_end (&builder), NULL, NULL);
        }
 
        priv->discovery_started = discovering;
@@ -1045,8 +993,6 @@ _bluetooth_client_set_default_adapter_discovering (BluetoothClient *client,
                adapter1_call_start_discovery_sync (ADAPTER1 (adapter), NULL, NULL);
        else
                adapter1_call_stop_discovery_sync (ADAPTER1 (adapter), NULL, NULL);
-
-       g_object_unref(adapter);
 }
 
 static gboolean