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

cli: refactor connection.autoconnect-retires to use int-getter

Browse source
This commit is contained in:
Thomas Haller 2017-09-12 16:33:42 +02:00
parent e36ed195ba
commit 4c8673d978
1 changed files with 12 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2277,35 +2277,6 @@ _values_fcn_bond_options (ARGS_VALUES_FCN)
return nm_setting_bond_get_valid_options (NULL);
}
static gconstpointer
_get_fcn_connection_autoconnect_retries (ARGS_GET_FCN)
{
NMSettingConnection *s_con = NM_SETTING_CONNECTION (setting);
gint retries;
char *s;
RETURN_UNSUPPORTED_GET_TYPE ();
retries = nm_setting_connection_get_autoconnect_retries (s_con);
if (get_type != NM_META_ACCESSOR_GET_TYPE_PRETTY)
s = g_strdup_printf ("%d", retries);
else {
switch (retries) {
case -1:
s = g_strdup_printf (_("%d (default)"), retries);
break;
case 0:
s = g_strdup_printf (_("%d (forever)"), retries);
break;
default:
s = g_strdup_printf ("%d", retries);
break;
}
}
RETURN_STR_TO_FREE (s);
}
static gconstpointer
_get_fcn_connection_permissions (ARGS_GET_FCN)
{
@ -5012,9 +4983,18 @@ static const NMMetaPropertyInfo *const property_infos_CONNECTION[] = {
.property_type = &_pt_gobject_int,
),
PROPERTY_INFO_WITH_DESC (NM_SETTING_CONNECTION_AUTOCONNECT_RETRIES,
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_connection_autoconnect_retries,
.set_fcn = _set_fcn_gobject_int,
.property_type = &_pt_gobject_int,
.property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int,
.value_infos = INT_VALUE_INFOS (
{
.value = -1,
.nick = "default",
},
{
.value = 0,
.nick = "forever",
}
),
),
),
PROPERTY_INFO_WITH_DESC (NM_SETTING_CONNECTION_TIMESTAMP,