diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-05-02 18:49:08 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-05-02 20:19:35 +0100 |
| commit | 2cc2520bcfa36c834dab111ebf41637bbfc8371f (patch) | |
| tree | 17f9ed7c7ae3bdbfa839936bcec1b4c4073ff7ba /telepathy-glib/account-manager.h | |
| parent | bf6922353b10e50b62ae7a26d9a727fe5f5bf763 (diff) | |
| download | telepathy-glib-2cc2520bcfa36c834dab111ebf41637bbfc8371f.tar.gz | |
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.
Diffstat (limited to 'telepathy-glib/account-manager.h')
| -rw-r--r-- | telepathy-glib/account-manager.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/telepathy-glib/account-manager.h b/telepathy-glib/account-manager.h index 7df833e85..eead17ce0 100644 --- a/telepathy-glib/account-manager.h +++ b/telepathy-glib/account-manager.h @@ -81,9 +81,11 @@ TpAccountManager *tp_account_manager_dup (void) G_GNUC_WARN_UNUSED_RESULT; void tp_account_manager_init_known_interfaces (void); +#ifndef TP_DISABLE_DEPRECATED +_TP_DEPRECATED_IN_0_16_FOR (tp_simple_client_factory_ensure_account) TpAccount *tp_account_manager_ensure_account (TpAccountManager *manager, - const gchar *path) - _TP_GNUC_DEPRECATED_FOR (tp_simple_client_factory_ensure_account); + const gchar *path); +#endif GList *tp_account_manager_get_valid_accounts (TpAccountManager *manager) G_GNUC_WARN_UNUSED_RESULT; @@ -106,14 +108,18 @@ TpAccount * tp_account_manager_create_account_finish ( gboolean tp_account_manager_is_prepared (TpAccountManager *manager, GQuark feature); +#ifndef TP_DISABLE_DEPRECATED +_TP_DEPRECATED_IN_0_16_FOR (tp_proxy_prepare_async) void tp_account_manager_prepare_async (TpAccountManager *manager, const GQuark *features, GAsyncReadyCallback callback, - gpointer user_data) _TP_GNUC_DEPRECATED_FOR (tp_proxy_prepare_async); + gpointer user_data); +_TP_DEPRECATED_IN_0_16_FOR (tp_proxy_prepare_finish) gboolean tp_account_manager_prepare_finish (TpAccountManager *manager, GAsyncResult *result, - GError **error) _TP_GNUC_DEPRECATED_FOR (tp_proxy_prepare_finish); + GError **error); +#endif void tp_account_manager_enable_restart (TpAccountManager *manager); |