pidgin/pidgin

Make sure all of the final types in the protocols are defined as such

3 months ago, Gary Kramlich
a980db2607fd
Parents 4dc757d5f295
Children 722be3b1a8aa
Make sure all of the final types in the protocols are defined as such

Testing Done:
Consulted with the turtles and verified the demo protocol plugin could send messages.

Reviewed at https://reviews.imfreedom.org/r/2920/
13 files changed, 21 insertions(+), 15 deletions(-)
  • +2 -1
    libpurple/protocols/bonjour/bonjour_ft.c
  • +2 -2
    libpurple/protocols/demo/purpledemoconnection.c
  • +2 -1
    libpurple/protocols/gg/edisc.c
  • +3 -2
    libpurple/protocols/ircv3/purpleircv3capabilities.c
  • +1 -1
    libpurple/protocols/ircv3/purpleircv3message.c
  • +1 -1
    libpurple/protocols/ircv3/purpleircv3parser.c
  • +1 -1
    libpurple/protocols/jabber/jingle/iceudp.c
  • +1 -1
    libpurple/protocols/jabber/jingle/rawudp.c
  • +1 -1
    libpurple/protocols/jabber/jingle/rtp.c
  • +1 -1
    libpurple/protocols/jabber/jingle/session.c
  • +2 -1
    libpurple/protocols/jabber/oob.c
  • +2 -1
    libpurple/protocols/jabber/si.c
  • +2 -1
    libpurple/protocols/jabber/xmpp.c
    • --- a/libpurple/protocols/bonjour/bonjour_ft.c Tue Jan 23 00:02:11 2024 -0600
    +++ b/libpurple/protocols/bonjour/bonjour_ft.c Tue Jan 23 00:03:38 2024 -0600
    @@ -67,7 +67,8 @@
    PurpleContact *contact;
    };
    -G_DEFINE_DYNAMIC_TYPE(XepXfer, xep_xfer, PURPLE_TYPE_XFER);
    +G_DEFINE_DYNAMIC_TYPE_EXTENDED(XepXfer, xep_xfer, PURPLE_TYPE_XFER,
    + G_TYPE_FLAG_FINAL, {})
    static void
    xep_ft_si_reject(BonjourData *bd, const char *id, const char *to, const char *error_code, const char *error_type)
    --- a/libpurple/protocols/demo/purpledemoconnection.c Tue Jan 23 00:02:11 2024 -0600
    +++ b/libpurple/protocols/demo/purpledemoconnection.c Tue Jan 23 00:03:38 2024 -0600
    @@ -26,8 +26,8 @@
    PurpleConnection parent;
    };
    -G_DEFINE_DYNAMIC_TYPE(PurpleDemoConnection, purple_demo_connection,
    - PURPLE_TYPE_CONNECTION)
    +G_DEFINE_DYNAMIC_TYPE_EXTENDED(PurpleDemoConnection, purple_demo_connection,
    + PURPLE_TYPE_CONNECTION, G_TYPE_FLAG_FINAL, {})
    /******************************************************************************
    * PurpleConnection Implementation
    --- a/libpurple/protocols/gg/edisc.c Tue Jan 23 00:02:11 2024 -0600
    +++ b/libpurple/protocols/gg/edisc.c Tue Jan 23 00:03:38 2024 -0600
    @@ -1270,7 +1270,8 @@
    * GObject implementation
    ******************************************************************************/
    -G_DEFINE_DYNAMIC_TYPE(GGPXfer, ggp_xfer, PURPLE_TYPE_XFER);
    +G_DEFINE_DYNAMIC_TYPE_EXTENDED(GGPXfer, ggp_xfer, PURPLE_TYPE_XFER,
    + G_TYPE_FLAG_FINAL, {})
    static void
    ggp_xfer_init_xfer(PurpleXfer *xfer) {
    --- a/libpurple/protocols/ircv3/purpleircv3capabilities.c Tue Jan 23 00:02:11 2024 -0600
    +++ b/libpurple/protocols/ircv3/purpleircv3capabilities.c Tue Jan 23 00:03:38 2024 -0600
    @@ -166,8 +166,9 @@
    /******************************************************************************
    * GObject Implementation
    *****************************************************************************/
    -G_DEFINE_DYNAMIC_TYPE(PurpleIRCv3Capabilities, purple_ircv3_capabilities,
    - G_TYPE_OBJECT)
    +G_DEFINE_DYNAMIC_TYPE_EXTENDED(PurpleIRCv3Capabilities,
    + purple_ircv3_capabilities, G_TYPE_OBJECT,
    + G_TYPE_FLAG_FINAL, {})
    static void
    purple_ircv3_capabilities_get_property(GObject *obj, guint param_id,
    --- a/libpurple/protocols/ircv3/purpleircv3message.c Tue Jan 23 00:02:11 2024 -0600
    +++ b/libpurple/protocols/ircv3/purpleircv3message.c Tue Jan 23 00:03:38 2024 -0600
    @@ -46,7 +46,7 @@
    /******************************************************************************
    * GObject Implementation
    *****************************************************************************/
    -G_DEFINE_TYPE(PurpleIRCv3Message, purple_ircv3_message, G_TYPE_OBJECT)
    +G_DEFINE_FINAL_TYPE(PurpleIRCv3Message, purple_ircv3_message, G_TYPE_OBJECT)
    static void
    purple_ircv3_message_finalize(GObject *obj) {
    --- a/libpurple/protocols/ircv3/purpleircv3parser.c Tue Jan 23 00:02:11 2024 -0600
    +++ b/libpurple/protocols/ircv3/purpleircv3parser.c Tue Jan 23 00:03:38 2024 -0600
    @@ -39,7 +39,7 @@
    GHashTable *handlers;
    };
    -G_DEFINE_TYPE(PurpleIRCv3Parser, purple_ircv3_parser, G_TYPE_OBJECT)
    +G_DEFINE_FINAL_TYPE(PurpleIRCv3Parser, purple_ircv3_parser, G_TYPE_OBJECT)
    /******************************************************************************
    * Helpers
    --- a/libpurple/protocols/jabber/jingle/iceudp.c Tue Jan 23 00:02:11 2024 -0600
    +++ b/libpurple/protocols/jabber/jingle/iceudp.c Tue Jan 23 00:03:38 2024 -0600
    @@ -55,7 +55,7 @@
    JingleIceUdp,
    jingle_iceudp,
    JINGLE_TYPE_TRANSPORT,
    - 0,
    + G_TYPE_FLAG_FINAL,
    G_ADD_PRIVATE_DYNAMIC(JingleIceUdp)
    );
    --- a/libpurple/protocols/jabber/jingle/rawudp.c Tue Jan 23 00:02:11 2024 -0600
    +++ b/libpurple/protocols/jabber/jingle/rawudp.c Tue Jan 23 00:03:38 2024 -0600
    @@ -54,7 +54,7 @@
    JingleRawUdp,
    jingle_rawudp,
    JINGLE_TYPE_TRANSPORT,
    - 0,
    + G_TYPE_FLAG_FINAL,
    G_ADD_PRIVATE_DYNAMIC(JingleRawUdp)
    );
    --- a/libpurple/protocols/jabber/jingle/rtp.c Tue Jan 23 00:02:11 2024 -0600
    +++ b/libpurple/protocols/jabber/jingle/rtp.c Tue Jan 23 00:03:38 2024 -0600
    @@ -67,7 +67,7 @@
    JingleRtp,
    jingle_rtp,
    JINGLE_TYPE_CONTENT,
    - 0,
    + G_TYPE_FLAG_FINAL,
    G_ADD_PRIVATE_DYNAMIC(JingleRtp)
    );
    --- a/libpurple/protocols/jabber/jingle/session.c Tue Jan 23 00:02:11 2024 -0600
    +++ b/libpurple/protocols/jabber/jingle/session.c Tue Jan 23 00:03:38 2024 -0600
    @@ -68,7 +68,7 @@
    JingleSession,
    jingle_session,
    G_TYPE_OBJECT,
    - 0,
    + G_TYPE_FLAG_FINAL,
    G_ADD_PRIVATE_DYNAMIC(JingleSession)
    );
    --- a/libpurple/protocols/jabber/oob.c Tue Jan 23 00:02:11 2024 -0600
    +++ b/libpurple/protocols/jabber/oob.c Tue Jan 23 00:03:38 2024 -0600
    @@ -37,7 +37,8 @@
    SoupMessage *msg;
    };
    -G_DEFINE_DYNAMIC_TYPE(JabberOOBXfer, jabber_oob_xfer, PURPLE_TYPE_XFER);
    +G_DEFINE_DYNAMIC_TYPE_EXTENDED(JabberOOBXfer, jabber_oob_xfer,
    + PURPLE_TYPE_XFER, G_TYPE_FLAG_FINAL, {})
    static void jabber_oob_xfer_xfer_init(PurpleXfer *xfer)
    {
    --- a/libpurple/protocols/jabber/si.c Tue Jan 23 00:02:11 2024 -0600
    +++ b/libpurple/protocols/jabber/si.c Tue Jan 23 00:03:38 2024 -0600
    @@ -74,7 +74,8 @@
    PurpleCircularBuffer *ibb_buffer;
    };
    -G_DEFINE_DYNAMIC_TYPE(JabberSIXfer, jabber_si_xfer, PURPLE_TYPE_XFER);
    +G_DEFINE_DYNAMIC_TYPE_EXTENDED(JabberSIXfer, jabber_si_xfer, PURPLE_TYPE_XFER,
    + G_TYPE_FLAG_FINAL, {})
    /* some forward declarations */
    static void jabber_si_xfer_ibb_send_init(JabberStream *js, PurpleXfer *xfer);
    --- a/libpurple/protocols/jabber/xmpp.c Tue Jan 23 00:02:11 2024 -0600
    +++ b/libpurple/protocols/jabber/xmpp.c Tue Jan 23 00:03:38 2024 -0600
    @@ -114,7 +114,8 @@
    {
    }
    -G_DEFINE_DYNAMIC_TYPE(XMPPProtocol, xmpp_protocol, JABBER_TYPE_PROTOCOL);
    +G_DEFINE_DYNAMIC_TYPE_EXTENDED(XMPPProtocol, xmpp_protocol,
    + JABBER_TYPE_PROTOCOL, G_TYPE_FLAG_FINAL, {})
    /* This exists solely because the above macro makes xmpp_protocol_register_type
    * static. */