Add versioned deprecation annotationwip/version-bounds

We start from GLib 2.26.

6 files changed, 57 insertions, 57 deletions

diff --git a/glib/deprecated/gcompletion.h b/glib/deprecated/gcompletion.h
index f598ca75d..88a0479d8 100644
--- a/glib/deprecated/gcompletion.h
+++ b/glib/deprecated/gcompletion.h
@@ -56,28 +56,28 @@ struct _GCompletion
   GCompletionStrncmpFunc strncmp_func;
 };
 
-GLIB_DEPRECATED
+GLIB_DEPRECATED_IN_2_26
 GCompletion* g_completion_new           (GCompletionFunc func);
-GLIB_DEPRECATED
+GLIB_DEPRECATED_IN_2_26
 void         g_completion_add_items     (GCompletion*    cmp,
                                          GList*          items);
-GLIB_DEPRECATED
+GLIB_DEPRECATED_IN_2_26
 void         g_completion_remove_items  (GCompletion*    cmp,
                                          GList*          items);
-GLIB_DEPRECATED
+GLIB_DEPRECATED_IN_2_26
 void         g_completion_clear_items   (GCompletion*    cmp);
-GLIB_DEPRECATED
+GLIB_DEPRECATED_IN_2_26
 GList*       g_completion_complete      (GCompletion*    cmp,
                                          const gchar*    prefix,
                                          gchar**         new_prefix);
-GLIB_DEPRECATED
+GLIB_DEPRECATED_IN_2_26
 GList*       g_completion_complete_utf8 (GCompletion  *cmp,
                                          const gchar*    prefix,
                                          gchar**         new_prefix);
-GLIB_DEPRECATED
+GLIB_DEPRECATED_IN_2_26
 void         g_completion_set_compare   (GCompletion *cmp,
                                          GCompletionStrncmpFunc strncmp_func);
-GLIB_DEPRECATED
+GLIB_DEPRECATED_IN_2_26
 void         g_completion_free          (GCompletion*    cmp);
 
 G_END_DECLS
diff --git a/glib/deprecated/grel.h b/glib/deprecated/grel.h
index 68dcd3159..c9e09962a 100644
--- a/glib/deprecated/grel.h
+++ b/glib/deprecated/grel.h
@@ -66,38 +66,38 @@ struct _GTuples
  * g_relation_count() counts ...
  */
 
-GLIB_DEPRECATED
+GLIB_DEPRECATED_IN_2_26
 GRelation* g_relation_new     (gint         fields);
-GLIB_DEPRECATED
+GLIB_DEPRECATED_IN_2_26
 void       g_relation_destroy (GRelation   *relation);
-GLIB_DEPRECATED
+GLIB_DEPRECATED_IN_2_26
 void       g_relation_index   (GRelation   *relation,
                                gint         field,
                                GHashFunc    hash_func,
                                GEqualFunc   key_equal_func);
-GLIB_DEPRECATED
+GLIB_DEPRECATED_IN_2_26
 void       g_relation_insert  (GRelation   *relation,
                                ...);
-GLIB_DEPRECATED
+GLIB_DEPRECATED_IN_2_26
 gint       g_relation_delete  (GRelation   *relation,
                                gconstpointer  key,
                                gint         field);
-GLIB_DEPRECATED
+GLIB_DEPRECATED_IN_2_26
 GTuples*   g_relation_select  (GRelation   *relation,
                                gconstpointer  key,
                                gint         field);
-GLIB_DEPRECATED
+GLIB_DEPRECATED_IN_2_26
 gint       g_relation_count   (GRelation   *relation,
                                gconstpointer  key,
                                gint         field);
-GLIB_DEPRECATED
+GLIB_DEPRECATED_IN_2_26
 gboolean   g_relation_exists  (GRelation   *relation,
                                ...);
-GLIB_DEPRECATED
+GLIB_DEPRECATED_IN_2_26
 void       g_relation_print   (GRelation   *relation);
-GLIB_DEPRECATED
+GLIB_DEPRECATED_IN_2_26
 void       g_tuples_destroy   (GTuples     *tuples);
-GLIB_DEPRECATED
+GLIB_DEPRECATED_IN_2_26
 gpointer   g_tuples_index     (GTuples     *tuples,
                                gint         index_,
                                gint         field);
diff --git a/glib/deprecated/gthread.h b/glib/deprecated/gthread.h
index a0d795d35..1866540ea 100644
--- a/glib/deprecated/gthread.h
+++ b/glib/deprecated/gthread.h
@@ -96,13 +96,13 @@ GLIB_VAR gboolean               g_thread_use_default_impl;
 
 GLIB_VAR guint64   (*g_thread_gettime) (void);
 
-GLIB_DEPRECATED_FOR(g_thread_new)
+GLIB_DEPRECATED_IN_2_32_FOR(g_thread_new)
 GThread *g_thread_create       (GThreadFunc       func,
                                 gpointer          data,
                                 gboolean          joinable,
                                 GError          **error);
 
-GLIB_DEPRECATED_FOR(g_thread_new)
+GLIB_DEPRECATED_IN_2_32_FOR(g_thread_new)
 GThread *g_thread_create_full  (GThreadFunc       func,
                                 gpointer          data,
                                 gulong            stack_size,
@@ -111,11 +111,11 @@ GThread *g_thread_create_full  (GThreadFunc       func,
                                 GThreadPriority   priority,
                                 GError          **error);
 
-GLIB_DEPRECATED
+GLIB_DEPRECATED_IN_2_32
 void     g_thread_set_priority (GThread          *thread,
                                 GThreadPriority   priority);
 
-GLIB_DEPRECATED
+GLIB_DEPRECATED_IN_2_32
 void     g_thread_foreach      (GFunc             thread_func,
                                 gpointer          user_data);
 
@@ -141,9 +141,9 @@ typedef struct
 #define g_static_mutex_unlock(mutex) \
     g_mutex_unlock (g_static_mutex_get_mutex (mutex))
 
-GLIB_DEPRECATED_FOR(g_mutex_init)
+GLIB_DEPRECATED_IN_2_32_FOR(g_mutex_init)
 void    g_static_mutex_init           (GStaticMutex *mutex);
-GLIB_DEPRECATED_FOR(g_mutex_free)
+GLIB_DEPRECATED_IN_2_32_FOR(g_mutex_free)
 void    g_static_mutex_free           (GStaticMutex *mutex);
 GMutex *g_static_mutex_get_mutex_impl (GStaticMutex *mutex);
 
@@ -166,26 +166,26 @@ struct _GStaticRecMutex
 };
 
 #define G_STATIC_REC_MUTEX_INIT { G_STATIC_MUTEX_INIT }
-GLIB_DEPRECATED_FOR(g_rec_mutex_init)
+GLIB_DEPRECATED_IN_2_32_FOR(g_rec_mutex_init)
 void     g_static_rec_mutex_init        (GStaticRecMutex *mutex);
 
-GLIB_DEPRECATED_FOR(g_rec_mutex_lock)
+GLIB_DEPRECATED_IN_2_32_FOR(g_rec_mutex_lock)
 void     g_static_rec_mutex_lock        (GStaticRecMutex *mutex);
 
-GLIB_DEPRECATED_FOR(g_rec_mutex_try_lock)
+GLIB_DEPRECATED_IN_2_32_FOR(g_rec_mutex_try_lock)
 gboolean g_static_rec_mutex_trylock     (GStaticRecMutex *mutex);
 
-GLIB_DEPRECATED_FOR(g_rec_mutex_unlock)
+GLIB_DEPRECATED_IN_2_32_FOR(g_rec_mutex_unlock)
 void     g_static_rec_mutex_unlock      (GStaticRecMutex *mutex);
 
-GLIB_DEPRECATED
+GLIB_DEPRECATED_IN_2_32
 void     g_static_rec_mutex_lock_full   (GStaticRecMutex *mutex,
                                          guint            depth);
 
-GLIB_DEPRECATED
+GLIB_DEPRECATED_IN_2_32
 guint    g_static_rec_mutex_unlock_full (GStaticRecMutex *mutex);
 
-GLIB_DEPRECATED_FOR(g_rec_mutex_free)
+GLIB_DEPRECATED_IN_2_32_FOR(g_rec_mutex_free)
 void     g_static_rec_mutex_free        (GStaticRecMutex *mutex);
 
 typedef struct _GStaticRWLock GStaticRWLock;
@@ -203,31 +203,31 @@ struct _GStaticRWLock
 
 #define G_STATIC_RW_LOCK_INIT { G_STATIC_MUTEX_INIT, NULL, NULL, 0, FALSE, 0, 0 }
 
-GLIB_DEPRECATED_FOR(g_rw_lock_init)
+GLIB_DEPRECATED_IN_2_32_FOR(g_rw_lock_init)
 void      g_static_rw_lock_init           (GStaticRWLock *lock);
 
-GLIB_DEPRECATED_FOR(g_rw_lock_reader_lock)
+GLIB_DEPRECATED_IN_2_32_FOR(g_rw_lock_reader_lock)
 void      g_static_rw_lock_reader_lock    (GStaticRWLock *lock);
 
-GLIB_DEPRECATED_FOR(g_rw_lock_reader_trylock)
+GLIB_DEPRECATED_IN_2_32_FOR(g_rw_lock_reader_trylock)
 gboolean  g_static_rw_lock_reader_trylock (GStaticRWLock *lock);
 
-GLIB_DEPRECATED_FOR(g_rw_lock_reader_unlock)
+GLIB_DEPRECATED_IN_2_32_FOR(g_rw_lock_reader_unlock)
 void      g_static_rw_lock_reader_unlock  (GStaticRWLock *lock);
 
-GLIB_DEPRECATED_FOR(g_rw_lock_writer_lock)
+GLIB_DEPRECATED_IN_2_32_FOR(g_rw_lock_writer_lock)
 void      g_static_rw_lock_writer_lock    (GStaticRWLock *lock);
 
-GLIB_DEPRECATED_FOR(g_rw_lock_writer_trylock)
+GLIB_DEPRECATED_IN_2_32_FOR(g_rw_lock_writer_trylock)
 gboolean  g_static_rw_lock_writer_trylock (GStaticRWLock *lock);
 
-GLIB_DEPRECATED_FOR(g_rw_lock_writer_unlock)
+GLIB_DEPRECATED_IN_2_32_FOR(g_rw_lock_writer_unlock)
 void      g_static_rw_lock_writer_unlock  (GStaticRWLock *lock);
 
-GLIB_DEPRECATED_FOR(g_rw_lock_free)
+GLIB_DEPRECATED_IN_2_32_FOR(g_rw_lock_free)
 void      g_static_rw_lock_free           (GStaticRWLock *lock);
 
-GLIB_DEPRECATED
+GLIB_DEPRECATED_IN_2_32
 GPrivate *      g_private_new             (GDestroyNotify notify);
 
 typedef struct _GStaticPrivate  GStaticPrivate;
@@ -238,44 +238,44 @@ struct _GStaticPrivate
 };
 
 #define G_STATIC_PRIVATE_INIT { 0 }
-GLIB_DEPRECATED
+GLIB_DEPRECATED_IN_2_32
 void     g_static_private_init           (GStaticPrivate *private_key);
 
-GLIB_DEPRECATED_FOR(g_private_get)
+GLIB_DEPRECATED_IN_2_32_FOR(g_private_get)
 gpointer g_static_private_get            (GStaticPrivate *private_key);
 
-GLIB_DEPRECATED_FOR(g_private_set)
+GLIB_DEPRECATED_IN_2_32_FOR(g_private_set)
 void     g_static_private_set            (GStaticPrivate *private_key,
                                           gpointer        data,
                                           GDestroyNotify  notify);
 
-GLIB_DEPRECATED
+GLIB_DEPRECATED_IN_2_32
 void     g_static_private_free           (GStaticPrivate *private_key);
 
-GLIB_DEPRECATED
+GLIB_DEPRECATED_IN_2_32
 gboolean g_once_init_enter_impl          (volatile gsize *location);
 
-GLIB_DEPRECATED
+GLIB_DEPRECATED_IN_2_32
 void     g_thread_init                   (gpointer vtable);
-GLIB_DEPRECATED
+GLIB_DEPRECATED_IN_2_32
 void    g_thread_init_with_errorcheck_mutexes (gpointer vtable);
 
-GLIB_DEPRECATED
+GLIB_DEPRECATED_IN_2_32
 gboolean g_thread_get_initialized        (void);
 
 GLIB_VAR gboolean g_threads_got_initialized;
 
 #define g_thread_supported()     (1)
 
-GLIB_DEPRECATED
+GLIB_DEPRECATED_IN_2_32
 GMutex *        g_mutex_new             (void);
-GLIB_DEPRECATED
+GLIB_DEPRECATED_IN_2_32
 void            g_mutex_free            (GMutex *mutex);
-GLIB_DEPRECATED
+GLIB_DEPRECATED_IN_2_32
 GCond *         g_cond_new              (void);
-GLIB_DEPRECATED
+GLIB_DEPRECATED_IN_2_32
 void            g_cond_free             (GCond  *cond);
-GLIB_DEPRECATED
+GLIB_DEPRECATED_IN_2_32
 gboolean        g_cond_timed_wait       (GCond          *cond,
                                          GMutex         *mutex,
                                          GTimeVal       *timeval);
diff --git a/glib/gatomic.h b/glib/gatomic.h
index 41df1dbd7..5403f281b 100644
--- a/glib/gatomic.h
+++ b/glib/gatomic.h
@@ -62,7 +62,7 @@ gsize                   g_atomic_pointer_or                   (volatile void  *a
 gsize                   g_atomic_pointer_xor                  (volatile void  *atomic,
                                                                gsize           val);
 
-GLIB_DEPRECATED_FOR(g_atomic_add)
+GLIB_DEPRECATED_IN_2_30_FOR(g_atomic_add)
 gint                    g_atomic_int_exchange_and_add         (volatile gint  *atomic,
                                                                gint            val);
 
diff --git a/glib/gmain.h b/glib/gmain.h
index 498e10890..cba45fdc8 100644
--- a/glib/gmain.h
+++ b/glib/gmain.h
@@ -409,7 +409,7 @@ void     g_source_add_child_source    (GSource        *source,
 void     g_source_remove_child_source (GSource        *source,
 				       GSource        *child_source);
 
-GLIB_DEPRECATED_FOR(g_source_get_time)
+GLIB_DEPRECATED_IN_2_28_FOR(g_source_get_time)
 void     g_source_get_current_time (GSource        *source,
                                     GTimeVal       *timeval);
 
diff --git a/glib/gunicode.h b/glib/gunicode.h
index 10d35329a..93598725d 100644
--- a/glib/gunicode.h
+++ b/glib/gunicode.h
@@ -570,7 +570,7 @@ void g_unicode_canonical_ordering (gunichar *string,
                                    gsize     len);
 
 
-GLIB_DEPRECATED
+GLIB_DEPRECATED_IN_2_30
 gunichar *g_unicode_canonical_decomposition (gunichar  ch,
                                              gsize    *result_len) G_GNUC_MALLOC;