[gnome-online-accounts] oauth2: Use G_DECLARE_DERIVABLE_TYPE

[Debarshi Ray <debarshir src gnome org>]

commit 05ea26bc6b08818574da66661bf47d2ede14b330
Author: Debarshi Ray <debarshir gnome org>
Date:   Wed Feb 8 13:40:04 2017 +0100

    oauth2: Use G_DECLARE_DERIVABLE_TYPE

 src/goabackend/goaoauth2provider-priv.h |    5 -----
 src/goabackend/goaoauth2provider.h      |   13 ++++---------
 2 files changed, 4 insertions(+), 14 deletions(-)
---
diff --git a/src/goabackend/goaoauth2provider-priv.h b/src/goabackend/goaoauth2provider-priv.h
index 07181d2..f9f04d8 100644
--- a/src/goabackend/goaoauth2provider-priv.h
+++ b/src/goabackend/goaoauth2provider-priv.h
@@ -37,11 +37,6 @@ G_BEGIN_DECLS
  * The #GoaOAuth2Provider structure contains only private data and should
  * only be accessed using the provided API.
  */
-struct _GoaOAuth2Provider
-{
-  /*< private >*/
-  GoaProvider parent_instance;
-};
 
 /**
  * GoaOAuth2ProviderClass:
diff --git a/src/goabackend/goaoauth2provider.h b/src/goabackend/goaoauth2provider.h
index ade7107..e908286 100644
--- a/src/goabackend/goaoauth2provider.h
+++ b/src/goabackend/goaoauth2provider.h
@@ -25,21 +25,16 @@
 
 #include <gio/gio.h>
 
+#include "goabackend/goaprovider.h"
+#include "goabackend/goaprovider-priv.h"
+
 G_BEGIN_DECLS
 
 #define GOA_TYPE_OAUTH2_PROVIDER         (goa_oauth2_provider_get_type ())
-#define GOA_OAUTH2_PROVIDER(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), GOA_TYPE_OAUTH2_PROVIDER, 
GoaOAuth2Provider))
-#define GOA_OAUTH2_PROVIDER_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST ((k), GOA_TYPE_OAUTH2_PROVIDER, 
GoaOAuth2ProviderClass))
-#define GOA_OAUTH2_PROVIDER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GOA_TYPE_OAUTH2_PROVIDER, 
GoaOAuth2ProviderClass))
-#define GOA_IS_OAUTH2_PROVIDER(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOA_TYPE_OAUTH2_PROVIDER))
-
-#define GOA_IS_OAUTH2_PROVIDER_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), GOA_TYPE_OAUTH2_PROVIDER))
+G_DECLARE_DERIVABLE_TYPE (GoaOAuth2Provider, goa_oauth2_provider, GOA, OAUTH2_PROVIDER, GoaProvider);
 
-typedef struct _GoaOAuth2Provider GoaOAuth2Provider;
-typedef struct _GoaOAuth2ProviderClass GoaOAuth2ProviderClass;
 typedef struct _GoaOAuth2ProviderPrivate GoaOAuth2ProviderPrivate;
 
-GType        goa_oauth2_provider_get_type                     (void) G_GNUC_CONST;
 const gchar *goa_oauth2_provider_get_authorization_uri        (GoaOAuth2Provider             *provider);
 const gchar *goa_oauth2_provider_get_token_uri                (GoaOAuth2Provider             *provider);
 const gchar *goa_oauth2_provider_get_redirect_uri             (GoaOAuth2Provider             *provider);