[gnome-online-accounts/wip/rishi/g_type_class_add_private] identity: Port away from deprecated g_type_class_add_private



commit 9b6b9df9eca0f3a1392cfcae608a11b82a6425f0
Author: Thomas Bechtold <tbechtold suse com>
Date:   Thu Oct 25 15:00:29 2018 +0200

    identity: Port away from deprecated g_type_class_add_private
    
    https://gitlab.gnome.org/GNOME/gnome-online-accounts/merge_requests/15

 src/goaidentity/goaalarm.c                   | 4 +---
 src/goaidentity/goaidentityservice.c         | 3 +--
 src/goaidentity/goakerberosidentity.c        | 3 +--
 src/goaidentity/goakerberosidentityinquiry.c | 3 +--
 src/goaidentity/goakerberosidentitymanager.c | 3 +--
 5 files changed, 5 insertions(+), 11 deletions(-)
---
diff --git a/src/goaidentity/goaalarm.c b/src/goaidentity/goaalarm.c
index d2fadfc4..d8231cc9 100644
--- a/src/goaidentity/goaalarm.c
+++ b/src/goaidentity/goaalarm.c
@@ -73,7 +73,7 @@ static void goa_alarm_set_time (GoaAlarm *self, GDateTime *time);
 static void clear_wakeup_source_pointer (GoaAlarm *self);
 static guint signals[NUMBER_OF_SIGNALS] = { 0 };
 
-G_DEFINE_TYPE (GoaAlarm, goa_alarm, G_TYPE_OBJECT);
+G_DEFINE_TYPE_WITH_PRIVATE (GoaAlarm, goa_alarm, G_TYPE_OBJECT);
 
 static void
 goa_alarm_dispose (GObject *object)
@@ -152,8 +152,6 @@ goa_alarm_class_init (GoaAlarmClass *klass)
   object_class->get_property = goa_alarm_get_property;
   object_class->set_property = goa_alarm_set_property;
 
-  g_type_class_add_private (klass, sizeof (GoaAlarmPrivate));
-
   signals[FIRED] = g_signal_new ("fired",
                                  G_TYPE_FROM_CLASS (klass),
                                  G_SIGNAL_RUN_LAST,
diff --git a/src/goaidentity/goaidentityservice.c b/src/goaidentity/goaidentityservice.c
index 50428392..c3d64d91 100644
--- a/src/goaidentity/goaidentityservice.c
+++ b/src/goaidentity/goaidentityservice.c
@@ -66,6 +66,7 @@ sign_in (GoaIdentityService     *self,
 G_DEFINE_TYPE_WITH_CODE (GoaIdentityService,
                          goa_identity_service,
                          GOA_IDENTITY_SERVICE_TYPE_MANAGER_SKELETON,
+                         G_ADD_PRIVATE (GoaIdentityService)
                          G_IMPLEMENT_INTERFACE (GOA_IDENTITY_SERVICE_TYPE_MANAGER,
                                                 identity_service_manager_interface_init));
 
@@ -1704,8 +1705,6 @@ goa_identity_service_class_init (GoaIdentityServiceClass *service_class)
 
   goa_identity_utils_register_error_domain (GOA_IDENTITY_ERROR, GOA_TYPE_IDENTITY_ERROR);
   goa_identity_utils_register_error_domain (GOA_IDENTITY_MANAGER_ERROR, GOA_TYPE_IDENTITY_MANAGER_ERROR);
-
-  g_type_class_add_private (service_class, sizeof (GoaIdentityServicePrivate));
 }
 
 GoaIdentityService *
diff --git a/src/goaidentity/goakerberosidentity.c b/src/goaidentity/goakerberosidentity.c
index 5f05a3d7..688c87ee 100644
--- a/src/goaidentity/goakerberosidentity.c
+++ b/src/goaidentity/goakerberosidentity.c
@@ -103,6 +103,7 @@ G_LOCK_DEFINE_STATIC (identity_lock);
 G_DEFINE_TYPE_WITH_CODE (GoaKerberosIdentity,
                          goa_kerberos_identity,
                          G_TYPE_OBJECT,
+                         G_ADD_PRIVATE (GoaKerberosIdentity)
                          G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE,
                                                 initable_interface_init)
                          G_IMPLEMENT_INTERFACE (GOA_TYPE_IDENTITY,
@@ -186,8 +187,6 @@ goa_kerberos_identity_class_init (GoaKerberosIdentityClass *klass)
   object_class->finalize = goa_kerberos_identity_finalize;
   object_class->get_property = goa_kerberos_identity_get_property;
 
-  g_type_class_add_private (klass, sizeof (GoaKerberosIdentityPrivate));
-
   signals[EXPIRING] = g_signal_new ("expiring",
                                     G_TYPE_FROM_CLASS (klass),
                                     G_SIGNAL_RUN_LAST,
diff --git a/src/goaidentity/goakerberosidentityinquiry.c b/src/goaidentity/goakerberosidentityinquiry.c
index 4f25298d..e83c27f4 100644
--- a/src/goaidentity/goakerberosidentityinquiry.c
+++ b/src/goaidentity/goakerberosidentityinquiry.c
@@ -50,6 +50,7 @@ static void initable_interface_init (GInitableIface *interface);
 G_DEFINE_TYPE_WITH_CODE (GoaKerberosIdentityInquiry,
                          goa_kerberos_identity_inquiry,
                          G_TYPE_OBJECT,
+                         G_ADD_PRIVATE (GoaKerberosIdentityInquiry)
                          G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE,
                                                 initable_interface_init)
                          G_IMPLEMENT_INTERFACE (GOA_TYPE_IDENTITY_INQUIRY,
@@ -125,8 +126,6 @@ goa_kerberos_identity_inquiry_class_init (GoaKerberosIdentityInquiryClass *klass
 
   object_class->dispose = goa_kerberos_identity_inquiry_dispose;
   object_class->finalize = goa_kerberos_identity_inquiry_finalize;
-
-  g_type_class_add_private (klass, sizeof (GoaKerberosIdentityInquiryPrivate));
 }
 
 static void
diff --git a/src/goaidentity/goakerberosidentitymanager.c b/src/goaidentity/goakerberosidentitymanager.c
index 4f3c147b..950ddaf0 100644
--- a/src/goaidentity/goakerberosidentitymanager.c
+++ b/src/goaidentity/goakerberosidentitymanager.c
@@ -112,6 +112,7 @@ static void on_identity_expired (GoaIdentity                *identity,
 G_DEFINE_TYPE_WITH_CODE (GoaKerberosIdentityManager,
                          goa_kerberos_identity_manager,
                          G_TYPE_OBJECT,
+                         G_ADD_PRIVATE (GoaKerberosIdentityManager)
                          G_IMPLEMENT_INTERFACE (GOA_TYPE_IDENTITY_MANAGER,
                                                 identity_manager_interface_init)
                          G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE,
@@ -1664,8 +1665,6 @@ goa_kerberos_identity_manager_class_init (GoaKerberosIdentityManagerClass *klass
 
   object_class->dispose = goa_kerberos_identity_manager_dispose;
   object_class->finalize = goa_kerberos_identity_manager_finalize;
-
-  g_type_class_add_private (klass, sizeof (GoaKerberosIdentityManagerPrivate));
 }
 
 GoaIdentityManager *


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