Use _TP_DEPRECATED_IN_* for most deprecated functions

Also make use of TP_DISABLE_DEPRECATED consistent: always wrap
deprecated functions, and add deprecation decorators to any wrapped
function.

1 files changed, 25 insertions, 18 deletions

diff --git a/telepathy-glib/base-client.h b/telepathy-glib/base-client.h
index 823a1e818..b9c681a5a 100644
--- a/telepathy-glib/base-client.h
+++ b/telepathy-glib/base-client.h
@@ -139,35 +139,39 @@ void tp_base_client_add_handler_capabilities (TpBaseClient *self,
 void tp_base_client_add_handler_capabilities_varargs (TpBaseClient *self,
     const gchar *first_token, ...) G_GNUC_NULL_TERMINATED;
 
+#ifndef TP_DISABLE_DEPRECATED
+_TP_DEPRECATED_IN_0_16_FOR (tp_simple_client_factory_add_account_features)
 void tp_base_client_add_account_features (TpBaseClient *self,
-    const GQuark *features, gssize n)
-    _TP_GNUC_DEPRECATED_FOR (tp_simple_client_factory_add_account_features);
+    const GQuark *features, gssize n);
 
+_TP_DEPRECATED_IN_0_16_FOR (tp_simple_client_factory_add_account_features_varargs)
 void tp_base_client_add_account_features_varargs (TpBaseClient *self,
-    GQuark feature, ...)
-    _TP_GNUC_DEPRECATED_FOR (tp_simple_client_factory_add_account_features_varargs);
+    GQuark feature, ...);
 
+_TP_DEPRECATED_IN_0_16_FOR (tp_simple_client_factory_add_channel_features)
 void tp_base_client_add_channel_features (TpBaseClient *self,
-    const GQuark *features, gssize n)
-    _TP_GNUC_DEPRECATED_FOR (tp_simple_client_factory_add_channel_features);
-void tp_base_client_add_channel_features_varargs (TpBaseClient *self,
-    GQuark feature, ...)
-    _TP_GNUC_DEPRECATED_FOR (tp_simple_client_factory_add_channel_features_varargs);
+    const GQuark *features, gssize n);
 
+_TP_DEPRECATED_IN_0_16_FOR (tp_simple_client_factory_add_channel_features_varargs)
+void tp_base_client_add_channel_features_varargs (TpBaseClient *self,
+    GQuark feature, ...);
 
+_TP_DEPRECATED_IN_0_16_FOR (tp_simple_client_factory_add_connection_features)
 void tp_base_client_add_connection_features (TpBaseClient *self,
-    const GQuark *features, gssize n)
-    _TP_GNUC_DEPRECATED_FOR (tp_simple_client_factory_add_connection_features);
-void tp_base_client_add_connection_features_varargs (TpBaseClient *self,
-    GQuark feature, ...)
-    _TP_GNUC_DEPRECATED_FOR (tp_simple_client_factory_add_connection_features_varargs);
+    const GQuark *features, gssize n);
 
+_TP_DEPRECATED_IN_0_16_FOR (tp_simple_client_factory_add_connection_features_varargs)
+void tp_base_client_add_connection_features_varargs (TpBaseClient *self,
+    GQuark feature, ...);
 
+_TP_DEPRECATED_IN_0_16
 void tp_base_client_set_channel_factory (TpBaseClient *self,
-    TpClientChannelFactory *factory) _TP_GNUC_DEPRECATED;
+    TpClientChannelFactory *factory);
 
+_TP_DEPRECATED_IN_0_16
 TpClientChannelFactory *tp_base_client_get_channel_factory (
-    TpBaseClient *self) _TP_GNUC_DEPRECATED;
+    TpBaseClient *self);
+#endif
 
 typedef void (*TpBaseClientDelegatedChannelsCb) (
     TpBaseClient *client,
@@ -213,8 +217,11 @@ gboolean tp_base_client_get_uniquify_name (TpBaseClient *self);
 const gchar *tp_base_client_get_bus_name (TpBaseClient *self);
 const gchar *tp_base_client_get_object_path (TpBaseClient *self);
 TpDBusDaemon *tp_base_client_get_dbus_daemon (TpBaseClient *self);
-TpAccountManager *tp_base_client_get_account_manager (TpBaseClient *self)
-    _TP_GNUC_DEPRECATED;
+
+#ifndef TP_DISABLE_DEPRECATED
+_TP_DEPRECATED_IN_0_16
+TpAccountManager *tp_base_client_get_account_manager (TpBaseClient *self);
+#endif
 
 void tp_base_client_unregister (TpBaseClient *self);