Mercurial > pidgin3 / file diff

--- a/pidgin/gtkblist.c	Tue Nov 12 01:34:57 2019 -0600
+++ b/pidgin/gtkblist.c	Thu Nov 14 21:53:50 2019 -0600
@@ -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 @@
  *            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 @@
 	{ "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 @@
 			"<menuitem action='BuddyPounces'/>"
 			"<menuitem action='CustomSmileys'/>"
 			"<menuitem action='Plugins'/>"
-			"<menuitem action='Plugins-NG'/>"
 			"<menuitem action='Preferences'/>"
 			"<menuitem action='Privacy'/>"
 			"<menuitem action='SetMood'/>"