Use new GObject private API

8 files changed, 40 insertions, 48 deletions

diff --git a/tests/plugins/builtin/builtin-plugin.c b/tests/plugins/builtin/builtin-plugin.c
index 122cfee..c6a2ffb 100644
--- a/tests/plugins/builtin/builtin-plugin.c
+++ b/tests/plugins/builtin/builtin-plugin.c
@@ -31,9 +31,9 @@
 
 #include "builtin-plugin.h"
 
-struct _TestingBuiltinPluginPrivate {
+typedef struct {
   GObject *object;
-};
+} TestingBuiltinPluginPrivate;
 
 static void peas_activatable_iface_init (PeasActivatableInterface *iface);
 
@@ -41,9 +41,13 @@ G_DEFINE_DYNAMIC_TYPE_EXTENDED (TestingBuiltinPlugin,
                                 testing_builtin_plugin,
                                 PEAS_TYPE_EXTENSION_BASE,
                                 0,
+                                G_ADD_PRIVATE_DYNAMIC (TestingBuiltinPlugin)
                                 G_IMPLEMENT_INTERFACE_DYNAMIC (PEAS_TYPE_ACTIVATABLE,
                                                                peas_activatable_iface_init))
 
+#define GET_PRIV(o) \
+  (testing_builtin_plugin_get_instance_private (o))
+
 enum {
   PROP_0,
   PROP_OBJECT
@@ -56,11 +60,12 @@ testing_builtin_plugin_set_property (GObject      *object,
                                      GParamSpec   *pspec)
 {
   TestingBuiltinPlugin *plugin = TESTING_BUILTIN_PLUGIN (object);
+  TestingBuiltinPluginPrivate *priv = GET_PRIV (plugin);
 
   switch (prop_id)
     {
     case PROP_OBJECT:
-      plugin->priv->object = g_value_get_object (value);
+      priv->object = g_value_get_object (value);
       break;
 
     default:
@@ -76,11 +81,12 @@ testing_builtin_plugin_get_property (GObject    *object,
                                      GParamSpec *pspec)
 {
   TestingBuiltinPlugin *plugin = TESTING_BUILTIN_PLUGIN (object);
+  TestingBuiltinPluginPrivate *priv = GET_PRIV (plugin);
 
   switch (prop_id)
     {
     case PROP_OBJECT:
-      g_value_set_object (value, plugin->priv->object);
+      g_value_set_object (value, priv->object);
       break;
 
     default:
@@ -92,9 +98,6 @@ testing_builtin_plugin_get_property (GObject    *object,
 static void
 testing_builtin_plugin_init (TestingBuiltinPlugin *plugin)
 {
-  plugin->priv = G_TYPE_INSTANCE_GET_PRIVATE (plugin,
-                                              TESTING_TYPE_BUILTIN_PLUGIN,
-                                              TestingBuiltinPluginPrivate);
 }
 
 static void
@@ -116,8 +119,6 @@ testing_builtin_plugin_class_init (TestingBuiltinPluginClass *klass)
   object_class->get_property = testing_builtin_plugin_get_property;
 
   g_object_class_override_property (object_class, PROP_OBJECT, "object");
-
-  g_type_class_add_private (klass, sizeof (TestingBuiltinPluginPrivate));
 }
 
 static void
diff --git a/tests/plugins/builtin/builtin-plugin.h b/tests/plugins/builtin/builtin-plugin.h
index 3af1062..3bc64dd 100644
--- a/tests/plugins/builtin/builtin-plugin.h
+++ b/tests/plugins/builtin/builtin-plugin.h
@@ -35,12 +35,9 @@ G_BEGIN_DECLS
 
 typedef struct _TestingBuiltinPlugin         TestingBuiltinPlugin;
 typedef struct _TestingBuiltinPluginClass    TestingBuiltinPluginClass;
-typedef struct _TestingBuiltinPluginPrivate  TestingBuiltinPluginPrivate;
 
 struct _TestingBuiltinPlugin {
   PeasExtensionBase parent_instance;
-
-  TestingBuiltinPluginPrivate *priv;
 };
 
 struct _TestingBuiltinPluginClass {
diff --git a/tests/plugins/has-dep/has-dep-plugin.c b/tests/plugins/has-dep/has-dep-plugin.c
index c265244..3c360bc 100644
--- a/tests/plugins/has-dep/has-dep-plugin.c
+++ b/tests/plugins/has-dep/has-dep-plugin.c
@@ -31,9 +31,9 @@
 
 #include "has-dep-plugin.h"
 
-struct _TestingHasDepPluginPrivate {
+typedef struct {
   GObject *object;
-};
+} TestingHasDepPluginPrivate;
 
 static void peas_activatable_iface_init (PeasActivatableInterface *iface);
 
@@ -41,9 +41,13 @@ G_DEFINE_DYNAMIC_TYPE_EXTENDED (TestingHasDepPlugin,
                                 testing_has_dep_plugin,
                                 PEAS_TYPE_EXTENSION_BASE,
                                 0,
+                                G_ADD_PRIVATE_DYNAMIC (TestingHasDepPlugin)
                                 G_IMPLEMENT_INTERFACE_DYNAMIC (PEAS_TYPE_ACTIVATABLE,
                                                                peas_activatable_iface_init))
 
+#define GET_PRIV(o) \
+  (testing_has_dep_plugin_get_instance_private (o))
+
 enum {
   PROP_0,
   PROP_OBJECT
@@ -56,11 +60,12 @@ testing_has_dep_plugin_set_property (GObject      *object,
                                      GParamSpec   *pspec)
 {
   TestingHasDepPlugin *plugin = TESTING_HAS_DEP_PLUGIN (object);
+  TestingHasDepPluginPrivate *priv = GET_PRIV (plugin);
 
   switch (prop_id)
     {
     case PROP_OBJECT:
-      plugin->priv->object = g_value_get_object (value);
+      priv->object = g_value_get_object (value);
       break;
 
     default:
@@ -76,11 +81,12 @@ testing_has_dep_plugin_get_property (GObject    *object,
                                      GParamSpec *pspec)
 {
   TestingHasDepPlugin *plugin = TESTING_HAS_DEP_PLUGIN (object);
+  TestingHasDepPluginPrivate *priv = GET_PRIV (plugin);
 
   switch (prop_id)
     {
     case PROP_OBJECT:
-      g_value_set_object (value, plugin->priv->object);
+      g_value_set_object (value, priv->object);
       break;
 
     default:
@@ -92,9 +98,6 @@ testing_has_dep_plugin_get_property (GObject    *object,
 static void
 testing_has_dep_plugin_init (TestingHasDepPlugin *plugin)
 {
-  plugin->priv = G_TYPE_INSTANCE_GET_PRIVATE (plugin,
-                                              TESTING_TYPE_HAS_DEP_PLUGIN,
-                                              TestingHasDepPluginPrivate);
 }
 
 static void
@@ -116,8 +119,6 @@ testing_has_dep_plugin_class_init (TestingHasDepPluginClass *klass)
   object_class->get_property = testing_has_dep_plugin_get_property;
 
   g_object_class_override_property (object_class, PROP_OBJECT, "object");
-
-  g_type_class_add_private (klass, sizeof (TestingHasDepPluginPrivate));
 }
 
 static void
diff --git a/tests/plugins/has-dep/has-dep-plugin.h b/tests/plugins/has-dep/has-dep-plugin.h
index 8faec07..c3c4ac1 100644
--- a/tests/plugins/has-dep/has-dep-plugin.h
+++ b/tests/plugins/has-dep/has-dep-plugin.h
@@ -35,12 +35,9 @@ G_BEGIN_DECLS
 
 typedef struct _TestingHasDepPlugin         TestingHasDepPlugin;
 typedef struct _TestingHasDepPluginClass    TestingHasDepPluginClass;
-typedef struct _TestingHasDepPluginPrivate  TestingHasDepPluginPrivate;
 
 struct _TestingHasDepPlugin {
   PeasExtensionBase parent_instance;
-
-  TestingHasDepPluginPrivate *priv;
 };
 
 struct _TestingHasDepPluginClass {
diff --git a/tests/plugins/loadable/loadable-plugin.c b/tests/plugins/loadable/loadable-plugin.c
index 1f9d8fb..9bdc29d 100644
--- a/tests/plugins/loadable/loadable-plugin.c
+++ b/tests/plugins/loadable/loadable-plugin.c
@@ -31,9 +31,9 @@
 
 #include "loadable-plugin.h"
 
-struct _TestingLoadablePluginPrivate {
+typedef struct {
   GObject *object;
-};
+} TestingLoadablePluginPrivate;
 
 /* Used by the local linkage test */
 G_MODULE_EXPORT gpointer global_symbol_clash;
@@ -44,9 +44,13 @@ G_DEFINE_DYNAMIC_TYPE_EXTENDED (TestingLoadablePlugin,
                                 testing_loadable_plugin,
                                 G_TYPE_OBJECT,
                                 0,
+                                G_ADD_PRIVATE_DYNAMIC (TestingLoadablePlugin)
                                 G_IMPLEMENT_INTERFACE_DYNAMIC (PEAS_TYPE_ACTIVATABLE,
                                                                peas_activatable_iface_init))
 
+#define GET_PRIV(o) \
+  (testing_loadable_plugin_get_instance_private (o))
+
 enum {
   PROP_0,
   PROP_GLOBAL_SYMBOL_CLASH,
@@ -65,11 +69,12 @@ testing_loadable_plugin_set_property (GObject      *object,
                                       GParamSpec   *pspec)
 {
   TestingLoadablePlugin *plugin = TESTING_LOADABLE_PLUGIN (object);
+  TestingLoadablePluginPrivate *priv = GET_PRIV (plugin);
 
   switch (prop_id)
     {
     case PROP_OBJECT:
-      plugin->priv->object = g_value_get_object (value);
+      priv->object = g_value_get_object (value);
       break;
 
     default:
@@ -85,6 +90,7 @@ testing_loadable_plugin_get_property (GObject    *object,
                                       GParamSpec *pspec)
 {
   TestingLoadablePlugin *plugin = TESTING_LOADABLE_PLUGIN (object);
+  TestingLoadablePluginPrivate *priv = GET_PRIV (plugin);
 
   switch (prop_id)
     {
@@ -93,7 +99,7 @@ testing_loadable_plugin_get_property (GObject    *object,
       break;
 
     case PROP_OBJECT:
-      g_value_set_object (value, plugin->priv->object);
+      g_value_set_object (value, priv->object);
       break;
 
     default:
@@ -105,9 +111,6 @@ testing_loadable_plugin_get_property (GObject    *object,
 static void
 testing_loadable_plugin_init (TestingLoadablePlugin *plugin)
 {
-  plugin->priv = G_TYPE_INSTANCE_GET_PRIVATE (plugin,
-                                              TESTING_TYPE_LOADABLE_PLUGIN,
-                                              TestingLoadablePluginPrivate);
 }
 
 static void
@@ -138,8 +141,6 @@ testing_loadable_plugin_class_init (TestingLoadablePluginClass *klass)
                           G_PARAM_STATIC_STRINGS);
 
   g_object_class_install_properties (object_class, N_PROPERTIES, properties);
-
-  g_type_class_add_private (klass, sizeof (TestingLoadablePluginPrivate));
 }
 
 static void
diff --git a/tests/plugins/loadable/loadable-plugin.h b/tests/plugins/loadable/loadable-plugin.h
index c134133..b9ced38 100644
--- a/tests/plugins/loadable/loadable-plugin.h
+++ b/tests/plugins/loadable/loadable-plugin.h
@@ -35,15 +35,12 @@ G_BEGIN_DECLS
 
 typedef struct _TestingLoadablePlugin         TestingLoadablePlugin;
 typedef struct _TestingLoadablePluginClass    TestingLoadablePluginClass;
-typedef struct _TestingLoadablePluginPrivate  TestingLoadablePluginPrivate;
 
 struct _TestingLoadablePlugin {
   /* Inherit from GObject and not PeasExtensionBase
    * to check that it is possible
    */
   GObject parent_instance;
-
-  TestingLoadablePluginPrivate *priv;
 };
 
 struct _TestingLoadablePluginClass {
diff --git a/tests/plugins/self-dep/self-dep-plugin.c b/tests/plugins/self-dep/self-dep-plugin.c
index 397a4b5..c73ea5c 100644
--- a/tests/plugins/self-dep/self-dep-plugin.c
+++ b/tests/plugins/self-dep/self-dep-plugin.c
@@ -31,9 +31,9 @@
 
 #include "self-dep-plugin.h"
 
-struct _TestingSelfDepPluginPrivate {
+typedef struct {
   GObject *object;
-};
+} TestingSelfDepPluginPrivate;
 
 static void peas_activatable_iface_init (PeasActivatableInterface *iface);
 
@@ -41,9 +41,13 @@ G_DEFINE_DYNAMIC_TYPE_EXTENDED (TestingSelfDepPlugin,
                                 testing_self_dep_plugin,
                                 PEAS_TYPE_EXTENSION_BASE,
                                 0,
+                                G_ADD_PRIVATE_DYNAMIC (TestingSelfDepPlugin)
                                 G_IMPLEMENT_INTERFACE_DYNAMIC (PEAS_TYPE_ACTIVATABLE,
                                                                peas_activatable_iface_init))
 
+#define GET_PRIV(o) \
+  (testing_self_dep_plugin_get_instance_private (o))
+
 enum {
   PROP_0,
   PROP_OBJECT
@@ -56,11 +60,12 @@ testing_self_dep_plugin_set_property (GObject      *object,
                                       GParamSpec   *pspec)
 {
   TestingSelfDepPlugin *plugin = TESTING_SELF_DEP_PLUGIN (object);
+  TestingSelfDepPluginPrivate *priv = GET_PRIV (plugin);
 
   switch (prop_id)
     {
     case PROP_OBJECT:
-      plugin->priv->object = g_value_get_object (value);
+      priv->object = g_value_get_object (value);
       break;
 
     default:
@@ -76,11 +81,12 @@ testing_self_dep_plugin_get_property (GObject    *object,
                                       GParamSpec *pspec)
 {
   TestingSelfDepPlugin *plugin = TESTING_SELF_DEP_PLUGIN (object);
+  TestingSelfDepPluginPrivate *priv = GET_PRIV (plugin);
 
   switch (prop_id)
     {
     case PROP_OBJECT:
-      g_value_set_object (value, plugin->priv->object);
+      g_value_set_object (value, priv->object);
       break;
 
     default:
@@ -92,9 +98,6 @@ testing_self_dep_plugin_get_property (GObject    *object,
 static void
 testing_self_dep_plugin_init (TestingSelfDepPlugin *plugin)
 {
-  plugin->priv = G_TYPE_INSTANCE_GET_PRIVATE (plugin,
-                                              TESTING_TYPE_SELF_DEP_PLUGIN,
-                                              TestingSelfDepPluginPrivate);
 }
 
 static void
@@ -116,8 +119,6 @@ testing_self_dep_plugin_class_init (TestingSelfDepPluginClass *klass)
   object_class->get_property = testing_self_dep_plugin_get_property;
 
   g_object_class_override_property (object_class, PROP_OBJECT, "object");
-
-  g_type_class_add_private (klass, sizeof (TestingSelfDepPluginPrivate));
 }
 
 static void
diff --git a/tests/plugins/self-dep/self-dep-plugin.h b/tests/plugins/self-dep/self-dep-plugin.h
index 62a2962..2e576b9 100644
--- a/tests/plugins/self-dep/self-dep-plugin.h
+++ b/tests/plugins/self-dep/self-dep-plugin.h
@@ -35,12 +35,9 @@ G_BEGIN_DECLS
 
 typedef struct _TestingSelfDepPlugin         TestingSelfDepPlugin;
 typedef struct _TestingSelfDepPluginClass    TestingSelfDepPluginClass;
-typedef struct _TestingSelfDepPluginPrivate  TestingSelfDepPluginPrivate;
 
 struct _TestingSelfDepPlugin {
   PeasExtensionBase parent_instance;
-
-  TestingSelfDepPluginPrivate *priv;
 };
 
 struct _TestingSelfDepPluginClass {