diff options
| author | Michael Biebl <biebl@debian.org> | 2017-07-12 17:58:09 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2017-07-12 17:58:09 +0200 |
| commit | 1c106aa806930113c6773992fa4ddce13e295ead (patch) | |
| tree | 2242b717e4060d33794b94d9c45f81e4007e3a3f /clients/cli/general.c | |
| parent | eb2473a843f46fae54f981c822fcace18d8f6fdf (diff) | |
| parent | b9f0451fa35393ceedf6d9d20b78c43578ebea5d (diff) | |
Updated version 1.8.2 from 'upstream/1.8.2'
with Debian dir 0d04ce142632bf08356d8d906289b6fc2de9e7c1
Diffstat (limited to 'clients/cli/general.c')
| -rw-r--r-- | clients/cli/general.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/clients/cli/general.c b/clients/cli/general.c index 12e76efd..68fab6e0 100644 --- a/clients/cli/general.c +++ b/clients/cli/general.c @@ -1136,10 +1136,10 @@ device_overview (NmCli *nmc, NMDevice *device) else g_string_append_printf (outbuf, "%s, ", _("hw")); - if ( nm_device_get_ip_iface (device) - && g_strcmp0 (nm_device_get_ip_iface (device), nm_device_get_iface (device)) - && g_strcmp0 (nm_device_get_ip_iface (device), "")) - g_string_append_printf (outbuf, "%s %s,", _("iface"), nm_device_get_ip_iface (device)); + if (!NM_IN_STRSET (nm_device_get_ip_iface (device), + NULL, + nm_device_get_iface (device))) + g_string_append_printf (outbuf, "%s %s, ", _("iface"), nm_device_get_ip_iface (device)); if (nm_device_get_physical_port_id (device)) g_string_append_printf (outbuf, "%s %s, ", _("port"), nm_device_get_physical_port_id (device)); |