diff options
Diffstat (limited to 'clients/tui')
| -rw-r--r-- | clients/tui/meson.build | 3 | ||||
| -rw-r--r-- | clients/tui/nmt-editor.c | 4 | ||||
| -rw-r--r-- | clients/tui/nmt-mac-entry.c | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/clients/tui/meson.build b/clients/tui/meson.build index 461b1f0a..837645a6 100644 --- a/clients/tui/meson.build +++ b/clients/tui/meson.build @@ -2,7 +2,7 @@ name = 'nmtui' deps = [ newt_dep, - nm_core_dep, + libnm_core_dep, ] cflags = clients_cflags + [ @@ -56,6 +56,7 @@ sources = files( deps += [ libnm_dep, + libnmc_dep, libnmc_base_dep, libnmt_newt_dep, ] diff --git a/clients/tui/nmt-editor.c b/clients/tui/nmt-editor.c index b18f23d5..c28288a2 100644 --- a/clients/tui/nmt-editor.c +++ b/clients/tui/nmt-editor.c @@ -53,6 +53,8 @@ #include "nmt-page-vlan.h" #include "nmt-page-wifi.h" +#include "nm-meta-setting-access.h" + G_DEFINE_TYPE (NmtEditor, nmt_editor, NMT_TYPE_NEWT_FORM) #define NMT_EDITOR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NMT_TYPE_EDITOR, NmtEditorPrivate)) @@ -230,6 +232,8 @@ build_edit_connection (NMConnection *orig_connection) settings = nm_connection_to_dbus (orig_connection, NM_CONNECTION_SERIALIZE_NO_SECRETS); g_variant_iter_init (&iter, settings); while (g_variant_iter_next (&iter, "{&s@a{sv}}", &setting_name, NULL)) { + if (!nm_meta_setting_info_editor_has_secrets (nm_meta_setting_info_editor_find_by_name (setting_name, FALSE))) + continue; nmt_sync_op_init (&op); nm_remote_connection_get_secrets_async (NM_REMOTE_CONNECTION (orig_connection), setting_name, NULL, got_secrets, &op); diff --git a/clients/tui/nmt-mac-entry.c b/clients/tui/nmt-mac-entry.c index 70c8c307..6c775bc5 100644 --- a/clients/tui/nmt-mac-entry.c +++ b/clients/tui/nmt-mac-entry.c @@ -30,7 +30,7 @@ #include "nmt-mac-entry.h" -#include "nm-common-macros.h" +#include "nm-libnm-core-intern/nm-common-macros.h" G_DEFINE_TYPE (NmtMacEntry, nmt_mac_entry, NMT_TYPE_NEWT_ENTRY) |