From 0f4245b9ba4393f2b60eb1662028e82cf9ff99e7 Mon Sep 17 00:00:00 2001
From: Nicola Fontana <ntd@entidi.it>
Date: Tue, 11 Aug 2009 16:16:59 +0200
Subject: [PATCH] [AdgCanvas] Hidden private struct

This struct is used internally to the adg library: no need to expose
anything, a forward reference to this private struct neither.
---
 adg/adg-canvas-private.h |  5 +++++
 adg/adg-canvas.c         | 17 +++++++++++++----
 adg/adg-canvas.h         |  6 +++---
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/adg/adg-canvas-private.h b/adg/adg-canvas-private.h
index 81f15076..0b080e83 100644
--- a/adg/adg-canvas-private.h
+++ b/adg/adg-canvas-private.h
@@ -26,7 +26,12 @@
 
 G_BEGIN_DECLS
 
+typedef struct _AdgCanvasPrivate AdgCanvasPrivate;
+
 struct _AdgCanvasPrivate {
+    /* Just to not have an empty struct, as I fear this could be
+     * a source of problems */
+    gint        dummy;
 };
 
 G_END_DECLS
diff --git a/adg/adg-canvas.c b/adg/adg-canvas.c
index 8675ec16..73267713 100644
--- a/adg/adg-canvas.c
+++ b/adg/adg-canvas.c
@@ -17,6 +17,7 @@
  * Boston, MA  02110-1301, USA.
  */
 
+
 /**
  * SECTION:canvas
  * @title: AdgCanvas
@@ -29,6 +30,14 @@
  * Internally, the target is mantained as a #cairo_t context pointer.
  */
 
+/**
+ * AdgCanvas:
+ *
+ * All fields are private and should not be used directly.
+ * Use its public methods instead.
+ **/
+
+
 #include "adg-canvas.h"
 #include "adg-canvas-private.h"
 #include "adg-line-style.h"
@@ -54,11 +63,11 @@ static void
 adg_canvas_init(AdgCanvas *canvas)
 {
     AdgContext *context;
-    AdgCanvasPrivate *priv =
-        G_TYPE_INSTANCE_GET_PRIVATE(canvas, ADG_TYPE_CANVAS,
-                                    AdgCanvasPrivate);
+    AdgCanvasPrivate *data = G_TYPE_INSTANCE_GET_PRIVATE(canvas,
+                                                         ADG_TYPE_CANVAS,
+                                                         AdgCanvasPrivate);
 
-    canvas->priv = priv;
+    canvas->data = data;
 
     context = adg_context_new(context_filler, NULL);
     adg_entity_set_context((AdgEntity *) canvas, context);
diff --git a/adg/adg-canvas.h b/adg/adg-canvas.h
index c0acc6d1..c9d5788d 100644
--- a/adg/adg-canvas.h
+++ b/adg/adg-canvas.h
@@ -36,16 +36,16 @@ G_BEGIN_DECLS
 
 /* AdgCanvas declared in adg-entity.h */
 typedef struct _AdgCanvasClass   AdgCanvasClass;
-typedef struct _AdgCanvasPrivate AdgCanvasPrivate;
 
 
 struct _AdgCanvas {
-    AdgContainer         container;
     /*< private >*/
-    AdgCanvasPrivate    *priv;
+    AdgContainer         parent;
+    gpointer             data;
 };
 
 struct _AdgCanvasClass {
+    /*< private >*/
     AdgContainerClass    parent_class;
 };
 
-- 
2.11.4.GIT