pidgin/pidgin

Update to gplugin 0.35.0

2021-10-04, Gary Kramlich
84e48180ef67
Parents b19be87fd27a
Children e315e317c2de
Update to gplugin 0.35.0

Testing Done:
Compiled and ran in the devenv.

Reviewed at https://reviews.imfreedom.org/r/994/
37 files changed, 52 insertions(+), 39 deletions(-)
  • +1 -1
    finch/plugins/gntclipboard.c
  • +1 -1
    finch/plugins/gntgf.c
  • +1 -1
    finch/plugins/gnthistory.c
  • +1 -1
    finch/plugins/gnttinyurl.c
  • +1 -1
    finch/plugins/grouping.c
  • +1 -1
    finch/plugins/lastlog.c
  • +1 -1
    libpurple/plugins/autoaccept.c
  • +1 -1
    libpurple/plugins/buddynote.c
  • +1 -1
    libpurple/plugins/idle.c
  • +1 -1
    libpurple/plugins/joinpart.c
  • +4 -1
    libpurple/plugins/keyrings/kwallet/purplekwallet.cpp
  • +4 -1
    libpurple/plugins/keyrings/secretservice.c
  • +4 -1
    libpurple/plugins/keyrings/wincred.c
  • +1 -1
    libpurple/plugins/log_reader.c
  • +4 -1
    libpurple/plugins/notification-sound/notification-sound.c
  • +1 -1
    libpurple/plugins/psychic.c
  • +1 -0
    libpurple/plugins/purple-toast.c
  • +1 -1
    libpurple/plugins/statenotify.c
  • +1 -1
    libpurple/protocols/bonjour/bonjour.c
  • +1 -1
    libpurple/protocols/facebook/facebook.c
  • +1 -1
    libpurple/protocols/gg/gg.c
  • +1 -1
    libpurple/protocols/irc/irc.c
  • +1 -1
    libpurple/protocols/jabber/jabber.c
  • +1 -1
    libpurple/protocols/novell/novell.c
  • +1 -1
    libpurple/protocols/null/nullprpl.c
  • +1 -1
    libpurple/protocols/sametime/sametime.c
  • +1 -1
    libpurple/protocols/silc/silc.c
  • +1 -1
    libpurple/protocols/zephyr/zephyr.c
  • +4 -4
    meson.build
  • +1 -1
    pidgin/meson.build
  • +1 -1
    pidgin/plugins/disco/xmppdisco.c
  • +1 -1
    pidgin/plugins/gestures/gestures.c
  • +1 -1
    pidgin/plugins/gtkbuddynote.c
  • +1 -1
    pidgin/plugins/iconaway.c
  • +1 -1
    pidgin/plugins/relnot.c
  • +1 -1
    pidgin/plugins/xmppconsole/xmppconsole.c
  • +1 -1
    subprojects/gplugin.wrap
    • --- a/finch/plugins/gntclipboard.c Fri Oct 01 17:50:50 2021 -0500
    +++ b/finch/plugins/gntclipboard.c Mon Oct 04 03:30:49 2021 -0500
    @@ -148,7 +148,7 @@
    }
    static gboolean
    -gnt_clipboard_unload(GPluginPlugin *plugin, GError **error) {
    +gnt_clipboard_unload(GPluginPlugin *plugin, gboolean shutdown, GError **error) {
    #ifdef HAVE_X11
    if (child) {
    kill(child, SIGTERM);
    --- a/finch/plugins/gntgf.c Fri Oct 01 17:50:50 2021 -0500
    +++ b/finch/plugins/gntgf.c Mon Oct 04 03:30:49 2021 -0500
    @@ -376,7 +376,7 @@
    }
    static gboolean
    -gnt_gf_unload(GPluginPlugin *plugin, GError **error) {
    +gnt_gf_unload(GPluginPlugin *plugin, gboolean shutdown, GError **error) {
    while (toasters)
    {
    GntToast *toast = toasters->data;
    --- a/finch/plugins/gnthistory.c Fri Oct 01 17:50:50 2021 -0500
    +++ b/finch/plugins/gnthistory.c Mon Oct 04 03:30:49 2021 -0500
    @@ -223,7 +223,7 @@
    }
    static gboolean
    -gnt_history_unload(GPluginPlugin *plugin, GError **error) {
    +gnt_history_unload(GPluginPlugin *plugin, gboolean shutdown, GError **error) {
    return TRUE;
    }
    --- a/finch/plugins/gnttinyurl.c Fri Oct 01 17:50:50 2021 -0500
    +++ b/finch/plugins/gnttinyurl.c Mon Oct 04 03:30:49 2021 -0500
    @@ -515,7 +515,7 @@
    }
    static gboolean
    -tiny_url_unload(GPluginPlugin *plugin, GError **error) {
    +tiny_url_unload(GPluginPlugin *plugin, gboolean shutdown, GError **error) {
    PurpleNotifyUiOps *ops = purple_notify_get_ui_ops();
    if (ops->notify_uri == tinyurl_notify_uri)
    ops->notify_uri = g_object_get_data(G_OBJECT(plugin), "notify-uri");
    --- a/finch/plugins/grouping.c Fri Oct 01 17:50:50 2021 -0500
    +++ b/finch/plugins/grouping.c Mon Oct 04 03:30:49 2021 -0500
    @@ -379,7 +379,7 @@
    }
    static gboolean
    -grouping_unload(GPluginPlugin *plugin, GError **error) {
    +grouping_unload(GPluginPlugin *plugin, gboolean shutdown, GError **error) {
    finch_blist_uninstall_manager(&on_offline);
    finch_blist_uninstall_manager(&meebo_group);
    finch_blist_uninstall_manager(&no_group);
    --- a/finch/plugins/lastlog.c Fri Oct 01 17:50:50 2021 -0500
    +++ b/finch/plugins/lastlog.c Mon Oct 04 03:30:49 2021 -0500
    @@ -117,7 +117,7 @@
    }
    static gboolean
    -gnt_last_log_unload(GPluginPlugin *plugin, GError **error) {
    +gnt_last_log_unload(GPluginPlugin *plugin, gboolean shutdown, GError **error) {
    purple_cmd_unregister(cmd);
    return TRUE;
    }
    --- a/libpurple/plugins/autoaccept.c Fri Oct 01 17:50:50 2021 -0500
    +++ b/libpurple/plugins/autoaccept.c Mon Oct 04 03:30:49 2021 -0500
    @@ -332,7 +332,7 @@
    }
    static gboolean
    -auto_accept_unload(GPluginPlugin *plugin, GError **error)
    +auto_accept_unload(GPluginPlugin *plugin, gboolean shutdown, GError **error)
    {
    return TRUE;
    }
    --- a/libpurple/plugins/buddynote.c Fri Oct 01 17:50:50 2021 -0500
    +++ b/libpurple/plugins/buddynote.c Mon Oct 04 03:30:49 2021 -0500
    @@ -97,7 +97,7 @@
    }
    static gboolean
    -buddy_note_unload(GPluginPlugin *plugin, GError **error)
    +buddy_note_unload(GPluginPlugin *plugin, gboolean shutdown, GError **error)
    {
    return TRUE;
    }
    --- a/libpurple/plugins/idle.c Fri Oct 01 17:50:50 2021 -0500
    +++ b/libpurple/plugins/idle.c Mon Oct 04 03:30:49 2021 -0500
    @@ -301,7 +301,7 @@
    }
    static gboolean
    -idle_unload(GPluginPlugin *plugin, GError **error)
    +idle_unload(GPluginPlugin *plugin, gboolean shutdown, GError **error)
    {
    unidle_all_action(NULL);
    --- a/libpurple/plugins/joinpart.c Fri Oct 01 17:50:50 2021 -0500
    +++ b/libpurple/plugins/joinpart.c Mon Oct 04 03:30:49 2021 -0500
    @@ -266,7 +266,7 @@
    }
    static gboolean
    -join_part_unload(GPluginPlugin *plugin, GError **error)
    +join_part_unload(GPluginPlugin *plugin, gboolean shutdown, GError **error)
    {
    /* Destroy the hash table. The core plugin code will
    * disconnect the signals, and since Purple is single-threaded,
    --- a/libpurple/plugins/keyrings/kwallet/purplekwallet.cpp Fri Oct 01 17:50:50 2021 -0500
    +++ b/libpurple/plugins/keyrings/kwallet/purplekwallet.cpp Mon Oct 04 03:30:49 2021 -0500
    @@ -588,7 +588,10 @@
    }
    static gboolean
    -kwallet_unload(G_GNUC_UNUSED GPluginPlugin *plugin, GError **error) {
    +kwallet_unload(G_GNUC_UNUSED GPluginPlugin *plugin,
    + G_GNUC_UNUSED gboolean shutdown,
    + GError **error)
    +{
    PurpleCredentialManager *manager = NULL;
    gboolean ret = FALSE;
    --- a/libpurple/plugins/keyrings/secretservice.c Fri Oct 01 17:50:50 2021 -0500
    +++ b/libpurple/plugins/keyrings/secretservice.c Mon Oct 04 03:30:49 2021 -0500
    @@ -318,7 +318,10 @@
    }
    static gboolean
    -secret_service_unload(G_GNUC_UNUSED GPluginPlugin *plugin, GError **error) {
    +secret_service_unload(G_GNUC_UNUSED GPluginPlugin *plugin,
    + G_GNUC_UNUSED gboolean shutdown,
    + GError **error)
    +{
    PurpleCredentialManager *manager = NULL;
    gboolean ret = FALSE;
    --- a/libpurple/plugins/keyrings/wincred.c Fri Oct 01 17:50:50 2021 -0500
    +++ b/libpurple/plugins/keyrings/wincred.c Mon Oct 04 03:30:49 2021 -0500
    @@ -411,7 +411,10 @@
    }
    static gboolean
    -wincred_unload(G_GNUC_UNUSED GPluginPlugin *plugin, GError **error) {
    +wincred_unload(G_GNUC_UNUSED GPluginPlugin *plugin,
    + G_GNUC_UNUSED gboolean shutdown,
    + GError **error)
    +{
    PurpleCredentialManager *manager = NULL;
    gboolean ret = FALSE;
    --- a/libpurple/plugins/log_reader.c Fri Oct 01 17:50:50 2021 -0500
    +++ b/libpurple/plugins/log_reader.c Mon Oct 04 03:30:49 2021 -0500
    @@ -2706,7 +2706,7 @@
    }
    static gboolean
    -log_reader_unload(GPluginPlugin *plugin, GError **error)
    +log_reader_unload(GPluginPlugin *plugin, gboolean shutdown, GError **error)
    {
    g_return_val_if_fail(plugin != NULL, FALSE);
    --- a/libpurple/plugins/notification-sound/notification-sound.c Fri Oct 01 17:50:50 2021 -0500
    +++ b/libpurple/plugins/notification-sound/notification-sound.c Mon Oct 04 03:30:49 2021 -0500
    @@ -287,7 +287,10 @@
    }
    static gboolean
    -notification_sound_unload(GPluginPlugin *plugin, G_GNUC_UNUSED GError **error) {
    +notification_sound_unload(GPluginPlugin *plugin,
    + G_GNUC_UNUSED gboolean shutdown,
    + G_GNUC_UNUSED GError **error)
    +{
    purple_signals_disconnect_by_handle(plugin);
    purple_notification_sound_save_prefs();
    --- a/libpurple/plugins/psychic.c Fri Oct 01 17:50:50 2021 -0500
    +++ b/libpurple/plugins/psychic.c Mon Oct 04 03:30:49 2021 -0500
    @@ -159,7 +159,7 @@
    static gboolean
    -psychic_unload(GPluginPlugin *plugin, GError **error) {
    +psychic_unload(GPluginPlugin *plugin, gboolean shutdown, GError **error) {
    return TRUE;
    }
    --- a/libpurple/plugins/purple-toast.c Fri Oct 01 17:50:50 2021 -0500
    +++ b/libpurple/plugins/purple-toast.c Mon Oct 04 03:30:49 2021 -0500
    @@ -230,6 +230,7 @@
    static gboolean
    purple_toast_unload(G_GNUC_UNUSED GPluginPlugin *plugin,
    + G_GNUC_UNUSED gboolean shutdown,
    G_GNUC_UNUSED GError **error)
    {
    return TRUE;
    --- a/libpurple/plugins/statenotify.c Fri Oct 01 17:50:50 2021 -0500
    +++ b/libpurple/plugins/statenotify.c Mon Oct 04 03:30:49 2021 -0500
    @@ -177,7 +177,7 @@
    }
    static gboolean
    -state_notify_unload(GPluginPlugin *plugin, GError **error)
    +state_notify_unload(GPluginPlugin *plugin, gboolean shutdown, GError **error)
    {
    return TRUE;
    }
    --- a/libpurple/protocols/bonjour/bonjour.c Fri Oct 01 17:50:50 2021 -0500
    +++ b/libpurple/protocols/bonjour/bonjour.c Mon Oct 04 03:30:49 2021 -0500
    @@ -800,7 +800,7 @@
    }
    static gboolean
    -bonjour_unload(GPluginPlugin *plugin, GError **error)
    +bonjour_unload(GPluginPlugin *plugin, gboolean shutdown, GError **error)
    {
    PurpleProtocolManager *manager = purple_protocol_manager_get_default();
    --- a/libpurple/protocols/facebook/facebook.c Fri Oct 01 17:50:50 2021 -0500
    +++ b/libpurple/protocols/facebook/facebook.c Mon Oct 04 03:30:49 2021 -0500
    @@ -1754,7 +1754,7 @@
    }
    static gboolean
    -facebook_unload(GPluginPlugin *plugin, GError **error)
    +facebook_unload(GPluginPlugin *plugin, gboolean shutdown, GError **error)
    {
    PurpleProtocolManager *manager = purple_protocol_manager_get_default();
    --- a/libpurple/protocols/gg/gg.c Fri Oct 01 17:50:50 2021 -0500
    +++ b/libpurple/protocols/gg/gg.c Mon Oct 04 03:30:49 2021 -0500
    @@ -1280,7 +1280,7 @@
    }
    static gboolean
    -gg_unload(GPluginPlugin *plugin, GError **error)
    +gg_unload(GPluginPlugin *plugin, gboolean shutdown, GError **error)
    {
    PurpleProtocolManager *manager = purple_protocol_manager_get_default();
    --- a/libpurple/protocols/irc/irc.c Fri Oct 01 17:50:50 2021 -0500
    +++ b/libpurple/protocols/irc/irc.c Mon Oct 04 03:30:49 2021 -0500
    @@ -1226,7 +1226,7 @@
    }
    static gboolean
    -irc_unload(GPluginPlugin *plugin, GError **error)
    +irc_unload(GPluginPlugin *plugin, gboolean shutdown, GError **error)
    {
    PurpleProtocolManager *manager = purple_protocol_manager_get_default();
    --- a/libpurple/protocols/jabber/jabber.c Fri Oct 01 17:50:50 2021 -0500
    +++ b/libpurple/protocols/jabber/jabber.c Mon Oct 04 03:30:49 2021 -0500
    @@ -4312,7 +4312,7 @@
    }
    static gboolean
    -jabber_unload(GPluginPlugin *plugin, GError **error)
    +jabber_unload(GPluginPlugin *plugin, gboolean shutdown, GError **error)
    {
    PurpleProtocolManager *manager = purple_protocol_manager_get_default();
    --- a/libpurple/protocols/novell/novell.c Fri Oct 01 17:50:50 2021 -0500
    +++ b/libpurple/protocols/novell/novell.c Mon Oct 04 03:30:49 2021 -0500
    @@ -3682,7 +3682,7 @@
    }
    static gboolean
    -novell_unload(GPluginPlugin *plugin, GError **error)
    +novell_unload(GPluginPlugin *plugin, gboolean shutdown, GError **error)
    {
    PurpleProtocolManager *manager = purple_protocol_manager_get_default();
    --- a/libpurple/protocols/null/nullprpl.c Fri Oct 01 17:50:50 2021 -0500
    +++ b/libpurple/protocols/null/nullprpl.c Mon Oct 04 03:30:49 2021 -0500
    @@ -1339,7 +1339,7 @@
    }
    static gboolean
    -null_unload(GPluginPlugin *plugin, GError **error)
    +null_unload(GPluginPlugin *plugin, gboolean shutdown, GError **error)
    {
    PurpleProtocolManager *manager = purple_protocol_manager_get_default();
    --- a/libpurple/protocols/sametime/sametime.c Fri Oct 01 17:50:50 2021 -0500
    +++ b/libpurple/protocols/sametime/sametime.c Mon Oct 04 03:30:49 2021 -0500
    @@ -5458,7 +5458,7 @@
    static gboolean
    -sametime_unload(GPluginPlugin *plugin, GError **error)
    +sametime_unload(GPluginPlugin *plugin, gboolean shutdown, GError **error)
    {
    PurpleProtocolManager *manager = purple_protocol_manager_get_default();
    --- a/libpurple/protocols/silc/silc.c Fri Oct 01 17:50:50 2021 -0500
    +++ b/libpurple/protocols/silc/silc.c Mon Oct 04 03:30:49 2021 -0500
    @@ -2408,7 +2408,7 @@
    }
    static gboolean
    -silc_unload(GPluginPlugin *plugin, GError **error)
    +silc_unload(GPluginPlugin *plugin, gboolean shutdown, GError **error)
    {
    PurpleProtocolManager *manager = purple_protocol_manager_get_default();
    --- a/libpurple/protocols/zephyr/zephyr.c Fri Oct 01 17:50:50 2021 -0500
    +++ b/libpurple/protocols/zephyr/zephyr.c Mon Oct 04 03:30:49 2021 -0500
    @@ -1772,7 +1772,7 @@
    static gboolean
    -zephyr_unload(GPluginPlugin *plugin, GError **error)
    +zephyr_unload(GPluginPlugin *plugin, gboolean shutdown, GError **error)
    {
    PurpleProtocolManager *manager = purple_protocol_manager_get_default();
    --- a/meson.build Fri Oct 01 17:50:50 2021 -0500
    +++ b/meson.build Mon Oct 04 03:30:49 2021 -0500
    @@ -550,13 +550,13 @@
    # Check for GPlugin
    #######################################################################
    gplugin_dep = dependency('gplugin',
    - version : ['>=0.34.1', '<0.35.0'],
    + version : ['>=0.35.0', '<0.36.0'],
    fallback : ['gplugin', 'gplugin_dep'])
    if get_option('gtkui')
    - gplugin_gtk_dep = dependency('gplugin-gtk',
    - version : ['>=0.34.1', '<0.35.0'],
    - fallback : ['gplugin-gtk', 'gplugin_gtk_dep'])
    + gplugin_gtk_dep = dependency('gplugin-gtk3',
    + version : ['>=0.35.0', '<0.36.0'],
    + fallback : ['gplugin-gtk', 'gplugin_gtk3_dep'])
    endif
    #######################################################################
    --- a/pidgin/meson.build Fri Oct 01 17:50:50 2021 -0500
    +++ b/pidgin/meson.build Mon Oct 04 03:30:49 2021 -0500
    @@ -315,7 +315,7 @@
    introspection_sources = libpidgin_headers + libpidgin_prefs_headers
    Pidgin_gir_includes = [
    - 'GObject-2.0', 'Gtk-3.0', 'GPlugin-1.0', 'GPluginGtk-1.0',
    + 'GObject-2.0', 'Gtk-3.0', 'GPlugin-1.0', 'GPluginGtk3-1.0',
    'Talkatu-0.0',
    # subproject needs to be before libpurple in the repo so that
    # meson will use our variables and not try to discover them from
    --- a/pidgin/plugins/disco/xmppdisco.c Fri Oct 01 17:50:50 2021 -0500
    +++ b/pidgin/plugins/disco/xmppdisco.c Mon Oct 04 03:30:49 2021 -0500
    @@ -662,7 +662,7 @@
    }
    static gboolean
    -xmpp_disco_unload(GPluginPlugin *plugin, GError **error)
    +xmpp_disco_unload(GPluginPlugin *plugin, gboolean unload, GError **error)
    {
    g_hash_table_destroy(iq_callbacks);
    iq_callbacks = NULL;
    --- a/pidgin/plugins/gestures/gestures.c Fri Oct 01 17:50:50 2021 -0500
    +++ b/pidgin/plugins/gestures/gestures.c Mon Oct 04 03:30:49 2021 -0500
    @@ -280,7 +280,7 @@
    }
    static gboolean
    -gestures_unload(GPluginPlugin *plugin, GError **error)
    +gestures_unload(GPluginPlugin *plugin, gboolean shutdown, GError **error)
    {
    PurpleConversation *conv;
    PurpleConversationManager *manager;
    --- a/pidgin/plugins/gtkbuddynote.c Fri Oct 01 17:50:50 2021 -0500
    +++ b/pidgin/plugins/gtkbuddynote.c Mon Oct 04 03:30:49 2021 -0500
    @@ -78,7 +78,7 @@
    }
    static gboolean
    -gtk_buddy_note_unload(GPluginPlugin *plugin, GError **error)
    +gtk_buddy_note_unload(GPluginPlugin *plugin, gboolean shutdown, GError **error)
    {
    return TRUE;
    }
    --- a/pidgin/plugins/iconaway.c Fri Oct 01 17:50:50 2021 -0500
    +++ b/pidgin/plugins/iconaway.c Mon Oct 04 03:30:49 2021 -0500
    @@ -88,7 +88,7 @@
    }
    static gboolean
    -icon_away_unload(GPluginPlugin *plugin, GError **error)
    +icon_away_unload(GPluginPlugin *plugin, gboolean shutdown, GError **error)
    {
    return TRUE;
    }
    --- a/pidgin/plugins/relnot.c Fri Oct 01 17:50:50 2021 -0500
    +++ b/pidgin/plugins/relnot.c Mon Oct 04 03:30:49 2021 -0500
    @@ -166,7 +166,7 @@
    }
    static gboolean
    -relnot_unload(GPluginPlugin *plugin, GError **error)
    +relnot_unload(GPluginPlugin *plugin, gboolean shutdown, GError **error)
    {
    soup_session_abort(session);
    g_clear_object(&session);
    --- a/pidgin/plugins/xmppconsole/xmppconsole.c Fri Oct 01 17:50:50 2021 -0500
    +++ b/pidgin/plugins/xmppconsole/xmppconsole.c Mon Oct 04 03:30:49 2021 -0500
    @@ -769,7 +769,7 @@
    }
    static gboolean
    -xmpp_console_unload(GPluginPlugin *plugin, GError **error)
    +xmpp_console_unload(GPluginPlugin *plugin, gboolean shutdown, GError **error)
    {
    if (console)
    gtk_widget_destroy(console->window);
    --- a/subprojects/gplugin.wrap Fri Oct 01 17:50:50 2021 -0500
    +++ b/subprojects/gplugin.wrap Mon Oct 04 03:30:49 2021 -0500
    @@ -1,4 +1,4 @@
    [wrap-hg]
    directory = gplugin
    url = https://keep.imfreedom.org/gplugin/gplugin
    -revision = v0.34.1
    +revision = v0.35.0