diff options
57 files changed, 137 insertions, 339 deletions
diff --git a/libnm-core/nm-connection.h b/libnm-core/nm-connection.h index cc2ba30c1e..6a17581d19 100644 --- a/libnm-core/nm-connection.h +++ b/libnm-core/nm-connection.h @@ -123,6 +123,9 @@ typedef struct { /* Signals */ void (*secrets_updated) (NMConnection *connection, const char * setting); + + /*< private >*/ + gpointer padding[8]; } NMConnectionClass; GType nm_connection_get_type (void); diff --git a/libnm-core/nm-setting-8021x.h b/libnm-core/nm-setting-8021x.h index ab034580dd..9fd1342277 100644 --- a/libnm-core/nm-setting-8021x.h +++ b/libnm-core/nm-setting-8021x.h @@ -152,11 +152,8 @@ typedef struct { typedef struct { NMSettingClass parent; - /* Padding for future expansion */ - void (*_reserved1) (void); - void (*_reserved2) (void); - void (*_reserved3) (void); - void (*_reserved4) (void); + /*< private >*/ + gpointer padding[4]; } NMSetting8021xClass; GType nm_setting_802_1x_get_type (void); diff --git a/libnm-core/nm-setting-adsl.h b/libnm-core/nm-setting-adsl.h index 82af6ebdd0..eb1f07d333 100644 --- a/libnm-core/nm-setting-adsl.h +++ b/libnm-core/nm-setting-adsl.h @@ -73,11 +73,8 @@ typedef struct { typedef struct { NMSettingClass parent; - /* Padding for future expansion */ - void (*_reserved1) (void); - void (*_reserved2) (void); - void (*_reserved3) (void); - void (*_reserved4) (void); + /*< private >*/ + gpointer padding[4]; } NMSettingAdslClass; GType nm_setting_adsl_get_type (void); diff --git a/libnm-core/nm-setting-bluetooth.h b/libnm-core/nm-setting-bluetooth.h index caf12158c0..d401fc4583 100644 --- a/libnm-core/nm-setting-bluetooth.h +++ b/libnm-core/nm-setting-bluetooth.h @@ -82,11 +82,8 @@ typedef struct { typedef struct { NMSettingClass parent; - /* Padding for future expansion */ - void (*_reserved1) (void); - void (*_reserved2) (void); - void (*_reserved3) (void); - void (*_reserved4) (void); + /*< private >*/ + gpointer padding[4]; } NMSettingBluetoothClass; GType nm_setting_bluetooth_get_type (void); diff --git a/libnm-core/nm-setting-bond.h b/libnm-core/nm-setting-bond.h index 6bfb2e7db7..6aa94f2bab 100644 --- a/libnm-core/nm-setting-bond.h +++ b/libnm-core/nm-setting-bond.h @@ -79,11 +79,8 @@ typedef struct { typedef struct { NMSettingClass parent; - /* Padding for future expansion */ - void (*_reserved1) (void); - void (*_reserved2) (void); - void (*_reserved3) (void); - void (*_reserved4) (void); + /*< private >*/ + gpointer padding[4]; } NMSettingBondClass; GType nm_setting_bond_get_type (void); diff --git a/libnm-core/nm-setting-bridge-port.h b/libnm-core/nm-setting-bridge-port.h index f63aa390e2..0bf2c791c7 100644 --- a/libnm-core/nm-setting-bridge-port.h +++ b/libnm-core/nm-setting-bridge-port.h @@ -62,11 +62,8 @@ typedef struct { typedef struct { NMSettingClass parent; - /* Padding for future expansion */ - void (*_reserved1) (void); - void (*_reserved2) (void); - void (*_reserved3) (void); - void (*_reserved4) (void); + /*< private >*/ + gpointer padding[4]; } NMSettingBridgePortClass; GType nm_setting_bridge_port_get_type (void); diff --git a/libnm-core/nm-setting-bridge.h b/libnm-core/nm-setting-bridge.h index 336c8ec7d6..d06935cd3c 100644 --- a/libnm-core/nm-setting-bridge.h +++ b/libnm-core/nm-setting-bridge.h @@ -67,11 +67,8 @@ typedef struct { typedef struct { NMSettingClass parent; - /* Padding for future expansion */ - void (*_reserved1) (void); - void (*_reserved2) (void); - void (*_reserved3) (void); - void (*_reserved4) (void); + /*< private >*/ + gpointer padding[4]; } NMSettingBridgeClass; GType nm_setting_bridge_get_type (void); diff --git a/libnm-core/nm-setting-cdma.h b/libnm-core/nm-setting-cdma.h index eee4420592..938a110b8a 100644 --- a/libnm-core/nm-setting-cdma.h +++ b/libnm-core/nm-setting-cdma.h @@ -67,11 +67,8 @@ typedef struct { typedef struct { NMSettingClass parent; - /* Padding for future expansion */ - void (*_reserved1) (void); - void (*_reserved2) (void); - void (*_reserved3) (void); - void (*_reserved4) (void); + /*< private >*/ + gpointer padding[4]; } NMSettingCdmaClass; GType nm_setting_cdma_get_type (void); diff --git a/libnm-core/nm-setting-connection.h b/libnm-core/nm-setting-connection.h index 31a82aff47..6f219ccd44 100644 --- a/libnm-core/nm-setting-connection.h +++ b/libnm-core/nm-setting-connection.h @@ -92,11 +92,8 @@ typedef struct { typedef struct { NMSettingClass parent; - /* Padding for future expansion */ - void (*_reserved1) (void); - void (*_reserved2) (void); - void (*_reserved3) (void); - void (*_reserved4) (void); + /*< private >*/ + gpointer padding[4]; } NMSettingConnectionClass; GType nm_setting_connection_get_type (void); diff --git a/libnm-core/nm-setting-dcb.h b/libnm-core/nm-setting-dcb.h index fb4a3c1f57..a1a200adb0 100644 --- a/libnm-core/nm-setting-dcb.h +++ b/libnm-core/nm-setting-dcb.h @@ -112,11 +112,8 @@ typedef struct { typedef struct { NMSettingClass parent; - /* Padding for future expansion */ - void (*_reserved1) (void); - void (*_reserved2) (void); - void (*_reserved3) (void); - void (*_reserved4) (void); + /*< private >*/ + gpointer padding[4]; } NMSettingDcbClass; GType nm_setting_dcb_get_type (void); diff --git a/libnm-core/nm-setting-generic.h b/libnm-core/nm-setting-generic.h index ece8707e74..605cb23f82 100644 --- a/libnm-core/nm-setting-generic.h +++ b/libnm-core/nm-setting-generic.h @@ -58,11 +58,8 @@ typedef struct { typedef struct { NMSettingClass parent; - /* Padding for future expansion */ - void (*_reserved1) (void); - void (*_reserved2) (void); - void (*_reserved3) (void); - void (*_reserved4) (void); + /*< private >*/ + gpointer padding[4]; } NMSettingGenericClass; GType nm_setting_generic_get_type (void); diff --git a/libnm-core/nm-setting-gsm.h b/libnm-core/nm-setting-gsm.h index 4675e409b7..8e20285f7a 100644 --- a/libnm-core/nm-setting-gsm.h +++ b/libnm-core/nm-setting-gsm.h @@ -76,11 +76,8 @@ typedef struct { typedef struct { NMSettingClass parent; - /* Padding for future expansion */ - void (*_reserved1) (void); - void (*_reserved2) (void); - void (*_reserved3) (void); - void (*_reserved4) (void); + /*< private >*/ + gpointer padding[4]; } NMSettingGsmClass; GType nm_setting_gsm_get_type (void); diff --git a/libnm-core/nm-setting-infiniband.h b/libnm-core/nm-setting-infiniband.h index dff3845036..b58f33c292 100644 --- a/libnm-core/nm-setting-infiniband.h +++ b/libnm-core/nm-setting-infiniband.h @@ -64,11 +64,8 @@ typedef struct { typedef struct { NMSettingClass parent; - /* Padding for future expansion */ - void (*_reserved1) (void); - void (*_reserved2) (void); - void (*_reserved3) (void); - void (*_reserved4) (void); + /*< private >*/ + gpointer padding[4]; } NMSettingInfinibandClass; GType nm_setting_infiniband_get_type (void); diff --git a/libnm-core/nm-setting-ip4-config.h b/libnm-core/nm-setting-ip4-config.h index e368212472..3572a1e3c8 100644 --- a/libnm-core/nm-setting-ip4-config.h +++ b/libnm-core/nm-setting-ip4-config.h @@ -170,11 +170,8 @@ typedef struct { typedef struct { NMSettingClass parent; - /* Padding for future expansion */ - void (*_reserved1) (void); - void (*_reserved2) (void); - void (*_reserved3) (void); - void (*_reserved4) (void); + /*< private >*/ + gpointer padding[4]; } NMSettingIP4ConfigClass; GType nm_setting_ip4_config_get_type (void); diff --git a/libnm-core/nm-setting-ip6-config.h b/libnm-core/nm-setting-ip6-config.h index e1a7eab537..dae63bc0c5 100644 --- a/libnm-core/nm-setting-ip6-config.h +++ b/libnm-core/nm-setting-ip6-config.h @@ -200,11 +200,8 @@ typedef struct { typedef struct { NMSettingClass parent; - /* Padding for future expansion */ - void (*_reserved1) (void); - void (*_reserved2) (void); - void (*_reserved3) (void); - void (*_reserved4) (void); + /*< private >*/ + gpointer padding[4]; } NMSettingIP6ConfigClass; GType nm_setting_ip6_config_get_type (void); diff --git a/libnm-core/nm-setting-olpc-mesh.h b/libnm-core/nm-setting-olpc-mesh.h index 54b268e2c6..44b9a85ba2 100644 --- a/libnm-core/nm-setting-olpc-mesh.h +++ b/libnm-core/nm-setting-olpc-mesh.h @@ -63,11 +63,8 @@ typedef struct { typedef struct { NMSettingClass parent; - /* Padding for future expansion */ - void (*_reserved1) (void); - void (*_reserved2) (void); - void (*_reserved3) (void); - void (*_reserved4) (void); + /*< private >*/ + gpointer padding[4]; } NMSettingOlpcMeshClass; GType nm_setting_olpc_mesh_get_type (void); diff --git a/libnm-core/nm-setting-ppp.h b/libnm-core/nm-setting-ppp.h index 3b0956a892..a6bdfb3f97 100644 --- a/libnm-core/nm-setting-ppp.h +++ b/libnm-core/nm-setting-ppp.h @@ -81,11 +81,8 @@ typedef struct { typedef struct { NMSettingClass parent; - /* Padding for future expansion */ - void (*_reserved1) (void); - void (*_reserved2) (void); - void (*_reserved3) (void); - void (*_reserved4) (void); + /*< private >*/ + gpointer padding[4]; } NMSettingPppClass; GType nm_setting_ppp_get_type (void); diff --git a/libnm-core/nm-setting-pppoe.h b/libnm-core/nm-setting-pppoe.h index 92c2d3361d..d1d4fe8a00 100644 --- a/libnm-core/nm-setting-pppoe.h +++ b/libnm-core/nm-setting-pppoe.h @@ -67,11 +67,8 @@ typedef struct { typedef struct { NMSettingClass parent; - /* Padding for future expansion */ - void (*_reserved1) (void); - void (*_reserved2) (void); - void (*_reserved3) (void); - void (*_reserved4) (void); + /*< private >*/ + gpointer padding[4]; } NMSettingPppoeClass; GType nm_setting_pppoe_get_type (void); diff --git a/libnm-core/nm-setting-serial.h b/libnm-core/nm-setting-serial.h index 67ebe1abe6..2a9377c422 100644 --- a/libnm-core/nm-setting-serial.h +++ b/libnm-core/nm-setting-serial.h @@ -68,11 +68,8 @@ typedef struct { typedef struct { NMSettingClass parent; - /* Padding for future expansion */ - void (*_reserved1) (void); - void (*_reserved2) (void); - void (*_reserved3) (void); - void (*_reserved4) (void); + /*< private >*/ + gpointer padding[4]; } NMSettingSerialClass; GType nm_setting_serial_get_type (void); diff --git a/libnm-core/nm-setting-team-port.h b/libnm-core/nm-setting-team-port.h index e34b4b2bc3..a9f3ff9325 100644 --- a/libnm-core/nm-setting-team-port.h +++ b/libnm-core/nm-setting-team-port.h @@ -59,11 +59,8 @@ typedef struct { typedef struct { NMSettingClass parent; - /* Padding for future expansion */ - void (*_reserved1) (void); - void (*_reserved2) (void); - void (*_reserved3) (void); - void (*_reserved4) (void); + /*< private >*/ + gpointer padding[4]; } NMSettingTeamPortClass; GType nm_setting_team_port_get_type (void); diff --git a/libnm-core/nm-setting-team.h b/libnm-core/nm-setting-team.h index 7ce3c7dec4..f33ec5b1c8 100644 --- a/libnm-core/nm-setting-team.h +++ b/libnm-core/nm-setting-team.h @@ -60,11 +60,8 @@ typedef struct { typedef struct { NMSettingClass parent; - /* Padding for future expansion */ - void (*_reserved1) (void); - void (*_reserved2) (void); - void (*_reserved3) (void); - void (*_reserved4) (void); + /*< private >*/ + gpointer padding[4]; } NMSettingTeamClass; GType nm_setting_team_get_type (void); diff --git a/libnm-core/nm-setting-vlan.h b/libnm-core/nm-setting-vlan.h index 32636a1a3f..9c37da36ef 100644 --- a/libnm-core/nm-setting-vlan.h +++ b/libnm-core/nm-setting-vlan.h @@ -69,11 +69,8 @@ typedef struct { typedef struct { NMSettingClass parent; - /* Padding for future expansion */ - void (*_reserved1) (void); - void (*_reserved2) (void); - void (*_reserved3) (void); - void (*_reserved4) (void); + /*< private >*/ + gpointer padding[4]; } NMSettingVlanClass; /** diff --git a/libnm-core/nm-setting-vpn.h b/libnm-core/nm-setting-vpn.h index b5a44c0d29..ba2f016704 100644 --- a/libnm-core/nm-setting-vpn.h +++ b/libnm-core/nm-setting-vpn.h @@ -64,11 +64,8 @@ typedef struct { typedef struct { NMSettingClass parent; - /* Padding for future expansion */ - void (*_reserved1) (void); - void (*_reserved2) (void); - void (*_reserved3) (void); - void (*_reserved4) (void); + /*< private >*/ + gpointer padding[4]; } NMSettingVpnClass; /** diff --git a/libnm-core/nm-setting-wimax.h b/libnm-core/nm-setting-wimax.h index 781d717c2d..8e9df6accb 100644 --- a/libnm-core/nm-setting-wimax.h +++ b/libnm-core/nm-setting-wimax.h @@ -60,6 +60,9 @@ typedef struct { typedef struct { NMSettingClass parent; + + /*< private >*/ + gpointer padding[4]; } NMSettingWimaxClass; GType nm_setting_wimax_get_type (void); diff --git a/libnm-core/nm-setting-wired.h b/libnm-core/nm-setting-wired.h index 761ccf2251..947c89fc3a 100644 --- a/libnm-core/nm-setting-wired.h +++ b/libnm-core/nm-setting-wired.h @@ -71,11 +71,8 @@ typedef struct { typedef struct { NMSettingClass parent; - /* Padding for future expansion */ - void (*_reserved1) (void); - void (*_reserved2) (void); - void (*_reserved3) (void); - void (*_reserved4) (void); + /*< private >*/ + gpointer padding[4]; } NMSettingWiredClass; GType nm_setting_wired_get_type (void); diff --git a/libnm-core/nm-setting-wireless-security.h b/libnm-core/nm-setting-wireless-security.h index 5b188cc043..ff07a91bed 100644 --- a/libnm-core/nm-setting-wireless-security.h +++ b/libnm-core/nm-setting-wireless-security.h @@ -121,11 +121,8 @@ typedef struct { typedef struct { NMSettingClass parent; - /* Padding for future expansion */ - void (*_reserved1) (void); - void (*_reserved2) (void); - void (*_reserved3) (void); - void (*_reserved4) (void); + /*< private >*/ + gpointer padding[4]; } NMSettingWirelessSecurityClass; GType nm_setting_wireless_security_get_type (void); diff --git a/libnm-core/nm-setting-wireless.h b/libnm-core/nm-setting-wireless.h index e44083c064..aa7ab3e491 100644 --- a/libnm-core/nm-setting-wireless.h +++ b/libnm-core/nm-setting-wireless.h @@ -107,11 +107,8 @@ typedef struct { typedef struct { NMSettingClass parent; - /* Padding for future expansion */ - void (*_reserved1) (void); - void (*_reserved2) (void); - void (*_reserved3) (void); - void (*_reserved4) (void); + /*< private >*/ + gpointer padding[4]; } NMSettingWirelessClass; GType nm_setting_wireless_get_type (void); diff --git a/libnm-core/nm-setting.h b/libnm-core/nm-setting.h index 8f250c2ef4..62778edadc 100644 --- a/libnm-core/nm-setting.h +++ b/libnm-core/nm-setting.h @@ -190,21 +190,21 @@ typedef struct { NMSettingSecretFlags flags, GError **error); + gboolean (*clear_secrets_with_flags) (NMSetting *setting, + GParamSpec *pspec, + NMSettingClearSecretsWithFlagsFn func, + gpointer user_data); + /* Returns TRUE if the given property contains the same value in both settings */ gboolean (*compare_property) (NMSetting *setting, NMSetting *other, const GParamSpec *prop_spec, NMSettingCompareFlags flags); - gboolean (*clear_secrets_with_flags) (NMSetting *setting, - GParamSpec *pspec, - NMSettingClearSecretsWithFlagsFn func, - gpointer user_data); - const char *(*get_virtual_iface_name) (NMSetting *setting); - /* Padding for future expansion */ - void (*_reserved1) (void); + /*< private >*/ + gpointer padding[8]; } NMSettingClass; /** diff --git a/libnm/nm-access-point.h b/libnm/nm-access-point.h index df62c7cc5b..f483cb33e3 100644 --- a/libnm/nm-access-point.h +++ b/libnm/nm-access-point.h @@ -58,13 +58,8 @@ typedef struct { typedef struct { NMObjectClass parent; - /* Padding for future expansion */ - void (*_reserved1) (void); - void (*_reserved2) (void); - void (*_reserved3) (void); - void (*_reserved4) (void); - void (*_reserved5) (void); - void (*_reserved6) (void); + /*< private >*/ + gpointer padding[4]; } NMAccessPointClass; GType nm_access_point_get_type (void); diff --git a/libnm/nm-active-connection.h b/libnm/nm-active-connection.h index 9c429c1ba8..3c389d8492 100644 --- a/libnm/nm-active-connection.h +++ b/libnm/nm-active-connection.h @@ -64,13 +64,8 @@ typedef struct { typedef struct { NMObjectClass parent; - /* Padding for future expansion */ - void (*_reserved1) (void); - void (*_reserved2) (void); - void (*_reserved3) (void); - void (*_reserved4) (void); - void (*_reserved5) (void); - void (*_reserved6) (void); + /*< private >*/ + gpointer padding[8]; } NMActiveConnectionClass; GType nm_active_connection_get_type (void); diff --git a/libnm/nm-client.h b/libnm/nm-client.h index 553c1fdb02..9fa3203c13 100644 --- a/libnm/nm-client.h +++ b/libnm/nm-client.h @@ -154,13 +154,8 @@ typedef struct { NMClientPermission permission, NMClientPermissionResult result); - /* Padding for future expansion */ - void (*_reserved1) (void); - void (*_reserved2) (void); - void (*_reserved3) (void); - void (*_reserved4) (void); - void (*_reserved5) (void); - void (*_reserved6) (void); + /*< private >*/ + gpointer padding[8]; } NMClientClass; GType nm_client_get_type (void); diff --git a/libnm/nm-device-adsl.h b/libnm/nm-device-adsl.h index 35d2731a2c..109c667e7b 100644 --- a/libnm/nm-device-adsl.h +++ b/libnm/nm-device-adsl.h @@ -56,13 +56,8 @@ typedef struct { typedef struct { NMDeviceClass parent; - /* Padding for future expansion */ - void (*_reserved1) (void); - void (*_reserved2) (void); - void (*_reserved3) (void); - void (*_reserved4) (void); - void (*_reserved5) (void); - void (*_reserved6) (void); + /*< private >*/ + gpointer padding[4]; } NMDeviceAdslClass; GType nm_device_adsl_get_type (void); diff --git a/libnm/nm-device-bond.h b/libnm/nm-device-bond.h index cd1a60271f..8893430103 100644 --- a/libnm/nm-device-bond.h +++ b/libnm/nm-device-bond.h @@ -60,13 +60,8 @@ typedef struct { typedef struct { NMDeviceClass parent; - /* Padding for future expansion */ - void (*_reserved1) (void); - void (*_reserved2) (void); - void (*_reserved3) (void); - void (*_reserved4) (void); - void (*_reserved5) (void); - void (*_reserved6) (void); + /*< private >*/ + gpointer padding[4]; } NMDeviceBondClass; GType nm_device_bond_get_type (void); diff --git a/libnm/nm-device-bridge.h b/libnm/nm-device-bridge.h index 93b17b2ce8..73ae852cc9 100644 --- a/libnm/nm-device-bridge.h +++ b/libnm/nm-device-bridge.h @@ -60,13 +60,8 @@ typedef struct { typedef struct { NMDeviceClass parent; - /* Padding for future expansion */ - void (*_reserved1) (void); - void (*_reserved2) (void); - void (*_reserved3) (void); - void (*_reserved4) (void); - void (*_reserved5) (void); - void (*_reserved6) (void); + /*< private >*/ + gpointer padding[4]; } NMDeviceBridgeClass; GType nm_device_bridge_get_type (void); diff --git a/libnm/nm-device-bt.h b/libnm/nm-device-bt.h index 51dc86e39e..6ed7b55ba6 100644 --- a/libnm/nm-device-bt.h +++ b/libnm/nm-device-bt.h @@ -66,13 +66,8 @@ typedef struct { typedef struct { NMDeviceClass parent; - /* Padding for future expansion */ - void (*_reserved1) (void); - void (*_reserved2) (void); - void (*_reserved3) (void); - void (*_reserved4) (void); - void (*_reserved5) (void); - void (*_reserved6) (void); + /*< private >*/ + gpointer padding[4]; } NMDeviceBtClass; GType nm_device_bt_get_type (void); diff --git a/libnm/nm-device-ethernet.h b/libnm/nm-device-ethernet.h index be289cdfcc..5fcff108e9 100644 --- a/libnm/nm-device-ethernet.h +++ b/libnm/nm-device-ethernet.h @@ -64,13 +64,8 @@ typedef struct { typedef struct { NMDeviceClass parent; - /* Padding for future expansion */ - void (*_reserved1) (void); - void (*_reserved2) (void); - void (*_reserved3) (void); - void (*_reserved4) (void); - void (*_reserved5) (void); - void (*_reserved6) (void); + /*< private >*/ + gpointer padding[4]; } NMDeviceEthernetClass; GType nm_device_ethernet_get_type (void); diff --git a/libnm/nm-device-generic.h b/libnm/nm-device-generic.h index 901bde2e4e..7d4b28a26f 100644 --- a/libnm/nm-device-generic.h +++ b/libnm/nm-device-generic.h @@ -57,13 +57,8 @@ typedef struct { typedef struct { NMDeviceClass parent; - /* Padding for future expansion */ - void (*_reserved1) (void); - void (*_reserved2) (void); - void (*_reserved3) (void); - void (*_reserved4) (void); - void (*_reserved5) (void); - void (*_reserved6) (void); + /*< private >*/ + gpointer padding[4]; } NMDeviceGenericClass; GType nm_device_generic_get_type (void); diff --git a/libnm/nm-device-infiniband.h b/libnm/nm-device-infiniband.h index ba587d93b9..9c131380b9 100644 --- a/libnm/nm-device-infiniband.h +++ b/libnm/nm-device-infiniband.h @@ -61,13 +61,8 @@ typedef struct { typedef struct { NMDeviceClass parent; - /* Padding for future expansion */ - void (*_reserved1) (void); - void (*_reserved2) (void); - void (*_reserved3) (void); - void (*_reserved4) (void); - void (*_reserved5) (void); - void (*_reserved6) (void); + /*< private >*/ + gpointer padding[4]; } NMDeviceInfinibandClass; GType nm_device_infiniband_get_type (void); diff --git a/libnm/nm-device-modem.h b/libnm/nm-device-modem.h index 226cd04695..683685cbb5 100644 --- a/libnm/nm-device-modem.h +++ b/libnm/nm-device-modem.h @@ -60,13 +60,8 @@ typedef struct { typedef struct { NMDeviceClass parent; - /* Padding for future expansion */ - void (*_reserved1) (void); - void (*_reserved2) (void); - void (*_reserved3) (void); - void (*_reserved4) (void); - void (*_reserved5) (void); - void (*_reserved6) (void); + /*< private >*/ + gpointer padding[4]; } NMDeviceModemClass; GType nm_device_modem_get_type (void); diff --git a/libnm/nm-device-olpc-mesh.h b/libnm/nm-device-olpc-mesh.h index fcef83bcd1..d24468f8b2 100644 --- a/libnm/nm-device-olpc-mesh.h +++ b/libnm/nm-device-olpc-mesh.h @@ -59,13 +59,8 @@ typedef struct { typedef struct { NMDeviceClass parent; - /* Padding for future expansion */ - void (*_reserved1) (void); - void (*_reserved2) (void); - void (*_reserved3) (void); - void (*_reserved4) (void); - void (*_reserved5) (void); - void (*_reserved6) (void); + /*< private >*/ + gpointer padding[4]; } NMDeviceOlpcMeshClass; GType nm_device_olpc_mesh_get_type (void); diff --git a/libnm/nm-device-team.h b/libnm/nm-device-team.h index 074cf73ba8..e88ab89057 100644 --- a/libnm/nm-device-team.h +++ b/libnm/nm-device-team.h @@ -60,13 +60,8 @@ typedef struct { typedef struct { NMDeviceClass parent; - /* Padding for future expansion */ - void (*_reserved1) (void); - void (*_reserved2) (void); - void (*_reserved3) (void); - void (*_reserved4) (void); - void (*_reserved5) (void); - void (*_reserved6) (void); + /*< private >*/ + gpointer padding[4]; } NMDeviceTeamClass; GType nm_device_team_get_type (void); diff --git a/libnm/nm-device-vlan.h b/libnm/nm-device-vlan.h index 511d02215b..e4a7ac2b46 100644 --- a/libnm/nm-device-vlan.h +++ b/libnm/nm-device-vlan.h @@ -64,13 +64,8 @@ typedef struct { typedef struct { NMDeviceClass parent; - /* Padding for future expansion */ - void (*_reserved1) (void); - void (*_reserved2) (void); - void (*_reserved3) (void); - void (*_reserved4) (void); - void (*_reserved5) (void); - void (*_reserved6) (void); + /*< private >*/ + gpointer padding[4]; } NMDeviceVlanClass; GType nm_device_vlan_get_type (void); diff --git a/libnm/nm-device-wifi.h b/libnm/nm-device-wifi.h index 2bb432a7b0..a57430ace0 100644 --- a/libnm/nm-device-wifi.h +++ b/libnm/nm-device-wifi.h @@ -78,13 +78,8 @@ typedef struct { void (*access_point_added) (NMDeviceWifi *device, NMAccessPoint *ap); void (*access_point_removed) (NMDeviceWifi *device, NMAccessPoint *ap); - /* Padding for future expansion */ - void (*_reserved1) (void); - void (*_reserved2) (void); - void (*_reserved3) (void); - void (*_reserved4) (void); - void (*_reserved5) (void); - void (*_reserved6) (void); + /*< private >*/ + gpointer padding[4]; } NMDeviceWifiClass; GType nm_device_wifi_get_type (void); diff --git a/libnm/nm-device-wimax.h b/libnm/nm-device-wimax.h index 1b889d95fe..0726d81aca 100644 --- a/libnm/nm-device-wimax.h +++ b/libnm/nm-device-wimax.h @@ -72,6 +72,9 @@ typedef struct { /* Signals */ void (*nsp_added) (NMDeviceWimax *self, NMWimaxNsp *nsp); void (*nsp_removed) (NMDeviceWimax *self, NMWimaxNsp *nsp); + + /*< private >*/ + gpointer padding[4]; } NMDeviceWimaxClass; GType nm_device_wimax_get_type (void); diff --git a/libnm/nm-device.h b/libnm/nm-device.h index 87d1e30e41..8bffd0bb50 100644 --- a/libnm/nm-device.h +++ b/libnm/nm-device.h @@ -94,6 +94,7 @@ typedef struct { NMDeviceState old_state, NMDeviceStateReason reason); + /* Methods */ gboolean (*connection_compatible) (NMDevice *device, NMConnection *connection, GError **error); @@ -103,10 +104,8 @@ typedef struct { GType (*get_setting_type) (NMDevice *device); - /* Padding for future expansion */ - void (*_reserved1) (void); - void (*_reserved2) (void); - void (*_reserved3) (void); + /*< private >*/ + gpointer padding[8]; } NMDeviceClass; GType nm_device_get_type (void); diff --git a/libnm/nm-dhcp4-config.h b/libnm/nm-dhcp4-config.h index 996cdd133b..52eeb6bc66 100644 --- a/libnm/nm-dhcp4-config.h +++ b/libnm/nm-dhcp4-config.h @@ -42,13 +42,8 @@ typedef struct { typedef struct { NMObjectClass parent; - /* Padding for future expansion */ - void (*_reserved1) (void); - void (*_reserved2) (void); - void (*_reserved3) (void); - void (*_reserved4) (void); - void (*_reserved5) (void); - void (*_reserved6) (void); + /*< private >*/ + gpointer padding[4]; } NMDhcp4ConfigClass; #define NM_DHCP4_CONFIG_OPTIONS "options" diff --git a/libnm/nm-dhcp6-config.h b/libnm/nm-dhcp6-config.h index 2f21eed2d9..e9753bcad8 100644 --- a/libnm/nm-dhcp6-config.h +++ b/libnm/nm-dhcp6-config.h @@ -42,13 +42,8 @@ typedef struct { typedef struct { NMObjectClass parent; - /* Padding for future expansion */ - void (*_reserved1) (void); - void (*_reserved2) (void); - void (*_reserved3) (void); - void (*_reserved4) (void); - void (*_reserved5) (void); - void (*_reserved6) (void); + /*< private >*/ + gpointer padding[4]; } NMDhcp6ConfigClass; #define NM_DHCP6_CONFIG_OPTIONS "options" diff --git a/libnm/nm-ip4-config.h b/libnm/nm-ip4-config.h index 2ba8d3cd90..7e5732320f 100644 --- a/libnm/nm-ip4-config.h +++ b/libnm/nm-ip4-config.h @@ -43,13 +43,8 @@ typedef struct { typedef struct { NMObjectClass parent; - /* Padding for future expansion */ - void (*_reserved1) (void); - void (*_reserved2) (void); - void (*_reserved3) (void); - void (*_reserved4) (void); - void (*_reserved5) (void); - void (*_reserved6) (void); + /*< private >*/ + gpointer padding[4]; } NMIP4ConfigClass; #define NM_IP4_CONFIG_GATEWAY "gateway" diff --git a/libnm/nm-ip6-config.h b/libnm/nm-ip6-config.h index 9ec5eff95e..47d082b1e3 100644 --- a/libnm/nm-ip6-config.h +++ b/libnm/nm-ip6-config.h @@ -43,13 +43,8 @@ typedef struct { typedef struct { NMObjectClass parent; - /* Padding for future expansion */ - void (*_reserved1) (void); - void (*_reserved2) (void); - void (*_reserved3) (void); - void (*_reserved4) (void); - void (*_reserved5) (void); - void (*_reserved6) (void); + /*< private >*/ + gpointer padding[4]; } NMIP6ConfigClass; #define NM_IP6_CONFIG_GATEWAY "gateway" diff --git a/libnm/nm-object.h b/libnm/nm-object.h index 0990d4e2df..d50efafe91 100644 --- a/libnm/nm-object.h +++ b/libnm/nm-object.h @@ -72,13 +72,8 @@ typedef struct { GError *error, char *failed_path); - /* Padding for future expansion */ - void (*_reserved1) (void); - void (*_reserved2) (void); - void (*_reserved3) (void); - void (*_reserved4) (void); - void (*_reserved5) (void); - void (*_reserved6) (void); + /*< private >*/ + gpointer padding[8]; } NMObjectClass; GType nm_object_get_type (void); diff --git a/libnm/nm-remote-connection.h b/libnm/nm-remote-connection.h index 37f18d1d04..e437ab554b 100644 --- a/libnm/nm-remote-connection.h +++ b/libnm/nm-remote-connection.h @@ -70,13 +70,8 @@ typedef struct { void (*removed) (NMRemoteConnection *connection); - /* Padding for future expansion */ - void (*_reserved1) (void); - void (*_reserved2) (void); - void (*_reserved3) (void); - void (*_reserved4) (void); - void (*_reserved5) (void); - void (*_reserved6) (void); + /*< private >*/ + gpointer padding[8]; } NMRemoteConnectionClass; /** diff --git a/libnm/nm-remote-settings.h b/libnm/nm-remote-settings.h index d8ed0cf5bc..12156d19fd 100644 --- a/libnm/nm-remote-settings.h +++ b/libnm/nm-remote-settings.h @@ -99,13 +99,8 @@ struct _NMRemoteSettingsClass { void (*connections_read) (NMRemoteSettings *settings); - /* Padding for future expansion */ - void (*_reserved1) (void); - void (*_reserved2) (void); - void (*_reserved3) (void); - void (*_reserved4) (void); - void (*_reserved5) (void); - void (*_reserved6) (void); + /*< private >*/ + gpointer padding[8]; }; GType nm_remote_settings_get_type (void); diff --git a/libnm/nm-secret-agent.h b/libnm/nm-secret-agent.h index a4c9877c2c..ad315d7fce 100644 --- a/libnm/nm-secret-agent.h +++ b/libnm/nm-secret-agent.h @@ -166,6 +166,9 @@ typedef void (*NMSecretAgentDeleteSecretsFunc) (NMSecretAgent *agent, typedef struct { GObjectClass parent; + /* Signals */ + void (*registration_result) (NMSecretAgent *agent, GError *error); + /* Virtual methods for subclasses */ /* Called when the subclass should retrieve and return secrets. Subclass @@ -218,16 +221,8 @@ typedef struct { NMSecretAgentDeleteSecretsFunc callback, gpointer user_data); - /* Signals */ - void (*registration_result) (NMSecretAgent *agent, GError *error); - - /* Padding for future expansion */ - void (*_reserved1) (void); - void (*_reserved2) (void); - void (*_reserved3) (void); - void (*_reserved4) (void); - void (*_reserved5) (void); - void (*_reserved6) (void); + /*< private >*/ + gpointer padding[8]; } NMSecretAgentClass; GType nm_secret_agent_get_type (void); diff --git a/libnm/nm-vpn-connection.h b/libnm/nm-vpn-connection.h index 665244c6d3..c38d902860 100644 --- a/libnm/nm-vpn-connection.h +++ b/libnm/nm-vpn-connection.h @@ -52,13 +52,8 @@ typedef struct { NMVpnConnectionState state, NMVpnConnectionStateReason reason); - /* Padding for future expansion */ - void (*_reserved1) (void); - void (*_reserved2) (void); - void (*_reserved3) (void); - void (*_reserved4) (void); - void (*_reserved5) (void); - void (*_reserved6) (void); + /*< private >*/ + gpointer padding[4]; } NMVpnConnectionClass; GType nm_vpn_connection_get_type (void); diff --git a/libnm/nm-vpn-plugin-ui-interface.h b/libnm/nm-vpn-plugin-ui-interface.h index d29d93794e..cc3c4943bd 100644 --- a/libnm/nm-vpn-plugin-ui-interface.h +++ b/libnm/nm-vpn-plugin-ui-interface.h @@ -134,14 +134,6 @@ struct _NMVpnPluginUiInterface { * by the caller. */ char * (*get_suggested_name) (NMVpnPluginUiInterface *iface, NMConnection *connection); - - /* Padding for future expansion */ - void (*_reserved1) (void); - void (*_reserved2) (void); - void (*_reserved3) (void); - void (*_reserved4) (void); - void (*_reserved5) (void); - void (*_reserved6) (void); }; GType nm_vpn_plugin_ui_interface_get_type (void); diff --git a/libnm/nm-vpn-plugin.h b/libnm/nm-vpn-plugin.h index 1ee64e97cf..055c4ab411 100644 --- a/libnm/nm-vpn-plugin.h +++ b/libnm/nm-vpn-plugin.h @@ -89,19 +89,6 @@ typedef struct { typedef struct { GObjectClass parent; - /* virtual methods */ - gboolean (*connect) (NMVpnPlugin *plugin, - NMConnection *connection, - GError **err); - - gboolean (*need_secrets) (NMVpnPlugin *plugin, - NMConnection *connection, - char **setting_name, - GError **error); - - gboolean (*disconnect) (NMVpnPlugin *plugin, - GError **err); - /* Signals */ void (*state_changed) (NMVpnPlugin *plugin, NMVpnServiceState state); @@ -123,7 +110,19 @@ typedef struct { void (*ip6_config) (NMVpnPlugin *plugin, GHashTable *config); - /* more methods */ + /* virtual methods */ + gboolean (*connect) (NMVpnPlugin *plugin, + NMConnection *connection, + GError **err); + + gboolean (*need_secrets) (NMVpnPlugin *plugin, + NMConnection *connection, + char **setting_name, + GError **error); + + gboolean (*disconnect) (NMVpnPlugin *plugin, + GError **err); + gboolean (*new_secrets) (NMVpnPlugin *plugin, NMConnection *connection, GError **error); @@ -133,9 +132,8 @@ typedef struct { GHashTable *details, GError **error); - /* Padding for future expansion */ - void (*_reserved1) (void); - void (*_reserved2) (void); + /*< private >*/ + gpointer padding[8]; } NMVpnPluginClass; GType nm_vpn_plugin_get_type (void); diff --git a/libnm/nm-wimax-nsp.h b/libnm/nm-wimax-nsp.h index e0cfe1e895..57a915991c 100644 --- a/libnm/nm-wimax-nsp.h +++ b/libnm/nm-wimax-nsp.h @@ -54,13 +54,8 @@ typedef struct { typedef struct { NMObjectClass parent; - /* Padding for future expansion */ - void (*_reserved1) (void); - void (*_reserved2) (void); - void (*_reserved3) (void); - void (*_reserved4) (void); - void (*_reserved5) (void); - void (*_reserved6) (void); + /*< private >*/ + gpointer padding[4]; } NMWimaxNspClass; GType nm_wimax_nsp_get_type (void); |