--- a/libpurple/plugins.h Thu Jun 17 23:43:50 2021 -0500
+++ b/libpurple/plugins.h Fri Jun 18 00:00:00 2021 -0500
@@ -57,13 +57,7 @@
typedef GPluginPluginInterface PurplePluginInterface;
-/**
- * PURPLE_TYPE_PLUGIN_INFO:
- *
- * The standard _get_type macro for #PurplePluginInfo.
- */
-#define PURPLE_TYPE_PLUGIN_INFO (purple_plugin_info_get_type())
-typedef struct _PurplePluginInfo PurplePluginInfo;
+#include "purpleplugininfo.h"
/**
* PURPLE_TYPE_PLUGIN_ACTION:
@@ -73,8 +67,6 @@
#define PURPLE_TYPE_PLUGIN_ACTION (purple_plugin_action_get_type())
typedef struct _PurplePluginAction PurplePluginAction;
-#include "pluginpref.h"
-
/**
* PurplePluginActionCb:
* @action: the action information.
@@ -84,69 +76,6 @@
typedef void (*PurplePluginActionCb)(PurplePluginAction *action);
/**
- * PurplePluginActionsCb:
- * @plugin: the plugin associated with this callback.
- *
- * Returns a list of actions the plugin can perform.
- *
- * Returns: (transfer none): A list of actions the plugin can perform.
- */
-typedef GList *(*PurplePluginActionsCb)(PurplePlugin *plugin);
-
-/**
- * PurplePluginExtraCb:
- * @plugin: the plugin associated with this callback.
- *
- * Gives extra information about the plguin.
- *
- * Returns: a newly allocated string denoting extra information
- * about a plugin.
- */
-typedef gchar *(*PurplePluginExtraCb)(PurplePlugin *plugin);
-
-/**
- * PurplePluginPrefFrameCb:
- * @plugin: the plugin associated with this callback.
- *
- * Returns the preferences frame for the plugin.
- *
- * Returns: Preference frame.
- */
-typedef PurplePluginPrefFrame *(*PurplePluginPrefFrameCb)(PurplePlugin *plugin);
-
-/**
- * PurplePrefRequestCb:
- *
- * Returns the preferences request handle for a plugin.
- *
- * Returns: Preferences request handle.
- */
-typedef gpointer (*PurplePluginPrefRequestCb)(PurplePlugin *plugin);
-
-/**
- * PurplePluginInfoFlags:
- * @PURPLE_PLUGIN_INFO_FLAGS_INTERNAL: Plugin is not shown in UI lists
- * @PURPLE_PLUGIN_INFO_FLAGS_AUTO_LOAD: Auto-load the plugin
- *
- * Flags that can be used to treat plugins differently.
- */
-typedef enum /*< flags >*/
-{
- PURPLE_PLUGIN_INFO_FLAGS_INTERNAL = 1 << 1,
- PURPLE_PLUGIN_INFO_FLAGS_AUTO_LOAD = 1 << 2,
-
-} PurplePluginInfoFlags;
-
-/**
- * PurplePluginInfo:
- *
- * Holds information about a plugin.
- */
-struct _PurplePluginInfo {
- GPluginPluginInfo parent;
-};
-
-/**
* PurplePluginAction:
* @label: The label to display in the user interface.
* @callback: The function to call when the user wants to perform this action.
@@ -163,41 +92,6 @@
gpointer user_data;
};
-/**
- * PURPLE_PLUGIN_ABI_VERSION:
- *
- * Note: The lower six nibbles represent the ABI version for libpurple, the
- * rest are required by GPlugin.
- *
- * Returns: An ABI version to set in plugins using major and minor versions.
- */
-#define PURPLE_PLUGIN_ABI_VERSION(major,minor) \
- (0x01000000 | ((major) << 16) | (minor))
-
-/**
- * PURPLE_PLUGIN_ABI_MAJOR_VERSION:
- *
- * Returns: The major version from an ABI version
- */
-#define PURPLE_PLUGIN_ABI_MAJOR_VERSION(abi) \
- ((abi >> 16) & 0xff)
-
-/**
- * PURPLE_PLUGIN_ABI_MINOR_VERSION:
- *
- * Returns: The minor version from an ABI version
- */
-#define PURPLE_PLUGIN_ABI_MINOR_VERSION(abi) \
- (abi & 0xffff)
-
-/**
- * PURPLE_ABI_VERSION:
- *
- * A convenience macro that returns an ABI version using PURPLE_MAJOR_VERSION
- * and PURPLE_MINOR_VERSION
- */
-#define PURPLE_ABI_VERSION PURPLE_PLUGIN_ABI_VERSION(PURPLE_MAJOR_VERSION, PURPLE_MINOR_VERSION)
-
G_BEGIN_DECLS
/**************************************************************************/
@@ -293,182 +187,6 @@
GSList *purple_plugin_get_dependent_plugins(PurplePlugin *plugin);
/**************************************************************************/
-/* PluginInfo API */
-/**************************************************************************/
-
-/**
- * purple_plugin_info_get_type:
- *
- * Returns: The #GType for the #PurplePluginInfo object.
- */
-G_DECLARE_FINAL_TYPE(PurplePluginInfo, purple_plugin_info, PURPLE, PLUGIN_INFO,
- GPluginPluginInfo)
-
-/**
- * purple_plugin_info_new:
- * @first_property: The first property name
- * @...: The value of the first property, followed optionally by more
- * name/value pairs, followed by %NULL
- *
- * Creates a new #PurplePluginInfo instance to be returned from
- * #plugin_query of a plugin, using the provided name/value pairs.
- *
- * All properties except <literal>"id"</literal> and
- * <literal>"purple-abi"</literal> are optional.
- *
- * Valid property names are:
- * <informaltable frame='none'>
- * <tgroup cols='2'><tbody>
- * <row><entry><literal>"id"</literal></entry>
- * <entry>(string) The ID of the plugin.</entry>
- * </row>
- * <row><entry><literal>"abi-version"</literal></entry>
- * <entry>(<type>guint32</type>) The ABI version required by the
- * plugin.</entry>
- * </row>
- * <row><entry><literal>"name"</literal></entry>
- * <entry>(string) The translated name of the plugin.</entry>
- * </row>
- * <row><entry><literal>"version"</literal></entry>
- * <entry>(string) Version of the plugin.</entry>
- * </row>
- * <row><entry><literal>"category"</literal></entry>
- * <entry>(string) Primary category of the plugin.</entry>
- * </row>
- * <row><entry><literal>"summary"</literal></entry>
- * <entry>(string) Brief summary of the plugin.</entry>
- * </row>
- * <row><entry><literal>"description"</literal></entry>
- * <entry>(string) Full description of the plugin.</entry>
- * </row>
- * <row><entry><literal>"authors"</literal></entry>
- * <entry>(<type>const gchar * const *</type>) A %NULL-terminated list of
- * plugin authors. format: First Last <user\@domain.com></entry>
- * </row>
- * <row><entry><literal>"website"</literal></entry>
- * <entry>(string) Website of the plugin.</entry>
- * </row>
- * <row><entry><literal>"icon"</literal></entry>
- * <entry>(string) Path to a plugin's icon.</entry>
- * </row>
- * <row><entry><literal>"license-id"</literal></entry>
- * <entry>(string) Short name of the plugin's license. This should
- * either be an identifier of the license from
- * <ulink url="http://dep.debian.net/deps/dep5/#license-specification">
- * DEP5</ulink> or "Other" for custom licenses.</entry>
- * </row>
- * <row><entry><literal>"license-text"</literal></entry>
- * <entry>(string) The text of the plugin's license, if unlisted on
- * DEP5.</entry>
- * </row>
- * <row><entry><literal>"license-url"</literal></entry>
- * <entry>(string) The plugin's license URL, if unlisted on DEP5.</entry>
- * </row>
- * <row><entry><literal>"dependencies"</literal></entry>
- * <entry>(<type>const gchar * const *</type>) A %NULL-terminated list of
- * plugin IDs required by the plugin.</entry>
- * </row>
- * <row><entry><literal>"actions-cb"</literal></entry>
- * <entry>(#PurplePluginActionsCb) Callback that returns a list of
- * actions the plugin can perform.</entry>
- * </row>
- * <row><entry><literal>"extra-cb"</literal></entry>
- * <entry>(#PurplePluginExtraCb) Callback that returns a newly
- * allocated string denoting extra information about a plugin.</entry>
- * </row>
- * <row><entry><literal>"pref-frame-cb"</literal></entry>
- * <entry>(#PurplePluginPrefFrameCb) Callback that returns a
- * preferences frame for the plugin.</entry>
- * </row>
- * <row><entry><literal>"pref-request-cb"</literal></entry>
- * <entry>(#PurplePluginPrefRequestCb) Callback that returns a
- * preferences request handle for the plugin.</entry>
- * </row>
- * <row><entry><literal>"flags"</literal></entry>
- * <entry>(#PurplePluginInfoFlags) The flags for a plugin.</entry>
- * </row>
- * </tbody></tgroup>
- * </informaltable>
- *
- * See #PURPLE_PLUGIN_ABI_VERSION,
- * <link linkend="chapter-plugin-ids">Plugin IDs</link>.
- *
- * Returns: A new #PurplePluginInfo instance.
- */
-GPluginPluginInfo *purple_plugin_info_new(const char *first_property, ...) G_GNUC_NULL_TERMINATED;
-
-/**
- * purple_plugin_info_get_actions_cb:
- * @info: The plugin info to get the callback from.
- *
- * Returns the callback that retrieves the list of actions a plugin can perform
- * at that moment.
- *
- * Returns: The callback that returns a list of #PurplePluginAction
- * instances corresponding to the actions a plugin can perform.
- */
-PurplePluginActionsCb
-purple_plugin_info_get_actions_cb(PurplePluginInfo *info);
-
-/**
- * purple_plugin_info_get_extra_cb:
- * @info: The plugin info to get extra information from.
- *
- * Returns a callback that gives extra information about a plugin. You must
- * free the string returned by this callback.
- *
- * Returns: (transfer none): The callback that returns extra information about a plugin.
- */
-PurplePluginExtraCb
-purple_plugin_info_get_extra_cb(PurplePluginInfo *info);
-
-/**
- * purple_plugin_info_get_pref_frame_cb:
- * @info: The plugin info to get the callback from.
- *
- * Returns the callback that retrieves the preferences frame for a plugin, set
- * via the "pref-frame-cb" property of the plugin info.
- *
- * Returns: The callback that returns the preferences frame.
- */
-PurplePluginPrefFrameCb
-purple_plugin_info_get_pref_frame_cb(PurplePluginInfo *info);
-
-/**
- * purple_plugin_info_get_pref_request_cb:
- * @info: The plugin info to get the callback from.
- *
- * Returns the callback that retrieves the preferences request handle for a
- * plugin, set via the "pref-request-cb" property of the plugin info.
- *
- * Returns: (transfer none): The callback that returns the preferences request handle.
- */
-PurplePluginPrefRequestCb
-purple_plugin_info_get_pref_request_cb(PurplePluginInfo *info);
-
-/**
- * purple_plugin_info_get_flags:
- * @info: The plugin's info instance.
- *
- * Returns the plugin's flags.
- *
- * Returns: The flags of the plugin.
- */
-PurplePluginInfoFlags
-purple_plugin_info_get_flags(PurplePluginInfo *info);
-
-/**
- * purple_plugin_info_get_error:
- * @info: The plugin info.
- *
- * Returns an error in the plugin info that would prevent the plugin from being
- * loaded.
- *
- * Returns: The plugin info error, or %NULL.
- */
-const gchar *purple_plugin_info_get_error(PurplePluginInfo *info);
-
-/**************************************************************************/
/* PluginAction API */
/**************************************************************************/
