delete gtkplugin.[ch] and deal with the repercussions

16 files changed, 222 insertions, 1015 deletions

diff --git a/pidgin/gtkblist.c b/pidgin/gtkblist.c
index ad7266caa3..03c963a309 100644
--- a/pidgin/gtkblist.c
+++ b/pidgin/gtkblist.c
@@ -45,7 +45,6 @@
 #include "gtkdialogs.h"
 #include "gtkxfer.h"
 #include "gtkpounce.h"
-#include "gtkplugin.h"
 #include "gtkprefs.h"
 #include "gtkprivacy.h"
 #include "gtkroomlist.h"
@@ -63,6 +62,7 @@
 #include "pidgin/pidgindebugplugininfo.h"
 #include "pidgin/pidgingdkpixbuf.h"
 #include "pidgin/pidginlog.h"
+#include "pidgin/pidginplugininfo.h"
 #include "pidgin/pidginpluginsdialog.h"
 #include "pidgin/pidgintooltip.h"
 #include "pidginmenutray.h"
@@ -3618,7 +3618,7 @@ set_mood_show(void)
  *            Crap                                 *
  ***************************************************/
 static void
-pidgin_plugins_dialog_cb(GtkAction *action, GtkWidget *window) {
+pidgin_blist_plugins_dialog_cb(GtkAction *action, GtkWidget *window) {
 	GtkWidget *dialog = pidgin_plugins_dialog_new();
 
 	gtk_window_set_transient_for(GTK_WINDOW(dialog), GTK_WINDOW(window));
@@ -3660,8 +3660,7 @@ static const GtkActionEntry blist_menu_entries[] = {
 	{ "ToolsMenu", NULL, N_("_Tools"), NULL, NULL, NULL },
 	{ "BuddyPounces", NULL, N_("Buddy _Pounces"), NULL, NULL, pidgin_pounces_manager_show },
 	{ "CustomSmileys", PIDGIN_STOCK_TOOLBAR_SMILEY, N_("Custom Smile_ys"), "<control>Y", NULL, pidgin_smiley_manager_show },
-	{ "Plugins", PIDGIN_STOCK_TOOLBAR_PLUGINS, N_("Plu_gins"), "<control>U", NULL, pidgin_plugin_dialog_show },
-	{ "Plugins-NG", PIDGIN_STOCK_TOOLBAR_PLUGINS, N_("Plugins-ng"), NULL, NULL, pidgin_plugins_dialog_cb },
+	{ "Plugins", PIDGIN_STOCK_TOOLBAR_PLUGINS, N_("Plu_gins"), "<control>U", NULL, pidgin_blist_plugins_dialog_cb },
 	{ "Preferences", GTK_STOCK_PREFERENCES, N_("Pr_eferences"), "<control>P", NULL, pidgin_prefs_show },
 	{ "Privacy", NULL, N_("Pr_ivacy"), NULL, NULL, pidgin_privacy_dialog_show },
 	{ "SetMood", NULL, N_("Set _Mood"), "<control>D", NULL, set_mood_show },
@@ -3721,7 +3720,6 @@ static const char *blist_menu =
 			"<menuitem action='BuddyPounces'/>"
 			"<menuitem action='CustomSmileys'/>"
 			"<menuitem action='Plugins'/>"
-			"<menuitem action='Plugins-NG'/>"
 			"<menuitem action='Preferences'/>"
 			"<menuitem action='Privacy'/>"
 			"<menuitem action='SetMood'/>"
diff --git a/pidgin/gtkplugin.c b/pidgin/gtkplugin.c
deleted file mode 100644
index 091b3080db..0000000000
--- a/pidgin/gtkplugin.c
+++ /dev/null
@@ -1,940 +0,0 @@
-/* pidgin
- *
- * Pidgin is the legal property of its developers, whose names are too numerous
- * to list here.  Please refer to the COPYRIGHT file distributed with this
- * source distribution.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
- */
-#include "internal.h"
-#include "pidgin.h"
-#include "gtkplugin.h"
-#include "gtkpluginpref.h"
-#include "gtkutils.h"
-#include "debug.h"
-#include "prefs.h"
-#include "request.h"
-#include "pidgintooltip.h"
-
-#include <string.h>
-
-#define PIDGIN_RESPONSE_CONFIGURE 98121
-
-typedef struct
-{
-	enum
-	{
-		PIDGIN_PLUGIN_UI_DATA_TYPE_FRAME,
-		PIDGIN_PLUGIN_UI_DATA_TYPE_REQUEST
-	} type;
-
-	union
-	{
-		struct
-		{
-			GtkWidget *dialog;
-			PurplePluginPrefFrame *pref_frame;
-		} frame;
-
-		gpointer request_handle;
-	} u;
-} PidginPluginUiData;
-
-static void plugin_toggled_stage_two(PurplePlugin *plug, GtkTreeModel *model,
-                                  GtkTreeIter *iter, GError *error, gboolean unload);
-
-static GtkWidget *expander = NULL;
-static GtkWidget *plugin_dialog = NULL;
-
-static GtkLabel *plugin_name = NULL;
-static GtkTextBuffer *plugin_desc = NULL;
-static GtkLabel *plugin_error = NULL;
-static GtkLabel *plugin_authors = NULL;
-static GtkLabel *plugin_website = NULL;
-static gchar *plugin_website_uri = NULL;
-static GtkLabel *plugin_filename = NULL;
-
-static GtkWidget *pref_button = NULL;
-
-static gboolean
-pidgin_plugin_has_prefs(PurplePlugin *plugin)
-{
-	PurplePluginInfo *info = purple_plugin_get_info(plugin);
-	PurplePluginPrefFrameCb config_frame_cb = NULL;
-	gboolean ret;
-
-	g_return_val_if_fail(plugin != NULL, FALSE);
-
-	if (!purple_plugin_is_loaded(plugin))
-		return FALSE;
-
-	ret = (config_frame_cb ||
-			purple_plugin_info_get_pref_frame_cb(info) ||
-			purple_plugin_info_get_pref_request_cb(info));
-
-	return ret;
-}
-
-static void
-pref_dialog_close(PurplePlugin *plugin)
-{
-	PurplePluginInfo *info;
-	PidginPluginUiData *ui_data;
-
-	g_return_if_fail(plugin != NULL);
-
-	info = purple_plugin_get_info(plugin);
-
-	ui_data = purple_plugin_info_get_ui_data(info);
-	if (ui_data == NULL)
-		return;
-
-	if (ui_data->type == PIDGIN_PLUGIN_UI_DATA_TYPE_REQUEST) {
-		purple_request_close(PURPLE_REQUEST_FIELDS,
-			ui_data->u.request_handle);
-		return;
-	}
-
-	g_return_if_fail(ui_data->type == PIDGIN_PLUGIN_UI_DATA_TYPE_FRAME);
-
-	gtk_widget_destroy(ui_data->u.frame.dialog);
-
-	if (ui_data->u.frame.pref_frame)
-		purple_plugin_pref_frame_destroy(ui_data->u.frame.pref_frame);
-
-	g_free(ui_data);
-	purple_plugin_info_set_ui_data(info, NULL);
-}
-
-
-static void
-pref_dialog_response_cb(GtkWidget *dialog, int response, PurplePlugin *plugin)
-{
-	if (response == GTK_RESPONSE_CLOSE ||
-		response == GTK_RESPONSE_DELETE_EVENT)
-	{
-		pref_dialog_close(plugin);
-	}
-}
-
-static void
-pidgin_plugin_open_config(PurplePlugin *plugin, GtkWindow *parent)
-{
-	PurplePluginInfo *info;
-	PidginPluginUiData *ui_data;
-	PurplePluginPrefFrameCb pref_frame_cb;
-	PurplePluginPrefRequestCb pref_request_cb;
-	gint prefs_count;
-
-	g_return_if_fail(plugin != NULL);
-
-	info = purple_plugin_get_info(plugin);
-
-	if (!pidgin_plugin_has_prefs(plugin)) {
-		purple_debug_warning("gtkplugin", "Plugin has no prefs");
-		return;
-	}
-
-	if (purple_plugin_info_get_ui_data(info))
-		return;
-
-	pref_frame_cb = purple_plugin_info_get_pref_frame_cb(info);
-	pref_request_cb = purple_plugin_info_get_pref_request_cb(info);
-
-	ui_data = g_new0(PidginPluginUiData, 1);
-	purple_plugin_info_set_ui_data(info, ui_data);
-
-	prefs_count = 0;
-	if (pref_frame_cb) {
-		prefs_count++;
-
-		ui_data->u.frame.pref_frame = pref_frame_cb(plugin);
-	}
-
-	if (pref_request_cb)
-		prefs_count++;
-
-	if (prefs_count > 1) {
-		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);
-
-
-	/* Priority: pidgin frame > purple request > purple frame
-	 * Purple frame could be replaced with purple request some day.
-	 */
-	if (pref_request_cb) {
-		ui_data->type = PIDGIN_PLUGIN_UI_DATA_TYPE_REQUEST;
-		ui_data->u.request_handle = pref_request_cb(plugin);
-		purple_request_add_close_notify(ui_data->u.request_handle,
-			purple_callback_set_zero, &info->ui_data);
-		purple_request_add_close_notify(ui_data->u.request_handle,
-			g_free, ui_data);
-	} else {
-		GtkWidget *box, *dialog;
-
-		ui_data->type = PIDGIN_PLUGIN_UI_DATA_TYPE_FRAME;
-
-		box = pidgin_plugin_pref_create_frame(ui_data->u.frame.pref_frame);
-		if (box == NULL) {
-			purple_debug_error("gtkplugin",
-				"Failed to display prefs frame");
-			g_free(ui_data);
-			purple_plugin_info_set_ui_data(info, NULL);
-			return;
-		}
-		gtk_widget_set_vexpand(box, TRUE);
-
-		ui_data->u.frame.dialog = dialog = gtk_dialog_new_with_buttons(
-			PIDGIN_ALERT_TITLE, parent,
-			GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_CLOSE,
-			GTK_RESPONSE_CLOSE, NULL);
-
-		g_signal_connect(G_OBJECT(dialog), "response",
-			G_CALLBACK(pref_dialog_response_cb), plugin);
-
-		gtk_container_add(GTK_CONTAINER(
-			gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
-			pidgin_make_scrollable(box, GTK_POLICY_NEVER,
-				GTK_POLICY_AUTOMATIC, GTK_SHADOW_IN, 400, 400));
-
-		gtk_window_set_role(GTK_WINDOW(dialog), "plugin_config");
-		gtk_window_set_title(GTK_WINDOW(dialog),
-		                     _(gplugin_plugin_info_get_name(
-		                             GPLUGIN_PLUGIN_INFO(info))));
-		gtk_widget_show_all(dialog);
-	}
-}
-
-void
-pidgin_plugins_save(void)
-{
-	purple_plugins_save_loaded(PIDGIN_PREFS_ROOT "/plugins/loaded");
-}
-
-static void
-update_plugin_list(void *data)
-{
-	GtkListStore *ls = GTK_LIST_STORE(data);
-	GtkTreeIter iter;
-	GList *plugins, *l;
-	PurplePlugin *plug;
-	PurplePluginInfo *info;
-	GPluginPluginInfo *ginfo;
-
-	gtk_list_store_clear(ls);
-	purple_plugins_refresh();
-
-	plugins = purple_plugins_find_all();
-
-	for (l = plugins; l != NULL; l = l->next)
-	{
-		char *name;
-		char *version;
-		char *summary;
-		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 (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(
-			        gplugin_plugin_get_filename(plug));
-			name = g_markup_escape_text(tmp, -1);
-			g_free(tmp);
-		}
-		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,
-				       summary);
-		g_free(name);
-		g_free(version);
-		g_free(summary);
-
-		gtk_list_store_set(ls, &iter,
-				   0, purple_plugin_is_loaded(plug),
-				   1, desc,
-				   2, plug,
-				   3, purple_plugin_info_get_error(info),
-				   -1);
-		g_free(desc);
-	}
-
-	g_list_free(plugins);
-}
-
-static gboolean
-check_if_loaded(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data)
-{
-	PurplePlugin *plugin;
-	gtk_tree_model_get(model, iter, 2, &plugin, -1);
-	gtk_list_store_set(GTK_LIST_STORE(model), iter,
-					           0, purple_plugin_is_loaded(plugin),
-					           -1);
-	return FALSE;
-}
-
-static void
-update_loaded_plugins(GtkTreeModel *model)
-{
-	gtk_tree_model_foreach(model, check_if_loaded, NULL);
-}
-
-static void plugin_loading_common(PurplePlugin *plugin, GtkTreeView *view, gboolean loaded)
-{
-	GtkTreeIter iter;
-	GtkTreeModel *model = gtk_tree_view_get_model(view);
-
-	if (gtk_tree_model_get_iter_first(model, &iter)) {
-		do {
-			PurplePlugin *plug;
-			GtkTreeSelection *sel;
-
-			gtk_tree_model_get(model, &iter, 2, &plug, -1);
-
-			if (plug != plugin)
-				continue;
-
-			gtk_list_store_set(GTK_LIST_STORE(model), &iter, 0, loaded, -1);
-
-			/* If the loaded/unloaded plugin is the selected row,
-			 * update the pref_button. */
-			sel = gtk_tree_view_get_selection(view);
-			if (gtk_tree_selection_get_selected(sel, &model, &iter))
-			{
-				gtk_tree_model_get(model, &iter, 2, &plug, -1);
-				if (plug == plugin)
-				{
-					gtk_widget_set_sensitive(pref_button,
-						pidgin_plugin_has_prefs(plug));
-				}
-			}
-
-			break;
-		} while (gtk_tree_model_iter_next(model, &iter));
-	}
-}
-
-static void plugin_load_cb(PurplePlugin *plugin, gpointer data)
-{
-	GtkTreeView *view = (GtkTreeView *)data;
-	plugin_loading_common(plugin, view, TRUE);
-}
-
-static void plugin_unload_cb(PurplePlugin *plugin, gpointer data)
-{
-	GtkTreeView *view = (GtkTreeView *)data;
-	plugin_loading_common(plugin, view, FALSE);
-}
-
-static void plugin_unload_confirm_cb(gpointer *data)
-{
-	PurplePlugin *plugin = (PurplePlugin *)data[0];
-	GtkTreeModel *model = (GtkTreeModel *)data[1];
-	GtkTreeIter *iter = (GtkTreeIter *)data[2];
-
-	plugin_toggled_stage_two(plugin, model, iter, NULL, TRUE);
-
-	g_free(data);
-}
-
-static void plugin_toggled(GtkCellRendererToggle *cell, gchar *pth, gpointer data)
-{
-	GtkTreeModel *model = (GtkTreeModel *)data;
-	GtkTreeIter *iter = g_new(GtkTreeIter, 1);
-	GtkTreePath *path = gtk_tree_path_new_from_string(pth);
-	PurplePlugin *plug;
-	GError *error = NULL;
-
-	gtk_tree_model_get_iter(model, iter, path);
-	gtk_tree_path_free(path);
-	gtk_tree_model_get(model, iter, 2, &plug, -1);
-
-	if (!purple_plugin_is_loaded(plug))
-	{
-		pidgin_set_cursor(plugin_dialog, GDK_WATCH);
-
-		purple_plugin_load(plug, &error);
-		plugin_toggled_stage_two(plug, model, iter, error, FALSE);
-
-		pidgin_clear_cursor(plugin_dialog);
-	}
-	else
-	{
-		pref_dialog_close(plug);
-
-		if (purple_plugin_get_dependent_plugins(plug) != NULL)
-		{
-			GString *tmp = g_string_new(_("The following plugins will be unloaded."));
-			GSList *l;
-			gpointer *cb_data;
-
-			for (l = purple_plugin_get_dependent_plugins(plug); l != NULL ; l = l->next)
-			{
-				const char *dep_name = (const char *)l->data;
-				PurplePlugin *dep_plugin = purple_plugins_find_plugin(dep_name);
-				GPluginPluginInfo *dep_info;
-
-				if (dep_plugin == NULL) {
-					purple_debug_error("gtkplugin",
-					                   "The %s plugin could not be found.",
-					                   dep_name);
-					continue;
-				}
-
-				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);
-			cb_data[0] = plug;
-			cb_data[1] = model;
-			cb_data[2] = iter;
-
-			purple_request_action(plugin_dialog, NULL,
-				_("Multiple plugins will be unloaded."),
-				tmp->str, 0, NULL, cb_data, 2,
-				_("Unload Plugins"),
-				G_CALLBACK(plugin_unload_confirm_cb),
-				_("Cancel"), g_free);
-			g_string_free(tmp, TRUE);
-		}
-		else
-			plugin_toggled_stage_two(plug, model, iter, NULL, TRUE);
-	}
-}
-
-static void plugin_toggled_stage_two(PurplePlugin *plug, GtkTreeModel *model, GtkTreeIter *iter, GError *error, gboolean unload)
-{
-	GPluginPluginInfo *info =
-	        GPLUGIN_PLUGIN_INFO(purple_plugin_get_info(plug));
-
-	if (unload)
-	{
-		pidgin_set_cursor(plugin_dialog, GDK_WATCH);
-
-		if (!purple_plugin_unload(plug, &error))
-		{
-			const char *primary = _("Could not unload plugin");
-			const char *reload = _("The plugin could not be unloaded now, but will be disabled at the next startup.");
-
-			char *tmp = g_strdup_printf("%s\n\n%s", reload, error->message);
-			purple_notify_warning(NULL, NULL, primary, tmp, NULL);
-			g_free(tmp);
-
-			purple_plugin_disable(plug);
-		}
-
-		pidgin_clear_cursor(plugin_dialog);
-	} else if (error) {
-		purple_notify_warning(NULL, NULL, _("Could not load plugin"), error->message, NULL);
-	}
-
-	gtk_widget_set_sensitive(pref_button, pidgin_plugin_has_prefs(plug));
-
-	if (error != NULL)
-	{
-		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>",
-		                       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);
-		g_free(text);
-
-		text = g_strdup_printf(
-			"<span weight=\"bold\" color=\"red\">%s</span>",
-			disp_error);
-		gtk_label_set_markup(plugin_error, text);
-		g_free(text);
-
-		g_free(disp_error);
-		g_free(name);
-
-		g_error_free(error);
-	}
-
-	if ((unload && purple_plugin_get_dependent_plugins(plug)) ||
-	    (!unload && gplugin_plugin_info_get_dependencies(info))) {
-		update_loaded_plugins(model);
-	} else {
-		gtk_list_store_set(GTK_LIST_STORE (model), iter,
-			               0, purple_plugin_is_loaded(plug),
-			               -1);
-	}
-	g_free(iter);
-
-	pidgin_plugins_save();
-}
-
-static gboolean ensure_plugin_visible(void *data)
-{
-	GtkTreeSelection *sel = GTK_TREE_SELECTION(data);
-	GtkTreeView *tv = gtk_tree_selection_get_tree_view(sel);
-	GtkTreeModel *model = gtk_tree_view_get_model(tv);
-	GtkTreePath *path;
-	GtkTreeIter iter;
-	if (!gtk_tree_selection_get_selected (sel, &model, &iter))
-		return FALSE;
-	path = gtk_tree_model_get_path(model, &iter);
-	gtk_tree_view_scroll_to_cell(gtk_tree_selection_get_tree_view(sel), path, NULL, FALSE, 0, 0);
-	gtk_tree_path_free(path);
-	return FALSE;
-}
-
-static void prefs_plugin_sel (GtkTreeSelection *sel, GtkTreeModel *model)
-{
-	gchar *buf, *tmp, *name, *version;
-	gchar *authors = NULL;
-	const gchar * const *authorlist;
-	GtkTreeIter  iter;
-	GValue val;
-	PurplePlugin *plug;
-	PurplePluginInfo *info;
-	GPluginPluginInfo *ginfo;
-
-	if (!gtk_tree_selection_get_selected (sel, &model, &iter))
-	{
-		gtk_widget_set_sensitive(pref_button, FALSE);
-
-		/* Collapse and disable the expander widget */
-		gtk_expander_set_expanded(GTK_EXPANDER(expander), FALSE);
-		gtk_widget_set_sensitive(expander, FALSE);
-
-		return;
-	}
-
-	gtk_widget_set_sensitive(expander, TRUE);
-
-	val.g_type = 0;
-	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(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>",
-		name, version);
-	gtk_label_set_markup(plugin_name, buf);
-	g_free(name);
-	g_free(version);
-	g_free(buf);
-
-	gtk_text_buffer_set_text(
-	        plugin_desc, gplugin_plugin_info_get_description(ginfo), -1);
-
-	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, gplugin_plugin_get_filename(plug));
-
-	g_free(plugin_website_uri);
-	plugin_website_uri = g_strdup(gplugin_plugin_info_get_website(ginfo));
-
-	if (plugin_website_uri)
-	{
-		tmp = g_markup_escape_text(plugin_website_uri, -1);
-		buf = g_strdup_printf("<span underline=\"single\" "
-			"foreground=\"blue\">%s</span>", tmp);
-		gtk_label_set_markup(plugin_website, buf);
-		g_free(tmp);
-		g_free(buf);
-	}
-	else
-	{
-		gtk_label_set_text(plugin_website, NULL);
-	}
-
-	if (purple_plugin_info_get_error(info) == NULL)
-	{
-		gtk_label_set_text(plugin_error, NULL);
-	}
-	else
-	{
-		tmp = g_markup_escape_text(purple_plugin_info_get_error(info), -1);
-		buf = g_strdup_printf(
-			_("<span foreground=\"red\" weight=\"bold\">"
-			  "Error: %s\n"
-			  "Check the plugin website for an update."
-			  "</span>"),
-			tmp);
-		gtk_label_set_markup(plugin_error, buf);
-		g_free(buf);
-		g_free(tmp);
-	}
-
-	gtk_widget_set_sensitive(pref_button, pidgin_plugin_has_prefs(plug));
-
-	/* Make sure the selected plugin is still visible */
-	g_idle_add(ensure_plugin_visible, sel);
-
-	g_value_unset(&val);
-}
-
-static void plugin_dialog_response_cb(GtkWidget *d, int response, GtkTreeSelection *sel)
-{
-	PurplePlugin *plugin;
-	GtkTreeModel *model;
-	GValue val;
-	GtkTreeIter iter;
-	GList *list;
-
-	g_return_if_fail(d != NULL);
-
-	switch (response) {
-	case GTK_RESPONSE_CLOSE:
-	case GTK_RESPONSE_DELETE_EVENT:
-		purple_request_close_with_handle(plugin_dialog);
-		purple_signals_disconnect_by_handle(plugin_dialog);
-		list = purple_plugins_find_all();
-		g_list_free_full(list, (GDestroyNotify)pref_dialog_close);
-		gtk_widget_destroy(d);
-		plugin_dialog = NULL;
-		break;
-	case PIDGIN_RESPONSE_CONFIGURE:
-		if (! gtk_tree_selection_get_selected (sel, &model, &iter))
-			return;
-		val.g_type = 0;
-		gtk_tree_model_get_value(model, &iter, 2, &val);
-		plugin = g_value_get_pointer(&val);
-		g_value_unset(&val);
-		if (plugin == NULL)
-			break;
-
-		pidgin_plugin_open_config(plugin, GTK_WINDOW(d));
-
-		break;
-	}
-}
-
-static void
-show_plugin_prefs_cb(GtkTreeView *view, GtkTreePath *path, GtkTreeViewColumn *column, GtkWidget *dialog)
-{
-	GtkTreeSelection *sel;
-	GtkTreeIter iter;
-	PurplePlugin *plugin;
-	GtkTreeModel *model;
-
-	sel = gtk_tree_view_get_selection(view);
-
-	if (!gtk_tree_selection_get_selected(sel, &model, &iter))
-		return;
-
-	gtk_tree_model_get(model, &iter, 2, &plugin, -1);
-
-	if (!purple_plugin_is_loaded(plugin))
-		return;
-
-	/* Now show the pref-dialog for the plugin */
-	plugin_dialog_response_cb(dialog, PIDGIN_RESPONSE_CONFIGURE, sel);
-}
-
-static gboolean
-pidgin_plugins_paint_tooltip(GtkWidget *tipwindow, cairo_t *cr, gpointer data)
-{
-	PangoLayout *layout = g_object_get_data(G_OBJECT(tipwindow), "tooltip-plugin");
-	GtkStyleContext *context = gtk_widget_get_style_context(tipwindow);
-	gtk_style_context_add_class(context, GTK_STYLE_CLASS_TOOLTIP);
-	gtk_render_layout(context, cr, 6, 6, layout);
-	return TRUE;
-}
-
-static gboolean
-pidgin_plugins_create_tooltip(GtkWidget *tipwindow, GtkTreePath *path,
-		gpointer data, int *w, int *h)
-{
-	GtkTreeIter iter;
-	GtkTreeView *treeview = GTK_TREE_VIEW(data);
-	PurplePlugin *plugin = NULL;
-	GPluginPluginInfo *info;
-	GtkTreeModel *model = gtk_tree_view_get_model(treeview);
-	PangoLayout *layout;
-	int width, height;
-	const char * const *authorlist;
-	char *markup, *name, *desc;
-	char *authors = NULL, *pauthors = NULL;
-
-	if (!gtk_tree_model_get_iter(model, &iter, path))
-		return FALSE;
-
-	gtk_tree_model_get(model, &iter, 2, &plugin, -1);
-	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(gplugin_plugin_info_get_name(info), -1),
-	        _("Description"),
-	        desc = g_markup_escape_text(
-	                gplugin_plugin_info_get_description(info), -1),
-	        (authorlist && g_strv_length((gchar **)authorlist) > 1
-	                 ? _("Authors")
-	                 : _("Author")),
-	        pauthors);
-
-	layout = gtk_widget_create_pango_layout(tipwindow, NULL);
-	pango_layout_set_markup(layout, markup, -1);
-	pango_layout_set_wrap(layout, PANGO_WRAP_WORD);
-	pango_layout_set_width(layout, 600000);
-	pango_layout_get_size(layout, &width, &height);
-	g_object_set_data_full(G_OBJECT(tipwindow), "tooltip-plugin", layout, g_object_unref);
-
-	if (w)
-		*w = PANGO_PIXELS(width) + 12;
-	if (h)
-		*h = PANGO_PIXELS(height) + 12;
-
-	g_free(markup);
-	g_free(name);
-	g_free(desc);
-	g_free(pauthors);
-	g_free(authors);
-
-	return TRUE;
-}
-
-static gboolean
-website_button_motion_cb(GtkWidget *button, GdkEventCrossing *event,
-                          gpointer unused)
-{
-	if (plugin_website_uri) {
-		pidgin_set_cursor(button, GDK_HAND2);
-		return TRUE;
-	}
-	return FALSE;
-}
-
-static gboolean
-website_button_clicked_cb(GtkButton *button, GdkEventButton *event,
-                          gpointer unused)
-{
-	if (plugin_website_uri) {
-		purple_notify_uri(NULL, plugin_website_uri);
-		return TRUE;
-	}
-	return FALSE;
-}
-
-static GtkWidget *
-create_details()
-{
-	GtkBox *vbox = GTK_BOX(gtk_box_new(GTK_ORIENTATION_VERTICAL, 3));
-	GtkSizeGroup *sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
-	GtkWidget *label, *view, *website_button;
-
-	plugin_name = GTK_LABEL(gtk_label_new(NULL));
-	gtk_label_set_xalign(plugin_name, 0);
-	gtk_label_set_yalign(plugin_name, 0);
-	gtk_label_set_line_wrap(plugin_name, FALSE);
-	gtk_label_set_selectable(plugin_name, TRUE);
-	gtk_box_pack_start(vbox, GTK_WIDGET(plugin_name), FALSE, FALSE, 0);
-
-	view = gtk_text_view_new();
-	plugin_desc = gtk_text_view_get_buffer(GTK_TEXT_VIEW(view));
-	g_object_set(view, "wrap-mode", GTK_WRAP_WORD,
-	                   "editable",  FALSE,
-	                   "left-margin",  PIDGIN_HIG_CAT_SPACE,
-	                   "right-margin", PIDGIN_HIG_CAT_SPACE,
-	                   NULL);
-	gtk_box_pack_start(vbox, view, TRUE, TRUE, 0);
-
-	plugin_error = GTK_LABEL(gtk_label_new(NULL));
-	gtk_label_set_xalign(plugin_error, 0);
-	gtk_label_set_yalign(plugin_error, 0);
-	gtk_label_set_line_wrap(plugin_error, FALSE);
-	gtk_label_set_selectable(plugin_error, TRUE);
-	gtk_box_pack_start(vbox, GTK_WIDGET(plugin_error), FALSE, FALSE, 0);
-
-	plugin_authors = GTK_LABEL(gtk_label_new(NULL));
-	gtk_label_set_line_wrap(plugin_authors, FALSE);
-	gtk_label_set_xalign(plugin_authors, 0);
-	gtk_label_set_yalign(plugin_authors, 0);
-	gtk_label_set_selectable(plugin_authors, TRUE);
-	pidgin_add_widget_to_vbox(vbox, "", sg,
-		GTK_WIDGET(plugin_authors), TRUE, &label);
-	gtk_label_set_markup(GTK_LABEL(label), _("<b>Written by:</b>"));
-	gtk_label_set_xalign(GTK_LABEL(label), 0);
-	gtk_label_set_yalign(GTK_LABEL(label), 0);
-
-	website_button = gtk_event_box_new();
-	gtk_event_box_set_visible_window(GTK_EVENT_BOX(website_button), FALSE);
-
-	plugin_website = GTK_LABEL(gtk_label_new(NULL));
-	g_object_set(G_OBJECT(plugin_website),
-		"ellipsize", PANGO_ELLIPSIZE_MIDDLE, NULL);
-	gtk_label_set_xalign(plugin_website, 0);
-	gtk_label_set_yalign(plugin_website, 0);
-	gtk_container_add(GTK_CONTAINER(website_button),
-		GTK_WIDGET(plugin_website));
-	g_signal_connect(website_button, "button-release-event",
-		G_CALLBACK(website_button_clicked_cb), NULL);
-	g_signal_connect(website_button, "enter-notify-event",
-		G_CALLBACK(website_button_motion_cb), NULL);
-	g_signal_connect(website_button, "leave-notify-event",
-		G_CALLBACK(pidgin_clear_cursor), NULL);
-
-	pidgin_add_widget_to_vbox(vbox, "", sg, website_button, TRUE, &label);
-	gtk_label_set_markup(GTK_LABEL(label), _("<b>Web site:</b>"));
-	gtk_label_set_xalign(GTK_LABEL(label), 0);
-
-	plugin_filename = GTK_LABEL(gtk_label_new(NULL));
-	gtk_label_set_line_wrap(plugin_filename, FALSE);
-	gtk_label_set_xalign(plugin_filename, 0);
-	gtk_label_set_yalign(plugin_filename, 0);
-	gtk_label_set_selectable(plugin_filename, TRUE);
-	pidgin_add_widget_to_vbox(vbox, "", sg,
-		GTK_WIDGET(plugin_filename), TRUE, &label);
-	gtk_label_set_markup(GTK_LABEL(label), _("<b>Filename:</b>"));
-	gtk_label_set_xalign(GTK_LABEL(label), 0);
-	gtk_label_set_yalign(GTK_LABEL(label), 0);
-
-	g_object_unref(sg);
-
-	return GTK_WIDGET(vbox);
-}
-
-
-void pidgin_plugin_dialog_show()
-{
-	GtkWidget *event_view;
-	GtkListStore *ls;
-	GtkCellRenderer *rend, *rendt;
-	GtkTreeViewColumn *col;
-	GtkTreeSelection *sel;
-
-	if (plugin_dialog != NULL) {
-		gtk_window_present(GTK_WINDOW(plugin_dialog));
-		return;
-	}
-
-	plugin_dialog = gtk_dialog_new();
-	gtk_window_set_title(GTK_WINDOW(plugin_dialog), _("Plugins"));
-	pref_button = gtk_dialog_add_button(GTK_DIALOG(plugin_dialog),
-						_("Configure Pl_ugin"), PIDGIN_RESPONSE_CONFIGURE);
-	gtk_dialog_add_button(GTK_DIALOG(plugin_dialog),
-						GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
-	gtk_widget_set_sensitive(pref_button, FALSE);
-	gtk_window_set_role(GTK_WINDOW(plugin_dialog), "plugins");
-
-	ls = gtk_list_store_new(4, G_TYPE_BOOLEAN, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_BOOLEAN);
-	gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(ls),
-					     1, GTK_SORT_ASCENDING);
-
-	update_plugin_list(ls);
-
-	event_view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(ls));
-
-	g_signal_connect(G_OBJECT(event_view), "row-activated",
-				G_CALLBACK(show_plugin_prefs_cb), plugin_dialog);
-
-	purple_signal_connect(purple_plugins_get_handle(), "plugin-load", plugin_dialog,
-	                    PURPLE_CALLBACK(plugin_load_cb), event_view);
-	purple_signal_connect(purple_plugins_get_handle(), "plugin-unload", plugin_dialog,
-	                    PURPLE_CALLBACK(plugin_unload_cb), event_view);
-
-	rend = gtk_cell_renderer_toggle_new();
-	sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (event_view));
-
-	col = gtk_tree_view_column_new_with_attributes (_("Enabled"),
-							rend,
-							"active", 0,
-							NULL);
-	gtk_tree_view_append_column (GTK_TREE_VIEW(event_view), col);
-	gtk_tree_view_column_set_sort_column_id(col, 0);
-	g_signal_connect(G_OBJECT(rend), "toggled",
-			 G_CALLBACK(plugin_toggled), ls);
-
-	rendt = gtk_cell_renderer_text_new();
-	g_object_set(rendt,
-		     "foreground", "#c0c0c0",
-		     NULL);
-	col = gtk_tree_view_column_new_with_attributes (_("Name"),
-							rendt,
-							"markup", 1,
-							"foreground-set", 3,
-							NULL);
-	gtk_tree_view_column_set_expand (col, TRUE);
-	g_object_set(rendt, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
-	gtk_tree_view_append_column (GTK_TREE_VIEW(event_view), col);
-	gtk_tree_view_column_set_sort_column_id(col, 1);
-	g_object_unref(G_OBJECT(ls));
-	gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(plugin_dialog))),
-		pidgin_make_scrollable(event_view, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC, GTK_SHADOW_IN, -1, -1),
-		TRUE, TRUE, 0);
-	gtk_tree_view_set_search_column(GTK_TREE_VIEW(event_view), 1);
-	gtk_tree_view_set_search_equal_func(GTK_TREE_VIEW(event_view),
-				pidgin_tree_view_search_equal_func, NULL, NULL);
-
-	pidgin_tooltip_setup_for_treeview(event_view, event_view,
-			pidgin_plugins_create_tooltip,
-			pidgin_plugins_paint_tooltip);
-
-
-	expander = gtk_expander_new(_("<b>Plugin Details</b>"));
-	gtk_expander_set_use_markup(GTK_EXPANDER(expander), TRUE);
-	gtk_widget_set_sensitive(expander, FALSE);
-	gtk_container_add(GTK_CONTAINER(expander), create_details());
-	gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(plugin_dialog))),
-	                   expander, FALSE, FALSE, 0);
-
-
-	g_signal_connect (G_OBJECT (sel), "changed", G_CALLBACK (prefs_plugin_sel), NULL);
-	g_signal_connect(G_OBJECT(plugin_dialog), "response", G_CALLBACK(plugin_dialog_response_cb), sel);
-	gtk_window_set_default_size(GTK_WINDOW(plugin_dialog), 430, 530);
-
-	pidgin_auto_parent_window(plugin_dialog);
-
-	gtk_widget_show_all(plugin_dialog);
-}
diff --git a/pidgin/gtkplugin.h b/pidgin/gtkplugin.h
deleted file mode 100644
index 7ab4c45adc..0000000000
--- a/pidgin/gtkplugin.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* pidgin
- *
- * Pidgin is the legal property of its developers, whose names are too numerous
- * to list here.  Please refer to the COPYRIGHT file distributed with this
- * source distribution.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
- */
-
-#ifndef _PIDGINPLUGIN_H_
-#define _PIDGINPLUGIN_H_
-/**
- * SECTION:gtkplugin
- * @section_id: pidgin-gtkplugin
- * @short_description: <filename>gtkplugin.h</filename>
- * @title: Plugin API
- */
-
-#include "pidgin.h"
-#include "plugins.h"
-
-#include "pidginplugininfo.h"
-
-G_BEGIN_DECLS
-
-/**
- * pidgin_plugins_save:
- *
- * Saves all loaded plugins.
- */
-void pidgin_plugins_save(void);
-
-/**
- * pidgin_plugin_dialog_show:
- *
- * Shows the Plugins dialog
- */
-void pidgin_plugin_dialog_show(void);
-
-G_END_DECLS
-
-#endif /* _PIDGINPLUGIN_H_ */
diff --git a/pidgin/libpidgin.c b/pidgin/libpidgin.c
index d0908ebae1..cc67d07b2e 100644
--- a/pidgin/libpidgin.c
+++ b/pidgin/libpidgin.c
@@ -52,7 +52,6 @@
 #include "gtkidle.h"
 #include "gtkmedia.h"
 #include "gtknotify.h"
-#include "gtkplugin.h"
 #include "gtkpounce.h"
 #include "gtkprefs.h"
 #include "gtkprivacy.h"
@@ -62,10 +61,11 @@
 #include "gtksmiley-theme.h"
 #include "gtksound.h"
 #include "gtkutils.h"
-#include "pidginstock.h"
 #include "gtkwhiteboard.h"
 #include "pidgindebug.h"
 #include "pidginlog.h"
+#include "pidginplugininfo.h"
+#include "pidginstock.h"
 
 #ifndef _WIN32
 #include <signal.h>
diff --git a/pidgin/meson.build b/pidgin/meson.build
index 108430f629..20101281f7 100644
--- a/pidgin/meson.build
+++ b/pidgin/meson.build
@@ -14,7 +14,6 @@ libpidgin_SOURCES = [
 	'gtkidle.c',
 	'gtkmedia.c',
 	'gtknotify.c',
-	'gtkplugin.c',
 	'gtkpluginpref.c',
 	'gtkpounce.c',
 	'gtkprefs.c',
@@ -67,7 +66,6 @@ libpidgin_headers = [
 	'gtkmedia.h',
 	'gtknickcolors.h',
 	'gtknotify.h',
-	'gtkplugin.h',
 	'gtkpluginpref.h',
 	'gtkprefs.h',
 	'gtkprivacy.h',
diff --git a/pidgin/pidginpluginsdialog.c b/pidgin/pidginpluginsdialog.c
index 26418729b0..094127afa8 100644
--- a/pidgin/pidginpluginsdialog.c
+++ b/pidgin/pidginpluginsdialog.c
@@ -28,9 +28,14 @@
 #include <gplugin.h>
 #include <gplugin-gtk.h>
 
+#include <purple.h>
+
+#include "gtkpluginpref.h"
+
 struct _PidginPluginsDialog {
 	GtkDialog parent;
 
+	GtkWidget *tree_view;
 	GtkWidget *configure_plugin_button;
 	GtkWidget *close_button;
 	GtkWidget *plugin_info;
@@ -38,14 +43,104 @@ struct _PidginPluginsDialog {
 	GtkListStore *plugin_store;
 };
 
+/* this has a short life left to it... */
+typedef struct
+{
+	enum
+	{
+		PIDGIN_PLUGIN_UI_DATA_TYPE_FRAME,
+		PIDGIN_PLUGIN_UI_DATA_TYPE_REQUEST
+	} type;
+
+	union
+	{
+		struct
+		{
+			GtkWidget *dialog;
+			PurplePluginPrefFrame *pref_frame;
+		} frame;
+
+		gpointer request_handle;
+	} u;
+} PidginPluginUiData;
+
 /******************************************************************************
  * Helpers
  *****************************************************************************/
 static gboolean
 pidgin_plugins_dialog_plugin_has_config(GPluginPlugin *plugin) {
-	return FALSE;
+	GPluginPluginInfo *ginfo = gplugin_plugin_get_info(plugin);
+	PurplePluginInfo *info = PURPLE_PLUGIN_INFO(ginfo);
+	GPluginPluginState state;
+	gboolean ret;
+
+	g_return_val_if_fail(GPLUGIN_IS_PLUGIN(plugin), FALSE);
+
+	state = gplugin_plugin_get_state(plugin);
+
+	if (state != GPLUGIN_PLUGIN_STATE_LOADED) {
+		return FALSE;
+	}
+
+	ret = (purple_plugin_info_get_pref_frame_cb(info) ||
+	       purple_plugin_info_get_pref_request_cb(info));
+
+	return ret;
 }
 
+static GPluginPlugin *
+pidgin_plugins_dialog_get_selected(PidginPluginsDialog *dialog) {
+	GPluginPlugin *plugin = NULL;
+	GtkTreeSelection *selection = NULL;
+	GtkTreeModel *model = NULL;
+	GtkTreeIter iter;
+
+	g_return_val_if_fail(PIDGIN_IS_PLUGINS_DIALOG(dialog), NULL);
+
+	selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(dialog->tree_view));
+	/* not sure if this is necessary, but playing defense. - grim 20191112 */
+	if(selection == NULL) {
+		return NULL;
+	}
+
+	if(gtk_tree_selection_get_selected(selection, &model, &iter)) {
+		gtk_tree_model_get(model, &iter,
+		                   GPLUGIN_GTK_STORE_PLUGIN_COLUMN, &plugin,
+		                   -1);
+	}
+
+	return plugin;
+}
+
+static void
+pidgin_plugins_dialog_pref_dialog_close(GPluginPlugin *plugin) {
+	GPluginPluginInfo *ginfo = gplugin_plugin_get_info(plugin);
+	PurplePluginInfo *info = PURPLE_PLUGIN_INFO(ginfo);
+	PidginPluginUiData *ui_data;
+
+	ui_data = purple_plugin_info_get_ui_data(info);
+	if (ui_data == NULL) {
+		purple_debug_info("PidginPluginsDialog", "failed to find uidata\n");
+		return;
+	}
+
+	if (ui_data->type == PIDGIN_PLUGIN_UI_DATA_TYPE_REQUEST) {
+		purple_request_close(PURPLE_REQUEST_FIELDS,
+			ui_data->u.request_handle);
+		return;
+	}
+
+	g_return_if_fail(ui_data->type == PIDGIN_PLUGIN_UI_DATA_TYPE_FRAME);
+
+	gtk_widget_destroy(ui_data->u.frame.dialog);
+
+	if (ui_data->u.frame.pref_frame) {
+		purple_plugin_pref_frame_destroy(ui_data->u.frame.pref_frame);
+	}
+
+	g_free(ui_data);
+	purple_plugin_info_set_ui_data(info, NULL);
+}
 
 /******************************************************************************
  * Callbacks
@@ -80,7 +175,116 @@ pidgin_plugins_dialog_selection_cb(GtkTreeSelection *sel, gpointer data) {
 }
 
 static void
+pidgin_plugins_dialog_pref_dialog_response_cb(GtkWidget *dialog, int response,
+                                              gpointer data)
+{
+	if (response == GTK_RESPONSE_CLOSE ||
+		response == GTK_RESPONSE_DELETE_EVENT)
+	{
+		pidgin_plugins_dialog_pref_dialog_close(GPLUGIN_PLUGIN(data));
+	}
+}
+
+static void
 pidgin_plugins_dialog_config_plugin_cb(GtkWidget *button, gpointer data) {
+	PidginPluginsDialog *dialog = PIDGIN_PLUGINS_DIALOG(data);
+	PidginPluginUiData *ui_data;
+	PurplePluginInfo *info;
+	PurplePluginPrefFrameCb pref_frame_cb;
+	PurplePluginPrefRequestCb pref_request_cb;
+	GPluginPlugin *plugin = NULL;
+	GPluginPluginInfo *ginfo = NULL;
+	gint prefs_count;
+
+	plugin = pidgin_plugins_dialog_get_selected(dialog);
+	if(!GPLUGIN_IS_PLUGIN(plugin)) {
+		return;
+	}
+
+	ginfo = gplugin_plugin_get_info(plugin);
+	info = PURPLE_PLUGIN_INFO(ginfo);
+
+	if(purple_plugin_info_get_ui_data(info)) {
+		return;
+	}
+
+	pref_frame_cb = purple_plugin_info_get_pref_frame_cb(info);
+	pref_request_cb = purple_plugin_info_get_pref_request_cb(info);
+
+	ui_data = g_new0(PidginPluginUiData, 1);
+	purple_plugin_info_set_ui_data(info, ui_data);
+
+	prefs_count = 0;
+	if (pref_frame_cb) {
+		prefs_count++;
+
+		ui_data->u.frame.pref_frame = pref_frame_cb(plugin);
+	}
+
+	if (pref_request_cb)
+		prefs_count++;
+
+	if (prefs_count > 1) {
+		purple_debug_warning("gtkplugin",
+		                     "Plugin %s contains more than one prefs "
+		                     "callback, some will be ignored.",
+		                     gplugin_plugin_info_get_name(ginfo));
+	}
+	g_return_if_fail(prefs_count > 0);
+
+
+	/* Priority: pidgin frame > purple request > purple frame
+	 * Purple frame could be replaced with purple request some day.
+	 */
+	if (pref_request_cb) {
+		ui_data->type = PIDGIN_PLUGIN_UI_DATA_TYPE_REQUEST;
+		ui_data->u.request_handle = pref_request_cb(plugin);
+		purple_request_add_close_notify(ui_data->u.request_handle,
+			purple_callback_set_zero, &info->ui_data);
+		purple_request_add_close_notify(ui_data->u.request_handle,
+			g_free, ui_data);
+	} else {
+		GtkWidget *box, *pdialog, *content, *sw;
+
+		ui_data->type = PIDGIN_PLUGIN_UI_DATA_TYPE_FRAME;
+
+		box = pidgin_plugin_pref_create_frame(ui_data->u.frame.pref_frame);
+		if (box == NULL) {
+			purple_debug_error("gtkplugin",
+				"Failed to display prefs frame");
+			g_free(ui_data);
+			purple_plugin_info_set_ui_data(info, NULL);
+			return;
+		}
+		gtk_widget_set_vexpand(box, TRUE);
+
+		ui_data->u.frame.dialog = pdialog = gtk_dialog_new_with_buttons(
+			PIDGIN_ALERT_TITLE, GTK_WINDOW(dialog),
+			GTK_DIALOG_DESTROY_WITH_PARENT,
+			_("Close"), GTK_RESPONSE_CLOSE,
+			NULL);
+
+		g_signal_connect(G_OBJECT(pdialog), "response",
+			G_CALLBACK(pidgin_plugins_dialog_pref_dialog_response_cb), plugin);
+
+		content = gtk_dialog_get_content_area(GTK_DIALOG(pdialog));
+
+		sw = gtk_scrolled_window_new(NULL, NULL);
+		gtk_container_add(GTK_CONTAINER(content), sw);
+		gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
+		                               GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+		gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw),
+		                                    GTK_SHADOW_IN);
+		gtk_widget_set_size_request(sw, 400, 400);
+
+		gtk_container_add(GTK_CONTAINER(sw), box);
+
+		gtk_window_set_role(GTK_WINDOW(pdialog), "plugin_config");
+		gtk_window_set_title(GTK_WINDOW(pdialog),
+		                     _(gplugin_plugin_info_get_name(
+		                             GPLUGIN_PLUGIN_INFO(info))));
+		gtk_widget_show_all(pdialog);
+	}
 }
 
 /******************************************************************************
@@ -97,6 +301,7 @@ pidgin_plugins_dialog_class_init(PidginPluginsDialogClass *klass) {
 		"/im/pidgin/Pidgin/Plugins/dialog.ui"
 	);
 
+	gtk_widget_class_bind_template_child(widget_class, PidginPluginsDialog, tree_view);
 	gtk_widget_class_bind_template_child(widget_class, PidginPluginsDialog, configure_plugin_button);
 	gtk_widget_class_bind_template_child(widget_class, PidginPluginsDialog, close_button);
 	gtk_widget_class_bind_template_child(widget_class, PidginPluginsDialog, plugin_info);
diff --git a/pidgin/plugins/contact_priority.c b/pidgin/plugins/contact_priority.c
index 64dd9652b8..faf4a0adc9 100644
--- a/pidgin/plugins/contact_priority.c
+++ b/pidgin/plugins/contact_priority.c
@@ -20,8 +20,8 @@
 
 #include "internal.h"
 #include "pidgin.h"
-#include "gtkplugin.h"
 #include "gtkutils.h"
+#include "pidginplugininfo.h"
 #include "prefs.h"
 #include "version.h"
 
diff --git a/pidgin/plugins/disco/xmppdisco.c b/pidgin/plugins/disco/xmppdisco.c
index b3be82e265..7dea817fe6 100644
--- a/pidgin/plugins/disco/xmppdisco.c
+++ b/pidgin/plugins/disco/xmppdisco.c
@@ -44,7 +44,7 @@ disco#info:
 #include "version.h"
 
 #include "gtkconv.h"
-#include "gtkplugin.h"
+#include "pidginplugininfo.h"
 
 #include "xmppdisco.h"
 #include "gtkdisco.h"
diff --git a/pidgin/plugins/extplacement.c b/pidgin/plugins/extplacement.c
index 074dad89c8..730e971b8b 100644
--- a/pidgin/plugins/extplacement.c
+++ b/pidgin/plugins/extplacement.c
@@ -24,7 +24,7 @@
 #include "pidgin.h"
 #include "conversation.h"
 #include "version.h"
-#include "gtkplugin.h"
+#include "pidginplugininfo.h"
 #include "gtkconv.h"
 #include "gtkconvwin.h"
 
diff --git a/pidgin/plugins/gtk-signals-test.c b/pidgin/plugins/gtk-signals-test.c
index e6c04a11a7..425c265634 100644
--- a/pidgin/plugins/gtk-signals-test.c
+++ b/pidgin/plugins/gtk-signals-test.c
@@ -30,7 +30,7 @@
 #include "gtkaccount.h"
 #include "gtkblist.h"
 #include "gtkconv.h"
-#include "gtkplugin.h"
+#include "pidginplugininfo.h"
 
 /**************************************************************************
  * Account subsystem signal callbacks
diff --git a/pidgin/plugins/gtkbuddynote.c b/pidgin/plugins/gtkbuddynote.c
index c73bc9bf21..3063c928ea 100644
--- a/pidgin/plugins/gtkbuddynote.c
+++ b/pidgin/plugins/gtkbuddynote.c
@@ -19,7 +19,7 @@
 #include "internal.h"
 
 #include <gtkblist.h>
-#include <gtkplugin.h>
+#include <pidginplugininfo.h>
 
 #include <debug.h>
 #include <version.h>
diff --git a/pidgin/plugins/iconaway.c b/pidgin/plugins/iconaway.c
index 58436d6b7b..b882496d66 100644
--- a/pidgin/plugins/iconaway.c
+++ b/pidgin/plugins/iconaway.c
@@ -26,7 +26,7 @@
 #include "version.h"
 
 #include "gtkconv.h"
-#include "gtkplugin.h"
+#include "pidginplugininfo.h"
 
 #define ICONAWAY_PLUGIN_ID "gtk-iconaway"
 
diff --git a/pidgin/plugins/relnot.c b/pidgin/plugins/relnot.c
index a179a6dd32..aac216a78b 100644
--- a/pidgin/plugins/relnot.c
+++ b/pidgin/plugins/relnot.c
@@ -32,10 +32,10 @@
 #include "core.h"
 #include "debug.h"
 #include "gtkblist.h"
-#include "gtkplugin.h"
 #include "gtkutils.h"
 #include "notify.h"
 #include "pidginicon.h"
+#include "pidginplugininfo.h"
 #include "prefs.h"
 #include "util.h"
 #include "version.h"
diff --git a/pidgin/plugins/ticker/ticker.c b/pidgin/plugins/ticker/ticker.c
index 87690452ee..c4ba30ce89 100644
--- a/pidgin/plugins/ticker/ticker.c
+++ b/pidgin/plugins/ticker/ticker.c
@@ -35,8 +35,8 @@
 #include "version.h"
 
 #include "gtkblist.h"
-#include "gtkplugin.h"
 #include "gtkutils.h"
+#include "pidginplugininfo.h"
 #include "pidginstock.h"
 
 #include "gtkticker.h"
diff --git a/pidgin/plugins/xmppconsole/xmppconsole.c b/pidgin/plugins/xmppconsole/xmppconsole.c
index cdf06079a6..b82db36cd4 100644
--- a/pidgin/plugins/xmppconsole/xmppconsole.c
+++ b/pidgin/plugins/xmppconsole/xmppconsole.c
@@ -22,7 +22,7 @@
  */
 
 #include "internal.h"
-#include "gtkplugin.h"
+#include "pidginplugininfo.h"
 #include "version.h"
 #include "protocol.h"
 #include "xmlnode.h"
diff --git a/pidgin/resources/Plugins/dialog.ui b/pidgin/resources/Plugins/dialog.ui
index cf590fa533..1f5a284330 100644
--- a/pidgin/resources/Plugins/dialog.ui
+++ b/pidgin/resources/Plugins/dialog.ui
@@ -68,14 +68,14 @@
                 <property name="can_focus">True</property>
                 <property name="shadow_type">in</property>
                 <child>
-                  <object class="GPluginGtkView">
+                  <object class="GPluginGtkView" id="tree_view">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="model">plugin_store</property>
                     <property name="headers_clickable">False</property>
                     <child internal-child="selection">
                       <object class="GtkTreeSelection">
-                        <signal name="changed" handler="pidgin_plugins_dialog_selection_cb" object="PidginPluginDialog" swapped="no"/>
+                        <signal name="changed" handler="pidgin_plugins_dialog_selection_cb" object="PidginPluginsDialog" swapped="no"/>
                       </object>
                     </child>
                   </object>