[gegl] Fix introspection of gegl_node_get_gegl_operation

[Daniel Sabo <daniels src gnome org>]

commit 91d0c0dfb68b6641cdfad356650654f30651f508
Author: Daniel Sabo <DanielSabo gmail com>
Date:   Tue Dec 3 01:59:06 2013 -0800

    Fix introspection of gegl_node_get_gegl_operation
    
    * Move enough of GeglOperation to gegl-types.h for introspection
    to identify it.
    * Move the private GeglPad and GeglConnection types to
    gegl-types-internal.h.

 gegl/gegl-types-internal.h      |    3 +++
 gegl/gegl-types.h               |   12 +++++++-----
 gegl/graph/gegl-node-private.h  |    2 +-
 gegl/graph/gegl-node.h          |    2 +-
 gegl/operation/gegl-operation.h |    6 +-----
 operations/common/introspect.c  |    1 +
 6 files changed, 14 insertions(+), 12 deletions(-)
---
diff --git a/gegl/gegl-types-internal.h b/gegl/gegl-types-internal.h
index 1fba515..b9f160d 100644
--- a/gegl/gegl-types-internal.h
+++ b/gegl/gegl-types-internal.h
@@ -22,6 +22,9 @@
 
 G_BEGIN_DECLS
 
+typedef struct _GeglPad              GeglPad;
+typedef struct _GeglConnection       GeglConnection;
+
 typedef struct _GeglCRVisitor        GeglCRVisitor;
 typedef struct _GeglDebugRectVisitor GeglDebugRectVisitor;
 typedef struct _GeglEvalManager      GeglEvalManager;
diff --git a/gegl/gegl-types.h b/gegl/gegl-types.h
index 64ebb6e..e772d11 100644
--- a/gegl/gegl-types.h
+++ b/gegl/gegl-types.h
@@ -46,11 +46,6 @@ GType gegl_config_get_type (void) G_GNUC_CONST;
 #define GEGL_CONFIG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_CONFIG, GeglConfig))
 #define GEGL_IS_CONFIG(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GEGL_TYPE_CONFIG))
 
-typedef struct _GeglPad              GeglPad;
-typedef struct _GeglOperation        GeglOperation;
-typedef struct _GeglOperationContext GeglOperationContext;
-typedef struct _GeglConnection       GeglConnection;
-
 typedef struct _GeglCurve  GeglCurve;
 typedef struct _GeglPath   GeglPath;
 typedef struct _GeglColor  GeglColor;
@@ -69,6 +64,13 @@ GType gegl_rectangle_get_type (void) G_GNUC_CONST;
 
 #define  GEGL_RECTANGLE(x,y,w,h) (&((GeglRectangle){(x), (y),   (w), (h)}))
 
+typedef struct _GeglOperationContext GeglOperationContext;
+
+typedef struct _GeglOperation  GeglOperation;
+GType gegl_operation_get_type  (void) G_GNUC_CONST;
+#define GEGL_TYPE_OPERATION    (gegl_operation_get_type ())
+#define GEGL_OPERATION(obj)    (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_OPERATION, GeglOperation))
+#define GEGL_IS_OPERATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GEGL_TYPE_OPERATION))
 
 typedef struct _GeglNode  GeglNode;
 GType gegl_node_get_type  (void) G_GNUC_CONST;
diff --git a/gegl/graph/gegl-node-private.h b/gegl/graph/gegl-node-private.h
index 80076b7..446a0bb 100644
--- a/gegl/graph/gegl-node-private.h
+++ b/gegl/graph/gegl-node-private.h
@@ -20,8 +20,8 @@
 #ifndef __GEGL_NODE_PRIVATE_H__
 #define __GEGL_NODE_PRIVATE_H__
 
-#include "gegl-buffer.h"
 #include "gegl-cache.h"
+#include "gegl-types-internal.h"
 #include "gegl-node.h"
 
 G_BEGIN_DECLS
diff --git a/gegl/graph/gegl-node.h b/gegl/graph/gegl-node.h
index 3577119..52471d8 100644
--- a/gegl/graph/gegl-node.h
+++ b/gegl/graph/gegl-node.h
@@ -492,7 +492,7 @@ GeglNode    * gegl_node_get_input_proxy  (GeglNode      *node,
 const gchar * gegl_node_get_operation    (const GeglNode *node);
 
 /**
- * gegl_node_get_gegl_operation: (skip)
+ * gegl_node_get_gegl_operation:
  * @node: a #GeglNode
  *
  * Return value: (transfer none) (allow-none): The operation object
diff --git a/gegl/operation/gegl-operation.h b/gegl/operation/gegl-operation.h
index 21fa16e..d0b7381 100644
--- a/gegl/operation/gegl-operation.h
+++ b/gegl/operation/gegl-operation.h
@@ -29,12 +29,10 @@
 
 G_BEGIN_DECLS
 
-#define GEGL_TYPE_OPERATION            (gegl_operation_get_type ())
-#define GEGL_OPERATION(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEGL_TYPE_OPERATION, 
GeglOperation))
 #define GEGL_OPERATION_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GEGL_TYPE_OPERATION, 
GeglOperationClass))
-#define GEGL_IS_OPERATION(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GEGL_TYPE_OPERATION))
 #define GEGL_IS_OPERATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GEGL_TYPE_OPERATION))
 #define GEGL_OPERATION_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GEGL_TYPE_OPERATION, 
GeglOperationClass))
+/* The rest is in gegl-types.h */
 
 typedef struct _GeglOperationClass GeglOperationClass;
 
@@ -149,8 +147,6 @@ struct _GeglOperationClass
 
 
 
-GType           gegl_operation_get_type        (void) G_GNUC_CONST;
-
 GeglRectangle   gegl_operation_get_invalidated_by_change
                                              (GeglOperation *operation,
                                               const gchar   *input_pad,
diff --git a/operations/common/introspect.c b/operations/common/introspect.c
index ea65684..19e0f10 100644
--- a/operations/common/introspect.c
+++ b/operations/common/introspect.c
@@ -31,6 +31,7 @@ gegl_chant_object(node, _("Node"), _("GeglNode to introspect"))
 #define GEGL_CHANT_C_FILE       "introspect.c"
 
 #include "gegl-chant.h"
+#include "gegl-types-internal.h"
 #include "gegl-dot.h" /* XXX: internal header file */
 #include <stdio.h>