--- a/libpurple/protocol.c Sat Aug 22 13:03:30 2020 -0500 +++ b/libpurple/protocol.c Sat Aug 22 22:15:25 2020 -0500 @@ -640,77 +640,6 @@ #undef DEFINE_PROTOCOL_FUNC /************************************************************************** - * Protocol Privacy Interface API - **************************************************************************/ -#define DEFINE_PROTOCOL_FUNC(protocol,funcname,...) \ - PurpleProtocolPrivacyInterface *privacy_iface = \ - PURPLE_PROTOCOL_PRIVACY_GET_IFACE(protocol); \ - if (privacy_iface && privacy_iface->funcname) \ - privacy_iface->funcname(__VA_ARGS__); - -#define DEFINE_PROTOCOL_FUNC_WITH_RETURN(protocol,defaultreturn,funcname,...) \ - PurpleProtocolPrivacyInterface *privacy_iface = \ - PURPLE_PROTOCOL_PRIVACY_GET_IFACE(protocol); \ - if (privacy_iface && privacy_iface->funcname) \ - return privacy_iface->funcname(__VA_ARGS__); \ - else \ - return defaultreturn; - -GType -purple_protocol_privacy_iface_get_type(void) -{ - static GType type = 0; - - if (G_UNLIKELY(type == 0)) { - static const GTypeInfo info = { - .class_size = sizeof(PurpleProtocolPrivacyInterface), - }; - - type = g_type_register_static(G_TYPE_INTERFACE, - "PurpleProtocolPrivacyInterface", &info, 0); - } - return type; -} - -void -purple_protocol_privacy_iface_add_permit(PurpleProtocol *protocol, - PurpleConnection *gc, const char *name) -{ - DEFINE_PROTOCOL_FUNC(protocol, add_permit, gc, name); -} - -void -purple_protocol_privacy_iface_add_deny(PurpleProtocol *protocol, - PurpleConnection *gc, const char *name) -{ - DEFINE_PROTOCOL_FUNC(protocol, add_deny, gc, name); -} - -void -purple_protocol_privacy_iface_rem_permit(PurpleProtocol *protocol, - PurpleConnection *gc, const char *name) -{ - DEFINE_PROTOCOL_FUNC(protocol, rem_permit, gc, name); -} - -void -purple_protocol_privacy_iface_rem_deny(PurpleProtocol *protocol, - PurpleConnection *gc, const char *name) -{ - DEFINE_PROTOCOL_FUNC(protocol, rem_deny, gc, name); -} - -void -purple_protocol_privacy_iface_set_permit_deny(PurpleProtocol *protocol, - PurpleConnection *gc) -{ - DEFINE_PROTOCOL_FUNC(protocol, set_permit_deny, gc); -} - -#undef DEFINE_PROTOCOL_FUNC_WITH_RETURN -#undef DEFINE_PROTOCOL_FUNC - -/************************************************************************** * Protocol Media Interface API **************************************************************************/ #define DEFINE_PROTOCOL_FUNC(protocol,funcname,...) \