Initial addition of padding for ui_ops and other class-like structs

21 files changed, 117 insertions, 0 deletions

diff --git a/libpurple/account.h b/libpurple/account.h
index 6c404aad07..ef07d72e2a 100644
--- a/libpurple/account.h
+++ b/libpurple/account.h
@@ -66,6 +66,11 @@ struct _PurpleAccountUiOps
 				 const char *alias, const char *message, gboolean on_list, 
 				 GCallback authorize_cb, GCallback deny_cb, void *user_data);
 	void (*close_account_request)(void *ui_handle);
+
+	void (*_purple_reserved1)(void);
+	void (*_purple_reserved2)(void);
+	void (*_purple_reserved3)(void);
+	void (*_purple_reserved4)(void);
 };
 
 struct _PurpleAccount
diff --git a/libpurple/blist.h b/libpurple/blist.h
index a90b6ca740..76eae5b6db 100644
--- a/libpurple/blist.h
+++ b/libpurple/blist.h
@@ -178,6 +178,11 @@ struct _PurpleBlistUiOps
 	void (*request_add_chat)(PurpleAccount *account, PurpleGroup *group,
 							 const char *alias, const char *name);
 	void (*request_add_group)(void);
+
+	void (*_purple_reserved1)(void);
+	void (*_purple_reserved2)(void);
+	void (*_purple_reserved3)(void);
+	void (*_purple_reserved4)(void);
 };
 
 #ifdef __cplusplus
diff --git a/libpurple/cipher.h b/libpurple/cipher.h
index a55d379936..e2bcb2aaff 100644
--- a/libpurple/cipher.h
+++ b/libpurple/cipher.h
@@ -102,6 +102,11 @@ struct _PurpleCipherOps {
 
 	/** The get key size function */
 	size_t (*get_key_size)(PurpleCipherContext *context);
+
+	void (*_purple_reserved1)(void);
+	void (*_purple_reserved2)(void);
+	void (*_purple_reserved3)(void);
+	void (*_purple_reserved4)(void);
 };
 
 #ifdef __cplusplus
diff --git a/libpurple/connection.h b/libpurple/connection.h
index 357002da82..67bba1d543 100644
--- a/libpurple/connection.h
+++ b/libpurple/connection.h
@@ -71,6 +71,10 @@ typedef struct
 	void (*network_connected)();
 	void (*network_disconnected)();
 
+	void (*_purple_reserved1)(void);
+	void (*_purple_reserved2)(void);
+	void (*_purple_reserved3)(void);
+	void (*_purple_reserved4)(void);
 } PurpleConnectionUiOps;
 
 struct _PurpleConnection
diff --git a/libpurple/conversation.h b/libpurple/conversation.h
index 1ec365694b..69beaf4c9e 100644
--- a/libpurple/conversation.h
+++ b/libpurple/conversation.h
@@ -177,6 +177,11 @@ struct _PurpleConversationUiOps
 	void (*custom_smiley_close)(PurpleConversation *conv, const char *smile);
 
 	void (*send_confirm)(PurpleConversation *conv, const char *message);
+
+	void (*_purple_reserved1)(void);
+	void (*_purple_reserved2)(void);
+	void (*_purple_reserved3)(void);
+	void (*_purple_reserved4)(void);
 };
 
 /**
diff --git a/libpurple/core.h b/libpurple/core.h
index 5b18f7d491..c529da73f0 100644
--- a/libpurple/core.h
+++ b/libpurple/core.h
@@ -33,6 +33,10 @@ typedef struct
 	void (*ui_init)(void);
 	void (*quit)(void);
 
+	void (*_purple_reserved1)(void);
+	void (*_purple_reserved2)(void);
+	void (*_purple_reserved3)(void);
+	void (*_purple_reserved4)(void);
 } PurpleCoreUiOps;
 
 #ifdef __cplusplus
diff --git a/libpurple/debug.h b/libpurple/debug.h
index 7247c63945..c0d4872beb 100644
--- a/libpurple/debug.h
+++ b/libpurple/debug.h
@@ -51,6 +51,11 @@ typedef struct
 				  const char *arg_s);
 	gboolean (*is_enabled)(PurpleDebugLevel level,
 			const char *category);
+
+	void (*_purple_reserved1)(void);
+	void (*_purple_reserved2)(void);
+	void (*_purple_reserved3)(void);
+	void (*_purple_reserved4)(void);
 } PurpleDebugUiOps;
 
 #ifdef __cplusplus
diff --git a/libpurple/dnsquery.h b/libpurple/dnsquery.h
index 4f75c76713..4d725c3648 100644
--- a/libpurple/dnsquery.h
+++ b/libpurple/dnsquery.h
@@ -57,6 +57,11 @@ typedef struct
 	 * resolve_host is not implemented.
 	 */
 	void (*destroy)(PurpleDnsQueryData *query_data);
+
+	void (*_purple_reserved1)(void);
+	void (*_purple_reserved2)(void);
+	void (*_purple_reserved3)(void);
+	void (*_purple_reserved4)(void);
 } PurpleDnsQueryUiOps;
 
 #ifdef __cplusplus
diff --git a/libpurple/eventloop.h b/libpurple/eventloop.h
index dc6605c38e..b0523f8876 100644
--- a/libpurple/eventloop.h
+++ b/libpurple/eventloop.h
@@ -81,6 +81,10 @@ struct _PurpleEventLoopUiOps
 	 */
 	int (*input_get_error)(int fd, int *error);
 
+	void (*_purple_reserved1)(void);
+	void (*_purple_reserved2)(void);
+	void (*_purple_reserved3)(void);
+	void (*_purple_reserved4)(void);
 };
 
 /**************************************************************************/
diff --git a/libpurple/ft.h b/libpurple/ft.h
index fbf555775d..ecca0683f6 100644
--- a/libpurple/ft.h
+++ b/libpurple/ft.h
@@ -77,6 +77,10 @@ typedef struct
 	void (*cancel_local)(PurpleXfer *xfer);
 	void (*cancel_remote)(PurpleXfer *xfer);
 
+	void (*_purple_reserved1)(void);
+	void (*_purple_reserved2)(void);
+	void (*_purple_reserved3)(void);
+	void (*_purple_reserved4)(void);
 } PurpleXferUiOps;
 
 /**
diff --git a/libpurple/idle.h b/libpurple/idle.h
index 0de5f847ba..b0743a9022 100644
--- a/libpurple/idle.h
+++ b/libpurple/idle.h
@@ -31,6 +31,11 @@
 typedef struct
 {
 	time_t (*get_time_idle)(void);
+
+	void (*_purple_reserved1)(void);
+	void (*_purple_reserved2)(void);
+	void (*_purple_reserved3)(void);
+	void (*_purple_reserved4)(void);
 } PurpleIdleUiOps;
 
 #ifdef __cplusplus
diff --git a/libpurple/log.h b/libpurple/log.h
index aacae83192..bd0db8516d 100644
--- a/libpurple/log.h
+++ b/libpurple/log.h
@@ -109,6 +109,11 @@ struct _PurpleLogLogger {
 
 	/* Tests whether a log is deletable */
 	gboolean (*is_deletable)(PurpleLog *log);
+
+	void (*_purple_reserved1)(void);
+	void (*_purple_reserved2)(void);
+	void (*_purple_reserved3)(void);
+	void (*_purple_reserved4)(void);
 };
 
 /**
diff --git a/libpurple/notify.h b/libpurple/notify.h
index 727682a792..3130b26874 100644
--- a/libpurple/notify.h
+++ b/libpurple/notify.h
@@ -171,6 +171,10 @@ typedef struct
 
 	void (*close_notify)(PurpleNotifyType type, void *ui_handle);
 
+	void (*_purple_reserved1)(void);
+	void (*_purple_reserved2)(void);
+	void (*_purple_reserved3)(void);
+	void (*_purple_reserved4)(void);
 } PurpleNotifyUiOps;
 
 
diff --git a/libpurple/plugin.h b/libpurple/plugin.h
index a9c6815186..5bd84246d4 100644
--- a/libpurple/plugin.h
+++ b/libpurple/plugin.h
@@ -102,6 +102,11 @@ struct _PurplePluginInfo
 	void *extra_info;
 	PurplePluginUiInfo *prefs_info; /**< Used by any plugin to display preferences.  If #ui_info has been specified, this will be ignored. */
 	GList *(*actions)(PurplePlugin *plugin, gpointer context);
+
+	void (*_purple_reserved1)(void);
+	void (*_purple_reserved2)(void);
+	void (*_purple_reserved3)(void);
+	void (*_purple_reserved4)(void);
 };
 
 /**
@@ -115,6 +120,11 @@ struct _PurplePluginLoaderInfo
 	gboolean (*load)(PurplePlugin *plugin);
 	gboolean (*unload)(PurplePlugin *plugin);
 	void     (*destroy)(PurplePlugin *plugin);
+
+	void (*_purple_reserved1)(void);
+	void (*_purple_reserved2)(void);
+	void (*_purple_reserved3)(void);
+	void (*_purple_reserved4)(void);
 };
 
 /**
@@ -132,6 +142,11 @@ struct _PurplePlugin
 	void *extra;                           /**< Plugin-specific data.     */
 	gboolean unloadable;                   /**< Unloadable                */
 	GList *dependent_plugins;              /**< Plugins depending on this */
+
+	void (*_purple_reserved1)(void);
+	void (*_purple_reserved2)(void);
+	void (*_purple_reserved3)(void);
+	void (*_purple_reserved4)(void);
 };
 
 #define PURPLE_PLUGIN_LOADER_INFO(plugin) \
@@ -142,6 +157,11 @@ struct _PurplePluginUiInfo {
 
 	int page_num;                                         /**< Reserved */
 	PurplePluginPrefFrame *frame;                           /**< Reserved */
+
+	void (*_purple_reserved1)(void);
+	void (*_purple_reserved2)(void);
+	void (*_purple_reserved3)(void);
+	void (*_purple_reserved4)(void);
 };
 
 #define PURPLE_PLUGIN_HAS_PREF_FRAME(plugin) \
diff --git a/libpurple/privacy.h b/libpurple/privacy.h
index c8ae3f50e0..c4c1f9133f 100644
--- a/libpurple/privacy.h
+++ b/libpurple/privacy.h
@@ -53,6 +53,10 @@ typedef struct
 	void (*deny_added)(PurpleAccount *account, const char *name);
 	void (*deny_removed)(PurpleAccount *account, const char *name);
 
+	void (*_purple_reserved1)(void);
+	void (*_purple_reserved2)(void);
+	void (*_purple_reserved3)(void);
+	void (*_purple_reserved4)(void);
 } PurplePrivacyUiOps;
 
 /**
diff --git a/libpurple/prpl.h b/libpurple/prpl.h
index 3ec66c3550..aa429fbc6f 100644
--- a/libpurple/prpl.h
+++ b/libpurple/prpl.h
@@ -315,6 +315,11 @@ struct _PurplePluginProtocolInfo
 
 	/* room list serialize */
 	char *(*roomlist_room_serialize)(PurpleRoomlistRoom *room);
+
+	void (*_purple_reserved1)(void);
+	void (*_purple_reserved2)(void);
+	void (*_purple_reserved3)(void);
+	void (*_purple_reserved4)(void);
 };
 
 #define PURPLE_IS_PROTOCOL_PLUGIN(plugin) \
diff --git a/libpurple/request.h b/libpurple/request.h
index 8a6581cb7a..0e716e03bf 100644
--- a/libpurple/request.h
+++ b/libpurple/request.h
@@ -215,6 +215,11 @@ typedef struct
 							GCallback ok_cb, GCallback cancel_cb,
 							PurpleAccount *account, const char *who, PurpleConversation *conv,
 							void *user_data);
+
+	void (*_purple_reserved1)(void);
+	void (*_purple_reserved2)(void);
+	void (*_purple_reserved3)(void);
+	void (*_purple_reserved4)(void);
 } PurpleRequestUiOps;
 
 typedef void (*PurpleRequestInputCb)(void *, const char *);
diff --git a/libpurple/roomlist.h b/libpurple/roomlist.h
index ad65b66078..8eb5bb9c12 100644
--- a/libpurple/roomlist.h
+++ b/libpurple/roomlist.h
@@ -105,6 +105,11 @@ struct _PurpleRoomlistUiOps {
 	void (*add_room)(PurpleRoomlist *list, PurpleRoomlistRoom *room); /**< Add a room to the list. */
 	void (*in_progress)(PurpleRoomlist *list, gboolean flag); /**< Are we fetching stuff still? */
 	void (*destroy)(PurpleRoomlist *list); /**< We're destroying list. */
+
+	void (*_purple_reserved1)(void);
+	void (*_purple_reserved2)(void);
+	void (*_purple_reserved3)(void);
+	void (*_purple_reserved4)(void);
 };
 
 
diff --git a/libpurple/sound.h b/libpurple/sound.h
index 0f7558c0b4..982dfa2dc2 100644
--- a/libpurple/sound.h
+++ b/libpurple/sound.h
@@ -60,6 +60,10 @@ typedef struct _PurpleSoundUiOps
 	void (*play_file)(const char *filename);
 	void (*play_event)(PurpleSoundEventID event);
 
+	void (*_purple_reserved1)(void);
+	void (*_purple_reserved2)(void);
+	void (*_purple_reserved3)(void);
+	void (*_purple_reserved4)(void);
 } PurpleSoundUiOps;
 
 #ifdef __cplusplus
diff --git a/libpurple/sslconn.h b/libpurple/sslconn.h
index e227de4790..de1f87fac1 100644
--- a/libpurple/sslconn.h
+++ b/libpurple/sslconn.h
@@ -73,6 +73,10 @@ typedef struct
 	size_t (*read)(PurpleSslConnection *gsc, void *data, size_t len);
 	size_t (*write)(PurpleSslConnection *gsc, const void *data, size_t len);
 
+	void (*_purple_reserved1)(void);
+	void (*_purple_reserved2)(void);
+	void (*_purple_reserved3)(void);
+	void (*_purple_reserved4)(void);
 } PurpleSslOps;
 
 #ifdef __cplusplus
diff --git a/libpurple/whiteboard.h b/libpurple/whiteboard.h
index bad790a652..01cc11c132 100644
--- a/libpurple/whiteboard.h
+++ b/libpurple/whiteboard.h
@@ -64,6 +64,11 @@ typedef struct _PurpleWhiteboardUiOps
 					  int x2, int y2,
 					  int color, int size);                            /**< draw_line function */
 	void (*clear)(PurpleWhiteboard *wb);                                 /**< clear function */
+
+	void (*_purple_reserved1)(void);
+	void (*_purple_reserved2)(void);
+	void (*_purple_reserved3)(void);
+	void (*_purple_reserved4)(void);
 } PurpleWhiteboardUiOps;
 
 /**
@@ -79,6 +84,11 @@ struct _PurpleWhiteboardPrplOps
 	void (*set_brush) (PurpleWhiteboard *wb, int size, int color);         /**< set the brush size and color */
 	void (*send_draw_list)(PurpleWhiteboard *wb, GList *draw_list);        /**< send_draw_list function */
 	void (*clear)(PurpleWhiteboard *wb);                                   /**< clear function */
+
+	void (*_purple_reserved1)(void);
+	void (*_purple_reserved2)(void);
+	void (*_purple_reserved3)(void);
+	void (*_purple_reserved4)(void);
 };
 
 #ifdef __cplusplus