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).

29 files changed, 74 insertions, 207 deletions

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);