fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-04 11:00:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cli: only connect handlers for property changes in interactive edit

Browse source 
Fixes: c5324ed285
(cherry picked from commit 79c81bbb8c)
This commit is contained in:
Lubomir Rintel 2016-08-24 15:01:03 +02:00
parent 2f45665559
commit afab2b8112
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
clients/cli/connections.c
View file

@ -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 */

3
clients/cli/settings.c
View file

@ -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,