diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2019-01-25 11:26:25 +0100 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2019-01-25 11:26:25 +0100 |
| commit | f54a568880bf47c2ea54c9b30d291156b34d6539 (patch) | |
| tree | aab9bb44b306da7651e8caf38bbab5cfeeb81b7d /clients/cli/utils.h | |
| parent | e8ac7dacdcf4b38addef4f8ac6ab038f9d29582c (diff) | |
| parent | bbae86d3d2997a853ca0365e8eb7a3ca7489ee09 (diff) | |
Update upstream source from tag 'upstream/1.15.2'
Update to upstream version '1.15.2' with Debian dir b4be4b7cfce96679a31cb9d423107789761e3b49
Diffstat (limited to 'clients/cli/utils.h')
| -rw-r--r-- | clients/cli/utils.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/clients/cli/utils.h b/clients/cli/utils.h index b2a3e5eb..b84b35bf 100644 --- a/clients/cli/utils.h +++ b/clients/cli/utils.h @@ -40,7 +40,7 @@ gboolean nmc_parse_args (nmc_arg_t *arg_arr, gboolean last, int *argc, char ***a char *ssid_to_hex (const char *str, gsize len); void nmc_terminal_erase_line (void); void nmc_terminal_show_progress (const char *str); -void nmc_terminal_spawn_pager (const NmcConfig *nmc_config); +pid_t nmc_terminal_spawn_pager (const NmcConfig *nmc_config); char *nmc_colorize (const NmcConfig *nmc_config, NMMetaColor color, const char * fmt, ...) _nm_printf (3, 4); void nmc_filter_out_colors_inplace (char *str); char *nmc_filter_out_colors (const char *str); @@ -166,6 +166,8 @@ typedef enum { NMC_GENERIC_INFO_TYPE_DEVICE_STATUS_DEVICE = 0, NMC_GENERIC_INFO_TYPE_DEVICE_STATUS_TYPE, NMC_GENERIC_INFO_TYPE_DEVICE_STATUS_STATE, + NMC_GENERIC_INFO_TYPE_DEVICE_STATUS_IP4_CONNECTIVITY, + NMC_GENERIC_INFO_TYPE_DEVICE_STATUS_IP6_CONNECTIVITY, NMC_GENERIC_INFO_TYPE_DEVICE_STATUS_DBUS_PATH, NMC_GENERIC_INFO_TYPE_DEVICE_STATUS_CONNECTION, NMC_GENERIC_INFO_TYPE_DEVICE_STATUS_CON_UUID, @@ -184,6 +186,8 @@ typedef enum { NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_MTU, NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_STATE, NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_REASON, + NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_IP4_CONNECTIVITY, + NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_IP6_CONNECTIVITY, NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_UDI, NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_IP_IFACE, NMC_GENERIC_INFO_TYPE_DEVICE_DETAIL_GENERAL_IS_SOFTWARE, |