[gnome-online-accounts] flickr: Use G_DECLARE_FINAL_TYPE



commit 1ce9327d213b25e7a7934e8b02c6ed00399da3de
Author: Debarshi Ray <debarshir gnome org>
Date:   Wed May 31 13:34:34 2017 +0200

    flickr: Use G_DECLARE_FINAL_TYPE

 src/goabackend/goaflickrprovider.c |    8 --------
 src/goabackend/goaflickrprovider.h |    9 +++------
 2 files changed, 3 insertions(+), 14 deletions(-)
---
diff --git a/src/goabackend/goaflickrprovider.c b/src/goabackend/goaflickrprovider.c
index ae6bcde..a61c0d9 100644
--- a/src/goabackend/goaflickrprovider.c
+++ b/src/goabackend/goaflickrprovider.c
@@ -25,7 +25,6 @@
 
 #include "goaprovider.h"
 #include "goaprovider-priv.h"
-#include "goaoauthprovider.h"
 #include "goaflickrprovider.h"
 #include "goaobjectskeletonutils.h"
 
@@ -34,13 +33,6 @@ struct _GoaFlickrProvider
   GoaOAuthProvider parent_instance;
 };
 
-typedef struct _GoaFlickrProviderClass GoaFlickrProviderClass;
-
-struct _GoaFlickrProviderClass
-{
-  GoaOAuthProviderClass parent_class;
-};
-
 G_DEFINE_TYPE_WITH_CODE (GoaFlickrProvider, goa_flickr_provider, GOA_TYPE_OAUTH_PROVIDER,
                          goa_provider_ensure_extension_points_registered ();
                          g_io_extension_point_implement (GOA_PROVIDER_EXTENSION_POINT_NAME,
diff --git a/src/goabackend/goaflickrprovider.h b/src/goabackend/goaflickrprovider.h
index c5e8039..742e2cd 100644
--- a/src/goabackend/goaflickrprovider.h
+++ b/src/goabackend/goaflickrprovider.h
@@ -25,15 +25,12 @@
 
 #include <glib-object.h>
 
+#include "goaoauthprovider.h"
+
 G_BEGIN_DECLS
 
 #define GOA_TYPE_FLICKR_PROVIDER   (goa_flickr_provider_get_type ())
-#define GOA_FLICKR_PROVIDER(o)     (G_TYPE_CHECK_INSTANCE_CAST ((o), GOA_TYPE_FLICKR_PROVIDER, 
GoaFlickrProvider))
-#define GOA_IS_FLICKR_PROVIDER(o)  (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOA_TYPE_FLICKR_PROVIDER))
-
-typedef struct _GoaFlickrProvider GoaFlickrProvider;
-
-GType goa_flickr_provider_get_type (void) G_GNUC_CONST;
+G_DECLARE_FINAL_TYPE (GoaFlickrProvider, goa_flickr_provider, GOA, FLICKR_PROVIDER, GoaOAuthProvider);
 
 G_END_DECLS
 


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