diff options
Diffstat (limited to 'src/libnm-core-impl/nm-setting-team.c')
| -rw-r--r-- | src/libnm-core-impl/nm-setting-team.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/libnm-core-impl/nm-setting-team.c b/src/libnm-core-impl/nm-setting-team.c index 83de8b6f..2195757f 100644 --- a/src/libnm-core-impl/nm-setting-team.c +++ b/src/libnm-core-impl/nm-setting-team.c @@ -745,20 +745,18 @@ typedef struct { * Teaming Settings */ struct _NMSettingTeam { - NMSetting parent; - /* In the past, this struct was public API. Preserve ABI! */ + NMSetting parent; + NMSettingTeamPrivate _priv; }; struct _NMSettingTeamClass { NMSettingClass parent; - /* In the past, this struct was public API. Preserve ABI! */ - gpointer padding[4]; }; G_DEFINE_TYPE(NMSettingTeam, nm_setting_team, NM_TYPE_SETTING) #define NM_SETTING_TEAM_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE((o), NM_TYPE_SETTING_TEAM, NMSettingTeamPrivate)) + _NM_GET_PRIVATE(o, NMSettingTeam, NM_IS_SETTING_TEAM, NMSetting) /*****************************************************************************/ @@ -1386,8 +1384,7 @@ get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) break; case NM_TEAM_ATTRIBUTE_MASTER_RUNNER_TX_HASH: v_ptrarr = priv->team_setting->d.master.runner_tx_hash; - g_value_take_boxed(value, - v_ptrarr ? _nm_utils_ptrarray_to_strv((GPtrArray *) v_ptrarr) : NULL); + g_value_take_boxed(value, nm_strv_ptrarray_to_strv_full(v_ptrarr, FALSE)); break; case NM_TEAM_ATTRIBUTE_LINK_WATCHERS: g_value_take_boxed(value, @@ -1498,8 +1495,6 @@ nm_setting_team_class_init(NMSettingTeamClass *klass) NMSettingClass *setting_class = NM_SETTING_CLASS(klass); GArray *properties_override = _nm_sett_info_property_override_create_array(); - g_type_class_add_private(klass, sizeof(NMSettingTeamPrivate)); - object_class->get_property = get_property; object_class->set_property = set_property; object_class->finalize = finalize; @@ -1842,5 +1837,5 @@ nm_setting_team_class_init(NMSettingTeamClass *klass) NM_META_SETTING_TYPE_TEAM, NULL, properties_override, - NM_SETT_INFO_PRIVATE_OFFSET_FROM_CLASS); + G_STRUCT_OFFSET(NMSettingTeam, _priv)); } |