Merge branch 'master' into next

Conflicts:
	configure.ac
	telepathy-glib/account-channel-request.h
	telepathy-glib/account-manager.h
	telepathy-glib/account.h
	telepathy-glib/automatic-client-factory.h
	telepathy-glib/automatic-proxy-factory.h
	telepathy-glib/base-client.h
	telepathy-glib/base-connection.c
	telepathy-glib/base-contact-list.c
	telepathy-glib/basic-proxy-factory.h
	telepathy-glib/channel-contacts.c
	telepathy-glib/channel-factory-iface.h
	telepathy-glib/channel-request.h
	telepathy-glib/channel.h
	telepathy-glib/cm-message.h
	telepathy-glib/connection-manager.h
	telepathy-glib/connection.h
	telepathy-glib/contact-list-channel.c
	telepathy-glib/contact.c
	telepathy-glib/contact.h
	telepathy-glib/dbus-properties-mixin-internal.h
	telepathy-glib/dbus.c
	telepathy-glib/dbus.h
	telepathy-glib/debug.h
	telepathy-glib/defs.h
	telepathy-glib/errors.h
	telepathy-glib/media-interfaces.c
	telepathy-glib/message-mixin.c
	telepathy-glib/message.h
	telepathy-glib/presence-mixin.c
	telepathy-glib/properties-mixin.c
	telepathy-glib/proxy.h
	telepathy-glib/simple-approver.h
	telepathy-glib/simple-client-factory.h
	telepathy-glib/simple-handler.h
	telepathy-glib/simple-observer.h
	telepathy-glib/text-mixin.c
	telepathy-glib/text-mixin.h
	tests/dbus/account-channel-request.c
	tests/dbus/channel-introspect.c
	tests/dbus/connection-aliasing.c
	tests/dbus/connection-balance.c
	tests/dbus/connection-error.c
	tests/dbus/connection-getinterfaces-failure.c
	tests/dbus/connection-interests.c
	tests/dbus/connection.c
	tests/dbus/contact-lists.c
	tests/dbus/self-presence.c
	tests/dbus/text-mixin.c
	tests/lib/contact-list-manager.c

1 files changed, 8 insertions, 0 deletions

diff --git a/telepathy-glib/account.h b/telepathy-glib/account.h
index 56cb88d40..58cb2ae98 100644
--- a/telepathy-glib/account.h
+++ b/telepathy-glib/account.h
@@ -77,6 +77,7 @@ GType tp_account_get_type (void);
   tp_account_get_feature_quark_addressing ()
 
 GQuark tp_account_get_feature_quark_core (void) G_GNUC_CONST;
+_TP_AVAILABLE_IN_0_16
 GQuark tp_account_get_feature_quark_connection (void) G_GNUC_CONST;
 GQuark tp_account_get_feature_quark_storage (void) G_GNUC_CONST;
 GQuark tp_account_get_feature_quark_addressing (void) G_GNUC_CONST;
@@ -127,9 +128,11 @@ void tp_account_update_parameters_async (TpAccount *account,
     GAsyncReadyCallback callback, gpointer user_data);
 gboolean tp_account_update_parameters_finish (TpAccount *account,
     GAsyncResult *result, gchar ***reconnect_required, GError **error);
+_TP_AVAILABLE_IN_0_18
 void tp_account_update_parameters_vardict_async (TpAccount *account,
     GVariant *parameters, const gchar **unset_parameters,
     GAsyncReadyCallback callback, gpointer user_data);
+_TP_AVAILABLE_IN_0_18
 gboolean tp_account_update_parameters_vardict_finish (TpAccount *account,
     GAsyncResult *result, gchar ***reconnect_required, GError **error);
 
@@ -190,6 +193,7 @@ TpConnectionStatus tp_account_get_connection_status (TpAccount *account,
 
 const gchar *tp_account_get_detailed_error (TpAccount *self,
     const GHashTable **details);
+_TP_AVAILABLE_IN_0_18
 gchar *tp_account_dup_detailed_error_vardict (TpAccount *self,
     GVariant **details);
 
@@ -203,6 +207,7 @@ TpConnectionPresenceType tp_account_get_automatic_presence (
     TpAccount *self, gchar **status, gchar **status_message);
 
 const GHashTable *tp_account_get_parameters (TpAccount *account);
+_TP_AVAILABLE_IN_0_18
 GVariant *tp_account_dup_parameters_vardict (TpAccount *account);
 
 const gchar *tp_account_get_nickname (TpAccount *account);
@@ -213,6 +218,7 @@ void tp_account_set_nickname_async (TpAccount *account,
 gboolean tp_account_set_nickname_finish (TpAccount *account,
     GAsyncResult *result, GError **error);
 
+_TP_AVAILABLE_IN_0_18
 const gchar * const *
 /* ugh, gtk-doc */
 tp_account_get_supersedes (TpAccount *self);
@@ -244,10 +250,12 @@ void tp_account_get_storage_specific_information_async (TpAccount *self,
     GAsyncReadyCallback callback, gpointer user_data);
 GHashTable *tp_account_get_storage_specific_information_finish (TpAccount *self,
     GAsyncResult *result, GError **error);
+_TP_AVAILABLE_IN_0_18
 void tp_account_dup_storage_specific_information_vardict_async (
     TpAccount *self,
     GAsyncReadyCallback callback,
     gpointer user_data);
+_TP_AVAILABLE_IN_0_18
 GVariant *tp_account_dup_storage_specific_information_vardict_finish (
     TpAccount *self,
     GAsyncResult *result,