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

clients: implement proxy.pac-script as string property

Browse source 
... with separate validation function.
This commit is contained in:
Thomas Haller 2017-05-21 20:25:02 +02:00
parent df388ea7d5
commit 6c4428324e
1 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
clients/common/nm-meta-setting-desc.c
View file

@ -3638,19 +3638,14 @@ _set_fcn_olpc_mesh_channel (ARGS_SET_FCN)
return TRUE;
}
static gboolean
_set_fcn_proxy_pac_script (ARGS_SET_FCN)
static const char *
_validate_fcn_proxy_pac_script (const char *value, char **out_to_free, GError **error)
{
char *script = NULL;
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
if (!nmc_proxy_check_script (value, &script, error)) {
return FALSE;
}
g_object_set (setting, property_info->property_name, script, NULL);
g_free (script);
return TRUE;
if (!nmc_proxy_check_script (value, &script, error))
return NULL;
RETURN_STR_TO_FREE (script);
}
static gconstpointer
@ -5909,9 +5904,9 @@ static const NMMetaPropertyInfo *const property_infos_PROXY[] = {
.is_cli_option = TRUE,
.property_alias = "pac-script",
.prompt = N_("PAC script"),
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_gobject,
.set_fcn = _set_fcn_proxy_pac_script,
.property_type = &_pt_gobject_string,
.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_string,
.validate_fcn = _validate_fcn_proxy_pac_script,
),
),
NULL