Mercurial > pidgin3 / changeset

--- a/ChangeLog.API	Mon Sep 16 21:08:27 2019 -0400
+++ b/ChangeLog.API	Tue Sep 17 02:20:47 2019 +0000
@@ -68,21 +68,12 @@
 		* PurplePluginInfoFlags (PURPLE_PLUGIN_INFO_FLAGS_INTERNAL and
 		  PURPLE_PLUGIN_INFO_FLAGS_AUTO_LOAD)
 		* purple_plugin_get_dependent_plugins
-		* purple_plugin_get_filename
 		* purple_plugin_is_internal
 		* purple_plugin_info_new
 		* purple_plugin_get_info
-		* purple_plugin_info_get_abi_version
 		* purple_plugin_info_get_actions_cb
-		* purple_plugin_info_get_category
-		* purple_plugin_info_get_dependencies
 		* purple_plugin_info_get_error
 		* purple_plugin_info_get_extra_cb
-		* purple_plugin_info_get_flags
-		* purple_plugin_info_get_icon
-		* purple_plugin_info_get_license_id
-		* purple_plugin_info_get_license_text
-		* purple_plugin_info_get_license_url
 		* purple_plugin_info_get_pref_frame_cb
 		* purple_plugin_info_get_pref_request_cb
 		* purple_plugin_info_get_ui_data

--- a/finch/gntblist.c	Mon Sep 16 21:08:27 2019 -0400
+++ b/finch/gntblist.c	Tue Sep 17 02:20:47 2019 +0000
@@ -2482,7 +2482,8 @@
 		if (!purple_plugin_info_get_actions_cb(info))
 			continue;
 
-		item = gnt_menuitem_new(_(purple_plugin_info_get_name(info)));
+		item = gnt_menuitem_new(_(gplugin_plugin_info_get_name(
+		        GPLUGIN_PLUGIN_INFO(info))));
 		gnt_menu_add_item(GNT_MENU(sub), item);
 		build_plugin_actions(item, plugin);
 	}

--- a/finch/gntconv.c	Mon Sep 16 21:08:27 2019 -0400
+++ b/finch/gntconv.c	Tue Sep 17 02:20:47 2019 +0000
@@ -1284,8 +1284,13 @@
 		const GList *plugins = purple_plugins_get_loaded();
 		if (plugins) {
 			for (; plugins; plugins = plugins->next) {
-				PurplePluginInfo *plugin_info = purple_plugin_get_info(plugins->data);
-				str = g_string_append(str, purple_plugin_info_get_name(plugin_info));
+				GPluginPluginInfo *plugin_info =
+				        GPLUGIN_PLUGIN_INFO(
+				                purple_plugin_get_info(
+				                        plugins->data));
+				str = g_string_append(
+				        str, gplugin_plugin_info_get_name(
+				                     plugin_info));
 
 				if (plugins->next)
 					str = g_string_append(str, ", ");

--- a/finch/gntplugin.c	Mon Sep 16 21:08:27 2019 -0400
+++ b/finch/gntplugin.c	Tue Sep 17 02:20:47 2019 +0000
@@ -264,7 +264,8 @@
 selection_changed(GntWidget *widget, gpointer old, gpointer current, gpointer null)
 {
 	PurplePlugin *plugin = current;
-	PurplePluginInfo *info;
+	const gchar *filename;
+	GPluginPluginInfo *info;
 	char *text, *authors = NULL;
 	const char * const *authorlist;
 	GList *list = NULL, *iter = NULL;
@@ -272,8 +273,9 @@
 	if (!plugin)
 		return;
 
-	info = purple_plugin_get_info(plugin);
-	authorlist = purple_plugin_info_get_authors(info);
+	filename = gplugin_plugin_get_filename(GPLUGIN_PLUGIN(plugin));
+	info = GPLUGIN_PLUGIN_INFO(purple_plugin_get_info(plugin));
+	authorlist = gplugin_plugin_info_get_authors(info);
 
 	if (authorlist)
 		authors = g_strjoinv(", ", (gchar **)authorlist);
@@ -284,25 +286,27 @@
 	 * quickly find the plugin in the list.
 	 * I probably mean 'plugin developers' by 'users' here. */
 	list = g_object_get_data(G_OBJECT(widget), "seen-list");
-	if (list)
-		iter = g_list_find_custom(list, purple_plugin_get_filename(plugin),
-					(GCompareFunc)strcmp);
+	if (list) {
+		iter = g_list_find_custom(list, filename, (GCompareFunc)strcmp);
+	}
 	if (!iter) {
-		list = g_list_prepend(list, g_strdup(purple_plugin_get_filename(plugin)));
+		list = g_list_prepend(list, g_strdup(filename));
 		g_object_set_data(G_OBJECT(widget), "seen-list", list);
 	}
 
 	/* XXX: Use formatting and stuff */
 	gnt_text_view_clear(GNT_TEXT_VIEW(plugins.aboot));
-	text = g_strdup_printf((g_strv_length((gchar **)authorlist) > 1 ?
-			_("Name: %s\nVersion: %s\nDescription: %s\nAuthors: %s\nWebsite: %s\nFilename: %s\n") :
-			_("Name: %s\nVersion: %s\nDescription: %s\nAuthor: %s\nWebsite: %s\nFilename: %s\n")),
-			SAFE(_(purple_plugin_info_get_name(info))),
-			SAFE(_(purple_plugin_info_get_version(info))),
-			SAFE(_(purple_plugin_info_get_description(info))),
-			SAFE(authors),
-			SAFE(_(purple_plugin_info_get_website(info))),
-			SAFE(purple_plugin_get_filename(plugin)));
+	text = g_strdup_printf(
+	        (g_strv_length((gchar **)authorlist) > 1
+	                 ? _("Name: %s\nVersion: %s\nDescription: %s\nAuthors: "
+	                     "%s\nWebsite: %s\nFilename: %s\n")
+	                 : _("Name: %s\nVersion: %s\nDescription: %s\nAuthor: "
+	                     "%s\nWebsite: %s\nFilename: %s\n")),
+	        SAFE(_(gplugin_plugin_info_get_name(info))),
+	        SAFE(_(gplugin_plugin_info_get_version(info))),
+	        SAFE(_(gplugin_plugin_info_get_description(info))),
+	        SAFE(authors), SAFE(_(gplugin_plugin_info_get_website(info))),
+	        SAFE(filename));
 
 	gnt_text_view_append_text_with_flags(GNT_TEXT_VIEW(plugins.aboot),
 			text, GNT_TEXT_FLAG_NORMAL);
@@ -330,8 +334,14 @@
 static int
 plugin_compare(PurplePlugin *p1, PurplePlugin *p2)
 {
-	char *s1 = g_utf8_strup(purple_plugin_info_get_name(purple_plugin_get_info(p1)), -1);
-	char *s2 = g_utf8_strup(purple_plugin_info_get_name(purple_plugin_get_info(p2)), -1);
+	char *s1 =
+	        g_utf8_strup(gplugin_plugin_info_get_name(GPLUGIN_PLUGIN_INFO(
+	                             purple_plugin_get_info(p1))),
+	                     -1);
+	char *s2 =
+	        g_utf8_strup(gplugin_plugin_info_get_name(GPLUGIN_PLUGIN_INFO(
+	                             purple_plugin_get_info(p2))),
+	                     -1);
 	int ret = g_utf8_collate(s1, s2);
 	g_free(s1);
 	g_free(s2);
@@ -385,7 +395,8 @@
 
 		gnt_box_set_toplevel(GNT_BOX(window), TRUE);
 		gnt_box_set_title(GNT_BOX(window),
-				purple_plugin_info_get_name(info));
+		                  gplugin_plugin_info_get_name(
+		                          GPLUGIN_PLUGIN_INFO(info)));
 		gnt_box_set_alignment(GNT_BOX(window), GNT_ALIGN_MID);
 
 		box = priv->pref_frame_cb();
@@ -483,14 +494,19 @@
 		if (purple_plugin_is_internal(plug))
 			continue;
 
-		gnt_tree_add_choice(GNT_TREE(tree), plug,
-				gnt_tree_create_row(GNT_TREE(tree),
-				purple_plugin_info_get_name(purple_plugin_get_info(plug))),
-				NULL, NULL);
+		gnt_tree_add_choice(
+		        GNT_TREE(tree), plug,
+		        gnt_tree_create_row(
+		                GNT_TREE(tree),
+		                gplugin_plugin_info_get_name(
+		                        GPLUGIN_PLUGIN_INFO(
+		                                purple_plugin_get_info(plug)))),
+		        NULL, NULL);
 		gnt_tree_set_choice(GNT_TREE(tree), plug, purple_plugin_is_loaded(plug));
-		if (!g_list_find_custom(seen, purple_plugin_get_filename(plug),
-				(GCompareFunc)strcmp))
+		if (!g_list_find_custom(seen, gplugin_plugin_get_filename(plug),
+		                        (GCompareFunc)strcmp)) {
 			gnt_tree_set_row_flags(GNT_TREE(tree), plug, GNT_TEXT_FLAG_BOLD);
+		}
 	}
 	g_list_free(plugin_list);
 

--- a/libpurple/keyring.c	Mon Sep 16 21:08:27 2019 -0400
+++ b/libpurple/keyring.c	Tue Sep 17 02:20:47 2019 +0000
@@ -1292,10 +1292,13 @@
 	plugins = purple_plugins_find_all();
 	for (it = plugins; it != NULL; it = it->next) {
 		PurplePlugin *plugin = PURPLE_PLUGIN(it->data);
-		PurplePluginInfo *info = purple_plugin_get_info(plugin);
+		GPluginPluginInfo *info =
+		        GPLUGIN_PLUGIN_INFO(purple_plugin_get_info(plugin));
 
-		if (strncmp(purple_plugin_info_get_id(info), "keyring-", 8) != 0)
+		if (!purple_str_has_prefix(gplugin_plugin_info_get_id(info),
+		                           "keyring-")) {
 			continue;
+		}
 
 		if (purple_plugin_is_loaded(plugin))
 			continue;

--- a/libpurple/plugins.c	Mon Sep 16 21:08:27 2019 -0400
+++ b/libpurple/plugins.c	Tue Sep 17 02:20:47 2019 +0000
@@ -95,7 +95,8 @@
 
 	if (priv->error) {
 		purple_debug_error("plugins", "Failed to load plugin %s: %s",
-				           purple_plugin_get_filename(plugin), priv->error);
+		                   gplugin_plugin_get_filename(plugin),
+		                   priv->error);
 
 		g_set_error(error, PURPLE_PLUGINS_DOMAIN, 0,
 				    "Plugin is not loadable: %s", priv->error);
@@ -120,7 +121,7 @@
 	loaded_plugins = g_list_prepend(loaded_plugins, plugin);
 
 	purple_debug_info("plugins", "Loaded plugin %s\n",
-	                  purple_plugin_get_filename(plugin));
+	                  gplugin_plugin_get_filename(plugin));
 
 	purple_signal_emit(purple_plugins_get_handle(), "plugin-load", plugin);
 }
@@ -136,7 +137,7 @@
 	info = purple_plugin_get_info(plugin);
 	if (info) {
 		purple_debug_info("plugins", "Unloading plugin %s\n",
-		                  purple_plugin_get_filename(plugin));
+		                  gplugin_plugin_get_filename(plugin));
 	}
 
 	return TRUE;
@@ -185,8 +186,8 @@
 
 	if (!gplugin_manager_load_plugin(plugin, &err)) {
 		purple_debug_error("plugins", "Failed to load plugin %s: %s",
-				purple_plugin_get_filename(plugin),
-				(err ? err->message : "Unknown reason"));
+		                   gplugin_plugin_get_filename(plugin),
+		                   err ? err->message : "Unknown reason");
 
 		if (error)
 			*error = g_error_copy(err);
@@ -210,8 +211,8 @@
 
 	if (!gplugin_manager_unload_plugin(plugin, &err)) {
 		purple_debug_error("plugins", "Failed to unload plugin %s: %s",
-				purple_plugin_get_filename(plugin),
-				(err ? err->message : "Unknown reason"));
+		                   gplugin_plugin_get_filename(plugin),
+		                   err ? err->message : "Unknown reason");
 
 		if (error)
 			*error = g_error_copy(err);
@@ -231,14 +232,6 @@
 	return (gplugin_plugin_get_state(plugin) == GPLUGIN_PLUGIN_STATE_LOADED);
 }
 
-const gchar *
-purple_plugin_get_filename(PurplePlugin *plugin)
-{
-	g_return_val_if_fail(plugin != NULL, NULL);
-
-	return gplugin_plugin_get_filename(plugin);
-}
-
 PurplePluginInfo *
 purple_plugin_get_info(PurplePlugin *plugin)
 {
@@ -395,9 +388,10 @@
 purple_plugin_info_constructed(GObject *object)
 {
 	PurplePluginInfo *info = PURPLE_PLUGIN_INFO(object);
+	GPluginPluginInfo *ginfo = GPLUGIN_PLUGIN_INFO(info);
 	PurplePluginInfoPrivate *priv =
 			purple_plugin_info_get_instance_private(info);
-	const char *id = purple_plugin_info_get_id(info);
+	const char *id = gplugin_plugin_info_get_id(ginfo);
 	guint32 version;
 
 	G_OBJECT_CLASS(purple_plugin_info_parent_class)->constructed(object);
@@ -413,7 +407,7 @@
 				id, priv->error);
 	}
 
-	version = purple_plugin_info_get_abi_version(info);
+	version = gplugin_plugin_info_get_abi_version(ginfo);
 	if (PURPLE_PLUGIN_ABI_MAJOR_VERSION(version) != PURPLE_MAJOR_VERSION ||
 		PURPLE_PLUGIN_ABI_MINOR_VERSION(version) > PURPLE_MINOR_VERSION)
 	{
@@ -518,118 +512,6 @@
 	return PURPLE_PLUGIN_INFO(info);
 }
 
-const gchar *
-purple_plugin_info_get_id(const PurplePluginInfo *info)
-{
-	g_return_val_if_fail(info != NULL, NULL);
-
-	return gplugin_plugin_info_get_id(GPLUGIN_PLUGIN_INFO(info));
-}
-
-const gchar *
-purple_plugin_info_get_name(const PurplePluginInfo *info)
-{
-	g_return_val_if_fail(info != NULL, NULL);
-
-	return gplugin_plugin_info_get_name(GPLUGIN_PLUGIN_INFO(info));
-}
-
-const gchar *
-purple_plugin_info_get_version(const PurplePluginInfo *info)
-{
-	g_return_val_if_fail(info != NULL, NULL);
-
-	return gplugin_plugin_info_get_version(GPLUGIN_PLUGIN_INFO(info));
-}
-
-const gchar *
-purple_plugin_info_get_category(const PurplePluginInfo *info)
-{
-	g_return_val_if_fail(info != NULL, NULL);
-
-	return gplugin_plugin_info_get_category(GPLUGIN_PLUGIN_INFO(info));
-}
-
-const gchar *
-purple_plugin_info_get_summary(const PurplePluginInfo *info)
-{
-	g_return_val_if_fail(info != NULL, NULL);
-
-	return gplugin_plugin_info_get_summary(GPLUGIN_PLUGIN_INFO(info));
-}
-
-const gchar *
-purple_plugin_info_get_description(const PurplePluginInfo *info)
-{
-	g_return_val_if_fail(info != NULL, NULL);
-
-	return gplugin_plugin_info_get_description(GPLUGIN_PLUGIN_INFO(info));
-}
-
-const gchar * const *
-purple_plugin_info_get_authors(const PurplePluginInfo *info)
-{
-	g_return_val_if_fail(info != NULL, NULL);
-
-	return gplugin_plugin_info_get_authors(GPLUGIN_PLUGIN_INFO(info));
-}
-
-const gchar *
-purple_plugin_info_get_website(const PurplePluginInfo *info)
-{
-	g_return_val_if_fail(info != NULL, NULL);
-
-	return gplugin_plugin_info_get_website(GPLUGIN_PLUGIN_INFO(info));
-}
-
-const gchar *
-purple_plugin_info_get_icon(const PurplePluginInfo *info)
-{
-	g_return_val_if_fail(info != NULL, NULL);
-
-	return gplugin_plugin_info_get_icon(GPLUGIN_PLUGIN_INFO(info));
-}
-
-const gchar *
-purple_plugin_info_get_license_id(const PurplePluginInfo *info)
-{
-	g_return_val_if_fail(info != NULL, NULL);
-
-	return gplugin_plugin_info_get_license_id(GPLUGIN_PLUGIN_INFO(info));
-}
-
-const gchar *
-purple_plugin_info_get_license_text(const PurplePluginInfo *info)
-{
-	g_return_val_if_fail(info != NULL, NULL);
-
-	return gplugin_plugin_info_get_license_text(GPLUGIN_PLUGIN_INFO(info));
-}
-
-const gchar *
-purple_plugin_info_get_license_url(const PurplePluginInfo *info)
-{
-	g_return_val_if_fail(info != NULL, NULL);
-
-	return gplugin_plugin_info_get_license_url(GPLUGIN_PLUGIN_INFO(info));
-}
-
-const gchar * const *
-purple_plugin_info_get_dependencies(const PurplePluginInfo *info)
-{
-	g_return_val_if_fail(info != NULL, NULL);
-
-	return gplugin_plugin_info_get_dependencies(GPLUGIN_PLUGIN_INFO(info));
-}
-
-guint32
-purple_plugin_info_get_abi_version(const PurplePluginInfo *info)
-{
-	g_return_val_if_fail(info != NULL, 0);
-
-	return gplugin_plugin_info_get_abi_version(GPLUGIN_PLUGIN_INFO(info));
-}
-
 PurplePluginActionsCb
 purple_plugin_info_get_actions_cb(PurplePluginInfo *info)
 {
@@ -705,7 +587,7 @@
 }
 
 gpointer
-purple_plugin_info_get_ui_data(const PurplePluginInfo *info)
+purple_plugin_info_get_ui_data(PurplePluginInfo *info)
 {
 	g_return_val_if_fail(PURPLE_IS_PLUGIN_INFO(info), NULL);
 
@@ -822,7 +704,7 @@
 		if (!priv->unloaded && purple_plugin_info_get_flags(info) &
 				PURPLE_PLUGIN_INFO_FLAGS_AUTO_LOAD) {
 			purple_debug_info("plugins", "Auto-loading plugin %s\n",
-			                  purple_plugin_get_filename(plugin));
+			                  gplugin_plugin_get_filename(plugin));
 			purple_plugin_load(plugin, NULL);
 		}
 	}
@@ -863,7 +745,8 @@
 	for (l = plugins; l != NULL; l = l->next) {
 		PurplePlugin *plugin = PURPLE_PLUGIN(l->data);
 
-		if (purple_strequal(purple_plugin_get_filename(plugin), filename)) {
+		if (purple_strequal(gplugin_plugin_get_filename(plugin),
+		                    filename)) {
 			g_list_free(plugins);
 			return plugin;
 		}
@@ -892,7 +775,9 @@
 			continue;
 
 		if (!g_list_find(plugins_to_disable, plugin))
-			files = g_list_append(files, (gchar *)purple_plugin_get_filename(plugin));
+			files = g_list_append(
+			        files,
+			        (gchar *)gplugin_plugin_get_filename(plugin));
 	}
 
 	purple_prefs_set_path_list(key, files);

--- a/libpurple/plugins.h	Mon Sep 16 21:08:27 2019 -0400
+++ b/libpurple/plugins.h	Tue Sep 17 02:20:47 2019 +0000
@@ -374,16 +374,6 @@
 gboolean purple_plugin_is_loaded(PurplePlugin *plugin);
 
 /**
- * purple_plugin_get_filename:
- * @plugin: The plugin.
- *
- * Returns a plugin's filename, along with the path.
- *
- * Returns: The plugin's filename.
- */
-const gchar *purple_plugin_get_filename(PurplePlugin *plugin);
-
-/**
  * purple_plugin_get_info:
  * @plugin: The plugin.
  *
@@ -570,148 +560,6 @@
                   G_GNUC_NULL_TERMINATED;
 
 /**
- * purple_plugin_info_get_id:
- * @info: The plugin's info instance.
- *
- * Returns a plugin's ID.
- *
- * Returns: The plugin's ID.
- */
-const gchar *purple_plugin_info_get_id(const PurplePluginInfo *info);
-
-/**
- * purple_plugin_info_get_name:
- * @info: The plugin's info instance.
- *
- * Returns a plugin's translated name.
- *
- * Returns: The name of the plugin, or %NULL.
- */
-const gchar *purple_plugin_info_get_name(const PurplePluginInfo *info);
-
-/**
- * purple_plugin_info_get_version:
- * @info: The plugin's info instance.
- *
- * Returns a plugin's version.
- *
- * Returns: The version of the plugin, or %NULL.
- */
-const gchar *purple_plugin_info_get_version(const PurplePluginInfo *info);
-
-/**
- * purple_plugin_info_get_category:
- * @info: The plugin's info instance.
- *
- * Returns a plugin's primary category.
- *
- * Returns: The primary category of the plugin, or %NULL.
- */
-const gchar *purple_plugin_info_get_category(const PurplePluginInfo *info);
-
-/**
- * purple_plugin_info_get_summary:
- * @info: The plugin's info instance.
- *
- * Returns a plugin's summary.
- *
- * Returns: The summary of the plugin, or %NULL.
- */
-const gchar *purple_plugin_info_get_summary(const PurplePluginInfo *info);
-
-/**
- * purple_plugin_info_get_description:
- * @info: The plugin's info instance.
- *
- * Returns a plugin's description.
- *
- * Returns: The description of the plugin, or %NULL.
- */
-const gchar *purple_plugin_info_get_description(const PurplePluginInfo *info);
-
-/**
- * purple_plugin_info_get_authors:
- * @info: The plugin's info instance.
- *
- * Returns a NULL-terminated list of the plugin's authors.
- *
- * Returns: The authors of the plugin, or %NULL.
- */
-const gchar * const *
-purple_plugin_info_get_authors(const PurplePluginInfo *info);
-
-/**
- * purple_plugin_info_get_website:
- * @info: The plugin's info instance.
- *
- * Returns a plugin's website.
- *
- * Returns: The website of the plugin, or %NULL.
- */
-const gchar *purple_plugin_info_get_website(const PurplePluginInfo *info);
-
-/**
- * purple_plugin_info_get_icon:
- * @info: The plugin's info instance.
- *
- * Returns the path to a plugin's icon.
- *
- * Returns: The path to the plugin's icon, or %NULL.
- */
-const gchar *purple_plugin_info_get_icon(const PurplePluginInfo *info);
-
-/**
- * purple_plugin_info_get_license_id:
- * @info: The plugin's info instance.
- *
- * Returns a short name of the plugin's license.
- *
- * Returns: The license name of the plugin, or %NULL.
- */
-const gchar *purple_plugin_info_get_license_id(const PurplePluginInfo *info);
-
-/**
- * purple_plugin_info_get_license_text:
- * @info: The plugin's info instance.
- *
- * Returns the text of a plugin's license.
- *
- * Returns: The license text of the plugin, or %NULL.
- */
-const gchar *purple_plugin_info_get_license_text(const PurplePluginInfo *info);
-
-/**
- * purple_plugin_info_get_license_url:
- * @info: The plugin's info instance.
- *
- * Returns the URL of a plugin's license.
- *
- * Returns: The license URL of the plugin, or %NULL.
- */
-const gchar *purple_plugin_info_get_license_url(const PurplePluginInfo *info);
-
-/**
- * purple_plugin_info_get_dependencies:
- * @info: The plugin's info instance.
- *
- * Returns a NULL-terminated list of IDs of plugins required by a plugin.
- *
- * Returns: The dependencies of the plugin, or %NULL.
- */
-const gchar * const *
-purple_plugin_info_get_dependencies(const PurplePluginInfo *info);
-
-/**
- * purple_plugin_info_get_abi_version:
- * @info: The plugin's info instance.
- *
- * Returns the required purple ABI version for a plugin.
- *
- * Returns: The required purple ABI version for the plugin.
- */
-guint32 purple_plugin_info_get_abi_version(const PurplePluginInfo *info);
-
-/**
  * purple_plugin_info_get_actions_cb:
  * @info: The plugin info to get the callback from.
  *
@@ -801,7 +649,7 @@
  *          convenience field provided to the UIs--it is not
  *          used by the libpurple core.
  */
-gpointer purple_plugin_info_get_ui_data(const PurplePluginInfo *info);
+gpointer purple_plugin_info_get_ui_data(PurplePluginInfo *info);
 
 /**************************************************************************/
 /* PluginAction API                                                       */

--- a/pidgin/gtkblist.c	Mon Sep 16 21:08:27 2019 -0400
+++ b/pidgin/gtkblist.c	Tue Sep 17 02:20:47 2019 +0000
@@ -8222,7 +8222,8 @@
 		}
 
 		menuitem = gtk_menu_item_new_with_mnemonic(
-				_(purple_plugin_info_get_name(info)));
+		        _(gplugin_plugin_info_get_name(
+		                GPLUGIN_PLUGIN_INFO(info))));
 		gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), submenu);
 		gtk_widget_show(menuitem);
 		plugin_menu_items = g_slist_prepend(plugin_menu_items,

--- a/pidgin/gtkconv.c	Mon Sep 16 21:08:27 2019 -0400
+++ b/pidgin/gtkconv.c	Tue Sep 17 02:20:47 2019 +0000
@@ -324,8 +324,12 @@
 		const GList *plugins = purple_plugins_get_loaded();
 		if (plugins) {
 			for (; plugins; plugins = plugins->next) {
-				PurplePluginInfo *info = purple_plugin_get_info(PURPLE_PLUGIN(plugins->data));
-				str = g_string_append(str, purple_plugin_info_get_name(info));
+				GPluginPluginInfo *info = GPLUGIN_PLUGIN_INFO(
+				        purple_plugin_get_info(
+				                PURPLE_PLUGIN(plugins->data)));
+				str = g_string_append(
+				        str,
+				        gplugin_plugin_info_get_name(info));
 
 				if (plugins->next)
 					str = g_string_append(str, ", ");

--- a/pidgin/gtkdialogs.c	Mon Sep 16 21:08:27 2019 -0400
+++ b/pidgin/gtkdialogs.c	Tue Sep 17 02:20:47 2019 +0000
@@ -165,6 +165,7 @@
 	GList *plugins, *l = NULL;
 	PurplePlugin *plugin = NULL;
 	PurplePluginInfo *info;
+	GPluginPluginInfo *ginfo;
 	PurplePluginExtraCb extra_cb;
 	char *title = g_strdup_printf(_("%s Plugin Information"), PIDGIN_NAME);
 	char *pname = NULL, *authors, *pauthors, *pextra;
@@ -183,10 +184,12 @@
 	for(l = plugins; l; l = l->next) {
 		plugin = PURPLE_PLUGIN(l->data);
 		info = purple_plugin_get_info(plugin);
+		ginfo = GPLUGIN_PLUGIN_INFO(info);
 		extra_cb = purple_plugin_info_get_extra_cb(info);
 
-		pname = g_markup_escape_text(purple_plugin_info_get_name(info), -1);
-		authorlist = purple_plugin_info_get_authors(info);
+		pname = g_markup_escape_text(
+		        gplugin_plugin_info_get_name(ginfo), -1);
+		authorlist = gplugin_plugin_info_get_authors(ginfo);
 
 		if (authorlist) {
 			authors = g_strjoinv(", ", (gchar **)authorlist);
@@ -201,10 +204,10 @@
 		else
 			pauthors = NULL;
 
-		pver = purple_plugin_info_get_version(info);
-		plicense = purple_plugin_info_get_license_id(info);
-		pwebsite = purple_plugin_info_get_website(info);
-		pid = purple_plugin_info_get_id(info);
+		pver = gplugin_plugin_info_get_version(ginfo);
+		plicense = gplugin_plugin_info_get_license_id(ginfo);
+		pwebsite = gplugin_plugin_info_get_website(ginfo);
+		pid = gplugin_plugin_info_get_id(ginfo);
 		ploadable = !purple_plugin_info_get_error(info);
 		ploaded = purple_plugin_is_loaded(plugin);
 

--- a/pidgin/gtkdocklet.c	Mon Sep 16 21:08:27 2019 -0400
+++ b/pidgin/gtkdocklet.c	Tue Sep 17 02:20:47 2019 +0000
@@ -661,8 +661,9 @@
 		if (!purple_plugin_info_get_actions_cb(info))
 			continue;
 
-		menuitem =
-			gtk_image_menu_item_new_with_label(_(purple_plugin_info_get_name(info)));
+		menuitem = gtk_image_menu_item_new_with_label(
+		        _(gplugin_plugin_info_get_name(
+		                GPLUGIN_PLUGIN_INFO(info))));
 		gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
 
 		submenu = gtk_menu_new();

--- a/pidgin/gtkplugin.c	Mon Sep 16 21:08:27 2019 -0400
+++ b/pidgin/gtkplugin.c	Tue Sep 17 02:20:47 2019 +0000
@@ -300,9 +300,11 @@
 		prefs_count++;
 
 	if (prefs_count > 1) {
-		purple_debug_warning("gtkplugin", "Plugin %s contains more than"
-			" one prefs callback, some will be ignored.",
-			purple_plugin_info_get_name(info));
+		purple_debug_warning("gtkplugin",
+		                     "Plugin %s contains more than one prefs "
+		                     "callback, some will be ignored.",
+		                     gplugin_plugin_info_get_name(
+		                             GPLUGIN_PLUGIN_INFO(info)));
 	}
 	g_return_if_fail(prefs_count > 0);
 
@@ -350,7 +352,8 @@
 
 		gtk_window_set_role(GTK_WINDOW(dialog), "plugin_config");
 		gtk_window_set_title(GTK_WINDOW(dialog),
-			_(purple_plugin_info_get_name(info)));
+		                     _(gplugin_plugin_info_get_name(
+		                             GPLUGIN_PLUGIN_INFO(info))));
 		gtk_widget_show_all(dialog);
 	}
 }
@@ -369,6 +372,7 @@
 	GList *plugins, *l;
 	PurplePlugin *plug;
 	PurplePluginInfo *info;
+	GPluginPluginInfo *ginfo;
 
 	gtk_list_store_clear(ls);
 	purple_plugins_refresh();
@@ -383,21 +387,26 @@
 		char *desc;
 		plug = PURPLE_PLUGIN(l->data);
 		info = purple_plugin_get_info(plug);
+		ginfo = GPLUGIN_PLUGIN_INFO(info);
 
 		if (purple_plugin_is_internal(plug))
 			continue;
 
 		gtk_list_store_append (ls, &iter);
 
-		if (purple_plugin_info_get_name(info)) {
-			name = g_markup_escape_text(_(purple_plugin_info_get_name(info)), -1);
+		if (gplugin_plugin_info_get_name(ginfo)) {
+			name = g_markup_escape_text(
+			        _(gplugin_plugin_info_get_name(ginfo)), -1);
 		} else {
-			char *tmp = g_path_get_basename(purple_plugin_get_filename(plug));
+			char *tmp = g_path_get_basename(
+			        gplugin_plugin_get_filename(plug));
 			name = g_markup_escape_text(tmp, -1);
 			g_free(tmp);
 		}
-		version = g_markup_escape_text(purple_plugin_info_get_version(info), -1);
-		summary = g_markup_escape_text(purple_plugin_info_get_summary(info), -1);
+		version = g_markup_escape_text(
+		        gplugin_plugin_info_get_version(ginfo), -1);
+		summary = g_markup_escape_text(
+		        gplugin_plugin_info_get_summary(ginfo), -1);
 
 		desc = g_strdup_printf("<b>%s</b> %s\n%s", name,
 				       version,
@@ -528,12 +537,15 @@
 			{
 				const char *dep_name = (const char *)l->data;
 				PurplePlugin *dep_plugin = purple_plugins_find_plugin(dep_name);
-				PurplePluginInfo *dep_info;
+				GPluginPluginInfo *dep_info;
 
 				g_return_if_fail(dep_plugin != NULL);
 
-				dep_info = purple_plugin_get_info(dep_plugin);
-				g_string_append_printf(tmp, "\n\t%s\n", purple_plugin_info_get_name(dep_info));
+				dep_info = GPLUGIN_PLUGIN_INFO(
+				        purple_plugin_get_info(dep_plugin));
+				g_string_append_printf(
+				        tmp, "\n\t%s\n",
+				        gplugin_plugin_info_get_name(dep_info));
 			}
 
 			cb_data = g_new(gpointer, 3);
@@ -556,7 +568,8 @@
 
 static void plugin_toggled_stage_two(PurplePlugin *plug, GtkTreeModel *model, GtkTreeIter *iter, GError *error, gboolean unload)
 {
-	PurplePluginInfo *info = purple_plugin_get_info(plug);
+	GPluginPluginInfo *info =
+	        GPLUGIN_PLUGIN_INFO(purple_plugin_get_info(plug));
 
 	if (unload)
 	{
@@ -585,15 +598,17 @@
 
 	if (error != NULL)
 	{
-		gchar *name = g_markup_escape_text(purple_plugin_info_get_name(info), -1);
+		gchar *name = g_markup_escape_text(
+		        gplugin_plugin_info_get_name(info), -1);
 
 		gchar *disp_error = g_markup_escape_text(error->message, -1);
 		gchar *text;
 
-		text = g_strdup_printf(
-			"<b>%s</b> %s\n<span weight=\"bold\" color=\"red\">%s</span>",
-			purple_plugin_info_get_name(info),
-			purple_plugin_info_get_version(info), disp_error);
+		text = g_strdup_printf("<b>%s</b> %s\n<span weight=\"bold\" "
+		                       "color=\"red\">%s</span>",
+		                       gplugin_plugin_info_get_name(info),
+		                       gplugin_plugin_info_get_version(info),
+		                       disp_error);
 		gtk_list_store_set(GTK_LIST_STORE (model), iter,
 				   1, text,
 				   -1);
@@ -612,12 +627,13 @@
 	}
 
 	if ((unload && purple_plugin_get_dependent_plugins(plug)) ||
-	   (!unload && purple_plugin_info_get_dependencies(info)))
+	    (!unload && gplugin_plugin_info_get_dependencies(info))) {
 		update_loaded_plugins(model);
-	else
+	} else {
 		gtk_list_store_set(GTK_LIST_STORE (model), iter,
 			               0, purple_plugin_is_loaded(plug),
 			               -1);
+	}
 	g_free(iter);
 
 	pidgin_plugins_save();
@@ -647,6 +663,7 @@
 	GValue val;
 	PurplePlugin *plug;
 	PurplePluginInfo *info;
+	GPluginPluginInfo *ginfo;
 
 	if (!gtk_tree_selection_get_selected (sel, &model, &iter))
 	{
@@ -665,9 +682,11 @@
 	gtk_tree_model_get_value (model, &iter, 2, &val);
 	plug = g_value_get_pointer(&val);
 	info = purple_plugin_get_info(plug);
+	ginfo = GPLUGIN_PLUGIN_INFO(info);
 
-	name = g_markup_escape_text(purple_plugin_info_get_name(info), -1);
-	version = g_markup_escape_text(purple_plugin_info_get_version(info), -1);
+	name = g_markup_escape_text(gplugin_plugin_info_get_name(ginfo), -1);
+	version = g_markup_escape_text(gplugin_plugin_info_get_version(ginfo),
+	                               -1);
 	buf = g_strdup_printf(
 		"<span size=\"larger\" weight=\"bold\">%s</span> "
 		"<span size=\"smaller\">%s</span>",
@@ -677,18 +696,19 @@
 	g_free(version);
 	g_free(buf);
 
-	gtk_text_buffer_set_text(plugin_desc, purple_plugin_info_get_description(info), -1);
+	gtk_text_buffer_set_text(
+	        plugin_desc, gplugin_plugin_info_get_description(ginfo), -1);
 
-	authorlist = purple_plugin_info_get_authors(info);
+	authorlist = gplugin_plugin_info_get_authors(ginfo);
 	if (authorlist)
 		authors = g_strjoinv(",\n", (gchar **)authorlist);
 	gtk_label_set_text(plugin_authors, authors);
 	g_free(authors);
 
-	gtk_label_set_text(plugin_filename, purple_plugin_get_filename(plug));
+	gtk_label_set_text(plugin_filename, gplugin_plugin_get_filename(plug));
 
 	g_free(plugin_website_uri);
-	plugin_website_uri = g_strdup(purple_plugin_info_get_website(info));
+	plugin_website_uri = g_strdup(gplugin_plugin_info_get_website(ginfo));
 
 	if (plugin_website_uri)
 	{
@@ -807,7 +827,7 @@
 	GtkTreeIter iter;
 	GtkTreeView *treeview = GTK_TREE_VIEW(data);
 	PurplePlugin *plugin = NULL;
-	PurplePluginInfo *info;
+	GPluginPluginInfo *info;
 	GtkTreeModel *model = gtk_tree_view_get_model(treeview);
 	PangoLayout *layout;
 	int width, height;
@@ -819,18 +839,25 @@
 		return FALSE;
 
 	gtk_tree_model_get(model, &iter, 2, &plugin, -1);
-	info = purple_plugin_get_info(plugin);
-	authorlist = purple_plugin_info_get_authors(info);
+	info = GPLUGIN_PLUGIN_INFO(purple_plugin_get_info(plugin));
+	authorlist = gplugin_plugin_info_get_authors(info);
 
 	if (authorlist)
 		authors = g_strjoinv(", ", (gchar **)authorlist);
 	if (authors)
 		pauthors = g_markup_escape_text(authors, -1);
 
-	markup = g_strdup_printf("<span size='x-large' weight='bold'>%s</span>\n<b>%s:</b> %s\n<b>%s:</b> %s",
-			name = g_markup_escape_text(purple_plugin_info_get_name(info), -1),
-			_("Description"), desc = g_markup_escape_text(purple_plugin_info_get_description(info), -1),
-			(g_strv_length((gchar **)authorlist) > 1 ? _("Authors") : _("Author")), pauthors);
+	markup = g_strdup_printf(
+	        "<span size='x-large' weight='bold'>%s</span>\n<b>%s:</b> "
+	        "%s\n<b>%s:</b> %s",
+	        name = g_markup_escape_text(gplugin_plugin_info_get_name(info),
+	                                    -1),
+	        _("Description"),
+	        desc = g_markup_escape_text(
+	                gplugin_plugin_info_get_description(info), -1),
+	        (g_strv_length((gchar **)authorlist) > 1 ? _("Authors")
+	                                                 : _("Author")),
+	        pauthors);
 
 	layout = gtk_widget_create_pango_layout(tipwindow, NULL);
 	pango_layout_set_markup(layout, markup, -1);

--- a/pidgin/pidgindebugplugininfo.c	Mon Sep 16 21:08:27 2019 -0400
+++ b/pidgin/pidgindebugplugininfo.c	Tue Sep 17 02:20:47 2019 +0000
@@ -61,9 +61,10 @@
 static gint
 purple_debug_plugin_compare_plugin_id(gconstpointer a, gconstpointer b) {
 	return g_strcmp0(
-		purple_plugin_info_get_id(purple_plugin_get_info(PURPLE_PLUGIN(a))),
-		purple_plugin_info_get_id(purple_plugin_get_info(PURPLE_PLUGIN(b)))
-	);
+	        gplugin_plugin_info_get_id(GPLUGIN_PLUGIN_INFO(
+	                purple_plugin_get_info(PURPLE_PLUGIN((gpointer)a)))),
+	        gplugin_plugin_info_get_id(GPLUGIN_PLUGIN_INFO(
+	                purple_plugin_get_info(PURPLE_PLUGIN((gpointer)b)))));
 }
 
 static gchar *
@@ -82,7 +83,9 @@
 		PurplePlugin *plugin = PURPLE_PLUGIN(l->data);
 		PurplePluginInfo *info = purple_plugin_get_info(plugin);
 		PurplePluginExtraCb extra_cb;
-		gchar *name = g_markup_escape_text(purple_plugin_info_get_name(info), -1);
+		gchar *name = g_markup_escape_text(
+		        gplugin_plugin_info_get_name(GPLUGIN_PLUGIN_INFO(info)),
+		        -1);
 		gchar *version, *license, *website, *id;
 		gchar *authors = NULL, *extra = NULL;
 		const gchar *error_message = NULL;