Mercurial > pidgin3 / changeset

--- a/ChangeLog.API	Sun Jul 13 00:01:48 2025 -0500
+++ b/ChangeLog.API	Sun Jul 13 00:50:19 2025 -0500
@@ -111,8 +111,8 @@
 		  purple_notify_user_info_entry_set_entry_type
 		* purple_notify_user_info_prepend_pair renamed to
 		  purple_notify_user_info_prepend_pair_html
-		* PurplePlugin is now a GObject (alias for GPluginPlugin). Please see
-		  the documentation for details.
+		* PurplePlugin is now replaced by GPluginPlugin. Please see the
+		  documentation for details.
 		* PurplePluginInfo is now a GObject, inherits GPluginPluginInfo. Please
 		  see the documentation for details.
 		* PURPLE_INIT_PLUGIN(pluginname, initfunc, plugininfo) is now

--- a/libpurple/plugins.c	Sun Jul 13 00:01:48 2025 -0500
+++ b/libpurple/plugins.c	Sun Jul 13 00:50:19 2025 -0500
@@ -47,13 +47,13 @@
  * Plugin API
  **************************************************************************/
 static gboolean
-plugin_loading_cb(G_GNUC_UNUSED GObject *manager, PurplePlugin *plugin,
+plugin_loading_cb(G_GNUC_UNUSED GObject *manager, GPluginPlugin *plugin,
                   GError **error, G_GNUC_UNUSED gpointer data)
 {
 	PurplePluginInfo *info;
 	const gchar *info_error = NULL;
 
-	g_return_val_if_fail(PURPLE_IS_PLUGIN(plugin), FALSE);
+	g_return_val_if_fail(GPLUGIN_IS_PLUGIN(plugin), FALSE);
 
 	info = purple_plugin_get_info(plugin);
 	if (!info)
@@ -77,12 +77,12 @@
 }
 
 static void
-plugin_loaded_cb(G_GNUC_UNUSED GObject *manager, PurplePlugin *plugin)
+plugin_loaded_cb(G_GNUC_UNUSED GObject *manager, GPluginPlugin *plugin)
 {
 	PurplePluginInfo *info;
 	gchar *filename;
 
-	g_return_if_fail(PURPLE_IS_PLUGIN(plugin));
+	g_return_if_fail(GPLUGIN_IS_PLUGIN(plugin));
 
 	info = purple_plugin_get_info(plugin);
 	if (!info)
@@ -97,13 +97,13 @@
 }
 
 static gboolean
-plugin_unloading_cb(G_GNUC_UNUSED GObject *manager, PurplePlugin *plugin,
+plugin_unloading_cb(G_GNUC_UNUSED GObject *manager, GPluginPlugin *plugin,
                     G_GNUC_UNUSED GError **error, G_GNUC_UNUSED gpointer data)
 {
 	PurplePluginInfo *info;
 	gchar *filename;
 
-	g_return_val_if_fail(PURPLE_IS_PLUGIN(plugin), FALSE);
+	g_return_val_if_fail(GPLUGIN_IS_PLUGIN(plugin), FALSE);
 
 	info = purple_plugin_get_info(plugin);
 	if (info) {
@@ -117,11 +117,11 @@
 }
 
 static void
-plugin_unloaded_cb(G_GNUC_UNUSED GObject *manager, PurplePlugin *plugin)
+plugin_unloaded_cb(G_GNUC_UNUSED GObject *manager, GPluginPlugin *plugin)
 {
 	PurplePluginInfo *info;
 
-	g_return_if_fail(PURPLE_IS_PLUGIN(plugin));
+	g_return_if_fail(GPLUGIN_IS_PLUGIN(plugin));
 
 	info = purple_plugin_get_info(plugin);
 	if (!info)
@@ -139,13 +139,13 @@
 }
 
 gboolean
-purple_plugin_load(PurplePlugin *plugin, GError **error)
+purple_plugin_load(GPluginPlugin *plugin, GError **error)
 {
 	GPluginManager *manager = NULL;
 	GError *err = NULL;
 	gchar *filename;
 
-	g_return_val_if_fail(plugin != NULL, FALSE);
+	g_return_val_if_fail(GPLUGIN_IS_PLUGIN(plugin), FALSE);
 
 	if (purple_plugin_is_loaded(plugin))
 		return TRUE;
@@ -168,13 +168,13 @@
 }
 
 gboolean
-purple_plugin_unload(PurplePlugin *plugin, GError **error)
+purple_plugin_unload(GPluginPlugin *plugin, GError **error)
 {
 	GError *err = NULL;
 	gchar *filename;
 	GPluginManager *manager = NULL;
 
-	g_return_val_if_fail(plugin != NULL, FALSE);
+	g_return_val_if_fail(GPLUGIN_IS_PLUGIN(plugin), FALSE);
 
 	if (!purple_plugin_is_loaded(plugin))
 		return TRUE;
@@ -198,19 +198,19 @@
 }
 
 gboolean
-purple_plugin_is_loaded(PurplePlugin *plugin)
+purple_plugin_is_loaded(GPluginPlugin *plugin)
 {
-	g_return_val_if_fail(plugin != NULL, FALSE);
+	g_return_val_if_fail(GPLUGIN_IS_PLUGIN(plugin), FALSE);
 
 	return (gplugin_plugin_get_state(plugin) == GPLUGIN_PLUGIN_STATE_LOADED);
 }
 
 PurplePluginInfo *
-purple_plugin_get_info(PurplePlugin *plugin)
+purple_plugin_get_info(GPluginPlugin *plugin)
 {
 	GPluginPluginInfo *info;
 
-	g_return_val_if_fail(plugin != NULL, NULL);
+	g_return_val_if_fail(GPLUGIN_IS_PLUGIN(plugin), NULL);
 
 	info = gplugin_plugin_get_info(plugin);
 
@@ -227,20 +227,20 @@
 }
 
 void
-purple_plugin_disable(PurplePlugin *plugin)
+purple_plugin_disable(GPluginPlugin *plugin)
 {
-	g_return_if_fail(plugin != NULL);
+	g_return_if_fail(GPLUGIN_IS_PLUGIN(plugin));
 
 	if (!g_list_find(plugins_to_disable, plugin))
 		plugins_to_disable = g_list_prepend(plugins_to_disable, plugin);
 }
 
 gboolean
-purple_plugin_is_internal(PurplePlugin *plugin)
+purple_plugin_is_internal(GPluginPlugin *plugin)
 {
 	PurplePluginInfo *info;
 
-	g_return_val_if_fail(plugin != NULL, FALSE);
+	g_return_val_if_fail(GPLUGIN_IS_PLUGIN(plugin), FALSE);
 
 	info = purple_plugin_get_info(plugin);
 	if (!info)
@@ -251,7 +251,7 @@
 }
 
 GSList *
-purple_plugin_get_dependent_plugins(G_GNUC_UNUSED PurplePlugin *plugin)
+purple_plugin_get_dependent_plugins(G_GNUC_UNUSED GPluginPlugin *plugin)
 {
 #pragma message("TODO: Implement this when GPlugin can return dependent plugins.")
 	return NULL;
@@ -273,7 +273,7 @@
 		plugins = gplugin_manager_find_plugins(manager, l->data);
 
 		for (ll = plugins; ll; ll = ll->next) {
-			PurplePlugin *plugin = PURPLE_PLUGIN(ll->data);
+			GPluginPlugin *plugin = GPLUGIN_PLUGIN(ll->data);
 			if (purple_plugin_get_info(plugin))
 				ret = g_list_append(ret, plugin);
 		}
@@ -309,7 +309,7 @@
 
 	plugins = purple_plugins_find_all();
 	for (l = plugins; l != NULL; l = l->next) {
-		PurplePlugin *plugin = PURPLE_PLUGIN(l->data);
+		GPluginPlugin *plugin = GPLUGIN_PLUGIN(l->data);
 		PurplePluginInfo *info;
 		PurplePluginInfoFlags flags;
 		gboolean unloaded;
@@ -333,10 +333,10 @@
 	g_list_free(plugins);
 }
 
-PurplePlugin *
+GPluginPlugin *
 purple_plugins_find_plugin(const gchar *id)
 {
-	PurplePlugin *plugin;
+	GPluginPlugin *plugin;
 	GPluginManager *manager = NULL;
 
 	g_return_val_if_fail(id != NULL && *id != '\0', NULL);
@@ -357,7 +357,7 @@
 	return plugin;
 }
 
-PurplePlugin *
+GPluginPlugin *
 purple_plugins_find_by_filename(const char *filename)
 {
 	GList *plugins, *l;
@@ -367,7 +367,7 @@
 	plugins = purple_plugins_find_all();
 
 	for (l = plugins; l != NULL; l = l->next) {
-		PurplePlugin *plugin = PURPLE_PLUGIN(l->data);
+		GPluginPlugin *plugin = GPLUGIN_PLUGIN(l->data);
 		gchar *plugin_filename = gplugin_plugin_get_filename(plugin);
 
 		if (purple_strequal(plugin_filename, filename)) {
@@ -391,7 +391,7 @@
 	g_return_if_fail(key != NULL && *key != '\0');
 
 	for (pl = purple_plugins_get_loaded(); pl != NULL; pl = pl->next) {
-		PurplePlugin *plugin = PURPLE_PLUGIN(pl->data);
+		GPluginPlugin *plugin = GPLUGIN_PLUGIN(pl->data);
 		PurplePluginInfo *info = purple_plugin_get_info(plugin);
 		if (!info)
 			continue;
@@ -421,7 +421,7 @@
 
 	for (l = files; l; l = l->next)
 	{
-		PurplePlugin *plugin;
+		GPluginPlugin *plugin;
 		GError *error = NULL;
 		char *file;
 

--- a/libpurple/plugins.h	Sun Jul 13 00:01:48 2025 -0500
+++ b/libpurple/plugins.h	Sun Jul 13 00:50:19 2025 -0500
@@ -32,40 +32,6 @@
 
 #define PURPLE_PLUGINS_DOMAIN          (g_quark_from_static_string("plugins"))
 
-#define PURPLE_TYPE_PLUGIN             GPLUGIN_TYPE_PLUGIN
-/**
- * PURPLE_PLUGIN:
- * @obj: The instance.
- *
- * A typecast macro to cast @obj to PurplePlugin.
- *
- * Since: 3.0
- */
-#define PURPLE_PLUGIN(obj)             GPLUGIN_PLUGIN(obj)
-#define PURPLE_IS_PLUGIN(obj)          GPLUGIN_IS_PLUGIN(obj)
-#define PURPLE_PLUGIN_GET_IFACE(obj)   GPLUGIN_PLUGIN_GET_IFACE(obj)
-
-/**
- * PurplePlugin:
- *
- * Represents a plugin handle.
- * This type is an alias for GPluginPlugin.
- *
- * Since: 2.0
- */
-typedef GPluginPlugin PurplePlugin;
-
-/**
- * PurplePluginInterface:
- *
- * Represents the plugin interface.
- *
- * This type is an alias for GPluginPluginInterface.
- *
- * Since: 3.0
- */
-typedef GPluginPluginInterface PurplePluginInterface;
-
 #include "purpleplugininfo.h"
 #include "purpleversion.h"
 
@@ -90,7 +56,7 @@
  * Since: 2.0
  */
 PURPLE_AVAILABLE_IN_ALL
-gboolean purple_plugin_load(PurplePlugin *plugin, GError **error);
+gboolean purple_plugin_load(GPluginPlugin *plugin, GError **error);
 
 /**
  * purple_plugin_unload:
@@ -107,7 +73,7 @@
  * Since: 2.0
  */
 PURPLE_AVAILABLE_IN_ALL
-gboolean purple_plugin_unload(PurplePlugin *plugin, GError **error);
+gboolean purple_plugin_unload(GPluginPlugin *plugin, GError **error);
 
 /**
  * purple_plugin_is_loaded:
@@ -120,7 +86,7 @@
  * Since: 2.0
  */
 PURPLE_AVAILABLE_IN_ALL
-gboolean purple_plugin_is_loaded(PurplePlugin *plugin);
+gboolean purple_plugin_is_loaded(GPluginPlugin *plugin);
 
 /**
  * purple_plugin_get_info:
@@ -137,7 +103,7 @@
  * Since: 3.0
  */
 PURPLE_AVAILABLE_IN_3_0
-PurplePluginInfo *purple_plugin_get_info(PurplePlugin *plugin);
+PurplePluginInfo *purple_plugin_get_info(GPluginPlugin *plugin);
 
 /**
  * purple_plugin_disable:
@@ -153,7 +119,7 @@
  * Since: 2.3
  */
 PURPLE_AVAILABLE_IN_2_3
-void purple_plugin_disable(PurplePlugin *plugin);
+void purple_plugin_disable(GPluginPlugin *plugin);
 
 /**
  * purple_plugin_is_internal:
@@ -169,7 +135,7 @@
  * Since: 3.0
  */
 PURPLE_AVAILABLE_IN_3_0
-gboolean purple_plugin_is_internal(PurplePlugin *plugin);
+gboolean purple_plugin_is_internal(GPluginPlugin *plugin);
 
 /**
  * purple_plugin_get_dependent_plugins:
@@ -177,13 +143,13 @@
  *
  * Returns a list of plugins that depend on a particular plugin.
  *
- * Returns: (element-type PurplePlugin) (transfer none): The list of a plugins that depend on the specified
- *                           plugin.
+ * Returns: (element-type GPluginPlugin) (transfer none): The list of a plugins
+ *          that depend on the specified plugin.
  *
  * Since: 3.0
  */
 PURPLE_AVAILABLE_IN_3_0
-GSList *purple_plugin_get_dependent_plugins(PurplePlugin *plugin);
+GSList *purple_plugin_get_dependent_plugins(GPluginPlugin *plugin);
 
 /**************************************************************************/
 /* Plugins API                                                            */
@@ -194,7 +160,7 @@
  *
  * Returns a list of all plugins, whether loaded or not.
  *
- * Returns: (element-type PurplePlugin) (transfer full): A list of all plugins.
+ * Returns: (element-type GPluginPlugin) (transfer full): A list of all plugins.
  * 	       The list is owned by the caller, and must be
  *         g_list_free()d to avoid leaking the nodes.
  *
@@ -208,7 +174,8 @@
  *
  * Returns a list of all loaded plugins.
  *
- * Returns: (element-type PurplePlugin) (transfer none): A list of all loaded plugins.
+ * Returns: (element-type GPluginPlugin) (transfer none): A list of all loaded
+ *          plugins.
  *
  * Since: 2.0
  */
@@ -250,7 +217,7 @@
  * Since: 3.0
  */
 PURPLE_AVAILABLE_IN_3_0
-PurplePlugin *purple_plugins_find_plugin(const gchar *id);
+GPluginPlugin *purple_plugins_find_plugin(const gchar *id);
 
 /**
  * purple_plugins_find_by_filename:
@@ -263,7 +230,7 @@
  * Since: 3.0
  */
 PURPLE_AVAILABLE_IN_3_0
-PurplePlugin *purple_plugins_find_by_filename(const char *filename);
+GPluginPlugin *purple_plugins_find_by_filename(const char *filename);
 
 /**
  * purple_plugins_save_loaded:

--- a/pidgin/plugins/disco/gtkdisco.c	Sun Jul 13 00:01:48 2025 -0500
+++ b/pidgin/plugins/disco/gtkdisco.c	Sun Jul 13 00:50:19 2025 -0500
@@ -506,7 +506,7 @@
  *****************************************************************************/
 
 void
-pidgin_disco_dialog_register(PurplePlugin *plugin)
+pidgin_disco_dialog_register(GPluginPlugin *plugin)
 {
 	pidgin_disco_dialog_register_type(G_TYPE_MODULE(plugin));
 }

--- a/pidgin/plugins/disco/gtkdisco.h	Sun Jul 13 00:01:48 2025 -0500
+++ b/pidgin/plugins/disco/gtkdisco.h	Sun Jul 13 00:50:19 2025 -0500
@@ -69,7 +69,7 @@
 /**
  * Registers dynamic GObjects.
  */
-void pidgin_disco_dialog_register(PurplePlugin *plugin);
+void pidgin_disco_dialog_register(GPluginPlugin *plugin);
 
 /**
  * Shows a new service discovery dialog.

--- a/pidgin/plugins/disco/xmppdisco.c	Sun Jul 13 00:01:48 2025 -0500
+++ b/pidgin/plugins/disco/xmppdisco.c	Sun Jul 13 00:50:19 2025 -0500
@@ -49,7 +49,7 @@
 #include "gtkdisco.h"
 
 /* Variables */
-PurplePlugin *my_plugin = NULL;
+GPluginPlugin *my_plugin = NULL;
 static GHashTable *iq_callbacks = NULL;
 static gboolean iq_listening = FALSE;
 

--- a/pidgin/plugins/disco/xmppdisco.h	Sun Jul 13 00:01:48 2025 -0500
+++ b/pidgin/plugins/disco/xmppdisco.h	Sun Jul 13 00:50:19 2025 -0500
@@ -35,7 +35,7 @@
 #define PLUGIN_DOMAIN  (g_quark_from_static_string(PLUGIN_ID))
 
 #include <purple.h>
-extern PurplePlugin *my_plugin;
+extern GPluginPlugin *my_plugin;
 
 void xmpp_disco_start(PidginDiscoList *list);
 

--- a/pidgin/plugins/disco/xmppdiscoservice.c	Sun Jul 13 00:01:48 2025 -0500
+++ b/pidgin/plugins/disco/xmppdiscoservice.c	Sun Jul 13 00:50:19 2025 -0500
@@ -291,7 +291,7 @@
  *****************************************************************************/
 
 void
-xmpp_disco_service_register(PurplePlugin *plugin) {
+xmpp_disco_service_register(GPluginPlugin *plugin) {
 	xmpp_disco_service_register_type(G_TYPE_MODULE(plugin));
 }
 

--- a/pidgin/plugins/disco/xmppdiscoservice.h	Sun Jul 13 00:01:48 2025 -0500
+++ b/pidgin/plugins/disco/xmppdiscoservice.h	Sun Jul 13 00:50:19 2025 -0500
@@ -74,7 +74,7 @@
 	XMPP_DISCO_REGISTER = 0x0004,
 } XmppDiscoServiceFlags;
 
-void xmpp_disco_service_register(PurplePlugin *plugin);
+void xmpp_disco_service_register(GPluginPlugin *plugin);
 
 XmppDiscoService *xmpp_disco_service_new(PidginDiscoList *list);