Commit 2fc55941 authored by Dan Winship's avatar Dan Winship

libnm: fix up class struct reserved slots

Add reserved slots to those classes that were missing them (or had run
out), and sync up the number of slots across classes:

  - 8 slots for "important" classes, abstract base classes, and
    classes we expect we might need to add new virtual methods or
    signals to later.

  - 4 for everything else

Also, rearrange the class elements in a few places into standard order
(signals first, then methods).
parent bdda66a8
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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;
/**
......
......@@ -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;
/**
......
......@@ -60,6 +60,9 @@ typedef struct {
typedef struct {
NMSettingClass parent;
/*< private >*/
gpointer padding[4];
} NMSettingWimaxClass;
GType nm_setting_wimax_get_type (void);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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;
/**
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -60,13 +60,8 @@ typedef struct {
typedef struct {
NMDeviceClass parent;
/* Padding for future expansion */
void (*_reserved1) (void);
void (*_reserved2) (void);