GNOME.org
 

[gcr/wip/nielsdg/g-add-private: 2/3] gcr: g_type_class_add_private() is deprecated

commit b4a3774b661a4f54a3b18cf13ded628b6b2054a6
Author: Niels De Graef <nielsdegraef gmail com>
Date:   Fri May 24 08:52:11 2019 +0200

    gcr: g_type_class_add_private() is deprecated
    
    Use `G_ADD_PRIVATE()` (or the convenience macro
    `G_DEFINE_TYPE_WITH_PRIVATE()`) instead.

 gcr/gcr-filter-collection.c  | 5 ++---
 gcr/gcr-gnupg-collection.c   | 5 ++---
 gcr/gcr-gnupg-importer.c     | 5 ++---
 gcr/gcr-gnupg-key.c          | 5 ++---
 gcr/gcr-gnupg-process.c      | 6 ++----
 gcr/gcr-memory-icon.c        | 5 ++---
 gcr/gcr-parser.c             | 6 ++----
 gcr/gcr-pkcs11-certificate.c | 5 ++---
 gcr/gcr-secret-exchange.c    | 7 ++-----
 gcr/gcr-simple-certificate.c | 5 ++---
 gcr/gcr-simple-collection.c  | 4 ++--
 gcr/gcr-system-prompt.c      | 6 ++----
 gcr/gcr-system-prompter.c    | 7 ++-----
 gcr/gcr-union-collection.c   | 4 ++--
 14 files changed, 28 insertions(+), 47 deletions(-)
---
diff --git a/gcr/gcr-filter-collection.c b/gcr/gcr-filter-collection.c
index 25e97ec..769c0f6 100644
--- a/gcr/gcr-filter-collection.c
+++ b/gcr/gcr-filter-collection.c
@@ -77,6 +77,7 @@ struct _GcrFilterCollectionPrivate {
 static void       gcr_filter_collection_iface       (GcrCollectionIface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (GcrFilterCollection, gcr_filter_collection, G_TYPE_OBJECT,
+                         G_ADD_PRIVATE (GcrFilterCollection);
                          G_IMPLEMENT_INTERFACE (GCR_TYPE_COLLECTION, gcr_filter_collection_iface));
 
 static void
@@ -134,7 +135,7 @@ on_collection_removed (GcrCollection *collection,
 static void
 gcr_filter_collection_init (GcrFilterCollection *self)
 {
-       self->pv = G_TYPE_INSTANCE_GET_PRIVATE (self, GCR_TYPE_FILTER_COLLECTION, GcrFilterCollectionPrivate);
+       self->pv = gcr_filter_collection_get_instance_private (self);
        self->pv->items = g_hash_table_new_full (g_direct_hash, g_direct_equal, g_object_unref, NULL);
 }
 
@@ -212,8 +213,6 @@ gcr_filter_collection_class_init (GcrFilterCollectionClass *klass)
        gobject_class->set_property = gcr_filter_collection_set_property;
        gobject_class->finalize = gcr_filter_collection_finalize;
 
-       g_type_class_add_private (gobject_class, sizeof (GcrFilterCollectionPrivate));
-
        g_object_class_install_property (gobject_class, PROP_UNDERLYING,
                    g_param_spec_object ("underlying", "Underlying", "Underlying collection",
                                         GCR_TYPE_COLLECTION, G_PARAM_STATIC_STRINGS |
diff --git a/gcr/gcr-gnupg-collection.c b/gcr/gcr-gnupg-collection.c
index e46f348..5b25615 100644
--- a/gcr/gcr-gnupg-collection.c
+++ b/gcr/gcr-gnupg-collection.c
@@ -49,6 +49,7 @@ struct _GcrGnupgCollectionPrivate {
 static void _gcr_collection_iface (GcrCollectionIface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (GcrGnupgCollection, _gcr_gnupg_collection, G_TYPE_OBJECT,
+       G_ADD_PRIVATE (GcrGnupgCollection);
        G_IMPLEMENT_INTERFACE (GCR_TYPE_COLLECTION, _gcr_collection_iface)
 );
 
@@ -56,8 +57,7 @@ G_DEFINE_TYPE_WITH_CODE (GcrGnupgCollection, _gcr_gnupg_collection, G_TYPE_OBJEC
 static void
 _gcr_gnupg_collection_init (GcrGnupgCollection *self)
 {
-       self->pv = G_TYPE_INSTANCE_GET_PRIVATE (self, GCR_TYPE_GNUPG_COLLECTION,
-                                               GcrGnupgCollectionPrivate);
+       self->pv = _gcr_gnupg_collection_get_instance_private (self);
 
        self->pv->items = g_hash_table_new_full (g_str_hash, g_str_equal,
                                                 g_free, g_object_unref);
@@ -146,7 +146,6 @@ _gcr_gnupg_collection_class_init (GcrGnupgCollectionClass *klass)
                   g_param_spec_string ("directory", "Directory", "Gnupg Directory",
                                        NULL, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
 
-       g_type_class_add_private (gobject_class, sizeof (GcrGnupgCollectionPrivate));
        _gcr_initialize_library ();
 }
 
diff --git a/gcr/gcr-gnupg-importer.c b/gcr/gcr-gnupg-importer.c
index bee2c1b..9eaad91 100644
--- a/gcr/gcr-gnupg-importer.c
+++ b/gcr/gcr-gnupg-importer.c
@@ -48,13 +48,14 @@ struct _GcrGnupgImporterPrivate {
 static void gcr_gnupg_importer_iface (GcrImporterIface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (GcrGnupgImporter, _gcr_gnupg_importer, G_TYPE_OBJECT,
+                         G_ADD_PRIVATE (GcrGnupgImporter);
                          G_IMPLEMENT_INTERFACE (GCR_TYPE_IMPORTER, gcr_gnupg_importer_iface);
 );
 
 static void
 _gcr_gnupg_importer_init (GcrGnupgImporter *self)
 {
-       self->pv = G_TYPE_INSTANCE_GET_PRIVATE (self, GCR_TYPE_GNUPG_IMPORTER, GcrGnupgImporterPrivate);
+       self->pv = _gcr_gnupg_importer_get_instance_private (self);
        self->pv->packets = G_MEMORY_INPUT_STREAM (g_memory_input_stream_new ());
        self->pv->imported = g_array_new (TRUE, TRUE, sizeof (gchar *));
 }
@@ -234,8 +235,6 @@ _gcr_gnupg_importer_class_init (GcrGnupgImporterClass *klass)
        gobject_class->set_property = _gcr_gnupg_importer_set_property;
        gobject_class->get_property = _gcr_gnupg_importer_get_property;
 
-       g_type_class_add_private (gobject_class, sizeof (GcrGnupgImporterPrivate));
-
        g_object_class_override_property (gobject_class, PROP_LABEL, "label");
        g_object_class_override_property (gobject_class, PROP_ICON, "icon");
        g_object_class_override_property (gobject_class, PROP_INTERACTION, "interaction");
diff --git a/gcr/gcr-gnupg-key.c b/gcr/gcr-gnupg-key.c
index 606434e..c6e9e48 100644
--- a/gcr/gcr-gnupg-key.c
+++ b/gcr/gcr-gnupg-key.c
@@ -46,7 +46,7 @@ struct _GcrGnupgKeyPrivate {
        GIcon *icon;
 };
 
-G_DEFINE_TYPE (GcrGnupgKey, _gcr_gnupg_key, G_TYPE_OBJECT);
+G_DEFINE_TYPE_WITH_PRIVATE (GcrGnupgKey, _gcr_gnupg_key, G_TYPE_OBJECT);
 
 static gchar *
 calculate_name (GcrGnupgKey *self)
@@ -85,7 +85,7 @@ calculate_markup (GcrGnupgKey *self)
 static void
 _gcr_gnupg_key_init (GcrGnupgKey *self)
 {
-       self->pv = (G_TYPE_INSTANCE_GET_PRIVATE (self, GCR_TYPE_GNUPG_KEY, GcrGnupgKeyPrivate));
+       self->pv = _gcr_gnupg_key_get_instance_private (self);
 }
 
 static void
@@ -163,7 +163,6 @@ _gcr_gnupg_key_class_init (GcrGnupgKeyClass *klass)
        GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
 
        _gcr_gnupg_key_parent_class = g_type_class_peek_parent (klass);
-       g_type_class_add_private (klass, sizeof (GcrGnupgKeyPrivate));
 
        gobject_class->finalize = _gcr_gnupg_key_finalize;
        gobject_class->set_property = _gcr_gnupg_key_set_property;
diff --git a/gcr/gcr-gnupg-process.c b/gcr/gcr-gnupg-process.c
index a53d6db..b3ff444 100644
--- a/gcr/gcr-gnupg-process.c
+++ b/gcr/gcr-gnupg-process.c
@@ -108,13 +108,13 @@ struct _GcrGnupgProcessPrivate {
 static void _gcr_gnupg_process_init_async (GAsyncResultIface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (GcrGnupgProcess, _gcr_gnupg_process, G_TYPE_OBJECT,
+                         G_ADD_PRIVATE (GcrGnupgProcess);
                          G_IMPLEMENT_INTERFACE (G_TYPE_ASYNC_RESULT, _gcr_gnupg_process_init_async));
 
 static void
 _gcr_gnupg_process_init (GcrGnupgProcess *self)
 {
-       self->pv = G_TYPE_INSTANCE_GET_PRIVATE (self, GCR_TYPE_GNUPG_PROCESS,
-                                               GcrGnupgProcessPrivate);
+       self->pv = _gcr_gnupg_process_get_instance_private (self);
 }
 
 static void
@@ -292,8 +292,6 @@ _gcr_gnupg_process_class_init (GcrGnupgProcessClass *klass)
                   G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GcrGnupgProcessClass, status_record),
                   NULL, NULL, _gcr_marshal_VOID__BOXED,
                   G_TYPE_NONE, 1, GCR_TYPE_RECORD);
-
-       g_type_class_add_private (gobject_class, sizeof (GcrGnupgProcessPrivate));
 }
 
 static gpointer
diff --git a/gcr/gcr-memory-icon.c b/gcr/gcr-memory-icon.c
index e1c62f3..27edefc 100644
--- a/gcr/gcr-memory-icon.c
+++ b/gcr/gcr-memory-icon.c
@@ -36,6 +36,7 @@ static void _gcr_memory_icon_iface_icon (GIconIface *iface);
 static void _gcr_memory_icon_iface_loadable_icon (GLoadableIconIface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (GcrMemoryIcon, _gcr_memory_icon, G_TYPE_OBJECT,
+       G_ADD_PRIVATE (GcrMemoryIcon);
        G_IMPLEMENT_INTERFACE (G_TYPE_ICON, _gcr_memory_icon_iface_icon);
        G_IMPLEMENT_INTERFACE (G_TYPE_LOADABLE_ICON, _gcr_memory_icon_iface_loadable_icon);
 );
@@ -44,7 +45,7 @@ G_DEFINE_TYPE_WITH_CODE (GcrMemoryIcon, _gcr_memory_icon, G_TYPE_OBJECT,
 static void
 _gcr_memory_icon_init (GcrMemoryIcon *self)
 {
-       self->pv = (G_TYPE_INSTANCE_GET_PRIVATE (self, GCR_TYPE_MEMORY_ICON, GcrMemoryIconPrivate));
+       self->pv = _gcr_memory_icon_get_instance_private (self);
 }
 
 static void
@@ -64,8 +65,6 @@ _gcr_memory_icon_class_init (GcrMemoryIconClass *klass)
 {
        GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
 
-       g_type_class_add_private (klass, sizeof (GcrMemoryIconPrivate));
-
        gobject_class->finalize = _gcr_memory_icon_finalize;
 }
 
diff --git a/gcr/gcr-parser.c b/gcr/gcr-parser.c
index cf5c44e..11c5fbb 100644
--- a/gcr/gcr-parser.c
+++ b/gcr/gcr-parser.c
@@ -138,7 +138,7 @@ struct _GcrParserPrivate {
        gchar *filename;
 };
 
-G_DEFINE_TYPE (GcrParser, gcr_parser, G_TYPE_OBJECT);
+G_DEFINE_TYPE_WITH_PRIVATE (GcrParser, gcr_parser, G_TYPE_OBJECT);
 
 typedef struct {
        gint ask_state;
@@ -2347,7 +2347,7 @@ gcr_parser_constructor (GType type, guint n_props, GObjectConstructParam *props)
 static void
 gcr_parser_init (GcrParser *self)
 {
-       self->pv = G_TYPE_INSTANCE_GET_PRIVATE (self, GCR_TYPE_PARSER, GcrParserPrivate);
+       self->pv = gcr_parser_get_instance_private (self);
        self->pv->passwords = g_ptr_array_new ();
        self->pv->normal_formats = TRUE;
 }
@@ -2438,8 +2438,6 @@ gcr_parser_class_init (GcrParserClass *klass)
         * Get the attributes that make up the currently parsed item. This is
         * generally only valid during a #GcrParser::parsed signal.
         */
-       g_type_class_add_private (gobject_class, sizeof (GcrParserPrivate));
-
        g_object_class_install_property (gobject_class, PROP_PARSED_ATTRIBUTES,
                   g_param_spec_boxed ("parsed-attributes", "Parsed Attributes", "Parsed PKCS#11 attributes",
                                       GCK_TYPE_ATTRIBUTES, G_PARAM_READABLE));
diff --git a/gcr/gcr-pkcs11-certificate.c b/gcr/gcr-pkcs11-certificate.c
index a89d7c5..8016c89 100644
--- a/gcr/gcr-pkcs11-certificate.c
+++ b/gcr/gcr-pkcs11-certificate.c
@@ -69,6 +69,7 @@ struct _GcrPkcs11CertificatePrivate {
 
 static void gcr_certificate_iface (GcrCertificateIface *iface);
 G_DEFINE_TYPE_WITH_CODE (GcrPkcs11Certificate, gcr_pkcs11_certificate, GCK_TYPE_OBJECT,
+       G_ADD_PRIVATE (GcrPkcs11Certificate);
        GCR_CERTIFICATE_MIXIN_IMPLEMENT_COMPARABLE ();
        G_IMPLEMENT_INTERFACE (GCR_TYPE_CERTIFICATE, gcr_certificate_iface);
 );
@@ -222,7 +223,7 @@ gcr_pkcs11_certificate_constructor (GType type, guint n_props, GObjectConstructP
 static void
 gcr_pkcs11_certificate_init (GcrPkcs11Certificate *self)
 {
-       self->pv = G_TYPE_INSTANCE_GET_PRIVATE (self, GCR_TYPE_PKCS11_CERTIFICATE, 
GcrPkcs11CertificatePrivate);
+       self->pv = gcr_pkcs11_certificate_get_instance_private (self);
 }
 
 static void
@@ -288,8 +289,6 @@ gcr_pkcs11_certificate_class_init (GcrPkcs11CertificateClass *klass)
                 g_param_spec_boxed ("attributes", "Attributes", "The data displayed in the renderer",
                                     GCK_TYPE_ATTRIBUTES, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
 
-       g_type_class_add_private (gobject_class, sizeof (GcrPkcs11CertificatePrivate));
-
        gcr_certificate_mixin_class_init (gobject_class);
        _gcr_initialize_library ();
 }
diff --git a/gcr/gcr-secret-exchange.c b/gcr/gcr-secret-exchange.c
index 1b53eff..02380ca 100644
--- a/gcr/gcr-secret-exchange.c
+++ b/gcr/gcr-secret-exchange.c
@@ -101,7 +101,7 @@ struct _GcrSecretExchangePrivate {
        gsize n_secret;
 };
 
-G_DEFINE_TYPE (GcrSecretExchange, gcr_secret_exchange, G_TYPE_OBJECT);
+G_DEFINE_TYPE_WITH_PRIVATE (GcrSecretExchange, gcr_secret_exchange, G_TYPE_OBJECT);
 
 static void
 key_file_set_base64 (GKeyFile *key_file, const gchar *section,
@@ -136,8 +136,7 @@ key_file_get_base64 (GKeyFile *key_file, const gchar *section,
 static void
 gcr_secret_exchange_init (GcrSecretExchange *self)
 {
-       self->pv = G_TYPE_INSTANCE_GET_PRIVATE (self, GCR_TYPE_SECRET_EXCHANGE,
-                                               GcrSecretExchangePrivate);
+       self->pv = gcr_secret_exchange_get_instance_private (self);
 }
 
 
@@ -857,8 +856,6 @@ gcr_secret_exchange_class_init (GcrSecretExchangeClass *klass)
        klass->decrypt_transport_data = gcr_secret_exchange_default_decrypt_transport_data;
        klass->encrypt_transport_data = gcr_secret_exchange_default_encrypt_transport_data;
 
-       g_type_class_add_private (gobject_class, sizeof (GcrSecretExchangePrivate));
-
        egg_libgcrypt_initialize ();
 
        /**
diff --git a/gcr/gcr-simple-certificate.c b/gcr/gcr-simple-certificate.c
index 4007639..3daba64 100644
--- a/gcr/gcr-simple-certificate.c
+++ b/gcr/gcr-simple-certificate.c
@@ -62,6 +62,7 @@ struct _GcrSimpleCertificatePrivate {
 static void gcr_simple_certificate_iface_init (GcrCertificateIface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (GcrSimpleCertificate, gcr_simple_certificate, G_TYPE_OBJECT,
+       G_ADD_PRIVATE (GcrSimpleCertificate);
        GCR_CERTIFICATE_MIXIN_IMPLEMENT_COMPARABLE ();
        G_IMPLEMENT_INTERFACE (GCR_TYPE_CERTIFICATE, gcr_simple_certificate_iface_init);
 );
@@ -73,7 +74,7 @@ G_DEFINE_TYPE_WITH_CODE (GcrSimpleCertificate, gcr_simple_certificate, G_TYPE_OB
 static void
 gcr_simple_certificate_init (GcrSimpleCertificate *self)
 {
-       self->pv = G_TYPE_INSTANCE_GET_PRIVATE (self, GCR_TYPE_SIMPLE_CERTIFICATE, 
GcrSimpleCertificatePrivate);
+       self->pv = gcr_simple_certificate_get_instance_private (self);
 }
 
 static void
@@ -97,8 +98,6 @@ gcr_simple_certificate_class_init (GcrSimpleCertificateClass *klass)
        gobject_class->finalize = gcr_simple_certificate_real_finalize;
        gobject_class->get_property = gcr_certificate_mixin_get_property;
 
-       g_type_class_add_private (gobject_class, sizeof (GcrSimpleCertificatePrivate));
-
        gcr_certificate_mixin_class_init (gobject_class);
        _gcr_initialize_library ();
 }
diff --git a/gcr/gcr-simple-collection.c b/gcr/gcr-simple-collection.c
index def00f0..c90149b 100644
--- a/gcr/gcr-simple-collection.c
+++ b/gcr/gcr-simple-collection.c
@@ -55,6 +55,7 @@ struct _GcrSimpleCollectionPrivate {
 
 static void gcr_collection_iface (GcrCollectionIface *iface);
 G_DEFINE_TYPE_WITH_CODE (GcrSimpleCollection, gcr_simple_collection, G_TYPE_OBJECT,
+                         G_ADD_PRIVATE (GcrSimpleCollection);
                          G_IMPLEMENT_INTERFACE (GCR_TYPE_COLLECTION, gcr_collection_iface));
 
 #define UNUSED_VALUE  GUINT_TO_POINTER (1)
@@ -66,7 +67,7 @@ G_DEFINE_TYPE_WITH_CODE (GcrSimpleCollection, gcr_simple_collection, G_TYPE_OBJE
 static void
 gcr_simple_collection_init (GcrSimpleCollection *self)
 {
-       self->pv = G_TYPE_INSTANCE_GET_PRIVATE (self, GCR_TYPE_SIMPLE_COLLECTION, GcrSimpleCollectionPrivate);
+       self->pv = gcr_simple_collection_get_instance_private (self);
        self->pv->items = g_hash_table_new_full (g_direct_hash, g_direct_equal, g_object_unref, NULL);
 }
 
@@ -99,7 +100,6 @@ gcr_simple_collection_class_init (GcrSimpleCollectionClass *klass)
        GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
        gobject_class->dispose = gcr_simple_collection_dispose;
        gobject_class->finalize = gcr_simple_collection_finalize;
-       g_type_class_add_private (gobject_class, sizeof (GcrSimpleCollectionPrivate));
 }
 
 static guint
diff --git a/gcr/gcr-system-prompt.c b/gcr/gcr-system-prompt.c
index d45efd8..08a4a4a 100644
--- a/gcr/gcr-system-prompt.c
+++ b/gcr/gcr-system-prompt.c
@@ -132,6 +132,7 @@ static void     perform_init_async                     (GcrSystemPrompt *self,
                                                         GSimpleAsyncResult *res);
 
 G_DEFINE_TYPE_WITH_CODE (GcrSystemPrompt, gcr_system_prompt, G_TYPE_OBJECT,
+                         G_ADD_PRIVATE (GcrSystemPrompt);
                          G_IMPLEMENT_INTERFACE (GCR_TYPE_PROMPT, gcr_system_prompt_prompt_iface);
                          G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, gcr_system_prompt_initable_iface);
                          G_IMPLEMENT_INTERFACE (G_TYPE_ASYNC_INITABLE, 
gcr_system_prompt_async_initable_iface);
@@ -198,8 +199,7 @@ call_closure_new (GCancellable *cancellable)
 static void
 gcr_system_prompt_init (GcrSystemPrompt *self)
 {
-       self->pv = G_TYPE_INSTANCE_GET_PRIVATE (self, GCR_TYPE_SYSTEM_PROMPT,
-                                               GcrSystemPromptPrivate);
+       self->pv = gcr_system_prompt_get_instance_private (self);
 
        self->pv->timeout_seconds = -1;
        self->pv->properties = g_hash_table_new_full (g_direct_hash, g_direct_equal,
@@ -554,8 +554,6 @@ gcr_system_prompt_class_init (GcrSystemPromptClass *klass)
        gobject_class->dispose = gcr_system_prompt_dispose;
        gobject_class->finalize = gcr_system_prompt_finalize;
 
-       g_type_class_add_private (gobject_class, sizeof (GcrSystemPromptPrivate));
-
        /**
         * GcrSystemPrompt:bus-name:
         *
diff --git a/gcr/gcr-system-prompter.c b/gcr/gcr-system-prompter.c
index 39250e7..10948cf 100644
--- a/gcr/gcr-system-prompter.c
+++ b/gcr/gcr-system-prompter.c
@@ -100,7 +100,7 @@ struct _GcrSystemPrompterPrivate {
 
 static guint signals[LAST_SIGNAL] = { 0, };
 
-G_DEFINE_TYPE (GcrSystemPrompter, gcr_system_prompter, G_TYPE_OBJECT);
+G_DEFINE_TYPE_WITH_PRIVATE (GcrSystemPrompter, gcr_system_prompter, G_TYPE_OBJECT);
 
 typedef struct {
        const gchar *path;
@@ -257,8 +257,7 @@ unwatch_name (gpointer data)
 static void
 gcr_system_prompter_init (GcrSystemPrompter *self)
 {
-       self->pv = G_TYPE_INSTANCE_GET_PRIVATE (self, GCR_TYPE_SYSTEM_PROMPTER,
-                                               GcrSystemPrompterPrivate);
+       self->pv = gcr_system_prompter_get_instance_private (self);
        self->pv->callbacks = g_hash_table_new_full (callback_hash, callback_equal, callback_free, 
unwatch_name);
        self->pv->active = g_hash_table_new_full (callback_hash, callback_equal, NULL, active_prompt_unref);
 }
@@ -377,8 +376,6 @@ gcr_system_prompter_class_init (GcrSystemPrompterClass *klass)
 
        klass->new_prompt = gcr_system_prompter_new_prompt;
 
-       g_type_class_add_private (gobject_class, sizeof (GcrSystemPrompterPrivate));
-
        /**
         * GcrSystemPrompter:mode:
         *
diff --git a/gcr/gcr-union-collection.c b/gcr/gcr-union-collection.c
index 13a416c..b66b7c8 100644
--- a/gcr/gcr-union-collection.c
+++ b/gcr/gcr-union-collection.c
@@ -58,6 +58,7 @@ struct _GcrUnionCollectionPrivate {
 static void      gcr_collection_iface       (GcrCollectionIface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (GcrUnionCollection, gcr_union_collection, G_TYPE_OBJECT,
+                         G_ADD_PRIVATE (GcrUnionCollection);
                          G_IMPLEMENT_INTERFACE (GCR_TYPE_COLLECTION, gcr_collection_iface));
 
 static void
@@ -132,7 +133,7 @@ disconnect_from_collection (GcrUnionCollection *self,
 static void
 gcr_union_collection_init (GcrUnionCollection *self)
 {
-       self->pv = G_TYPE_INSTANCE_GET_PRIVATE (self, GCR_TYPE_UNION_COLLECTION, GcrUnionCollectionPrivate);
+       self->pv = gcr_union_collection_get_instance_private (self);
        self->pv->items = g_hash_table_new_full (g_direct_hash, g_direct_equal,
                                                 NULL, g_free);
        self->pv->collections = g_hash_table_new_full (g_direct_hash, g_direct_equal,
@@ -175,7 +176,6 @@ gcr_union_collection_class_init (GcrUnionCollectionClass *klass)
        GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
        gobject_class->dispose = gcr_union_collection_dispose;
        gobject_class->finalize = gcr_union_collection_finalize;
-       g_type_class_add_private (gobject_class, sizeof (GcrUnionCollectionPrivate));
 }
 
 static guint
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]