[gnome-bluetooth] lib: Simplify removing a device
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-bluetooth] lib: Simplify removing a device
- Date: Sun, 26 Nov 2017 16:16:12 +0000 (UTC)
commit cb52c8f77572481578e3219203c0b0a5c0695993
Author: Bastien Nocera <hadess hadess net>
Date: Fri Nov 24 19:46:10 2017 +0100
lib: Simplify removing a device
We don't need to create a proxy ourselves, BluetoothClient can hand us
one.
https://bugzilla.gnome.org/show_bug.cgi?id=790801
lib/bluetooth-settings-widget.c | 17 +++++------------
1 files changed, 5 insertions(+), 12 deletions(-)
---
diff --git a/lib/bluetooth-settings-widget.c b/lib/bluetooth-settings-widget.c
index cd4b89b..66c0cf8 100644
--- a/lib/bluetooth-settings-widget.c
+++ b/lib/bluetooth-settings-widget.c
@@ -1294,19 +1294,12 @@ remove_selected_device (BluetoothSettingsWidget *self)
GError *error = NULL;
GVariant *ret;
- g_object_get (G_OBJECT (priv->client), "default-adapter", &adapter, NULL);
- adapter_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
- G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES |
G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START,
- NULL,
- BLUEZ_SERVICE,
- adapter,
- ADAPTER_IFACE,
- NULL,
- &error);
- g_free (adapter);
+ g_debug ("About to call RemoveDevice for %s", priv->selected_object_path);
+
+ adapter_proxy = _bluetooth_client_get_default_adapter (priv->client);
+
if (adapter_proxy == NULL) {
- g_warning ("Failed to create a GDBusProxy for the default adapter: %s", error->message);
- g_error_free (error);
+ g_warning ("Failed to get a GDBusProxy for the default adapter");
return FALSE;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]