[clutter/wip/actor-content: 30/33] Move ClutterImageLoadFlags to the common types

[Emmanuele Bassi <ebassi src gnome org>]

commit 1e02e5fa10f451263b05e4b9e2ad266a84ff1336
Author: Emmanuele Bassi <ebassi linux intel com>
Date:   Mon Apr 18 16:31:34 2011 +0100

    Move ClutterImageLoadFlags to the common types
    
    It will be shared among ClutterImage and ClutterImageLoader, and we
    don't want a circular reference.

 clutter/clutter-image-loader.h |   17 +----------------
 clutter/clutter-types.h        |   16 ++++++++++++++++
 2 files changed, 17 insertions(+), 16 deletions(-)
---
diff --git a/clutter/clutter-image-loader.h b/clutter/clutter-image-loader.h
index ece4db2..d58de90 100644
--- a/clutter/clutter-image-loader.h
+++ b/clutter/clutter-image-loader.h
@@ -32,6 +32,7 @@
 #include <glib-object.h>
 #include <gio/gio.h>
 #include <cogl/cogl.h>
+#include <clutter/clutter-types.h>
 
 G_BEGIN_DECLS
 
@@ -56,22 +57,6 @@ typedef struct _ClutterImageLoader              ClutterImageLoader;
 typedef struct _ClutterImageLoaderClass         ClutterImageLoaderClass;
 
 /**
- * ClutterImageLoadFlags:
- * @CLUTTER_IMAGE_LOAD_NONE: No flags
- * @CLUTTER_IMAGE_LOAD_PRESERVE_ASPECT: Preserve the aspect ratio of the
- *   image when loading with a predefined size
- *
- * Flags to be passed to the image loading functions.
- *
- * Since: 1.8
- */
-typedef enum {
-  CLUTTER_IMAGE_LOAD_NONE = 0,
-
-  CLUTTER_IMAGE_LOAD_PRESERVE_ASPECT = 1 << 0
-} ClutterImageLoadFlags;
-
-/**
  * ClutterImageLoader:
  *
  * The <structname>ClutterImageLoader</structname> structure contains
diff --git a/clutter/clutter-types.h b/clutter/clutter-types.h
index f4de269..2154a90 100644
--- a/clutter/clutter-types.h
+++ b/clutter/clutter-types.h
@@ -542,6 +542,22 @@ typedef enum {
   CLUTTER_MODIFIER_MASK = 0x5c001fff
 } ClutterModifierType;
 
+/**
+ * ClutterImageLoadFlags:
+ * @CLUTTER_IMAGE_LOAD_NONE: No flags
+ * @CLUTTER_IMAGE_LOAD_PRESERVE_ASPECT: Preserve the aspect ratio of the
+ *   image when loading with a predefined size
+ *
+ * Flags to be passed to the image loading functions.
+ *
+ * Since: 1.8
+ */
+typedef enum {
+  CLUTTER_IMAGE_LOAD_NONE = 0,
+
+  CLUTTER_IMAGE_LOAD_PRESERVE_ASPECT = 1 << 0
+} ClutterImageLoadFlags;
+
 G_END_DECLS
 
 #endif /* __CLUTTER_TYPES_H__ */