diff options
| author | Bastien Nocera <hadess@hadess.net> | 2019-09-11 11:26:29 +0200 |
|---|---|---|
| committer | Bastien Nocera <hadess@hadess.net> | 2019-09-11 11:26:29 +0200 |
| commit | 96295afdc38c9c8534084d2ef643fc46c4dbe3aa (patch) | |
| tree | a94c5948f69d86e4bb29eee67712899ead7b722f | |
| parent | eb10cf6e1e6c088ae8eaed7379ee79413859b247 (diff) | |
| download | gnome-bluetooth-96295afdc38c9c8534084d2ef643fc46c4dbe3aa.tar.gz | |
lib: Prefer “Alias” adapter name to “Name”
The alias can be overridden by third-parties and will be used by
bluetoothd to set the externally visible name, so we need to use it
rather than the (usually computationally) set name.
Closes: #50
| -rw-r--r-- | lib/bluetooth-client.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/lib/bluetooth-client.c b/lib/bluetooth-client.c index 089fbb5f..1853f5a5 100644 --- a/lib/bluetooth-client.c +++ b/lib/bluetooth-client.c @@ -545,11 +545,11 @@ adapter_notify_cb (Adapter1 *adapter, gtk_tree_model_get (GTK_TREE_MODEL(priv->store), &iter, BLUETOOTH_COLUMN_DEFAULT, &is_default, -1); - if (g_strcmp0 (property, "name") == 0) { - const gchar *name = adapter1_get_name (adapter); + if (g_strcmp0 (property, "alias") == 0) { + const gchar *alias = adapter1_get_alias (adapter); gtk_tree_store_set (priv->store, &iter, - BLUETOOTH_COLUMN_NAME, name, -1); + BLUETOOTH_COLUMN_ALIAS, alias, -1); if (is_default) { g_object_notify (G_OBJECT (client), "default-adapter-powered"); @@ -605,7 +605,7 @@ adapter_added (GDBusObjectManager *manager, { BluetoothClientPrivate *priv = BLUETOOTH_CLIENT_GET_PRIVATE(client); GtkTreeIter iter; - const gchar *address, *name; + const gchar *address, *name, *alias; gboolean discovering, discoverable, powered; g_signal_connect_object (G_OBJECT (adapter), "notify", @@ -613,6 +613,7 @@ adapter_added (GDBusObjectManager *manager, address = adapter1_get_address (adapter); name = adapter1_get_name (adapter); + alias = adapter1_get_alias (adapter); discovering = adapter1_get_discovering (adapter); powered = adapter1_get_powered (adapter); discoverable = adapter1_get_discoverable (adapter); @@ -621,6 +622,7 @@ adapter_added (GDBusObjectManager *manager, BLUETOOTH_COLUMN_PROXY, adapter, BLUETOOTH_COLUMN_ADDRESS, address, BLUETOOTH_COLUMN_NAME, name, + BLUETOOTH_COLUMN_ALIAS, alias, BLUETOOTH_COLUMN_DISCOVERING, discovering, BLUETOOTH_COLUMN_DISCOVERABLE, discoverable, BLUETOOTH_COLUMN_POWERED, powered, @@ -938,7 +940,7 @@ _bluetooth_client_get_default_adapter_name (BluetoothClient *self) 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_NAME, &ret, -1); + gtk_tree_model_get (GTK_TREE_MODEL (priv->store), &iter, BLUETOOTH_COLUMN_ALIAS, &ret, -1); gtk_tree_path_free (path); return ret; @@ -1651,7 +1653,7 @@ bluetooth_client_dump_device (GtkTreeModel *model, GtkTreeIter *iter) { GDBusProxy *proxy; - char *address, *alias, *name, *icon, **uuids; + char *address, *alias, *icon, **uuids; gboolean is_default, paired, trusted, connected, discoverable, discovering, powered, is_adapter; GtkTreeIter parent; BluetoothType type; @@ -1659,7 +1661,6 @@ bluetooth_client_dump_device (GtkTreeModel *model, gtk_tree_model_get (model, iter, BLUETOOTH_COLUMN_ADDRESS, &address, BLUETOOTH_COLUMN_ALIAS, &alias, - BLUETOOTH_COLUMN_NAME, &name, BLUETOOTH_COLUMN_TYPE, &type, BLUETOOTH_COLUMN_ICON, &icon, BLUETOOTH_COLUMN_DEFAULT, &is_default, @@ -1683,7 +1684,7 @@ bluetooth_client_dump_device (GtkTreeModel *model, if (is_adapter != FALSE) { /* Adapter */ - g_print ("Adapter: %s (%s)\n", name, address); + g_print ("Adapter: %s (%s)\n", alias, address); if (is_default) g_print ("\tDefault adapter\n"); g_print ("\tD-Bus Path: %s\n", proxy ? g_dbus_proxy_get_object_path (proxy) : "(none)"); |