diff options
| author | Dan Williams <dcbw@redhat.com> | 2016-06-15 16:40:49 -0500 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2016-06-21 10:35:53 -0500 |
| commit | fdf5b6941a1a811c478ff56373148297c4f6fe79 (patch) | |
| tree | c76e00a4e47cf69283a3f1828c34f474d05f6195 /libnm | |
| parent | 68d48fa50769c34cf8f10b90788f5dca3ea60191 (diff) | |
| download | NetworkManager-fdf5b6941a1a811c478ff56373148297c4f6fe79.tar.gz | |
libnm/libnm-glib: use Bluetooth device name as description (bgo #592819)
Abuse the 'name' property for this, for now, so we don't have to grab
a free slot from NMDeviceClass.
https://bugzilla.gnome.org/show_bug.cgi?id=592819
Diffstat (limited to 'libnm')
| -rw-r--r-- | libnm/nm-device.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/libnm/nm-device.c b/libnm/nm-device.c index 496dd87a06..b3dc01b20f 100644 --- a/libnm/nm-device.c +++ b/libnm/nm-device.c @@ -1722,6 +1722,7 @@ get_description (NMDevice *device) char *pdown; char *vdown; GString *str; + GParamSpec *name_prop; dev_product = nm_device_get_product (device); priv->short_product = fixup_desc_string (dev_product); @@ -1729,6 +1730,15 @@ get_description (NMDevice *device) dev_vendor = nm_device_get_vendor (device); priv->short_vendor = fixup_desc_string (dev_vendor); + /* Grab device's preferred name, if any */ + name_prop = g_object_class_find_property (G_OBJECT_GET_CLASS (G_OBJECT (device)), "name"); + if (name_prop) { + g_object_get (device, "name", &priv->description, NULL); + if (priv->description && priv->description[0]) + return; + g_clear_pointer (&priv->description, g_free); + } + if (!dev_product || !dev_vendor) { priv->description = g_strdup (nm_device_get_iface (device)); return; |