New upstream version 1.45.90 upstream/1.45.90

1 files changed, 6 insertions, 10 deletions

diff --git a/src/libnm-core-impl/nm-setting-dcb.c b/src/libnm-core-impl/nm-setting-dcb.c
index d6890891..c59ee8b4 100644
--- a/src/libnm-core-impl/nm-setting-dcb.c
+++ b/src/libnm-core-impl/nm-setting-dcb.c
@@ -71,20 +71,17 @@ typedef struct {
  * Data Center Bridging Settings
  */
 struct _NMSettingDcb {
-    NMSetting parent;
-    /* In the past, this struct was public API. Preserve ABI! */
+    NMSetting           parent;
+    NMSettingDcbPrivate _priv;
 };
 
 struct _NMSettingDcbClass {
     NMSettingClass parent;
-    /* In the past, this struct was public API. Preserve ABI! */
-    gpointer padding[4];
 };
 
 G_DEFINE_TYPE(NMSettingDcb, nm_setting_dcb, NM_TYPE_SETTING)
 
-#define NM_SETTING_DCB_GET_PRIVATE(o) \
-    (G_TYPE_INSTANCE_GET_PRIVATE((o), NM_TYPE_SETTING_DCB, NMSettingDcbPrivate))
+#define NM_SETTING_DCB_GET_PRIVATE(o) _NM_GET_PRIVATE(o, NMSettingDcb, NM_IS_SETTING_DCB, NMSetting)
 
 /*****************************************************************************/
 
@@ -845,8 +842,6 @@ nm_setting_dcb_class_init(NMSettingDcbClass *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(NMSettingDcbPrivate));
-
     object_class->get_property = get_property;
     object_class->set_property = set_property;
 
@@ -925,7 +920,8 @@ nm_setting_dcb_class_init(NMSettingDcbClass *klass)
                                               PROP_APP_FCOE_MODE,
                                               NM_SETTING_PARAM_NONE,
                                               NMSettingDcbPrivate,
-                                              app_fcoe_mode);
+                                              app_fcoe_mode,
+                                              .direct_string_allow_empty = TRUE);
 
     /**
      * NMSettingDcb:app-iscsi-flags:
@@ -1230,5 +1226,5 @@ nm_setting_dcb_class_init(NMSettingDcbClass *klass)
                              NM_META_SETTING_TYPE_DCB,
                              NULL,
                              properties_override,
-                             NM_SETT_INFO_PRIVATE_OFFSET_FROM_CLASS);
+                             G_STRUCT_OFFSET(NMSettingDcb, _priv));
 }