From b3d0c00e584c5b97b79939ed5a699379a8bcd961 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Tue, 5 Jun 2012 10:46:34 +0200 Subject: [PATCH] text-mixin: use versioned deprecation macros https://bugs.freedesktop.org/show_bug.cgi?id=50712 --- telepathy-glib/text-mixin.h | 54 ++++++++++++++++++++++++------------------- 1 file changed, 30 insertions(+), 24 deletions(-) diff --git a/telepathy-glib/text-mixin.h b/telepathy-glib/text-mixin.h index 9222896..2107f4d 100644 --- a/telepathy-glib/text-mixin.h +++ b/telepathy-glib/text-mixin.h @@ -78,43 +78,49 @@ struct _TpTextMixin { #define TP_TEXT_MIXIN(o) \ ((TpTextMixin *) tp_mixin_offset_cast (o, TP_TEXT_MIXIN_OFFSET (o))) -GQuark tp_text_mixin_class_get_offset_quark (void) _TP_GNUC_DEPRECATED; -GQuark tp_text_mixin_get_offset_quark (void) _TP_GNUC_DEPRECATED; +_TP_DEPRECATED_IN_0_20 +GQuark tp_text_mixin_class_get_offset_quark (void); +_TP_DEPRECATED_IN_0_20 +GQuark tp_text_mixin_get_offset_quark (void); -void tp_text_mixin_class_init (GObjectClass *obj_cls, glong offset) - _TP_GNUC_DEPRECATED; +_TP_DEPRECATED_IN_0_20 +void tp_text_mixin_class_init (GObjectClass *obj_cls, glong offset); +_TP_DEPRECATED_IN_0_20_FOR (tp_message_mixin_init) void tp_text_mixin_init (GObject *obj, glong offset, - TpHandleRepoIface *contacts_repo) - _TP_GNUC_DEPRECATED_FOR (tp_message_mixin_init); -void tp_text_mixin_set_message_types (GObject *obj, ...) _TP_GNUC_DEPRECATED; -void tp_text_mixin_finalize (GObject *obj) - _TP_GNUC_DEPRECATED_FOR (tp_message_mixin_finalize); + TpHandleRepoIface *contacts_repo); +_TP_DEPRECATED_IN_0_20 +void tp_text_mixin_set_message_types (GObject *obj, ...); +_TP_DEPRECATED_IN_0_20_FOR (tp_message_mixin_finalize) +void tp_text_mixin_finalize (GObject *obj); +_TP_DEPRECATED_IN_0_20_FOR (tp_message_mixin_take_received) gboolean tp_text_mixin_receive_with_flags (GObject *obj, TpChannelTextMessageType type, TpHandle sender, time_t timestamp, - const char *text, TpChannelTextMessageFlags flags) - _TP_GNUC_DEPRECATED_FOR (tp_message_mixin_take_received); + const char *text, TpChannelTextMessageFlags flags); +_TP_DEPRECATED_IN_0_20_FOR (tp_message_mixin_take_received) gboolean tp_text_mixin_receive (GObject *obj, TpChannelTextMessageType type, - TpHandle sender, time_t timestamp, const char *text) - _TP_GNUC_DEPRECATED_FOR (tp_message_mixin_take_received); + TpHandle sender, time_t timestamp, const char *text); +_TP_DEPRECATED_IN_0_20 gboolean tp_text_mixin_acknowledge_pending_messages (GObject *obj, - const GArray * ids, GError **error) _TP_GNUC_DEPRECATED; + const GArray * ids, GError **error); +_TP_DEPRECATED_IN_0_20 gboolean tp_text_mixin_list_pending_messages (GObject *obj, gboolean clear, - GPtrArray ** ret, GError **error) _TP_GNUC_DEPRECATED; + GPtrArray ** ret, GError **error); +_TP_DEPRECATED_IN_0_20 gboolean tp_text_mixin_get_message_types (GObject *obj, GArray **ret, - GError **error) _TP_GNUC_DEPRECATED; -void tp_text_mixin_clear (GObject *obj) - _TP_GNUC_DEPRECATED_FOR (tp_message_mixin_clear); + GError **error); +_TP_DEPRECATED_IN_0_20_FOR (tp_message_mixin_clear) +void tp_text_mixin_clear (GObject *obj); +_TP_DEPRECATED_IN_0_20_FOR (tp_message_mixin_has_pending_messages) gboolean tp_text_mixin_has_pending_messages (GObject *obj, - TpHandle *first_sender) - _TP_GNUC_DEPRECATED_FOR (tp_message_mixin_has_pending_messages); -void tp_text_mixin_set_rescued (GObject *obj) - _TP_GNUC_DEPRECATED_FOR (tp_message_mixin_set_rescued); + TpHandle *first_sender); +_TP_DEPRECATED_IN_0_20_FOR (tp_message_mixin_set_rescued) +void tp_text_mixin_set_rescued (GObject *obj); -void tp_text_mixin_iface_init (gpointer g_iface, gpointer iface_data) - _TP_GNUC_DEPRECATED_FOR (tp_message_mixin_text_iface_init); +_TP_DEPRECATED_IN_0_20_FOR (tp_message_mixin_text_iface_init) +void tp_text_mixin_iface_init (gpointer g_iface, gpointer iface_data); #endif -- 1.7.10.2