pidgin/pidgin

Update gtkconv to use GPluginManger directly

2021-05-30, Gary Kramlich
f0a12e3048a4
Parents 06e5a2a8f49a
Children 60f4b2a6d66a
Update gtkconv to use GPluginManger directly

Testing Done:
Compiled and ran, but no plugins in tree use this.

Reviewed at https://reviews.imfreedom.org/r/685/
1 files changed, 9 insertions(+), 6 deletions(-)
  • +9 -6
    pidgin/gtkconv.c
    • --- a/pidgin/gtkconv.c Sun May 30 17:20:19 2021 -0500
    +++ b/pidgin/gtkconv.c Sun May 30 20:34:04 2021 -0500
    @@ -27,6 +27,8 @@
    #include <glib/gi18n-lib.h>
    #include <glib/gstdio.h>
    +#include <gplugin.h>
    +
    #define BUF_LONG (4096)
    #ifdef HAVE_X11
    @@ -5687,7 +5689,7 @@
    }
    static void
    -plugin_changed_cb(PurplePlugin *p, gpointer data)
    +plugin_changed_cb(GObject *manager, GPluginPlugin *p, gpointer data)
    {
    regenerate_plugins_items(data);
    }
    @@ -5779,6 +5781,7 @@
    GtkWidget *testidea;
    GtkWidget *menubar;
    GdkModifierType state;
    + GObject *manager;
    win = g_malloc0(sizeof(PidginConvWindow));
    win->menu = g_malloc0(sizeof(PidginConvWindowMenu));
    @@ -5846,11 +5849,11 @@
    gtk_box_pack_start(GTK_BOX(testidea), win->notebook, TRUE, TRUE, 0);
    /* Update the plugin actions when plugins are (un)loaded */
    - purple_signal_connect(purple_plugins_get_handle(), "plugin-load",
    - win, PURPLE_CALLBACK(plugin_changed_cb), win);
    - purple_signal_connect(purple_plugins_get_handle(), "plugin-unload",
    - win, PURPLE_CALLBACK(plugin_changed_cb), win);
    -
    + manager = gplugin_manager_get_instance();
    + g_signal_connect(manager, "loaded-plugin", G_CALLBACK(plugin_changed_cb),
    + win);
    + g_signal_connect(manager, "unloaded-plugin",
    + G_CALLBACK(plugin_changed_cb), win);
    #ifdef _WIN32
    g_signal_connect(G_OBJECT(win->window), "show",