pidgin/pidgin

Port the pidgin plugins from purple_protocols_ to purple_protocol_manager_

2021-02-28, Gary Kramlich
fb206d19393f
Parents 52f630910634
Children be00e9c87cb7
Port the pidgin plugins from purple_protocols_ to purple_protocol_manager_

Testing Done:
Compiled and verified both plugins still work.

Bugs closed: PIDGIN-17471

Reviewed at https://reviews.imfreedom.org/r/530/
2 files changed, 10 insertions(+), 3 deletions(-)
  • +7 -2
    pidgin/plugins/disco/xmppdisco.c
  • +3 -1
    pidgin/plugins/xmppconsole/xmppconsole.c
    • --- a/pidgin/plugins/disco/xmppdisco.c Sun Feb 28 22:00:50 2021 -0600
    +++ b/pidgin/plugins/disco/xmppdisco.c Sun Feb 28 22:05:06 2021 -0600
    @@ -146,7 +146,10 @@
    g_hash_table_insert(iq_callbacks, id, cbdata);
    if (!iq_listening) {
    - PurpleProtocol *protocol = purple_protocols_find(XMPP_PROTOCOL_ID);
    + PurpleProtocol *protocol = NULL;
    + PurpleProtocolManager *manager = purple_protocol_manager_get_default();
    + protocol = purple_protocol_manager_find(manager, XMPP_PROTOCOL_ID);
    +
    iq_listening = TRUE;
    purple_signal_connect(protocol, "jabber-receiving-iq", my_plugin,
    PURPLE_CALLBACK(xmpp_iq_received), NULL);
    @@ -636,10 +639,12 @@
    plugin_load(PurplePlugin *plugin, GError **error)
    {
    PurpleProtocol *xmpp_protocol;
    + PurpleProtocolManager *manager;
    my_plugin = plugin;
    - xmpp_protocol = purple_protocols_find(XMPP_PROTOCOL_ID);
    + manager = purple_protocol_manager_get_default();
    + xmpp_protocol = purple_protocol_manager_find(manager, XMPP_PROTOCOL_ID);
    if (NULL == xmpp_protocol) {
    g_set_error_literal(error, PLUGIN_DOMAIN, 0,
    _("XMPP protocol is not loaded."));
    --- a/pidgin/plugins/xmppconsole/xmppconsole.c Sun Feb 28 22:00:50 2021 -0600
    +++ b/pidgin/plugins/xmppconsole/xmppconsole.c Sun Feb 28 22:05:06 2021 -0600
    @@ -736,8 +736,10 @@
    i = 0;
    while (xmpp_prpls[i] != NULL) {
    PurpleProtocol *xmpp;
    + PurpleProtocolManager *manager;
    - xmpp = purple_protocols_find(xmpp_prpls[i]);
    + manager = purple_protocol_manager_get_default();
    + xmpp = purple_protocol_manager_find(manager, xmpp_prpls[i]);
    i++;
    if (!xmpp)