summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/connection-editor/ce-page.c5
-rw-r--r--src/connection-editor/page-bluetooth.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/src/connection-editor/ce-page.c b/src/connection-editor/ce-page.c
index 3f79c22b..c44d4adb 100644
--- a/src/connection-editor/ce-page.c
+++ b/src/connection-editor/ce-page.c
@@ -308,7 +308,10 @@ _get_device_list (CEPage *self,
if (!G_TYPE_CHECK_INSTANCE_TYPE (dev, device_type))
continue;
- ifname = nm_device_get_iface (NM_DEVICE (dev));
+ if (device_type == NM_TYPE_DEVICE_BT)
+ ifname = nm_device_bt_get_name (NM_DEVICE_BT (dev));
+ else
+ ifname = nm_device_get_iface (NM_DEVICE (dev));
if (mac_property)
g_object_get (G_OBJECT (dev), mac_property, &mac, NULL);
diff --git a/src/connection-editor/page-bluetooth.c b/src/connection-editor/page-bluetooth.c
index ffaa4bba..aa5913f0 100644
--- a/src/connection-editor/page-bluetooth.c
+++ b/src/connection-editor/page-bluetooth.c
@@ -81,7 +81,7 @@ populate_ui (CEPageBluetooth *self, NMConnection *connection)
bdaddr = nm_setting_bluetooth_get_bdaddr (setting);
ce_page_setup_device_combo (CE_PAGE (self), GTK_COMBO_BOX (priv->bdaddr),
NM_TYPE_DEVICE_BT, NULL,
- bdaddr, NM_DEVICE_BT_HW_ADDRESS, FALSE);
+ bdaddr, NM_DEVICE_BT_HW_ADDRESS, TRUE);
g_signal_connect_swapped (priv->bdaddr, "changed", G_CALLBACK (ce_page_changed), self);
}