pidgin/pidgin

Use G_DECLARE_FINAL_TYPE for FacebookProtocol

2021-04-16, Gary Kramlich
d9d347d5532b
Parents e4b7dd31c64c
Children 2bd48c93678a
Use G_DECLARE_FINAL_TYPE for FacebookProtocol

Testing Done:
Connected a Facebook account

Reviewed at https://reviews.imfreedom.org/r/619/
2 files changed, 7 insertions(+), 21 deletions(-)
  • +4 -0
    libpurple/protocols/facebook/facebook.c
  • +3 -21
    libpurple/protocols/facebook/facebook.h
    • --- a/libpurple/protocols/facebook/facebook.c Fri Apr 16 02:27:54 2021 -0500
    +++ b/libpurple/protocols/facebook/facebook.c Fri Apr 16 03:48:26 2021 -0500
    @@ -30,6 +30,10 @@
    #include "http.h"
    #include "util.h"
    +struct _FacebookProtocol {
    + PurpleProtocol parent;
    +};
    +
    static GSList *fb_cmds = NULL;
    static PurpleProtocol *fb_protocol = NULL;
    --- a/libpurple/protocols/facebook/facebook.h Fri Apr 16 02:27:54 2021 -0500
    +++ b/libpurple/protocols/facebook/facebook.h Fri Apr 16 03:48:26 2021 -0500
    @@ -34,12 +34,9 @@
    #include <glib.h>
    #include <gmodule.h>
    -#define FACEBOOK_TYPE_PROTOCOL (facebook_protocol_get_type())
    -#define FACEBOOK_PROTOCOL(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), FACEBOOK_TYPE_PROTOCOL, FacebookProtocol))
    -#define FACEBOOK_PROTOCOL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), FACEBOOK_TYPE_PROTOCOL, FacebookProtocolClass))
    -#define FACEBOOK_IS_PROTOCOL(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), FACEBOOK_TYPE_PROTOCOL))
    -#define FACEBOOK_IS_PROTOCOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), FACEBOOK_TYPE_PROTOCOL))
    -#define FACEBOOK_PROTOCOL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), FACEBOOK_TYPE_PROTOCOL, FacebookProtocolClass))
    +#define FACEBOOK_TYPE_PROTOCOL (facebook_protocol_get_type())
    +G_DECLARE_FINAL_TYPE(FacebookProtocol, facebook_protocol, FACEBOOK, PROTOCOL,
    + PurpleProtocol)
    /**
    * FB_PROTOCOL_ID:
    @@ -48,37 +45,22 @@
    */
    #define FB_PROTOCOL_ID "prpl-facebook"
    -typedef struct _FacebookProtocol FacebookProtocol;
    -typedef struct _FacebookProtocolClass FacebookProtocolClass;
    -
    /**
    * FacebookProtocol:
    *
    * Represents the Facebook #PurpleProtocol.
    */
    -struct _FacebookProtocol
    -{
    - /*< private >*/
    - PurpleProtocol parent;
    -};
    /**
    * FacebookProtocolClass:
    *
    * The base class for all #FacebookProtocol's.
    */
    -struct _FacebookProtocolClass
    -{
    - /*< private >*/
    - PurpleProtocolClass parent_class;
    -};
    /**
    * facebook_protocol_get_type:
    *
    * Returns: The #GType for a #FacebookProtocol.
    */
    -G_MODULE_EXPORT GType
    -facebook_protocol_get_type(void);
    #endif /* PURPLE_FACEBOOK_FACEBOOK_H */