From c023edc3bbef50cd51bd265c13a9c517bdb2848c Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Sat, 25 Mar 2017 16:22:25 +0100 Subject: [PATCH] cli: remove GLUE macros that hide names It's useful to see the entire name not having a macro construct it. Otherwise, the usage is not grepable. --- clients/cli/settings.c | 568 ++++++++++++++++++++--------------------- 1 file changed, 282 insertions(+), 286 deletions(-) diff --git a/clients/cli/settings.c b/clients/cli/settings.c index 6bd4f4f675..57c9db165d 100644 --- a/clients/cli/settings.c +++ b/clients/cli/settings.c @@ -6362,10 +6362,6 @@ _nmc_add_prop_funcs (const char *key, _nmc_add_prop_funcs ("" key, (NmcPropertyFuncs *) &_item_init); \ } G_STMT_END -/* concatenate setting name and property name */ -#define GLUE(A,B) "" NM_SETTING_##A##_SETTING_NAME "" NM_SETTING_##A##_##B "" -#define GLUE_IP(A,B) "" NM_SETTING_IP##A##_CONFIG_SETTING_NAME "" NM_SETTING_IP_CONFIG_##B "" - void nmc_properties_init (void) { @@ -6376,308 +6372,308 @@ nmc_properties_init (void) nmc_properties = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, g_free); /* Add editable properties for NM_SETTING_802_1X_SETTING_NAME */ - nmc_add_prop_funcs (GLUE (802_1X, EAP), + nmc_add_prop_funcs (NM_SETTING_802_1X_SETTING_NAME""NM_SETTING_802_1X_EAP, nmc_property_802_1X_get_eap, nmc_property_802_1X_set_eap, nmc_property_802_1X_remove_eap, NULL, nmc_property_802_1X_allowed_eap, NULL); - nmc_add_prop_funcs (GLUE (802_1X, IDENTITY), + nmc_add_prop_funcs (NM_SETTING_802_1X_SETTING_NAME""NM_SETTING_802_1X_IDENTITY, nmc_property_802_1X_get_identity, nmc_property_set_string, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (802_1X, ANONYMOUS_IDENTITY), + nmc_add_prop_funcs (NM_SETTING_802_1X_SETTING_NAME""NM_SETTING_802_1X_ANONYMOUS_IDENTITY, nmc_property_802_1X_get_anonymous_identity, nmc_property_set_string, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (802_1X, PAC_FILE), + nmc_add_prop_funcs (NM_SETTING_802_1X_SETTING_NAME""NM_SETTING_802_1X_PAC_FILE, nmc_property_802_1X_get_pac_file, nmc_property_set_string, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (802_1X, CA_CERT), + nmc_add_prop_funcs (NM_SETTING_802_1X_SETTING_NAME""NM_SETTING_802_1X_CA_CERT, nmc_property_802_1X_get_ca_cert, nmc_property_802_1X_set_ca_cert, NULL, nmc_property_802_1X_describe_ca_cert, NULL, NULL); - nmc_add_prop_funcs (GLUE (802_1X, CA_CERT_PASSWORD), + nmc_add_prop_funcs (NM_SETTING_802_1X_SETTING_NAME""NM_SETTING_802_1X_CA_CERT_PASSWORD, nmc_property_802_1X_get_ca_cert_password, nmc_property_set_string, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (802_1X, CA_CERT_PASSWORD_FLAGS), + nmc_add_prop_funcs (NM_SETTING_802_1X_SETTING_NAME""NM_SETTING_802_1X_CA_CERT_PASSWORD_FLAGS, nmc_property_802_1X_get_ca_cert_password_flags, nmc_property_set_secret_flags, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (802_1X, CA_PATH), + nmc_add_prop_funcs (NM_SETTING_802_1X_SETTING_NAME""NM_SETTING_802_1X_CA_PATH, nmc_property_802_1X_get_ca_path, nmc_property_set_string, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (802_1X, SUBJECT_MATCH), + nmc_add_prop_funcs (NM_SETTING_802_1X_SETTING_NAME""NM_SETTING_802_1X_SUBJECT_MATCH, nmc_property_802_1X_get_subject_match, nmc_property_set_string, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (802_1X, ALTSUBJECT_MATCHES), + nmc_add_prop_funcs (NM_SETTING_802_1X_SETTING_NAME""NM_SETTING_802_1X_ALTSUBJECT_MATCHES, nmc_property_802_1X_get_altsubject_matches, nmc_property_802_1X_set_altsubject_matches, nmc_property_802_1X_remove_altsubject_matches, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (802_1X, DOMAIN_SUFFIX_MATCH), + nmc_add_prop_funcs (NM_SETTING_802_1X_SETTING_NAME""NM_SETTING_802_1X_DOMAIN_SUFFIX_MATCH, nmc_property_802_1X_get_domain_suffix_match, nmc_property_set_string, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (802_1X, CLIENT_CERT), + nmc_add_prop_funcs (NM_SETTING_802_1X_SETTING_NAME""NM_SETTING_802_1X_CLIENT_CERT, nmc_property_802_1X_get_client_cert_full, nmc_property_802_1X_set_client_cert, NULL, nmc_property_802_1X_describe_client_cert, NULL, NULL); - nmc_add_prop_funcs (GLUE (802_1X, CLIENT_CERT_PASSWORD), + nmc_add_prop_funcs (NM_SETTING_802_1X_SETTING_NAME""NM_SETTING_802_1X_CLIENT_CERT_PASSWORD, nmc_property_802_1X_get_client_cert_password, nmc_property_set_string, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (802_1X, CLIENT_CERT_PASSWORD_FLAGS), + nmc_add_prop_funcs (NM_SETTING_802_1X_SETTING_NAME""NM_SETTING_802_1X_CLIENT_CERT_PASSWORD_FLAGS, nmc_property_802_1X_get_client_cert_password_flags, nmc_property_set_secret_flags, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (802_1X, PHASE1_PEAPVER), + nmc_add_prop_funcs (NM_SETTING_802_1X_SETTING_NAME""NM_SETTING_802_1X_PHASE1_PEAPVER, nmc_property_802_1X_get_phase1_peapver, nmc_property_802_1X_set_phase1_peapver, NULL, NULL, nmc_property_802_1X_allowed_phase1_peapver, NULL); - nmc_add_prop_funcs (GLUE (802_1X, PHASE1_PEAPLABEL), + nmc_add_prop_funcs (NM_SETTING_802_1X_SETTING_NAME""NM_SETTING_802_1X_PHASE1_PEAPLABEL, nmc_property_802_1X_get_phase1_peaplabel, nmc_property_802_1X_set_phase1_peaplabel, NULL, NULL, nmc_property_802_1X_allowed_phase1_peaplabel, NULL); - nmc_add_prop_funcs (GLUE (802_1X, PHASE1_FAST_PROVISIONING), + nmc_add_prop_funcs (NM_SETTING_802_1X_SETTING_NAME""NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING, nmc_property_802_1X_get_phase1_fast_provisioning, nmc_property_802_1X_set_phase1_fast_provisioning, NULL, NULL, nmc_property_802_1X_allowed_phase1_fast_provisioning, NULL); - nmc_add_prop_funcs (GLUE (802_1X, PHASE1_AUTH_FLAGS), + nmc_add_prop_funcs (NM_SETTING_802_1X_SETTING_NAME""NM_SETTING_802_1X_PHASE1_AUTH_FLAGS, nmc_property_802_1X_get_phase1_auth_flags, nmc_property_802_1X_set_phase1_auth_flags, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (802_1X, PHASE2_AUTH), + nmc_add_prop_funcs (NM_SETTING_802_1X_SETTING_NAME""NM_SETTING_802_1X_PHASE2_AUTH, nmc_property_802_1X_get_phase2_auth, nmc_property_802_1X_set_phase2_auth, NULL, NULL, nmc_property_802_1X_allowed_phase2_auth, NULL); - nmc_add_prop_funcs (GLUE (802_1X, PHASE2_AUTHEAP), + nmc_add_prop_funcs (NM_SETTING_802_1X_SETTING_NAME""NM_SETTING_802_1X_PHASE2_AUTHEAP, nmc_property_802_1X_get_phase2_autheap, nmc_property_802_1X_set_phase2_autheap, NULL, NULL, nmc_property_802_1X_allowed_phase2_autheap, NULL); - nmc_add_prop_funcs (GLUE (802_1X, PHASE2_CA_CERT), + nmc_add_prop_funcs (NM_SETTING_802_1X_SETTING_NAME""NM_SETTING_802_1X_PHASE2_CA_CERT, nmc_property_802_1X_get_phase2_ca_cert, nmc_property_802_1X_set_phase2_ca_cert, NULL, nmc_property_802_1X_describe_phase2_ca_cert, NULL, NULL); - nmc_add_prop_funcs (GLUE (802_1X, PHASE2_CA_CERT_PASSWORD), + nmc_add_prop_funcs (NM_SETTING_802_1X_SETTING_NAME""NM_SETTING_802_1X_PHASE2_CA_CERT_PASSWORD, nmc_property_802_1X_get_phase2_ca_cert_password, nmc_property_set_string, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (802_1X, PHASE2_CA_CERT_PASSWORD_FLAGS), + nmc_add_prop_funcs (NM_SETTING_802_1X_SETTING_NAME""NM_SETTING_802_1X_PHASE2_CA_CERT_PASSWORD_FLAGS, nmc_property_802_1X_get_phase2_ca_cert_password_flags, nmc_property_set_secret_flags, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (802_1X, PHASE2_CA_PATH), + nmc_add_prop_funcs (NM_SETTING_802_1X_SETTING_NAME""NM_SETTING_802_1X_PHASE2_CA_PATH, nmc_property_802_1X_get_phase2_ca_path, nmc_property_set_string, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (802_1X, PHASE2_SUBJECT_MATCH), + nmc_add_prop_funcs (NM_SETTING_802_1X_SETTING_NAME""NM_SETTING_802_1X_PHASE2_SUBJECT_MATCH, nmc_property_802_1X_get_phase2_subject_match, nmc_property_set_string, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (802_1X, PHASE2_ALTSUBJECT_MATCHES), + nmc_add_prop_funcs (NM_SETTING_802_1X_SETTING_NAME""NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES, nmc_property_802_1X_get_phase2_altsubject_matches, nmc_property_802_1X_set_phase2_altsubject_matches, nmc_property_802_1X_remove_phase2_altsubject_matches, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (802_1X, PHASE2_DOMAIN_SUFFIX_MATCH), + nmc_add_prop_funcs (NM_SETTING_802_1X_SETTING_NAME""NM_SETTING_802_1X_PHASE2_DOMAIN_SUFFIX_MATCH, nmc_property_802_1X_get_phase2_domain_suffix_match, nmc_property_set_string, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (802_1X, PHASE2_CLIENT_CERT), + nmc_add_prop_funcs (NM_SETTING_802_1X_SETTING_NAME""NM_SETTING_802_1X_PHASE2_CLIENT_CERT, nmc_property_802_1X_get_phase2_client_cert_full, nmc_property_802_1X_set_phase2_client_cert, NULL, nmc_property_802_1X_describe_phase2_client_cert, NULL, NULL); - nmc_add_prop_funcs (GLUE (802_1X, PHASE2_CLIENT_CERT_PASSWORD), + nmc_add_prop_funcs (NM_SETTING_802_1X_SETTING_NAME""NM_SETTING_802_1X_PHASE2_CLIENT_CERT_PASSWORD, nmc_property_802_1X_get_phase2_client_cert_password, nmc_property_set_string, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (802_1X, PHASE2_CLIENT_CERT_PASSWORD_FLAGS), + nmc_add_prop_funcs (NM_SETTING_802_1X_SETTING_NAME""NM_SETTING_802_1X_PHASE2_CLIENT_CERT_PASSWORD_FLAGS, nmc_property_802_1X_get_phase2_client_cert_password_flags, nmc_property_set_secret_flags, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (802_1X, PASSWORD), + nmc_add_prop_funcs (NM_SETTING_802_1X_SETTING_NAME""NM_SETTING_802_1X_PASSWORD, nmc_property_802_1X_get_password, nmc_property_set_string, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (802_1X, PASSWORD_FLAGS), + nmc_add_prop_funcs (NM_SETTING_802_1X_SETTING_NAME""NM_SETTING_802_1X_PASSWORD_FLAGS, nmc_property_802_1X_get_password_flags, nmc_property_set_secret_flags, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (802_1X, PASSWORD_RAW), + nmc_add_prop_funcs (NM_SETTING_802_1X_SETTING_NAME""NM_SETTING_802_1X_PASSWORD_RAW, nmc_property_802_1X_get_password_raw, nmc_property_802_1X_set_password_raw, NULL, nmc_property_802_1X_describe_password_raw, NULL, NULL); - nmc_add_prop_funcs (GLUE (802_1X, PASSWORD_RAW_FLAGS), + nmc_add_prop_funcs (NM_SETTING_802_1X_SETTING_NAME""NM_SETTING_802_1X_PASSWORD_RAW_FLAGS, nmc_property_802_1X_get_password_raw_flags, nmc_property_set_secret_flags, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (802_1X, PRIVATE_KEY), + nmc_add_prop_funcs (NM_SETTING_802_1X_SETTING_NAME""NM_SETTING_802_1X_PRIVATE_KEY, nmc_property_802_1X_get_private_key_full, nmc_property_802_1X_set_private_key, NULL, nmc_property_802_1X_describe_private_key, NULL, NULL); - nmc_add_prop_funcs (GLUE (802_1X, PRIVATE_KEY_PASSWORD), + nmc_add_prop_funcs (NM_SETTING_802_1X_SETTING_NAME""NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD, nmc_property_802_1X_get_private_key_password, nmc_property_set_string, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (802_1X, PRIVATE_KEY_PASSWORD_FLAGS), + nmc_add_prop_funcs (NM_SETTING_802_1X_SETTING_NAME""NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS, nmc_property_802_1X_get_private_key_password_flags, nmc_property_set_secret_flags, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (802_1X, PHASE2_PRIVATE_KEY), + nmc_add_prop_funcs (NM_SETTING_802_1X_SETTING_NAME""NM_SETTING_802_1X_PHASE2_PRIVATE_KEY, nmc_property_802_1X_get_phase2_private_key_full, nmc_property_802_1X_set_phase2_private_key, NULL, nmc_property_802_1X_describe_private_key, NULL, NULL); - nmc_add_prop_funcs (GLUE (802_1X, PHASE2_PRIVATE_KEY_PASSWORD), + nmc_add_prop_funcs (NM_SETTING_802_1X_SETTING_NAME""NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD, nmc_property_802_1X_get_phase2_private_key_password, nmc_property_set_string, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (802_1X, PHASE2_PRIVATE_KEY_PASSWORD_FLAGS), + nmc_add_prop_funcs (NM_SETTING_802_1X_SETTING_NAME""NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS, nmc_property_802_1X_get_phase2_private_key_password_flags, nmc_property_set_secret_flags, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (802_1X, PIN), + nmc_add_prop_funcs (NM_SETTING_802_1X_SETTING_NAME""NM_SETTING_802_1X_PIN, nmc_property_802_1X_get_pin, nmc_property_set_string, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (802_1X, PIN_FLAGS), + nmc_add_prop_funcs (NM_SETTING_802_1X_SETTING_NAME""NM_SETTING_802_1X_PIN_FLAGS, nmc_property_802_1X_get_pin_flags, nmc_property_set_secret_flags, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (802_1X, SYSTEM_CA_CERTS), + nmc_add_prop_funcs (NM_SETTING_802_1X_SETTING_NAME""NM_SETTING_802_1X_SYSTEM_CA_CERTS, nmc_property_802_1X_get_system_ca_certs, nmc_property_set_bool, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (802_1X, AUTH_TIMEOUT), + nmc_add_prop_funcs (NM_SETTING_802_1X_SETTING_NAME""NM_SETTING_802_1X_AUTH_TIMEOUT, nmc_property_802_1X_get_auth_timeout, nmc_property_set_int, NULL, @@ -6686,49 +6682,49 @@ nmc_properties_init (void) NULL); /* Add editable properties for NM_SETTING_ADSL_SETTING_NAME */ - nmc_add_prop_funcs (GLUE (ADSL, USERNAME), + nmc_add_prop_funcs (NM_SETTING_ADSL_SETTING_NAME""NM_SETTING_ADSL_USERNAME, nmc_property_adsl_get_username, nmc_property_set_string, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (ADSL, PASSWORD), + nmc_add_prop_funcs (NM_SETTING_ADSL_SETTING_NAME""NM_SETTING_ADSL_PASSWORD, nmc_property_adsl_get_password, nmc_property_set_string, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (ADSL, PASSWORD_FLAGS), + nmc_add_prop_funcs (NM_SETTING_ADSL_SETTING_NAME""NM_SETTING_ADSL_PASSWORD_FLAGS, nmc_property_adsl_get_password_flags, nmc_property_set_secret_flags, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (ADSL, PROTOCOL), + nmc_add_prop_funcs (NM_SETTING_ADSL_SETTING_NAME""NM_SETTING_ADSL_PROTOCOL, nmc_property_adsl_get_protocol, nmc_property_adsl_set_protocol, NULL, NULL, nmc_property_adsl_allowed_protocol, NULL); - nmc_add_prop_funcs (GLUE (ADSL, ENCAPSULATION), + nmc_add_prop_funcs (NM_SETTING_ADSL_SETTING_NAME""NM_SETTING_ADSL_ENCAPSULATION, nmc_property_adsl_get_encapsulation, nmc_property_adsl_set_encapsulation, NULL, NULL, nmc_property_adsl_allowed_encapsulation, NULL); - nmc_add_prop_funcs (GLUE (ADSL, VPI), + nmc_add_prop_funcs (NM_SETTING_ADSL_SETTING_NAME""NM_SETTING_ADSL_VPI, nmc_property_adsl_get_vpi, nmc_property_set_uint, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (ADSL, VCI), + nmc_add_prop_funcs (NM_SETTING_ADSL_SETTING_NAME""NM_SETTING_ADSL_VCI, nmc_property_adsl_get_vci, nmc_property_set_uint, NULL, @@ -6737,14 +6733,14 @@ nmc_properties_init (void) NULL); /* Add editable properties for NM_SETTING_BLUETOOTH_SETTING_NAME */ - nmc_add_prop_funcs (GLUE (BLUETOOTH, BDADDR), + nmc_add_prop_funcs (NM_SETTING_BLUETOOTH_SETTING_NAME""NM_SETTING_BLUETOOTH_BDADDR, nmc_property_bluetooth_get_bdaddr, nmc_property_set_mac, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (BLUETOOTH, TYPE), + nmc_add_prop_funcs (NM_SETTING_BLUETOOTH_SETTING_NAME""NM_SETTING_BLUETOOTH_TYPE, nmc_property_bluetooth_get_type, nmc_property_bluetooth_set_type, NULL, @@ -6753,7 +6749,7 @@ nmc_properties_init (void) NULL); /* Add editable properties for NM_SETTING_BOND_SETTING_NAME */ - nmc_add_prop_funcs (GLUE (BOND, OPTIONS), + nmc_add_prop_funcs (NM_SETTING_BOND_SETTING_NAME""NM_SETTING_BOND_OPTIONS, nmc_property_bond_get_options, nmc_property_bond_set_options, nmc_property_bond_remove_option_options, @@ -6762,49 +6758,49 @@ nmc_properties_init (void) NULL); /* Add editable properties for NM_SETTING_BRIDGE_SETTING_NAME */ - nmc_add_prop_funcs (GLUE (BRIDGE, MAC_ADDRESS), + nmc_add_prop_funcs (NM_SETTING_BRIDGE_SETTING_NAME""NM_SETTING_BRIDGE_MAC_ADDRESS, nmc_property_bridge_get_mac_address, nmc_property_set_mac, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (BRIDGE, STP), + nmc_add_prop_funcs (NM_SETTING_BRIDGE_SETTING_NAME""NM_SETTING_BRIDGE_STP, nmc_property_bridge_get_stp, nmc_property_set_bool, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (BRIDGE, PRIORITY), + nmc_add_prop_funcs (NM_SETTING_BRIDGE_SETTING_NAME""NM_SETTING_BRIDGE_PRIORITY, nmc_property_bridge_get_priority, nmc_property_set_uint, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (BRIDGE, FORWARD_DELAY), + nmc_add_prop_funcs (NM_SETTING_BRIDGE_SETTING_NAME""NM_SETTING_BRIDGE_FORWARD_DELAY, nmc_property_bridge_get_forward_delay, nmc_property_set_uint, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (BRIDGE, HELLO_TIME), + nmc_add_prop_funcs (NM_SETTING_BRIDGE_SETTING_NAME""NM_SETTING_BRIDGE_HELLO_TIME, nmc_property_bridge_get_hello_time, nmc_property_set_uint, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (BRIDGE, MAX_AGE), + nmc_add_prop_funcs (NM_SETTING_BRIDGE_SETTING_NAME""NM_SETTING_BRIDGE_MAX_AGE, nmc_property_bridge_get_max_age, nmc_property_set_uint, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (BRIDGE, AGEING_TIME), + nmc_add_prop_funcs (NM_SETTING_BRIDGE_SETTING_NAME""NM_SETTING_BRIDGE_AGEING_TIME, nmc_property_bridge_get_ageing_time, nmc_property_set_uint, NULL, @@ -6812,7 +6808,7 @@ nmc_properties_init (void) NULL, NULL); - nmc_add_prop_funcs (GLUE (BRIDGE, MULTICAST_SNOOPING), + nmc_add_prop_funcs (NM_SETTING_BRIDGE_SETTING_NAME""NM_SETTING_BRIDGE_MULTICAST_SNOOPING, nmc_property_bridge_get_multicast_snooping, nmc_property_set_bool, NULL, @@ -6821,21 +6817,21 @@ nmc_properties_init (void) NULL); /* Add editable properties for NM_SETTING_BRIDGE_PORT_SETTING_NAME */ - nmc_add_prop_funcs (GLUE (BRIDGE_PORT, PRIORITY), + nmc_add_prop_funcs (NM_SETTING_BRIDGE_PORT_SETTING_NAME""NM_SETTING_BRIDGE_PORT_PRIORITY, nmc_property_bridge_port_get_priority, nmc_property_set_uint, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (BRIDGE_PORT, PATH_COST), + nmc_add_prop_funcs (NM_SETTING_BRIDGE_PORT_SETTING_NAME""NM_SETTING_BRIDGE_PORT_PATH_COST, nmc_property_bridge_port_get_path_cost, nmc_property_set_uint, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (BRIDGE_PORT, HAIRPIN_MODE), + nmc_add_prop_funcs (NM_SETTING_BRIDGE_PORT_SETTING_NAME""NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE, nmc_property_bridge_port_get_hairpin_mode, nmc_property_set_bool, NULL, @@ -6844,35 +6840,35 @@ nmc_properties_init (void) NULL); /* Add editable properties for NM_SETTING_CDMA_SETTING_NAME */ - nmc_add_prop_funcs (GLUE (CDMA, NUMBER), + nmc_add_prop_funcs (NM_SETTING_CDMA_SETTING_NAME""NM_SETTING_CDMA_NUMBER, nmc_property_cdma_get_number, nmc_property_set_string, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (CDMA, USERNAME), + nmc_add_prop_funcs (NM_SETTING_CDMA_SETTING_NAME""NM_SETTING_CDMA_USERNAME, nmc_property_cdma_get_username, nmc_property_set_string, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (CDMA, PASSWORD), + nmc_add_prop_funcs (NM_SETTING_CDMA_SETTING_NAME""NM_SETTING_CDMA_PASSWORD, nmc_property_cdma_get_password, nmc_property_set_string, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (CDMA, PASSWORD_FLAGS), + nmc_add_prop_funcs (NM_SETTING_CDMA_SETTING_NAME""NM_SETTING_CDMA_PASSWORD_FLAGS, nmc_property_cdma_get_password_flags, nmc_property_set_secret_flags, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (CDMA, MTU), + nmc_add_prop_funcs (NM_SETTING_CDMA_SETTING_NAME""NM_SETTING_CDMA_MTU, nmc_property_cdma_get_mtu, nmc_property_set_uint, NULL, @@ -6881,105 +6877,105 @@ nmc_properties_init (void) NULL); /* Add editable properties for NM_SETTING_DCB_SETTING_NAME */ - nmc_add_prop_funcs (GLUE (DCB, APP_FCOE_FLAGS), + nmc_add_prop_funcs (NM_SETTING_DCB_SETTING_NAME""NM_SETTING_DCB_APP_FCOE_FLAGS, nmc_property_dcb_get_app_fcoe_flags, nmc_property_dcb_set_flags, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (DCB, APP_FCOE_MODE), + nmc_add_prop_funcs (NM_SETTING_DCB_SETTING_NAME""NM_SETTING_DCB_APP_FCOE_MODE, nmc_property_dcb_get_app_fcoe_mode, nmc_property_dcb_set_app_fcoe_mode, NULL, NULL, nmc_property_dcb_allowed_app_fcoe_modes, NULL); - nmc_add_prop_funcs (GLUE (DCB, APP_FCOE_PRIORITY), + nmc_add_prop_funcs (NM_SETTING_DCB_SETTING_NAME""NM_SETTING_DCB_APP_FCOE_PRIORITY, nmc_property_dcb_get_app_fcoe_priority, nmc_property_dcb_set_priority, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (DCB, APP_ISCSI_FLAGS), + nmc_add_prop_funcs (NM_SETTING_DCB_SETTING_NAME""NM_SETTING_DCB_APP_ISCSI_FLAGS, nmc_property_dcb_get_app_iscsi_flags, nmc_property_dcb_set_flags, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (DCB, APP_ISCSI_PRIORITY), + nmc_add_prop_funcs (NM_SETTING_DCB_SETTING_NAME""NM_SETTING_DCB_APP_ISCSI_PRIORITY, nmc_property_dcb_get_app_iscsi_priority, nmc_property_dcb_set_priority, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (DCB, APP_FIP_FLAGS), + nmc_add_prop_funcs (NM_SETTING_DCB_SETTING_NAME""NM_SETTING_DCB_APP_FIP_FLAGS, nmc_property_dcb_get_app_fip_flags, nmc_property_dcb_set_flags, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (DCB, APP_FIP_PRIORITY), + nmc_add_prop_funcs (NM_SETTING_DCB_SETTING_NAME""NM_SETTING_DCB_APP_FIP_PRIORITY, nmc_property_dcb_get_app_fip_priority, nmc_property_dcb_set_priority, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (DCB, PRIORITY_FLOW_CONTROL_FLAGS), + nmc_add_prop_funcs (NM_SETTING_DCB_SETTING_NAME""NM_SETTING_DCB_PRIORITY_FLOW_CONTROL_FLAGS, nmc_property_dcb_get_pfc_flags, nmc_property_dcb_set_flags, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (DCB, PRIORITY_FLOW_CONTROL), + nmc_add_prop_funcs (NM_SETTING_DCB_SETTING_NAME""NM_SETTING_DCB_PRIORITY_FLOW_CONTROL, nmc_property_dcb_get_pfc, nmc_property_dcb_set_pfc, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (DCB, PRIORITY_GROUP_FLAGS), + nmc_add_prop_funcs (NM_SETTING_DCB_SETTING_NAME""NM_SETTING_DCB_PRIORITY_GROUP_FLAGS, nmc_property_dcb_get_pg_flags, nmc_property_dcb_set_flags, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (DCB, PRIORITY_GROUP_ID), + nmc_add_prop_funcs (NM_SETTING_DCB_SETTING_NAME""NM_SETTING_DCB_PRIORITY_GROUP_ID, nmc_property_dcb_get_pg_group_id, nmc_property_dcb_set_pg_group_id, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (DCB, PRIORITY_GROUP_BANDWIDTH), + nmc_add_prop_funcs (NM_SETTING_DCB_SETTING_NAME""NM_SETTING_DCB_PRIORITY_GROUP_BANDWIDTH, nmc_property_dcb_get_pg_group_bandwidth, nmc_property_dcb_set_pg_group_bandwidth, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (DCB, PRIORITY_BANDWIDTH), + nmc_add_prop_funcs (NM_SETTING_DCB_SETTING_NAME""NM_SETTING_DCB_PRIORITY_BANDWIDTH, nmc_property_dcb_get_pg_bandwidth, nmc_property_dcb_set_pg_bandwidth, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (DCB, PRIORITY_STRICT_BANDWIDTH), + nmc_add_prop_funcs (NM_SETTING_DCB_SETTING_NAME""NM_SETTING_DCB_PRIORITY_STRICT_BANDWIDTH, nmc_property_dcb_get_pg_strict, nmc_property_dcb_set_pg_strict, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (DCB, PRIORITY_TRAFFIC_CLASS), + nmc_add_prop_funcs (NM_SETTING_DCB_SETTING_NAME""NM_SETTING_DCB_PRIORITY_TRAFFIC_CLASS, nmc_property_dcb_get_pg_traffic_class, nmc_property_dcb_set_pg_traffic_class, NULL, @@ -6988,91 +6984,91 @@ nmc_properties_init (void) NULL); /* Add editable properties for NM_SETTING_GSM_SETTING_NAME */ - nmc_add_prop_funcs (GLUE (GSM, NUMBER), + nmc_add_prop_funcs (NM_SETTING_GSM_SETTING_NAME""NM_SETTING_GSM_NUMBER, nmc_property_gsm_get_number, nmc_property_set_string, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (GSM, USERNAME), + nmc_add_prop_funcs (NM_SETTING_GSM_SETTING_NAME""NM_SETTING_GSM_USERNAME, nmc_property_gsm_get_username, nmc_property_set_string, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (GSM, PASSWORD), + nmc_add_prop_funcs (NM_SETTING_GSM_SETTING_NAME""NM_SETTING_GSM_PASSWORD, nmc_property_gsm_get_password, nmc_property_set_string, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (GSM, PASSWORD_FLAGS), + nmc_add_prop_funcs (NM_SETTING_GSM_SETTING_NAME""NM_SETTING_GSM_PASSWORD_FLAGS, nmc_property_gsm_get_password_flags, nmc_property_set_secret_flags, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (GSM, APN), + nmc_add_prop_funcs (NM_SETTING_GSM_SETTING_NAME""NM_SETTING_GSM_APN, nmc_property_gsm_get_apn, nmc_property_set_string, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (GSM, NETWORK_ID), + nmc_add_prop_funcs (NM_SETTING_GSM_SETTING_NAME""NM_SETTING_GSM_NETWORK_ID, nmc_property_gsm_get_network_id, nmc_property_set_string, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (GSM, PIN), + nmc_add_prop_funcs (NM_SETTING_GSM_SETTING_NAME""NM_SETTING_GSM_PIN, nmc_property_gsm_get_pin, nmc_property_set_string, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (GSM, PIN_FLAGS), + nmc_add_prop_funcs (NM_SETTING_GSM_SETTING_NAME""NM_SETTING_GSM_PIN_FLAGS, nmc_property_gsm_get_pin_flags, nmc_property_set_secret_flags, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (GSM, HOME_ONLY), + nmc_add_prop_funcs (NM_SETTING_GSM_SETTING_NAME""NM_SETTING_GSM_HOME_ONLY, nmc_property_gsm_get_home_only, nmc_property_set_bool, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (GSM, DEVICE_ID), + nmc_add_prop_funcs (NM_SETTING_GSM_SETTING_NAME""NM_SETTING_GSM_DEVICE_ID, nmc_property_gsm_get_device_id, nmc_property_set_string, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (GSM, SIM_ID), + nmc_add_prop_funcs (NM_SETTING_GSM_SETTING_NAME""NM_SETTING_GSM_SIM_ID, nmc_property_gsm_get_sim_id, nmc_property_set_string, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (GSM, SIM_OPERATOR_ID), + nmc_add_prop_funcs (NM_SETTING_GSM_SETTING_NAME""NM_SETTING_GSM_SIM_OPERATOR_ID, nmc_property_gsm_get_sim_operator_id, nmc_property_gsm_set_sim_operator_id, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (GSM, MTU), + nmc_add_prop_funcs (NM_SETTING_GSM_SETTING_NAME""NM_SETTING_GSM_MTU, nmc_property_gsm_get_mtu, nmc_property_set_uint, NULL, @@ -7081,35 +7077,35 @@ nmc_properties_init (void) NULL); /* Add editable properties for NM_SETTING_INFINIBAND_SETTING_NAME */ - nmc_add_prop_funcs (GLUE (INFINIBAND, MAC_ADDRESS), + nmc_add_prop_funcs (NM_SETTING_INFINIBAND_SETTING_NAME""NM_SETTING_INFINIBAND_MAC_ADDRESS, nmc_property_ib_get_mac_address, nmc_property_ib_set_mac, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (INFINIBAND, MTU), + nmc_add_prop_funcs (NM_SETTING_INFINIBAND_SETTING_NAME""NM_SETTING_INFINIBAND_MTU, nmc_property_ib_get_mtu, nmc_property_set_mtu, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (INFINIBAND, TRANSPORT_MODE), + nmc_add_prop_funcs (NM_SETTING_INFINIBAND_SETTING_NAME""NM_SETTING_INFINIBAND_TRANSPORT_MODE, nmc_property_ib_get_transport_mode, nmc_property_ib_set_transport_mode, NULL, NULL, nmc_property_ib_allowed_transport_mode, NULL); - nmc_add_prop_funcs (GLUE (INFINIBAND, P_KEY), + nmc_add_prop_funcs (NM_SETTING_INFINIBAND_SETTING_NAME""NM_SETTING_INFINIBAND_P_KEY, nmc_property_ib_get_p_key, nmc_property_ib_set_p_key, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (INFINIBAND, PARENT), + nmc_add_prop_funcs (NM_SETTING_INFINIBAND_SETTING_NAME""NM_SETTING_INFINIBAND_PARENT, nmc_property_ib_get_parent, nmc_property_set_ifname, NULL, @@ -7118,133 +7114,133 @@ nmc_properties_init (void) NULL); /* Add editable properties for NM_SETTING_IP4_CONFIG_SETTING_NAME */ - nmc_add_prop_funcs (GLUE_IP (4, METHOD), + nmc_add_prop_funcs (NM_SETTING_IP4_CONFIG_SETTING_NAME""NM_SETTING_IP_CONFIG_METHOD, nmc_property_ipv4_get_method, nmc_property_ipv4_set_method, NULL, NULL, nmc_property_ipv4_allowed_method, NULL); - nmc_add_prop_funcs (GLUE_IP (4, DNS), + nmc_add_prop_funcs (NM_SETTING_IP4_CONFIG_SETTING_NAME""NM_SETTING_IP_CONFIG_DNS, nmc_property_ipv4_get_dns, nmc_property_ipv4_set_dns, nmc_property_ipv4_remove_dns, nmc_property_ipv4_describe_dns, NULL, NULL); - nmc_add_prop_funcs (GLUE_IP (4, DNS_SEARCH), + nmc_add_prop_funcs (NM_SETTING_IP4_CONFIG_SETTING_NAME""NM_SETTING_IP_CONFIG_DNS_SEARCH, nmc_property_ipv4_get_dns_search, nmc_property_ipv4_set_dns_search, nmc_property_ipv4_remove_dns_search, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE_IP (4, DNS_OPTIONS), + nmc_add_prop_funcs (NM_SETTING_IP4_CONFIG_SETTING_NAME""NM_SETTING_IP_CONFIG_DNS_OPTIONS, nmc_property_ipv4_get_dns_options, nmc_property_ipv4_set_dns_options, nmc_property_ipv4_remove_dns_option, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE_IP (4, DNS_PRIORITY), + nmc_add_prop_funcs (NM_SETTING_IP4_CONFIG_SETTING_NAME""NM_SETTING_IP_CONFIG_DNS_PRIORITY, nmc_property_ipv4_get_dns_priority, nmc_property_set_int, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE_IP (4, ADDRESSES), + nmc_add_prop_funcs (NM_SETTING_IP4_CONFIG_SETTING_NAME""NM_SETTING_IP_CONFIG_ADDRESSES, nmc_property_ip_get_addresses, nmc_property_ipv4_set_addresses, nmc_property_ipv4_remove_addresses, nmc_property_ipv4_describe_addresses, NULL, NULL); - nmc_add_prop_funcs (GLUE_IP (4, GATEWAY), + nmc_add_prop_funcs (NM_SETTING_IP4_CONFIG_SETTING_NAME""NM_SETTING_IP_CONFIG_GATEWAY, nmc_property_ipv4_get_gateway, nmc_property_ipv4_set_gateway, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE_IP (4, ROUTES), + nmc_add_prop_funcs (NM_SETTING_IP4_CONFIG_SETTING_NAME""NM_SETTING_IP_CONFIG_ROUTES, nmc_property_ipv4_get_routes, nmc_property_ipv4_set_routes, nmc_property_ipv4_remove_routes, nmc_property_ipv4_describe_routes, NULL, NULL); - nmc_add_prop_funcs (GLUE_IP (4, ROUTE_METRIC), + nmc_add_prop_funcs (NM_SETTING_IP4_CONFIG_SETTING_NAME""NM_SETTING_IP_CONFIG_ROUTE_METRIC, nmc_property_ipv4_get_route_metric, nmc_property_set_int64, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE_IP (4, IGNORE_AUTO_ROUTES), + nmc_add_prop_funcs (NM_SETTING_IP4_CONFIG_SETTING_NAME""NM_SETTING_IP_CONFIG_IGNORE_AUTO_ROUTES, nmc_property_ipv4_get_ignore_auto_routes, nmc_property_set_bool, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE_IP (4, IGNORE_AUTO_DNS), + nmc_add_prop_funcs (NM_SETTING_IP4_CONFIG_SETTING_NAME""NM_SETTING_IP_CONFIG_IGNORE_AUTO_DNS, nmc_property_ipv4_get_ignore_auto_dns, nmc_property_set_bool, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (IP4_CONFIG, DHCP_CLIENT_ID), + nmc_add_prop_funcs (NM_SETTING_IP4_CONFIG_SETTING_NAME""NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID, nmc_property_ipv4_get_dhcp_client_id, nmc_property_set_string, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE_IP (4, DHCP_TIMEOUT), + nmc_add_prop_funcs (NM_SETTING_IP4_CONFIG_SETTING_NAME""NM_SETTING_IP_CONFIG_DHCP_TIMEOUT, nmc_property_ipv4_get_dhcp_timeout, nmc_property_set_int, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE_IP (4, DHCP_SEND_HOSTNAME), + nmc_add_prop_funcs (NM_SETTING_IP4_CONFIG_SETTING_NAME""NM_SETTING_IP_CONFIG_DHCP_SEND_HOSTNAME, nmc_property_ipv4_get_dhcp_send_hostname, nmc_property_set_bool, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE_IP (4, DHCP_HOSTNAME), + nmc_add_prop_funcs (NM_SETTING_IP4_CONFIG_SETTING_NAME""NM_SETTING_IP_CONFIG_DHCP_HOSTNAME, nmc_property_ipv4_get_dhcp_hostname, nmc_property_set_string, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (IP4_CONFIG, DHCP_FQDN), + nmc_add_prop_funcs (NM_SETTING_IP4_CONFIG_SETTING_NAME""NM_SETTING_IP4_CONFIG_DHCP_FQDN, nmc_property_ipv4_get_dhcp_fqdn, nmc_property_set_string, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE_IP (4, NEVER_DEFAULT), + nmc_add_prop_funcs (NM_SETTING_IP4_CONFIG_SETTING_NAME""NM_SETTING_IP_CONFIG_NEVER_DEFAULT, nmc_property_ipv4_get_never_default, nmc_property_set_bool, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE_IP (4, MAY_FAIL), + nmc_add_prop_funcs (NM_SETTING_IP4_CONFIG_SETTING_NAME""NM_SETTING_IP_CONFIG_MAY_FAIL, nmc_property_ipv4_get_may_fail, nmc_property_set_bool, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE_IP (4, DAD_TIMEOUT), + nmc_add_prop_funcs (NM_SETTING_IP4_CONFIG_SETTING_NAME""NM_SETTING_IP_CONFIG_DAD_TIMEOUT, nmc_property_ipv4_get_dad_timeout, nmc_property_set_int, NULL, @@ -7253,126 +7249,126 @@ nmc_properties_init (void) NULL); /* Add editable properties for NM_SETTING_IP6_CONFIG_SETTING_NAME */ - nmc_add_prop_funcs (GLUE_IP (6, METHOD), + nmc_add_prop_funcs (NM_SETTING_IP6_CONFIG_SETTING_NAME""NM_SETTING_IP_CONFIG_METHOD, nmc_property_ipv6_get_method, nmc_property_ipv6_set_method, NULL, NULL, nmc_property_ipv6_allowed_method, NULL); - nmc_add_prop_funcs (GLUE_IP (6, DNS), + nmc_add_prop_funcs (NM_SETTING_IP6_CONFIG_SETTING_NAME""NM_SETTING_IP_CONFIG_DNS, nmc_property_ipv6_get_dns, nmc_property_ipv6_set_dns, nmc_property_ipv6_remove_dns, nmc_property_ipv6_describe_dns, NULL, NULL); - nmc_add_prop_funcs (GLUE_IP (6, DNS_SEARCH), + nmc_add_prop_funcs (NM_SETTING_IP6_CONFIG_SETTING_NAME""NM_SETTING_IP_CONFIG_DNS_SEARCH, nmc_property_ipv6_get_dns_search, nmc_property_ipv6_set_dns_search, nmc_property_ipv6_remove_dns_search, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE_IP (6, DNS_OPTIONS), + nmc_add_prop_funcs (NM_SETTING_IP6_CONFIG_SETTING_NAME""NM_SETTING_IP_CONFIG_DNS_OPTIONS, nmc_property_ipv6_get_dns_options, nmc_property_ipv6_set_dns_options, nmc_property_ipv6_remove_dns_option, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE_IP (6, DNS_PRIORITY), + nmc_add_prop_funcs (NM_SETTING_IP6_CONFIG_SETTING_NAME""NM_SETTING_IP_CONFIG_DNS_PRIORITY, nmc_property_ipv6_get_dns_priority, nmc_property_set_int, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE_IP (6, ADDRESSES), + nmc_add_prop_funcs (NM_SETTING_IP6_CONFIG_SETTING_NAME""NM_SETTING_IP_CONFIG_ADDRESSES, nmc_property_ip_get_addresses, nmc_property_ipv6_set_addresses, nmc_property_ipv6_remove_addresses, nmc_property_ipv6_describe_addresses, NULL, NULL); - nmc_add_prop_funcs (GLUE_IP (6, GATEWAY), + nmc_add_prop_funcs (NM_SETTING_IP6_CONFIG_SETTING_NAME""NM_SETTING_IP_CONFIG_GATEWAY, nmc_property_ipv6_get_gateway, nmc_property_ipv6_set_gateway, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE_IP (6, ROUTES), + nmc_add_prop_funcs (NM_SETTING_IP6_CONFIG_SETTING_NAME""NM_SETTING_IP_CONFIG_ROUTES, nmc_property_ipv6_get_routes, nmc_property_ipv6_set_routes, nmc_property_ipv6_remove_routes, nmc_property_ipv6_describe_routes, NULL, NULL); - nmc_add_prop_funcs (GLUE_IP (6, ROUTE_METRIC), + nmc_add_prop_funcs (NM_SETTING_IP6_CONFIG_SETTING_NAME""NM_SETTING_IP_CONFIG_ROUTE_METRIC, nmc_property_ipv6_get_route_metric, nmc_property_set_int64, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE_IP (6, IGNORE_AUTO_ROUTES), + nmc_add_prop_funcs (NM_SETTING_IP6_CONFIG_SETTING_NAME""NM_SETTING_IP_CONFIG_IGNORE_AUTO_ROUTES, nmc_property_ipv6_get_ignore_auto_routes, nmc_property_set_bool, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE_IP (6, IGNORE_AUTO_DNS), + nmc_add_prop_funcs (NM_SETTING_IP6_CONFIG_SETTING_NAME""NM_SETTING_IP_CONFIG_IGNORE_AUTO_DNS, nmc_property_ipv6_get_ignore_auto_dns, nmc_property_set_bool, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE_IP (6, NEVER_DEFAULT), + nmc_add_prop_funcs (NM_SETTING_IP6_CONFIG_SETTING_NAME""NM_SETTING_IP_CONFIG_NEVER_DEFAULT, nmc_property_ipv6_get_never_default, nmc_property_set_bool, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE_IP (6, MAY_FAIL), + nmc_add_prop_funcs (NM_SETTING_IP6_CONFIG_SETTING_NAME""NM_SETTING_IP_CONFIG_MAY_FAIL, nmc_property_ipv6_get_may_fail, nmc_property_set_bool, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (IP6_CONFIG, IP6_PRIVACY), + nmc_add_prop_funcs (NM_SETTING_IP6_CONFIG_SETTING_NAME""NM_SETTING_IP6_CONFIG_IP6_PRIVACY, nmc_property_ipv6_get_ip6_privacy, nmc_property_ipv6_set_ip6_privacy, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (IP6_CONFIG, ADDR_GEN_MODE), + nmc_add_prop_funcs (NM_SETTING_IP6_CONFIG_SETTING_NAME""NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE, nmc_property_ipv6_get_addr_gen_mode, nmc_property_ipv6_set_addr_gen_mode, NULL, NULL, nmc_property_ipv6_allowed_addr_gen_mode, NULL); - nmc_add_prop_funcs (GLUE_IP (6, DHCP_SEND_HOSTNAME), + nmc_add_prop_funcs (NM_SETTING_IP6_CONFIG_SETTING_NAME""NM_SETTING_IP_CONFIG_DHCP_SEND_HOSTNAME, nmc_property_ipv6_get_dhcp_send_hostname, nmc_property_set_bool, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE_IP (6, DHCP_HOSTNAME), + nmc_add_prop_funcs (NM_SETTING_IP6_CONFIG_SETTING_NAME""NM_SETTING_IP_CONFIG_DHCP_HOSTNAME, nmc_property_ipv6_get_dhcp_hostname, nmc_property_set_string, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (IP6_CONFIG, TOKEN), + nmc_add_prop_funcs (NM_SETTING_IP6_CONFIG_SETTING_NAME""NM_SETTING_IP6_CONFIG_TOKEN, nmc_property_ipv6_get_token, nmc_property_set_string, NULL, @@ -7381,21 +7377,21 @@ nmc_properties_init (void) NULL); /* Add editable properties for NM_SETTING_OLPC_MESH_SETTING_NAME */ - nmc_add_prop_funcs (GLUE (OLPC_MESH, SSID), + nmc_add_prop_funcs (NM_SETTING_OLPC_MESH_SETTING_NAME""NM_SETTING_OLPC_MESH_SSID, nmc_property_olpc_get_ssid, nmc_property_set_ssid, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (OLPC_MESH, CHANNEL), + nmc_add_prop_funcs (NM_SETTING_OLPC_MESH_SETTING_NAME""NM_SETTING_OLPC_MESH_CHANNEL, nmc_property_olpc_get_channel, nmc_property_olpc_set_channel, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (OLPC_MESH, DHCP_ANYCAST_ADDRESS), + nmc_add_prop_funcs (NM_SETTING_OLPC_MESH_SETTING_NAME""NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS, nmc_property_olpc_get_anycast_address, nmc_property_set_mac, NULL, @@ -7404,126 +7400,126 @@ nmc_properties_init (void) NULL); /* Add editable properties for NM_SETTING_PPP_SETTING_NAME */ - nmc_add_prop_funcs (GLUE (PPP, NOAUTH), + nmc_add_prop_funcs (NM_SETTING_PPP_SETTING_NAME""NM_SETTING_PPP_NOAUTH, nmc_property_ppp_get_noauth, nmc_property_set_bool, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (PPP, REFUSE_EAP), + nmc_add_prop_funcs (NM_SETTING_PPP_SETTING_NAME""NM_SETTING_PPP_REFUSE_EAP, nmc_property_ppp_get_refuse_eap, nmc_property_set_bool, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (PPP, REFUSE_PAP), + nmc_add_prop_funcs (NM_SETTING_PPP_SETTING_NAME""NM_SETTING_PPP_REFUSE_PAP, nmc_property_ppp_get_refuse_pap, nmc_property_set_bool, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (PPP, REFUSE_CHAP), + nmc_add_prop_funcs (NM_SETTING_PPP_SETTING_NAME""NM_SETTING_PPP_REFUSE_CHAP, nmc_property_ppp_get_refuse_chap, nmc_property_set_bool, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (PPP, REFUSE_MSCHAP), + nmc_add_prop_funcs (NM_SETTING_PPP_SETTING_NAME""NM_SETTING_PPP_REFUSE_MSCHAP, nmc_property_ppp_get_refuse_mschap, nmc_property_set_bool, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (PPP, REFUSE_MSCHAPV2), + nmc_add_prop_funcs (NM_SETTING_PPP_SETTING_NAME""NM_SETTING_PPP_REFUSE_MSCHAPV2, nmc_property_ppp_get_refuse_mschapv2, nmc_property_set_bool, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (PPP, NOBSDCOMP), + nmc_add_prop_funcs (NM_SETTING_PPP_SETTING_NAME""NM_SETTING_PPP_NOBSDCOMP, nmc_property_ppp_get_nobsdcomp, nmc_property_set_bool, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (PPP, NODEFLATE), + nmc_add_prop_funcs (NM_SETTING_PPP_SETTING_NAME""NM_SETTING_PPP_NODEFLATE, nmc_property_ppp_get_nodeflate, nmc_property_set_bool, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (PPP, NO_VJ_COMP), + nmc_add_prop_funcs (NM_SETTING_PPP_SETTING_NAME""NM_SETTING_PPP_NO_VJ_COMP, nmc_property_ppp_get_no_vj_comp, nmc_property_set_bool, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (PPP, REQUIRE_MPPE), + nmc_add_prop_funcs (NM_SETTING_PPP_SETTING_NAME""NM_SETTING_PPP_REQUIRE_MPPE, nmc_property_ppp_get_require_mppe, nmc_property_set_bool, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (PPP, REQUIRE_MPPE_128), + nmc_add_prop_funcs (NM_SETTING_PPP_SETTING_NAME""NM_SETTING_PPP_REQUIRE_MPPE_128, nmc_property_ppp_get_require_mppe_128, nmc_property_set_bool, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (PPP, MPPE_STATEFUL), + nmc_add_prop_funcs (NM_SETTING_PPP_SETTING_NAME""NM_SETTING_PPP_MPPE_STATEFUL, nmc_property_ppp_get_mppe_stateful, nmc_property_set_bool, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (PPP, CRTSCTS), + nmc_add_prop_funcs (NM_SETTING_PPP_SETTING_NAME""NM_SETTING_PPP_CRTSCTS, nmc_property_ppp_get_crtscts, nmc_property_set_bool, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (PPP, BAUD), + nmc_add_prop_funcs (NM_SETTING_PPP_SETTING_NAME""NM_SETTING_PPP_BAUD, nmc_property_ppp_get_baud, nmc_property_set_uint, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (PPP, MRU), + nmc_add_prop_funcs (NM_SETTING_PPP_SETTING_NAME""NM_SETTING_PPP_MRU, nmc_property_ppp_get_mru, nmc_property_set_uint, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (PPP, MTU), + nmc_add_prop_funcs (NM_SETTING_PPP_SETTING_NAME""NM_SETTING_PPP_MTU, nmc_property_ppp_get_mtu, nmc_property_set_mtu, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (PPP, LCP_ECHO_FAILURE), + nmc_add_prop_funcs (NM_SETTING_PPP_SETTING_NAME""NM_SETTING_PPP_LCP_ECHO_FAILURE, nmc_property_ppp_get_lcp_echo_failure, nmc_property_set_uint, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (PPP, LCP_ECHO_INTERVAL), + nmc_add_prop_funcs (NM_SETTING_PPP_SETTING_NAME""NM_SETTING_PPP_LCP_ECHO_INTERVAL, nmc_property_ppp_get_lcp_echo_interval, nmc_property_set_uint, NULL, @@ -7532,28 +7528,28 @@ nmc_properties_init (void) NULL); /* Add editable properties for NM_SETTING_PPPOE_SETTING_NAME */ - nmc_add_prop_funcs (GLUE (PPPOE, SERVICE), + nmc_add_prop_funcs (NM_SETTING_PPPOE_SETTING_NAME""NM_SETTING_PPPOE_SERVICE, nmc_property_pppoe_get_service, nmc_property_set_string, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (PPPOE, USERNAME), + nmc_add_prop_funcs (NM_SETTING_PPPOE_SETTING_NAME""NM_SETTING_PPPOE_USERNAME, nmc_property_pppoe_get_username, nmc_property_set_string, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (PPPOE, PASSWORD), + nmc_add_prop_funcs (NM_SETTING_PPPOE_SETTING_NAME""NM_SETTING_PPPOE_PASSWORD, nmc_property_pppoe_get_password, nmc_property_set_string, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (PPPOE, PASSWORD_FLAGS), + nmc_add_prop_funcs (NM_SETTING_PPPOE_SETTING_NAME""NM_SETTING_PPPOE_PASSWORD_FLAGS, nmc_property_pppoe_get_password_flags, nmc_property_set_secret_flags, NULL, @@ -7562,35 +7558,35 @@ nmc_properties_init (void) NULL); /* Add editable properties for NM_SETTING_SERIAL_SETTING_NAME */ - nmc_add_prop_funcs (GLUE (SERIAL, BAUD), + nmc_add_prop_funcs (NM_SETTING_SERIAL_SETTING_NAME""NM_SETTING_SERIAL_BAUD, nmc_property_serial_get_baud, nmc_property_set_uint, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (SERIAL, BITS), + nmc_add_prop_funcs (NM_SETTING_SERIAL_SETTING_NAME""NM_SETTING_SERIAL_BITS, nmc_property_serial_get_bits, nmc_property_set_uint, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (SERIAL, PARITY), + nmc_add_prop_funcs (NM_SETTING_SERIAL_SETTING_NAME""NM_SETTING_SERIAL_PARITY, nmc_property_serial_get_parity, nmc_property_serial_set_parity, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (SERIAL, STOPBITS), + nmc_add_prop_funcs (NM_SETTING_SERIAL_SETTING_NAME""NM_SETTING_SERIAL_STOPBITS, nmc_property_serial_get_stopbits, nmc_property_set_uint, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (SERIAL, SEND_DELAY), + nmc_add_prop_funcs (NM_SETTING_SERIAL_SETTING_NAME""NM_SETTING_SERIAL_SEND_DELAY, nmc_property_serial_get_send_delay, nmc_property_set_uint, NULL, @@ -7599,7 +7595,7 @@ nmc_properties_init (void) NULL); /* Add editable properties for NM_SETTING_TEAM_SETTING_NAME */ - nmc_add_prop_funcs (GLUE (TEAM, CONFIG), + nmc_add_prop_funcs (NM_SETTING_TEAM_SETTING_NAME""NM_SETTING_TEAM_CONFIG, nmc_property_team_get_config, nmc_property_team_set_config, NULL, @@ -7608,7 +7604,7 @@ nmc_properties_init (void) NULL); /* Add editable properties for NM_SETTING_TEAM_PORT_SETTING_NAME */ - nmc_add_prop_funcs (GLUE (TEAM_PORT, CONFIG), + nmc_add_prop_funcs (NM_SETTING_TEAM_PORT_SETTING_NAME""NM_SETTING_TEAM_PORT_CONFIG, nmc_property_team_port_get_config, nmc_property_team_set_config, NULL, @@ -7617,35 +7613,35 @@ nmc_properties_init (void) NULL); /* Add editable properties for NM_SETTING_VLAN_SETTING_NAME */ - nmc_add_prop_funcs (GLUE (VLAN, PARENT), + nmc_add_prop_funcs (NM_SETTING_VLAN_SETTING_NAME""NM_SETTING_VLAN_PARENT, nmc_property_vlan_get_parent, nmc_property_set_string, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (VLAN, ID), + nmc_add_prop_funcs (NM_SETTING_VLAN_SETTING_NAME""NM_SETTING_VLAN_ID, nmc_property_vlan_get_id, nmc_property_set_uint, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (VLAN, FLAGS), + nmc_add_prop_funcs (NM_SETTING_VLAN_SETTING_NAME""NM_SETTING_VLAN_FLAGS, nmc_property_vlan_get_flags, nmc_property_set_flags, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (VLAN, INGRESS_PRIORITY_MAP), + nmc_add_prop_funcs (NM_SETTING_VLAN_SETTING_NAME""NM_SETTING_VLAN_INGRESS_PRIORITY_MAP, nmc_property_vlan_get_ingress_priority_map, nmc_property_vlan_set_ingress_priority_map, nmc_property_vlan_remove_ingress_priority_map, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (VLAN, EGRESS_PRIORITY_MAP), + nmc_add_prop_funcs (NM_SETTING_VLAN_SETTING_NAME""NM_SETTING_VLAN_EGRESS_PRIORITY_MAP, nmc_property_vlan_get_egress_priority_map, nmc_property_vlan_set_egress_priority_map, nmc_property_vlan_remove_egress_priority_map, @@ -7654,35 +7650,35 @@ nmc_properties_init (void) NULL); /* Add editable properties for NM_SETTING_VPN_SETTING_NAME */ - nmc_add_prop_funcs (GLUE (VPN, SERVICE_TYPE), + nmc_add_prop_funcs (NM_SETTING_VPN_SETTING_NAME""NM_SETTING_VPN_SERVICE_TYPE, nmc_property_vpn_get_service_type, nmc_property_set_vpn_service, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (VPN, USER_NAME), + nmc_add_prop_funcs (NM_SETTING_VPN_SETTING_NAME""NM_SETTING_VPN_USER_NAME, nmc_property_vpn_get_user_name, nmc_property_set_string, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (VPN, DATA), + nmc_add_prop_funcs (NM_SETTING_VPN_SETTING_NAME""NM_SETTING_VPN_DATA, nmc_property_vpn_get_data, nmc_property_vpn_set_data, nmc_property_vpn_remove_option_data, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (VPN, SECRETS), + nmc_add_prop_funcs (NM_SETTING_VPN_SETTING_NAME""NM_SETTING_VPN_SECRETS, nmc_property_vpn_get_secrets, nmc_property_vpn_set_secrets, nmc_property_vpn_remove_option_secret, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (VPN, PERSISTENT), + nmc_add_prop_funcs (NM_SETTING_VPN_SETTING_NAME""NM_SETTING_VPN_PERSISTENT, nmc_property_vpn_get_persistent, nmc_property_set_bool, NULL, @@ -7690,7 +7686,7 @@ nmc_properties_init (void) NULL, NULL); - nmc_add_prop_funcs (GLUE (VPN, TIMEOUT), + nmc_add_prop_funcs (NM_SETTING_VPN_SETTING_NAME""NM_SETTING_VPN_TIMEOUT, nmc_property_vpn_get_timeout, nmc_property_set_uint, NULL, @@ -7699,14 +7695,14 @@ nmc_properties_init (void) NULL); /* Add editable properties for NM_SETTING_WIMAX_SETTING_NAME */ - nmc_add_prop_funcs (GLUE (WIMAX, NETWORK_NAME), + nmc_add_prop_funcs (NM_SETTING_WIMAX_SETTING_NAME""NM_SETTING_WIMAX_NETWORK_NAME, nmc_property_wimax_get_network_name, nmc_property_set_string, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (WIMAX, MAC_ADDRESS), + nmc_add_prop_funcs (NM_SETTING_WIMAX_SETTING_NAME""NM_SETTING_WIMAX_MAC_ADDRESS, nmc_property_wimax_get_mac_address, nmc_property_set_mac, NULL, @@ -7715,98 +7711,98 @@ nmc_properties_init (void) NULL); /* Add editable properties for NM_SETTING_WIRED_SETTING_NAME */ - nmc_add_prop_funcs (GLUE (WIRED, PORT), + nmc_add_prop_funcs (NM_SETTING_WIRED_SETTING_NAME""NM_SETTING_WIRED_PORT, nmc_property_wired_get_port, NULL, /* nmc_property_wired_set_port, */ NULL, NULL, NULL, /* nmc_property_wired_allowed_port, */ NULL); - nmc_add_prop_funcs (GLUE (WIRED, SPEED), + nmc_add_prop_funcs (NM_SETTING_WIRED_SETTING_NAME""NM_SETTING_WIRED_SPEED, nmc_property_wired_get_speed, nmc_property_set_uint, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (WIRED, DUPLEX), + nmc_add_prop_funcs (NM_SETTING_WIRED_SETTING_NAME""NM_SETTING_WIRED_DUPLEX, nmc_property_wired_get_duplex, nmc_property_wired_set_duplex, NULL, NULL, nmc_property_wired_allowed_duplex, NULL); - nmc_add_prop_funcs (GLUE (WIRED, AUTO_NEGOTIATE), + nmc_add_prop_funcs (NM_SETTING_WIRED_SETTING_NAME""NM_SETTING_WIRED_AUTO_NEGOTIATE, nmc_property_wired_get_auto_negotiate, nmc_property_set_bool, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (WIRED, MAC_ADDRESS), + nmc_add_prop_funcs (NM_SETTING_WIRED_SETTING_NAME""NM_SETTING_WIRED_MAC_ADDRESS, nmc_property_wired_get_mac_address, nmc_property_set_mac, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (WIRED, CLONED_MAC_ADDRESS), + nmc_add_prop_funcs (NM_SETTING_WIRED_SETTING_NAME""NM_SETTING_WIRED_CLONED_MAC_ADDRESS, nmc_property_wired_get_cloned_mac_address, nmc_property_set_mac_cloned, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (WIRED, GENERATE_MAC_ADDRESS_MASK), + nmc_add_prop_funcs (NM_SETTING_WIRED_SETTING_NAME""NM_SETTING_WIRED_GENERATE_MAC_ADDRESS_MASK, nmc_property_wired_get_generate_mac_address_mask, nmc_property_set_string, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (WIRED, MAC_ADDRESS_BLACKLIST), + nmc_add_prop_funcs (NM_SETTING_WIRED_SETTING_NAME""NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST, nmc_property_wired_get_mac_address_blacklist, nmc_property_wired_set_mac_address_blacklist, nmc_property_wired_remove_mac_address_blacklist, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (WIRED, MTU), + nmc_add_prop_funcs (NM_SETTING_WIRED_SETTING_NAME""NM_SETTING_WIRED_MTU, nmc_property_wired_get_mtu, nmc_property_set_mtu, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (WIRED, S390_SUBCHANNELS), + nmc_add_prop_funcs (NM_SETTING_WIRED_SETTING_NAME""NM_SETTING_WIRED_S390_SUBCHANNELS, nmc_property_wired_get_s390_subchannels, nmc_property_wired_set_s390_subchannels, NULL, nmc_property_wired_describe_s390_subchannels, NULL, NULL); - nmc_add_prop_funcs (GLUE (WIRED, S390_NETTYPE), + nmc_add_prop_funcs (NM_SETTING_WIRED_SETTING_NAME""NM_SETTING_WIRED_S390_NETTYPE, nmc_property_wired_get_s390_nettype, nmc_property_wired_set_s390_nettype, NULL, NULL, nmc_property_wired_allowed_s390_nettype, NULL); - nmc_add_prop_funcs (GLUE (WIRED, S390_OPTIONS), + nmc_add_prop_funcs (NM_SETTING_WIRED_SETTING_NAME""NM_SETTING_WIRED_S390_OPTIONS, nmc_property_wired_get_s390_options, nmc_property_wired_set_s390_options, nmc_property_wired_remove_option_s390_options, nmc_property_wired_describe_s390_options, nmc_property_wired_allowed_s390_options, NULL); - nmc_add_prop_funcs (GLUE (WIRED, WAKE_ON_LAN), + nmc_add_prop_funcs (NM_SETTING_WIRED_SETTING_NAME""NM_SETTING_WIRED_WAKE_ON_LAN, nmc_property_wired_get_wake_on_lan, nmc_property_wired_set_wake_on_lan, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (WIRED, WAKE_ON_LAN_PASSWORD), + nmc_add_prop_funcs (NM_SETTING_WIRED_SETTING_NAME""NM_SETTING_WIRED_WAKE_ON_LAN_PASSWORD, nmc_property_wired_get_wake_on_lan_password, nmc_property_set_mac, NULL, @@ -7815,35 +7811,35 @@ nmc_properties_init (void) NULL); /* Add editable properties for NM_SETTING_WIRELESS_SETTING_NAME */ - nmc_add_prop_funcs (GLUE (WIRELESS, SSID), + nmc_add_prop_funcs (NM_SETTING_WIRELESS_SETTING_NAME""NM_SETTING_WIRELESS_SSID, nmc_property_wireless_get_ssid, nmc_property_set_ssid, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (WIRELESS, MODE), + nmc_add_prop_funcs (NM_SETTING_WIRELESS_SETTING_NAME""NM_SETTING_WIRELESS_MODE, nmc_property_wireless_get_mode, nmc_property_wifi_set_mode, NULL, NULL, nmc_property_wifi_allowed_mode, NULL); - nmc_add_prop_funcs (GLUE (WIRELESS, BAND), + nmc_add_prop_funcs (NM_SETTING_WIRELESS_SETTING_NAME""NM_SETTING_WIRELESS_BAND, nmc_property_wireless_get_band, nmc_property_wifi_set_band, NULL, NULL, nmc_property_wifi_allowed_band, NULL); - nmc_add_prop_funcs (GLUE (WIRELESS, CHANNEL), + nmc_add_prop_funcs (NM_SETTING_WIRELESS_SETTING_NAME""NM_SETTING_WIRELESS_CHANNEL, nmc_property_wireless_get_channel, nmc_property_wifi_set_channel, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (WIRELESS, BSSID), + nmc_add_prop_funcs (NM_SETTING_WIRELESS_SETTING_NAME""NM_SETTING_WIRELESS_BSSID, nmc_property_wireless_get_bssid, nmc_property_set_mac, NULL, @@ -7854,77 +7850,77 @@ nmc_properties_init (void) * Do not allow setting 'rate' and 'tx-power'. They are not implemented in * NM core, nor in ifcfg-rh plugin (thus not preserved over re-reading). */ - nmc_add_prop_funcs (GLUE (WIRELESS, RATE), + nmc_add_prop_funcs (NM_SETTING_WIRELESS_SETTING_NAME""NM_SETTING_WIRELESS_RATE, nmc_property_wireless_get_rate, NULL, /* editing rate disabled */ NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (WIRELESS, TX_POWER), + nmc_add_prop_funcs (NM_SETTING_WIRELESS_SETTING_NAME""NM_SETTING_WIRELESS_TX_POWER, nmc_property_wireless_get_tx_power, NULL, /* editing tx-power disabled */ NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (WIRELESS, MAC_ADDRESS), + nmc_add_prop_funcs (NM_SETTING_WIRELESS_SETTING_NAME""NM_SETTING_WIRELESS_MAC_ADDRESS, nmc_property_wireless_get_mac_address, nmc_property_set_mac, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (WIRELESS, CLONED_MAC_ADDRESS), + nmc_add_prop_funcs (NM_SETTING_WIRELESS_SETTING_NAME""NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS, nmc_property_wireless_get_cloned_mac_address, nmc_property_set_mac_cloned, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (WIRELESS, GENERATE_MAC_ADDRESS_MASK), + nmc_add_prop_funcs (NM_SETTING_WIRELESS_SETTING_NAME""NM_SETTING_WIRELESS_GENERATE_MAC_ADDRESS_MASK, nmc_property_wireless_get_generate_mac_address_mask, nmc_property_set_string, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (WIRELESS, MAC_ADDRESS_BLACKLIST), + nmc_add_prop_funcs (NM_SETTING_WIRELESS_SETTING_NAME""NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST, nmc_property_wireless_get_mac_address_blacklist, nmc_property_wireless_set_mac_address_blacklist, nmc_property_wireless_remove_mac_address_blacklist, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (WIRELESS, SEEN_BSSIDS), + nmc_add_prop_funcs (NM_SETTING_WIRELESS_SETTING_NAME""NM_SETTING_WIRELESS_SEEN_BSSIDS, nmc_property_wireless_get_seen_bssids, NULL, /* read-only */ NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (WIRELESS, MTU), + nmc_add_prop_funcs (NM_SETTING_WIRELESS_SETTING_NAME""NM_SETTING_WIRELESS_MTU, nmc_property_wireless_get_mtu, nmc_property_set_mtu, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (WIRELESS, HIDDEN), + nmc_add_prop_funcs (NM_SETTING_WIRELESS_SETTING_NAME""NM_SETTING_WIRELESS_HIDDEN, nmc_property_wireless_get_hidden, nmc_property_set_bool, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (WIRELESS, POWERSAVE), + nmc_add_prop_funcs (NM_SETTING_WIRELESS_SETTING_NAME""NM_SETTING_WIRELESS_POWERSAVE, nmc_property_wireless_get_powersave, nmc_property_wireless_set_powersave, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (WIRELESS, MAC_ADDRESS_RANDOMIZATION), + nmc_add_prop_funcs (NM_SETTING_WIRELESS_SETTING_NAME""NM_SETTING_WIRELESS_MAC_ADDRESS_RANDOMIZATION, nmc_property_wireless_get_mac_address_randomization, nmc_property_wireless_set_mac_address_randomization, NULL, @@ -7933,119 +7929,119 @@ nmc_properties_init (void) NULL); /* Add editable properties for NM_SETTING_WIRELESS_SECURITY_SETTING_NAME */ - nmc_add_prop_funcs (GLUE (WIRELESS_SECURITY, KEY_MGMT), + nmc_add_prop_funcs (NM_SETTING_WIRELESS_SECURITY_SETTING_NAME""NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, nmc_property_wifi_sec_get_key_mgmt, nmc_property_wifi_sec_set_key_mgmt, NULL, NULL, nmc_property_wifi_sec_allowed_key_mgmt, NULL); - nmc_add_prop_funcs (GLUE (WIRELESS_SECURITY, WEP_TX_KEYIDX), + nmc_add_prop_funcs (NM_SETTING_WIRELESS_SECURITY_SETTING_NAME""NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX, nmc_property_wifi_sec_get_wep_tx_keyidx, nmc_property_set_uint, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (WIRELESS_SECURITY, AUTH_ALG), + nmc_add_prop_funcs (NM_SETTING_WIRELESS_SECURITY_SETTING_NAME""NM_SETTING_WIRELESS_SECURITY_AUTH_ALG, nmc_property_wifi_sec_get_auth_alg, nmc_property_wifi_sec_set_auth_alg, NULL, NULL, nmc_property_wifi_sec_allowed_auth_alg, NULL); - nmc_add_prop_funcs (GLUE (WIRELESS_SECURITY, PROTO), + nmc_add_prop_funcs (NM_SETTING_WIRELESS_SECURITY_SETTING_NAME""NM_SETTING_WIRELESS_SECURITY_PROTO, nmc_property_wifi_sec_get_proto, nmc_property_wifi_sec_set_proto, nmc_property_wifi_sec_remove_proto, NULL, nmc_property_wifi_sec_allowed_proto, NULL); - nmc_add_prop_funcs (GLUE (WIRELESS_SECURITY, PAIRWISE), + nmc_add_prop_funcs (NM_SETTING_WIRELESS_SECURITY_SETTING_NAME""NM_SETTING_WIRELESS_SECURITY_PAIRWISE, nmc_property_wifi_sec_get_pairwise, nmc_property_wifi_sec_set_pairwise, nmc_property_wifi_sec_remove_pairwise, NULL, nmc_property_wifi_sec_allowed_pairwise, NULL); - nmc_add_prop_funcs (GLUE (WIRELESS_SECURITY, GROUP), + nmc_add_prop_funcs (NM_SETTING_WIRELESS_SECURITY_SETTING_NAME""NM_SETTING_WIRELESS_SECURITY_GROUP, nmc_property_wifi_sec_get_group, nmc_property_wifi_sec_set_group, nmc_property_wifi_sec_remove_group, NULL, nmc_property_wifi_sec_allowed_group, NULL); - nmc_add_prop_funcs (GLUE (WIRELESS_SECURITY, LEAP_USERNAME), + nmc_add_prop_funcs (NM_SETTING_WIRELESS_SECURITY_SETTING_NAME""NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME, nmc_property_wifi_sec_get_leap_username, nmc_property_set_string, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (WIRELESS_SECURITY, WEP_KEY0), + nmc_add_prop_funcs (NM_SETTING_WIRELESS_SECURITY_SETTING_NAME""NM_SETTING_WIRELESS_SECURITY_WEP_KEY0, nmc_property_wifi_sec_get_wep_key0, nmc_property_wifi_set_wep_key, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (WIRELESS_SECURITY, WEP_KEY1), + nmc_add_prop_funcs (NM_SETTING_WIRELESS_SECURITY_SETTING_NAME""NM_SETTING_WIRELESS_SECURITY_WEP_KEY1, nmc_property_wifi_sec_get_wep_key1, nmc_property_wifi_set_wep_key, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (WIRELESS_SECURITY, WEP_KEY2), + nmc_add_prop_funcs (NM_SETTING_WIRELESS_SECURITY_SETTING_NAME""NM_SETTING_WIRELESS_SECURITY_WEP_KEY2, nmc_property_wifi_sec_get_wep_key2, nmc_property_wifi_set_wep_key, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (WIRELESS_SECURITY, WEP_KEY3), + nmc_add_prop_funcs (NM_SETTING_WIRELESS_SECURITY_SETTING_NAME""NM_SETTING_WIRELESS_SECURITY_WEP_KEY3, nmc_property_wifi_sec_get_wep_key3, nmc_property_wifi_set_wep_key, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (WIRELESS_SECURITY, WEP_KEY_FLAGS), + nmc_add_prop_funcs (NM_SETTING_WIRELESS_SECURITY_SETTING_NAME""NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS, nmc_property_wifi_sec_get_wep_key_flags, nmc_property_set_secret_flags, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (WIRELESS_SECURITY, WEP_KEY_TYPE), + nmc_add_prop_funcs (NM_SETTING_WIRELESS_SECURITY_SETTING_NAME""NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE, nmc_property_wifi_sec_get_wep_key_type, nmc_property_wifi_set_wep_key_type, NULL, nmc_property_wifi_describe_wep_key_type, NULL, NULL); - nmc_add_prop_funcs (GLUE (WIRELESS_SECURITY, PSK), + nmc_add_prop_funcs (NM_SETTING_WIRELESS_SECURITY_SETTING_NAME""NM_SETTING_WIRELESS_SECURITY_PSK, nmc_property_wifi_sec_get_psk, nmc_property_wifi_set_psk, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (WIRELESS_SECURITY, PSK_FLAGS), + nmc_add_prop_funcs (NM_SETTING_WIRELESS_SECURITY_SETTING_NAME""NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS, nmc_property_wifi_sec_get_psk_flags, nmc_property_set_secret_flags, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (WIRELESS_SECURITY, LEAP_PASSWORD), + nmc_add_prop_funcs (NM_SETTING_WIRELESS_SECURITY_SETTING_NAME""NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD, nmc_property_wifi_sec_get_leap_password, nmc_property_set_string, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (WIRELESS_SECURITY, LEAP_PASSWORD_FLAGS), + nmc_add_prop_funcs (NM_SETTING_WIRELESS_SECURITY_SETTING_NAME""NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS, nmc_property_wifi_sec_get_leap_password_flags, nmc_property_set_secret_flags, NULL, @@ -8054,42 +8050,42 @@ nmc_properties_init (void) NULL); /* Add editable properties for NM_SETTING_TUN_SETTING_NAME */ - nmc_add_prop_funcs (GLUE (TUN, MODE), + nmc_add_prop_funcs (NM_SETTING_TUN_SETTING_NAME""NM_SETTING_TUN_MODE, nmc_property_tun_get_mode, nmc_property_tun_set_mode, NULL, NULL, nmc_property_tun_allowed_mode, NULL); - nmc_add_prop_funcs (GLUE (TUN, OWNER), + nmc_add_prop_funcs (NM_SETTING_TUN_SETTING_NAME""NM_SETTING_TUN_OWNER, nmc_property_tun_get_owner, nmc_property_set_string, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (TUN, GROUP), + nmc_add_prop_funcs (NM_SETTING_TUN_SETTING_NAME""NM_SETTING_TUN_GROUP, nmc_property_tun_get_group, nmc_property_set_string, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (TUN, PI), + nmc_add_prop_funcs (NM_SETTING_TUN_SETTING_NAME""NM_SETTING_TUN_PI, nmc_property_tun_get_pi, nmc_property_set_bool, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (TUN, VNET_HDR), + nmc_add_prop_funcs (NM_SETTING_TUN_SETTING_NAME""NM_SETTING_TUN_VNET_HDR, nmc_property_tun_get_vnet_hdr, nmc_property_set_bool, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (TUN, MULTI_QUEUE), + nmc_add_prop_funcs (NM_SETTING_TUN_SETTING_NAME""NM_SETTING_TUN_MULTI_QUEUE, nmc_property_tun_get_multi_queue, nmc_property_set_bool, NULL, @@ -8098,84 +8094,84 @@ nmc_properties_init (void) NULL); /* Add editable properties for NM_SETTING_IP_TUNNEL_SETTING_NAME */ - nmc_add_prop_funcs (GLUE (IP_TUNNEL, MODE), + nmc_add_prop_funcs (NM_SETTING_IP_TUNNEL_SETTING_NAME""NM_SETTING_IP_TUNNEL_MODE, nmc_property_ip_tunnel_get_mode, nmc_property_ip_tunnel_set_mode, NULL, NULL, nmc_property_ip_tunnel_allowed_mode, NULL); - nmc_add_prop_funcs (GLUE (IP_TUNNEL, PARENT), + nmc_add_prop_funcs (NM_SETTING_IP_TUNNEL_SETTING_NAME""NM_SETTING_IP_TUNNEL_PARENT, nmc_property_ip_tunnel_get_parent, nmc_property_set_string, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (IP_TUNNEL, LOCAL), + nmc_add_prop_funcs (NM_SETTING_IP_TUNNEL_SETTING_NAME""NM_SETTING_IP_TUNNEL_LOCAL, nmc_property_ip_tunnel_get_local, nmc_property_set_string, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (IP_TUNNEL, REMOTE), + nmc_add_prop_funcs (NM_SETTING_IP_TUNNEL_SETTING_NAME""NM_SETTING_IP_TUNNEL_REMOTE, nmc_property_ip_tunnel_get_remote, nmc_property_set_string, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (IP_TUNNEL, TTL), + nmc_add_prop_funcs (NM_SETTING_IP_TUNNEL_SETTING_NAME""NM_SETTING_IP_TUNNEL_TTL, nmc_property_ip_tunnel_get_ttl, nmc_property_set_uint, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (IP_TUNNEL, TOS), + nmc_add_prop_funcs (NM_SETTING_IP_TUNNEL_SETTING_NAME""NM_SETTING_IP_TUNNEL_TOS, nmc_property_ip_tunnel_get_tos, nmc_property_set_uint, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (IP_TUNNEL, PATH_MTU_DISCOVERY), + nmc_add_prop_funcs (NM_SETTING_IP_TUNNEL_SETTING_NAME""NM_SETTING_IP_TUNNEL_PATH_MTU_DISCOVERY, nmc_property_ip_tunnel_get_path_mtu_discovery, nmc_property_set_bool, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (IP_TUNNEL, INPUT_KEY), + nmc_add_prop_funcs (NM_SETTING_IP_TUNNEL_SETTING_NAME""NM_SETTING_IP_TUNNEL_INPUT_KEY, nmc_property_ip_tunnel_get_input_key, nmc_property_set_string, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (IP_TUNNEL, OUTPUT_KEY), + nmc_add_prop_funcs (NM_SETTING_IP_TUNNEL_SETTING_NAME""NM_SETTING_IP_TUNNEL_OUTPUT_KEY, nmc_property_ip_tunnel_get_output_key, nmc_property_set_string, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (IP_TUNNEL, ENCAPSULATION_LIMIT), + nmc_add_prop_funcs (NM_SETTING_IP_TUNNEL_SETTING_NAME""NM_SETTING_IP_TUNNEL_ENCAPSULATION_LIMIT, nmc_property_ip_tunnel_get_encapsulation_limit, nmc_property_set_uint, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (IP_TUNNEL, FLOW_LABEL), + nmc_add_prop_funcs (NM_SETTING_IP_TUNNEL_SETTING_NAME""NM_SETTING_IP_TUNNEL_FLOW_LABEL, nmc_property_ip_tunnel_get_flow_label, nmc_property_set_uint, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (IP_TUNNEL, MTU), + nmc_add_prop_funcs (NM_SETTING_IP_TUNNEL_SETTING_NAME""NM_SETTING_IP_TUNNEL_MTU, nmc_property_ip_tunnel_get_mtu, nmc_property_set_uint, NULL, @@ -8184,56 +8180,56 @@ nmc_properties_init (void) NULL); /* Add editable properties for NM_SETTING_MACSEC_SETTING_NAME */ - nmc_add_prop_funcs (GLUE (MACSEC, PARENT), + nmc_add_prop_funcs (NM_SETTING_MACSEC_SETTING_NAME""NM_SETTING_MACSEC_PARENT, nmc_property_macsec_get_parent, nmc_property_set_string, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (MACSEC, MODE), + nmc_add_prop_funcs (NM_SETTING_MACSEC_SETTING_NAME""NM_SETTING_MACSEC_MODE, nmc_property_macsec_get_mode, nmc_property_macsec_set_mode, NULL, NULL, nmc_property_macsec_allowed_mode, NULL); - nmc_add_prop_funcs (GLUE (MACSEC, ENCRYPT), + nmc_add_prop_funcs (NM_SETTING_MACSEC_SETTING_NAME""NM_SETTING_MACSEC_ENCRYPT, nmc_property_macsec_get_encrypt, nmc_property_set_bool, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (MACSEC, MKA_CAK), + nmc_add_prop_funcs (NM_SETTING_MACSEC_SETTING_NAME""NM_SETTING_MACSEC_MKA_CAK, nmc_property_macsec_get_mka_cak, nmc_property_set_string, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (MACSEC, MKA_CAK_FLAGS), + nmc_add_prop_funcs (NM_SETTING_MACSEC_SETTING_NAME""NM_SETTING_MACSEC_MKA_CAK_FLAGS, nmc_property_macsec_get_mka_cak_flags, nmc_property_set_secret_flags, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (MACSEC, MKA_CKN), + nmc_add_prop_funcs (NM_SETTING_MACSEC_SETTING_NAME""NM_SETTING_MACSEC_MKA_CKN, nmc_property_macsec_get_mka_ckn, nmc_property_set_string, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (MACSEC, PORT), + nmc_add_prop_funcs (NM_SETTING_MACSEC_SETTING_NAME""NM_SETTING_MACSEC_PORT, nmc_property_macsec_get_port, nmc_property_set_int, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (MACSEC, VALIDATION), + nmc_add_prop_funcs (NM_SETTING_MACSEC_SETTING_NAME""NM_SETTING_MACSEC_VALIDATION, nmc_property_macsec_get_validation, nmc_property_macsec_set_validation, NULL, @@ -8242,28 +8238,28 @@ nmc_properties_init (void) NULL); /* Add editable properties for NM_SETTING_MACVLAN_SETTING_NAME */ - nmc_add_prop_funcs (GLUE (MACVLAN, PARENT), + nmc_add_prop_funcs (NM_SETTING_MACVLAN_SETTING_NAME""NM_SETTING_MACVLAN_PARENT, nmc_property_macvlan_get_parent, nmc_property_set_string, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (MACVLAN, MODE), + nmc_add_prop_funcs (NM_SETTING_MACVLAN_SETTING_NAME""NM_SETTING_MACVLAN_MODE, nmc_property_macvlan_get_mode, nmc_property_macvlan_set_mode, NULL, NULL, nmc_property_macvlan_allowed_mode, NULL); - nmc_add_prop_funcs (GLUE (MACVLAN, PROMISCUOUS), + nmc_add_prop_funcs (NM_SETTING_MACVLAN_SETTING_NAME""NM_SETTING_MACVLAN_PROMISCUOUS, nmc_property_macvlan_get_promiscuous, nmc_property_set_bool, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (MACVLAN, TAP), + nmc_add_prop_funcs (NM_SETTING_MACVLAN_SETTING_NAME""NM_SETTING_MACVLAN_TAP, nmc_property_macvlan_get_tap, nmc_property_set_bool, NULL, @@ -8272,112 +8268,112 @@ nmc_properties_init (void) NULL); /* Add editable properties for NM_SETTING_VXLAN_SETTING_NAME */ - nmc_add_prop_funcs (GLUE (VXLAN, PARENT), + nmc_add_prop_funcs (NM_SETTING_VXLAN_SETTING_NAME""NM_SETTING_VXLAN_PARENT, nmc_property_vxlan_get_parent, nmc_property_set_string, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (VXLAN, ID), + nmc_add_prop_funcs (NM_SETTING_VXLAN_SETTING_NAME""NM_SETTING_VXLAN_ID, nmc_property_vxlan_get_id, nmc_property_set_uint, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (VXLAN, LOCAL), + nmc_add_prop_funcs (NM_SETTING_VXLAN_SETTING_NAME""NM_SETTING_VXLAN_LOCAL, nmc_property_vxlan_get_local, nmc_property_set_string, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (VXLAN, REMOTE), + nmc_add_prop_funcs (NM_SETTING_VXLAN_SETTING_NAME""NM_SETTING_VXLAN_REMOTE, nmc_property_vxlan_get_remote, nmc_property_set_string, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (VXLAN, SOURCE_PORT_MIN), + nmc_add_prop_funcs (NM_SETTING_VXLAN_SETTING_NAME""NM_SETTING_VXLAN_SOURCE_PORT_MIN, nmc_property_vxlan_get_source_port_min, nmc_property_set_uint, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (VXLAN, SOURCE_PORT_MAX), + nmc_add_prop_funcs (NM_SETTING_VXLAN_SETTING_NAME""NM_SETTING_VXLAN_SOURCE_PORT_MAX, nmc_property_vxlan_get_source_port_max, nmc_property_set_uint, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (VXLAN, DESTINATION_PORT), + nmc_add_prop_funcs (NM_SETTING_VXLAN_SETTING_NAME""NM_SETTING_VXLAN_DESTINATION_PORT, nmc_property_vxlan_get_destination_port, nmc_property_set_uint, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (VXLAN, TOS), + nmc_add_prop_funcs (NM_SETTING_VXLAN_SETTING_NAME""NM_SETTING_VXLAN_TOS, nmc_property_vxlan_get_tos, nmc_property_set_uint, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (VXLAN, TTL), + nmc_add_prop_funcs (NM_SETTING_VXLAN_SETTING_NAME""NM_SETTING_VXLAN_TTL, nmc_property_vxlan_get_ttl, nmc_property_set_uint, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (VXLAN, AGEING), + nmc_add_prop_funcs (NM_SETTING_VXLAN_SETTING_NAME""NM_SETTING_VXLAN_AGEING, nmc_property_vxlan_get_ageing, nmc_property_set_uint, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (VXLAN, LIMIT), + nmc_add_prop_funcs (NM_SETTING_VXLAN_SETTING_NAME""NM_SETTING_VXLAN_LIMIT, nmc_property_vxlan_get_limit, nmc_property_set_uint, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (VXLAN, LEARNING), + nmc_add_prop_funcs (NM_SETTING_VXLAN_SETTING_NAME""NM_SETTING_VXLAN_LEARNING, nmc_property_vxlan_get_learning, nmc_property_set_bool, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (VXLAN, PROXY), + nmc_add_prop_funcs (NM_SETTING_VXLAN_SETTING_NAME""NM_SETTING_VXLAN_PROXY, nmc_property_vxlan_get_proxy, nmc_property_set_bool, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (VXLAN, RSC), + nmc_add_prop_funcs (NM_SETTING_VXLAN_SETTING_NAME""NM_SETTING_VXLAN_RSC, nmc_property_vxlan_get_rsc, nmc_property_set_bool, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (VXLAN, L2_MISS), + nmc_add_prop_funcs (NM_SETTING_VXLAN_SETTING_NAME""NM_SETTING_VXLAN_L2_MISS, nmc_property_vxlan_get_l2_miss, nmc_property_set_bool, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (VXLAN, L3_MISS), + nmc_add_prop_funcs (NM_SETTING_VXLAN_SETTING_NAME""NM_SETTING_VXLAN_L3_MISS, nmc_property_vxlan_get_l3_miss, nmc_property_set_bool, NULL, @@ -8386,28 +8382,28 @@ nmc_properties_init (void) NULL); /* Add editable properties for NM_SETTING_PROXY_SETTING_NAME */ - nmc_add_prop_funcs (GLUE (PROXY, METHOD), + nmc_add_prop_funcs (NM_SETTING_PROXY_SETTING_NAME""NM_SETTING_PROXY_METHOD, nmc_property_proxy_get_method, nmc_property_proxy_set_method, NULL, NULL, nmc_property_proxy_allowed_method, NULL); - nmc_add_prop_funcs (GLUE (PROXY, BROWSER_ONLY), + nmc_add_prop_funcs (NM_SETTING_PROXY_SETTING_NAME""NM_SETTING_PROXY_BROWSER_ONLY, nmc_property_proxy_get_browser_only, nmc_property_set_bool, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (PROXY, PAC_URL), + nmc_add_prop_funcs (NM_SETTING_PROXY_SETTING_NAME""NM_SETTING_PROXY_PAC_URL, nmc_property_proxy_get_pac_url, nmc_property_set_string, NULL, NULL, NULL, NULL); - nmc_add_prop_funcs (GLUE (PROXY, PAC_SCRIPT), + nmc_add_prop_funcs (NM_SETTING_PROXY_SETTING_NAME""NM_SETTING_PROXY_PAC_SCRIPT, nmc_property_proxy_get_pac_script, nmc_property_proxy_set_pac_script, NULL,