[evolution-data-server/wip/camel-more-gobject] Add/remove/update reserved "Padding for future expansion" for Camel classes



commit f62ad035b5c1e584e1905daa8365d4ddd0246225
Author: Milan Crha <mcrha redhat com>
Date:   Tue Nov 1 18:18:05 2016 +0100

    Add/remove/update reserved "Padding for future expansion" for Camel classes

 src/camel/camel-address.h                          |    3 +++
 src/camel/camel-block-file.h                       |    6 ++++++
 src/camel/camel-certdb.h                           |    3 +++
 src/camel/camel-cipher-context.h                   |    4 ++--
 src/camel/camel-data-cache.h                       |    3 +++
 src/camel/camel-data-wrapper.h                     |    4 ++--
 src/camel/camel-filter-driver.h                    |    3 +++
 src/camel/camel-filter-input-stream.h              |    3 +++
 src/camel/camel-filter-output-stream.h             |    3 +++
 src/camel/camel-folder-search.h                    |    3 +++
 src/camel/camel-folder.h                           |   10 +++++-----
 src/camel/camel-gpg-context.h                      |    3 +++
 src/camel/camel-html-parser.h                      |    3 +++
 src/camel/camel-index.h                            |    3 +++
 src/camel/camel-internet-address.h                 |    3 +++
 src/camel/camel-junk-filter.h                      |    3 +++
 src/camel/camel-local-settings.h                   |    3 +++
 src/camel/camel-medium.h                           |    3 +++
 src/camel/camel-message-info-base.h                |    3 +++
 src/camel/camel-mime-filter-basic.h                |    3 +++
 src/camel/camel-mime-filter-bestenc.h              |    3 +++
 src/camel/camel-mime-filter-canon.h                |    3 +++
 src/camel/camel-mime-filter-charset.h              |    3 +++
 src/camel/camel-mime-filter-crlf.h                 |    3 +++
 src/camel/camel-mime-filter-enriched.h             |    3 +++
 src/camel/camel-mime-filter-from.h                 |    3 +++
 src/camel/camel-mime-filter-gzip.h                 |    3 +++
 src/camel/camel-mime-filter-html.h                 |    3 +++
 src/camel/camel-mime-filter-index.h                |    3 +++
 src/camel/camel-mime-filter-linewrap.h             |    3 +++
 src/camel/camel-mime-filter-pgp.h                  |    3 +++
 src/camel/camel-mime-filter-progress.h             |    3 +++
 src/camel/camel-mime-filter-tohtml.h               |    3 +++
 src/camel/camel-mime-filter-windows.h              |    3 +++
 src/camel/camel-mime-filter-yenc.h                 |    3 +++
 src/camel/camel-mime-filter.h                      |    3 +++
 src/camel/camel-mime-message.h                     |    3 +++
 src/camel/camel-mime-parser.h                      |    3 +++
 src/camel/camel-mime-part.h                        |    4 ++--
 src/camel/camel-multipart-encrypted.h              |    2 ++
 src/camel/camel-multipart-signed.h                 |    3 +++
 src/camel/camel-multipart.h                        |    3 +++
 src/camel/camel-network-service.h                  |    3 ++-
 src/camel/camel-network-settings.h                 |    3 +++
 src/camel/camel-nntp-address.h                     |    3 +++
 src/camel/camel-null-output-stream.h               |    3 +++
 src/camel/camel-object.h                           |    3 +++
 src/camel/camel-offline-folder.h                   |    4 ++--
 src/camel/camel-offline-settings.h                 |    3 +++
 src/camel/camel-offline-store.h                    |    3 +++
 src/camel/camel-operation.h                        |    3 +++
 src/camel/camel-partition-table.h                  |    6 ++++++
 src/camel/camel-sasl-anonymous.h                   |    3 +++
 src/camel/camel-sasl-cram-md5.h                    |    3 +++
 src/camel/camel-sasl-digest-md5.h                  |    3 +++
 src/camel/camel-sasl-gssapi.h                      |    3 +++
 src/camel/camel-sasl-login.h                       |    3 +++
 src/camel/camel-sasl-ntlm.h                        |    3 +++
 src/camel/camel-sasl-plain.h                       |    3 +++
 src/camel/camel-sasl-popb4smtp.h                   |    3 +++
 src/camel/camel-sasl.h                             |    4 ++--
 src/camel/camel-service.h                          |    4 ++--
 src/camel/camel-session.h                          |    7 +++++--
 src/camel/camel-settings.h                         |    3 +++
 src/camel/camel-sexp.h                             |    3 +++
 src/camel/camel-smime-context.h                    |    3 +++
 src/camel/camel-store-settings.h                   |    3 +++
 src/camel/camel-store-summary.h                    |    3 +++
 src/camel/camel-store.h                            |   10 +++++-----
 src/camel/camel-stream-buffer.h                    |    3 +++
 src/camel/camel-stream-filter.h                    |    3 +++
 src/camel/camel-stream-fs.h                        |    3 +++
 src/camel/camel-stream-mem.h                       |    3 +++
 src/camel/camel-stream-null.h                      |    3 +++
 src/camel/camel-stream-process.h                   |    3 +++
 src/camel/camel-stream.h                           |    3 +++
 src/camel/camel-subscribable.h                     |    7 +++++--
 src/camel/camel-text-index.h                       |   12 ++++++++++++
 src/camel/camel-transport.h                        |    4 ++--
 src/camel/camel-vee-data-cache.h                   |    9 +++++++++
 src/camel/camel-vee-folder.h                       |    3 +++
 src/camel/camel-vee-message-info.h                 |    3 +++
 src/camel/camel-vee-store.h                        |    3 +++
 src/camel/camel-vee-summary.h                      |    3 +++
 src/camel/camel-vtrash-folder.h                    |    3 +++
 .../providers/imapx/camel-imapx-conn-manager.h     |    3 +++
 src/camel/providers/imapx/camel-imapx-folder.h     |    3 +++
 .../providers/imapx/camel-imapx-input-stream.h     |    3 +++
 src/camel/providers/imapx/camel-imapx-job.h        |    1 -
 .../providers/imapx/camel-imapx-list-response.h    |    3 +++
 src/camel/providers/imapx/camel-imapx-logger.h     |    3 +++
 src/camel/providers/imapx/camel-imapx-mailbox.h    |    3 +++
 .../providers/imapx/camel-imapx-message-info.h     |    3 +++
 .../imapx/camel-imapx-namespace-response.h         |    3 +++
 src/camel/providers/imapx/camel-imapx-namespace.h  |    3 +++
 src/camel/providers/imapx/camel-imapx-search.h     |    3 +++
 src/camel/providers/imapx/camel-imapx-server.h     |    3 +++
 src/camel/providers/imapx/camel-imapx-settings.h   |    3 +++
 .../providers/imapx/camel-imapx-status-response.h  |    3 +++
 .../providers/imapx/camel-imapx-store-summary.h    |    3 +++
 src/camel/providers/imapx/camel-imapx-store.h      |    3 +++
 src/camel/providers/imapx/camel-imapx-summary.h    |    3 +++
 src/camel/providers/local/camel-local-folder.h     |    3 +++
 src/camel/providers/local/camel-local-store.h      |    3 +++
 src/camel/providers/local/camel-local-summary.h    |    3 +++
 src/camel/providers/local/camel-maildir-folder.h   |    3 +++
 .../providers/local/camel-maildir-message-info.h   |    3 +++
 src/camel/providers/local/camel-maildir-store.h    |    3 +++
 src/camel/providers/local/camel-maildir-summary.h  |    3 +++
 src/camel/providers/local/camel-mbox-folder.h      |    3 +++
 .../providers/local/camel-mbox-message-info.h      |    3 +++
 src/camel/providers/local/camel-mbox-store.h       |    3 +++
 src/camel/providers/local/camel-mbox-summary.h     |    3 +++
 src/camel/providers/local/camel-mh-folder.h        |    3 +++
 src/camel/providers/local/camel-mh-settings.h      |    3 +++
 src/camel/providers/local/camel-mh-store.h         |    3 +++
 src/camel/providers/local/camel-mh-summary.h       |    3 +++
 src/camel/providers/local/camel-spool-folder.h     |    3 +++
 src/camel/providers/local/camel-spool-settings.h   |    3 +++
 src/camel/providers/local/camel-spool-store.h      |    3 +++
 src/camel/providers/local/camel-spool-summary.h    |    4 +++-
 src/camel/providers/nntp/camel-nntp-folder.h       |    3 +++
 src/camel/providers/nntp/camel-nntp-settings.h     |    3 +++
 .../providers/nntp/camel-nntp-store-summary.h      |    3 +++
 src/camel/providers/nntp/camel-nntp-store.h        |    3 +++
 src/camel/providers/nntp/camel-nntp-stream.h       |    3 +++
 src/camel/providers/nntp/camel-nntp-summary.h      |    3 +++
 src/camel/providers/pop3/camel-pop3-engine.h       |    3 +++
 src/camel/providers/pop3/camel-pop3-folder.h       |    3 +++
 src/camel/providers/pop3/camel-pop3-settings.h     |    3 +++
 src/camel/providers/pop3/camel-pop3-store.h        |    3 +++
 src/camel/providers/pop3/camel-pop3-stream.h       |    3 +++
 .../providers/sendmail/camel-sendmail-settings.h   |    3 +++
 .../providers/sendmail/camel-sendmail-transport.h  |    3 +++
 src/camel/providers/smtp/camel-smtp-settings.h     |    3 +++
 src/camel/providers/smtp/camel-smtp-transport.h    |    3 +++
 136 files changed, 425 insertions(+), 31 deletions(-)
---
diff --git a/src/camel/camel-address.h b/src/camel/camel-address.h
index 186d6cd..31c52a5 100644
--- a/src/camel/camel-address.h
+++ b/src/camel/camel-address.h
@@ -72,6 +72,9 @@ struct _CamelAddressClass {
                                                 CamelAddress *source);
        void            (*remove)               (CamelAddress *addr,
                                                 gint index);
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_address_get_type          (void);
diff --git a/src/camel/camel-block-file.h b/src/camel/camel-block-file.h
index 9c02075..93f7101 100644
--- a/src/camel/camel-block-file.h
+++ b/src/camel/camel-block-file.h
@@ -135,6 +135,9 @@ struct _CamelBlockFileClass {
 
        gint (*validate_root)(CamelBlockFile *bs);
        gint (*init_root)(CamelBlockFile *bs);
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_block_file_get_type       (void);
@@ -180,6 +183,9 @@ struct _CamelKeyFile {
 
 struct _CamelKeyFileClass {
        GObjectClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType      camel_key_file_get_type (void);
diff --git a/src/camel/camel-certdb.h b/src/camel/camel-certdb.h
index 6f0b092..cf289f7 100644
--- a/src/camel/camel-certdb.h
+++ b/src/camel/camel-certdb.h
@@ -91,6 +91,9 @@ struct _CamelCertDBClass {
        gint            (*cert_save)            (CamelCertDB *certdb,
                                                 CamelCert *cert,
                                                 FILE *ostream);
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_cert_get_type             (void) G_GNUC_CONST;
diff --git a/src/camel/camel-cipher-context.h b/src/camel/camel-cipher-context.h
index 191a24d..6ad74b6 100644
--- a/src/camel/camel-cipher-context.h
+++ b/src/camel/camel-cipher-context.h
@@ -182,8 +182,8 @@ struct _CamelCipherContextClass {
                                                 GCancellable *cancellable,
                                                 GError **error);
 
-       /* Reserved slots. */
-       gpointer reserved[8];
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_cipher_context_get_type   (void);
diff --git a/src/camel/camel-data-cache.h b/src/camel/camel-data-cache.h
index 97a468e..3d616ee 100644
--- a/src/camel/camel-data-cache.h
+++ b/src/camel/camel-data-cache.h
@@ -59,6 +59,9 @@ struct _CamelDataCache {
 
 struct _CamelDataCacheClass {
        GObjectClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_data_cache_get_type       (void);
diff --git a/src/camel/camel-data-wrapper.h b/src/camel/camel-data-wrapper.h
index 0e70224..de57dec 100644
--- a/src/camel/camel-data-wrapper.h
+++ b/src/camel/camel-data-wrapper.h
@@ -110,8 +110,8 @@ struct _CamelDataWrapperClass {
                                                 GCancellable *cancellable,
                                                 GError **error);
 
-       /* Reserved slots. */
-       gpointer reserved[3];
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_data_wrapper_get_type     (void);
diff --git a/src/camel/camel-filter-driver.h b/src/camel/camel-filter-driver.h
index 383b5e0..8425863 100644
--- a/src/camel/camel-filter-driver.h
+++ b/src/camel/camel-filter-driver.h
@@ -61,6 +61,9 @@ struct _CamelFilterDriver {
 
 struct _CamelFilterDriverClass {
        GObjectClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 /* FIXME: this maybe should change... */
diff --git a/src/camel/camel-filter-input-stream.h b/src/camel/camel-filter-input-stream.h
index abc8f3d..1740a4d 100644
--- a/src/camel/camel-filter-input-stream.h
+++ b/src/camel/camel-filter-input-stream.h
@@ -57,6 +57,9 @@ struct _CamelFilterInputStream {
 
 struct _CamelFilterInputStreamClass {
        GFilterInputStreamClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_filter_input_stream_get_type
diff --git a/src/camel/camel-filter-output-stream.h b/src/camel/camel-filter-output-stream.h
index 064f851..b089f80 100644
--- a/src/camel/camel-filter-output-stream.h
+++ b/src/camel/camel-filter-output-stream.h
@@ -57,6 +57,9 @@ struct _CamelFilterOutputStream {
 
 struct _CamelFilterOutputStreamClass {
        GFilterOutputStreamClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_filter_output_stream_get_type
diff --git a/src/camel/camel-folder-search.h b/src/camel/camel-folder-search.h
index 7c88f68..351caa3 100644
--- a/src/camel/camel-folder-search.h
+++ b/src/camel/camel-folder-search.h
@@ -263,6 +263,9 @@ struct _CamelFolderSearchClass {
                                                 gint argc,
                                                 CamelSExpResult **argv,
                                                 CamelFolderSearch *search);
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_folder_search_get_type    (void) G_GNUC_CONST;
diff --git a/src/camel/camel-folder.h b/src/camel/camel-folder.h
index b9f9bf5..86fadd8 100644
--- a/src/camel/camel-folder.h
+++ b/src/camel/camel-folder.h
@@ -127,9 +127,6 @@ struct _CamelFolder {
 
        CamelFolderFlags folder_flags;
        guint32 permanent_flags; /* bit-or of CamelMessageFlags */
-
-       /* Future ABI expansion */
-       gpointer later[4];
 };
 
 struct _CamelFolderClass {
@@ -253,8 +250,8 @@ struct _CamelFolderClass {
        void            (*prepare_content_refresh)
                                                (CamelFolder *folder);
 
-       /* Reserved slots for methods. */
-       gpointer reserved_for_methods[19];
+       /* Padding for future expansion */
+       gpointer reserved_methods[20];
 
        /* Signals */
        void            (*changed)              (CamelFolder *folder,
@@ -262,6 +259,9 @@ struct _CamelFolderClass {
        void            (*deleted)              (CamelFolder *folder);
        void            (*renamed)              (CamelFolder *folder,
                                                 const gchar *old_name);
+
+       /* Padding for future expansion */
+       gpointer reserved_signals[20];
 };
 
 GType          camel_folder_get_type           (void);
diff --git a/src/camel/camel-gpg-context.h b/src/camel/camel-gpg-context.h
index 763bc23..667f74e 100644
--- a/src/camel/camel-gpg-context.h
+++ b/src/camel/camel-gpg-context.h
@@ -59,6 +59,9 @@ struct _CamelGpgContext {
 
 struct _CamelGpgContextClass {
        CamelCipherContextClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_gpg_context_get_type      (void);
diff --git a/src/camel/camel-html-parser.h b/src/camel/camel-html-parser.h
index b299a4d..06d8d82 100644
--- a/src/camel/camel-html-parser.h
+++ b/src/camel/camel-html-parser.h
@@ -82,6 +82,9 @@ struct _CamelHTMLParser {
 
 struct _CamelHTMLParserClass {
        GObjectClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_html_parser_get_type      (void);
diff --git a/src/camel/camel-index.h b/src/camel/camel-index.h
index 8ed26bd..fa49ddc 100644
--- a/src/camel/camel-index.h
+++ b/src/camel/camel-index.h
@@ -109,6 +109,9 @@ struct _CamelIndexCursorClass {
        GObjectClass parent;
 
        const gchar * (*next) (CamelIndexCursor *idc);
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType           camel_index_cursor_get_type (void);
diff --git a/src/camel/camel-internet-address.h b/src/camel/camel-internet-address.h
index 4253abb..9562460 100644
--- a/src/camel/camel-internet-address.h
+++ b/src/camel/camel-internet-address.h
@@ -58,6 +58,9 @@ struct _CamelInternetAddress {
 
 struct _CamelInternetAddressClass {
        CamelAddressClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_internet_address_get_type (void);
diff --git a/src/camel/camel-junk-filter.h b/src/camel/camel-junk-filter.h
index b27064f..b36abe7 100644
--- a/src/camel/camel-junk-filter.h
+++ b/src/camel/camel-junk-filter.h
@@ -75,6 +75,9 @@ struct _CamelJunkFilterInterface {
        gboolean        (*synchronize)          (CamelJunkFilter *junk_filter,
                                                 GCancellable *cancellable,
                                                 GError **error);
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_junk_filter_get_type      (void) G_GNUC_CONST;
diff --git a/src/camel/camel-local-settings.h b/src/camel/camel-local-settings.h
index 6ae5d1d..eedb42b 100644
--- a/src/camel/camel-local-settings.h
+++ b/src/camel/camel-local-settings.h
@@ -64,6 +64,9 @@ struct _CamelLocalSettings {
 
 struct _CamelLocalSettingsClass {
        CamelStoreSettingsClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_local_settings_get_type   (void) G_GNUC_CONST;
diff --git a/src/camel/camel-medium.h b/src/camel/camel-medium.h
index b509ae4..6d59275 100644
--- a/src/camel/camel-medium.h
+++ b/src/camel/camel-medium.h
@@ -78,6 +78,9 @@ struct _CamelMediumClass {
                        (*get_content)          (CamelMedium *medium);
        void            (*set_content)          (CamelMedium *medium,
                                                 CamelDataWrapper *content);
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_medium_get_type           (void);
diff --git a/src/camel/camel-message-info-base.h b/src/camel/camel-message-info-base.h
index 70b8a0e..4343467 100644
--- a/src/camel/camel-message-info-base.h
+++ b/src/camel/camel-message-info-base.h
@@ -58,6 +58,9 @@ struct _CamelMessageInfoBase {
 
 struct _CamelMessageInfoBaseClass {
        CamelMessageInfoClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_message_info_base_get_type        (void);
diff --git a/src/camel/camel-mime-filter-basic.h b/src/camel/camel-mime-filter-basic.h
index a393632..8ad4f29 100644
--- a/src/camel/camel-mime-filter-basic.h
+++ b/src/camel/camel-mime-filter-basic.h
@@ -59,6 +59,9 @@ struct _CamelMimeFilterBasic {
 
 struct _CamelMimeFilterBasicClass {
        CamelMimeFilterClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_mime_filter_basic_get_type (void);
diff --git a/src/camel/camel-mime-filter-bestenc.h b/src/camel/camel-mime-filter-bestenc.h
index 9d5f95b..ff4a190 100644
--- a/src/camel/camel-mime-filter-bestenc.h
+++ b/src/camel/camel-mime-filter-bestenc.h
@@ -79,6 +79,9 @@ struct _CamelMimeFilterBestenc {
 
 struct _CamelMimeFilterBestencClass {
        CamelMimeFilterClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_mime_filter_bestenc_get_type (void);
diff --git a/src/camel/camel-mime-filter-canon.h b/src/camel/camel-mime-filter-canon.h
index 7a725d0..495a065 100644
--- a/src/camel/camel-mime-filter-canon.h
+++ b/src/camel/camel-mime-filter-canon.h
@@ -65,6 +65,9 @@ struct _CamelMimeFilterCanon {
 
 struct _CamelMimeFilterCanonClass {
        CamelMimeFilterClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_mime_filter_canon_get_type (void);
diff --git a/src/camel/camel-mime-filter-charset.h b/src/camel/camel-mime-filter-charset.h
index a3336dd..27d743c 100644
--- a/src/camel/camel-mime-filter-charset.h
+++ b/src/camel/camel-mime-filter-charset.h
@@ -59,6 +59,9 @@ struct _CamelMimeFilterCharset {
 
 struct _CamelMimeFilterCharsetClass {
        CamelMimeFilterClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_mime_filter_charset_get_type (void);
diff --git a/src/camel/camel-mime-filter-crlf.h b/src/camel/camel-mime-filter-crlf.h
index 3c2ae69..47dc502 100644
--- a/src/camel/camel-mime-filter-crlf.h
+++ b/src/camel/camel-mime-filter-crlf.h
@@ -60,6 +60,9 @@ struct _CamelMimeFilterCRLF {
 
 struct _CamelMimeFilterCRLFClass {
        CamelMimeFilterClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_mime_filter_crlf_get_type (void);
diff --git a/src/camel/camel-mime-filter-enriched.h b/src/camel/camel-mime-filter-enriched.h
index 0ffad8e..fbdf797 100644
--- a/src/camel/camel-mime-filter-enriched.h
+++ b/src/camel/camel-mime-filter-enriched.h
@@ -60,6 +60,9 @@ struct _CamelMimeFilterEnriched {
 
 struct _CamelMimeFilterEnrichedClass {
        CamelMimeFilterClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_mime_filter_enriched_get_type (void);
diff --git a/src/camel/camel-mime-filter-from.h b/src/camel/camel-mime-filter-from.h
index 86b3d20..93f6aef 100644
--- a/src/camel/camel-mime-filter-from.h
+++ b/src/camel/camel-mime-filter-from.h
@@ -58,6 +58,9 @@ struct _CamelMimeFilterFrom {
 
 struct _CamelMimeFilterFromClass {
        CamelMimeFilterClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_mime_filter_from_get_type (void);
diff --git a/src/camel/camel-mime-filter-gzip.h b/src/camel/camel-mime-filter-gzip.h
index ac2ca5f..0b92411 100644
--- a/src/camel/camel-mime-filter-gzip.h
+++ b/src/camel/camel-mime-filter-gzip.h
@@ -59,6 +59,9 @@ struct _CamelMimeFilterGZip {
 
 struct _CamelMimeFilterGZipClass {
        CamelMimeFilterClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_mime_filter_gzip_get_type (void);
diff --git a/src/camel/camel-mime-filter-html.h b/src/camel/camel-mime-filter-html.h
index 71e9a9e..664b897 100644
--- a/src/camel/camel-mime-filter-html.h
+++ b/src/camel/camel-mime-filter-html.h
@@ -58,6 +58,9 @@ struct _CamelMimeFilterHTML {
 
 struct _CamelMimeFilterHTMLClass {
        CamelMimeFilterClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_mime_filter_html_get_type (void);
diff --git a/src/camel/camel-mime-filter-index.h b/src/camel/camel-mime-filter-index.h
index 3ca3881..80a425f 100644
--- a/src/camel/camel-mime-filter-index.h
+++ b/src/camel/camel-mime-filter-index.h
@@ -59,6 +59,9 @@ struct _CamelMimeFilterIndex {
 
 struct _CamelMimeFilterIndexClass {
        CamelMimeFilterClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_mime_filter_index_get_type (void);
diff --git a/src/camel/camel-mime-filter-linewrap.h b/src/camel/camel-mime-filter-linewrap.h
index 51bf6b7..a1229d1 100644
--- a/src/camel/camel-mime-filter-linewrap.h
+++ b/src/camel/camel-mime-filter-linewrap.h
@@ -63,6 +63,9 @@ struct _CamelMimeFilterLinewrap {
 
 struct _CamelMimeFilterLinewrapClass {
        CamelMimeFilterClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_mime_filter_linewrap_get_type (void);
diff --git a/src/camel/camel-mime-filter-pgp.h b/src/camel/camel-mime-filter-pgp.h
index a2b9155..11ab23b 100644
--- a/src/camel/camel-mime-filter-pgp.h
+++ b/src/camel/camel-mime-filter-pgp.h
@@ -58,6 +58,9 @@ struct _CamelMimeFilterPgp {
 
 struct _CamelMimeFilterPgpClass {
        CamelMimeFilterClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_mime_filter_pgp_get_type  (void);
diff --git a/src/camel/camel-mime-filter-progress.h b/src/camel/camel-mime-filter-progress.h
index 9f8a19c..e76f5b8 100644
--- a/src/camel/camel-mime-filter-progress.h
+++ b/src/camel/camel-mime-filter-progress.h
@@ -65,6 +65,9 @@ struct _CamelMimeFilterProgress {
 
 struct _CamelMimeFilterProgressClass {
        CamelMimeFilterClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_mime_filter_progress_get_type (void);
diff --git a/src/camel/camel-mime-filter-tohtml.h b/src/camel/camel-mime-filter-tohtml.h
index a0b9d2a..ef6d384 100644
--- a/src/camel/camel-mime-filter-tohtml.h
+++ b/src/camel/camel-mime-filter-tohtml.h
@@ -59,6 +59,9 @@ struct _CamelMimeFilterToHTML {
 
 struct _CamelMimeFilterToHTMLClass {
        CamelMimeFilterClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_mime_filter_tohtml_get_type (void);
diff --git a/src/camel/camel-mime-filter-windows.h b/src/camel/camel-mime-filter-windows.h
index 17a3d2a..99fcd0a 100644
--- a/src/camel/camel-mime-filter-windows.h
+++ b/src/camel/camel-mime-filter-windows.h
@@ -58,6 +58,9 @@ struct _CamelMimeFilterWindows {
 
 struct _CamelMimeFilterWindowsClass {
        CamelMimeFilterClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_mime_filter_windows_get_type (void);
diff --git a/src/camel/camel-mime-filter-yenc.h b/src/camel/camel-mime-filter-yenc.h
index fa9d6d7..8fce654 100644
--- a/src/camel/camel-mime-filter-yenc.h
+++ b/src/camel/camel-mime-filter-yenc.h
@@ -78,6 +78,9 @@ struct _CamelMimeFilterYenc {
 
 struct _CamelMimeFilterYencClass {
        CamelMimeFilterClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_mime_filter_yenc_get_type (void);
diff --git a/src/camel/camel-mime-filter.h b/src/camel/camel-mime-filter.h
index a064aed..45dfc0d 100644
--- a/src/camel/camel-mime-filter.h
+++ b/src/camel/camel-mime-filter.h
@@ -88,6 +88,9 @@ struct _CamelMimeFilterClass {
                                                 gsize *outlen,
                                                 gsize *outprespace);
        void            (*reset)                (CamelMimeFilter *filter);
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_mime_filter_get_type      (void);
diff --git a/src/camel/camel-mime-message.h b/src/camel/camel-mime-message.h
index 026de17..5511d84 100644
--- a/src/camel/camel-mime-message.h
+++ b/src/camel/camel-mime-message.h
@@ -89,6 +89,9 @@ struct _CamelMimeMessage {
 
 struct _CamelMimeMessageClass {
        CamelMimePartClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_mime_message_get_type     (void);
diff --git a/src/camel/camel-mime-parser.h b/src/camel/camel-mime-parser.h
index a50da80..7fc0dfe 100644
--- a/src/camel/camel-mime-parser.h
+++ b/src/camel/camel-mime-parser.h
@@ -89,6 +89,9 @@ struct _CamelMimeParserClass {
        void (*message) (CamelMimeParser *parser, gpointer headers);
        void (*part) (CamelMimeParser *parser);
        void (*content) (CamelMimeParser *parser);
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType camel_mime_parser_get_type (void);
diff --git a/src/camel/camel-mime-part.h b/src/camel/camel-mime-part.h
index 9284b17..0e5fa4d 100644
--- a/src/camel/camel-mime-part.h
+++ b/src/camel/camel-mime-part.h
@@ -72,8 +72,8 @@ struct _CamelMimePartClass {
                                                 GCancellable *cancellable,
                                                 GError **error);
 
-       /* Reserved slots. */
-       gpointer reserved[2];
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_mime_part_get_type        (void);
diff --git a/src/camel/camel-multipart-encrypted.h b/src/camel/camel-multipart-encrypted.h
index dedb469..2566538 100644
--- a/src/camel/camel-multipart-encrypted.h
+++ b/src/camel/camel-multipart-encrypted.h
@@ -65,6 +65,8 @@ struct _CamelMultipartEncrypted {
 struct _CamelMultipartEncryptedClass {
        CamelMultipartClass parent_class;
 
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_multipart_encrypted_get_type      (void) G_GNUC_CONST;
diff --git a/src/camel/camel-multipart-signed.h b/src/camel/camel-multipart-signed.h
index 6d84d0f..aef7d5f 100644
--- a/src/camel/camel-multipart-signed.h
+++ b/src/camel/camel-multipart-signed.h
@@ -69,6 +69,9 @@ struct _CamelMultipartSigned {
 
 struct _CamelMultipartSignedClass {
        CamelMultipartClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_multipart_signed_get_type (void) G_GNUC_CONST;
diff --git a/src/camel/camel-multipart.h b/src/camel/camel-multipart.h
index 171b0eb..8284edc 100644
--- a/src/camel/camel-multipart.h
+++ b/src/camel/camel-multipart.h
@@ -73,6 +73,9 @@ struct _CamelMultipartClass {
        gint            (*construct_from_parser)
                                                (CamelMultipart *multipart,
                                                 CamelMimeParser *parser);
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_multipart_get_type        (void) G_GNUC_CONST;
diff --git a/src/camel/camel-network-service.h b/src/camel/camel-network-service.h
index 4795e9b..92e75a8 100644
--- a/src/camel/camel-network-service.h
+++ b/src/camel/camel-network-service.h
@@ -73,7 +73,8 @@ struct _CamelNetworkServiceInterface {
                        (*new_connectable)
                                        (CamelNetworkService *service);
 
-       gpointer reserved[15];
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_network_service_get_type  (void) G_GNUC_CONST;
diff --git a/src/camel/camel-network-settings.h b/src/camel/camel-network-settings.h
index db79485..9158bf1 100644
--- a/src/camel/camel-network-settings.h
+++ b/src/camel/camel-network-settings.h
@@ -56,6 +56,9 @@ typedef struct _CamelNetworkSettingsInterface CamelNetworkSettingsInterface;
 
 struct _CamelNetworkSettingsInterface {
        GTypeInterface parent_interface;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_network_settings_get_type
diff --git a/src/camel/camel-nntp-address.h b/src/camel/camel-nntp-address.h
index 096fcf2..da60b0b 100644
--- a/src/camel/camel-nntp-address.h
+++ b/src/camel/camel-nntp-address.h
@@ -58,6 +58,9 @@ struct _CamelNNTPAddress {
 
 struct _CamelNNTPAddressClass {
        CamelAddressClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_nntp_address_get_type     (void);
diff --git a/src/camel/camel-null-output-stream.h b/src/camel/camel-null-output-stream.h
index f113ae4..978763d 100644
--- a/src/camel/camel-null-output-stream.h
+++ b/src/camel/camel-null-output-stream.h
@@ -56,6 +56,9 @@ struct _CamelNullOutputStream {
 
 struct _CamelNullOutputStreamClass {
        GOutputStreamClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_null_output_stream_get_type
diff --git a/src/camel/camel-object.h b/src/camel/camel-object.h
index 1d96f82..5e76c01 100644
--- a/src/camel/camel-object.h
+++ b/src/camel/camel-object.h
@@ -101,6 +101,9 @@ struct _CamelObjectClass {
                                                 FILE *fp);
        gint            (*state_write)          (CamelObject *object,
                                                 FILE *fp);
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_object_get_type           (void);
diff --git a/src/camel/camel-offline-folder.h b/src/camel/camel-offline-folder.h
index 0182cb3..4d04344 100644
--- a/src/camel/camel-offline-folder.h
+++ b/src/camel/camel-offline-folder.h
@@ -66,8 +66,8 @@ struct _CamelOfflineFolderClass {
                                                 GCancellable *cancellable,
                                                 GError **error);
 
-       /* Reserved slots. */
-       gpointer reserved[2];
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_offline_folder_get_type   (void);
diff --git a/src/camel/camel-offline-settings.h b/src/camel/camel-offline-settings.h
index b336a62..c0a562e 100644
--- a/src/camel/camel-offline-settings.h
+++ b/src/camel/camel-offline-settings.h
@@ -64,6 +64,9 @@ struct _CamelOfflineSettings {
 
 struct _CamelOfflineSettingsClass {
        CamelStoreSettingsClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_offline_settings_get_type
diff --git a/src/camel/camel-offline-store.h b/src/camel/camel-offline-store.h
index 35e5ddc..3ca4400 100644
--- a/src/camel/camel-offline-store.h
+++ b/src/camel/camel-offline-store.h
@@ -58,6 +58,9 @@ struct _CamelOfflineStore {
 
 struct _CamelOfflineStoreClass {
        CamelStoreClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_offline_store_get_type (void);
diff --git a/src/camel/camel-operation.h b/src/camel/camel-operation.h
index d8cbd9f..1452470 100644
--- a/src/camel/camel-operation.h
+++ b/src/camel/camel-operation.h
@@ -61,6 +61,9 @@ struct _CamelOperationClass {
        void            (*status)               (CamelOperation *operation,
                                                 const gchar *what,
                                                 gint pc);
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_operation_get_type        (void);
diff --git a/src/camel/camel-partition-table.h b/src/camel/camel-partition-table.h
index 8689d4b..4842f77 100644
--- a/src/camel/camel-partition-table.h
+++ b/src/camel/camel-partition-table.h
@@ -116,6 +116,9 @@ struct _CamelPartitionTable {
 
 struct _CamelPartitionTableClass {
        GObjectClass parent;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_partition_table_get_type  (void);
@@ -179,6 +182,9 @@ struct _CamelKeyTable {
 
 struct _CamelKeyTableClass {
        GObjectClass parent;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_key_table_get_type        (void);
diff --git a/src/camel/camel-sasl-anonymous.h b/src/camel/camel-sasl-anonymous.h
index 56c570e..6a45af3 100644
--- a/src/camel/camel-sasl-anonymous.h
+++ b/src/camel/camel-sasl-anonymous.h
@@ -60,6 +60,9 @@ struct _CamelSaslAnonymous {
 
 struct _CamelSaslAnonymousClass {
        CamelSaslClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType camel_sasl_anonymous_get_type (void);
diff --git a/src/camel/camel-sasl-cram-md5.h b/src/camel/camel-sasl-cram-md5.h
index 352c6f3..d885796 100644
--- a/src/camel/camel-sasl-cram-md5.h
+++ b/src/camel/camel-sasl-cram-md5.h
@@ -58,6 +58,9 @@ struct _CamelSaslCramMd5 {
 
 struct _CamelSaslCramMd5Class {
        CamelSaslClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType camel_sasl_cram_md5_get_type (void);
diff --git a/src/camel/camel-sasl-digest-md5.h b/src/camel/camel-sasl-digest-md5.h
index 9e30fa4..1b5da6d 100644
--- a/src/camel/camel-sasl-digest-md5.h
+++ b/src/camel/camel-sasl-digest-md5.h
@@ -59,6 +59,9 @@ struct _CamelSaslDigestMd5 {
 
 struct _CamelSaslDigestMd5Class {
        CamelSaslClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType camel_sasl_digest_md5_get_type (void);
diff --git a/src/camel/camel-sasl-gssapi.h b/src/camel/camel-sasl-gssapi.h
index 7629fb3..4e87ba9 100644
--- a/src/camel/camel-sasl-gssapi.h
+++ b/src/camel/camel-sasl-gssapi.h
@@ -59,6 +59,9 @@ struct _CamelSaslGssapi {
 
 struct _CamelSaslGssapiClass {
        CamelSaslClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_sasl_gssapi_get_type      (void);
diff --git a/src/camel/camel-sasl-login.h b/src/camel/camel-sasl-login.h
index 41a53cf..6fab83b 100644
--- a/src/camel/camel-sasl-login.h
+++ b/src/camel/camel-sasl-login.h
@@ -58,6 +58,9 @@ struct _CamelSaslLogin {
 
 struct _CamelSaslLoginClass {
        CamelSaslClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType camel_sasl_login_get_type (void);
diff --git a/src/camel/camel-sasl-ntlm.h b/src/camel/camel-sasl-ntlm.h
index 31d0630..095250f 100644
--- a/src/camel/camel-sasl-ntlm.h
+++ b/src/camel/camel-sasl-ntlm.h
@@ -57,6 +57,9 @@ struct _CamelSaslNTLM {
 
 struct _CamelSaslNTLMClass {
        CamelSaslClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType camel_sasl_ntlm_get_type (void);
diff --git a/src/camel/camel-sasl-plain.h b/src/camel/camel-sasl-plain.h
index 8bdf7f1..f21c9d3 100644
--- a/src/camel/camel-sasl-plain.h
+++ b/src/camel/camel-sasl-plain.h
@@ -58,6 +58,9 @@ struct _CamelSaslPlain {
 
 struct _CamelSaslPlainClass {
        CamelSaslClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType camel_sasl_plain_get_type (void);
diff --git a/src/camel/camel-sasl-popb4smtp.h b/src/camel/camel-sasl-popb4smtp.h
index a079d39..1fa6731 100644
--- a/src/camel/camel-sasl-popb4smtp.h
+++ b/src/camel/camel-sasl-popb4smtp.h
@@ -58,6 +58,9 @@ struct _CamelSaslPOPB4SMTP {
 
 struct _CamelSaslPOPB4SMTPClass {
        CamelSaslClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType camel_sasl_popb4smtp_get_type (void);
diff --git a/src/camel/camel-sasl.h b/src/camel/camel-sasl.h
index e167199..befc009 100644
--- a/src/camel/camel-sasl.h
+++ b/src/camel/camel-sasl.h
@@ -72,8 +72,8 @@ struct _CamelSaslClass {
                                                 GCancellable *cancellable,
                                                 GError **error);
 
-       /* Reserved slots. */
-       gpointer reserved[4];
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_sasl_get_type             (void);
diff --git a/src/camel/camel-service.h b/src/camel/camel-service.h
index bb5cc21..fe04223 100644
--- a/src/camel/camel-service.h
+++ b/src/camel/camel-service.h
@@ -115,8 +115,8 @@ struct _CamelServiceClass {
                                                 GCancellable *cancellable,
                                                 GError **error);
 
-       /* Reserved slots. */
-       gpointer reserved[8];
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 /* query_auth_types returns a GList of these */
diff --git a/src/camel/camel-session.h b/src/camel/camel-session.h
index e837e0f..1745ac6 100644
--- a/src/camel/camel-session.h
+++ b/src/camel/camel-session.h
@@ -132,8 +132,8 @@ struct _CamelSessionClass {
                                                 GCancellable *cancellable,
                                                 GError **error);
 
-       /* Reserved slots for methods. */
-       gpointer reserved_for_methods[4];
+       /* Padding for future expansion */
+       gpointer reserved_methods[20];
 
        /* Signals */
        void            (*job_started)          (CamelSession *session,
@@ -145,6 +145,9 @@ struct _CamelSessionClass {
                                                 CamelService *service,
                                                 CamelSessionAlertType type,
                                                 const gchar *message);
+
+       /* Padding for future expansion */
+       gpointer reserved_signals[20];
 };
 
 GType          camel_session_get_type          (void);
diff --git a/src/camel/camel-settings.h b/src/camel/camel-settings.h
index 3781b82..c8dcd89 100644
--- a/src/camel/camel-settings.h
+++ b/src/camel/camel-settings.h
@@ -72,6 +72,9 @@ struct _CamelSettingsClass {
        CamelSettings * (*clone)                (CamelSettings *settings);
        gboolean        (*equal)                (CamelSettings *settings_a,
                                                 CamelSettings *settings_b);
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_settings_get_type         (void) G_GNUC_CONST;
diff --git a/src/camel/camel-sexp.h b/src/camel/camel-sexp.h
index d4d9aa7..301b7a0 100644
--- a/src/camel/camel-sexp.h
+++ b/src/camel/camel-sexp.h
@@ -186,6 +186,9 @@ struct _CamelSExp {
 
 struct _CamelSExpClass {
        GObjectClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_sexp_get_type             (void) G_GNUC_CONST;
diff --git a/src/camel/camel-smime-context.h b/src/camel/camel-smime-context.h
index b1dd0e9..a24e8c2 100644
--- a/src/camel/camel-smime-context.h
+++ b/src/camel/camel-smime-context.h
@@ -71,6 +71,9 @@ struct _CamelSMIMEContext {
 
 struct _CamelSMIMEContextClass {
        CamelCipherContextClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType camel_smime_context_get_type (void);
diff --git a/src/camel/camel-store-settings.h b/src/camel/camel-store-settings.h
index a743cb1..be1b32a 100644
--- a/src/camel/camel-store-settings.h
+++ b/src/camel/camel-store-settings.h
@@ -64,6 +64,9 @@ struct _CamelStoreSettings {
 
 struct _CamelStoreSettingsClass {
        CamelSettingsClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_store_settings_get_type   (void) G_GNUC_CONST;
diff --git a/src/camel/camel-store-summary.h b/src/camel/camel-store-summary.h
index d46fa80..a05e7ce 100644
--- a/src/camel/camel-store-summary.h
+++ b/src/camel/camel-store-summary.h
@@ -112,6 +112,9 @@ struct _CamelStoreSummaryClass {
                                                 CamelStoreInfo *info,
                                                 gint type,
                                                 const gchar *value);
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_store_summary_get_type    (void) G_GNUC_CONST;
diff --git a/src/camel/camel-store.h b/src/camel/camel-store.h
index c0690cd..2820060 100644
--- a/src/camel/camel-store.h
+++ b/src/camel/camel-store.h
@@ -153,9 +153,6 @@ struct _CamelStore {
         *     The mode is only checked by the account combo box in
         *     Evolution's composer window. */
        CamelStorePermissionFlags mode;
-
-       /* Future ABI expansion */
-       gpointer later[4];
 };
 
 struct _CamelStoreClass {
@@ -216,8 +213,8 @@ struct _CamelStoreClass {
                                                 GCancellable *cancellable,
                                                 GError **error);
 
-       /* Reserved slots for methods. */
-       gpointer reserved_for_methods[20];
+       /* Padding for future expansion */
+       gpointer reserved_methods[20];
 
        /* Signals */
        void            (*folder_created)       (CamelStore *store,
@@ -230,6 +227,9 @@ struct _CamelStoreClass {
                                                 const gchar *old_name,
                                                 CamelFolderInfo *folder_info);
        void            (*folder_info_stale)    (CamelStore *store);
+
+       /* Padding for future expansion */
+       gpointer reserved_signals[20];
 };
 
 GType          camel_store_get_type            (void);
diff --git a/src/camel/camel-stream-buffer.h b/src/camel/camel-stream-buffer.h
index d7a014b..ef92cfd 100644
--- a/src/camel/camel-stream-buffer.h
+++ b/src/camel/camel-stream-buffer.h
@@ -77,6 +77,9 @@ struct _CamelStreamBufferClass {
                                         CamelStreamBufferMode mode,
                                         gchar *buf,
                                         guint32 size);
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_stream_buffer_get_type    (void);
diff --git a/src/camel/camel-stream-filter.h b/src/camel/camel-stream-filter.h
index 853ae17..c954a8d 100644
--- a/src/camel/camel-stream-filter.h
+++ b/src/camel/camel-stream-filter.h
@@ -59,6 +59,9 @@ struct _CamelStreamFilter {
 
 struct _CamelStreamFilterClass {
        CamelStreamClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_stream_filter_get_type    (void);
diff --git a/src/camel/camel-stream-fs.h b/src/camel/camel-stream-fs.h
index 31cfe8c..7c0547b 100644
--- a/src/camel/camel-stream-fs.h
+++ b/src/camel/camel-stream-fs.h
@@ -64,6 +64,9 @@ struct _CamelStreamFs {
 
 struct _CamelStreamFsClass {
        CamelStreamClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_stream_fs_get_type        (void);
diff --git a/src/camel/camel-stream-mem.h b/src/camel/camel-stream-mem.h
index 385ce86..02fcbd4 100644
--- a/src/camel/camel-stream-mem.h
+++ b/src/camel/camel-stream-mem.h
@@ -61,6 +61,9 @@ struct _CamelStreamMem {
 
 struct _CamelStreamMemClass {
        CamelStreamClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_stream_mem_get_type       (void);
diff --git a/src/camel/camel-stream-null.h b/src/camel/camel-stream-null.h
index d0d96d5..1fdcfde 100644
--- a/src/camel/camel-stream-null.h
+++ b/src/camel/camel-stream-null.h
@@ -58,6 +58,9 @@ struct _CamelStreamNull {
 
 struct _CamelStreamNullClass {
        CamelStreamClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType camel_stream_null_get_type (void);
diff --git a/src/camel/camel-stream-process.h b/src/camel/camel-stream-process.h
index 1c48645..4982232 100644
--- a/src/camel/camel-stream-process.h
+++ b/src/camel/camel-stream-process.h
@@ -59,6 +59,9 @@ struct _CamelStreamProcess {
 
 struct _CamelStreamProcessClass {
        CamelStreamClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_stream_process_get_type   (void);
diff --git a/src/camel/camel-stream.h b/src/camel/camel-stream.h
index 4e7571e..05d6c89 100644
--- a/src/camel/camel-stream.h
+++ b/src/camel/camel-stream.h
@@ -82,6 +82,9 @@ struct _CamelStreamClass {
                                                 GCancellable *cancellable,
                                                 GError **error);
        gboolean        (*eos)                  (CamelStream *stream);
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_stream_get_type           (void);
diff --git a/src/camel/camel-subscribable.h b/src/camel/camel-subscribable.h
index 6d53492..c0aafda 100644
--- a/src/camel/camel-subscribable.h
+++ b/src/camel/camel-subscribable.h
@@ -73,8 +73,8 @@ struct _CamelSubscribableInterface {
                                         GCancellable *cancellable,
                                         GError **error);
 
-       /* Reserved slots for methods. */
-       gpointer reserved_for_methods[4];
+       /* Padding for future expansion */
+       gpointer reserved_methods[20];
 
        /* Signals */
        void            (*folder_subscribed)
@@ -83,6 +83,9 @@ struct _CamelSubscribableInterface {
        void            (*folder_unsubscribed)
                                        (CamelSubscribable *subscribable,
                                         CamelFolderInfo *folder_info);
+
+       /* Padding for future expansion */
+       gpointer reserved_signals[20];
 };
 
 GType          camel_subscribable_get_type
diff --git a/src/camel/camel-text-index.h b/src/camel/camel-text-index.h
index c4e2750..9162cc8 100644
--- a/src/camel/camel-text-index.h
+++ b/src/camel/camel-text-index.h
@@ -127,6 +127,9 @@ struct _CamelTextIndexCursor {
 
 struct _CamelTextIndexCursorClass {
        CamelIndexCursorClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType camel_text_index_cursor_get_type (void);
@@ -140,6 +143,9 @@ struct _CamelTextIndexKeyCursor {
 
 struct _CamelTextIndexKeyCursorClass {
        CamelIndexCursorClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType camel_text_index_key_cursor_get_type (void);
@@ -153,6 +159,9 @@ struct _CamelTextIndexName {
 
 struct _CamelTextIndexNameClass {
        CamelIndexNameClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType camel_text_index_name_get_type (void);
@@ -166,6 +175,9 @@ struct _CamelTextIndex {
 
 struct _CamelTextIndexClass {
        CamelIndexClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_text_index_get_type       (void);
diff --git a/src/camel/camel-transport.h b/src/camel/camel-transport.h
index df51094..92e845c 100644
--- a/src/camel/camel-transport.h
+++ b/src/camel/camel-transport.h
@@ -71,8 +71,8 @@ struct _CamelTransportClass {
                                                 GCancellable *cancellable,
                                                 GError **error);
 
-       /* Reserved slots. */
-       gpointer reserved[2];
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_transport_get_type        (void);
diff --git a/src/camel/camel-vee-data-cache.h b/src/camel/camel-vee-data-cache.h
index 3228597..4220500 100644
--- a/src/camel/camel-vee-data-cache.h
+++ b/src/camel/camel-vee-data-cache.h
@@ -113,6 +113,9 @@ struct _CamelVeeSubfolderData {
 
 struct _CamelVeeSubfolderDataClass {
        GObjectClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_vee_subfolder_data_get_type
@@ -138,6 +141,9 @@ struct _CamelVeeMessageInfoData {
 
 struct _CamelVeeMessageInfoDataClass {
        GObjectClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_vee_message_info_data_get_type
@@ -168,6 +174,9 @@ struct _CamelVeeDataCache {
 
 struct _CamelVeeDataCacheClass {
        GObjectClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_vee_data_cache_get_type   (void) G_GNUC_CONST;
diff --git a/src/camel/camel-vee-folder.h b/src/camel/camel-vee-folder.h
index ebb43b7..522afdf 100644
--- a/src/camel/camel-vee-folder.h
+++ b/src/camel/camel-vee-folder.h
@@ -83,6 +83,9 @@ struct _CamelVeeFolderClass {
        void            (*folder_changed)       (CamelVeeFolder *vfolder,
                                                 CamelFolder *subfolder,
                                                 CamelFolderChangeInfo *changes);
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 #define CAMEL_UNMATCHED_NAME "UNMATCHED"
diff --git a/src/camel/camel-vee-message-info.h b/src/camel/camel-vee-message-info.h
index fa79459..3ba0b72 100644
--- a/src/camel/camel-vee-message-info.h
+++ b/src/camel/camel-vee-message-info.h
@@ -58,6 +58,9 @@ struct _CamelVeeMessageInfo {
 
 struct _CamelVeeMessageInfoClass {
        CamelMessageInfoClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_vee_message_info_get_type (void);
diff --git a/src/camel/camel-vee-store.h b/src/camel/camel-vee-store.h
index d0fde35..3857323 100644
--- a/src/camel/camel-vee-store.h
+++ b/src/camel/camel-vee-store.h
@@ -60,6 +60,9 @@ struct _CamelVeeStore {
 
 struct _CamelVeeStoreClass {
        CamelStoreClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType                  camel_vee_store_get_type                        (void);
diff --git a/src/camel/camel-vee-summary.h b/src/camel/camel-vee-summary.h
index 629b2f4..2fcf352 100644
--- a/src/camel/camel-vee-summary.h
+++ b/src/camel/camel-vee-summary.h
@@ -64,6 +64,9 @@ struct _CamelVeeSummary {
 
 struct _CamelVeeSummaryClass {
        CamelFolderSummaryClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_vee_summary_get_type      (void);
diff --git a/src/camel/camel-vtrash-folder.h b/src/camel/camel-vtrash-folder.h
index bf0c6d4..0c226d3 100644
--- a/src/camel/camel-vtrash-folder.h
+++ b/src/camel/camel-vtrash-folder.h
@@ -69,6 +69,9 @@ struct _CamelVTrashFolder {
 
 struct _CamelVTrashFolderClass {
        CamelVeeFolderClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_vtrash_folder_get_type    (void);
diff --git a/src/camel/providers/imapx/camel-imapx-conn-manager.h 
b/src/camel/providers/imapx/camel-imapx-conn-manager.h
index f0edd54..eac6db2 100644
--- a/src/camel/providers/imapx/camel-imapx-conn-manager.h
+++ b/src/camel/providers/imapx/camel-imapx-conn-manager.h
@@ -64,6 +64,9 @@ struct _CamelIMAPXConnManagerClass {
        /* Signals */
        void    (* connection_created) (CamelIMAPXConnManager *conn_man,
                                        CamelIMAPXServer *server);
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_imapx_conn_manager_get_type (void);
diff --git a/src/camel/providers/imapx/camel-imapx-folder.h b/src/camel/providers/imapx/camel-imapx-folder.h
index 12c3d9b..98d4bc0 100644
--- a/src/camel/providers/imapx/camel-imapx-folder.h
+++ b/src/camel/providers/imapx/camel-imapx-folder.h
@@ -65,6 +65,9 @@ struct _CamelIMAPXFolder {
 
 struct _CamelIMAPXFolderClass {
        CamelOfflineFolderClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_imapx_folder_get_type     (void);
diff --git a/src/camel/providers/imapx/camel-imapx-input-stream.h 
b/src/camel/providers/imapx/camel-imapx-input-stream.h
index e379a3a..f2a7cc4 100644
--- a/src/camel/providers/imapx/camel-imapx-input-stream.h
+++ b/src/camel/providers/imapx/camel-imapx-input-stream.h
@@ -68,6 +68,9 @@ struct _CamelIMAPXInputStream {
 
 struct _CamelIMAPXInputStreamClass {
        GFilterInputStreamClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GQuark         camel_imapx_error_quark         (void) G_GNUC_CONST;
diff --git a/src/camel/providers/imapx/camel-imapx-job.h b/src/camel/providers/imapx/camel-imapx-job.h
index de0c5d1..b27de5f 100644
--- a/src/camel/providers/imapx/camel-imapx-job.h
+++ b/src/camel/providers/imapx/camel-imapx-job.h
@@ -121,4 +121,3 @@ void                camel_imapx_job_wait_sync       (CamelIMAPXJob *job,
 G_END_DECLS
 
 #endif /* CAMEL_IMAPX_JOB_H */
-
diff --git a/src/camel/providers/imapx/camel-imapx-list-response.h 
b/src/camel/providers/imapx/camel-imapx-list-response.h
index b0419bf..3fdb38d 100644
--- a/src/camel/providers/imapx/camel-imapx-list-response.h
+++ b/src/camel/providers/imapx/camel-imapx-list-response.h
@@ -84,6 +84,9 @@ struct _CamelIMAPXListResponse {
 
 struct _CamelIMAPXListResponseClass {
        GObjectClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_imapx_list_response_get_type
diff --git a/src/camel/providers/imapx/camel-imapx-logger.h b/src/camel/providers/imapx/camel-imapx-logger.h
index cdf9231..d697ad4 100644
--- a/src/camel/providers/imapx/camel-imapx-logger.h
+++ b/src/camel/providers/imapx/camel-imapx-logger.h
@@ -60,6 +60,9 @@ struct _CamelIMAPXLogger {
 
 struct _CamelIMAPXLoggerClass {
        GObjectClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_imapx_logger_get_type     (void) G_GNUC_CONST;
diff --git a/src/camel/providers/imapx/camel-imapx-mailbox.h b/src/camel/providers/imapx/camel-imapx-mailbox.h
index 9ec86df..9421457 100644
--- a/src/camel/providers/imapx/camel-imapx-mailbox.h
+++ b/src/camel/providers/imapx/camel-imapx-mailbox.h
@@ -69,6 +69,9 @@ struct _CamelIMAPXMailbox {
 
 struct _CamelIMAPXMailboxClass {
        GObjectClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_imapx_mailbox_get_type
diff --git a/src/camel/providers/imapx/camel-imapx-message-info.h 
b/src/camel/providers/imapx/camel-imapx-message-info.h
index 748c75b..f553559 100644
--- a/src/camel/providers/imapx/camel-imapx-message-info.h
+++ b/src/camel/providers/imapx/camel-imapx-message-info.h
@@ -54,6 +54,9 @@ struct _CamelIMAPXMessageInfo {
 
 struct _CamelIMAPXMessageInfoClass {
        CamelMessageInfoBaseClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_imapx_message_info_get_type       (void);
diff --git a/src/camel/providers/imapx/camel-imapx-namespace-response.h 
b/src/camel/providers/imapx/camel-imapx-namespace-response.h
index 0321dd3..af71b8a 100644
--- a/src/camel/providers/imapx/camel-imapx-namespace-response.h
+++ b/src/camel/providers/imapx/camel-imapx-namespace-response.h
@@ -61,6 +61,9 @@ struct _CamelIMAPXNamespaceResponse {
 
 struct _CamelIMAPXNamespaceResponseClass {
        GObjectClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_imapx_namespace_response_get_type
diff --git a/src/camel/providers/imapx/camel-imapx-namespace.h 
b/src/camel/providers/imapx/camel-imapx-namespace.h
index d6fdb5f..5d42cf2 100644
--- a/src/camel/providers/imapx/camel-imapx-namespace.h
+++ b/src/camel/providers/imapx/camel-imapx-namespace.h
@@ -78,6 +78,9 @@ struct _CamelIMAPXNamespace {
 
 struct _CamelIMAPXNamespaceClass {
        GObjectClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_imapx_namespace_get_type
diff --git a/src/camel/providers/imapx/camel-imapx-search.h b/src/camel/providers/imapx/camel-imapx-search.h
index acdba79..93b8daa 100644
--- a/src/camel/providers/imapx/camel-imapx-search.h
+++ b/src/camel/providers/imapx/camel-imapx-search.h
@@ -62,6 +62,9 @@ struct _CamelIMAPXSearch {
 
 struct _CamelIMAPXSearchClass {
        CamelFolderSearchClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_imapx_search_get_type     (void) G_GNUC_CONST;
diff --git a/src/camel/providers/imapx/camel-imapx-server.h b/src/camel/providers/imapx/camel-imapx-server.h
index 16d5090..c51e005 100644
--- a/src/camel/providers/imapx/camel-imapx-server.h
+++ b/src/camel/providers/imapx/camel-imapx-server.h
@@ -114,6 +114,9 @@ struct _CamelIMAPXServerClass {
        /* Signals */
        void            (*refresh_mailbox)      (CamelIMAPXServer *is,
                                                 CamelIMAPXMailbox *mailbox);
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_imapx_server_get_type     (void);
diff --git a/src/camel/providers/imapx/camel-imapx-settings.h 
b/src/camel/providers/imapx/camel-imapx-settings.h
index f1e402e..4de7306 100644
--- a/src/camel/providers/imapx/camel-imapx-settings.h
+++ b/src/camel/providers/imapx/camel-imapx-settings.h
@@ -52,6 +52,9 @@ struct _CamelIMAPXSettings {
 
 struct _CamelIMAPXSettingsClass {
        CamelOfflineSettingsClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_imapx_settings_get_type   (void) G_GNUC_CONST;
diff --git a/src/camel/providers/imapx/camel-imapx-status-response.h 
b/src/camel/providers/imapx/camel-imapx-status-response.h
index 49af19a..47ce8cd 100644
--- a/src/camel/providers/imapx/camel-imapx-status-response.h
+++ b/src/camel/providers/imapx/camel-imapx-status-response.h
@@ -62,6 +62,9 @@ struct _CamelIMAPXStatusResponse {
 
 struct _CamelIMAPXStatusResponseClass {
        GObjectClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_imapx_status_response_get_type
diff --git a/src/camel/providers/imapx/camel-imapx-store-summary.h 
b/src/camel/providers/imapx/camel-imapx-store-summary.h
index 2d919d1..390bb74 100644
--- a/src/camel/providers/imapx/camel-imapx-store-summary.h
+++ b/src/camel/providers/imapx/camel-imapx-store-summary.h
@@ -60,6 +60,9 @@ struct _CamelIMAPXStoreSummary {
 
 struct _CamelIMAPXStoreSummaryClass {
        CamelStoreSummaryClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_imapx_store_summary_get_type
diff --git a/src/camel/providers/imapx/camel-imapx-store.h b/src/camel/providers/imapx/camel-imapx-store.h
index e25eccd..c9f5d2f 100644
--- a/src/camel/providers/imapx/camel-imapx-store.h
+++ b/src/camel/providers/imapx/camel-imapx-store.h
@@ -72,6 +72,9 @@ struct _CamelIMAPXStoreClass {
                                                 const gchar *oldname);
        void            (*mailbox_updated)      (CamelIMAPXStore *imapx_store,
                                                 CamelIMAPXMailbox *mailbox);
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_imapx_store_get_type      (void);
diff --git a/src/camel/providers/imapx/camel-imapx-summary.h b/src/camel/providers/imapx/camel-imapx-summary.h
index 0db09fa..3f4d989 100644
--- a/src/camel/providers/imapx/camel-imapx-summary.h
+++ b/src/camel/providers/imapx/camel-imapx-summary.h
@@ -66,6 +66,9 @@ struct _CamelIMAPXSummary {
 
 struct _CamelIMAPXSummaryClass {
        CamelFolderSummaryClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_imapx_summary_get_type    (void);
diff --git a/src/camel/providers/local/camel-local-folder.h b/src/camel/providers/local/camel-local-folder.h
index 00bcb8e..e09c410 100644
--- a/src/camel/providers/local/camel-local-folder.h
+++ b/src/camel/providers/local/camel-local-folder.h
@@ -89,6 +89,9 @@ struct _CamelLocalFolderClass {
 
        /* Unlock the folder for my operations */
        void            (*unlock)               (CamelLocalFolder *);
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_local_folder_get_type     (void);
diff --git a/src/camel/providers/local/camel-local-store.h b/src/camel/providers/local/camel-local-store.h
index 32e492f..a71d920 100644
--- a/src/camel/providers/local/camel-local-store.h
+++ b/src/camel/providers/local/camel-local-store.h
@@ -62,6 +62,9 @@ struct _CamelLocalStoreClass {
        gchar *         (*get_meta_path)        (CamelLocalStore *ls,
                                                 const gchar *full_name,
                                                 const gchar *ext);
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_local_store_get_type      (void);
diff --git a/src/camel/providers/local/camel-local-summary.h b/src/camel/providers/local/camel-local-summary.h
index cd230e5..35a7e05 100644
--- a/src/camel/providers/local/camel-local-summary.h
+++ b/src/camel/providers/local/camel-local-summary.h
@@ -75,6 +75,9 @@ struct _CamelLocalSummaryClass {
        gchar *(*encode_x_evolution)(CamelLocalSummary *cls, const CamelMessageInfo *info);
        gint (*decode_x_evolution)(CamelLocalSummary *cls, const gchar *xev, CamelMessageInfo *info);
        gint (*need_index)(void);
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType  camel_local_summary_get_type    (void);
diff --git a/src/camel/providers/local/camel-maildir-folder.h 
b/src/camel/providers/local/camel-maildir-folder.h
index 08a08de..cbafc03 100644
--- a/src/camel/providers/local/camel-maildir-folder.h
+++ b/src/camel/providers/local/camel-maildir-folder.h
@@ -52,6 +52,9 @@ struct _CamelMaildirFolder {
 
 struct _CamelMaildirFolderClass {
        CamelLocalFolderClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_maildir_folder_get_type   (void);
diff --git a/src/camel/providers/local/camel-maildir-message-info.h 
b/src/camel/providers/local/camel-maildir-message-info.h
index 226bf50..5264762 100644
--- a/src/camel/providers/local/camel-maildir-message-info.h
+++ b/src/camel/providers/local/camel-maildir-message-info.h
@@ -54,6 +54,9 @@ struct _CamelMaildirMessageInfo {
 
 struct _CamelMaildirMessageInfoClass {
        CamelMessageInfoBaseClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_maildir_message_info_get_type     (void);
diff --git a/src/camel/providers/local/camel-maildir-store.h b/src/camel/providers/local/camel-maildir-store.h
index d949597..dbae0da 100644
--- a/src/camel/providers/local/camel-maildir-store.h
+++ b/src/camel/providers/local/camel-maildir-store.h
@@ -54,6 +54,9 @@ struct _CamelMaildirStore {
 
 struct _CamelMaildirStoreClass {
        CamelLocalStoreClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType camel_maildir_store_get_type (void);
diff --git a/src/camel/providers/local/camel-maildir-summary.h 
b/src/camel/providers/local/camel-maildir-summary.h
index 61040d4..e188b54 100644
--- a/src/camel/providers/local/camel-maildir-summary.h
+++ b/src/camel/providers/local/camel-maildir-summary.h
@@ -62,6 +62,9 @@ struct _CamelMaildirSummary {
 
 struct _CamelMaildirSummaryClass {
        CamelLocalSummaryClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType   camel_maildir_summary_get_type (void);
diff --git a/src/camel/providers/local/camel-mbox-folder.h b/src/camel/providers/local/camel-mbox-folder.h
index f309d02..1e72efa 100644
--- a/src/camel/providers/local/camel-mbox-folder.h
+++ b/src/camel/providers/local/camel-mbox-folder.h
@@ -55,6 +55,9 @@ struct _CamelMboxFolder {
 
 struct _CamelMboxFolderClass {
        CamelLocalFolderClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_mbox_folder_get_type      (void);
diff --git a/src/camel/providers/local/camel-mbox-message-info.h 
b/src/camel/providers/local/camel-mbox-message-info.h
index 89d894d..c493d8d 100644
--- a/src/camel/providers/local/camel-mbox-message-info.h
+++ b/src/camel/providers/local/camel-mbox-message-info.h
@@ -54,6 +54,9 @@ struct _CamelMboxMessageInfo {
 
 struct _CamelMboxMessageInfoClass {
        CamelMessageInfoBaseClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_mbox_message_info_get_type        (void);
diff --git a/src/camel/providers/local/camel-mbox-store.h b/src/camel/providers/local/camel-mbox-store.h
index be38efd..82b8a56 100644
--- a/src/camel/providers/local/camel-mbox-store.h
+++ b/src/camel/providers/local/camel-mbox-store.h
@@ -52,6 +52,9 @@ struct _CamelMboxStore {
 
 struct _CamelMboxStoreClass {
        CamelLocalStoreClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType camel_mbox_store_get_type (void);
diff --git a/src/camel/providers/local/camel-mbox-summary.h b/src/camel/providers/local/camel-mbox-summary.h
index 594cca4..1c610c2 100644
--- a/src/camel/providers/local/camel-mbox-summary.h
+++ b/src/camel/providers/local/camel-mbox-summary.h
@@ -72,6 +72,9 @@ struct _CamelMboxSummaryClass {
                                                 CamelFolderChangeInfo *changeinfo,
                                                 GCancellable *cancellable,
                                                 GError **error);
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_mbox_summary_get_type     (void);
diff --git a/src/camel/providers/local/camel-mh-folder.h b/src/camel/providers/local/camel-mh-folder.h
index c905c2e..169abc1 100644
--- a/src/camel/providers/local/camel-mh-folder.h
+++ b/src/camel/providers/local/camel-mh-folder.h
@@ -51,6 +51,9 @@ struct _CamelMhFolder {
 
 struct _CamelMhFolderClass {
        CamelLocalFolderClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_mh_folder_get_type        (void);
diff --git a/src/camel/providers/local/camel-mh-settings.h b/src/camel/providers/local/camel-mh-settings.h
index 0ec8561..a9b633c 100644
--- a/src/camel/providers/local/camel-mh-settings.h
+++ b/src/camel/providers/local/camel-mh-settings.h
@@ -52,6 +52,9 @@ struct _CamelMhSettings {
 
 struct _CamelMhSettingsClass {
        CamelLocalSettingsClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_mh_settings_get_type      (void) G_GNUC_CONST;
diff --git a/src/camel/providers/local/camel-mh-store.h b/src/camel/providers/local/camel-mh-store.h
index c478d48..fd78f39 100644
--- a/src/camel/providers/local/camel-mh-store.h
+++ b/src/camel/providers/local/camel-mh-store.h
@@ -54,6 +54,9 @@ struct _CamelMhStore {
 
 struct _CamelMhStoreClass {
        CamelLocalStoreClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_mh_store_get_type         (void);
diff --git a/src/camel/providers/local/camel-mh-summary.h b/src/camel/providers/local/camel-mh-summary.h
index 3c3ef20..e99ab8a 100644
--- a/src/camel/providers/local/camel-mh-summary.h
+++ b/src/camel/providers/local/camel-mh-summary.h
@@ -53,6 +53,9 @@ struct _CamelMhSummary {
 
 struct _CamelMhSummaryClass {
        CamelLocalSummaryClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_mh_summary_get_type       (void);
diff --git a/src/camel/providers/local/camel-spool-folder.h b/src/camel/providers/local/camel-spool-folder.h
index 1de8e2d..88e1e6d 100644
--- a/src/camel/providers/local/camel-spool-folder.h
+++ b/src/camel/providers/local/camel-spool-folder.h
@@ -57,6 +57,9 @@ struct _CamelSpoolFolder {
 
 struct _CamelSpoolFolderClass {
        CamelMboxFolderClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_spool_folder_get_type     (void);
diff --git a/src/camel/providers/local/camel-spool-settings.h 
b/src/camel/providers/local/camel-spool-settings.h
index 5ee0ecc..53d8d5a 100644
--- a/src/camel/providers/local/camel-spool-settings.h
+++ b/src/camel/providers/local/camel-spool-settings.h
@@ -52,6 +52,9 @@ struct _CamelSpoolSettings {
 
 struct _CamelSpoolSettingsClass {
        CamelLocalSettingsClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_spool_settings_get_type   (void) G_GNUC_CONST;
diff --git a/src/camel/providers/local/camel-spool-store.h b/src/camel/providers/local/camel-spool-store.h
index d6974d1..d2e6e33 100644
--- a/src/camel/providers/local/camel-spool-store.h
+++ b/src/camel/providers/local/camel-spool-store.h
@@ -54,6 +54,9 @@ struct _CamelSpoolStore {
 
 struct _CamelSpoolStoreClass {
        CamelMboxStoreClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_spool_store_get_type      (void);
diff --git a/src/camel/providers/local/camel-spool-summary.h b/src/camel/providers/local/camel-spool-summary.h
index fdd4f91..bab4f92 100644
--- a/src/camel/providers/local/camel-spool-summary.h
+++ b/src/camel/providers/local/camel-spool-summary.h
@@ -49,11 +49,13 @@ typedef struct _CamelSpoolSummaryClass CamelSpoolSummaryClass;
 
 struct _CamelSpoolSummary {
        CamelMboxSummary parent;
-
 };
 
 struct _CamelSpoolSummaryClass {
        CamelMboxSummaryClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType  camel_spool_summary_get_type    (void);
diff --git a/src/camel/providers/nntp/camel-nntp-folder.h b/src/camel/providers/nntp/camel-nntp-folder.h
index 7f8308d..b3ba625 100644
--- a/src/camel/providers/nntp/camel-nntp-folder.h
+++ b/src/camel/providers/nntp/camel-nntp-folder.h
@@ -58,6 +58,9 @@ struct _CamelNNTPFolder {
 
 struct _CamelNNTPFolderClass {
        CamelOfflineFolderClass parent;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_nntp_folder_get_type      (void);
diff --git a/src/camel/providers/nntp/camel-nntp-settings.h b/src/camel/providers/nntp/camel-nntp-settings.h
index c934456..74b198e 100644
--- a/src/camel/providers/nntp/camel-nntp-settings.h
+++ b/src/camel/providers/nntp/camel-nntp-settings.h
@@ -52,6 +52,9 @@ struct _CamelNNTPSettings {
 
 struct _CamelNNTPSettingsClass {
        CamelOfflineSettingsClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_nntp_settings_get_type
diff --git a/src/camel/providers/nntp/camel-nntp-store-summary.h 
b/src/camel/providers/nntp/camel-nntp-store-summary.h
index c7cd5a5..40abc42 100644
--- a/src/camel/providers/nntp/camel-nntp-store-summary.h
+++ b/src/camel/providers/nntp/camel-nntp-store-summary.h
@@ -76,6 +76,9 @@ struct _CamelNNTPStoreSummary {
 
 struct _CamelNNTPStoreSummaryClass {
        CamelStoreSummaryClass summary_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_nntp_store_summary_get_type
diff --git a/src/camel/providers/nntp/camel-nntp-store.h b/src/camel/providers/nntp/camel-nntp-store.h
index 8050b96..69f1832 100644
--- a/src/camel/providers/nntp/camel-nntp-store.h
+++ b/src/camel/providers/nntp/camel-nntp-store.h
@@ -81,6 +81,9 @@ struct _CamelNNTPStore {
 
 struct _CamelNNTPStoreClass {
        CamelOfflineStoreClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_nntp_store_get_type       (void);
diff --git a/src/camel/providers/nntp/camel-nntp-stream.h b/src/camel/providers/nntp/camel-nntp-stream.h
index a54ca16..cb33405 100644
--- a/src/camel/providers/nntp/camel-nntp-stream.h
+++ b/src/camel/providers/nntp/camel-nntp-stream.h
@@ -65,6 +65,9 @@ struct _CamelNNTPStream {
 
 struct _CamelNNTPStreamClass {
        CamelStreamClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_nntp_stream_get_type      (void);
diff --git a/src/camel/providers/nntp/camel-nntp-summary.h b/src/camel/providers/nntp/camel-nntp-summary.h
index 941721a..f8a2c36 100644
--- a/src/camel/providers/nntp/camel-nntp-summary.h
+++ b/src/camel/providers/nntp/camel-nntp-summary.h
@@ -59,6 +59,9 @@ struct _CamelNNTPSummary {
 
 struct _CamelNNTPSummaryClass {
        CamelFolderSummaryClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_nntp_summary_get_type     (void);
diff --git a/src/camel/providers/pop3/camel-pop3-engine.h b/src/camel/providers/pop3/camel-pop3-engine.h
index c71a464..768fd6f 100644
--- a/src/camel/providers/pop3/camel-pop3-engine.h
+++ b/src/camel/providers/pop3/camel-pop3-engine.h
@@ -139,6 +139,9 @@ struct _CamelPOP3Engine {
 
 struct _CamelPOP3EngineClass {
        GObjectClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_pop3_engine_get_type      (void);
diff --git a/src/camel/providers/pop3/camel-pop3-folder.h b/src/camel/providers/pop3/camel-pop3-folder.h
index 2cd2ab1..67a25d1 100644
--- a/src/camel/providers/pop3/camel-pop3-folder.h
+++ b/src/camel/providers/pop3/camel-pop3-folder.h
@@ -69,6 +69,9 @@ struct _CamelPOP3Folder {
 
 struct _CamelPOP3FolderClass {
        CamelFolderClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_pop3_folder_get_type      (void);
diff --git a/src/camel/providers/pop3/camel-pop3-settings.h b/src/camel/providers/pop3/camel-pop3-settings.h
index 2f5d2f3..d69b71b 100644
--- a/src/camel/providers/pop3/camel-pop3-settings.h
+++ b/src/camel/providers/pop3/camel-pop3-settings.h
@@ -52,6 +52,9 @@ struct _CamelPOP3Settings {
 
 struct _CamelPOP3SettingsClass {
        CamelStoreSettingsClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_pop3_settings_get_type    (void) G_GNUC_CONST;
diff --git a/src/camel/providers/pop3/camel-pop3-store.h b/src/camel/providers/pop3/camel-pop3-store.h
index 58432d6..63e559e 100644
--- a/src/camel/providers/pop3/camel-pop3-store.h
+++ b/src/camel/providers/pop3/camel-pop3-store.h
@@ -58,6 +58,9 @@ struct _CamelPOP3Store {
 
 struct _CamelPOP3StoreClass {
        CamelStoreClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_pop3_store_get_type       (void);
diff --git a/src/camel/providers/pop3/camel-pop3-stream.h b/src/camel/providers/pop3/camel-pop3-stream.h
index 2c4a51a..bb6dbb9 100644
--- a/src/camel/providers/pop3/camel-pop3-stream.h
+++ b/src/camel/providers/pop3/camel-pop3-stream.h
@@ -68,6 +68,9 @@ struct _CamelPOP3Stream {
 
 struct _CamelPOP3StreamClass {
        CamelStreamClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_pop3_stream_get_type      (void);
diff --git a/src/camel/providers/sendmail/camel-sendmail-settings.h 
b/src/camel/providers/sendmail/camel-sendmail-settings.h
index 5c3d152..4afa013 100644
--- a/src/camel/providers/sendmail/camel-sendmail-settings.h
+++ b/src/camel/providers/sendmail/camel-sendmail-settings.h
@@ -52,6 +52,9 @@ struct _CamelSendmailSettings {
 
 struct _CamelSendmailSettingsClass {
        CamelSettingsClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_sendmail_settings_get_type
diff --git a/src/camel/providers/sendmail/camel-sendmail-transport.h 
b/src/camel/providers/sendmail/camel-sendmail-transport.h
index 77171cb..cb548ed 100644
--- a/src/camel/providers/sendmail/camel-sendmail-transport.h
+++ b/src/camel/providers/sendmail/camel-sendmail-transport.h
@@ -53,6 +53,9 @@ struct _CamelSendmailTransport {
 
 struct _CamelSendmailTransportClass {
        CamelTransportClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType camel_sendmail_transport_get_type (void);
diff --git a/src/camel/providers/smtp/camel-smtp-settings.h b/src/camel/providers/smtp/camel-smtp-settings.h
index b37739a..e2dd454 100644
--- a/src/camel/providers/smtp/camel-smtp-settings.h
+++ b/src/camel/providers/smtp/camel-smtp-settings.h
@@ -52,6 +52,9 @@ struct _CamelSmtpSettings {
 
 struct _CamelSmtpSettingsClass {
        CamelSettingsClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType          camel_smtp_settings_get_type    (void) G_GNUC_CONST;
diff --git a/src/camel/providers/smtp/camel-smtp-transport.h b/src/camel/providers/smtp/camel-smtp-transport.h
index c5a20de..f513639 100644
--- a/src/camel/providers/smtp/camel-smtp-transport.h
+++ b/src/camel/providers/smtp/camel-smtp-transport.h
@@ -65,6 +65,9 @@ struct _CamelSmtpTransport {
 
 struct _CamelSmtpTransportClass {
        CamelTransportClass parent_class;
+
+       /* Padding for future expansion */
+       gpointer reserved[20];
 };
 
 GType camel_smtp_transport_get_type (void);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]