diff options
| author | Thomas Haller <thaller@redhat.com> | 2017-05-21 22:00:27 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2017-05-23 13:37:10 +0200 |
| commit | cfc9f5a9fd0e3cc91cf431cf4971b65dbfee002b (patch) | |
| tree | 8c9bb4fe631cddc9ed24bf73576c04aea81a0e30 | |
| parent | 9a68123827a8c4fe1eeaaf003d365429441d97e9 (diff) | |
clients: implement team.config as string property
... with separate validation function.
| -rw-r--r-- | clients/common/nm-meta-setting-desc.c | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c index 2882655380..530c8ac05d 100644 --- a/clients/common/nm-meta-setting-desc.c +++ b/clients/common/nm-meta-setting-desc.c @@ -3648,19 +3648,14 @@ _validate_fcn_proxy_pac_script (const char *value, char **out_to_free, GError ** RETURN_STR_TO_FREE (script); } -static gboolean -_set_fcn_team_config (ARGS_SET_FCN) +static const char * +_validate_fcn_team_config (const char *value, char **out_to_free, GError **error) { char *json = NULL; - g_return_val_if_fail (error == NULL || *error == NULL, FALSE); - - if (!nmc_team_check_config (value, &json, error)) { - return FALSE; - } - g_object_set (setting, property_info->property_name, json, NULL); - g_free (json); - return TRUE; + if (!nmc_team_check_config (value, &json, error)) + return NULL; + RETURN_STR_TO_FREE (json); } static gconstpointer @@ -5882,9 +5877,9 @@ static const NMMetaPropertyInfo *const property_infos_TEAM[] = { .property_alias = "config", .prompt = N_("Team JSON configuration [none]"), .describe_message = TEAM_DESCRIBE_MESSAGE, - .property_type = DEFINE_PROPERTY_TYPE ( - .get_fcn = _get_fcn_gobject, - .set_fcn = _set_fcn_team_config, + .property_type = &_pt_gobject_string, + .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_string, + .validate_fcn = _validate_fcn_team_config, ), ), NULL @@ -5898,9 +5893,9 @@ static const NMMetaPropertyInfo *const property_infos_TEAM_PORT[] = { .property_alias = "config", .prompt = N_("Team JSON configuration [none]"), .describe_message = TEAM_DESCRIBE_MESSAGE, - .property_type = DEFINE_PROPERTY_TYPE ( - .get_fcn = _get_fcn_gobject, - .set_fcn = _set_fcn_team_config, + .property_type = &_pt_gobject_string, + .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_string, + .validate_fcn = _validate_fcn_team_config, ), ), NULL |