value array: Annotate with versioned deprecation

https://bugzilla.gnome.org/show_bug.cgi?id=670542

diff --git a/gobject/gvaluearray.h b/gobject/gvaluearray.h
index 0dc9b98..cb93199 100644 (file)
--- a/gobject/gvaluearray.h
+++ b/gobject/gvaluearray.h
@@ -50,41 +50,41 @@ struct _GValueArray
 
 
 /* --- prototypes --- */
-GLIB_DEPRECATED_FOR(g_array_index)
+GLIB_DEPRECATED_IN_2_32_FOR(g_array_index)
 GValue*                g_value_array_get_nth        (GValueArray       *value_array,
                                              guint              index_);
 
-GLIB_DEPRECATED_FOR(g_array_new)
+GLIB_DEPRECATED_IN_2_32_FOR(g_array_new)
 GValueArray*   g_value_array_new            (guint              n_prealloced);
 
-GLIB_DEPRECATED_FOR(g_array_unref)
+GLIB_DEPRECATED_IN_2_32_FOR(g_array_unref)
 void           g_value_array_free           (GValueArray       *value_array);
 
-GLIB_DEPRECATED_FOR(g_array_ref)
+GLIB_DEPRECATED_IN_2_32_FOR(g_array_ref)
 GValueArray*   g_value_array_copy           (const GValueArray *value_array);
 
-GLIB_DEPRECATED_FOR(g_array_prepend_vals)
+GLIB_DEPRECATED_IN_2_32_FOR(g_array_prepend_vals)
 GValueArray*   g_value_array_prepend        (GValueArray       *value_array,
                                              const GValue      *value);
 
-GLIB_DEPRECATED_FOR(g_array_append_vals)
+GLIB_DEPRECATED_IN_2_32_FOR(g_array_append_vals)
 GValueArray*   g_value_array_append         (GValueArray       *value_array,
                                              const GValue      *value);
 
-GLIB_DEPRECATED_FOR(g_array_insert_vals)
+GLIB_DEPRECATED_IN_2_32_FOR(g_array_insert_vals)
 GValueArray*   g_value_array_insert         (GValueArray       *value_array,
                                              guint              index_,
                                              const GValue      *value);
 
-GLIB_DEPRECATED_FOR(g_array_remove_index)
+GLIB_DEPRECATED_IN_2_32_FOR(g_array_remove_index)
 GValueArray*   g_value_array_remove         (GValueArray       *value_array,
                                              guint              index_);
 
-GLIB_DEPRECATED_FOR(g_array_sort)
+GLIB_DEPRECATED_IN_2_32_FOR(g_array_sort)
 GValueArray*   g_value_array_sort           (GValueArray       *value_array,
                                              GCompareFunc       compare_func);
 
-GLIB_DEPRECATED_FOR(g_array_sort_with_data)
+GLIB_DEPRECATED_IN_2_32_FOR(g_array_sort_with_data)
 GValueArray*   g_value_array_sort_with_data (GValueArray       *value_array,
                                              GCompareDataFunc   compare_func,
                                              gpointer           user_data);

diff --git a/gobject/tests/valuearray.c b/gobject/tests/valuearray.c
index 7fe06b7..3eb5288 100644 (file)
--- a/gobject/tests/valuearray.c
+++ b/gobject/tests/valuearray.c
@@ -1,4 +1,4 @@
-#define GLIB_DISABLE_DEPRECATION_WARNINGS
+#define GLIB_VERSION_MIN_REQUIRED       GLIB_VERSION_2_30
 #include <glib-object.h>
 
 static gint