diff options
Diffstat (limited to 'clients')
| -rw-r--r-- | clients/tui/nm-editor-utils.c | 21 | ||||
| -rw-r--r-- | clients/tui/nmt-page-bond.c | 3 |
2 files changed, 18 insertions, 6 deletions
diff --git a/clients/tui/nm-editor-utils.c b/clients/tui/nm-editor-utils.c index 9dd95c0881..5bc30a6635 100644 --- a/clients/tui/nm-editor-utils.c +++ b/clients/tui/nm-editor-utils.c @@ -69,14 +69,23 @@ bond_connection_setup_func (NMConnection *connection, NMSetting *s_hw) { NMSettingBond *s_bond = NM_SETTING_BOND (s_hw); - const char **options, *def, *cur; - int i; - - options = nm_setting_bond_get_valid_options (s_bond); - for (i = 0; options[i]; i++) { + const char *def, *cur; + const char *const options[] = { + NM_SETTING_BOND_OPTION_MODE, + NM_SETTING_BOND_OPTION_MIIMON, + NM_SETTING_BOND_OPTION_ARP_INTERVAL, + NM_SETTING_BOND_OPTION_ARP_IP_TARGET, + NM_SETTING_BOND_OPTION_UPDELAY, + NM_SETTING_BOND_OPTION_DOWNDELAY, + NM_SETTING_BOND_OPTION_PRIMARY, + }; + guint i; + + /* Only add options supported by the UI */ + for (i = 0; i < G_N_ELEMENTS(options); i++) { def = nm_setting_bond_get_option_default (s_bond, options[i]); cur = nm_setting_bond_get_option_by_name (s_bond, options[i]); - if (g_strcmp0 (def, cur) != 0) + if (!nm_streq0 (def, cur)) nm_setting_bond_add_option (s_bond, options[i], def); } } diff --git a/clients/tui/nmt-page-bond.c b/clients/tui/nmt-page-bond.c index 1629c8b083..ce318e9343 100644 --- a/clients/tui/nmt-page-bond.c +++ b/clients/tui/nmt-page-bond.c @@ -46,6 +46,9 @@ typedef enum { typedef struct { NmtSlaveList *slaves; + /* Note: when adding new options to the UI also ensure they are + * initialized in bond_connection_setup_func() + */ NmtNewtPopup *mode; NmtNewtEntry *primary; NmtNewtPopup *monitoring; |