diff options
| author | Jiří Klimeš <jklimes@redhat.com> | 2014-09-24 08:38:08 +0200 |
|---|---|---|
| committer | Jiří Klimeš <jklimes@redhat.com> | 2014-10-10 11:42:40 +0200 |
| commit | f6125fe419de13cb4350c3500b380d0a480fec07 (patch) | |
| tree | b704642a74f33bcf87c4e38c7e4cb51087d71ba2 | |
| parent | 15b2a85ec5675603eee02640794fa2b0b52369da (diff) | |
| download | NetworkManager-jk/tui-bond-fix.tar.gz | |
-wip- tui blajk/tui-bond-fix
| -rw-r--r-- | clients/tui/nm-editor-utils.c | 2 | ||||
| -rw-r--r-- | clients/tui/nmt-page-bond.c | 17 |
2 files changed, 17 insertions, 2 deletions
diff --git a/clients/tui/nm-editor-utils.c b/clients/tui/nm-editor-utils.c index 54efbf8ea1..5d2b576970 100644 --- a/clients/tui/nm-editor-utils.c +++ b/clients/tui/nm-editor-utils.c @@ -71,6 +71,7 @@ bond_connection_setup_func (NMConnection *connection, NMSettingConnection *s_con, NMSetting *s_hw) { +#if 0 NMSettingBond *s_bond = NM_SETTING_BOND (s_hw); const char **options, *def, *cur; int i; @@ -82,6 +83,7 @@ bond_connection_setup_func (NMConnection *connection, if (g_strcmp0 (def, cur) != 0) nm_setting_bond_add_option (s_bond, options[i], def); } +#endif } typedef void (*NMEditorNewConnectionSetupFunc) (NMConnection *connection, diff --git a/clients/tui/nmt-page-bond.c b/clients/tui/nmt-page-bond.c index 4dddb3bd63..b758c02f47 100644 --- a/clients/tui/nmt-page-bond.c +++ b/clients/tui/nmt-page-bond.c @@ -110,7 +110,7 @@ bond_options_changed (GObject *object, NMSettingBond *s_bond = NM_SETTING_BOND (object); NmtPageBond *bond = NMT_PAGE_BOND (user_data); NmtPageBondPrivate *priv = NMT_PAGE_BOND_GET_PRIVATE (bond); - const char *val; + const char *val, *def; char **ips; if (priv->updating) @@ -140,14 +140,26 @@ bond_options_changed (GObject *object, if (priv->monitoring_mode == NMT_PAGE_BOND_MONITORING_MII) { nmt_newt_widget_set_visible (NMT_NEWT_WIDGET (priv->miimon), TRUE); val = nm_setting_bond_get_option_by_name (s_bond, NM_SETTING_BOND_OPTION_MIIMON); + if (!val) { + val = nm_setting_bond_get_option_default (s_bond, NM_SETTING_BOND_OPTION_MIIMON); + nm_setting_bond_add_option (priv->s_bond, NM_SETTING_BOND_OPTION_MIIMON, val); + } nmt_newt_entry_set_text (priv->miimon, val); nmt_newt_widget_set_visible (NMT_NEWT_WIDGET (priv->updelay), TRUE); val = nm_setting_bond_get_option_by_name (s_bond, NM_SETTING_BOND_OPTION_UPDELAY); + if (!val) { + val = nm_setting_bond_get_option_default (s_bond, NM_SETTING_BOND_OPTION_UPDELAY); + nm_setting_bond_add_option (priv->s_bond, NM_SETTING_BOND_OPTION_UPDELAY, val); + } nmt_newt_entry_set_text (priv->updelay, val); nmt_newt_widget_set_visible (NMT_NEWT_WIDGET (priv->downdelay), TRUE); val = nm_setting_bond_get_option_by_name (s_bond, NM_SETTING_BOND_OPTION_DOWNDELAY); + if (!val) { + val = nm_setting_bond_get_option_default (s_bond, NM_SETTING_BOND_OPTION_DOWNDELAY); + nm_setting_bond_add_option (priv->s_bond, NM_SETTING_BOND_OPTION_DOWNDELAY, val); + } nmt_newt_entry_set_text (priv->downdelay, val); nmt_newt_widget_set_visible (NMT_NEWT_WIDGET (priv->arp_interval), FALSE); @@ -155,7 +167,8 @@ bond_options_changed (GObject *object, } else { nmt_newt_widget_set_visible (NMT_NEWT_WIDGET (priv->arp_interval), TRUE); val = nm_setting_bond_get_option_by_name (s_bond, NM_SETTING_BOND_OPTION_ARP_INTERVAL); - nmt_newt_entry_set_text (priv->arp_interval, val); + def = nm_setting_bond_get_option_default (s_bond, NM_SETTING_BOND_OPTION_ARP_INTERVAL); + nmt_newt_entry_set_text (priv->arp_interval, val ? val : def); nmt_newt_widget_set_visible (NMT_NEWT_WIDGET (priv->arp_ip_target), TRUE); val = nm_setting_bond_get_option_by_name (s_bond, NM_SETTING_BOND_OPTION_ARP_IP_TARGET); |