[gnome-online-accounts] live: Use G_DECLARE_FINAL_TYPE



commit b1a0e6cfe85dd9aba5bbb59513f3e63351ae65e5
Author: Debarshi Ray <debarshir gnome org>
Date:   Tue Feb 7 17:05:57 2017 +0100

    live: Use G_DECLARE_FINAL_TYPE

 src/goabackend/goawindowsliveprovider.c |    9 ---------
 src/goabackend/goawindowsliveprovider.h |   14 ++++++++------
 2 files changed, 8 insertions(+), 15 deletions(-)
---
diff --git a/src/goabackend/goawindowsliveprovider.c b/src/goabackend/goawindowsliveprovider.c
index 94d7a02..f48a7ec 100644
--- a/src/goabackend/goawindowsliveprovider.c
+++ b/src/goabackend/goawindowsliveprovider.c
@@ -25,8 +25,6 @@
 
 #include "goaprovider.h"
 #include "goaprovider-priv.h"
-#include "goaoauth2provider.h"
-#include "goaoauth2provider-priv.h"
 #include "goawindowsliveprovider.h"
 #include "goaobjectskeletonutils.h"
 
@@ -42,13 +40,6 @@ struct _GoaWindowsLiveProvider
   GoaOAuth2Provider parent_instance;
 };
 
-typedef struct _GoaWindowsLiveProviderClass GoaWindowsLiveProviderClass;
-
-struct _GoaWindowsLiveProviderClass
-{
-  GoaOAuth2ProviderClass parent_class;
-};
-
 /**
  * SECTION:goawindowsliveprovider
  * @title: GoaWindowsLiveProvider
diff --git a/src/goabackend/goawindowsliveprovider.h b/src/goabackend/goawindowsliveprovider.h
index 763ac73..cb3246a 100644
--- a/src/goabackend/goawindowsliveprovider.h
+++ b/src/goabackend/goawindowsliveprovider.h
@@ -26,15 +26,17 @@
 
 #include <glib-object.h>
 
+#include "goaoauth2provider.h"
+#include "goaoauth2provider-priv.h"
+
 G_BEGIN_DECLS
 
 #define GOA_TYPE_WINDOWS_LIVE_PROVIDER   (goa_windows_live_provider_get_type ())
-#define GOA_WINDOWS_LIVE_PROVIDER(o)     (G_TYPE_CHECK_INSTANCE_CAST ((o), GOA_TYPE_WINDOWS_LIVE_PROVIDER, 
GoaWindowsLiveProvider))
-#define GOA_IS_WINDOWS_LIVE_PROVIDER(o)  (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOA_TYPE_WINDOWS_LIVE_PROVIDER))
-
-typedef struct _GoaWindowsLiveProvider GoaWindowsLiveProvider;
-
-GType goa_windows_live_provider_get_type (void) G_GNUC_CONST;
+G_DECLARE_FINAL_TYPE (GoaWindowsLiveProvider,
+                      goa_windows_live_provider,
+                      GOA,
+                      WINDOWS_LIVE_PROVIDER,
+                      GoaOAuth2Provider);
 
 G_END_DECLS
 


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