[cogl/lionel/introspection-next: 22/42] matrix: update introspection support

[Lionel Landwerlin <llandwerlin src gnome org>]

commit 2602e2f1a47a4b88019a278e1271da9daa0a9727
Author: Lionel Landwerlin <llandwerlin gmail com>
Date:   Tue Sep 3 15:40:46 2013 +0100

    matrix: update introspection support

 cogl/cogl-matrix.c |    2 --
 cogl/cogl-matrix.h |   23 ++++++-----------------
 2 files changed, 6 insertions(+), 19 deletions(-)
---
diff --git a/cogl/cogl-matrix.c b/cogl/cogl-matrix.c
index 5c3cb67..cc82531 100644
--- a/cogl/cogl-matrix.c
+++ b/cogl/cogl-matrix.c
@@ -77,12 +77,10 @@
 #include <math.h>
 #include <string.h>
 
-#ifdef _COGL_SUPPORTS_GTYPE_INTEGRATION
 #include <cogl-gtype-private.h>
 COGL_GTYPE_DEFINE_BOXED ("Matrix", matrix,
                          cogl_matrix_copy,
                          cogl_matrix_free);
-#endif
 
 /*
  * Symbolic names to some of the entries in the matrix
diff --git a/cogl/cogl-matrix.h b/cogl/cogl-matrix.h
index de6cba3..b46e43f 100644
--- a/cogl/cogl-matrix.h
+++ b/cogl/cogl-matrix.h
@@ -116,6 +116,12 @@ struct _CoglMatrix
 };
 COGL_STRUCT_SIZE_ASSERT (CoglMatrix, 128 + sizeof (unsigned long) * 3);
 
+
+#ifdef _COGL_SUPPORTS_GTYPE_INTEGRATION
+#define COGL_GTYPE_TYPE_MATRIX (cogl_gtype_matrix_get_type ())
+#endif /* _COGL_SUPPORTS_GTYPE_INTEGRATION */
+COGL_GTYPE_DECLARE_TYPE (matrix);
+
 /**
  * cogl_matrix_init_identity:
  * @matrix: A 4x4 transformation matrix
@@ -780,23 +786,6 @@ cogl_matrix_transpose (CoglMatrix *matrix);
 void
 cogl_debug_matrix_print (const CoglMatrix *matrix);
 
-#ifdef _COGL_SUPPORTS_GTYPE_INTEGRATION
-
-#define COGL_GTYPE_TYPE_MATRIX (cogl_gtype_matrix_get_type ())
-
-/**
- * cogl_gtype_matrix_get_type:
- *
- * Returns: the GType for the registered "CoglMatrix" boxed type. This
- * can be used for example to define GObject properties that accept a
- * #CoglMatrix value.
- */
-GType
-cogl_gtype_matrix_get_type (void);
-
-#endif /* _COGL_SUPPORTS_GTYPE_INTEGRATION */
-
 COGL_END_DECLS
 
 #endif /* __COGL_MATRIX_H */
-