# HG changeset patch
# User Gary Kramlich <grim@reaperworld.com>
# Date 1177896521 0
# Node ID 589cc57571487ddc1988645b631dbdfae16dabfa
# Parent  8f4d82a1aa6dd7834ef57435dcfc07dd11b0233d# Parent  fbf1114368961e8645cbb9fb3d6367fff835508e
propagate from branch 'im.pidgin.padding' (head 4e0b1f990f77ad0ba6efa8bf6f73f422956b36fa)
            to branch 'im.pidgin.pidgin' (head 05168290f094ac829b3cec45fafc858cf25342a9)

diff -r 8f4d82a1aa6d -r 589cc5757148 finch/finch.c
--- a/finch/finch.c	Mon Apr 30 01:03:42 2007 +0000
+++ b/finch/finch.c	Mon Apr 30 01:28:41 2007 +0000
@@ -59,7 +59,13 @@
 	finch_prefs_init,
 	debug_init,
 	gnt_ui_init,
-	gnt_ui_uninit
+	gnt_ui_uninit,
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 static PurpleCoreUiOps *
@@ -149,7 +155,13 @@
 	g_source_remove,
 	gnt_input_add,
 	g_source_remove,
-	NULL /* input_get_error */
+	NULL, /* input_get_error */
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 static PurpleEventLoopUiOps *
diff -r 8f4d82a1aa6d -r 589cc5757148 finch/gntdebug.c
--- a/finch/gntdebug.c	Mon Apr 30 01:03:42 2007 +0000
+++ b/finch/gntdebug.c	Mon Apr 30 01:28:41 2007 +0000
@@ -95,7 +95,13 @@
 static PurpleDebugUiOps uiops =
 {
 	finch_debug_print,
-	finch_debug_is_enabled
+	finch_debug_is_enabled,
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 PurpleDebugUiOps *finch_debug_get_ui_ops()
diff -r 8f4d82a1aa6d -r 589cc5757148 finch/gntft.c
--- a/finch/gntft.c	Mon Apr 30 01:03:42 2007 +0000
+++ b/finch/gntft.c	Mon Apr 30 01:28:41 2007 +0000
@@ -498,7 +498,13 @@
 	finch_xfer_add_xfer,
 	finch_xfer_update_progress,
 	finch_xfer_cancel_local,
-	finch_xfer_cancel_remote
+	finch_xfer_cancel_remote,
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 /**************************************************************************
diff -r 8f4d82a1aa6d -r 589cc5757148 finch/gntidle.c
--- a/finch/gntidle.c	Mon Apr 30 01:03:42 2007 +0000
+++ b/finch/gntidle.c	Mon Apr 30 01:28:41 2007 +0000
@@ -35,7 +35,13 @@
 
 static PurpleIdleUiOps ui_ops =
 {
-	finch_get_idle_time
+	finch_get_idle_time,
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 PurpleIdleUiOps *
diff -r 8f4d82a1aa6d -r 589cc5757148 finch/plugins/gntclipboard.c
--- a/finch/plugins/gntclipboard.c	Mon Apr 30 01:03:42 2007 +0000
+++ b/finch/plugins/gntclipboard.c	Mon Apr 30 01:28:41 2007 +0000
@@ -159,6 +159,12 @@
 	NULL,
 	NULL,
 	NULL,
+	NULL,
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
 	NULL
 };
 
diff -r 8f4d82a1aa6d -r 589cc5757148 finch/plugins/gntgf.c
--- a/finch/plugins/gntgf.c	Mon Apr 30 01:03:42 2007 +0000
+++ b/finch/plugins/gntgf.c	Mon Apr 30 01:28:41 2007 +0000
@@ -378,6 +378,12 @@
 	config_frame,
 	NULL,
 	NULL,
+	NULL,
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
 	NULL
 };
 
diff -r 8f4d82a1aa6d -r 589cc5757148 finch/plugins/gnthistory.c
--- a/finch/plugins/gnthistory.c	Mon Apr 30 01:03:42 2007 +0000
+++ b/finch/plugins/gnthistory.c	Mon Apr 30 01:28:41 2007 +0000
@@ -190,6 +190,12 @@
 	NULL,
 	NULL,
 	NULL,
+	NULL,
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
 	NULL
 };
 
diff -r 8f4d82a1aa6d -r 589cc5757148 finch/plugins/lastlog.c
--- a/finch/plugins/lastlog.c	Mon Apr 30 01:03:42 2007 +0000
+++ b/finch/plugins/lastlog.c	Mon Apr 30 01:28:41 2007 +0000
@@ -130,6 +130,12 @@
 	NULL,
 	NULL,
 	NULL,
+	NULL,
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
 	NULL
 };
 
diff -r 8f4d82a1aa6d -r 589cc5757148 libpurple/account.h
--- a/libpurple/account.h	Mon Apr 30 01:03:42 2007 +0000
+++ b/libpurple/account.h	Mon Apr 30 01:28:41 2007 +0000
@@ -66,6 +66,11 @@
 				 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 -r 8f4d82a1aa6d -r 589cc5757148 libpurple/blist.h
--- a/libpurple/blist.h	Mon Apr 30 01:03:42 2007 +0000
+++ b/libpurple/blist.h	Mon Apr 30 01:28:41 2007 +0000
@@ -178,6 +178,11 @@
 	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 -r 8f4d82a1aa6d -r 589cc5757148 libpurple/cipher.c
--- a/libpurple/cipher.c	Mon Apr 30 01:03:42 2007 +0000
+++ b/libpurple/cipher.c	Mon Apr 30 01:28:41 2007 +0000
@@ -339,7 +339,13 @@
 	NULL,			/* set salt */
 	NULL,			/* get salt size */
 	NULL,			/* set key */
-	NULL			/* get key size */
+	NULL,			/* get key size */
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 /*******************************************************************************
@@ -588,7 +594,13 @@
 	NULL,                   /* set salt */
 	NULL,                   /* get salt size */
 	NULL,                   /* set key */
-	NULL                    /* get key size */
+	NULL,                   /* get key size */
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 /******************************************************************************
@@ -1006,7 +1018,13 @@
 	NULL,                   /* set salt */
 	NULL,                   /* get salt size */
 	des_set_key,		/* set key */
-	NULL                    /* get key size */
+	NULL,                   /* get key size */
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 
@@ -1247,7 +1265,13 @@
 	NULL,			/* set salt			*/
 	NULL,			/* get salt size	*/
 	NULL,			/* set key			*/
-	NULL			/* get key size		*/
+	NULL,			/* get key size		*/
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 /*******************************************************************************
diff -r 8f4d82a1aa6d -r 589cc5757148 libpurple/cipher.h
--- a/libpurple/cipher.h	Mon Apr 30 01:03:42 2007 +0000
+++ b/libpurple/cipher.h	Mon Apr 30 01:28:41 2007 +0000
@@ -102,6 +102,11 @@
 
 	/** 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 -r 8f4d82a1aa6d -r 589cc5757148 libpurple/connection.h
--- a/libpurple/connection.h	Mon Apr 30 01:03:42 2007 +0000
+++ b/libpurple/connection.h	Mon Apr 30 01:28:41 2007 +0000
@@ -71,6 +71,10 @@
 	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 -r 8f4d82a1aa6d -r 589cc5757148 libpurple/conversation.h
--- a/libpurple/conversation.h	Mon Apr 30 01:03:42 2007 +0000
+++ b/libpurple/conversation.h	Mon Apr 30 01:28:41 2007 +0000
@@ -177,6 +177,11 @@
 	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 -r 8f4d82a1aa6d -r 589cc5757148 libpurple/core.h
--- a/libpurple/core.h	Mon Apr 30 01:03:42 2007 +0000
+++ b/libpurple/core.h	Mon Apr 30 01:28:41 2007 +0000
@@ -33,6 +33,10 @@
 	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 -r 8f4d82a1aa6d -r 589cc5757148 libpurple/debug.h
--- a/libpurple/debug.h	Mon Apr 30 01:03:42 2007 +0000
+++ b/libpurple/debug.h	Mon Apr 30 01:28:41 2007 +0000
@@ -51,6 +51,11 @@
 				  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 -r 8f4d82a1aa6d -r 589cc5757148 libpurple/dnsquery.h
--- a/libpurple/dnsquery.h	Mon Apr 30 01:03:42 2007 +0000
+++ b/libpurple/dnsquery.h	Mon Apr 30 01:28:41 2007 +0000
@@ -57,6 +57,11 @@
 	 * 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 -r 8f4d82a1aa6d -r 589cc5757148 libpurple/eventloop.h
--- a/libpurple/eventloop.h	Mon Apr 30 01:03:42 2007 +0000
+++ b/libpurple/eventloop.h	Mon Apr 30 01:28:41 2007 +0000
@@ -81,6 +81,10 @@
 	 */
 	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 -r 8f4d82a1aa6d -r 589cc5757148 libpurple/example/nullclient.c
--- a/libpurple/example/nullclient.c	Mon Apr 30 01:03:42 2007 +0000
+++ b/libpurple/example/nullclient.c	Mon Apr 30 01:28:41 2007 +0000
@@ -107,6 +107,12 @@
 	g_source_remove,
 	glib_input_add,
 	g_source_remove,
+	NULL,
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
 	NULL
 };
 /*** End of the eventloop functions. ***/
@@ -149,6 +155,12 @@
 	NULL,
 	NULL,
 	null_ui_init,
+	NULL,
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
 	NULL
 };
 
diff -r 8f4d82a1aa6d -r 589cc5757148 libpurple/ft.h
--- a/libpurple/ft.h	Mon Apr 30 01:03:42 2007 +0000
+++ b/libpurple/ft.h	Mon Apr 30 01:28:41 2007 +0000
@@ -77,6 +77,10 @@
 	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 -r 8f4d82a1aa6d -r 589cc5757148 libpurple/idle.h
--- a/libpurple/idle.h	Mon Apr 30 01:03:42 2007 +0000
+++ b/libpurple/idle.h	Mon Apr 30 01:28:41 2007 +0000
@@ -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 -r 8f4d82a1aa6d -r 589cc5757148 libpurple/log.h
--- a/libpurple/log.h	Mon Apr 30 01:03:42 2007 +0000
+++ b/libpurple/log.h	Mon Apr 30 01:28:41 2007 +0000
@@ -109,6 +109,11 @@
 
 	/* 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 -r 8f4d82a1aa6d -r 589cc5757148 libpurple/notify.h
--- a/libpurple/notify.h	Mon Apr 30 01:03:42 2007 +0000
+++ b/libpurple/notify.h	Mon Apr 30 01:28:41 2007 +0000
@@ -171,6 +171,10 @@
 
 	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 -r 8f4d82a1aa6d -r 589cc5757148 libpurple/plugin.h
--- a/libpurple/plugin.h	Mon Apr 30 01:03:42 2007 +0000
+++ b/libpurple/plugin.h	Mon Apr 30 01:28:41 2007 +0000
@@ -102,6 +102,11 @@
 	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 @@
 	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 @@
 	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 @@
 
 	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 -r 8f4d82a1aa6d -r 589cc5757148 libpurple/plugins/autoaccept.c
--- a/libpurple/plugins/autoaccept.c	Mon Apr 30 01:03:42 2007 +0000
+++ b/libpurple/plugins/autoaccept.c	Mon Apr 30 01:28:41 2007 +0000
@@ -231,6 +231,12 @@
 	get_plugin_pref_frame,
 	0,
 	NULL,
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 static PurplePluginInfo info = {
@@ -258,7 +264,13 @@
 	NULL,					/* ui_info				*/
 	NULL,					/* extra_info			*/
 	&prefs_info,				/* prefs_info			*/
-	NULL					/* actions				*/
+	NULL,					/* actions				*/
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 static void
diff -r 8f4d82a1aa6d -r 589cc5757148 libpurple/plugins/buddynote.c
--- a/libpurple/plugins/buddynote.c	Mon Apr 30 01:03:42 2007 +0000
+++ b/libpurple/plugins/buddynote.c	Mon Apr 30 01:28:41 2007 +0000
@@ -97,7 +97,13 @@
 	NULL,											/**< ui_info		*/
 	NULL,											/**< extra_info		*/
 	NULL,											/**< prefs_info		*/
-	NULL											/**< actions		*/
+	NULL,											/**< actions		*/
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 
diff -r 8f4d82a1aa6d -r 589cc5757148 libpurple/plugins/dbus-example.c
--- a/libpurple/plugins/dbus-example.c	Mon Apr 30 01:03:42 2007 +0000
+++ b/libpurple/plugins/dbus-example.c	Mon Apr 30 01:28:41 2007 +0000
@@ -168,6 +168,12 @@
 	NULL,                                             /**< ui_info        */
 	NULL,                                             /**< extra_info     */
 	NULL,                                       /**< prefs_info     */
+	NULL,
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
 	NULL
 };
 
diff -r 8f4d82a1aa6d -r 589cc5757148 libpurple/plugins/idle.c
--- a/libpurple/plugins/idle.c	Mon Apr 30 01:03:42 2007 +0000
+++ b/libpurple/plugins/idle.c	Mon Apr 30 01:28:41 2007 +0000
@@ -327,7 +327,13 @@
 	NULL,
 	NULL,
 	NULL,
-	actions
+	actions,
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 static void
diff -r 8f4d82a1aa6d -r 589cc5757148 libpurple/plugins/joinpart.c
--- a/libpurple/plugins/joinpart.c	Mon Apr 30 01:03:42 2007 +0000
+++ b/libpurple/plugins/joinpart.c	Mon Apr 30 01:28:41 2007 +0000
@@ -246,7 +246,13 @@
 static PurplePluginUiInfo prefs_info = {
 	get_plugin_pref_frame,
 	0,   /* page_num (reserved) */
-	NULL /* frame (reserved) */
+	NULL, /* frame (reserved) */
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 static PurplePluginInfo info =
@@ -279,7 +285,13 @@
 	NULL,                                             /**< ui_info        */
 	NULL,                                             /**< extra_info     */
 	&prefs_info,                                      /**< prefs_info     */
-	NULL                                              /**< actions        */
+	NULL,                                             /**< actions        */
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 static void
diff -r 8f4d82a1aa6d -r 589cc5757148 libpurple/plugins/log_reader.c
--- a/libpurple/plugins/log_reader.c	Mon Apr 30 01:03:42 2007 +0000
+++ b/libpurple/plugins/log_reader.c	Mon Apr 30 01:28:41 2007 +0000
@@ -2109,7 +2109,13 @@
 static PurplePluginUiInfo prefs_info = {
 	get_plugin_pref_frame,
 	0,   /* page_num (reserved) */
-	NULL /* frame (reserved) */
+	NULL, /* frame (reserved) */
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 static PurplePluginInfo info =
@@ -2145,7 +2151,13 @@
 	NULL,                                             /**< ui_info        */
 	NULL,                                             /**< extra_info     */
 	&prefs_info,                                      /**< prefs_info     */
-	NULL                                              /**< actions        */
+	NULL,                                             /**< actions        */
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 PURPLE_INIT_PLUGIN(log_reader, init_plugin, info)
diff -r 8f4d82a1aa6d -r 589cc5757148 libpurple/plugins/mono/loader/mono.c
--- a/libpurple/plugins/mono/loader/mono.c	Mon Apr 30 01:03:42 2007 +0000
+++ b/libpurple/plugins/mono/loader/mono.c	Mon Apr 30 01:28:41 2007 +0000
@@ -194,7 +194,13 @@
 	probe_mono_plugin,
 	load_mono_plugin,
 	unload_mono_plugin,
-	destroy_mono_plugin
+	destroy_mono_plugin,
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 static PurplePluginInfo info =
@@ -220,6 +226,12 @@
 	NULL,
 	&loader_info,
 	NULL,
+	NULL,
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
 	NULL
 };
 
diff -r 8f4d82a1aa6d -r 589cc5757148 libpurple/plugins/newline.c
--- a/libpurple/plugins/newline.c	Mon Apr 30 01:03:42 2007 +0000
+++ b/libpurple/plugins/newline.c	Mon Apr 30 01:28:41 2007 +0000
@@ -81,7 +81,13 @@
 	NULL,											/**< ui_info		*/
 	NULL,											/**< extra_info		*/
 	NULL,											/**< prefs_info		*/
-	NULL											/**< actions		*/
+	NULL,											/**< actions		*/
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 static void
diff -r 8f4d82a1aa6d -r 589cc5757148 libpurple/plugins/offlinemsg.c
--- a/libpurple/plugins/offlinemsg.c	Mon Apr 30 01:03:42 2007 +0000
+++ b/libpurple/plugins/offlinemsg.c	Mon Apr 30 01:28:41 2007 +0000
@@ -199,6 +199,12 @@
 static PurplePluginUiInfo prefs_info = {
 	get_plugin_pref_frame,
 	0,
+	NULL,
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
 	NULL
 };
 
@@ -228,7 +234,13 @@
 	NULL,					/* ui_info				*/
 	NULL,					/* extra_info			*/
 	&prefs_info,				/* prefs_info			*/
-	NULL					/* actions				*/
+	NULL,					/* actions				*/
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 static void
diff -r 8f4d82a1aa6d -r 589cc5757148 libpurple/plugins/perl/perl.c
--- a/libpurple/plugins/perl/perl.c	Mon Apr 30 01:03:42 2007 +0000
+++ b/libpurple/plugins/perl/perl.c	Mon Apr 30 01:28:41 2007 +0000
@@ -572,7 +572,13 @@
 	probe_perl_plugin,                                /**< probe          */
 	load_perl_plugin,                                 /**< load           */
 	unload_perl_plugin,                               /**< unload         */
-	destroy_perl_plugin                               /**< destroy        */
+	destroy_perl_plugin,                              /**< destroy        */
+	
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 static PurplePluginInfo info =
@@ -601,6 +607,12 @@
 	NULL,                                             /**< ui_info        */
 	&loader_info,                                     /**< extra_info     */
 	NULL,
+	NULL,
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
 	NULL
 };
 
diff -r 8f4d82a1aa6d -r 589cc5757148 libpurple/plugins/psychic.c
--- a/libpurple/plugins/psychic.c	Mon Apr 30 01:03:42 2007 +0000
+++ b/libpurple/plugins/psychic.c	Mon Apr 30 01:28:41 2007 +0000
@@ -126,6 +126,12 @@
   get_plugin_pref_frame,
   0,    /* page_num (Reserved) */
   NULL, /* frame (Reserved) */
+  
+  /* padding */
+  NULL,
+  NULL,
+  NULL,
+  NULL
 };
 
 
@@ -155,6 +161,12 @@
   NULL,                   /**< extra_info */
   &prefs_info,            /**< prefs_info */
   NULL,                   /**< actions */
+
+  /* padding */
+  NULL,
+  NULL,
+  NULL,
+  NULL
 };
 
 
diff -r 8f4d82a1aa6d -r 589cc5757148 libpurple/plugins/ssl/ssl-gnutls.c
--- a/libpurple/plugins/ssl/ssl-gnutls.c	Mon Apr 30 01:03:42 2007 +0000
+++ b/libpurple/plugins/ssl/ssl-gnutls.c	Mon Apr 30 01:28:41 2007 +0000
@@ -208,7 +208,13 @@
 	ssl_gnutls_connect,
 	ssl_gnutls_close,
 	ssl_gnutls_read,
-	ssl_gnutls_write
+	ssl_gnutls_write,
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 #endif /* HAVE_GNUTLS */
@@ -270,7 +276,13 @@
 	NULL,                                             /**< ui_info        */
 	NULL,                                             /**< extra_info     */
 	NULL,                                             /**< prefs_info     */
-	NULL                                              /**< actions        */
+	NULL,                                             /**< actions        */
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 static void
diff -r 8f4d82a1aa6d -r 589cc5757148 libpurple/plugins/ssl/ssl-nss.c
--- a/libpurple/plugins/ssl/ssl-nss.c	Mon Apr 30 01:03:42 2007 +0000
+++ b/libpurple/plugins/ssl/ssl-nss.c	Mon Apr 30 01:28:41 2007 +0000
@@ -359,7 +359,13 @@
 	ssl_nss_connect,
 	ssl_nss_close,
 	ssl_nss_read,
-	ssl_nss_write
+	ssl_nss_write,
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 #endif /* HAVE_NSS */
@@ -422,7 +428,13 @@
 	NULL,                                             /**< ui_info        */
 	NULL,                                             /**< extra_info     */
 	NULL,                                             /**< prefs_info     */
-	NULL                                              /**< actions        */
+	NULL,                                             /**< actions        */
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 static void
diff -r 8f4d82a1aa6d -r 589cc5757148 libpurple/plugins/ssl/ssl.c
--- a/libpurple/plugins/ssl/ssl.c	Mon Apr 30 01:03:42 2007 +0000
+++ b/libpurple/plugins/ssl/ssl.c	Mon Apr 30 01:28:41 2007 +0000
@@ -107,6 +107,12 @@
 	NULL,                                             /**< ui_info        */
 	NULL,                                             /**< extra_info     */
 	NULL,
+	NULL,
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
 	NULL
 };
 
diff -r 8f4d82a1aa6d -r 589cc5757148 libpurple/plugins/statenotify.c
--- a/libpurple/plugins/statenotify.c	Mon Apr 30 01:03:42 2007 +0000
+++ b/libpurple/plugins/statenotify.c	Mon Apr 30 01:28:41 2007 +0000
@@ -124,7 +124,13 @@
 {
 	get_plugin_pref_frame,
 	0,   /* page_num (Reserved) */
-	NULL /* frame (Reserved) */
+	NULL, /* frame (Reserved) */
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 static PurplePluginInfo info =
@@ -157,6 +163,12 @@
 	NULL,                                             /**< ui_info        */
 	NULL,                                             /**< extra_info     */
 	&prefs_info,                                      /**< prefs_info     */
+	NULL,
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
 	NULL
 };
 
diff -r 8f4d82a1aa6d -r 589cc5757148 libpurple/plugins/tcl/tcl.c
--- a/libpurple/plugins/tcl/tcl.c	Mon Apr 30 01:03:42 2007 +0000
+++ b/libpurple/plugins/tcl/tcl.c	Mon Apr 30 01:28:41 2007 +0000
@@ -399,6 +399,12 @@
 	tcl_load_plugin,
 	tcl_unload_plugin,
 	tcl_destroy_plugin,
+
+	/* pidgin */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 static PurplePluginInfo tcl_info =
@@ -424,6 +430,12 @@
 	NULL,
 	&tcl_loader_info,
 	NULL,
+	NULL,
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
 	NULL
 };
 
diff -r 8f4d82a1aa6d -r 589cc5757148 libpurple/privacy.h
--- a/libpurple/privacy.h	Mon Apr 30 01:03:42 2007 +0000
+++ b/libpurple/privacy.h	Mon Apr 30 01:28:41 2007 +0000
@@ -53,6 +53,10 @@
 	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 -r 8f4d82a1aa6d -r 589cc5757148 libpurple/protocols/gg/gg.c
--- a/libpurple/protocols/gg/gg.c	Mon Apr 30 01:03:42 2007 +0000
+++ b/libpurple/protocols/gg/gg.c	Mon Apr 30 01:28:41 2007 +0000
@@ -2123,6 +2123,12 @@
 	NULL,				/* whiteboard_prpl_ops */
 	NULL,				/* send_raw */
 	NULL,				/* roomlist_room_serialize */
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 /* }}} */
 
@@ -2153,7 +2159,13 @@
 	NULL,				/* ui_info */
 	&prpl_info,			/* extra_info */
 	NULL,				/* prefs_info */
-	ggp_actions			/* actions */
+	ggp_actions,			/* actions */
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 /* }}} */
 
diff -r 8f4d82a1aa6d -r 589cc5757148 libpurple/protocols/irc/irc.c
--- a/libpurple/protocols/irc/irc.c	Mon Apr 30 01:03:42 2007 +0000
+++ b/libpurple/protocols/irc/irc.c	Mon Apr 30 01:28:41 2007 +0000
@@ -862,6 +862,12 @@
 	NULL,					/* whiteboard_prpl_ops */
 	irc_send_raw,			/* send_raw */
 	NULL,					/* roomlist_room_serialize */
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 static gboolean load_plugin (PurplePlugin *plugin) {
@@ -904,7 +910,13 @@
 	NULL,                                             /**< ui_info        */
 	&prpl_info,                                       /**< extra_info     */
 	NULL,                                             /**< prefs_info     */
-	irc_actions
+	irc_actions,
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 static void _init_plugin(PurplePlugin *plugin)
diff -r 8f4d82a1aa6d -r 589cc5757148 libpurple/protocols/jabber/libxmpp.c
--- a/libpurple/protocols/jabber/libxmpp.c	Mon Apr 30 01:03:42 2007 +0000
+++ b/libpurple/protocols/jabber/libxmpp.c	Mon Apr 30 01:28:41 2007 +0000
@@ -108,6 +108,12 @@
 	NULL,							/* whiteboard_prpl_ops */
 	jabber_prpl_send_raw,			/* send_raw */
 	jabber_roomlist_room_serialize, /* roomlist_room_serialize */
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 static gboolean load_plugin(PurplePlugin *plugin)
@@ -170,7 +176,13 @@
 	NULL,                                             /**< ui_info        */
 	&prpl_info,                                       /**< extra_info     */
 	NULL,                                             /**< prefs_info     */
-	jabber_actions
+	jabber_actions,
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 static void
diff -r 8f4d82a1aa6d -r 589cc5757148 libpurple/protocols/msn/msn.c
--- a/libpurple/protocols/msn/msn.c	Mon Apr 30 01:03:42 2007 +0000
+++ b/libpurple/protocols/msn/msn.c	Mon Apr 30 01:28:41 2007 +0000
@@ -2069,6 +2069,12 @@
 	NULL,					/* whiteboard_prpl_ops */
 	NULL,					/* send_raw */
 	NULL,					/* roomlist_room_serialize */
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 static PurplePluginInfo info =
@@ -2099,7 +2105,13 @@
 	NULL,                                             /**< ui_info        */
 	&prpl_info,                                       /**< extra_info     */
 	NULL,                                             /**< prefs_info     */
-	msn_actions
+	msn_actions,
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 static void
diff -r 8f4d82a1aa6d -r 589cc5757148 libpurple/protocols/novell/novell.c
--- a/libpurple/protocols/novell/novell.c	Mon Apr 30 01:03:42 2007 +0000
+++ b/libpurple/protocols/novell/novell.c	Mon Apr 30 01:28:41 2007 +0000
@@ -3495,6 +3495,11 @@
 	NULL,						/* send_raw */
 	NULL,						/* roomlist_room_serialize */
 
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 static PurplePluginInfo info = {
@@ -3523,6 +3528,12 @@
 	NULL,					/**< ui_info        */
 	&prpl_info,				/**< extra_info     */
 	NULL,
+	NULL,
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
 	NULL
 };
 
diff -r 8f4d82a1aa6d -r 589cc5757148 libpurple/protocols/oscar/libaim.c
--- a/libpurple/protocols/oscar/libaim.c	Mon Apr 30 01:03:42 2007 +0000
+++ b/libpurple/protocols/oscar/libaim.c	Mon Apr 30 01:28:41 2007 +0000
@@ -92,6 +92,12 @@
 	NULL,					/* whiteboard_prpl_ops */
 	NULL,					/* send_raw */
 	NULL,					/* roomlist_room_serialize */
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 static PurplePluginInfo info =
@@ -122,7 +128,13 @@
 	NULL,                                             /**< ui_info        */
 	&prpl_info,                                       /**< extra_info     */
 	NULL,
-	oscar_actions
+	oscar_actions,
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 static void
diff -r 8f4d82a1aa6d -r 589cc5757148 libpurple/protocols/oscar/libicq.c
--- a/libpurple/protocols/oscar/libicq.c	Mon Apr 30 01:03:42 2007 +0000
+++ b/libpurple/protocols/oscar/libicq.c	Mon Apr 30 01:28:41 2007 +0000
@@ -92,6 +92,12 @@
 	NULL,					/* whiteboard_prpl_ops */
 	NULL,					/* send_raw */
 	NULL,					/* roomlist_room_serialize */
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 static PurplePluginInfo info =
@@ -122,7 +128,13 @@
 	NULL,                                             /**< ui_info        */
 	&prpl_info,                                       /**< extra_info     */
 	NULL,
-	oscar_actions
+	oscar_actions,
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 static void
diff -r 8f4d82a1aa6d -r 589cc5757148 libpurple/protocols/qq/qq.c
--- a/libpurple/protocols/qq/qq.c	Mon Apr 30 01:03:42 2007 +0000
+++ b/libpurple/protocols/qq/qq.c	Mon Apr 30 01:28:41 2007 +0000
@@ -698,6 +698,12 @@
 	NULL,							/* PurpleWhiteboardPrplOps */
 	NULL,							/* send_raw */
 	NULL,							/* roomlist_room_serialize */
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 static PurplePluginInfo info = {
@@ -727,7 +733,13 @@
 	NULL,				/**< ui_info		*/
 	&prpl_info,			/**< extra_info		*/
 	NULL,				/**< prefs_info		*/
-	_qq_actions
+	_qq_actions,
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 
diff -r 8f4d82a1aa6d -r 589cc5757148 libpurple/protocols/simple/simple.c
--- a/libpurple/protocols/simple/simple.c	Mon Apr 30 01:03:42 2007 +0000
+++ b/libpurple/protocols/simple/simple.c	Mon Apr 30 01:28:41 2007 +0000
@@ -1800,6 +1800,12 @@
 	NULL,					/* whiteboard_prpl_ops */
 	simple_send_raw,		/* send_raw */
 	NULL,					/* roomlist_room_serialize */
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 
@@ -1829,6 +1835,12 @@
 	NULL,                                             /**< ui_info        */
 	&prpl_info,                                       /**< extra_info     */
 	NULL,
+	NULL,
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
 	NULL
 };
 
diff -r 8f4d82a1aa6d -r 589cc5757148 libpurple/protocols/yahoo/yahoo.c
--- a/libpurple/protocols/yahoo/yahoo.c	Mon Apr 30 01:03:42 2007 +0000
+++ b/libpurple/protocols/yahoo/yahoo.c	Mon Apr 30 01:28:41 2007 +0000
@@ -3948,7 +3948,13 @@
 	yahoo_doodle_get_brush,
 	yahoo_doodle_set_brush,
 	yahoo_doodle_send_draw_list,
-	yahoo_doodle_clear
+	yahoo_doodle_clear,
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 static PurplePluginProtocolInfo prpl_info =
@@ -4015,6 +4021,12 @@
 	&yahoo_whiteboard_prpl_ops,
 	NULL, /* send_raw */
 	NULL, /* roomlist_room_serialize */
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 static PurplePluginInfo info =
@@ -4042,7 +4054,13 @@
 	NULL,                                             /**< ui_info        */
 	&prpl_info,                                       /**< extra_info     */
 	NULL,
-	yahoo_actions
+	yahoo_actions,
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 static void
diff -r 8f4d82a1aa6d -r 589cc5757148 libpurple/protocols/zephyr/zephyr.c
--- a/libpurple/protocols/zephyr/zephyr.c	Mon Apr 30 01:03:42 2007 +0000
+++ b/libpurple/protocols/zephyr/zephyr.c	Mon Apr 30 01:28:41 2007 +0000
@@ -2920,6 +2920,12 @@
 	NULL,					/* whiteboard_prpl_ops */
 	NULL,					/* send_raw */
 	NULL,					/* roomlist_room_serialize */
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 static PurplePluginInfo info = {
@@ -2950,6 +2956,12 @@
 	&prpl_info,					  /**< extra_info     */
 	NULL,
 	zephyr_actions,
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 static void init_plugin(PurplePlugin * plugin)
diff -r 8f4d82a1aa6d -r 589cc5757148 libpurple/prpl.h
--- a/libpurple/prpl.h	Mon Apr 30 01:03:42 2007 +0000
+++ b/libpurple/prpl.h	Mon Apr 30 01:28:41 2007 +0000
@@ -315,6 +315,11 @@
 
 	/* 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 -r 8f4d82a1aa6d -r 589cc5757148 libpurple/request.h
--- a/libpurple/request.h	Mon Apr 30 01:03:42 2007 +0000
+++ b/libpurple/request.h	Mon Apr 30 01:28:41 2007 +0000
@@ -215,6 +215,11 @@
 							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 -r 8f4d82a1aa6d -r 589cc5757148 libpurple/roomlist.h
--- a/libpurple/roomlist.h	Mon Apr 30 01:03:42 2007 +0000
+++ b/libpurple/roomlist.h	Mon Apr 30 01:28:41 2007 +0000
@@ -105,6 +105,11 @@
 	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 -r 8f4d82a1aa6d -r 589cc5757148 libpurple/sound.h
--- a/libpurple/sound.h	Mon Apr 30 01:03:42 2007 +0000
+++ b/libpurple/sound.h	Mon Apr 30 01:28:41 2007 +0000
@@ -60,6 +60,10 @@
 	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 -r 8f4d82a1aa6d -r 589cc5757148 libpurple/sslconn.h
--- a/libpurple/sslconn.h	Mon Apr 30 01:03:42 2007 +0000
+++ b/libpurple/sslconn.h	Mon Apr 30 01:28:41 2007 +0000
@@ -73,6 +73,10 @@
 	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 -r 8f4d82a1aa6d -r 589cc5757148 libpurple/whiteboard.h
--- a/libpurple/whiteboard.h	Mon Apr 30 01:03:42 2007 +0000
+++ b/libpurple/whiteboard.h	Mon Apr 30 01:28:41 2007 +0000
@@ -64,6 +64,11 @@
 					  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 @@
 	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
diff -r 8f4d82a1aa6d -r 589cc5757148 pidgin/gtkaccount.c
--- a/pidgin/gtkaccount.c	Mon Apr 30 01:03:42 2007 +0000
+++ b/pidgin/gtkaccount.c	Mon Apr 30 01:28:41 2007 +0000
@@ -2571,7 +2571,11 @@
 	NULL,
 	pidgin_accounts_request_add,
 	pidgin_accounts_request_authorization,
-	pidgin_accounts_request_close
+	pidgin_accounts_request_close,
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 PurpleAccountUiOps *
diff -r 8f4d82a1aa6d -r 589cc5757148 pidgin/gtkblist.c
--- a/pidgin/gtkblist.c	Mon Apr 30 01:03:42 2007 +0000
+++ b/pidgin/gtkblist.c	Mon Apr 30 01:28:41 2007 +0000
@@ -5865,7 +5865,11 @@
 	pidgin_blist_set_visible,
 	pidgin_blist_request_add_buddy,
 	pidgin_blist_request_add_chat,
-	pidgin_blist_request_add_group
+	pidgin_blist_request_add_group,
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 
diff -r 8f4d82a1aa6d -r 589cc5757148 pidgin/gtkconn.c
--- a/pidgin/gtkconn.c	Mon Apr 30 01:03:42 2007 +0000
+++ b/pidgin/gtkconn.c	Mon Apr 30 01:28:41 2007 +0000
@@ -248,7 +248,11 @@
 	pidgin_connection_notice,
 	pidgin_connection_report_disconnect,
 	pidgin_connection_network_connected,
-	pidgin_connection_network_disconnected
+	pidgin_connection_network_disconnected,
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 PurpleConnectionUiOps *
diff -r 8f4d82a1aa6d -r 589cc5757148 pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Mon Apr 30 01:03:42 2007 +0000
+++ b/pidgin/gtkconv.c	Mon Apr 30 01:28:41 2007 +0000
@@ -6161,6 +6161,10 @@
 	pidgin_conv_custom_smiley_write,  /* custom_smiley_write  */
 	pidgin_conv_custom_smiley_close,  /* custom_smiley_close  */
 	pidgin_conv_send_confirm,         /* send_confirm         */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 PurpleConversationUiOps *
diff -r 8f4d82a1aa6d -r 589cc5757148 pidgin/gtkdebug.c
--- a/pidgin/gtkdebug.c	Mon Apr 30 01:03:42 2007 +0000
+++ b/pidgin/gtkdebug.c	Mon Apr 30 01:28:41 2007 +0000
@@ -1116,7 +1116,11 @@
 static PurpleDebugUiOps ops =
 {
 	pidgin_debug_print,
-	pidgin_debug_is_enabled
+	pidgin_debug_is_enabled,
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 PurpleDebugUiOps *
diff -r 8f4d82a1aa6d -r 589cc5757148 pidgin/gtkeventloop.c
--- a/pidgin/gtkeventloop.c	Mon Apr 30 01:03:42 2007 +0000
+++ b/pidgin/gtkeventloop.c	Mon Apr 30 01:28:41 2007 +0000
@@ -119,7 +119,11 @@
 	g_source_remove,
 	pidgin_input_add,
 	g_source_remove,
-	NULL /* input_get_error */
+	NULL, /* input_get_error */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 PurpleEventLoopUiOps *
diff -r 8f4d82a1aa6d -r 589cc5757148 pidgin/gtkft.c
--- a/pidgin/gtkft.c	Mon Apr 30 01:03:42 2007 +0000
+++ b/pidgin/gtkft.c	Mon Apr 30 01:28:41 2007 +0000
@@ -1222,7 +1222,11 @@
 	pidgin_xfer_add_xfer,
 	pidgin_xfer_update_progress,
 	pidgin_xfer_cancel_local,
-	pidgin_xfer_cancel_remote
+	pidgin_xfer_cancel_remote,
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 /**************************************************************************
diff -r 8f4d82a1aa6d -r 589cc5757148 pidgin/gtkidle.c
--- a/pidgin/gtkidle.c	Mon Apr 30 01:03:42 2007 +0000
+++ b/pidgin/gtkidle.c	Mon Apr 30 01:28:41 2007 +0000
@@ -120,10 +120,14 @@
 static PurpleIdleUiOps ui_ops =
 {
 #if defined(USE_SCREENSAVER) || defined(HAVE_IOKIT)
-	pidgin_get_time_idle
+	pidgin_get_time_idle,
 #else
+	NULL,
+#endif /* USE_SCREENSAVER || HAVE_IOKIT */
+	NULL,
+	NULL,
+	NULL,
 	NULL
-#endif /* USE_SCREENSAVER || HAVE_IOKIT */
 };
 
 PurpleIdleUiOps *
diff -r 8f4d82a1aa6d -r 589cc5757148 pidgin/gtkmain.c
--- a/pidgin/gtkmain.c	Mon Apr 30 01:03:42 2007 +0000
+++ b/pidgin/gtkmain.c	Mon Apr 30 01:28:41 2007 +0000
@@ -350,7 +350,11 @@
 	pidgin_prefs_init,
 	debug_init,
 	pidgin_ui_init,
-	pidgin_quit
+	pidgin_quit,
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 static PurpleCoreUiOps *
diff -r 8f4d82a1aa6d -r 589cc5757148 pidgin/gtknotify.c
--- a/pidgin/gtknotify.c	Mon Apr 30 01:03:42 2007 +0000
+++ b/pidgin/gtknotify.c	Mon Apr 30 01:28:41 2007 +0000
@@ -1112,7 +1112,11 @@
 	pidgin_notify_searchresults_new_rows,
 	pidgin_notify_userinfo,
 	pidgin_notify_uri,
-	pidgin_close_notify
+	pidgin_close_notify,
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 PurpleNotifyUiOps *
diff -r 8f4d82a1aa6d -r 589cc5757148 pidgin/gtkplugin.h
--- a/pidgin/gtkplugin.h	Mon Apr 30 01:03:42 2007 +0000
+++ b/pidgin/gtkplugin.h	Mon Apr 30 01:28:41 2007 +0000
@@ -38,6 +38,12 @@
 	GtkWidget *(*get_config_frame)(PurplePlugin *plugin);
 
 	int page_num;                                         /**< Reserved */
+
+	/* padding */
+	void (*_pidgin_reserved1)(void);
+	void (*_pidgin_reserved2)(void);
+	void (*_pidgin_reserved3)(void);
+	void (*_pidgin_reserved4)(void);
 };
 
 #define PIDGIN_PLUGIN_TYPE PIDGIN_UI
diff -r 8f4d82a1aa6d -r 589cc5757148 pidgin/gtkprivacy.c
--- a/pidgin/gtkprivacy.c	Mon Apr 30 01:03:42 2007 +0000
+++ b/pidgin/gtkprivacy.c	Mon Apr 30 01:28:41 2007 +0000
@@ -644,7 +644,11 @@
 	pidgin_permit_added_removed,
 	pidgin_permit_added_removed,
 	pidgin_deny_added_removed,
-	pidgin_deny_added_removed
+	pidgin_deny_added_removed,
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 PurplePrivacyUiOps *
diff -r 8f4d82a1aa6d -r 589cc5757148 pidgin/gtkrequest.c
--- a/pidgin/gtkrequest.c	Mon Apr 30 01:03:42 2007 +0000
+++ b/pidgin/gtkrequest.c	Mon Apr 30 01:28:41 2007 +0000
@@ -1676,7 +1676,11 @@
 	pidgin_request_fields,
 	pidgin_request_file,
 	pidgin_close_request,
-	pidgin_request_folder
+	pidgin_request_folder,
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 PurpleRequestUiOps *
diff -r 8f4d82a1aa6d -r 589cc5757148 pidgin/gtkroomlist.c
--- a/pidgin/gtkroomlist.c	Mon Apr 30 01:03:42 2007 +0000
+++ b/pidgin/gtkroomlist.c	Mon Apr 30 01:28:41 2007 +0000
@@ -789,7 +789,11 @@
 	pidgin_roomlist_set_fields,
 	pidgin_roomlist_add_room,
 	pidgin_roomlist_in_progress,
-	pidgin_roomlist_destroy
+	pidgin_roomlist_destroy,
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 
diff -r 8f4d82a1aa6d -r 589cc5757148 pidgin/gtksound.c
--- a/pidgin/gtksound.c	Mon Apr 30 01:03:42 2007 +0000
+++ b/pidgin/gtksound.c	Mon Apr 30 01:28:41 2007 +0000
@@ -549,7 +549,11 @@
 	pidgin_sound_init,
 	pidgin_sound_uninit,
 	pidgin_sound_play_file,
-	pidgin_sound_play_event
+	pidgin_sound_play_event,
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 PurpleSoundUiOps *
diff -r 8f4d82a1aa6d -r 589cc5757148 pidgin/gtkwhiteboard.c
--- a/pidgin/gtkwhiteboard.c	Mon Apr 30 01:03:42 2007 +0000
+++ b/pidgin/gtkwhiteboard.c	Mon Apr 30 01:28:41 2007 +0000
@@ -85,7 +85,11 @@
 	pidgin_whiteboard_set_brush,
 	pidgin_whiteboard_draw_brush_point,
 	pidgin_whiteboard_draw_brush_line,
-	pidgin_whiteboard_clear
+	pidgin_whiteboard_clear,
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 /******************************************************************************
diff -r 8f4d82a1aa6d -r 589cc5757148 pidgin/plugins/convcolors.c
--- a/pidgin/plugins/convcolors.c	Mon Apr 30 01:03:42 2007 +0000
+++ b/pidgin/plugins/convcolors.c	Mon Apr 30 01:28:41 2007 +0000
@@ -319,6 +319,12 @@
 {
 	get_config_frame,
 	0,
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 static PurplePluginInfo info =
@@ -347,7 +353,13 @@
 	&ui_info,                     /* ui_info            */
 	NULL,                         /* extra_info         */
 	NULL,                         /* prefs_info         */
-	NULL                          /* actions            */
+	NULL,                         /* actions            */
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 static void
diff -r 8f4d82a1aa6d -r 589cc5757148 pidgin/plugins/extplacement.c
--- a/pidgin/plugins/extplacement.c	Mon Apr 30 01:03:42 2007 +0000
+++ b/pidgin/plugins/extplacement.c	Mon Apr 30 01:28:41 2007 +0000
@@ -118,7 +118,13 @@
 static PurplePluginUiInfo prefs_info = {
 	get_plugin_pref_frame,
 	0,   /* page_num (Reserved) */
-	NULL /* frame (Reserved) */
+	NULL, /* frame (Reserved) */
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 static PurplePluginInfo info =
@@ -146,7 +152,13 @@
 	NULL,											/**< ui_info		*/
 	NULL,											/**< extra_info		*/
 	&prefs_info,									/**< prefs_info		*/
-	NULL											/**< actions		*/
+	NULL,											/**< actions		*/
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 static void
diff -r 8f4d82a1aa6d -r 589cc5757148 pidgin/plugins/gestures/gestures.c
--- a/pidgin/plugins/gestures/gestures.c	Mon Apr 30 01:03:42 2007 +0000
+++ b/pidgin/plugins/gestures/gestures.c	Mon Apr 30 01:28:41 2007 +0000
@@ -271,7 +271,13 @@
 static PidginPluginUiInfo ui_info =
 {
 	get_config_frame,
-	0 /* page_num (Reserved) */
+	0, /* page_num (Reserved) */
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 static PurplePluginInfo info =
@@ -308,6 +314,12 @@
 	&ui_info,                                         /**< ui_info        */
 	NULL,                                             /**< extra_info     */
 	NULL,
+	NULL,
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
 	NULL
 };
 
diff -r 8f4d82a1aa6d -r 589cc5757148 pidgin/plugins/history.c
--- a/pidgin/plugins/history.c	Mon Apr 30 01:03:42 2007 +0000
+++ b/pidgin/plugins/history.c	Mon Apr 30 01:28:41 2007 +0000
@@ -198,6 +198,12 @@
 	NULL,
 	NULL,
 	NULL,
+	NULL,
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
 	NULL
 };
 
diff -r 8f4d82a1aa6d -r 589cc5757148 pidgin/plugins/iconaway.c
--- a/pidgin/plugins/iconaway.c	Mon Apr 30 01:03:42 2007 +0000
+++ b/pidgin/plugins/iconaway.c	Mon Apr 30 01:28:41 2007 +0000
@@ -95,6 +95,12 @@
 	NULL,                                             /**< ui_info        */
 	NULL,                                             /**< extra_info     */
 	NULL,
+	NULL,
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
 	NULL
 };
 
diff -r 8f4d82a1aa6d -r 589cc5757148 pidgin/plugins/markerline.c
--- a/pidgin/plugins/markerline.c	Mon Apr 30 01:03:42 2007 +0000
+++ b/pidgin/plugins/markerline.c	Mon Apr 30 01:28:41 2007 +0000
@@ -261,6 +261,12 @@
 	get_plugin_pref_frame,
 	0,
 	NULL,
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 static PurplePluginInfo info = {
@@ -288,7 +294,13 @@
 	NULL,						/* ui_info				*/
 	NULL,						/* extra_info			*/
 	&prefs_info,				/* prefs_info			*/
-	NULL						/* actions				*/
+	NULL,						/* actions				*/
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 static void
diff -r 8f4d82a1aa6d -r 589cc5757148 pidgin/plugins/musicmessaging/musicmessaging.c
--- a/pidgin/plugins/musicmessaging/musicmessaging.c	Mon Apr 30 01:03:42 2007 +0000
+++ b/pidgin/plugins/musicmessaging/musicmessaging.c	Mon Apr 30 01:28:41 2007 +0000
@@ -649,7 +649,13 @@
 static PidginPluginUiInfo ui_info =
 {
 	get_config_frame,
-	0 /* page_num (reserved) */
+	0, /* page_num (reserved) */
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 static PurplePluginInfo info = {
@@ -677,7 +683,13 @@
     &ui_info,                                            /**< ui_info        */
     NULL,                                                /**< extra_info     */
     NULL,
-    NULL
+    NULL,
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 static void
diff -r 8f4d82a1aa6d -r 589cc5757148 pidgin/plugins/notify.c
--- a/pidgin/plugins/notify.c	Mon Apr 30 01:03:42 2007 +0000
+++ b/pidgin/plugins/notify.c	Mon Apr 30 01:28:41 2007 +0000
@@ -877,7 +877,13 @@
 static PidginPluginUiInfo ui_info =
 {
 	get_config_frame,
-	0 /* page_num (Reserved) */
+	0, /* page_num (Reserved) */
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 static PurplePluginInfo info =
@@ -909,6 +915,12 @@
 	&ui_info,                                         /**< ui_info        */
 	NULL,                                              /**< extra_info     */
 	NULL,
+	NULL,
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
 	NULL
 };
 
diff -r 8f4d82a1aa6d -r 589cc5757148 pidgin/plugins/pidginrc.c
--- a/pidgin/plugins/pidginrc.c	Mon Apr 30 01:03:42 2007 +0000
+++ b/pidgin/plugins/pidginrc.c	Mon Apr 30 01:28:41 2007 +0000
@@ -599,7 +599,13 @@
 static PidginPluginUiInfo purplerc_ui_info =
 {
 	purplerc_get_config_frame,
-	0 /* page_num (Reserved) */
+	0, /* page_num (Reserved) */
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 static PurplePluginInfo purplerc_info =
@@ -625,6 +631,12 @@
 	&purplerc_ui_info,
 	NULL,
 	NULL,
+	NULL,
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
 	NULL
 };
 
diff -r 8f4d82a1aa6d -r 589cc5757148 pidgin/plugins/relnot.c
--- a/pidgin/plugins/relnot.c	Mon Apr 30 01:03:42 2007 +0000
+++ b/pidgin/plugins/relnot.c	Mon Apr 30 01:28:41 2007 +0000
@@ -159,6 +159,12 @@
 	NULL,                                             /**< ui_info        */
 	NULL,                                             /**< extra_info     */
 	NULL,
+	NULL,
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
 	NULL
 };
 
diff -r 8f4d82a1aa6d -r 589cc5757148 pidgin/plugins/spellchk.c
--- a/pidgin/plugins/spellchk.c	Mon Apr 30 01:03:42 2007 +0000
+++ b/pidgin/plugins/spellchk.c	Mon Apr 30 01:28:41 2007 +0000
@@ -2350,7 +2350,13 @@
 static PidginPluginUiInfo ui_info =
 {
 	get_config_frame,
-	0 /* page_num (Reserved) */
+	0, /* page_num (Reserved) */
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 static PurplePluginInfo info =
@@ -2376,6 +2382,12 @@
 	&ui_info,
 	NULL,
 	NULL,
+	NULL,
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
 	NULL
 };
 
diff -r 8f4d82a1aa6d -r 589cc5757148 pidgin/plugins/ticker/ticker.c
--- a/pidgin/plugins/ticker/ticker.c	Mon Apr 30 01:03:42 2007 +0000
+++ b/pidgin/plugins/ticker/ticker.c	Mon Apr 30 01:28:41 2007 +0000
@@ -368,6 +368,12 @@
 	NULL,                                             /**< ui_info        */
 	NULL,                                             /**< extra_info     */
 	NULL,
+	NULL,
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
 	NULL
 };
 
diff -r 8f4d82a1aa6d -r 589cc5757148 pidgin/plugins/timestamp.c
--- a/pidgin/plugins/timestamp.c	Mon Apr 30 01:03:42 2007 +0000
+++ b/pidgin/plugins/timestamp.c	Mon Apr 30 01:28:41 2007 +0000
@@ -178,7 +178,13 @@
 static PidginPluginUiInfo ui_info =
 {
 	get_config_frame,
-	0 /* page_num (Reserved) */
+	0, /* page_num (Reserved) */
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 static PurplePluginInfo info =
@@ -209,6 +215,12 @@
 	&ui_info,                                         /**< ui_info        */
 	NULL,                                             /**< extra_info     */
 	NULL,
+	NULL,
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
 	NULL
 };
 
diff -r 8f4d82a1aa6d -r 589cc5757148 pidgin/plugins/timestamp_format.c
--- a/pidgin/plugins/timestamp_format.c	Mon Apr 30 01:03:42 2007 +0000
+++ b/pidgin/plugins/timestamp_format.c	Mon Apr 30 01:28:41 2007 +0000
@@ -126,7 +126,13 @@
 static PurplePluginUiInfo prefs_info = {
         get_plugin_pref_frame,
 	0,   /* page num (Reserved) */
-	NULL /* frame (Reserved) */
+	NULL,/* frame (Reserved) */
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 static PurplePluginInfo info =
@@ -159,7 +165,13 @@
 	NULL,                                             /**< ui_info        */
 	NULL,                                             /**< extra_info     */
 	&prefs_info,                                      /**< prefs_info     */
-	NULL                                              /**< actions        */
+	NULL,                                             /**< actions        */
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 static void
diff -r 8f4d82a1aa6d -r 589cc5757148 pidgin/plugins/win32/transparency/win2ktrans.c
--- a/pidgin/plugins/win32/transparency/win2ktrans.c	Mon Apr 30 01:03:42 2007 +0000
+++ b/pidgin/plugins/win32/transparency/win2ktrans.c	Mon Apr 30 01:28:41 2007 +0000
@@ -641,7 +641,13 @@
 static PidginPluginUiInfo ui_info =
 {
 	get_config_frame,
-	0 /* page_num (Reserved) */
+	0, /* page_num (Reserved) */
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 static PurplePluginInfo info =
@@ -670,7 +676,13 @@
 	&ui_info,			/**< ui_info        */
 	NULL,				/**< extra_info     */
 	NULL,				/**< prefs_info     */
-	NULL				/**< actions        */
+	NULL,				/**< actions        */
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 static void
diff -r 8f4d82a1aa6d -r 589cc5757148 pidgin/plugins/win32/winprefs/winprefs.c
--- a/pidgin/plugins/win32/winprefs/winprefs.c	Mon Apr 30 01:03:42 2007 +0000
+++ b/pidgin/plugins/win32/winprefs/winprefs.c	Mon Apr 30 01:28:41 2007 +0000
@@ -352,7 +352,13 @@
 static PidginPluginUiInfo ui_info =
 {
 	get_config_frame,
-	0
+	0,
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 static PurplePluginInfo info =
@@ -378,6 +384,12 @@
 	&ui_info,
 	NULL,
 	NULL,
+	NULL,
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
 	NULL
 };
 
diff -r 8f4d82a1aa6d -r 589cc5757148 pidgin/plugins/xmppconsole.c
--- a/pidgin/plugins/xmppconsole.c	Mon Apr 30 01:03:42 2007 +0000
+++ b/pidgin/plugins/xmppconsole.c	Mon Apr 30 01:28:41 2007 +0000
@@ -873,7 +873,13 @@
 	NULL,                                         /**< ui_info        */
 	NULL,                                             /**< extra_info     */
 	NULL,
-	actions
+	actions,
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 static void