grim/pidgin

Rename *Iface to more standard names.

2019-08-06, Elliott Sales de Andrade
4a5ba806d8c9
Parents 19d876c43cf4
Children a0e894209b3e
Rename *Iface to more standard names.

Just a simple sed of `s/Iface/Interface/g`.
23 files changed, 139 insertions(+), 139 deletions(-)
  • +1 -1
    libpurple/conversation.h
  • +1 -1
    libpurple/media.c
  • +2 -2
    libpurple/media/backend-fs2.c
  • +4 -4
    libpurple/media/backend-iface.c
  • +4 -4
    libpurple/media/backend-iface.h
  • +32 -32
    libpurple/protocol.c
  • +32 -32
    libpurple/protocol.h
  • +1 -1
    libpurple/protocols.h
  • +3 -3
    libpurple/protocols/bonjour/bonjour.c
  • +5 -5
    libpurple/protocols/facebook/facebook.c
  • +6 -6
    libpurple/protocols/gg/gg.c
  • +5 -5
    libpurple/protocols/irc/irc.c
  • +1 -1
    libpurple/protocols/jabber/gtalk.c
  • +7 -7
    libpurple/protocols/jabber/jabber.c
  • +5 -5
    libpurple/protocols/novell/novell.c
  • +6 -6
    libpurple/protocols/null/nullprpl.c
  • +2 -2
    libpurple/protocols/oscar/aim.c
  • +1 -1
    libpurple/protocols/oscar/icq.c
  • +5 -5
    libpurple/protocols/oscar/oscar.c
  • +5 -5
    libpurple/protocols/sametime/sametime.c
  • +5 -5
    libpurple/protocols/silc/silc.c
  • +2 -2
    libpurple/protocols/simple/simple.c
  • +4 -4
    libpurple/protocols/zephyr/zephyr.c
    • --- a/libpurple/conversation.h Tue Aug 06 04:51:53 2019 +0000
    +++ b/libpurple/conversation.h Tue Aug 06 17:40:37 2019 -0400
    @@ -646,7 +646,7 @@
    *
    * Gets the maximum message size in bytes for the conversation.
    *
    - * See #PurpleProtocolClientIface's <literal>get_max_message_size</literal>.
    + * See #PurpleProtocolClientInterface's <literal>get_max_message_size</literal>.
    *
    * Returns: Maximum message size, 0 if unspecified, -1 for infinite.
    */
    --- a/libpurple/media.c Tue Aug 06 04:51:53 2019 +0000
    +++ b/libpurple/media.c Tue Aug 06 17:40:37 2019 -0400
    @@ -1424,7 +1424,7 @@
    gchar dtmf, guint8 volume, guint16 duration)
    {
    #ifdef USE_VV
    - PurpleMediaBackendIface *backend_iface = NULL;
    + PurpleMediaBackendInterface *backend_iface = NULL;
    if (media)
    {
    --- a/libpurple/media/backend-fs2.c Tue Aug 06 04:51:53 2019 +0000
    +++ b/libpurple/media/backend-fs2.c Tue Aug 06 17:40:37 2019 -0400
    @@ -44,7 +44,7 @@
    /** @copydoc _PurpleMediaBackendFs2Stream */
    typedef struct _PurpleMediaBackendFs2Stream PurpleMediaBackendFs2Stream;
    -static void purple_media_backend_iface_init(PurpleMediaBackendIface *iface);
    +static void purple_media_backend_iface_init(PurpleMediaBackendInterface *iface);
    static gboolean
    gst_bus_cb(GstBus *bus, GstMessage *msg, PurpleMediaBackendFs2 *self);
    @@ -510,7 +510,7 @@
    }
    static void
    -purple_media_backend_iface_init(PurpleMediaBackendIface *iface)
    +purple_media_backend_iface_init(PurpleMediaBackendInterface *iface)
    {
    iface->add_stream = purple_media_backend_fs2_add_stream;
    iface->add_remote_candidates =
    --- a/libpurple/media/backend-iface.c Tue Aug 06 04:51:53 2019 +0000
    +++ b/libpurple/media/backend-iface.c Tue Aug 06 17:40:37 2019 -0400
    @@ -101,7 +101,7 @@
    static GType iface_type = 0;
    if (iface_type == 0) {
    static const GTypeInfo info = {
    - sizeof(PurpleMediaBackendIface),
    + sizeof(PurpleMediaBackendInterface),
    purple_media_backend_base_init,
    NULL,
    NULL,
    @@ -195,7 +195,7 @@
    const gchar *sess_id, const gchar *cipher,
    const gchar *auth, const gchar *key, gsize key_len)
    {
    - PurpleMediaBackendIface *backend_iface;
    + PurpleMediaBackendInterface *backend_iface;
    g_return_val_if_fail(PURPLE_IS_MEDIA_BACKEND(self), FALSE);
    backend_iface = PURPLE_MEDIA_BACKEND_GET_INTERFACE(self);
    @@ -210,7 +210,7 @@
    const gchar *cipher, const gchar *auth,
    const gchar *key, gsize key_len)
    {
    - PurpleMediaBackendIface *backend_iface;
    + PurpleMediaBackendInterface *backend_iface;
    g_return_val_if_fail(PURPLE_IS_MEDIA_BACKEND(self), FALSE);
    backend_iface = PURPLE_MEDIA_BACKEND_GET_INTERFACE(self);
    @@ -240,7 +240,7 @@
    purple_media_backend_set_send_rtcp_mux(PurpleMediaBackend *self,
    const gchar *sess_id, const gchar *participant, gboolean send_rtcp_mux)
    {
    - PurpleMediaBackendIface *backend_iface;
    + PurpleMediaBackendInterface *backend_iface;
    g_return_val_if_fail(PURPLE_IS_MEDIA_BACKEND(self), FALSE);
    backend_iface = PURPLE_MEDIA_BACKEND_GET_INTERFACE(self);
    --- a/libpurple/media/backend-iface.h Tue Aug 06 04:51:53 2019 +0000
    +++ b/libpurple/media/backend-iface.h Tue Aug 06 17:40:37 2019 -0400
    @@ -38,7 +38,7 @@
    #define PURPLE_TYPE_MEDIA_BACKEND (purple_media_backend_get_type())
    #define PURPLE_IS_MEDIA_BACKEND(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), PURPLE_TYPE_MEDIA_BACKEND))
    #define PURPLE_MEDIA_BACKEND(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), PURPLE_TYPE_MEDIA_BACKEND, PurpleMediaBackend))
    -#define PURPLE_MEDIA_BACKEND_GET_INTERFACE(inst)(G_TYPE_INSTANCE_GET_INTERFACE((inst), PURPLE_TYPE_MEDIA_BACKEND, PurpleMediaBackendIface))
    +#define PURPLE_MEDIA_BACKEND_GET_INTERFACE(inst)(G_TYPE_INSTANCE_GET_INTERFACE((inst), PURPLE_TYPE_MEDIA_BACKEND, PurpleMediaBackendInterface))
    /**
    * PurpleMediaBackend:
    @@ -48,13 +48,13 @@
    typedef struct _PurpleMediaBackend PurpleMediaBackend;
    /**
    - * PurpleMediaBackendIface:
    + * PurpleMediaBackendInterface:
    *
    * A structure to derive media backends from.
    */
    -typedef struct _PurpleMediaBackendIface PurpleMediaBackendIface;
    +typedef struct _PurpleMediaBackendInterface PurpleMediaBackendInterface;
    -struct _PurpleMediaBackendIface
    +struct _PurpleMediaBackendInterface
    {
    /*< private >*/
    GTypeInterface parent_iface; /* The parent iface class */
    --- a/libpurple/protocol.c Tue Aug 06 04:51:53 2019 +0000
    +++ b/libpurple/protocol.c Tue Aug 06 17:40:37 2019 -0400
    @@ -255,13 +255,13 @@
    * Protocol Client Interface API
    **************************************************************************/
    #define DEFINE_PROTOCOL_FUNC(protocol,funcname,...) \
    - PurpleProtocolClientIface *client_iface = \
    + PurpleProtocolClientInterface *client_iface = \
    PURPLE_PROTOCOL_GET_CLIENT_IFACE(protocol); \
    if (client_iface && client_iface->funcname) \
    client_iface->funcname(__VA_ARGS__);
    #define DEFINE_PROTOCOL_FUNC_WITH_RETURN(protocol,defaultreturn,funcname,...) \
    - PurpleProtocolClientIface *client_iface = \
    + PurpleProtocolClientInterface *client_iface = \
    PURPLE_PROTOCOL_GET_CLIENT_IFACE(protocol); \
    if (client_iface && client_iface->funcname) \
    return client_iface->funcname(__VA_ARGS__); \
    @@ -275,11 +275,11 @@
    if (G_UNLIKELY(type == 0)) {
    static const GTypeInfo info = {
    - .class_size = sizeof(PurpleProtocolClientIface),
    + .class_size = sizeof(PurpleProtocolClientInterface),
    };
    type = g_type_register_static(G_TYPE_INTERFACE,
    - "PurpleProtocolClientIface", &info, 0);
    + "PurpleProtocolClientInterface", &info, 0);
    }
    return type;
    }
    @@ -384,13 +384,13 @@
    * Protocol Server Interface API
    **************************************************************************/
    #define DEFINE_PROTOCOL_FUNC(protocol,funcname,...) \
    - PurpleProtocolServerIface *server_iface = \
    + PurpleProtocolServerInterface *server_iface = \
    PURPLE_PROTOCOL_GET_SERVER_IFACE(protocol); \
    if (server_iface && server_iface->funcname) \
    server_iface->funcname(__VA_ARGS__);
    #define DEFINE_PROTOCOL_FUNC_WITH_RETURN(protocol,defaultreturn,funcname,...) \
    - PurpleProtocolServerIface *server_iface = \
    + PurpleProtocolServerInterface *server_iface = \
    PURPLE_PROTOCOL_GET_SERVER_IFACE(protocol); \
    if (server_iface && server_iface->funcname) \
    return server_iface->funcname(__VA_ARGS__); \
    @@ -404,11 +404,11 @@
    if (G_UNLIKELY(type == 0)) {
    static const GTypeInfo info = {
    - .class_size = sizeof(PurpleProtocolServerIface),
    + .class_size = sizeof(PurpleProtocolServerInterface),
    };
    type = g_type_register_static(G_TYPE_INTERFACE,
    - "PurpleProtocolServerIface", &info, 0);
    + "PurpleProtocolServerInterface", &info, 0);
    }
    return type;
    }
    @@ -577,13 +577,13 @@
    * Protocol IM Interface API
    **************************************************************************/
    #define DEFINE_PROTOCOL_FUNC(protocol,funcname,...) \
    - PurpleProtocolIMIface *im_iface = \
    + PurpleProtocolIMInterface *im_iface = \
    PURPLE_PROTOCOL_GET_IM_IFACE(protocol); \
    if (im_iface && im_iface->funcname) \
    im_iface->funcname(__VA_ARGS__);
    #define DEFINE_PROTOCOL_FUNC_WITH_RETURN(protocol,defaultreturn,funcname,...) \
    - PurpleProtocolIMIface *im_iface = \
    + PurpleProtocolIMInterface *im_iface = \
    PURPLE_PROTOCOL_GET_IM_IFACE(protocol); \
    if (im_iface && im_iface->funcname) \
    return im_iface->funcname(__VA_ARGS__); \
    @@ -597,11 +597,11 @@
    if (G_UNLIKELY(type == 0)) {
    static const GTypeInfo info = {
    - .class_size = sizeof(PurpleProtocolIMIface),
    + .class_size = sizeof(PurpleProtocolIMInterface),
    };
    type = g_type_register_static(G_TYPE_INTERFACE,
    - "PurpleProtocolIMIface", &info, 0);
    + "PurpleProtocolIMInterface", &info, 0);
    }
    return type;
    }
    @@ -627,13 +627,13 @@
    * Protocol Chat Interface API
    **************************************************************************/
    #define DEFINE_PROTOCOL_FUNC(protocol,funcname,...) \
    - PurpleProtocolChatIface *chat_iface = \
    + PurpleProtocolChatInterface *chat_iface = \
    PURPLE_PROTOCOL_GET_CHAT_IFACE(protocol); \
    if (chat_iface && chat_iface->funcname) \
    chat_iface->funcname(__VA_ARGS__);
    #define DEFINE_PROTOCOL_FUNC_WITH_RETURN(protocol,defaultreturn,funcname,...) \
    - PurpleProtocolChatIface *chat_iface = \
    + PurpleProtocolChatInterface *chat_iface = \
    PURPLE_PROTOCOL_GET_CHAT_IFACE(protocol); \
    if (chat_iface && chat_iface->funcname) \
    return chat_iface->funcname(__VA_ARGS__); \
    @@ -647,11 +647,11 @@
    if (G_UNLIKELY(type == 0)) {
    static const GTypeInfo info = {
    - .class_size = sizeof(PurpleProtocolChatIface),
    + .class_size = sizeof(PurpleProtocolChatInterface),
    };
    type = g_type_register_static(G_TYPE_INTERFACE,
    - "PurpleProtocolChatIface", &info, 0);
    + "PurpleProtocolChatInterface", &info, 0);
    }
    return type;
    }
    @@ -734,13 +734,13 @@
    * Protocol Privacy Interface API
    **************************************************************************/
    #define DEFINE_PROTOCOL_FUNC(protocol,funcname,...) \
    - PurpleProtocolPrivacyIface *privacy_iface = \
    + PurpleProtocolPrivacyInterface *privacy_iface = \
    PURPLE_PROTOCOL_GET_PRIVACY_IFACE(protocol); \
    if (privacy_iface && privacy_iface->funcname) \
    privacy_iface->funcname(__VA_ARGS__);
    #define DEFINE_PROTOCOL_FUNC_WITH_RETURN(protocol,defaultreturn,funcname,...) \
    - PurpleProtocolPrivacyIface *privacy_iface = \
    + PurpleProtocolPrivacyInterface *privacy_iface = \
    PURPLE_PROTOCOL_GET_PRIVACY_IFACE(protocol); \
    if (privacy_iface && privacy_iface->funcname) \
    return privacy_iface->funcname(__VA_ARGS__); \
    @@ -754,11 +754,11 @@
    if (G_UNLIKELY(type == 0)) {
    static const GTypeInfo info = {
    - .class_size = sizeof(PurpleProtocolPrivacyIface),
    + .class_size = sizeof(PurpleProtocolPrivacyInterface),
    };
    type = g_type_register_static(G_TYPE_INTERFACE,
    - "PurpleProtocolPrivacyIface", &info, 0);
    + "PurpleProtocolPrivacyInterface", &info, 0);
    }
    return type;
    }
    @@ -805,13 +805,13 @@
    * Protocol Roomlist Interface API
    **************************************************************************/
    #define DEFINE_PROTOCOL_FUNC(protocol,funcname,...) \
    - PurpleProtocolRoomlistIface *roomlist_iface = \
    + PurpleProtocolRoomlistInterface *roomlist_iface = \
    PURPLE_PROTOCOL_GET_ROOMLIST_IFACE(protocol); \
    if (roomlist_iface && roomlist_iface->funcname) \
    roomlist_iface->funcname(__VA_ARGS__);
    #define DEFINE_PROTOCOL_FUNC_WITH_RETURN(protocol,defaultreturn,funcname,...) \
    - PurpleProtocolRoomlistIface *roomlist_iface = \
    + PurpleProtocolRoomlistInterface *roomlist_iface = \
    PURPLE_PROTOCOL_GET_ROOMLIST_IFACE(protocol); \
    if (roomlist_iface && roomlist_iface->funcname) \
    return roomlist_iface->funcname(__VA_ARGS__); \
    @@ -825,11 +825,11 @@
    if (G_UNLIKELY(type == 0)) {
    static const GTypeInfo info = {
    - .class_size = sizeof(PurpleProtocolRoomlistIface),
    + .class_size = sizeof(PurpleProtocolRoomlistInterface),
    };
    type = g_type_register_static(G_TYPE_INTERFACE,
    - "PurpleProtocolRoomlistIface", &info, 0);
    + "PurpleProtocolRoomlistInterface", &info, 0);
    }
    return type;
    }
    @@ -869,13 +869,13 @@
    * Protocol Media Interface API
    **************************************************************************/
    #define DEFINE_PROTOCOL_FUNC(protocol,funcname,...) \
    - PurpleProtocolMediaIface *media_iface = \
    + PurpleProtocolMediaInterface *media_iface = \
    PURPLE_PROTOCOL_GET_MEDIA_IFACE(protocol); \
    if (media_iface && media_iface->funcname) \
    media_iface->funcname(__VA_ARGS__);
    #define DEFINE_PROTOCOL_FUNC_WITH_RETURN(protocol,defaultreturn,funcname,...) \
    - PurpleProtocolMediaIface *media_iface = \
    + PurpleProtocolMediaInterface *media_iface = \
    PURPLE_PROTOCOL_GET_MEDIA_IFACE(protocol); \
    if (media_iface && media_iface->funcname) \
    return media_iface->funcname(__VA_ARGS__); \
    @@ -889,11 +889,11 @@
    if (G_UNLIKELY(type == 0)) {
    static const GTypeInfo info = {
    - .class_size = sizeof(PurpleProtocolMediaIface),
    + .class_size = sizeof(PurpleProtocolMediaInterface),
    };
    type = g_type_register_static(G_TYPE_INTERFACE,
    - "PurpleProtocolMediaIface", &info, 0);
    + "PurpleProtocolMediaInterface", &info, 0);
    }
    return type;
    }
    @@ -927,13 +927,13 @@
    * Protocol Factory Interface API
    **************************************************************************/
    #define DEFINE_PROTOCOL_FUNC(protocol,funcname,...) \
    - PurpleProtocolFactoryIface *factory_iface = \
    + PurpleProtocolFactoryInterface *factory_iface = \
    PURPLE_PROTOCOL_GET_FACTORY_IFACE(protocol); \
    if (factory_iface && factory_iface->funcname) \
    factory_iface->funcname(__VA_ARGS__);
    #define DEFINE_PROTOCOL_FUNC_WITH_RETURN(protocol,defaultreturn,funcname,...) \
    - PurpleProtocolFactoryIface *factory_iface = \
    + PurpleProtocolFactoryInterface *factory_iface = \
    PURPLE_PROTOCOL_GET_FACTORY_IFACE(protocol); \
    if (factory_iface && factory_iface->funcname) \
    return factory_iface->funcname(__VA_ARGS__); \
    @@ -947,11 +947,11 @@
    if (G_UNLIKELY(type == 0)) {
    static const GTypeInfo info = {
    - .class_size = sizeof(PurpleProtocolFactoryIface),
    + .class_size = sizeof(PurpleProtocolFactoryInterface),
    };
    type = g_type_register_static(G_TYPE_INTERFACE,
    - "PurpleProtocolFactoryIface", &info, 0);
    + "PurpleProtocolFactoryInterface", &info, 0);
    }
    return type;
    }
    --- a/libpurple/protocol.h Tue Aug 06 04:51:53 2019 +0000
    +++ b/libpurple/protocol.h Tue Aug 06 17:40:37 2019 -0400
    @@ -145,10 +145,10 @@
    #define PURPLE_TYPE_PROTOCOL_CLIENT_IFACE (purple_protocol_client_iface_get_type())
    -typedef struct _PurpleProtocolClientIface PurpleProtocolClientIface;
    +typedef struct _PurpleProtocolClientInterface PurpleProtocolClientInterface;
    /**
    - * PurpleProtocolClientIface:
    + * PurpleProtocolClientInterface:
    * @get_actions: Returns the actions the protocol can perform. These will
    * show up in the Accounts menu, under a submenu with the name
    * of the account.
    @@ -209,7 +209,7 @@
    *
    * This interface provides a gateway between purple and the protocol.
    */
    -struct _PurpleProtocolClientIface
    +struct _PurpleProtocolClientInterface
    {
    /*< private >*/
    GTypeInterface parent_iface;
    @@ -245,14 +245,14 @@
    #define PURPLE_PROTOCOL_HAS_CLIENT_IFACE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), PURPLE_TYPE_PROTOCOL_CLIENT_IFACE))
    #define PURPLE_PROTOCOL_GET_CLIENT_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE((obj), PURPLE_TYPE_PROTOCOL_CLIENT_IFACE, \
    - PurpleProtocolClientIface))
    + PurpleProtocolClientInterface))
    #define PURPLE_TYPE_PROTOCOL_SERVER_IFACE (purple_protocol_server_iface_get_type())
    -typedef struct _PurpleProtocolServerIface PurpleProtocolServerIface;
    +typedef struct _PurpleProtocolServerInterface PurpleProtocolServerInterface;
    /**
    - * PurpleProtocolServerIface:
    + * PurpleProtocolServerInterface:
    * @register_user: New user registration
    * @unregister_user: Remove the user from the server. The account can either be
    * connected or disconnected. After the removal is finished,
    @@ -320,7 +320,7 @@
    *
    * This interface provides a gateway between purple and the protocol's server.
    */
    -struct _PurpleProtocolServerIface
    +struct _PurpleProtocolServerInterface
    {
    /*< private >*/
    GTypeInterface parent_iface;
    @@ -383,14 +383,14 @@
    #define PURPLE_PROTOCOL_HAS_SERVER_IFACE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), PURPLE_TYPE_PROTOCOL_SERVER_IFACE))
    #define PURPLE_PROTOCOL_GET_SERVER_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE((obj), PURPLE_TYPE_PROTOCOL_SERVER_IFACE, \
    - PurpleProtocolServerIface))
    + PurpleProtocolServerInterface))
    #define PURPLE_TYPE_PROTOCOL_IM_IFACE (purple_protocol_im_iface_get_type())
    -typedef struct _PurpleProtocolIMIface PurpleProtocolIMIface;
    +typedef struct _PurpleProtocolIMInterface PurpleProtocolIMInterface;
    /**
    - * PurpleProtocolIMIface:
    + * PurpleProtocolIMInterface:
    * @send: This protocol function should return a positive value on
    * success. If the message is too big to be sent, return
    * <literal>-E2BIG</literal>. If the account is not connected,
    @@ -409,7 +409,7 @@
    *
    * This interface provides callbacks needed by protocols that implement IMs.
    */
    -struct _PurpleProtocolIMIface
    +struct _PurpleProtocolIMInterface
    {
    /*< private >*/
    GTypeInterface parent_iface;
    @@ -423,14 +423,14 @@
    #define PURPLE_PROTOCOL_HAS_IM_IFACE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), PURPLE_TYPE_PROTOCOL_IM_IFACE))
    #define PURPLE_PROTOCOL_GET_IM_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE((obj), PURPLE_TYPE_PROTOCOL_IM_IFACE, \
    - PurpleProtocolIMIface))
    + PurpleProtocolIMInterface))
    #define PURPLE_TYPE_PROTOCOL_CHAT_IFACE (purple_protocol_chat_iface_get_type())
    -typedef struct _PurpleProtocolChatIface PurpleProtocolChatIface;
    +typedef struct _PurpleProtocolChatInterface PurpleProtocolChatInterface;
    /**
    - * PurpleProtocolChatIface:
    + * PurpleProtocolChatInterface:
    * @info: Returns a list of #PurpleProtocolChatEntry structs, which represent
    * information required by the protocol to join a chat. libpurple will
    * call join_chat along with the information filled by the user.
    @@ -492,7 +492,7 @@
    *
    * This interface provides callbacks needed by protocols that implement chats.
    */
    -struct _PurpleProtocolChatIface
    +struct _PurpleProtocolChatInterface
    {
    /*< private >*/
    GTypeInterface parent_iface;
    @@ -522,14 +522,14 @@
    #define PURPLE_PROTOCOL_HAS_CHAT_IFACE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), PURPLE_TYPE_PROTOCOL_CHAT_IFACE))
    #define PURPLE_PROTOCOL_GET_CHAT_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE((obj), PURPLE_TYPE_PROTOCOL_CHAT_IFACE, \
    - PurpleProtocolChatIface))
    + PurpleProtocolChatInterface))
    #define PURPLE_TYPE_PROTOCOL_PRIVACY_IFACE (purple_protocol_privacy_iface_get_type())
    -typedef struct _PurpleProtocolPrivacyIface PurpleProtocolPrivacyIface;
    +typedef struct _PurpleProtocolPrivacyInterface PurpleProtocolPrivacyInterface;
    /**
    - * PurpleProtocolPrivacyIface:
    + * PurpleProtocolPrivacyInterface:
    * @add_permit: Add the buddy on the required authorized list.
    * @add_deny: Add the buddy on the required blocked list.
    * @rem_permit: Remove the buddy from the requried authorized list.
    @@ -540,7 +540,7 @@
    *
    * This interface provides privacy callbacks such as to permit/deny users.
    */
    -struct _PurpleProtocolPrivacyIface
    +struct _PurpleProtocolPrivacyInterface
    {
    /*< private >*/
    GTypeInterface parent_iface;
    @@ -559,20 +559,20 @@
    #define PURPLE_PROTOCOL_HAS_PRIVACY_IFACE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), PURPLE_TYPE_PROTOCOL_PRIVACY_IFACE))
    #define PURPLE_PROTOCOL_GET_PRIVACY_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE((obj), PURPLE_TYPE_PROTOCOL_PRIVACY_IFACE, \
    - PurpleProtocolPrivacyIface))
    + PurpleProtocolPrivacyInterface))
    #define PURPLE_TYPE_PROTOCOL_ROOMLIST_IFACE (purple_protocol_roomlist_iface_get_type())
    -typedef struct _PurpleProtocolRoomlistIface PurpleProtocolRoomlistIface;
    +typedef struct _PurpleProtocolRoomlistInterface PurpleProtocolRoomlistInterface;
    /**
    - * PurpleProtocolRoomlistIface:
    + * PurpleProtocolRoomlistInterface:
    *
    * The protocol roomlist interface.
    *
    * This interface provides callbacks for room listing.
    */
    -struct _PurpleProtocolRoomlistIface
    +struct _PurpleProtocolRoomlistInterface
    {
    /*< private >*/
    GTypeInterface parent_iface;
    @@ -591,14 +591,14 @@
    #define PURPLE_PROTOCOL_HAS_ROOMLIST_IFACE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), PURPLE_TYPE_PROTOCOL_ROOMLIST_IFACE))
    #define PURPLE_PROTOCOL_GET_ROOMLIST_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE((obj), PURPLE_TYPE_PROTOCOL_ROOMLIST_IFACE, \
    - PurpleProtocolRoomlistIface))
    + PurpleProtocolRoomlistInterface))
    #define PURPLE_TYPE_PROTOCOL_MEDIA_IFACE (purple_protocol_media_iface_get_type())
    -typedef struct _PurpleProtocolMediaIface PurpleProtocolMediaIface;
    +typedef struct _PurpleProtocolMediaInterface PurpleProtocolMediaInterface;
    /**
    - * PurpleProtocolMediaIface:
    + * PurpleProtocolMediaInterface:
    * @initiate_session: Initiate a media session with the given contact.
    * <sbr/>@account: The account to initiate the media session
    * on.
    @@ -620,7 +620,7 @@
    *
    * This interface provides callbacks for media sessions on the protocol.
    */
    -struct _PurpleProtocolMediaIface
    +struct _PurpleProtocolMediaInterface
    {
    /*< private >*/
    GTypeInterface parent_iface;
    @@ -638,14 +638,14 @@
    #define PURPLE_PROTOCOL_HAS_MEDIA_IFACE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), PURPLE_TYPE_PROTOCOL_MEDIA_IFACE))
    #define PURPLE_PROTOCOL_GET_MEDIA_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE((obj), PURPLE_TYPE_PROTOCOL_MEDIA_IFACE, \
    - PurpleProtocolMediaIface))
    + PurpleProtocolMediaInterface))
    #define PURPLE_TYPE_PROTOCOL_FACTORY_IFACE (purple_protocol_factory_iface_get_type())
    -typedef struct _PurpleProtocolFactoryIface PurpleProtocolFactoryIface;
    +typedef struct _PurpleProtocolFactoryInterface PurpleProtocolFactoryInterface;
    /**
    - * PurpleProtocolFactoryIface:
    + * PurpleProtocolFactoryInterface:
    * @connection_new: Creates a new protocol-specific connection object that
    * inherits #PurpleConnection.
    * @roomlist_new: Creates a new protocol-specific room list object that
    @@ -660,7 +660,7 @@
    * This interface provides callbacks for construction of protocol-specific
    * subclasses of some purple objects.
    */
    -struct _PurpleProtocolFactoryIface
    +struct _PurpleProtocolFactoryInterface
    {
    /*< private >*/
    GTypeInterface parent_iface;
    @@ -678,7 +678,7 @@
    #define PURPLE_PROTOCOL_HAS_FACTORY_IFACE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), PURPLE_TYPE_PROTOCOL_FACTORY_IFACE))
    #define PURPLE_PROTOCOL_GET_FACTORY_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE((obj), PURPLE_TYPE_PROTOCOL_FACTORY_IFACE, \
    - PurpleProtocolFactoryIface))
    + PurpleProtocolFactoryInterface))
    /**
    * PURPLE_PROTOCOL_IMPLEMENTS:
    --- a/libpurple/protocols.h Tue Aug 06 04:51:53 2019 +0000
    +++ b/libpurple/protocols.h Tue Aug 06 17:40:37 2019 -0400
    @@ -370,7 +370,7 @@
    *
    * Gets the safe maximum message size in bytes for the protocol.
    *
    - * See #PurpleProtocolClientIface's <literal>get_max_message_size</literal>.
    + * See #PurpleProtocolClientInterface's <literal>get_max_message_size</literal>.
    *
    * Returns: Maximum message size, 0 if unspecified, -1 for infinite.
    */
    --- a/libpurple/protocols/bonjour/bonjour.c Tue Aug 06 04:51:53 2019 +0000
    +++ b/libpurple/protocols/bonjour/bonjour.c Tue Aug 06 17:40:37 2019 -0400
    @@ -671,7 +671,7 @@
    }
    static void
    -bonjour_protocol_client_iface_init(PurpleProtocolClientIface *client_iface)
    +bonjour_protocol_client_iface_init(PurpleProtocolClientInterface *client_iface)
    {
    client_iface->status_text = bonjour_status_text;
    client_iface->tooltip_text = bonjour_tooltip_text;
    @@ -680,7 +680,7 @@
    }
    static void
    -bonjour_protocol_server_iface_init(PurpleProtocolServerIface *server_iface)
    +bonjour_protocol_server_iface_init(PurpleProtocolServerInterface *server_iface)
    {
    server_iface->add_buddy = bonjour_fake_add_buddy;
    server_iface->remove_buddy = bonjour_remove_buddy;
    @@ -691,7 +691,7 @@
    }
    static void
    -bonjour_protocol_im_iface_init(PurpleProtocolIMIface *im_iface)
    +bonjour_protocol_im_iface_init(PurpleProtocolIMInterface *im_iface)
    {
    im_iface->send = bonjour_send_im;
    }
    --- a/libpurple/protocols/facebook/facebook.c Tue Aug 06 04:51:53 2019 +0000
    +++ b/libpurple/protocols/facebook/facebook.c Tue Aug 06 17:40:37 2019 -0400
    @@ -1582,7 +1582,7 @@
    }
    static void
    -facebook_protocol_client_iface_init(PurpleProtocolClientIface *iface)
    +facebook_protocol_client_iface_init(PurpleProtocolClientInterface *iface)
    {
    iface->tooltip_text = fb_client_tooltip_text;
    iface->blist_node_menu = fb_client_blist_node_menu;
    @@ -1590,20 +1590,20 @@
    }
    static void
    -facebook_protocol_server_iface_init(PurpleProtocolServerIface *iface)
    +facebook_protocol_server_iface_init(PurpleProtocolServerInterface *iface)
    {
    iface->set_status = fb_server_set_status;
    }
    static void
    -facebook_protocol_im_iface_init(PurpleProtocolIMIface *iface)
    +facebook_protocol_im_iface_init(PurpleProtocolIMInterface *iface)
    {
    iface->send = fb_im_send;
    iface->send_typing = fb_im_send_typing;
    }
    static void
    -facebook_protocol_chat_iface_init(PurpleProtocolChatIface *iface)
    +facebook_protocol_chat_iface_init(PurpleProtocolChatInterface *iface)
    {
    iface->info = fb_chat_info;
    iface->info_defaults = fb_chat_info_defaults;
    @@ -1615,7 +1615,7 @@
    }
    static void
    -facebook_protocol_roomlist_iface_init(PurpleProtocolRoomlistIface *iface)
    +facebook_protocol_roomlist_iface_init(PurpleProtocolRoomlistInterface *iface)
    {
    iface->get_list = fb_roomlist_get_list;
    iface->cancel = fb_roomlist_cancel;
    --- a/libpurple/protocols/gg/gg.c Tue Aug 06 04:51:53 2019 +0000
    +++ b/libpurple/protocols/gg/gg.c Tue Aug 06 17:40:37 2019 -0400
    @@ -1061,7 +1061,7 @@
    }
    static void
    -ggp_protocol_client_iface_init(PurpleProtocolClientIface *client_iface)
    +ggp_protocol_client_iface_init(PurpleProtocolClientInterface *client_iface)
    {
    client_iface->get_actions = ggp_get_actions;
    client_iface->list_emblem = ggp_list_emblem;
    @@ -1075,7 +1075,7 @@
    }
    static void
    -ggp_protocol_server_iface_init(PurpleProtocolServerIface *server_iface)
    +ggp_protocol_server_iface_init(PurpleProtocolServerInterface *server_iface)
    {
    server_iface->get_info = ggp_pubdir_get_info_protocol;
    server_iface->set_status = ggp_status_set_purplestatus;
    @@ -1089,14 +1089,14 @@
    }
    static void
    -ggp_protocol_im_iface_init(PurpleProtocolIMIface *im_iface)
    +ggp_protocol_im_iface_init(PurpleProtocolIMInterface *im_iface)
    {
    im_iface->send = ggp_message_send_im;
    im_iface->send_typing = ggp_send_typing;
    }
    static void
    -ggp_protocol_chat_iface_init(PurpleProtocolChatIface *chat_iface)
    +ggp_protocol_chat_iface_init(PurpleProtocolChatInterface *chat_iface)
    {
    chat_iface->info = ggp_chat_info;
    chat_iface->info_defaults = ggp_chat_info_defaults;
    @@ -1110,13 +1110,13 @@
    }
    static void
    -ggp_protocol_roomlist_iface_init(PurpleProtocolRoomlistIface *roomlist_iface)
    +ggp_protocol_roomlist_iface_init(PurpleProtocolRoomlistInterface *roomlist_iface)
    {
    roomlist_iface->get_list = ggp_chat_roomlist_get_list;
    }
    static void
    -ggp_protocol_privacy_iface_init(PurpleProtocolPrivacyIface *privacy_iface)
    +ggp_protocol_privacy_iface_init(PurpleProtocolPrivacyInterface *privacy_iface)
    {
    privacy_iface->add_deny = ggp_add_deny;
    privacy_iface->rem_deny = ggp_rem_deny;
    --- a/libpurple/protocols/irc/irc.c Tue Aug 06 04:51:53 2019 +0000
    +++ b/libpurple/protocols/irc/irc.c Tue Aug 06 17:40:37 2019 -0400
    @@ -1013,7 +1013,7 @@
    }
    static void
    -irc_protocol_client_iface_init(PurpleProtocolClientIface *client_iface)
    +irc_protocol_client_iface_init(PurpleProtocolClientInterface *client_iface)
    {
    client_iface->get_actions = irc_get_actions;
    client_iface->normalize = purple_normalize_nocase;
    @@ -1021,7 +1021,7 @@
    }
    static void
    -irc_protocol_server_iface_init(PurpleProtocolServerIface *server_iface)
    +irc_protocol_server_iface_init(PurpleProtocolServerInterface *server_iface)
    {
    server_iface->set_status = irc_set_status;
    server_iface->get_info = irc_get_info;
    @@ -1032,13 +1032,13 @@
    }
    static void
    -irc_protocol_im_iface_init(PurpleProtocolIMIface *im_iface)
    +irc_protocol_im_iface_init(PurpleProtocolIMInterface *im_iface)
    {
    im_iface->send = irc_im_send;
    }
    static void
    -irc_protocol_chat_iface_init(PurpleProtocolChatIface *chat_iface)
    +irc_protocol_chat_iface_init(PurpleProtocolChatInterface *chat_iface)
    {
    chat_iface->info = irc_chat_join_info;
    chat_iface->info_defaults = irc_chat_info_defaults;
    @@ -1051,7 +1051,7 @@
    }
    static void
    -irc_protocol_roomlist_iface_init(PurpleProtocolRoomlistIface *roomlist_iface)
    +irc_protocol_roomlist_iface_init(PurpleProtocolRoomlistInterface *roomlist_iface)
    {
    roomlist_iface->get_list = irc_roomlist_get_list;
    roomlist_iface->cancel = irc_roomlist_cancel;
    --- a/libpurple/protocols/jabber/gtalk.c Tue Aug 06 04:51:53 2019 +0000
    +++ b/libpurple/protocols/jabber/gtalk.c Tue Aug 06 17:40:37 2019 -0400
    @@ -110,7 +110,7 @@
    }
    static void
    -gtalk_protocol_server_iface_init(PurpleProtocolServerIface *server_iface)
    +gtalk_protocol_server_iface_init(PurpleProtocolServerInterface *server_iface)
    {
    /* disable xmpp functions not available for gtalk */
    server_iface->register_user = NULL;
    --- a/libpurple/protocols/jabber/jabber.c Tue Aug 06 04:51:53 2019 +0000
    +++ b/libpurple/protocols/jabber/jabber.c Tue Aug 06 17:40:37 2019 -0400
    @@ -4118,7 +4118,7 @@
    }
    static void
    -jabber_protocol_client_iface_init(PurpleProtocolClientIface *client_iface)
    +jabber_protocol_client_iface_init(PurpleProtocolClientInterface *client_iface)
    {
    client_iface->get_actions = jabber_get_actions;
    client_iface->list_emblem = jabber_list_emblem;
    @@ -4133,7 +4133,7 @@
    }
    static void
    -jabber_protocol_server_iface_init(PurpleProtocolServerIface *server_iface)
    +jabber_protocol_server_iface_init(PurpleProtocolServerInterface *server_iface)
    {
    server_iface->register_user = jabber_register_account;
    server_iface->unregister_user = jabber_unregister_account;
    @@ -4153,14 +4153,14 @@
    }
    static void
    -jabber_protocol_im_iface_init(PurpleProtocolIMIface *im_iface)
    +jabber_protocol_im_iface_init(PurpleProtocolIMInterface *im_iface)
    {
    im_iface->send = jabber_message_send_im;
    im_iface->send_typing = jabber_send_typing;
    }
    static void
    -jabber_protocol_chat_iface_init(PurpleProtocolChatIface *chat_iface)
    +jabber_protocol_chat_iface_init(PurpleProtocolChatInterface *chat_iface)
    {
    chat_iface->info = jabber_chat_info;
    chat_iface->info_defaults = jabber_chat_info_defaults;
    @@ -4174,14 +4174,14 @@
    }
    static void
    -jabber_protocol_privacy_iface_init(PurpleProtocolPrivacyIface *privacy_iface)
    +jabber_protocol_privacy_iface_init(PurpleProtocolPrivacyInterface *privacy_iface)
    {
    privacy_iface->add_deny = jabber_add_deny;
    privacy_iface->rem_deny = jabber_rem_deny;
    }
    static void
    -jabber_protocol_roomlist_iface_init(PurpleProtocolRoomlistIface *roomlist_iface)
    +jabber_protocol_roomlist_iface_init(PurpleProtocolRoomlistInterface *roomlist_iface)
    {
    roomlist_iface->get_list = jabber_roomlist_get_list;
    roomlist_iface->cancel = jabber_roomlist_cancel;
    @@ -4196,7 +4196,7 @@
    }
    static void
    -jabber_protocol_media_iface_init(PurpleProtocolMediaIface *media_iface)
    +jabber_protocol_media_iface_init(PurpleProtocolMediaInterface *media_iface)
    {
    media_iface->initiate_session = jabber_initiate_media;
    media_iface->get_caps = jabber_get_media_caps;
    --- a/libpurple/protocols/novell/novell.c Tue Aug 06 04:51:53 2019 +0000
    +++ b/libpurple/protocols/novell/novell.c Tue Aug 06 17:40:37 2019 -0400
    @@ -3512,7 +3512,7 @@
    }
    static void
    -novell_protocol_client_iface_init(PurpleProtocolClientIface *client_iface)
    +novell_protocol_client_iface_init(PurpleProtocolClientInterface *client_iface)
    {
    client_iface->status_text = novell_status_text;
    client_iface->tooltip_text = novell_tooltip_text;
    @@ -3523,7 +3523,7 @@
    }
    static void
    -novell_protocol_server_iface_init(PurpleProtocolServerIface *server_iface)
    +novell_protocol_server_iface_init(PurpleProtocolServerInterface *server_iface)
    {
    server_iface->get_info = novell_get_info;
    server_iface->set_status = novell_set_status;
    @@ -3538,14 +3538,14 @@
    }
    static void
    -novell_protocol_im_iface_init(PurpleProtocolIMIface *im_iface)
    +novell_protocol_im_iface_init(PurpleProtocolIMInterface *im_iface)
    {
    im_iface->send = novell_send_im;
    im_iface->send_typing = novell_send_typing;
    }
    static void
    -novell_protocol_chat_iface_init(PurpleProtocolChatIface *chat_iface)
    +novell_protocol_chat_iface_init(PurpleProtocolChatInterface *chat_iface)
    {
    chat_iface->invite = novell_chat_invite;
    chat_iface->leave = novell_chat_leave;
    @@ -3553,7 +3553,7 @@
    }
    static void
    -novell_protocol_privacy_iface_init(PurpleProtocolPrivacyIface *privacy_iface)
    +novell_protocol_privacy_iface_init(PurpleProtocolPrivacyInterface *privacy_iface)
    {
    privacy_iface->add_permit = novell_add_permit;
    privacy_iface->add_deny = novell_add_deny;
    --- a/libpurple/protocols/null/nullprpl.c Tue Aug 06 04:51:53 2019 +0000
    +++ b/libpurple/protocols/null/nullprpl.c Tue Aug 06 17:40:37 2019 -0400
    @@ -1033,7 +1033,7 @@
    }
    static void
    -null_protocol_client_iface_init(PurpleProtocolClientIface *client_iface)
    +null_protocol_client_iface_init(PurpleProtocolClientInterface *client_iface)
    {
    client_iface->get_actions = null_get_actions;
    client_iface->status_text = null_status_text;
    @@ -1045,7 +1045,7 @@
    }
    static void
    -null_protocol_server_iface_init(PurpleProtocolServerIface *server_iface)
    +null_protocol_server_iface_init(PurpleProtocolServerInterface *server_iface)
    {
    server_iface->register_user = null_register_user;
    server_iface->set_info = null_set_info;
    @@ -1065,14 +1065,14 @@
    }
    static void
    -null_protocol_im_iface_init(PurpleProtocolIMIface *im_iface)
    +null_protocol_im_iface_init(PurpleProtocolIMInterface *im_iface)
    {
    im_iface->send = null_send_im;
    im_iface->send_typing = null_send_typing;
    }
    static void
    -null_protocol_chat_iface_init(PurpleProtocolChatIface *chat_iface)
    +null_protocol_chat_iface_init(PurpleProtocolChatInterface *chat_iface)
    {
    chat_iface->info = null_chat_info;
    chat_iface->info_defaults = null_chat_info_defaults;
    @@ -1086,7 +1086,7 @@
    }
    static void
    -null_protocol_privacy_iface_init(PurpleProtocolPrivacyIface *privacy_iface)
    +null_protocol_privacy_iface_init(PurpleProtocolPrivacyInterface *privacy_iface)
    {
    privacy_iface->add_permit = null_add_permit;
    privacy_iface->add_deny = null_add_deny;
    @@ -1096,7 +1096,7 @@
    }
    static void
    -null_protocol_roomlist_iface_init(PurpleProtocolRoomlistIface *roomlist_iface)
    +null_protocol_roomlist_iface_init(PurpleProtocolRoomlistInterface *roomlist_iface)
    {
    roomlist_iface->get_list = null_roomlist_get_list;
    roomlist_iface->cancel = null_roomlist_cancel;
    --- a/libpurple/protocols/oscar/aim.c Tue Aug 06 04:51:53 2019 +0000
    +++ b/libpurple/protocols/oscar/aim.c Tue Aug 06 17:40:37 2019 -0400
    @@ -44,13 +44,13 @@
    }
    static void
    -aim_protocol_client_iface_init(PurpleProtocolClientIface *client_iface)
    +aim_protocol_client_iface_init(PurpleProtocolClientInterface *client_iface)
    {
    client_iface->get_max_message_size = oscar_get_max_message_size;
    }
    static void
    -aim_protocol_privacy_iface_init(PurpleProtocolPrivacyIface *privacy_iface)
    +aim_protocol_privacy_iface_init(PurpleProtocolPrivacyInterface *privacy_iface)
    {
    privacy_iface->add_permit = oscar_add_permit;
    privacy_iface->rem_permit = oscar_rem_permit;
    --- a/libpurple/protocols/oscar/icq.c Tue Aug 06 04:51:53 2019 +0000
    +++ b/libpurple/protocols/oscar/icq.c Tue Aug 06 17:40:37 2019 -0400
    @@ -60,7 +60,7 @@
    }
    static void
    -icq_protocol_client_iface_init(PurpleProtocolClientIface *client_iface)
    +icq_protocol_client_iface_init(PurpleProtocolClientInterface *client_iface)
    {
    client_iface->get_account_text_table = icq_get_account_text_table;
    client_iface->get_moods = oscar_get_purple_moods;
    --- a/libpurple/protocols/oscar/oscar.c Tue Aug 06 04:51:53 2019 +0000
    +++ b/libpurple/protocols/oscar/oscar.c Tue Aug 06 17:40:37 2019 -0400
    @@ -5696,7 +5696,7 @@
    }
    static void
    -oscar_protocol_client_iface_init(PurpleProtocolClientIface *client_iface)
    +oscar_protocol_client_iface_init(PurpleProtocolClientInterface *client_iface)
    {
    client_iface->get_actions = oscar_get_actions;
    client_iface->list_emblem = oscar_list_emblem;
    @@ -5709,7 +5709,7 @@
    }
    static void
    -oscar_protocol_server_iface_init(PurpleProtocolServerIface *server_iface)
    +oscar_protocol_server_iface_init(PurpleProtocolServerInterface *server_iface)
    {
    server_iface->set_info = oscar_set_info;
    server_iface->get_info = oscar_get_info;
    @@ -5727,14 +5727,14 @@
    }
    static void
    -oscar_protocol_im_iface_init(PurpleProtocolIMIface *im_iface)
    +oscar_protocol_im_iface_init(PurpleProtocolIMInterface *im_iface)
    {
    im_iface->send = oscar_send_im;
    im_iface->send_typing = oscar_send_typing;
    }
    static void
    -oscar_protocol_chat_iface_init(PurpleProtocolChatIface *chat_iface)
    +oscar_protocol_chat_iface_init(PurpleProtocolChatInterface *chat_iface)
    {
    chat_iface->info = oscar_chat_info;
    chat_iface->info_defaults = oscar_chat_info_defaults;
    @@ -5746,7 +5746,7 @@
    }
    static void
    -oscar_protocol_privacy_iface_init(PurpleProtocolPrivacyIface *privacy_iface)
    +oscar_protocol_privacy_iface_init(PurpleProtocolPrivacyInterface *privacy_iface)
    {
    privacy_iface->add_deny = oscar_add_deny;
    privacy_iface->rem_deny = oscar_rem_deny;
    --- a/libpurple/protocols/sametime/sametime.c Tue Aug 06 04:51:53 2019 +0000
    +++ b/libpurple/protocols/sametime/sametime.c Tue Aug 06 17:40:37 2019 -0400
    @@ -5260,7 +5260,7 @@
    static void
    -mw_protocol_client_iface_init(PurpleProtocolClientIface *client_iface)
    +mw_protocol_client_iface_init(PurpleProtocolClientInterface *client_iface)
    {
    client_iface->get_actions = mw_protocol_get_actions;
    client_iface->list_emblem = mw_protocol_list_emblem;
    @@ -5274,7 +5274,7 @@
    static void
    -mw_protocol_server_iface_init(PurpleProtocolServerIface *server_iface)
    +mw_protocol_server_iface_init(PurpleProtocolServerInterface *server_iface)
    {
    server_iface->get_info = mw_protocol_get_info;
    server_iface->set_status = mw_protocol_set_status;
    @@ -5291,7 +5291,7 @@
    static void
    -mw_protocol_im_iface_init(PurpleProtocolIMIface *im_iface)
    +mw_protocol_im_iface_init(PurpleProtocolIMInterface *im_iface)
    {
    im_iface->send = mw_protocol_send_im;
    im_iface->send_typing = mw_protocol_send_typing;
    @@ -5299,7 +5299,7 @@
    static void
    -mw_protocol_chat_iface_init(PurpleProtocolChatIface *chat_iface)
    +mw_protocol_chat_iface_init(PurpleProtocolChatInterface *chat_iface)
    {
    chat_iface->info = mw_protocol_chat_info;
    chat_iface->info_defaults = mw_protocol_chat_info_defaults;
    @@ -5313,7 +5313,7 @@
    static void
    -mw_protocol_privacy_iface_init(PurpleProtocolPrivacyIface *privacy_iface)
    +mw_protocol_privacy_iface_init(PurpleProtocolPrivacyInterface *privacy_iface)
    {
    privacy_iface->add_permit = mw_protocol_add_permit;
    privacy_iface->add_deny = mw_protocol_add_deny;
    --- a/libpurple/protocols/silc/silc.c Tue Aug 06 04:51:53 2019 +0000
    +++ b/libpurple/protocols/silc/silc.c Tue Aug 06 17:40:37 2019 -0400
    @@ -2204,7 +2204,7 @@
    }
    static void
    -silcpurple_protocol_client_iface_init(PurpleProtocolClientIface *client_iface)
    +silcpurple_protocol_client_iface_init(PurpleProtocolClientInterface *client_iface)
    {
    client_iface->get_actions = silcpurple_get_actions;
    client_iface->status_text = silcpurple_status_text;
    @@ -2213,7 +2213,7 @@
    }
    static void
    -silcpurple_protocol_server_iface_init(PurpleProtocolServerIface *server_iface)
    +silcpurple_protocol_server_iface_init(PurpleProtocolServerInterface *server_iface)
    {
    server_iface->set_info = silcpurple_set_info;
    server_iface->get_info = silcpurple_get_info;
    @@ -2227,13 +2227,13 @@
    }
    static void
    -silcpurple_protocol_im_iface_init(PurpleProtocolIMIface *im_iface)
    +silcpurple_protocol_im_iface_init(PurpleProtocolIMInterface *im_iface)
    {
    im_iface->send = silcpurple_send_im;
    }
    static void
    -silcpurple_protocol_chat_iface_init(PurpleProtocolChatIface *chat_iface)
    +silcpurple_protocol_chat_iface_init(PurpleProtocolChatInterface *chat_iface)
    {
    chat_iface->info = silcpurple_chat_info;
    chat_iface->info_defaults = silcpurple_chat_info_defaults;
    @@ -2246,7 +2246,7 @@
    }
    static void
    -silcpurple_protocol_roomlist_iface_init(PurpleProtocolRoomlistIface *roomlist_iface)
    +silcpurple_protocol_roomlist_iface_init(PurpleProtocolRoomlistInterface *roomlist_iface)
    {
    roomlist_iface->get_list = silcpurple_roomlist_get_list;
    roomlist_iface->cancel = silcpurple_roomlist_cancel;
    --- a/libpurple/protocols/simple/simple.c Tue Aug 06 04:51:53 2019 +0000
    +++ b/libpurple/protocols/simple/simple.c Tue Aug 06 17:40:37 2019 -0400
    @@ -2185,7 +2185,7 @@
    }
    static void
    -simple_protocol_server_iface_init(PurpleProtocolServerIface *server_iface)
    +simple_protocol_server_iface_init(PurpleProtocolServerInterface *server_iface)
    {
    server_iface->set_status = simple_set_status;
    server_iface->add_buddy = simple_add_buddy;
    @@ -2195,7 +2195,7 @@
    }
    static void
    -simple_protocol_im_iface_init(PurpleProtocolIMIface *im_iface)
    +simple_protocol_im_iface_init(PurpleProtocolIMInterface *im_iface)
    {
    im_iface->send = simple_im_send;
    im_iface->send_typing = simple_typing;
    --- a/libpurple/protocols/zephyr/zephyr.c Tue Aug 06 04:51:53 2019 +0000
    +++ b/libpurple/protocols/zephyr/zephyr.c Tue Aug 06 17:40:37 2019 -0400
    @@ -2961,7 +2961,7 @@
    static void
    -zephyr_protocol_client_iface_init(PurpleProtocolClientIface *client_iface)
    +zephyr_protocol_client_iface_init(PurpleProtocolClientInterface *client_iface)
    {
    client_iface->get_actions = zephyr_get_actions;
    client_iface->normalize = zephyr_normalize;
    @@ -2970,7 +2970,7 @@
    static void
    -zephyr_protocol_server_iface_init(PurpleProtocolServerIface *server_iface)
    +zephyr_protocol_server_iface_init(PurpleProtocolServerInterface *server_iface)
    {
    server_iface->get_info = zephyr_zloc;
    server_iface->set_status = zephyr_set_status;
    @@ -2981,7 +2981,7 @@
    static void
    -zephyr_protocol_im_iface_init(PurpleProtocolIMIface *im_iface)
    +zephyr_protocol_im_iface_init(PurpleProtocolIMInterface *im_iface)
    {
    im_iface->send = zephyr_send_im;
    im_iface->send_typing = zephyr_send_typing;
    @@ -2989,7 +2989,7 @@
    static void
    -zephyr_protocol_chat_iface_init(PurpleProtocolChatIface *chat_iface)
    +zephyr_protocol_chat_iface_init(PurpleProtocolChatInterface *chat_iface)
    {
    chat_iface->info = zephyr_chat_info;
    chat_iface->join = zephyr_join_chat;