[json-glib] Drop some more pointless GET_PRIVATE macros

[Emmanuele Bassi <ebassi src gnome org>]

commit df8ff199e2a56f5b0430dbe6c7a30addac5fcb42
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Thu Aug 22 12:10:07 2013 +0100

    Drop some more pointless GET_PRIVATE macros
    
    We can use the autogenerated get_instance_private() function.

 json-glib/json-builder.c   |    8 +++-----
 json-glib/json-generator.c |   11 +++++------
 2 files changed, 8 insertions(+), 11 deletions(-)
---
diff --git a/json-glib/json-builder.c b/json-glib/json-builder.c
index 90d6e2c..c190b12 100644
--- a/json-glib/json-builder.c
+++ b/json-glib/json-builder.c
@@ -48,8 +48,6 @@
 
 #include "json-builder.h"
 
-#define JSON_BUILDER_GET_PRIVATE(obj)   ((JsonBuilderPrivate *) json_builder_get_instance_private 
((JsonBuilder *) (obj)))
-
 struct _JsonBuilderPrivate
 {
   GQueue *stack;
@@ -126,7 +124,7 @@ json_builder_free_all_state (JsonBuilder *builder)
 static void
 json_builder_finalize (GObject *gobject)
 {
-  JsonBuilderPrivate *priv = JSON_BUILDER_GET_PRIVATE (gobject);
+  JsonBuilderPrivate *priv = json_builder_get_instance_private ((JsonBuilder *) gobject);
 
   json_builder_free_all_state (JSON_BUILDER (gobject));
 
@@ -147,9 +145,9 @@ json_builder_class_init (JsonBuilderClass *klass)
 static void
 json_builder_init (JsonBuilder *builder)
 {
-  JsonBuilderPrivate *priv;
+  JsonBuilderPrivate *priv = json_builder_get_instance_private (builder);
 
-  builder->priv = priv = JSON_BUILDER_GET_PRIVATE (builder);
+  builder->priv = priv;
 
   priv->stack = g_queue_new ();
   priv->root = NULL;
diff --git a/json-glib/json-generator.c b/json-glib/json-generator.c
index 8621b02..c5caa64 100644
--- a/json-glib/json-generator.c
+++ b/json-glib/json-generator.c
@@ -41,8 +41,6 @@
 #include "json-marshal.h"
 #include "json-generator.h"
 
-#define JSON_GENERATOR_GET_PRIVATE(obj) ((JsonGeneratorPrivate *) json_generator_get_instance_private 
((JsonGenerator *) (obj)))
-
 struct _JsonGeneratorPrivate
 {
   JsonNode *root;
@@ -119,9 +117,10 @@ json_strescape (const gchar *str)
 static void
 json_generator_finalize (GObject *gobject)
 {
-  JsonGeneratorPrivate *priv = JSON_GENERATOR_GET_PRIVATE (gobject);
+  JsonGeneratorPrivate *priv;
 
-  if (priv->root)
+  priv = json_generator_get_instance_private ((JsonGenerator *) gobject);
+  if (priv->root != NULL)
     json_node_free (priv->root);
 
   G_OBJECT_CLASS (json_generator_parent_class)->finalize (gobject);
@@ -257,9 +256,9 @@ json_generator_class_init (JsonGeneratorClass *klass)
 static void
 json_generator_init (JsonGenerator *generator)
 {
-  JsonGeneratorPrivate *priv;
+  JsonGeneratorPrivate *priv = json_generator_get_instance_private (generator);
 
-  generator->priv = priv = JSON_GENERATOR_GET_PRIVATE (generator);
+  generator->priv = priv;
 
   priv->pretty = FALSE;
   priv->indent = 2;