cli: use "--" instead of "no set" for NULL strings
authorJiří Klimeš <jklimes@redhat.com>
Mon, 4 Jun 2012 10:25:43 +0000 (12:25 +0200)
committerJiří Klimeš <jklimes@redhat.com>
Mon, 4 Jun 2012 10:25:43 +0000 (12:25 +0200)
cli/src/settings.c
cli/src/utils.c

index 13d76e1..a576459 100644 (file)
@@ -938,11 +938,11 @@ setting_wireless_details (NMSettingWireless *s_wireless, NmCli *nmc)
        nmc->allowed_fields[2].value = nm_setting_wireless_get_mode (s_wireless);
        nmc->allowed_fields[3].value = nm_setting_wireless_get_band (s_wireless);
        nmc->allowed_fields[4].value = channel_str;
-       nmc->allowed_fields[5].value = bssid_str ? bssid_str : _("not set");
+       nmc->allowed_fields[5].value = bssid_str;
        nmc->allowed_fields[6].value = rate_str;
        nmc->allowed_fields[7].value = tx_power_str;
-       nmc->allowed_fields[8].value = device_mac_str ? device_mac_str : _("not set");
-       nmc->allowed_fields[9].value = cloned_mac_str ? cloned_mac_str : _("not set");
+       nmc->allowed_fields[8].value = device_mac_str;
+       nmc->allowed_fields[9].value = cloned_mac_str;
        nmc->allowed_fields[10].value = mac_blacklist->str;
        nmc->allowed_fields[11].value = strcmp (mtu_str, "0") ?  mtu_str : _("auto");
        nmc->allowed_fields[12].value = seen_bssids->str;
index 19ecb1a..8030d5e 100644 (file)
@@ -276,7 +276,7 @@ print_fields (const NmcPrintFields fields, const NmcOutputField field_values[])
        int table_width = 0;
        char *line = NULL;
        char *indent_str;
-       const char *not_set_str = _("not set");
+       const char *not_set_str = "--";
        int i;
        gboolean multiline = fields.flags & NMC_PF_FLAG_MULTILINE;
        gboolean terse = fields.flags & NMC_PF_FLAG_TERSE;