[gnome-online-accounts/wip/rishi/port-to-g-declare] identity-service: Use G_DECLARE_FINAL_TYPE

[Debarshi Ray <debarshir src gnome org>]

commit 19b2149ba90972c80373356d2942121bb445fb33
Author: Debarshi Ray <debarshir gnome org>
Date:   Fri Dec 6 18:45:48 2019 +0100

    identity-service: Use G_DECLARE_FINAL_TYPE
    
    https://gitlab.gnome.org/GNOME/gnome-online-accounts/merge_requests/40

 src/goaidentity/goaidentityservice.c | 7 -------
 src/goaidentity/goaidentityservice.h | 8 +++-----
 2 files changed, 3 insertions(+), 12 deletions(-)
---
diff --git a/src/goaidentity/goaidentityservice.c b/src/goaidentity/goaidentityservice.c
index 689b6308..3dd27060 100644
--- a/src/goaidentity/goaidentityservice.c
+++ b/src/goaidentity/goaidentityservice.c
@@ -36,8 +36,6 @@
 
 #include "goakerberosidentitymanager.h"
 
-#include "org.gnome.Identity.h"
-
 struct _GoaIdentityService
 {
   GoaIdentityServiceManagerSkeleton  parent_instance;
@@ -55,11 +53,6 @@ struct _GoaIdentityService
   GoaClient                *client;
 };
 
-struct _GoaIdentityServiceClass
-{
-  GoaIdentityServiceManagerSkeletonClass  parent_class;
-};
-
 static void identity_service_manager_interface_init (GoaIdentityServiceManagerIface *interface);
 
 static void
diff --git a/src/goaidentity/goaidentityservice.h b/src/goaidentity/goaidentityservice.h
index 1974f928..29073fe9 100644
--- a/src/goaidentity/goaidentityservice.h
+++ b/src/goaidentity/goaidentityservice.h
@@ -23,14 +23,12 @@
 #include <glib-object.h>
 #include <gio/gio.h>
 
+#include "org.gnome.Identity.h"
+
 G_BEGIN_DECLS
 #define GOA_TYPE_IDENTITY_SERVICE           (goa_identity_service_get_type ())
-#define GOA_IDENTITY_SERVICE(obj)           (G_TYPE_CHECK_INSTANCE_CAST (obj, GOA_TYPE_IDENTITY_SERVICE, 
GoaIdentityService))
-#define GOA_IS_IDENTITY_SERVICE(obj)        (G_TYPE_CHECK_INSTANCE_TYPE (obj, GOA_TYPE_IDENTITY_SERVICE))
-typedef struct _GoaIdentityService GoaIdentityService;
-typedef struct _GoaIdentityServiceClass GoaIdentityServiceClass;
+G_DECLARE_FINAL_TYPE (GoaIdentityService, goa_identity_service, GOA, IDENTITY_SERVICE, 
GoaIdentityServiceManagerSkeleton);
 
-GType goa_identity_service_get_type (void);
 GoaIdentityService *goa_identity_service_new (void);
 gboolean goa_identity_service_activate   (GoaIdentityService  *service,
                                           GError             **error);