Version the deprecation of g_value_array_get_type()

Just like the rest of the GValueArray API.

diff --git a/gobject/gboxed.h b/gobject/gboxed.h
index 1b617b7..2b84087 100644 (file)
--- a/gobject/gboxed.h
+++ b/gobject/gboxed.h
@@ -106,22 +106,9 @@ GType    g_boxed_type_register_static     (const gchar   *name,
  */
 #define G_TYPE_VALUE (g_value_get_type ())
 
-/**
- * G_TYPE_VALUE_ARRAY:
- *
- * The type ID of the "GValueArray" type which is a boxed type,
- * used to pass around pointers to GValueArrays.
- *
- * Deprecated: 2.32: Use #GArray instead of #GValueArray
- */
-#define G_TYPE_VALUE_ARRAY (g_value_array_get_type ())
-
 GType   g_closure_get_type         (void) G_GNUC_CONST;
 GType   g_value_get_type           (void) G_GNUC_CONST;
 
-GLIB_DEPRECATED
-GType   g_value_array_get_type     (void) G_GNUC_CONST;
-
 G_END_DECLS
 
 #endif  /* __G_BOXED_H__ */

diff --git a/gobject/gvaluearray.h b/gobject/gvaluearray.h
index cb93199..de14934 100644 (file)
--- a/gobject/gvaluearray.h
+++ b/gobject/gvaluearray.h
@@ -29,6 +29,15 @@
 
 G_BEGIN_DECLS
 
+/**
+ * G_TYPE_VALUE_ARRAY:
+ *
+ * The type ID of the "GValueArray" type which is a boxed type,
+ * used to pass around pointers to GValueArrays.
+ *
+ * Deprecated: 2.32: Use #GArray instead of #GValueArray
+ */
+#define G_TYPE_VALUE_ARRAY (g_value_array_get_type ())
 
 /* --- typedefs & structs --- */
 typedef struct _GValueArray GValueArray;
@@ -48,8 +57,10 @@ struct _GValueArray
   guint   n_prealloced;
 };
 
-
 /* --- prototypes --- */
+GLIB_DEPRECATED_IN_2_32_FOR(g_array_get_type)
+GType           g_value_array_get_type       (void) G_GNUC_CONST;
+
 GLIB_DEPRECATED_IN_2_32_FOR(g_array_index)
 GValue*                g_value_array_get_nth        (GValueArray       *value_array,
                                              guint              index_);