diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2018-11-02 10:00:09 +0100 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2019-02-27 10:13:38 +0100 |
| commit | e8f61c61d311c83f1a7fecba718b322a08681636 (patch) | |
| tree | 5206cee6d34e023d1bb4bdd332d49df3cc095e76 | |
| parent | df50c77e61e361f9504a5010c4db5a552c76671c (diff) | |
| download | network-manager-applet-e8f61c61d311c83f1a7fecba718b322a08681636.tar.gz | |
applet/info-dialog: use nm_device_get_hw_address()
...instead of getting hardware-specific accessors. There's no reason
(perhaps historic ones) the hardware address should be specific for
Wi-Fi and Ethernet.
| -rw-r--r-- | src/applet-dialogs.c | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/src/applet-dialogs.c b/src/applet-dialogs.c index 03bc17b2..89915488 100644 --- a/src/applet-dialogs.c +++ b/src/applet-dialogs.c @@ -528,24 +528,20 @@ info_dialog_add_page (GtkNotebook *notebook, row++; /* Hardware address */ - str = NULL; - if (NM_IS_DEVICE_ETHERNET (device)) - str = g_strdup (nm_device_ethernet_get_hw_address (NM_DEVICE_ETHERNET (device))); - else if (NM_IS_DEVICE_WIFI (device)) - str = g_strdup (nm_device_wifi_get_hw_address (NM_DEVICE_WIFI (device))); + str = g_strdup (nm_device_get_hw_address (device)); - desc_widget = create_info_label (_("Hardware Address:"), FALSE); - desc_object = gtk_widget_get_accessible (desc_widget); - data_widget = create_info_label (str, TRUE); - data_object = gtk_widget_get_accessible (data_widget); - atk_object_add_relationship (desc_object, ATK_RELATION_LABEL_FOR, data_object); + if (str) { + desc_widget = create_info_label (_("Hardware Address:"), FALSE); + desc_object = gtk_widget_get_accessible (desc_widget); + data_widget = create_info_label (str, TRUE); + data_object = gtk_widget_get_accessible (data_widget); + atk_object_add_relationship (desc_object, ATK_RELATION_LABEL_FOR, data_object); - gtk_grid_attach (grid, desc_widget, - 0, row, 1, 1); - gtk_grid_attach (grid, data_widget, - 1, row, 1, 1); - g_free (str); - row++; + gtk_grid_attach (grid, desc_widget, 0, row, 1, 1); + gtk_grid_attach (grid, data_widget, 1, row, 1, 1); + g_free (str); + row++; + } /* Driver */ desc_widget = create_info_label (_("Driver:"), FALSE); |