diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2016-08-24 15:01:03 +0200 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2016-08-24 17:22:54 +0200 |
| commit | 79c81bbb8cf5903462caf9f60e1bca4a22f3280f (patch) | |
| tree | 629aaf759fd1660561941a4b0799473b3471ac28 | |
| parent | 195ad4ec976bc017b80bfbec80b2cd67d7b8dbdc (diff) | |
cli: only connect handlers for property changes in interactive edit
| -rw-r--r-- | clients/cli/connections.c | 8 | ||||
| -rw-r--r-- | clients/cli/settings.c | 3 |
2 files changed, 8 insertions, 3 deletions
diff --git a/clients/cli/connections.c b/clients/cli/connections.c index f659b12cb0..ea7c8a79df 100644 --- a/clients/cli/connections.c +++ b/clients/cli/connections.c @@ -7045,6 +7045,14 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t break; } nmc_setting_custom_init (setting); + + if (NM_IS_SETTING_WIRELESS (setting)) + nmc_setting_wireless_connect_handlers (NM_SETTING_WIRELESS (setting)); + else if (NM_IS_SETTING_IP4_CONFIG (setting)) + nmc_setting_ip4_connect_handlers (NM_SETTING_IP_CONFIG (setting)); + else if (NM_IS_SETTING_IP6_CONFIG (setting)) + nmc_setting_ip6_connect_handlers (NM_SETTING_IP_CONFIG (setting)); + nm_connection_add_setting (connection, setting); } /* Set global variable for use in TAB completion */ diff --git a/clients/cli/settings.c b/clients/cli/settings.c index feed51ce7e..ee167d2c6a 100644 --- a/clients/cli/settings.c +++ b/clients/cli/settings.c @@ -2447,7 +2447,6 @@ nmc_setting_custom_init (NMSetting *setting) g_object_set (NM_SETTING_WIRELESS (setting), NM_SETTING_WIRELESS_MODE, NM_SETTING_WIRELESS_MODE_INFRA, NULL); - nmc_setting_wireless_connect_handlers (NM_SETTING_WIRELESS (setting)); } else if (NM_IS_SETTING_ADSL (setting)) { /* Initialize a protocol */ g_object_set (NM_SETTING_ADSL (setting), @@ -2457,12 +2456,10 @@ nmc_setting_custom_init (NMSetting *setting) g_object_set (NM_SETTING_IP_CONFIG (setting), NM_SETTING_IP_CONFIG_METHOD, NM_SETTING_IP4_CONFIG_METHOD_AUTO, NULL); - nmc_setting_ip4_connect_handlers (NM_SETTING_IP_CONFIG (setting)); } else if (NM_IS_SETTING_IP6_CONFIG (setting)) { g_object_set (NM_SETTING_IP_CONFIG (setting), NM_SETTING_IP_CONFIG_METHOD, NM_SETTING_IP6_CONFIG_METHOD_AUTO, NULL); - nmc_setting_ip6_connect_handlers (NM_SETTING_IP_CONFIG (setting)); } else if (NM_IS_SETTING_TUN (setting)) { g_object_set (NM_SETTING_TUN (setting), NM_SETTING_TUN_MODE, NM_SETTING_TUN_MODE_TUN, |