Set the prereq type for all Protocol interfaces to PurpleProtocol
Testing Done:
Compiled and ran without an obvious issues.
Reviewed at https://reviews.imfreedom.org/r/888/
--- a/libpurple/purpleprotocolattention.c Thu Aug 12 01:04:21 2021 -0500
+++ b/libpurple/purpleprotocolattention.c Thu Aug 12 20:34:54 2021 -0500
@@ -23,7 +23,7 @@
#include "purpleprotocolattention.h"
G_DEFINE_INTERFACE(PurpleProtocolAttention, purple_protocol_attention,
/******************************************************************************
* GInterface Implementation
--- a/libpurple/purpleprotocolattention.h Thu Aug 12 01:04:21 2021 -0500
+++ b/libpurple/purpleprotocolattention.h Thu Aug 12 20:34:54 2021 -0500
@@ -40,8 +40,9 @@
* to support getting a contact's attention.
+#include <libpurple/account.h> +#include <libpurple/connection.h> +#include <libpurple/protocol.h> @@ -73,7 +74,7 @@
G_DECLARE_INTERFACE(PurpleProtocolAttention, purple_protocol_attention, PURPLE,
- PROTOCOL_ATTENTION, GObject)
+ PROTOCOL_ATTENTION, PurpleProtocol) * PurpleProtocolAttentionInterface:
--- a/libpurple/purpleprotocolchat.c Thu Aug 12 01:04:21 2021 -0500
+++ b/libpurple/purpleprotocolchat.c Thu Aug 12 20:34:54 2021 -0500
@@ -25,7 +25,8 @@
/******************************************************************************
*****************************************************************************/
-G_DEFINE_INTERFACE(PurpleProtocolChat, purple_protocol_chat, G_TYPE_INVALID)
+G_DEFINE_INTERFACE(PurpleProtocolChat, purple_protocol_chat, purple_protocol_chat_default_init(PurpleProtocolChatInterface *iface) {
--- a/libpurple/purpleprotocolchat.h Thu Aug 12 01:04:21 2021 -0500
+++ b/libpurple/purpleprotocolchat.h Thu Aug 12 20:34:54 2021 -0500
@@ -42,6 +42,7 @@
#include <libpurple/connection.h>
#include <libpurple/purplemessage.h>
+#include <libpurple/protocol.h> * PURPLE_TYPE_PROTOCOL_CHAT:
@@ -70,8 +71,8 @@
-G_DECLARE_INTERFACE(PurpleProtocolChat, purple_protocol_chat, PURPLE, PROTOCOL_CHAT,
+G_DECLARE_INTERFACE(PurpleProtocolChat, purple_protocol_chat, PURPLE, + PROTOCOL_CHAT, PurpleProtocol) --- a/libpurple/purpleprotocolclient.c Thu Aug 12 01:04:21 2021 -0500
+++ b/libpurple/purpleprotocolclient.c Thu Aug 12 20:34:54 2021 -0500
@@ -25,7 +25,8 @@
/******************************************************************************
*****************************************************************************/
-G_DEFINE_INTERFACE(PurpleProtocolClient, purple_protocol_client, G_TYPE_INVALID)
+G_DEFINE_INTERFACE(PurpleProtocolClient, purple_protocol_client, purple_protocol_client_default_init(PurpleProtocolClientInterface *iface) {
--- a/libpurple/purpleprotocolclient.h Thu Aug 12 01:04:21 2021 -0500
+++ b/libpurple/purpleprotocolclient.h Thu Aug 12 20:34:54 2021 -0500
@@ -42,10 +42,11 @@
#include <libpurple/account.h>
#include <libpurple/connection.h>
+#include <libpurple/protocol.h> #define PURPLE_TYPE_PROTOCOL_CLIENT (purple_protocol_client_get_type())
G_DECLARE_INTERFACE(PurpleProtocolClient, purple_protocol_client, PURPLE,
- PROTOCOL_CLIENT, GObject)
+ PROTOCOL_CLIENT, PurpleProtocol) * PURPLE_TYPE_PROTOCOL_CLIENT:
--- a/libpurple/purpleprotocolfactory.c Thu Aug 12 01:04:21 2021 -0500
+++ b/libpurple/purpleprotocolfactory.c Thu Aug 12 20:34:54 2021 -0500
@@ -22,7 +22,8 @@
#include "purpleprotocolfactory.h"
-G_DEFINE_INTERFACE(PurpleProtocolFactory, purple_protocol_factory, G_TYPE_INVALID);
+G_DEFINE_INTERFACE(PurpleProtocolFactory, purple_protocol_factory, /******************************************************************************
* GInterface Implementation
--- a/libpurple/purpleprotocolfactory.h Thu Aug 12 01:04:21 2021 -0500
+++ b/libpurple/purpleprotocolfactory.h Thu Aug 12 20:34:54 2021 -0500
@@ -53,7 +53,7 @@
#define PURPLE_TYPE_PROTOCOL_FACTORY (purple_protocol_factory_iface_get_type())
G_DECLARE_INTERFACE(PurpleProtocolFactory, purple_protocol_factory, PURPLE,
- PROTOCOL_FACTORY, GObject)
+ PROTOCOL_FACTORY, PurpleProtocol) --- a/libpurple/purpleprotocolim.c Thu Aug 12 01:04:21 2021 -0500
+++ b/libpurple/purpleprotocolim.c Thu Aug 12 20:34:54 2021 -0500
@@ -24,7 +24,7 @@
/******************************************************************************
*****************************************************************************/
-G_DEFINE_INTERFACE(PurpleProtocolIM, purple_protocol_im, G_TYPE_INVALID)
+G_DEFINE_INTERFACE(PurpleProtocolIM, purple_protocol_im, PURPLE_TYPE_PROTOCOL) purple_protocol_im_default_init(PurpleProtocolIMInterface *iface) {
--- a/libpurple/purpleprotocolim.h Thu Aug 12 01:04:21 2021 -0500
+++ b/libpurple/purpleprotocolim.h Thu Aug 12 20:34:54 2021 -0500
@@ -41,6 +41,7 @@
#include <libpurple/connection.h>
+#include <libpurple/protocol.h> * PURPLE_TYPE_PROTOCOL_IM:
@@ -70,7 +71,7 @@
G_DECLARE_INTERFACE(PurpleProtocolIM, purple_protocol_im, PURPLE, PROTOCOL_IM,
* PurpleProtocolIMInterface:
--- a/libpurple/purpleprotocolmedia.c Thu Aug 12 01:04:21 2021 -0500
+++ b/libpurple/purpleprotocolmedia.c Thu Aug 12 20:34:54 2021 -0500
@@ -24,7 +24,8 @@
/******************************************************************************
*****************************************************************************/
-G_DEFINE_INTERFACE(PurpleProtocolMedia, purple_protocol_media, G_TYPE_INVALID)
+G_DEFINE_INTERFACE(PurpleProtocolMedia, purple_protocol_media, purple_protocol_media_default_init(PurpleProtocolMediaInterface *iface) {
--- a/libpurple/purpleprotocolmedia.h Thu Aug 12 01:04:21 2021 -0500
+++ b/libpurple/purpleprotocolmedia.h Thu Aug 12 20:34:54 2021 -0500
@@ -42,10 +42,11 @@
#include <libpurple/account.h>
#include <libpurple/media.h>
+#include <libpurple/protocol.h> #define PURPLE_TYPE_PROTOCOL_MEDIA (purple_protocol_media_get_type())
G_DECLARE_INTERFACE(PurpleProtocolMedia, purple_protocol_media, PURPLE,
- PROTOCOL_MEDIA, GObject)
+ PROTOCOL_MEDIA, PurpleProtocol) --- a/libpurple/purpleprotocolprivacy.c Thu Aug 12 01:04:21 2021 -0500
+++ b/libpurple/purpleprotocolprivacy.c Thu Aug 12 20:34:54 2021 -0500
@@ -25,7 +25,7 @@
*****************************************************************************/
G_DEFINE_INTERFACE(PurpleProtocolPrivacy, purple_protocol_privacy,
purple_protocol_privacy_default_init(PurpleProtocolPrivacyInterface *iface) {
--- a/libpurple/purpleprotocolprivacy.h Thu Aug 12 01:04:21 2021 -0500
+++ b/libpurple/purpleprotocolprivacy.h Thu Aug 12 20:34:54 2021 -0500
@@ -40,6 +40,7 @@
#include <libpurple/connection.h>
+#include <libpurple/protocol.h> * PURPLE_TYPE_PROTOCOL_PRIVACY:
@@ -48,7 +49,7 @@
#define PURPLE_TYPE_PROTOCOL_PRIVACY (purple_protocol_privacy_get_type())
G_DECLARE_INTERFACE(PurpleProtocolPrivacy, purple_protocol_privacy, PURPLE,
- PROTOCOL_PRIVACY, GObject)
+ PROTOCOL_PRIVACY, PurpleProtocol) * PurpleProtocolPrivacyInterface:
--- a/libpurple/purpleprotocolserver.c Thu Aug 12 01:04:21 2021 -0500
+++ b/libpurple/purpleprotocolserver.c Thu Aug 12 20:34:54 2021 -0500
@@ -25,7 +25,8 @@
/******************************************************************************
*****************************************************************************/
-G_DEFINE_INTERFACE(PurpleProtocolServer, purple_protocol_server, G_TYPE_INVALID)
+G_DEFINE_INTERFACE(PurpleProtocolServer, purple_protocol_server, purple_protocol_server_default_init(PurpleProtocolServerInterface *iface) {
--- a/libpurple/purpleprotocolserver.h Thu Aug 12 01:04:21 2021 -0500
+++ b/libpurple/purpleprotocolserver.h Thu Aug 12 20:34:54 2021 -0500
@@ -44,11 +44,12 @@
#include <libpurple/buddy.h>
#include <libpurple/connection.h>
#include <libpurple/group.h>
+#include <libpurple/protocol.h> #include <libpurple/purplemessage.h>
#define PURPLE_TYPE_PROTOCOL_SERVER (purple_protocol_server_get_type())
G_DECLARE_INTERFACE(PurpleProtocolServer, purple_protocol_server, PURPLE,
- PROTOCOL_SERVER, GObject)
+ PROTOCOL_SERVER, PurpleProtocol) --- a/libpurple/xfer.c Thu Aug 12 01:04:21 2021 -0500
+++ b/libpurple/xfer.c Thu Aug 12 20:34:54 2021 -0500
@@ -2519,7 +2519,8 @@
/**************************************************************************
* PurpleXferProtocolInterface
**************************************************************************/
-G_DEFINE_INTERFACE(PurpleProtocolXfer, purple_protocol_xfer, G_TYPE_INVALID);
+G_DEFINE_INTERFACE(PurpleProtocolXfer, purple_protocol_xfer, purple_protocol_xfer_default_init(PurpleProtocolXferInterface *face) {
--- a/libpurple/xfer.h Thu Aug 12 01:04:21 2021 -0500
+++ b/libpurple/xfer.h Thu Aug 12 20:34:54 2021 -0500
@@ -51,8 +51,9 @@
+#include <libpurple/account.h> +#include <libpurple/connection.h> +#include <libpurple/protocol.h> @@ -834,7 +835,7 @@
* Returns: The #GType for the protocol xfer interface.
G_DECLARE_INTERFACE(PurpleProtocolXfer, purple_protocol_xfer, PURPLE,
- PROTOCOL_XFER, GObject)
+ PROTOCOL_XFER, PurpleProtocol) * PurpleProtocolXferInterface: