[gnome-online-accounts] oauth2: Use G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE



commit 08dc9d133d67b4fb3fa2df05b17c8a32d6046d6b
Author: Debarshi Ray <debarshir gnome org>
Date:   Wed Feb 8 13:26:05 2017 +0100

    oauth2: Use G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE
    
    This paves the way for improving our GObject use and reducing the
    amount of boilerplate.

 src/goabackend/goaoauth2provider.c |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)
---
diff --git a/src/goabackend/goaoauth2provider.c b/src/goabackend/goaoauth2provider.c
index 533295c..e4f31c1 100644
--- a/src/goabackend/goaoauth2provider.c
+++ b/src/goabackend/goaoauth2provider.c
@@ -82,11 +82,9 @@ struct _GoaOAuth2ProviderPrivate
   gchar *password;
 };
 
-#define GOA_OAUTH2_PROVIDER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GOA_TYPE_OAUTH2_PROVIDER, 
GoaOAuth2ProviderPrivate))
-
 G_LOCK_DEFINE_STATIC (provider_lock);
 
-G_DEFINE_ABSTRACT_TYPE (GoaOAuth2Provider, goa_oauth2_provider, GOA_TYPE_PROVIDER);
+G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (GoaOAuth2Provider, goa_oauth2_provider, GOA_TYPE_PROVIDER);
 
 static gboolean
 is_authorization_error (GError *error)
@@ -1733,7 +1731,7 @@ goa_oauth2_provider_finalize (GObject *object)
 static void
 goa_oauth2_provider_init (GoaOAuth2Provider *provider)
 {
-  provider->priv = GOA_OAUTH2_PROVIDER_GET_PRIVATE (provider);
+  provider->priv = goa_oauth2_provider_get_instance_private (provider);
 }
 
 static void
@@ -1759,8 +1757,6 @@ goa_oauth2_provider_class_init (GoaOAuth2ProviderClass *klass)
   klass->is_deny_node             = goa_oauth2_provider_is_deny_node_default;
   klass->is_password_node         = goa_oauth2_provider_is_password_node_default;
   klass->add_account_key_values   = goa_oauth2_provider_add_account_key_values_default;
-
-  g_type_class_add_private (object_class, sizeof (GoaOAuth2ProviderPrivate));
 }
 
 /* ---------------------------------------------------------------------------------------------------- */


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