diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2022-05-12 12:30:58 +0200 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2022-05-12 14:37:18 +0200 |
| commit | 2dbbea3f10893545d054f56f101cb91c2c2185c2 (patch) | |
| tree | 899f393109cf5c537bc7868dd8cd1e81c3f09610 | |
| parent | 1a995325d51106fd819d453a8ca7c73cc80ae6dd (diff) | |
nmcli/connections: export nmc_connection_check_deprecated()
It's going to be useful with "nmcli dev wifi connect" that also creates
a connection that should be checked.
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1224
| -rw-r--r-- | src/nmcli/connections.c | 11 | ||||
| -rw-r--r-- | src/nmcli/connections.h | 2 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/nmcli/connections.c b/src/nmcli/connections.c index 648583eb1d..4d9f662bf5 100644 --- a/src/nmcli/connections.c +++ b/src/nmcli/connections.c @@ -639,8 +639,8 @@ _con_show_fcn_get_type(NMConnection *c, NMActiveConnection *ac, NMMetaAccessorGe return connection_type_to_display(s, get_type); } -static const char * -_connection_check_deprecated(NMConnection *c) +const char * +nmc_connection_check_deprecated(NMConnection *c) { NMSettingWirelessSecurity *s_wsec; const char *key_mgmt; @@ -667,7 +667,7 @@ _connection_to_color(NMConnection *c, NMActiveConnection *ac) if (ac) return nmc_active_connection_state_to_color(ac); - if (_connection_check_deprecated(c)) + if (nmc_connection_check_deprecated(c)) return NM_META_COLOR_CONNECTION_DEPRECATED; return NM_META_COLOR_CONNECTION_UNKNOWN; @@ -2039,7 +2039,8 @@ con_show_get_items_cmp(gconstpointer pa, gconstpointer pb, gpointer user_data) } } - NM_CMP_DIRECT(!!_connection_check_deprecated(c_a), !!_connection_check_deprecated(c_b)); + NM_CMP_DIRECT(!!nmc_connection_check_deprecated(c_a), + !!nmc_connection_check_deprecated(c_b)); NM_CMP_DIRECT_STRCMP0(nm_connection_get_uuid(c_a), nm_connection_get_uuid(c_b)); NM_CMP_DIRECT_STRCMP0(nm_connection_get_path(c_a), nm_connection_get_path(c_b)); } @@ -5381,7 +5382,7 @@ connection_warnings(NmCli *nmc, NMConnection *connection) const char *id; const char *deprecated; - deprecated = _connection_check_deprecated(NM_CONNECTION(connection)); + deprecated = nmc_connection_check_deprecated(NM_CONNECTION(connection)); if (deprecated) g_printerr(_("Warning: %s.\n"), deprecated); diff --git a/src/nmcli/connections.h b/src/nmcli/connections.h index 782c4eafca..c610766a62 100644 --- a/src/nmcli/connections.h +++ b/src/nmcli/connections.h @@ -10,6 +10,8 @@ void monitor_connections(NmCli *nmc); +const char *nmc_connection_check_deprecated(NMConnection *c); + gboolean nmc_process_connection_properties(NmCli *nmc, NMConnection *connection, int *argc, |