diff --git a/src/libnm-core-impl/nm-setting-8021x.c b/src/libnm-core-impl/nm-setting-8021x.c index de330a92ef..78a31e9c39 100644 --- a/src/libnm-core-impl/nm-setting-8021x.c +++ b/src/libnm-core-impl/nm-setting-8021x.c @@ -187,11 +187,11 @@ typedef struct { */ struct _NMSetting8021x { NMSetting parent; + /* In the past, this struct was public API. Preserve ABI! */ }; struct _NMSetting8021xClass { NMSettingClass parent; - /* In the past, this struct was public API. Preserve ABI! */ gpointer padding[4]; }; diff --git a/src/libnm-core-impl/nm-setting-adsl.c b/src/libnm-core-impl/nm-setting-adsl.c index 4223e37d8d..8a82fb724c 100644 --- a/src/libnm-core-impl/nm-setting-adsl.c +++ b/src/libnm-core-impl/nm-setting-adsl.c @@ -47,11 +47,11 @@ typedef struct { */ struct _NMSettingAdsl { NMSetting parent; + /* In the past, this struct was public API. Preserve ABI! */ }; struct _NMSettingAdslClass { NMSettingClass parent; - /* In the past, this struct was public API. Preserve ABI! */ gpointer padding[4]; }; diff --git a/src/libnm-core-impl/nm-setting-bluetooth.c b/src/libnm-core-impl/nm-setting-bluetooth.c index b0fe71e4db..4bd91a691a 100644 --- a/src/libnm-core-impl/nm-setting-bluetooth.c +++ b/src/libnm-core-impl/nm-setting-bluetooth.c @@ -43,11 +43,11 @@ typedef struct { */ struct _NMSettingBluetooth { NMSetting parent; + /* In the past, this struct was public API. Preserve ABI! */ }; struct _NMSettingBluetoothClass { NMSettingClass parent; - /* In the past, this struct was public API. Preserve ABI! */ gpointer padding[4]; }; diff --git a/src/libnm-core-impl/nm-setting-bond.c b/src/libnm-core-impl/nm-setting-bond.c index eaf1712fcc..93baa9d689 100644 --- a/src/libnm-core-impl/nm-setting-bond.c +++ b/src/libnm-core-impl/nm-setting-bond.c @@ -45,11 +45,11 @@ typedef struct { */ struct _NMSettingBond { NMSetting parent; + /* In the past, this struct was public API. Preserve ABI! */ }; struct _NMSettingBondClass { NMSettingClass parent; - /* In the past, this struct was public API. Preserve ABI! */ gpointer padding[4]; }; diff --git a/src/libnm-core-impl/nm-setting-bridge-port.c b/src/libnm-core-impl/nm-setting-bridge-port.c index a23ab68656..9efb1563c3 100644 --- a/src/libnm-core-impl/nm-setting-bridge-port.c +++ b/src/libnm-core-impl/nm-setting-bridge-port.c @@ -46,11 +46,11 @@ typedef struct { */ struct _NMSettingBridgePort { NMSetting parent; + /* In the past, this struct was public API. Preserve ABI! */ }; struct _NMSettingBridgePortClass { NMSettingClass parent; - /* In the past, this struct was public API. Preserve ABI! */ gpointer padding[4]; }; diff --git a/src/libnm-core-impl/nm-setting-cdma.c b/src/libnm-core-impl/nm-setting-cdma.c index caec308287..6dc61e8385 100644 --- a/src/libnm-core-impl/nm-setting-cdma.c +++ b/src/libnm-core-impl/nm-setting-cdma.c @@ -43,11 +43,11 @@ typedef struct { */ struct _NMSettingCdma { NMSetting parent; + /* In the past, this struct was public API. Preserve ABI! */ }; struct _NMSettingCdmaClass { NMSettingClass parent; - /* In the past, this struct was public API. Preserve ABI! */ gpointer padding[4]; }; diff --git a/src/libnm-core-impl/nm-setting-connection.c b/src/libnm-core-impl/nm-setting-connection.c index 3288916701..19573db478 100644 --- a/src/libnm-core-impl/nm-setting-connection.c +++ b/src/libnm-core-impl/nm-setting-connection.c @@ -104,11 +104,11 @@ typedef struct { */ struct _NMSettingConnection { NMSetting parent; + /* In the past, this struct was public API. Preserve ABI! */ }; struct _NMSettingConnectionClass { NMSettingClass parent; - /* In the past, this struct was public API. Preserve ABI! */ gpointer padding[4]; }; diff --git a/src/libnm-core-impl/nm-setting-dcb.c b/src/libnm-core-impl/nm-setting-dcb.c index 0b176708c2..89df5835e8 100644 --- a/src/libnm-core-impl/nm-setting-dcb.c +++ b/src/libnm-core-impl/nm-setting-dcb.c @@ -72,11 +72,11 @@ typedef struct { */ struct _NMSettingDcb { NMSetting parent; + /* In the past, this struct was public API. Preserve ABI! */ }; struct _NMSettingDcbClass { NMSettingClass parent; - /* In the past, this struct was public API. Preserve ABI! */ gpointer padding[4]; }; diff --git a/src/libnm-core-impl/nm-setting-dummy.c b/src/libnm-core-impl/nm-setting-dummy.c index 486dea9d43..a998a27b14 100644 --- a/src/libnm-core-impl/nm-setting-dummy.c +++ b/src/libnm-core-impl/nm-setting-dummy.c @@ -28,11 +28,11 @@ */ struct _NMSettingDummy { NMSetting parent; + /* In the past, this struct was public API. Preserve ABI! */ }; struct _NMSettingDummyClass { NMSettingClass parent; - /* In the past, this struct was public API. Preserve ABI! */ gpointer padding[4]; }; diff --git a/src/libnm-core-impl/nm-setting-generic.c b/src/libnm-core-impl/nm-setting-generic.c index 379428675a..0eff1ddf49 100644 --- a/src/libnm-core-impl/nm-setting-generic.c +++ b/src/libnm-core-impl/nm-setting-generic.c @@ -34,11 +34,11 @@ typedef struct { */ struct _NMSettingGeneric { NMSetting parent; + /* In the past, this struct was public API. Preserve ABI! */ }; struct _NMSettingGenericClass { NMSettingClass parent; - /* In the past, this struct was public API. Preserve ABI! */ gpointer padding[4]; }; diff --git a/src/libnm-core-impl/nm-setting-gsm.c b/src/libnm-core-impl/nm-setting-gsm.c index 400dc3a82a..a1f0500e4d 100644 --- a/src/libnm-core-impl/nm-setting-gsm.c +++ b/src/libnm-core-impl/nm-setting-gsm.c @@ -62,11 +62,11 @@ typedef struct { */ struct _NMSettingGsm { NMSetting parent; + /* In the past, this struct was public API. Preserve ABI! */ }; struct _NMSettingGsmClass { NMSettingClass parent; - /* In the past, this struct was public API. Preserve ABI! */ gpointer padding[4]; }; diff --git a/src/libnm-core-impl/nm-setting-infiniband.c b/src/libnm-core-impl/nm-setting-infiniband.c index 5563f0b52a..95dc7b6696 100644 --- a/src/libnm-core-impl/nm-setting-infiniband.c +++ b/src/libnm-core-impl/nm-setting-infiniband.c @@ -47,11 +47,11 @@ typedef struct { */ struct _NMSettingInfiniband { NMSetting parent; + /* In the past, this struct was public API. Preserve ABI! */ }; struct _NMSettingInfinibandClass { NMSettingClass parent; - /* In the past, this struct was public API. Preserve ABI! */ gpointer padding[4]; }; diff --git a/src/libnm-core-impl/nm-setting-ip-tunnel.c b/src/libnm-core-impl/nm-setting-ip-tunnel.c index 4a7276f9c1..68135eea81 100644 --- a/src/libnm-core-impl/nm-setting-ip-tunnel.c +++ b/src/libnm-core-impl/nm-setting-ip-tunnel.c @@ -54,11 +54,11 @@ typedef struct { */ struct _NMSettingIPTunnel { NMSetting parent; + /* In the past, this struct was public API. Preserve ABI! */ }; struct _NMSettingIPTunnelClass { NMSettingClass parent; - /* In the past, this struct was public API. Preserve ABI! */ gpointer padding[4]; }; diff --git a/src/libnm-core-impl/nm-setting-ip4-config.c b/src/libnm-core-impl/nm-setting-ip4-config.c index 7b71ffe33e..003e8dc131 100644 --- a/src/libnm-core-impl/nm-setting-ip4-config.c +++ b/src/libnm-core-impl/nm-setting-ip4-config.c @@ -52,11 +52,11 @@ typedef struct { */ struct _NMSettingIP4Config { NMSettingIPConfig parent; + /* In the past, this struct was public API. Preserve ABI! */ }; struct _NMSettingIP4ConfigClass { NMSettingIPConfigClass parent; - /* In the past, this struct was public API. Preserve ABI! */ gpointer padding[4]; }; diff --git a/src/libnm-core-impl/nm-setting-ip6-config.c b/src/libnm-core-impl/nm-setting-ip6-config.c index d2229e1a90..d2a016fe25 100644 --- a/src/libnm-core-impl/nm-setting-ip6-config.c +++ b/src/libnm-core-impl/nm-setting-ip6-config.c @@ -59,11 +59,11 @@ typedef struct { */ struct _NMSettingIP6Config { NMSettingIPConfig parent; + /* In the past, this struct was public API. Preserve ABI! */ }; struct _NMSettingIP6ConfigClass { NMSettingIPConfigClass parent; - /* In the past, this struct was public API. Preserve ABI! */ gpointer padding[4]; }; diff --git a/src/libnm-core-impl/nm-setting-macsec.c b/src/libnm-core-impl/nm-setting-macsec.c index 2385917307..9593419304 100644 --- a/src/libnm-core-impl/nm-setting-macsec.c +++ b/src/libnm-core-impl/nm-setting-macsec.c @@ -56,11 +56,11 @@ typedef struct { */ struct _NMSettingMacsec { NMSetting parent; + /* In the past, this struct was public API. Preserve ABI! */ }; struct _NMSettingMacsecClass { NMSettingClass parent; - /* In the past, this struct was public API. Preserve ABI! */ gpointer padding[4]; }; diff --git a/src/libnm-core-impl/nm-setting-macvlan.c b/src/libnm-core-impl/nm-setting-macvlan.c index 5ae0f8497d..98f943e9cd 100644 --- a/src/libnm-core-impl/nm-setting-macvlan.c +++ b/src/libnm-core-impl/nm-setting-macvlan.c @@ -41,11 +41,11 @@ typedef struct { */ struct _NMSettingMacvlan { NMSetting parent; + /* In the past, this struct was public API. Preserve ABI! */ }; struct _NMSettingMacvlanClass { NMSettingClass parent; - /* In the past, this struct was public API. Preserve ABI! */ gpointer padding[4]; }; diff --git a/src/libnm-core-impl/nm-setting-olpc-mesh.c b/src/libnm-core-impl/nm-setting-olpc-mesh.c index 2121ee795b..103f619519 100644 --- a/src/libnm-core-impl/nm-setting-olpc-mesh.c +++ b/src/libnm-core-impl/nm-setting-olpc-mesh.c @@ -40,11 +40,11 @@ typedef struct { */ struct _NMSettingOlpcMesh { NMSetting parent; + /* In the past, this struct was public API. Preserve ABI! */ }; struct _NMSettingOlpcMeshClass { NMSettingClass parent; - /* In the past, this struct was public API. Preserve ABI! */ gpointer padding[4]; }; diff --git a/src/libnm-core-impl/nm-setting-ppp.c b/src/libnm-core-impl/nm-setting-ppp.c index ce111ccb59..73ffad647e 100644 --- a/src/libnm-core-impl/nm-setting-ppp.c +++ b/src/libnm-core-impl/nm-setting-ppp.c @@ -69,11 +69,11 @@ typedef struct { */ struct _NMSettingPpp { NMSetting parent; + /* In the past, this struct was public API. Preserve ABI! */ }; struct _NMSettingPppClass { NMSettingClass parent; - /* In the past, this struct was public API. Preserve ABI! */ gpointer padding[4]; }; diff --git a/src/libnm-core-impl/nm-setting-pppoe.c b/src/libnm-core-impl/nm-setting-pppoe.c index 1839305033..12beb51a5b 100644 --- a/src/libnm-core-impl/nm-setting-pppoe.c +++ b/src/libnm-core-impl/nm-setting-pppoe.c @@ -44,11 +44,11 @@ typedef struct { */ struct _NMSettingPppoe { NMSetting parent; + /* In the past, this struct was public API. Preserve ABI! */ }; struct _NMSettingPppoeClass { NMSettingClass parent; - /* In the past, this struct was public API. Preserve ABI! */ gpointer padding[4]; }; diff --git a/src/libnm-core-impl/nm-setting-private.h b/src/libnm-core-impl/nm-setting-private.h index 339921e65e..4185629e22 100644 --- a/src/libnm-core-impl/nm-setting-private.h +++ b/src/libnm-core-impl/nm-setting-private.h @@ -27,12 +27,14 @@ */ struct _NMSetting { GObject parent; + /* In the past, this struct was public API. Preserve ABI! */ }; struct _NMSettingClass { GObjectClass parent; - /* Virtual functions */ + /* In the past, this struct was public API. Preserve ABI! */ + int (*verify)(NMSetting *setting, NMConnection *connection, GError **error); gboolean (*verify_secrets)(NMSetting *setting, NMConnection *connection, GError **error); @@ -51,7 +53,6 @@ struct _NMSettingClass { NMSettingSecretFlags flags, GError ** error); - /* In the past, this struct was public API. Preserve ABI! */ gboolean (*clear_secrets)(const struct _NMSettInfoSetting *sett_info, guint property_idx, NMSetting * setting, @@ -64,7 +65,6 @@ struct _NMSettingClass { * * @other may be %NULL, in which case the function only determines whether * the setting should be compared (TRUE) or not (DEFAULT). */ - /* In the past, this struct was public API. Preserve ABI! */ NMTernary (*compare_property)(const struct _NMSettInfoSetting *sett_info, guint property_idx, NMConnection * con_a, @@ -73,21 +73,17 @@ struct _NMSettingClass { NMSetting * set_b, NMSettingCompareFlags flags); - /* In the past, this struct was public API. Preserve ABI! */ void (*duplicate_copy_properties)(const struct _NMSettInfoSetting *sett_info, NMSetting * src, NMSetting * dst); - /* In the past, this struct was public API. Preserve ABI! */ void (*enumerate_values)(const struct _NMSettInfoProperty *property_info, NMSetting * setting, NMSettingValueIterFn func, gpointer user_data); - /* In the past, this struct was public API. Preserve ABI! */ gboolean (*aggregate)(NMSetting *setting, int type_i, gpointer arg); - /* In the past, this struct was public API. Preserve ABI! */ void (*for_each_secret)(NMSetting * setting, const char * secret_name, GVariant * val, @@ -96,7 +92,6 @@ struct _NMSettingClass { gpointer callback_data, GVariantBuilder * setting_builder); - /* In the past, this struct was public API. Preserve ABI! */ gboolean (*init_from_dbus)(NMSetting * setting, GHashTable * keys, GVariant * setting_dict, @@ -104,10 +99,8 @@ struct _NMSettingClass { guint /* NMSettingParseFlags */ parse_flags, GError ** error); - /* In the past, this struct was public API. Preserve ABI! */ gpointer padding[1]; - /* In the past, this struct was public API. Preserve ABI! */ const struct _NMMetaSettingInfo *setting_info; }; diff --git a/src/libnm-core-impl/nm-setting-serial.c b/src/libnm-core-impl/nm-setting-serial.c index 44dbd43c64..5a3802a3e7 100644 --- a/src/libnm-core-impl/nm-setting-serial.c +++ b/src/libnm-core-impl/nm-setting-serial.c @@ -43,11 +43,11 @@ typedef struct { */ struct _NMSettingSerial { NMSetting parent; + /* In the past, this struct was public API. Preserve ABI! */ }; struct _NMSettingSerialClass { NMSettingClass parent; - /* In the past, this struct was public API. Preserve ABI! */ gpointer padding[4]; }; diff --git a/src/libnm-core-impl/nm-setting-team-port.c b/src/libnm-core-impl/nm-setting-team-port.c index 1e45d731b3..316fc67c96 100644 --- a/src/libnm-core-impl/nm-setting-team-port.c +++ b/src/libnm-core-impl/nm-setting-team-port.c @@ -42,11 +42,11 @@ typedef struct { */ struct _NMSettingTeamPort { NMSetting parent; + /* In the past, this struct was public API. Preserve ABI! */ }; struct _NMSettingTeamPortClass { NMSettingClass parent; - /* In the past, this struct was public API. Preserve ABI! */ gpointer padding[4]; }; diff --git a/src/libnm-core-impl/nm-setting-team.c b/src/libnm-core-impl/nm-setting-team.c index d90d940826..b9a368c51d 100644 --- a/src/libnm-core-impl/nm-setting-team.c +++ b/src/libnm-core-impl/nm-setting-team.c @@ -742,11 +742,11 @@ typedef struct { */ struct _NMSettingTeam { NMSetting parent; + /* In the past, this struct was public API. Preserve ABI! */ }; struct _NMSettingTeamClass { NMSettingClass parent; - /* In the past, this struct was public API. Preserve ABI! */ gpointer padding[4]; }; diff --git a/src/libnm-core-impl/nm-setting-tun.c b/src/libnm-core-impl/nm-setting-tun.c index e989e0be8f..be953e695e 100644 --- a/src/libnm-core-impl/nm-setting-tun.c +++ b/src/libnm-core-impl/nm-setting-tun.c @@ -47,11 +47,11 @@ typedef struct { */ struct _NMSettingTun { NMSetting parent; + /* In the past, this struct was public API. Preserve ABI! */ }; struct _NMSettingTunClass { NMSettingClass parent; - /* In the past, this struct was public API. Preserve ABI! */ gpointer padding[4]; }; diff --git a/src/libnm-core-impl/nm-setting-vlan.c b/src/libnm-core-impl/nm-setting-vlan.c index 3ac0d64763..541186ecf3 100644 --- a/src/libnm-core-impl/nm-setting-vlan.c +++ b/src/libnm-core-impl/nm-setting-vlan.c @@ -48,11 +48,11 @@ typedef struct { */ struct _NMSettingVlan { NMSetting parent; + /* In the past, this struct was public API. Preserve ABI! */ }; struct _NMSettingVlanClass { NMSettingClass parent; - /* In the past, this struct was public API. Preserve ABI! */ gpointer padding[4]; }; diff --git a/src/libnm-core-impl/nm-setting-vpn.c b/src/libnm-core-impl/nm-setting-vpn.c index 139860974b..d4a99d4da0 100644 --- a/src/libnm-core-impl/nm-setting-vpn.c +++ b/src/libnm-core-impl/nm-setting-vpn.c @@ -81,11 +81,11 @@ typedef struct { */ struct _NMSettingVpn { NMSetting parent; + /* In the past, this struct was public API. Preserve ABI! */ }; struct _NMSettingVpnClass { NMSettingClass parent; - /* In the past, this struct was public API. Preserve ABI! */ gpointer padding[4]; }; diff --git a/src/libnm-core-impl/nm-setting-vxlan.c b/src/libnm-core-impl/nm-setting-vxlan.c index b65d2a2a4e..2a89b0c32e 100644 --- a/src/libnm-core-impl/nm-setting-vxlan.c +++ b/src/libnm-core-impl/nm-setting-vxlan.c @@ -67,11 +67,11 @@ typedef struct { */ struct _NMSettingVxlan { NMSetting parent; + /* In the past, this struct was public API. Preserve ABI! */ }; struct _NMSettingVxlanClass { NMSettingClass parent; - /* In the past, this struct was public API. Preserve ABI! */ gpointer padding[4]; }; diff --git a/src/libnm-core-impl/nm-setting-wimax.c b/src/libnm-core-impl/nm-setting-wimax.c index e16e25279b..6d9f3284fa 100644 --- a/src/libnm-core-impl/nm-setting-wimax.c +++ b/src/libnm-core-impl/nm-setting-wimax.c @@ -42,11 +42,11 @@ typedef struct { */ struct _NMSettingWimax { NMSetting parent; + /* In the past, this struct was public API. Preserve ABI! */ }; struct _NMSettingWimaxClass { NMSettingClass parent; - /* In the past, this struct was public API. Preserve ABI! */ gpointer padding[4]; }; diff --git a/src/libnm-core-impl/nm-setting-wired.c b/src/libnm-core-impl/nm-setting-wired.c index f00a272009..36d254b3a5 100644 --- a/src/libnm-core-impl/nm-setting-wired.c +++ b/src/libnm-core-impl/nm-setting-wired.c @@ -76,11 +76,11 @@ typedef struct { */ struct _NMSettingWired { NMSetting parent; + /* In the past, this struct was public API. Preserve ABI! */ }; struct _NMSettingWiredClass { NMSettingClass parent; - /* In the past, this struct was public API. Preserve ABI! */ gpointer padding[4]; }; diff --git a/src/libnm-core-impl/nm-setting-wireless-security.c b/src/libnm-core-impl/nm-setting-wireless-security.c index 069309f8c8..df618e36d9 100644 --- a/src/libnm-core-impl/nm-setting-wireless-security.c +++ b/src/libnm-core-impl/nm-setting-wireless-security.c @@ -91,11 +91,11 @@ typedef struct { */ struct _NMSettingWirelessSecurity { NMSetting parent; + /* In the past, this struct was public API. Preserve ABI! */ }; struct _NMSettingWirelessSecurityClass { NMSettingClass parent; - /* In the past, this struct was public API. Preserve ABI! */ gpointer padding[4]; }; diff --git a/src/libnm-core-impl/nm-setting-wireless.c b/src/libnm-core-impl/nm-setting-wireless.c index fe8eaa6427..92209aec7f 100644 --- a/src/libnm-core-impl/nm-setting-wireless.c +++ b/src/libnm-core-impl/nm-setting-wireless.c @@ -73,11 +73,11 @@ typedef struct { */ struct _NMSettingWireless { NMSetting parent; + /* In the past, this struct was public API. Preserve ABI! */ }; struct _NMSettingWirelessClass { NMSettingClass parent; - /* In the past, this struct was public API. Preserve ABI! */ gpointer padding[4]; }; diff --git a/src/libnm-core-impl/nm-simple-connection.c b/src/libnm-core-impl/nm-simple-connection.c index 7b133e4551..185d47fc4f 100644 --- a/src/libnm-core-impl/nm-simple-connection.c +++ b/src/libnm-core-impl/nm-simple-connection.c @@ -25,11 +25,11 @@ */ struct _NMSimpleConnection { GObject parent; + /* In the past, this struct was public API. Preserve ABI! */ }; struct _NMSimpleConnectionClass { GObjectClass parent; - /* In the past, this struct was public API. Preserve ABI! */ gpointer padding[4]; };