[glib/gvariant] move GVariantClass to gvariant.h

[Ryan Lortie <ryanl src gnome org>]

commit e29abe4782e9f7ed988d5f05546e51c9e057b014
Author: Ryan Lortie <desrt desrt ca>
Date:   Thu Jan 21 14:19:57 2010 -0500

    move GVariantClass to gvariant.h

 glib/gvariant.h         |   23 +++++++++++++++++++++++
 glib/gvarianttype.h     |   23 -----------------------
 glib/gvarianttypeinfo.h |    2 +-
 3 files changed, 24 insertions(+), 24 deletions(-)
---
diff --git a/glib/gvariant.h b/glib/gvariant.h
index 6b6398d..d303239 100644
--- a/glib/gvariant.h
+++ b/glib/gvariant.h
@@ -30,6 +30,29 @@
 typedef struct _GVariant        GVariant;
 typedef struct _GVariantIter    GVariantIter;
 typedef struct _GVariantBuilder GVariantBuilder;
+typedef enum   _GVariantClass   GVariantClass;
+
+enum _GVariantClass
+{
+  G_VARIANT_CLASS_BOOLEAN       = 'b',
+  G_VARIANT_CLASS_BYTE          = 'y',
+  G_VARIANT_CLASS_INT16         = 'n',
+  G_VARIANT_CLASS_UINT16        = 'q',
+  G_VARIANT_CLASS_INT32         = 'i',
+  G_VARIANT_CLASS_UINT32        = 'u',
+  G_VARIANT_CLASS_INT64         = 'x',
+  G_VARIANT_CLASS_UINT64        = 't',
+  G_VARIANT_CLASS_HANDLE        = 'h',
+  G_VARIANT_CLASS_DOUBLE        = 'd',
+  G_VARIANT_CLASS_STRING        = 's',
+  G_VARIANT_CLASS_OBJECT_PATH   = 'o',
+  G_VARIANT_CLASS_SIGNATURE     = 'g',
+  G_VARIANT_CLASS_VARIANT       = 'v',
+  G_VARIANT_CLASS_MAYBE         = 'm',
+  G_VARIANT_CLASS_ARRAY         = 'a',
+  G_VARIANT_CLASS_TUPLE         = '(',
+  G_VARIANT_CLASS_DICT_ENTRY    = '{'
+};
 
 struct _GVariantIter
 {
diff --git a/glib/gvarianttype.h b/glib/gvarianttype.h
index 62e41fe..c5b12ab 100644
--- a/glib/gvarianttype.h
+++ b/glib/gvarianttype.h
@@ -24,29 +24,6 @@
 #include <glib/gmessages.h>
 #include <glib/gtypes.h>
 
-typedef enum
-{
-  G_VARIANT_CLASS_BOOLEAN       = 'b',
-  G_VARIANT_CLASS_BYTE          = 'y',
-  G_VARIANT_CLASS_INT16         = 'n',
-  G_VARIANT_CLASS_UINT16        = 'q',
-  G_VARIANT_CLASS_INT32         = 'i',
-  G_VARIANT_CLASS_UINT32        = 'u',
-  G_VARIANT_CLASS_INT64         = 'x',
-  G_VARIANT_CLASS_UINT64        = 't',
-  G_VARIANT_CLASS_HANDLE        = 'h',
-  G_VARIANT_CLASS_DOUBLE        = 'd',
-  G_VARIANT_CLASS_STRING        = 's',
-  G_VARIANT_CLASS_OBJECT_PATH   = 'o',
-  G_VARIANT_CLASS_SIGNATURE     = 'g',
-  G_VARIANT_CLASS_VARIANT       = 'v',
-  G_VARIANT_CLASS_MAYBE         = 'm',
-  G_VARIANT_CLASS_ARRAY         = 'a',
-  G_VARIANT_CLASS_TUPLE         = '(',
-  G_VARIANT_CLASS_DICT_ENTRY    = '{'
-} GVariantClass;
-
-
 typedef struct _GVariantType GVariantType;
 
 /**
diff --git a/glib/gvarianttypeinfo.h b/glib/gvarianttypeinfo.h
index ae5e05a..bb5d0b6 100644
--- a/glib/gvarianttypeinfo.h
+++ b/glib/gvarianttypeinfo.h
@@ -20,7 +20,7 @@
 #ifndef __G_VARIANT_TYPE_INFO_H__
 #define __G_VARIANT_TYPE_INFO_H__
 
-#include "gvarianttype.h"
+#include "gvariant.h"
 
 typedef struct OPAQUE_TYPE__GVariantTypeInfo GVariantTypeInfo;