[gnome-online-accounts/wip/rishi/port-to-g-declare: 5/7] pocket: Use G_DECLARE_FINAL_TYPE



commit f7c5b3f27a0a7a71f0bbaa842c6ff7e2c8a69a33
Author: Debarshi Ray <debarshir gnome org>
Date:   Thu Dec 5 18:53:42 2019 +0100

    pocket: Use G_DECLARE_FINAL_TYPE

 src/goabackend/goapocketprovider.c | 8 --------
 src/goabackend/goapocketprovider.h | 9 +++------
 2 files changed, 3 insertions(+), 14 deletions(-)
---
diff --git a/src/goabackend/goapocketprovider.c b/src/goabackend/goapocketprovider.c
index 38f9863a..c8d28a4e 100644
--- a/src/goabackend/goapocketprovider.c
+++ b/src/goabackend/goapocketprovider.c
@@ -26,7 +26,6 @@
 #include "goaprovider.h"
 #include "goaprovider-priv.h"
 #include "goaoauth2provider.h"
-#include "goaoauth2provider-priv.h"
 #include "goapocketprovider.h"
 #include "goaobjectskeletonutils.h"
 #include "goarestproxy.h"
@@ -45,13 +44,6 @@ struct _GoaPocketProvider
   gchar *identity;
 };
 
-typedef struct _GoaPocketProviderClass GoaPocketProviderClass;
-
-struct _GoaPocketProviderClass
-{
-  GoaOAuth2ProviderClass parent_class;
-};
-
 G_DEFINE_TYPE_WITH_CODE (GoaPocketProvider, goa_pocket_provider, GOA_TYPE_OAUTH2_PROVIDER,
                          goa_provider_ensure_extension_points_registered ();
                          g_io_extension_point_implement (GOA_PROVIDER_EXTENSION_POINT_NAME,
diff --git a/src/goabackend/goapocketprovider.h b/src/goabackend/goapocketprovider.h
index 063d40a7..782967b5 100644
--- a/src/goabackend/goapocketprovider.h
+++ b/src/goabackend/goapocketprovider.h
@@ -25,15 +25,12 @@
 
 #include <glib-object.h>
 
+#include "goaoauth2provider-priv.h"
+
 G_BEGIN_DECLS
 
 #define GOA_TYPE_POCKET_PROVIDER   (goa_pocket_provider_get_type ())
-#define GOA_POCKET_PROVIDER(o)     (G_TYPE_CHECK_INSTANCE_CAST ((o), GOA_TYPE_POCKET_PROVIDER, 
GoaPocketProvider))
-#define GOA_IS_POCKET_PROVIDER(o)  (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOA_TYPE_POCKET_PROVIDER))
-
-typedef struct _GoaPocketProvider GoaPocketProvider;
-
-GType goa_pocket_provider_get_type (void) G_GNUC_CONST;
+G_DECLARE_FINAL_TYPE (GoaPocketProvider, goa_pocket_provider, GOA, POCKET_PROVIDER, GoaOAuth2Provider);
 
 G_END_DECLS
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]