pidgin/pidgin

Clean up the G_DEFINE_DYNAMIC_TYPE definitions for protocols

18 months ago, Gary Kramlich
201aae92d734
Parents 4f86a754ed7b
Children 3bc50beccf03
Clean up the G_DEFINE_DYNAMIC_TYPE definitions for protocols

Most of these were missing the G_TYPE_FLAG_FINAL flag, many of these had wrong
indentation, and a many had a trailing ; that isn't necessary as well.

Testing Done:
Compiled

Reviewed at https://reviews.imfreedom.org/r/2058/
8 files changed, 120 insertions(+), 142 deletions(-)
  • +12 -13
    libpurple/protocols/bonjour/bonjour.c
  • +2 -3
    libpurple/protocols/demo/purpledemoprotocol.c
  • +14 -12
    libpurple/protocols/facebook/facebook.c
  • +20 -25
    libpurple/protocols/gg/gg.c
  • +18 -22
    libpurple/protocols/irc/irc.c
  • +22 -29
    libpurple/protocols/jabber/jabber.c
  • +14 -16
    libpurple/protocols/novell/novell.c
  • +18 -22
    libpurple/protocols/sametime/sametime.c
    • --- a/libpurple/protocols/bonjour/bonjour.c Fri Nov 11 18:57:54 2022 -0600
    +++ b/libpurple/protocols/bonjour/bonjour.c Fri Nov 11 19:39:24 2022 -0600
    @@ -727,19 +727,18 @@
    }
    G_DEFINE_DYNAMIC_TYPE_EXTENDED(
    - BonjourProtocol, bonjour_protocol, PURPLE_TYPE_PROTOCOL, 0,
    -
    - G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_CLIENT,
    - bonjour_protocol_client_iface_init)
    -
    - G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_SERVER,
    - bonjour_protocol_server_iface_init)
    -
    - G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_IM,
    - bonjour_protocol_im_iface_init)
    -
    - G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_XFER,
    - bonjour_protocol_xfer_iface_init));
    + BonjourProtocol,
    + bonjour_protocol,
    + PURPLE_TYPE_PROTOCOL,
    + G_TYPE_FLAG_FINAL,
    + G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_CLIENT,
    + bonjour_protocol_client_iface_init)
    + G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_SERVER,
    + bonjour_protocol_server_iface_init)
    + G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_IM,
    + bonjour_protocol_im_iface_init)
    + G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_XFER,
    + bonjour_protocol_xfer_iface_init))
    static PurpleProtocol *
    bonjour_protocol_new(void) {
    --- a/libpurple/protocols/demo/purpledemoprotocol.c Fri Nov 11 18:57:54 2022 -0600
    +++ b/libpurple/protocols/demo/purpledemoprotocol.c Fri Nov 11 19:39:24 2022 -0600
    @@ -90,7 +90,7 @@
    PurpleDemoProtocol,
    purple_demo_protocol,
    PURPLE_TYPE_PROTOCOL,
    - 0,
    + G_TYPE_FLAG_FINAL,
    G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_ACTIONS,
    purple_demo_protocol_actions_init)
    G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_CLIENT,
    @@ -98,8 +98,7 @@
    G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_IM,
    purple_demo_protocol_im_init)
    G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_MEDIA,
    - purple_demo_protocol_media_init)
    -)
    + purple_demo_protocol_media_init))
    static void
    purple_demo_protocol_init(PurpleDemoProtocol *protocol) {
    --- a/libpurple/protocols/facebook/facebook.c Fri Nov 11 18:57:54 2022 -0600
    +++ b/libpurple/protocols/facebook/facebook.c Fri Nov 11 19:39:24 2022 -0600
    @@ -1629,18 +1629,20 @@
    }
    G_DEFINE_DYNAMIC_TYPE_EXTENDED(
    - FacebookProtocol, facebook_protocol, PURPLE_TYPE_PROTOCOL, 0,
    -
    - G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_CLIENT,
    - facebook_protocol_client_iface_init)
    - G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_SERVER,
    - facebook_protocol_server_init)
    - G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_IM,
    - facebook_protocol_im_iface_init)
    - G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_CHAT,
    - facebook_protocol_chat_iface_init)
    - G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_ROOMLIST,
    - facebook_protocol_roomlist_iface_init));
    + FacebookProtocol,
    + facebook_protocol,
    + PURPLE_TYPE_PROTOCOL,
    + G_TYPE_FLAG_FINAL,
    + G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_CLIENT,
    + facebook_protocol_client_iface_init)
    + G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_SERVER,
    + facebook_protocol_server_init)
    + G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_IM,
    + facebook_protocol_im_iface_init)
    + G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_CHAT,
    + facebook_protocol_chat_iface_init)
    + G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_ROOMLIST,
    + facebook_protocol_roomlist_iface_init))
    static void
    fb_cmds_register(void)
    --- a/libpurple/protocols/gg/gg.c Fri Nov 11 18:57:54 2022 -0600
    +++ b/libpurple/protocols/gg/gg.c Fri Nov 11 19:39:24 2022 -0600
    @@ -1345,31 +1345,26 @@
    }
    G_DEFINE_DYNAMIC_TYPE_EXTENDED(
    - GGPProtocol, ggp_protocol, PURPLE_TYPE_PROTOCOL, 0,
    -
    - G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_ACTIONS,
    - ggp_protocol_actions_iface_init)
    -
    - G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_CLIENT,
    - ggp_protocol_client_iface_init)
    -
    - G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_SERVER,
    - ggp_protocol_server_iface_init)
    -
    - G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_IM,
    - ggp_protocol_im_iface_init)
    -
    - G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_CHAT,
    - ggp_protocol_chat_iface_init)
    -
    - G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_ROOMLIST,
    - ggp_protocol_roomlist_iface_init)
    -
    - G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_PRIVACY,
    - ggp_protocol_privacy_iface_init)
    -
    - G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_XFER,
    - ggp_protocol_xfer_iface_init));
    + GGPProtocol,
    + ggp_protocol,
    + PURPLE_TYPE_PROTOCOL,
    + G_TYPE_FLAG_FINAL,
    + G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_ACTIONS,
    + ggp_protocol_actions_iface_init)
    + G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_CLIENT,
    + ggp_protocol_client_iface_init)
    + G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_SERVER,
    + ggp_protocol_server_iface_init)
    + G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_IM,
    + ggp_protocol_im_iface_init)
    + G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_CHAT,
    + ggp_protocol_chat_iface_init)
    + G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_ROOMLIST,
    + ggp_protocol_roomlist_iface_init)
    + G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_PRIVACY,
    + ggp_protocol_privacy_iface_init)
    + G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_XFER,
    + ggp_protocol_xfer_iface_init))
    static PurpleProtocol *
    ggp_protocol_new(void) {
    --- a/libpurple/protocols/irc/irc.c Fri Nov 11 18:57:54 2022 -0600
    +++ b/libpurple/protocols/irc/irc.c Fri Nov 11 19:39:24 2022 -0600
    @@ -1161,28 +1161,24 @@
    }
    G_DEFINE_DYNAMIC_TYPE_EXTENDED(
    - IRCProtocol, irc_protocol, PURPLE_TYPE_PROTOCOL, 0,
    -
    - G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_ACTIONS,
    - irc_protocol_actions_iface_init)
    -
    - G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_CLIENT,
    - irc_protocol_client_iface_init)
    -
    - G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_SERVER,
    - irc_protocol_server_iface_init)
    -
    - G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_IM,
    - irc_protocol_im_iface_init)
    -
    - G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_CHAT,
    - irc_protocol_chat_iface_init)
    -
    - G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_ROOMLIST,
    - irc_protocol_roomlist_iface_init)
    -
    - G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_XFER,
    - irc_protocol_xfer_iface_init));
    + IRCProtocol,
    + irc_protocol,
    + PURPLE_TYPE_PROTOCOL,
    + G_TYPE_FLAG_FINAL,
    + G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_ACTIONS,
    + irc_protocol_actions_iface_init)
    + G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_CLIENT,
    + irc_protocol_client_iface_init)
    + G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_SERVER,
    + irc_protocol_server_iface_init)
    + G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_IM,
    + irc_protocol_im_iface_init)
    + G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_CHAT,
    + irc_protocol_chat_iface_init)
    + G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_ROOMLIST,
    + irc_protocol_roomlist_iface_init)
    + G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_XFER,
    + irc_protocol_xfer_iface_init))
    static PurpleProtocol *
    irc_protocol_new(void) {
    --- a/libpurple/protocols/jabber/jabber.c Fri Nov 11 18:57:54 2022 -0600
    +++ b/libpurple/protocols/jabber/jabber.c Fri Nov 11 19:39:24 2022 -0600
    @@ -3566,35 +3566,28 @@
    }
    G_DEFINE_DYNAMIC_TYPE_EXTENDED(
    - JabberProtocol, jabber_protocol, PURPLE_TYPE_PROTOCOL,
    - G_TYPE_FLAG_ABSTRACT,
    -
    - G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_ACTIONS,
    - xmpp_protocol_actions_iface_init)
    -
    - G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_CLIENT,
    - jabber_protocol_client_iface_init)
    -
    - G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_SERVER,
    - jabber_protocol_server_iface_init)
    -
    - G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_IM,
    - jabber_protocol_im_iface_init)
    -
    - G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_CHAT,
    - jabber_protocol_chat_iface_init)
    -
    - G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_PRIVACY,
    - jabber_protocol_privacy_iface_init)
    -
    - G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_ROOMLIST,
    - jabber_protocol_roomlist_iface_init)
    -
    - G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_MEDIA,
    - jabber_protocol_media_iface_init)
    -
    - G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_XFER,
    - jabber_protocol_xfer_iface_init));
    + JabberProtocol,
    + jabber_protocol,
    + PURPLE_TYPE_PROTOCOL,
    + G_TYPE_FLAG_ABSTRACT,
    + G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_ACTIONS,
    + xmpp_protocol_actions_iface_init)
    + G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_CLIENT,
    + jabber_protocol_client_iface_init)
    + G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_SERVER,
    + jabber_protocol_server_iface_init)
    + G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_IM,
    + jabber_protocol_im_iface_init)
    + G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_CHAT,
    + jabber_protocol_chat_iface_init)
    + G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_PRIVACY,
    + jabber_protocol_privacy_iface_init)
    + G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_ROOMLIST,
    + jabber_protocol_roomlist_iface_init)
    + G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_MEDIA,
    + jabber_protocol_media_iface_init)
    + G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_XFER,
    + jabber_protocol_xfer_iface_init))
    static GPluginPluginInfo *
    jabber_query(GError **error)
    --- a/libpurple/protocols/novell/novell.c Fri Nov 11 18:57:54 2022 -0600
    +++ b/libpurple/protocols/novell/novell.c Fri Nov 11 19:39:24 2022 -0600
    @@ -3606,22 +3606,20 @@
    }
    G_DEFINE_DYNAMIC_TYPE_EXTENDED(
    - NovellProtocol, novell_protocol, PURPLE_TYPE_PROTOCOL, 0,
    -
    - G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_CLIENT,
    - novell_protocol_client_iface_init)
    -
    - G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_SERVER,
    - novell_protocol_server_iface_init)
    -
    - G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_IM,
    - novell_protocol_im_iface_init)
    -
    - G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_CHAT,
    - novell_protocol_chat_iface_init)
    -
    - G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_PRIVACY,
    - novell_protocol_privacy_iface_init));
    + NovellProtocol,
    + novell_protocol,
    + PURPLE_TYPE_PROTOCOL,
    + G_TYPE_FLAG_FINAL,
    + G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_CLIENT,
    + novell_protocol_client_iface_init)
    + G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_SERVER,
    + novell_protocol_server_iface_init)
    + G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_IM,
    + novell_protocol_im_iface_init)
    + G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_CHAT,
    + novell_protocol_chat_iface_init)
    + G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_PRIVACY,
    + novell_protocol_privacy_iface_init))
    static PurpleProtocol *
    novell_protocol_new(void) {
    --- a/libpurple/protocols/sametime/sametime.c Fri Nov 11 18:57:54 2022 -0600
    +++ b/libpurple/protocols/sametime/sametime.c Fri Nov 11 19:39:24 2022 -0600
    @@ -5434,28 +5434,24 @@
    }
    G_DEFINE_DYNAMIC_TYPE_EXTENDED(
    - mwProtocol, mw_protocol, PURPLE_TYPE_PROTOCOL, 0,
    -
    - G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_ACTIONS,
    - mw_protocol_actions_iface_init)
    -
    - G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_CLIENT,
    - mw_protocol_client_iface_init)
    -
    - G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_SERVER,
    - mw_protocol_server_iface_init)
    -
    - G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_IM,
    - mw_protocol_im_iface_init)
    -
    - G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_CHAT,
    - mw_protocol_chat_iface_init)
    -
    - G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_PRIVACY,
    - mw_protocol_privacy_iface_init)
    -
    - G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_XFER,
    - mw_protocol_xfer_iface_init));
    + mwProtocol,
    + mw_protocol,
    + PURPLE_TYPE_PROTOCOL,
    + G_TYPE_FLAG_FINAL,
    + G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_ACTIONS,
    + mw_protocol_actions_iface_init)
    + G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_CLIENT,
    + mw_protocol_client_iface_init)
    + G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_SERVER,
    + mw_protocol_server_iface_init)
    + G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_IM,
    + mw_protocol_im_iface_init)
    + G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_CHAT,
    + mw_protocol_chat_iface_init)
    + G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_PRIVACY,
    + mw_protocol_privacy_iface_init)
    + G_IMPLEMENT_INTERFACE_DYNAMIC(PURPLE_TYPE_PROTOCOL_XFER,
    + mw_protocol_xfer_iface_init))
    static PurpleProtocol *
    mw_protocol_new(void) {