account-channel-request.h		account-channel-request.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef __TP_ACCOUNT_CHANNEL_REQUEST_H__		#ifndef __TP_ACCOUNT_CHANNEL_REQUEST_H__
	#define __TP_ACCOUNT_CHANNEL_REQUEST_H__		#define __TP_ACCOUNT_CHANNEL_REQUEST_H__
	#include <gio/gio.h>		#include <gio/gio.h>
	#include <glib-object.h>		#include <glib-object.h>
	#include <glib.h>		#include <glib.h>
	#include <telepathy-glib/account.h>		#include <telepathy-glib/account.h>
	#include <telepathy-glib/channel.h>		#include <telepathy-glib/channel.h>
	#include <telepathy-glib/channel-request.h>		#include <telepathy-glib/channel-request.h>
	#include <telepathy-glib/client-channel-factory.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	#include <telepathy-glib/handle-channels-context.h>		#include <telepathy-glib/handle-channels-context.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	typedef struct _TpAccountChannelRequest TpAccountChannelRequest;		typedef struct _TpAccountChannelRequest TpAccountChannelRequest;
	typedef struct _TpAccountChannelRequestClass \		typedef struct _TpAccountChannelRequestClass \
	TpAccountChannelRequestClass;		TpAccountChannelRequestClass;
	typedef struct _TpAccountChannelRequestPrivate \		typedef struct _TpAccountChannelRequestPrivate \
	TpAccountChannelRequestPrivate;		TpAccountChannelRequestPrivate;
	skipping to change at line 87		skipping to change at line 86
	GHashTable * tp_account_channel_request_get_request (		GHashTable * tp_account_channel_request_get_request (
	TpAccountChannelRequest *self);		TpAccountChannelRequest *self);
	_TP_AVAILABLE_IN_0_20		_TP_AVAILABLE_IN_0_20
	GVariant *tp_account_channel_request_dup_request (		GVariant *tp_account_channel_request_dup_request (
	TpAccountChannelRequest *self);		TpAccountChannelRequest *self);
	gint64 tp_account_channel_request_get_user_action_time (		gint64 tp_account_channel_request_get_user_action_time (
	TpAccountChannelRequest *self);		TpAccountChannelRequest *self);
	#ifndef TP_DISABLE_DEPRECATED
	_TP_DEPRECATED_IN_0_16
	void tp_account_channel_request_set_channel_factory (
	TpAccountChannelRequest *self,
	TpClientChannelFactory *factory);
	#endif
	TpChannelRequest * tp_account_channel_request_get_channel_request (		TpChannelRequest * tp_account_channel_request_get_channel_request (
	TpAccountChannelRequest *self);		TpAccountChannelRequest *self);
	_TP_AVAILABLE_IN_0_20		_TP_AVAILABLE_IN_0_20
	void tp_account_channel_request_set_hint (TpAccountChannelRequest *self,		void tp_account_channel_request_set_hint (TpAccountChannelRequest *self,
	const gchar *key,		const gchar *key,
	GVariant *value);		GVariant *value);
	void tp_account_channel_request_set_hints (TpAccountChannelRequest *self,		void tp_account_channel_request_set_hints (TpAccountChannelRequest *self,
	GHashTable *hints);		GHashTable *hints);
	skipping to change at line 117		skipping to change at line 109
	TpAccountChannelRequest *self,		TpAccountChannelRequest *self,
	gboolean delegate);		gboolean delegate);
	/* Text */		/* Text */
	_TP_AVAILABLE_IN_0_20		_TP_AVAILABLE_IN_0_20
	TpAccountChannelRequest *tp_account_channel_request_new_text (		TpAccountChannelRequest *tp_account_channel_request_new_text (
	TpAccount *account,		TpAccount *account,
	gint64 user_action_time) G_GNUC_WARN_UNUSED_RESULT;		gint64 user_action_time) G_GNUC_WARN_UNUSED_RESULT;
	_TP_AVAILABLE_IN_0_24
	void tp_account_channel_request_set_sms_channel (TpAccountChannelRequest *s
	elf,
	gboolean is_sms_channel);
	/* Calls */		/* Calls */
	_TP_AVAILABLE_IN_0_20		_TP_AVAILABLE_IN_0_20
	TpAccountChannelRequest *tp_account_channel_request_new_audio_call (		TpAccountChannelRequest *tp_account_channel_request_new_audio_call (
	TpAccount *account,		TpAccount *account,
	gint64 user_action_time) G_GNUC_WARN_UNUSED_RESULT;		gint64 user_action_time) G_GNUC_WARN_UNUSED_RESULT;
	_TP_AVAILABLE_IN_0_20		_TP_AVAILABLE_IN_0_20
	TpAccountChannelRequest *tp_account_channel_request_new_audio_video_call (		TpAccountChannelRequest *tp_account_channel_request_new_audio_video_call (
	TpAccount *account,		TpAccount *account,
	gint64 user_action_time) G_GNUC_WARN_UNUSED_RESULT;		gint64 user_action_time) G_GNUC_WARN_UNUSED_RESULT;
	skipping to change at line 159		skipping to change at line 147
	const gchar *uri);		const gchar *uri);
	_TP_AVAILABLE_IN_0_20		_TP_AVAILABLE_IN_0_20
	void tp_account_channel_request_set_file_transfer_timestamp (		void tp_account_channel_request_set_file_transfer_timestamp (
	TpAccountChannelRequest *self,		TpAccountChannelRequest *self,
	guint64 timestamp);		guint64 timestamp);
	_TP_AVAILABLE_IN_0_20		_TP_AVAILABLE_IN_0_20
	void tp_account_channel_request_set_file_transfer_initial_offset (		void tp_account_channel_request_set_file_transfer_initial_offset (
	TpAccountChannelRequest *self,		TpAccountChannelRequest *self,
	guint64 offset);		guint64 offset);
	_TP_AVAILABLE_IN_0_24
	void tp_account_channel_request_set_file_transfer_hash (
	TpAccountChannelRequest *self,
	TpFileHashType hash_type,
	const gchar *hash);
	/* Tube */
	_TP_AVAILABLE_IN_0_24
	TpAccountChannelRequest *tp_account_channel_request_new_stream_tube (
	TpAccount *account,
	const gchar *service,
	gint64 user_action_time) G_GNUC_WARN_UNUSED_RESULT;
	_TP_AVAILABLE_IN_0_24
	TpAccountChannelRequest *tp_account_channel_request_new_dbus_tube (
	TpAccount *account,
	const gchar *service_name,
	gint64 user_action_time) G_GNUC_WARN_UNUSED_RESULT;
	/* Conference */
	_TP_AVAILABLE_IN_0_24
	void tp_account_channel_request_set_conference_initial_channels (
	TpAccountChannelRequest *self,
	const gchar * const * channels);
	_TP_AVAILABLE_IN_0_24
	void tp_account_channel_request_set_initial_invitee_ids (
	TpAccountChannelRequest *self,
	const gchar * const * ids);
	_TP_AVAILABLE_IN_0_24
	void tp_account_channel_request_set_initial_invitees (
	TpAccountChannelRequest *self,
	GPtrArray *contacts);
	/* Channel target (shared between all channel types) */		/* Channel target (shared between all channel types) */
	_TP_AVAILABLE_IN_0_20		_TP_AVAILABLE_IN_0_20
	void tp_account_channel_request_set_target_contact (		void tp_account_channel_request_set_target_contact (
	TpAccountChannelRequest *self,		TpAccountChannelRequest *self,
	TpContact *contact);		TpContact *contact);
	_TP_AVAILABLE_IN_0_20		_TP_AVAILABLE_IN_0_20
	void tp_account_channel_request_set_target_id (TpAccountChannelRequest *sel f,		void tp_account_channel_request_set_target_id (TpAccountChannelRequest *sel f,
	TpHandleType handle_type,		TpHandleType handle_type,
	const gchar *identifier);		const gchar *identifier);
	skipping to change at line 253		skipping to change at line 204
	TpChannel *channel,		TpChannel *channel,
	gpointer user_data);		gpointer user_data);
	_TP_AVAILABLE_IN_0_16		_TP_AVAILABLE_IN_0_16
	void tp_account_channel_request_set_delegated_channel_callback (		void tp_account_channel_request_set_delegated_channel_callback (
	TpAccountChannelRequest *self,		TpAccountChannelRequest *self,
	TpAccountChannelRequestDelegatedChannelCb callback,		TpAccountChannelRequestDelegatedChannelCb callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy);		GDestroyNotify destroy);
	/* Request and forget API */
	void tp_account_channel_request_create_channel_async (
	TpAccountChannelRequest *self,
	const gchar *preferred_handler,
	GCancellable *cancellable,
	GAsyncReadyCallback callback,
	gpointer user_data);
	gboolean tp_account_channel_request_create_channel_finish (
	TpAccountChannelRequest *self,
	GAsyncResult *result,
	GError **error);
	void tp_account_channel_request_ensure_channel_async (
	TpAccountChannelRequest *self,
	const gchar *preferred_handler,
	GCancellable *cancellable,
	GAsyncReadyCallback callback,
	gpointer user_data);
	gboolean tp_account_channel_request_ensure_channel_finish (
	TpAccountChannelRequest *self,
	GAsyncResult *result,
	GError **error);
	/* Request and observe API */		/* Request and observe API */
	void tp_account_channel_request_create_and_observe_channel_async (		void tp_account_channel_request_create_channel_async (
	TpAccountChannelRequest *self,		TpAccountChannelRequest *self,
	const gchar *preferred_handler,		const gchar *preferred_handler,
	GCancellable *cancellable,		GCancellable *cancellable,
	GAsyncReadyCallback callback,		GAsyncReadyCallback callback,
	gpointer user_data);		gpointer user_data);
	TpChannel * tp_account_channel_request_create_and_observe_channel_finish (		TpChannel * tp_account_channel_request_create_channel_finish (
	TpAccountChannelRequest *self,		TpAccountChannelRequest *self,
	GAsyncResult *result,		GAsyncResult *result,
	GError **error) G_GNUC_WARN_UNUSED_RESULT;		GError **error) G_GNUC_WARN_UNUSED_RESULT;
	void tp_account_channel_request_ensure_and_observe_channel_async (		void tp_account_channel_request_ensure_channel_async (
	TpAccountChannelRequest *self,		TpAccountChannelRequest *self,
	const gchar *preferred_handler,		const gchar *preferred_handler,
	GCancellable *cancellable,		GCancellable *cancellable,
	GAsyncReadyCallback callback,		GAsyncReadyCallback callback,
	gpointer user_data);		gpointer user_data);
	TpChannel * tp_account_channel_request_ensure_and_observe_channel_finish (		TpChannel * tp_account_channel_request_ensure_channel_finish (
	TpAccountChannelRequest *self,		TpAccountChannelRequest *self,
	GAsyncResult *result,		GAsyncResult *result,
	GError **error) G_GNUC_WARN_UNUSED_RESULT;		GError **error) G_GNUC_WARN_UNUSED_RESULT;
	G_END_DECLS		G_END_DECLS
	#endif		#endif
End of changes. 10 change blocks.
	84 lines changed or deleted		6 lines changed or added

	account-manager.h		account-manager.h
	skipping to change at line 22		skipping to change at line 22
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef TP_ACCOUNT_MANAGER_H		#ifndef TP_ACCOUNT_MANAGER_H
	#define TP_ACCOUNT_MANAGER_H		#define TP_ACCOUNT_MANAGER_H
	#include <telepathy-glib/account.h>		#include <telepathy-glib/account.h>
	#include <telepathy-glib/dbus.h>		#include <telepathy-glib/dbus.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	#include <telepathy-glib/proxy.h>		#include <telepathy-glib/proxy.h>
	skipping to change at line 81		skipping to change at line 81
	#define TP_ACCOUNT_MANAGER_FEATURE_CORE \		#define TP_ACCOUNT_MANAGER_FEATURE_CORE \
	tp_account_manager_get_feature_quark_core ()		tp_account_manager_get_feature_quark_core ()
	GQuark tp_account_manager_get_feature_quark_core (void) G_GNUC_CONST;		GQuark tp_account_manager_get_feature_quark_core (void) G_GNUC_CONST;
	TpAccountManager *tp_account_manager_new (TpDBusDaemon *bus_daemon)		TpAccountManager *tp_account_manager_new (TpDBusDaemon *bus_daemon)
	G_GNUC_WARN_UNUSED_RESULT;		G_GNUC_WARN_UNUSED_RESULT;
	TpAccountManager *tp_account_manager_new_with_factory (		TpAccountManager *tp_account_manager_new_with_factory (
	TpSimpleClientFactory *factory) G_GNUC_WARN_UNUSED_RESULT;		TpClientFactory *factory) G_GNUC_WARN_UNUSED_RESULT;
	_TP_AVAILABLE_IN_0_16		_TP_AVAILABLE_IN_0_16
	void tp_account_manager_set_default (TpAccountManager *manager);		void tp_account_manager_set_default (TpAccountManager *manager);
	_TP_AVAILABLE_IN_0_20		_TP_AVAILABLE_IN_0_20
	gboolean tp_account_manager_can_set_default (void);		gboolean tp_account_manager_can_set_default (void);
	TpAccountManager *tp_account_manager_dup (void) G_GNUC_WARN_UNUSED_RESULT;		TpAccountManager *tp_account_manager_dup (void) G_GNUC_WARN_UNUSED_RESULT;
	void tp_account_manager_init_known_interfaces (void);		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);
	#endif
	#ifndef TP_DISABLE_DEPRECATED
	_TP_DEPRECATED_IN_0_20_FOR (tp_account_manager_dup_valid_accounts)
	GList *tp_account_manager_get_valid_accounts (TpAccountManager *manager)
	G_GNUC_WARN_UNUSED_RESULT;
	#endif
	_TP_AVAILABLE_IN_0_20		_TP_AVAILABLE_IN_0_20
	GList *tp_account_manager_dup_valid_accounts (TpAccountManager *manager)		GList *tp_account_manager_dup_usable_accounts (TpAccountManager *manager)
	G_GNUC_WARN_UNUSED_RESULT;		G_GNUC_WARN_UNUSED_RESULT;
	void tp_account_manager_set_all_requested_presences (TpAccountManager *mana ger,		void tp_account_manager_set_all_requested_presences (TpAccountManager *mana ger,
	TpConnectionPresenceType type, const gchar *status, const gchar *messag e);		TpConnectionPresenceType type, const gchar *status, const gchar *messag e);
	TpConnectionPresenceType tp_account_manager_get_most_available_presence (		TpConnectionPresenceType tp_account_manager_get_most_available_presence (
	TpAccountManager *manager, gchar **status, gchar **message);		TpAccountManager *manager, gchar **status, gchar **message);
	void tp_account_manager_create_account_async (TpAccountManager *manager,		void tp_account_manager_create_account_async (TpAccountManager *manager,
	const gchar *connection_manager, const gchar *protocol,		const gchar *connection_manager, const gchar *protocol,
	const gchar *display_name, GHashTable *parameters, GHashTable *properti es,		const gchar *display_name, GHashTable *parameters, GHashTable *properti es,
	GAsyncReadyCallback callback, gpointer user_data);		GAsyncReadyCallback callback, gpointer user_data);
	TpAccount * tp_account_manager_create_account_finish (		TpAccount * tp_account_manager_create_account_finish (
	TpAccountManager *manager, GAsyncResult *result, GError **error)		TpAccountManager *manager, GAsyncResult *result, GError **error)
	G_GNUC_WARN_UNUSED_RESULT;		G_GNUC_WARN_UNUSED_RESULT;
	#ifndef TP_DISABLE_DEPRECATED
	_TP_DEPRECATED_IN_0_24_FOR(tp_proxy_is_prepared)
	gboolean tp_account_manager_is_prepared (TpAccountManager *manager,
	GQuark feature);
	_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_DEPRECATED_IN_0_16_FOR (tp_proxy_prepare_finish)
	gboolean tp_account_manager_prepare_finish (TpAccountManager *manager,
	GAsyncResult *result,
	GError **error);
	#endif
	void tp_account_manager_enable_restart (TpAccountManager *manager);		void tp_account_manager_enable_restart (TpAccountManager *manager);
	G_END_DECLS		G_END_DECLS
	#include <telepathy-glib/_gen/tp-cli-account-manager.h>
	#endif		#endif
End of changes. 6 change blocks.
	37 lines changed or deleted		4 lines changed or added

	account-request.h		account-request.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef TP_ACCOUNT_REQUEST_H		#ifndef TP_ACCOUNT_REQUEST_H
	#define TP_ACCOUNT_REQUEST_H		#define TP_ACCOUNT_REQUEST_H
	#include <telepathy-glib/account-manager.h>		#include <telepathy-glib/account-manager.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	#include <telepathy-glib/protocol.h>		#include <telepathy-glib/protocol.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	skipping to change at line 71		skipping to change at line 71
	(G_TYPE_CHECK_INSTANCE_TYPE ((obj), TP_TYPE_ACCOUNT_REQUEST))		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), TP_TYPE_ACCOUNT_REQUEST))
	#define TP_IS_ACCOUNT_REQUEST_CLASS(klass) \		#define TP_IS_ACCOUNT_REQUEST_CLASS(klass) \
	(G_TYPE_CHECK_CLASS_TYPE ((klass), TP_TYPE_ACCOUNT_REQUEST))		(G_TYPE_CHECK_CLASS_TYPE ((klass), TP_TYPE_ACCOUNT_REQUEST))
	#define TP_ACCOUNT_REQUEST_GET_CLASS(obj) \		#define TP_ACCOUNT_REQUEST_GET_CLASS(obj) \
	(G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_ACCOUNT_REQUEST, \		(G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_ACCOUNT_REQUEST, \
	TpAccountRequestClass))		TpAccountRequestClass))
	_TP_AVAILABLE_IN_0_20		_TP_AVAILABLE_IN_0_20
	TpAccountRequest * tp_account_request_new (		TpAccountRequest * tp_account_request_new (
	TpAccountManager *account_manager,		TpAccountManager *account_manager,
	const gchar *manager,		const gchar *cm_name,
	const gchar *protocol,		const gchar *protocol_name,
	const gchar *display_name) G_GNUC_WARN_UNUSED_RESULT;		const gchar *display_name) G_GNUC_WARN_UNUSED_RESULT;
	_TP_AVAILABLE_IN_0_20		_TP_AVAILABLE_IN_0_20
	TpAccountRequest * tp_account_request_new_from_protocol (		TpAccountRequest * tp_account_request_new_from_protocol (
	TpAccountManager *account_manager,		TpAccountManager *account_manager,
	TpProtocol *protocol,		TpProtocol *protocol,
	const gchar *display_name) G_GNUC_WARN_UNUSED_RESULT;		const gchar *display_name) G_GNUC_WARN_UNUSED_RESULT;
	_TP_AVAILABLE_IN_0_20		_TP_AVAILABLE_IN_0_20
	void tp_account_request_set_display_name (TpAccountRequest *self,		void tp_account_request_set_display_name (TpAccountRequest *self,
End of changes. 2 change blocks.
	6 lines changed or deleted		4 lines changed or added

	account.h		account.h
	skipping to change at line 22		skipping to change at line 22
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef TP_ACCOUNT_H		#ifndef TP_ACCOUNT_H
	#define TP_ACCOUNT_H		#define TP_ACCOUNT_H
	#include <gio/gio.h>		#include <gio/gio.h>
	#include <telepathy-glib/connection.h>		#include <telepathy-glib/connection.h>
	#include <telepathy-glib/dbus.h>		#include <telepathy-glib/dbus.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	skipping to change at line 89		skipping to change at line 89
	tp_account_get_feature_quark_storage ()		tp_account_get_feature_quark_storage ()
	#define TP_ACCOUNT_FEATURE_ADDRESSING \		#define TP_ACCOUNT_FEATURE_ADDRESSING \
	tp_account_get_feature_quark_addressing ()		tp_account_get_feature_quark_addressing ()
	GQuark tp_account_get_feature_quark_core (void) G_GNUC_CONST;		GQuark tp_account_get_feature_quark_core (void) G_GNUC_CONST;
	_TP_AVAILABLE_IN_0_16		_TP_AVAILABLE_IN_0_16
	GQuark tp_account_get_feature_quark_connection (void) G_GNUC_CONST;		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_storage (void) G_GNUC_CONST;
	GQuark tp_account_get_feature_quark_addressing (void) G_GNUC_CONST;		GQuark tp_account_get_feature_quark_addressing (void) G_GNUC_CONST;
	_TP_DEPRECATED_IN_0_20_FOR(tp_simple_client_factory_ensure_account)
	TpAccount *tp_account_new (TpDBusDaemon *bus_daemon, const gchar *object_pa
	th,
	GError **error) G_GNUC_WARN_UNUSED_RESULT;
	#ifndef TP_DISABLE_DEPRECATED
	_TP_DEPRECATED_IN_0_20_FOR(tp_account_get_protocol)
	gboolean tp_account_parse_object_path (const gchar *object_path,
	gchar **cm, gchar **protocol, gchar **account_id, GError **error);
	#endif
	const gchar *tp_account_get_path_suffix (TpAccount *account);		const gchar *tp_account_get_path_suffix (TpAccount *account);
	void tp_account_init_known_interfaces (void);		void tp_account_init_known_interfaces (void);
	TpConnection *tp_account_get_connection (TpAccount *account);		TpConnection *tp_account_get_connection (TpAccount *account);
	#ifndef TP_DISABLE_DEPRECATED
	_TP_DEPRECATED_IN_0_20_FOR(tp_simple_client_factory_ensure_connection)
	TpConnection *tp_account_ensure_connection (TpAccount *account,
	const gchar *path);
	#endif
	const gchar *tp_account_get_display_name (TpAccount *account);		const gchar *tp_account_get_display_name (TpAccount *account);
	#ifndef TP_DISABLE_DEPRECATED
	_TP_DEPRECATED_IN_0_20_FOR(tp_account_get_cm_name)
	const gchar *tp_account_get_connection_manager (TpAccount *account);
	_TP_DEPRECATED_IN_0_20_FOR(tp_account_get_protocol_name)
	const gchar *tp_account_get_protocol (TpAccount *account);
	#endif
	_TP_AVAILABLE_IN_0_20		_TP_AVAILABLE_IN_0_20
	const gchar *tp_account_get_cm_name (TpAccount *account);		const gchar *tp_account_get_cm_name (TpAccount *account);
	_TP_AVAILABLE_IN_0_20		_TP_AVAILABLE_IN_0_20
	const gchar *tp_account_get_protocol_name (TpAccount *account);		const gchar *tp_account_get_protocol_name (TpAccount *account);
	const gchar *tp_account_get_service (TpAccount *self);		const gchar *tp_account_get_service (TpAccount *self);
	const gchar *tp_account_get_icon_name (TpAccount *account);		const gchar *tp_account_get_icon_name (TpAccount *account);
	skipping to change at line 145		skipping to change at line 123
	GAsyncResult *result, GError **error);		GAsyncResult *result, GError **error);
	void tp_account_reconnect_async (TpAccount *account,		void tp_account_reconnect_async (TpAccount *account,
	GAsyncReadyCallback callback, gpointer user_data);		GAsyncReadyCallback callback, gpointer user_data);
	gboolean tp_account_reconnect_finish (TpAccount *account,		gboolean tp_account_reconnect_finish (TpAccount *account,
	GAsyncResult *result, GError **error);		GAsyncResult *result, GError **error);
	gboolean tp_account_is_enabled (TpAccount *account);		gboolean tp_account_is_enabled (TpAccount *account);
	gboolean tp_account_is_valid (TpAccount *account);		gboolean tp_account_is_usable (TpAccount *account);
	void tp_account_update_parameters_async (TpAccount *account,		void tp_account_update_parameters_async (TpAccount *account,
	GHashTable *parameters, const gchar **unset_parameters,		GHashTable *parameters, const gchar **unset_parameters,
	GAsyncReadyCallback callback, gpointer user_data);		GAsyncReadyCallback callback, gpointer user_data);
	gboolean tp_account_update_parameters_finish (TpAccount *account,		gboolean tp_account_update_parameters_finish (TpAccount *account,
	GAsyncResult *result, gchar ***reconnect_required, GError **error);		GAsyncResult *result, gchar ***reconnect_required, GError **error);
	_TP_AVAILABLE_IN_0_18		_TP_AVAILABLE_IN_0_18
	void tp_account_update_parameters_vardict_async (TpAccount *account,		void tp_account_update_parameters_vardict_async (TpAccount *account,
	GVariant *parameters, const gchar **unset_parameters,		GVariant *parameters, const gchar **unset_parameters,
	GAsyncReadyCallback callback, gpointer user_data);		GAsyncReadyCallback callback, gpointer user_data);
	skipping to change at line 253		skipping to change at line 231
	const gchar * const *		const gchar * const *
	/* ugh, gtk-doc */		/* ugh, gtk-doc */
	tp_account_get_supersedes (TpAccount *self);		tp_account_get_supersedes (TpAccount *self);
	void tp_account_get_avatar_async (TpAccount *account,		void tp_account_get_avatar_async (TpAccount *account,
	GAsyncReadyCallback callback, gpointer user_data);		GAsyncReadyCallback callback, gpointer user_data);
	const GArray *tp_account_get_avatar_finish (TpAccount *account,		const GArray *tp_account_get_avatar_finish (TpAccount *account,
	GAsyncResult *result, GError **error);		GAsyncResult *result, GError **error);
	#ifndef TP_DISABLE_DEPRECATED
	_TP_DEPRECATED_IN_0_24_FOR(tp_proxy_is_prepared)
	gboolean tp_account_is_prepared (TpAccount *account, GQuark feature);
	#endif
	#ifndef TP_DISABLE_DEPRECATED
	_TP_DEPRECATED_IN_0_16_FOR (tp_proxy_prepare_async)
	void tp_account_prepare_async (TpAccount *account,
	const GQuark *features,
	GAsyncReadyCallback callback,
	gpointer user_data);
	_TP_DEPRECATED_IN_0_16_FOR (tp_proxy_prepare_finish)
	gboolean tp_account_prepare_finish (TpAccount *account,
	GAsyncResult *result,
	GError **error);
	#endif
	void tp_account_set_avatar_async (TpAccount *self,		void tp_account_set_avatar_async (TpAccount *self,
	const guchar *avatar,		const guchar *avatar,
	gsize len,		gsize len,
	const gchar *mime_type,		const gchar *mime_type,
	GAsyncReadyCallback callback,		GAsyncReadyCallback callback,
	gpointer user_data);		gpointer user_data);
	gboolean tp_account_set_avatar_finish (TpAccount *self,		gboolean tp_account_set_avatar_finish (TpAccount *self,
	GAsyncResult *result,		GAsyncResult *result,
	GError **error);		GError **error);
	skipping to change at line 319		skipping to change at line 279
	const gchar *scheme, gboolean associate,		const gchar *scheme, gboolean associate,
	GAsyncReadyCallback callback, gpointer user_data);		GAsyncReadyCallback callback, gpointer user_data);
	gboolean tp_account_set_uri_scheme_association_finish (TpAccount *self,		gboolean tp_account_set_uri_scheme_association_finish (TpAccount *self,
	GAsyncResult *result, GError **error);		GAsyncResult *result, GError **error);
	GBinding *tp_account_bind_connection_status_to_property (TpAccount *self,		GBinding *tp_account_bind_connection_status_to_property (TpAccount *self,
	gpointer target, const char *target_property, gboolean invert);		gpointer target, const char *target_property, gboolean invert);
	G_END_DECLS		G_END_DECLS
	#include <telepathy-glib/_gen/tp-cli-account.h>
	#endif		#endif
End of changes. 7 change blocks.
	48 lines changed or deleted		3 lines changed or added

	add-dispatch-operation-context.h		add-dispatch-operation-context.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef __TP_ADD_DISPATCH_OPERATION_CONTEXT_H__		#ifndef __TP_ADD_DISPATCH_OPERATION_CONTEXT_H__
	#define __TP_ADD_DISPATCH_OPERATION_CONTEXT_H__		#define __TP_ADD_DISPATCH_OPERATION_CONTEXT_H__
	#include <gio/gio.h>		#include <gio/gio.h>
	#include <glib-object.h>		#include <glib-object.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
End of changes. 1 change blocks.
	4 lines changed or deleted		2 lines changed or added

	automatic-client-factory.h		automatic-client-factory.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef __TP_AUTOMATIC_CLIENT_FACTORY_H__		#ifndef __TP_AUTOMATIC_CLIENT_FACTORY_H__
	#define __TP_AUTOMATIC_CLIENT_FACTORY_H__		#define __TP_AUTOMATIC_CLIENT_FACTORY_H__
	#include <telepathy-glib/call-channel.h>		#include <telepathy-glib/call-channel.h>
	#include <telepathy-glib/dbus-tube-channel.h>		#include <telepathy-glib/dbus-tube-channel.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	#include <telepathy-glib/file-transfer-channel.h>		#include <telepathy-glib/file-transfer-channel.h>
	#include <telepathy-glib/simple-client-factory.h>		#include <telepathy-glib/client-factory.h>
	#include <telepathy-glib/stream-tube-channel.h>		#include <telepathy-glib/stream-tube-channel.h>
	#include <telepathy-glib/text-channel.h>		#include <telepathy-glib/text-channel.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	typedef struct _TpAutomaticClientFactory TpAutomaticClientFactory;		typedef struct _TpAutomaticClientFactory TpAutomaticClientFactory;
	typedef struct _TpAutomaticClientFactoryClass TpAutomaticClientFactoryClass ;		typedef struct _TpAutomaticClientFactoryClass TpAutomaticClientFactoryClass ;
	struct _TpAutomaticClientFactoryClass {		struct _TpAutomaticClientFactoryClass {
	/*<public>*/		/*<public>*/
	TpSimpleClientFactoryClass parent_class;		TpClientFactoryClass parent_class;
	};		};
	struct _TpAutomaticClientFactory {		struct _TpAutomaticClientFactory {
	/*<private>*/		/*<private>*/
	TpSimpleClientFactory parent;		TpClientFactory parent;
	};		};
	_TP_AVAILABLE_IN_0_16		_TP_AVAILABLE_IN_0_16
	GType tp_automatic_client_factory_get_type (void);		GType tp_automatic_client_factory_get_type (void);
	#define TP_TYPE_AUTOMATIC_CLIENT_FACTORY \		#define TP_TYPE_AUTOMATIC_CLIENT_FACTORY \
	(tp_automatic_client_factory_get_type ())		(tp_automatic_client_factory_get_type ())
	#define TP_AUTOMATIC_CLIENT_FACTORY(obj) \		#define TP_AUTOMATIC_CLIENT_FACTORY(obj) \
	(G_TYPE_CHECK_INSTANCE_CAST ((obj), TP_TYPE_AUTOMATIC_CLIENT_FACTORY, \		(G_TYPE_CHECK_INSTANCE_CAST ((obj), TP_TYPE_AUTOMATIC_CLIENT_FACTORY, \
	TpAutomaticClientFactory))		TpAutomaticClientFactory))
	skipping to change at line 70		skipping to change at line 70
	(G_TYPE_CHECK_CLASS_CAST ((klass), TP_TYPE_AUTOMATIC_CLIENT_FACTORY, \		(G_TYPE_CHECK_CLASS_CAST ((klass), TP_TYPE_AUTOMATIC_CLIENT_FACTORY, \
	TpAutomaticClientFactoryClass))		TpAutomaticClientFactoryClass))
	#define TP_IS_AUTOMATIC_CLIENT_FACTORY(obj) \		#define TP_IS_AUTOMATIC_CLIENT_FACTORY(obj) \
	(G_TYPE_CHECK_INSTANCE_TYPE ((obj), TP_TYPE_AUTOMATIC_CLIENT_FACTORY))		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), TP_TYPE_AUTOMATIC_CLIENT_FACTORY))
	#define TP_IS_AUTOMATIC_CLIENT_FACTORY_CLASS(klass) \		#define TP_IS_AUTOMATIC_CLIENT_FACTORY_CLASS(klass) \
	(G_TYPE_CHECK_CLASS_TYPE ((klass), TP_TYPE_AUTOMATIC_CLIENT_FACTORY))		(G_TYPE_CHECK_CLASS_TYPE ((klass), TP_TYPE_AUTOMATIC_CLIENT_FACTORY))
	#define TP_AUTOMATIC_CLIENT_FACTORY_GET_CLASS(obj) \		#define TP_AUTOMATIC_CLIENT_FACTORY_GET_CLASS(obj) \
	(G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_AUTOMATIC_CLIENT_FACTORY, \		(G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_AUTOMATIC_CLIENT_FACTORY, \
	TpAutomaticClientFactoryClass))		TpAutomaticClientFactoryClass))
	_TP_AVAILABLE_IN_0_16		TpClientFactory *tp_automatic_client_factory_new (TpDBusDaemon *dbus);
	TpAutomaticClientFactory *tp_automatic_client_factory_new (TpDBusDaemon *db
	us);
	G_END_DECLS		G_END_DECLS
	#endif		#endif
End of changes. 5 change blocks.
	10 lines changed or deleted		6 lines changed or added

	base-call-channel.h		base-call-channel.h
	skipping to change at line 22		skipping to change at line 22
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef __TP_BASE_CALL_CHANNEL_H__		#ifndef __TP_BASE_CALL_CHANNEL_H__
	#define __TP_BASE_CALL_CHANNEL_H__		#define __TP_BASE_CALL_CHANNEL_H__
	#include <telepathy-glib/base-channel.h>		#include <telepathy-glib/base-channel.h>
	#include <telepathy-glib/base-call-content.h>		#include <telepathy-glib/base-call-content.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
End of changes. 1 change blocks.
	4 lines changed or deleted		2 lines changed or added

	base-call-content.h		base-call-content.h
	skipping to change at line 23		skipping to change at line 23
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef TP_BASE_CALL_CONTENT_H		#ifndef TP_BASE_CALL_CONTENT_H
	#define TP_BASE_CALL_CONTENT_H		#define TP_BASE_CALL_CONTENT_H
	#include <glib-object.h>		#include <glib-object.h>
	#include <telepathy-glib/base-call-stream.h>		#include <telepathy-glib/base-call-stream.h>
	#include <telepathy-glib/base-connection.h>		#include <telepathy-glib/base-connection.h>
	#include <telepathy-glib/dbus-properties-mixin.h>		#include <telepathy-glib/dbus-properties-mixin.h>
End of changes. 1 change blocks.
	4 lines changed or deleted		2 lines changed or added

	base-call-stream.h		base-call-stream.h
	skipping to change at line 23		skipping to change at line 23
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef TP_BASE_CALL_STREAM_H		#ifndef TP_BASE_CALL_STREAM_H
	#define TP_BASE_CALL_STREAM_H		#define TP_BASE_CALL_STREAM_H
	#include <glib-object.h>		#include <glib-object.h>
	#include <telepathy-glib/base-connection.h>		#include <telepathy-glib/base-connection.h>
	#include <telepathy-glib/dbus-properties-mixin.h>		#include <telepathy-glib/dbus-properties-mixin.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
End of changes. 1 change blocks.
	4 lines changed or deleted		2 lines changed or added

	base-channel.h		base-channel.h
	skipping to change at line 22		skipping to change at line 22
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef __TP_BASE_CHANNEL_H__		#ifndef __TP_BASE_CHANNEL_H__
	#define __TP_BASE_CHANNEL_H__		#define __TP_BASE_CHANNEL_H__
	#include <glib-object.h>		#include <glib-object.h>
	#include <telepathy-glib/dbus-properties-mixin.h>		#include <telepathy-glib/dbus-properties-mixin.h>
	#include <telepathy-glib/base-connection.h>		#include <telepathy-glib/base-connection.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	skipping to change at line 59		skipping to change at line 59
	struct _TpBaseChannelClass		struct _TpBaseChannelClass
	{		{
	/*< private >*/		/*< private >*/
	GObjectClass parent_class;		GObjectClass parent_class;
	/*< public >*/		/*< public >*/
	TpDBusPropertiesMixinClass dbus_props_class;		TpDBusPropertiesMixinClass dbus_props_class;
	const gchar *channel_type;		const gchar *channel_type;
	TpHandleType target_handle_type;		TpHandleType target_handle_type;
	/*< private >*/
	const gchar **_TP_SEAL (interfaces);
	/*< public >*/
	TpBaseChannelCloseFunc close;		TpBaseChannelCloseFunc close;
	TpBaseChannelFillPropertiesFunc fill_immutable_properties;		TpBaseChannelFillPropertiesFunc fill_immutable_properties;
	TpBaseChannelGetPathFunc get_object_path_suffix;		TpBaseChannelGetPathFunc get_object_path_suffix;
	TpBaseChannelGetInterfacesFunc get_interfaces;		TpBaseChannelGetInterfacesFunc get_interfaces;
	/*< private >*/		/*< private >*/
	GCallback _reserved[9];		GCallback _reserved[9];
	};		};
End of changes. 2 change blocks.
	7 lines changed or deleted		2 lines changed or added

	base-client.h		base-client.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef __TP_BASE_CLIENT_H__		#ifndef __TP_BASE_CLIENT_H__
	#define __TP_BASE_CLIENT_H__		#define __TP_BASE_CLIENT_H__
	#include <dbus/dbus-glib.h>		#include <dbus/dbus-glib.h>
	#include <glib-object.h>		#include <glib-object.h>
	#include <telepathy-glib/account.h>		#include <telepathy-glib/account.h>
	#include <telepathy-glib/account-manager.h>
	#include <telepathy-glib/add-dispatch-operation-context.h>		#include <telepathy-glib/add-dispatch-operation-context.h>
	#include <telepathy-glib/client-channel-factory.h>		#include <telepathy-glib/channel.h>
	#include <telepathy-glib/handle-channels-context.h>		#include <telepathy-glib/handle-channels-context.h>
	#include <telepathy-glib/observe-channels-context.h>		#include <telepathy-glib/observe-channels-context.h>
	#include <telepathy-glib/connection.h>		#include <telepathy-glib/connection.h>
	#include <telepathy-glib/dbus.h>		#include <telepathy-glib/dbus.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	#include <telepathy-glib/dbus-properties-mixin.h>		#include <telepathy-glib/dbus-properties-mixin.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	/* forward declaration, see channel-dispatch-operation.h for the rest */		/* forward declaration, see channel-dispatch-operation.h for the rest */
	skipping to change at line 154		skipping to change at line 153
	void tp_base_client_set_handler_request_notification (TpBaseClient *self);		void tp_base_client_set_handler_request_notification (TpBaseClient *self);
	void tp_base_client_add_handler_capability (TpBaseClient *self,		void tp_base_client_add_handler_capability (TpBaseClient *self,
	const gchar *token);		const gchar *token);
	void tp_base_client_add_handler_capabilities (TpBaseClient *self,		void tp_base_client_add_handler_capabilities (TpBaseClient *self,
	const gchar * const *tokens);		const gchar * const *tokens);
	void tp_base_client_add_handler_capabilities_varargs (TpBaseClient *self,		void tp_base_client_add_handler_capabilities_varargs (TpBaseClient *self,
	const gchar *first_token, ...) G_GNUC_NULL_TERMINATED;		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_DEPRECATED_IN_0_16_FOR (tp_simple_client_factory_add_account_features_v
	arargs)
	void tp_base_client_add_account_features_varargs (TpBaseClient *self,
	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_DEPRECATED_IN_0_16_FOR (tp_simple_client_factory_add_channel_features_v
	arargs)
	void tp_base_client_add_channel_features_varargs (TpBaseClient *self,
	GQuark feature, ...);
	_TP_DEPRECATED_IN_0_16_FOR (tp_simple_client_factory_add_connection_feature
	s)
	void tp_base_client_add_connection_features (TpBaseClient *self,
	const GQuark *features, gssize n);
	_TP_DEPRECATED_IN_0_16_FOR (tp_simple_client_factory_add_connection_feature
	s_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_DEPRECATED_IN_0_16
	TpClientChannelFactory *tp_base_client_get_channel_factory (
	TpBaseClient *self);
	#endif
	typedef void (*TpBaseClientDelegatedChannelsCb) (		typedef void (*TpBaseClientDelegatedChannelsCb) (
	TpBaseClient *client,		TpBaseClient *client,
	GPtrArray *channels,		GPtrArray *channels,
	gpointer user_data);		gpointer user_data);
	_TP_AVAILABLE_IN_0_16		_TP_AVAILABLE_IN_0_16
	void tp_base_client_set_delegated_channels_callback (TpBaseClient *self,		void tp_base_client_set_delegated_channels_callback (TpBaseClient *self,
	TpBaseClientDelegatedChannelsCb callback,		TpBaseClientDelegatedChannelsCb callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy);		GDestroyNotify destroy);
	skipping to change at line 209		skipping to change at line 174
	/* future, potentially (currently in spec as a draft):		/* future, potentially (currently in spec as a draft):
	void tp_base_client_set_handler_related_conferences_bypass_approval (		void tp_base_client_set_handler_related_conferences_bypass_approval (
	TpBaseClient *self, gboolean bypass_approval);		TpBaseClient *self, gboolean bypass_approval);
	*/		*/
	gboolean tp_base_client_register (TpBaseClient *self,		gboolean tp_base_client_register (TpBaseClient *self,
	GError **error);		GError **error);
	/* Normal methods, can be called at any time */		/* Normal methods, can be called at any time */
	#ifndef TP_DISABLE_DEPRECATED
	_TP_DEPRECATED_IN_0_20_FOR (tp_base_client_dup_pending_requests)
	GList *tp_base_client_get_pending_requests (TpBaseClient *self);
	_TP_DEPRECATED_IN_0_20_FOR (tp_base_client_dup_handled_channels)
	GList *tp_base_client_get_handled_channels (TpBaseClient *self);
	#endif
	_TP_AVAILABLE_IN_0_20		_TP_AVAILABLE_IN_0_20
	GList *tp_base_client_dup_pending_requests (TpBaseClient *self);		GList *tp_base_client_dup_pending_requests (TpBaseClient *self);
	_TP_AVAILABLE_IN_0_20		_TP_AVAILABLE_IN_0_20
	GList *tp_base_client_dup_handled_channels (TpBaseClient *self);		GList *tp_base_client_dup_handled_channels (TpBaseClient *self);
	gboolean tp_base_client_is_handling_channel (TpBaseClient *self,		gboolean tp_base_client_is_handling_channel (TpBaseClient *self,
	TpChannel *channel);		TpChannel *channel);
	_TP_AVAILABLE_IN_0_16		_TP_AVAILABLE_IN_0_16
	void tp_base_client_delegate_channels_async (TpBaseClient *self,		void tp_base_client_delegate_channels_async (TpBaseClient *self,
	skipping to change at line 245		skipping to change at line 203
	GPtrArray **delegated,		GPtrArray **delegated,
	GHashTable **not_delegated,		GHashTable **not_delegated,
	GError **error);		GError **error);
	const gchar *tp_base_client_get_name (TpBaseClient *self);		const gchar *tp_base_client_get_name (TpBaseClient *self);
	gboolean tp_base_client_get_uniquify_name (TpBaseClient *self);		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_bus_name (TpBaseClient *self);
	const gchar *tp_base_client_get_object_path (TpBaseClient *self);		const gchar *tp_base_client_get_object_path (TpBaseClient *self);
	TpDBusDaemon *tp_base_client_get_dbus_daemon (TpBaseClient *self);		TpDBusDaemon *tp_base_client_get_dbus_daemon (TpBaseClient *self);
	#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);		void tp_base_client_unregister (TpBaseClient *self);
	#define TP_TYPE_BASE_CLIENT \		#define TP_TYPE_BASE_CLIENT \
	(tp_base_client_get_type ())		(tp_base_client_get_type ())
	#define TP_BASE_CLIENT(obj) \		#define TP_BASE_CLIENT(obj) \
	(G_TYPE_CHECK_INSTANCE_CAST ((obj), TP_TYPE_BASE_CLIENT, \		(G_TYPE_CHECK_INSTANCE_CAST ((obj), TP_TYPE_BASE_CLIENT, \
	TpBaseClient))		TpBaseClient))
	#define TP_BASE_CLIENT_CLASS(klass) \		#define TP_BASE_CLIENT_CLASS(klass) \
	(G_TYPE_CHECK_CLASS_CAST ((klass), TP_TYPE_BASE_CLIENT, \		(G_TYPE_CHECK_CLASS_CAST ((klass), TP_TYPE_BASE_CLIENT, \
	TpBaseClientClass))		TpBaseClientClass))
End of changes. 6 change blocks.
	56 lines changed or deleted		3 lines changed or added

	base-connection-manager.h		base-connection-manager.h
	skipping to change at line 22		skipping to change at line 22
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef __TP_BASE_CONNECTION_MANAGER_H__		#ifndef __TP_BASE_CONNECTION_MANAGER_H__
	#define __TP_BASE_CONNECTION_MANAGER_H__		#define __TP_BASE_CONNECTION_MANAGER_H__
	#include <dbus/dbus-glib.h>		#include <dbus/dbus-glib.h>
	#include <glib-object.h>		#include <glib-object.h>
	#include <telepathy-glib/base-connection.h>		#include <telepathy-glib/base-connection.h>
	#include <telepathy-glib/base-protocol.h>		#include <telepathy-glib/base-protocol.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	#include <telepathy-glib/proxy.h>		#include <telepathy-glib/proxy.h>
	#include <telepathy-glib/svc-connection-manager.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	void tp_cm_param_setter_offset (const TpCMParamSpec *paramspec,		void tp_cm_param_setter_offset (const TpCMParamSpec *paramspec,
	const GValue *value, gpointer params);		const GValue *value, gpointer params);
	typedef struct {		typedef struct {
	const gchar *name;		const gchar *name;
	const TpCMParamSpec *parameters;		const TpCMParamSpec *parameters;
	gpointer (*params_new) (void);		gpointer (*params_new) (void);
	skipping to change at line 73		skipping to change at line 72
	TpBaseConnectionManager *self, const gchar *proto,		TpBaseConnectionManager *self, const gchar *proto,
	TpIntset *params_present, void *parsed_params, GError **error);		TpIntset *params_present, void *parsed_params, GError **error);
	typedef GPtrArray * (*TpBaseConnectionManagerGetInterfacesFunc) (		typedef GPtrArray * (*TpBaseConnectionManagerGetInterfacesFunc) (
	TpBaseConnectionManager *self);		TpBaseConnectionManager *self);
	struct _TpBaseConnectionManagerClass {		struct _TpBaseConnectionManagerClass {
	GObjectClass parent_class;		GObjectClass parent_class;
	const char *cm_dbus_name;		const char *cm_dbus_name;
	/*<private>*/
	const TpCMProtocolSpec *_TP_SEAL (protocol_params);
	TpBaseConnectionManagerNewConnFunc _TP_SEAL (new_connection);
	/*< public >*/
	/*<private>*/		/*<private>*/
	const gchar * const *_TP_SEAL (interfaces);		const gchar * const *_TP_SEAL (interfaces);
	/*<public>*/		/*<public>*/
	TpBaseConnectionManagerGetInterfacesFunc get_interfaces;		TpBaseConnectionManagerGetInterfacesFunc get_interfaces;
	/*<private>*/		/*<private>*/
	gpointer _future3;		gpointer _future3;
	gpointer _future4;		gpointer _future4;
End of changes. 3 change blocks.
	9 lines changed or deleted		2 lines changed or added

	base-connection.h		base-connection.h
	skipping to change at line 22		skipping to change at line 22
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef __TP_BASE_CONNECTION_H__		#ifndef __TP_BASE_CONNECTION_H__
	#define __TP_BASE_CONNECTION_H__		#define __TP_BASE_CONNECTION_H__
	#include <dbus/dbus-glib.h>		#include <dbus/dbus-glib.h>
	#include <glib-object.h>		#include <glib-object.h>
	#include <telepathy-glib/channel-manager.h>		#include <telepathy-glib/channel-manager.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	#include <telepathy-glib/enums.h>		#include <telepathy-glib/enums.h>
	#include <telepathy-glib/handle-repo.h>		#include <telepathy-glib/handle-repo.h>
	#include <telepathy-glib/proxy.h>		#include <telepathy-glib/proxy.h>
	#include <telepathy-glib/svc-connection.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	/* The TpBaseConnection typedef is forward-declared in handle-repo.h */		/* The TpBaseConnection typedef is forward-declared in handle-repo.h */
	typedef struct _TpBaseConnectionClass TpBaseConnectionClass;		typedef struct _TpBaseConnectionClass TpBaseConnectionClass;
	typedef struct _TpBaseConnectionPrivate TpBaseConnectionPrivate;		typedef struct _TpBaseConnectionPrivate TpBaseConnectionPrivate;
	typedef void (*TpBaseConnectionProc) (TpBaseConnection *self);		typedef void (*TpBaseConnectionProc) (TpBaseConnection *self);
	typedef gboolean (*TpBaseConnectionStartConnectingImpl) (		typedef gboolean (*TpBaseConnectionStartConnectingImpl) (
	TpBaseConnection *self, GError **error);		TpBaseConnection *self, GError **error);
	typedef void (*TpBaseConnectionCreateHandleReposImpl) (TpBaseConnection *se lf,		typedef void (*TpBaseConnectionCreateHandleReposImpl) (TpBaseConnection *se lf,
	TpHandleRepoIface *repos[TP_NUM_HANDLE_TYPES]);		TpHandleRepoIface *repos[TP_NUM_HANDLE_TYPES]);
	typedef GPtrArray *(*TpBaseConnectionCreateChannelFactoriesImpl) (
	TpBaseConnection *self);
	typedef GPtrArray *(*TpBaseConnectionCreateChannelManagersImpl) (		typedef GPtrArray *(*TpBaseConnectionCreateChannelManagersImpl) (
	TpBaseConnection *self);		TpBaseConnection *self);
	typedef gchar *(*TpBaseConnectionGetUniqueConnectionNameImpl) (		typedef gchar *(*TpBaseConnectionGetUniqueConnectionNameImpl) (
	TpBaseConnection *self);		TpBaseConnection *self);
	typedef GPtrArray *(*TpBaseConnectionGetInterfacesImpl) (		typedef GPtrArray *(*TpBaseConnectionGetInterfacesImpl) (
	TpBaseConnection *self);		TpBaseConnection *self);
	struct _TpBaseConnection {		struct _TpBaseConnection {
	/*<private>*/		/*<private>*/
	GObject parent;		GObject parent;
	gchar *_TP_SEAL (bus_name);
	gchar *_TP_SEAL (object_path);
	TpConnectionStatus _TP_SEAL (status);
	TpHandle _TP_SEAL (self_handle);
	/*<private>*/
	gpointer _future1;
	gpointer _future2;
	gpointer _future3;
	gpointer _future4;
	TpBaseConnectionPrivate *priv;		TpBaseConnectionPrivate *priv;
	};		};
	struct _TpBaseConnectionClass {		struct _TpBaseConnectionClass {
	GObjectClass parent_class;		GObjectClass parent_class;
	#ifdef __GI_SCANNER__		#ifdef __GI_SCANNER__
	/*<private>*/		/*<private>*/
	GCallback _internal_create_handle_repos;		GCallback _internal_create_handle_repos;
	/*<public>*/		/*<public>*/
	#else		#else
	TpBaseConnectionCreateHandleReposImpl create_handle_repos;		TpBaseConnectionCreateHandleReposImpl create_handle_repos;
	#endif		#endif
	TpBaseConnectionCreateChannelFactoriesImpl create_channel_factories;
	TpBaseConnectionGetUniqueConnectionNameImpl get_unique_connection_name;		TpBaseConnectionGetUniqueConnectionNameImpl get_unique_connection_name;
	TpBaseConnectionProc connecting;		TpBaseConnectionProc connecting;
	TpBaseConnectionProc connected;		TpBaseConnectionProc connected;
	TpBaseConnectionProc disconnected;		TpBaseConnectionProc disconnected;
	TpBaseConnectionProc shut_down;		TpBaseConnectionProc shut_down;
	TpBaseConnectionStartConnectingImpl start_connecting;		TpBaseConnectionStartConnectingImpl start_connecting;
	skipping to change at line 177		skipping to change at line 158
	TpHandle tp_base_connection_get_self_handle (TpBaseConnection *self);		TpHandle tp_base_connection_get_self_handle (TpBaseConnection *self);
	void tp_base_connection_set_self_handle (TpBaseConnection *self,		void tp_base_connection_set_self_handle (TpBaseConnection *self,
	TpHandle self_handle);		TpHandle self_handle);
	void tp_base_connection_finish_shutdown (TpBaseConnection *self);		void tp_base_connection_finish_shutdown (TpBaseConnection *self);
	void tp_base_connection_add_interfaces (TpBaseConnection *self,		void tp_base_connection_add_interfaces (TpBaseConnection *self,
	const gchar **interfaces);		const gchar **interfaces);
	#ifndef TP_DISABLE_DEPRECATED
	_TP_DEPRECATED_IN_0_20
	void tp_base_connection_dbus_request_handles (TpSvcConnection *iface,
	guint handle_type, const gchar **names, DBusGMethodInvocation *context)
	;
	#endif
	void tp_base_connection_register_with_contacts_mixin (TpBaseConnection *sel f);		void tp_base_connection_register_with_contacts_mixin (TpBaseConnection *sel f);
	typedef struct _TpChannelManagerIter TpChannelManagerIter;		typedef struct _TpChannelManagerIter TpChannelManagerIter;
	struct _TpChannelManagerIter {		struct _TpChannelManagerIter {
	/*<private>*/		/*<private>*/
	TpBaseConnection *self;		TpBaseConnection *self;
	guint index;		guint index;
	gpointer _future[2];		gpointer _future[2];
	};		};
	skipping to change at line 222		skipping to change at line 197
	(G_TYPE_CHECK_CLASS_TYPE((klass), TP_TYPE_BASE_CONNECTION))		(G_TYPE_CHECK_CLASS_TYPE((klass), TP_TYPE_BASE_CONNECTION))
	#define TP_BASE_CONNECTION_GET_CLASS(obj) \		#define TP_BASE_CONNECTION_GET_CLASS(obj) \
	(G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_BASE_CONNECTION, \		(G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_BASE_CONNECTION, \
	TpBaseConnectionClass))		TpBaseConnectionClass))
	#define TP_BASE_CONNECTION_ERROR_IF_NOT_CONNECTED(conn, context) \		#define TP_BASE_CONNECTION_ERROR_IF_NOT_CONNECTED(conn, context) \
	G_STMT_START { \		G_STMT_START { \
	TpBaseConnection *c_ = (conn); \		TpBaseConnection *c_ = (conn); \
	GError *e_ = NULL; \		GError *e_ = NULL; \
	\		\
	G_GNUC_BEGIN_IGNORE_DEPRECATIONS \
	if (!tp_base_connection_check_connected (c_, &e_)) \		if (!tp_base_connection_check_connected (c_, &e_)) \
	{ \		{ \
	dbus_g_method_return_error ((context), e_); \		dbus_g_method_return_error ((context), e_); \
	g_error_free (e_); \		g_error_free (e_); \
	return; \		return; \
	} \		} \
	G_GNUC_END_IGNORE_DEPRECATIONS \
	} G_STMT_END		} G_STMT_END
	TpDBusDaemon *tp_base_connection_get_dbus_daemon (TpBaseConnection *self);		TpDBusDaemon *tp_base_connection_get_dbus_daemon (TpBaseConnection *self);
	void tp_base_connection_add_client_interest (TpBaseConnection *self,		void tp_base_connection_add_client_interest (TpBaseConnection *self,
	const gchar *unique_name, const gchar *token,		const gchar *unique_name, const gchar *token,
	gboolean only_if_uninterested);		gboolean only_if_uninterested);
	void tp_base_connection_add_possible_client_interest (TpBaseConnection *sel f,		void tp_base_connection_add_possible_client_interest (TpBaseConnection *sel f,
	GQuark token);		GQuark token);
	_TP_AVAILABLE_IN_0_24
	const gchar *tp_base_connection_get_account_path_suffix (
	TpBaseConnection *self);
	G_END_DECLS		G_END_DECLS
	#endif /* #ifndef __TP_BASE_CONNECTION_H__*/		#endif /* #ifndef __TP_BASE_CONNECTION_H__*/
End of changes. 9 change blocks.
	36 lines changed or deleted		2 lines changed or added

	base-contact-list.h		base-contact-list.h
	/* ContactList channel manager		/* ContactList base class
	*		*
	* Copyright © 2010 Collabora Ltd.		* Copyright © 2010 Collabora Ltd.
	*		*
	* This library is free software; you can redistribute it and/or		* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU Lesser General Public		* modify it under the terms of the GNU Lesser General Public
	* License as published by the Free Software Foundation; either		* License as published by the Free Software Foundation; either
	* version 2.1 of the License, or (at your option) any later version.		* version 2.1 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef __TP_BASE_CONTACT_LIST_H__		#ifndef __TP_BASE_CONTACT_LIST_H__
	#define __TP_BASE_CONTACT_LIST_H__		#define __TP_BASE_CONTACT_LIST_H__
	#include <glib-object.h>		#include <glib-object.h>
	#include <gio/gio.h>		#include <gio/gio.h>
	#include <telepathy-glib/base-connection.h>		#include <telepathy-glib/base-connection.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	#include <telepathy-glib/handle-repo.h>		#include <telepathy-glib/handle-repo.h>
	#include <telepathy-glib/svc-connection.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	typedef struct _TpBaseContactList TpBaseContactList;		typedef struct _TpBaseContactList TpBaseContactList;
	typedef struct _TpBaseContactListClass TpBaseContactListClass;		typedef struct _TpBaseContactListClass TpBaseContactListClass;
	typedef struct _TpBaseContactListPrivate TpBaseContactListPrivate;		typedef struct _TpBaseContactListPrivate TpBaseContactListPrivate;
	typedef struct _TpBaseContactListClassPrivate TpBaseContactListClassPrivate ;		typedef struct _TpBaseContactListClassPrivate TpBaseContactListClassPrivate ;
	struct _TpBaseContactList {		struct _TpBaseContactList {
	/*<private>*/		/*<private>*/
	skipping to change at line 591		skipping to change at line 590
	TpBaseContactListRenameGroupFunc rename_group_async;		TpBaseContactListRenameGroupFunc rename_group_async;
	TpBaseContactListAsyncFinishFunc rename_group_finish;		TpBaseContactListAsyncFinishFunc rename_group_finish;
	TpBaseContactListUIntFunc get_group_storage;		TpBaseContactListUIntFunc get_group_storage;
	};		};
	/* ---- Mixin-like functionality for our parent TpBaseConnection ---- */		/* ---- Mixin-like functionality for our parent TpBaseConnection ---- */
	void tp_base_contact_list_mixin_class_init (TpBaseConnectionClass *cls);		void tp_base_contact_list_mixin_class_init (TpBaseConnectionClass *cls);
	void tp_base_contact_list_mixin_register_with_contacts_mixin (		void tp_base_contact_list_mixin_register_with_contacts_mixin (
	TpBaseConnection *conn);		TpBaseContactList *self, TpBaseConnection *conn);
	void tp_base_contact_list_mixin_list_iface_init (		void tp_base_contact_list_mixin_list_iface_init (gpointer klass);
	TpSvcConnectionInterfaceContactListClass *klass);		void tp_base_contact_list_mixin_groups_iface_init (gpointer klass);
	void tp_base_contact_list_mixin_groups_iface_init (
	TpSvcConnectionInterfaceContactGroupsClass *klass);
	_TP_AVAILABLE_IN_0_16		_TP_AVAILABLE_IN_0_16
	void tp_base_contact_list_mixin_blocking_iface_init (		void tp_base_contact_list_mixin_blocking_iface_init (gpointer klass);
	TpSvcConnectionInterfaceContactBlockingClass *klass);
	G_END_DECLS		G_END_DECLS
	#endif		#endif
End of changes. 5 change blocks.
	13 lines changed or deleted		7 lines changed or added

	base-media-call-channel.h		base-media-call-channel.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef __TP_BASE_MEDIA_CALL_CHANNEL_H__		#ifndef __TP_BASE_MEDIA_CALL_CHANNEL_H__
	#define __TP_BASE_MEDIA_CALL_CHANNEL_H__		#define __TP_BASE_MEDIA_CALL_CHANNEL_H__
	#include <telepathy-glib/base-call-channel.h>		#include <telepathy-glib/base-call-channel.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
End of changes. 1 change blocks.
	4 lines changed or deleted		2 lines changed or added

	base-media-call-content.h		base-media-call-content.h
	skipping to change at line 22		skipping to change at line 22
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef __TP_BASE_MEDIA_CALL_CONTENT_H__		#ifndef __TP_BASE_MEDIA_CALL_CONTENT_H__
	#define __TP_BASE_MEDIA_CALL_CONTENT_H__		#define __TP_BASE_MEDIA_CALL_CONTENT_H__
	#include <gio/gio.h>		#include <gio/gio.h>
	#include <telepathy-glib/base-call-content.h>		#include <telepathy-glib/base-call-content.h>
	#include <telepathy-glib/call-content-media-description.h>		#include <telepathy-glib/call-content-media-description.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
End of changes. 1 change blocks.
	4 lines changed or deleted		2 lines changed or added

	base-media-call-stream.h		base-media-call-stream.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef __TP_BASE_MEDIA_CALL_STREAM_H__		#ifndef __TP_BASE_MEDIA_CALL_STREAM_H__
	#define __TP_BASE_MEDIA_CALL_STREAM_H__		#define __TP_BASE_MEDIA_CALL_STREAM_H__
	#include <telepathy-glib/base-call-stream.h>		#include <telepathy-glib/base-call-stream.h>
	#include <telepathy-glib/call-stream-endpoint.h>		#include <telepathy-glib/call-stream-endpoint.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
End of changes. 1 change blocks.
	4 lines changed or deleted		2 lines changed or added

	base-password-channel.h		base-password-channel.h
	skipping to change at line 20		skipping to change at line 20
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef __TP_BASE_PASSWORD_CHANNEL_H__		#ifndef __TP_BASE_PASSWORD_CHANNEL_H__
	#define __TP_BASE_PASSWORD_CHANNEL_H__		#define __TP_BASE_PASSWORD_CHANNEL_H__
	#include <glib-object.h>		#include <glib-object.h>
	#include <telepathy-glib/base-channel.h>		#include <telepathy-glib/base-channel.h>
	#include <telepathy-glib/dbus-properties-mixin.h>		#include <telepathy-glib/dbus-properties-mixin.h>
End of changes. 1 change blocks.
	4 lines changed or deleted		2 lines changed or added

	base-protocol.h		base-protocol.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef TP_BASE_PROTOCOL_H		#ifndef TP_BASE_PROTOCOL_H
	#define TP_BASE_PROTOCOL_H		#define TP_BASE_PROTOCOL_H
	#include <glib-object.h>		#include <glib-object.h>
	#include <telepathy-glib/base-connection.h>		#include <telepathy-glib/base-connection.h>
			#include <telepathy-glib/dbus-properties-mixin.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	#include <telepathy-glib/presence-mixin.h>		#include <telepathy-glib/presence-mixin.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	typedef struct _TpCMParamSpec TpCMParamSpec;		typedef struct _TpCMParamSpec TpCMParamSpec;
	typedef void (*TpCMParamSetter) (const TpCMParamSpec *paramspec,		typedef void (*TpCMParamSetter) (const TpCMParamSpec *paramspec,
	const GValue *value, gpointer params);		const GValue *value, gpointer params);
End of changes. 2 change blocks.
	4 lines changed or deleted		3 lines changed or added

	base-room-config.h		base-room-config.h
	skipping to change at line 20		skipping to change at line 20
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef TP_BASE_ROOM_CONFIG_H		#ifndef TP_BASE_ROOM_CONFIG_H
	#define TP_BASE_ROOM_CONFIG_H		#define TP_BASE_ROOM_CONFIG_H
	#include <glib-object.h>		#include <glib-object.h>
	#include <telepathy-glib/base-channel.h>		#include <telepathy-glib/base-channel.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	#include <telepathy-glib/_gen/genums.h>		#include <telepathy-glib/_gen/genums.h>
End of changes. 1 change blocks.
	4 lines changed or deleted		2 lines changed or added

	call-channel.h		call-channel.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef __TP_CALL_CHANNEL_H__		#ifndef __TP_CALL_CHANNEL_H__
	#define __TP_CALL_CHANNEL_H__		#define __TP_CALL_CHANNEL_H__
	#include <telepathy-glib/channel.h>		#include <telepathy-glib/channel.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
End of changes. 1 change blocks.
	4 lines changed or deleted		2 lines changed or added

	call-content-media-description.h		call-content-media-description.h
	skipping to change at line 23		skipping to change at line 23
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef __TP_CALL_CONTENT_MEDIA_DESCRIPTION_H__		#ifndef __TP_CALL_CONTENT_MEDIA_DESCRIPTION_H__
	#define __TP_CALL_CONTENT_MEDIA_DESCRIPTION_H__		#define __TP_CALL_CONTENT_MEDIA_DESCRIPTION_H__
	#include <glib-object.h>		#include <glib-object.h>
	#include <gio/gio.h>		#include <gio/gio.h>
	#include <telepathy-glib/dbus.h>		#include <telepathy-glib/dbus.h>
	#include <telepathy-glib/dbus-properties-mixin.h>		#include <telepathy-glib/dbus-properties-mixin.h>
End of changes. 1 change blocks.
	4 lines changed or deleted		2 lines changed or added

	call-content.h		call-content.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef __TP_CALL_CONTENT_H__		#ifndef __TP_CALL_CONTENT_H__
	#define __TP_CALL_CONTENT_H__		#define __TP_CALL_CONTENT_H__
	#include <telepathy-glib/proxy.h>		#include <telepathy-glib/proxy.h>
	#include <telepathy-glib/call-channel.h>		#include <telepathy-glib/call-channel.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	skipping to change at line 101		skipping to change at line 101
	GCancellable *cancellable,		GCancellable *cancellable,
	GAsyncReadyCallback callback,		GAsyncReadyCallback callback,
	gpointer user_data);		gpointer user_data);
	_TP_AVAILABLE_IN_0_18		_TP_AVAILABLE_IN_0_18
	gboolean tp_call_content_send_tones_finish (TpCallContent *self,		gboolean tp_call_content_send_tones_finish (TpCallContent *self,
	GAsyncResult *result,		GAsyncResult *result,
	GError **error);		GError **error);
	G_END_DECLS		G_END_DECLS
	#include <telepathy-glib/_gen/tp-cli-call-content.h>
	#endif		#endif
End of changes. 2 change blocks.
	6 lines changed or deleted		2 lines changed or added

	call-misc.h		call-misc.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef __TP_CALL_MISC_H__		#ifndef __TP_CALL_MISC_H__
	#define __TP_CALL_MISC_H__		#define __TP_CALL_MISC_H__
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	#include <telepathy-glib/proxy.h>		#include <telepathy-glib/proxy.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	_TP_AVAILABLE_IN_0_18		_TP_AVAILABLE_IN_0_18
	void tp_call_stream_endpoint_init_known_interfaces (void);		void tp_call_stream_endpoint_init_known_interfaces (void);
	_TP_AVAILABLE_IN_0_18		_TP_AVAILABLE_IN_0_18
	void tp_call_content_media_description_init_known_interfaces (void);		void tp_call_content_media_description_init_known_interfaces (void);
	G_END_DECLS		G_END_DECLS
	#include <telepathy-glib/_gen/tp-cli-call-content-media-description.h>
	#include <telepathy-glib/_gen/tp-cli-call-stream-endpoint.h>
	#endif		#endif
End of changes. 2 change blocks.
	7 lines changed or deleted		2 lines changed or added

	call-stream-endpoint.h		call-stream-endpoint.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef __TP_CALL_STREAM_ENDPOINT_H__		#ifndef __TP_CALL_STREAM_ENDPOINT_H__
	#define __TP_CALL_STREAM_ENDPOINT_H__		#define __TP_CALL_STREAM_ENDPOINT_H__
	#include <glib-object.h>		#include <glib-object.h>
	#include <telepathy-glib/dbus.h>		#include <telepathy-glib/dbus.h>
	#include <telepathy-glib/dbus-properties-mixin.h>		#include <telepathy-glib/dbus-properties-mixin.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
End of changes. 1 change blocks.
	4 lines changed or deleted		2 lines changed or added

	call-stream.h		call-stream.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef __TP_CALL_STREAM_H__		#ifndef __TP_CALL_STREAM_H__
	#define __TP_CALL_STREAM_H__		#define __TP_CALL_STREAM_H__
	#include <telepathy-glib/proxy.h>		#include <telepathy-glib/proxy.h>
	#include <telepathy-glib/call-channel.h>		#include <telepathy-glib/call-channel.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	skipping to change at line 100		skipping to change at line 100
	gboolean receive,		gboolean receive,
	GAsyncReadyCallback callback,		GAsyncReadyCallback callback,
	gpointer user_data);		gpointer user_data);
	_TP_AVAILABLE_IN_0_18		_TP_AVAILABLE_IN_0_18
	gboolean tp_call_stream_request_receiving_finish (TpCallStream *self,		gboolean tp_call_stream_request_receiving_finish (TpCallStream *self,
	GAsyncResult *result,		GAsyncResult *result,
	GError **error);		GError **error);
	G_END_DECLS		G_END_DECLS
	#include <telepathy-glib/_gen/tp-cli-call-stream.h>
	#endif		#endif
End of changes. 2 change blocks.
	6 lines changed or deleted		2 lines changed or added

	capabilities.h		capabilities.h
	skipping to change at line 20		skipping to change at line 20
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef __TP_CAPABILITIES_H__		#ifndef __TP_CAPABILITIES_H__
	#define __TP_CAPABILITIES_H__		#define __TP_CAPABILITIES_H__
	#include <glib-object.h>		#include <glib-object.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	#include <telepathy-glib/enums.h>		#include <telepathy-glib/enums.h>
End of changes. 1 change blocks.
	4 lines changed or deleted		2 lines changed or added

	channel-dispatch-operation.h		channel-dispatch-operation.h
	skipping to change at line 22		skipping to change at line 22
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef TP_CHANNEL_DISPATCH_OPERATION_H		#ifndef TP_CHANNEL_DISPATCH_OPERATION_H
	#define TP_CHANNEL_DISPATCH_OPERATION_H		#define TP_CHANNEL_DISPATCH_OPERATION_H
	#include <telepathy-glib/account.h>		#include <telepathy-glib/account.h>
	#include <telepathy-glib/base-client.h>		#include <telepathy-glib/base-client.h>
	#include <telepathy-glib/connection.h>		#include <telepathy-glib/connection.h>
	#include <telepathy-glib/dbus.h>		#include <telepathy-glib/dbus.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	skipping to change at line 77		skipping to change at line 77
	(G_TYPE_CHECK_CLASS_CAST ((klass), TP_TYPE_CHANNEL_DISPATCH_OPERATION, \		(G_TYPE_CHECK_CLASS_CAST ((klass), TP_TYPE_CHANNEL_DISPATCH_OPERATION, \
	TpChannelDispatchOperationClass))		TpChannelDispatchOperationClass))
	#define TP_IS_CHANNEL_DISPATCH_OPERATION(obj) \		#define TP_IS_CHANNEL_DISPATCH_OPERATION(obj) \
	(G_TYPE_CHECK_INSTANCE_TYPE ((obj), TP_TYPE_CHANNEL_DISPATCH_OPERATION))		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), TP_TYPE_CHANNEL_DISPATCH_OPERATION))
	#define TP_IS_CHANNEL_DISPATCH_OPERATION_CLASS(klass) \		#define TP_IS_CHANNEL_DISPATCH_OPERATION_CLASS(klass) \
	(G_TYPE_CHECK_CLASS_TYPE ((klass), TP_TYPE_CHANNEL_DISPATCH_OPERATION))		(G_TYPE_CHECK_CLASS_TYPE ((klass), TP_TYPE_CHANNEL_DISPATCH_OPERATION))
	#define TP_CHANNEL_DISPATCH_OPERATION_GET_CLASS(obj) \		#define TP_CHANNEL_DISPATCH_OPERATION_GET_CLASS(obj) \
	(G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_CHANNEL_DISPATCH_OPERATION, \		(G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_CHANNEL_DISPATCH_OPERATION, \
	TpChannelDispatchOperationClass))		TpChannelDispatchOperationClass))
	#ifndef TP_DISABLE_DEPRECATED
	_TP_DEPRECATED_IN_0_20
	TpChannelDispatchOperation *tp_channel_dispatch_operation_new (
	TpDBusDaemon *bus_daemon, const gchar *object_path,
	GHashTable *immutable_properties, GError **error)
	G_GNUC_WARN_UNUSED_RESULT;
	#endif
	void tp_channel_dispatch_operation_init_known_interfaces (void);		void tp_channel_dispatch_operation_init_known_interfaces (void);
	#define TP_CHANNEL_DISPATCH_OPERATION_FEATURE_CORE \		#define TP_CHANNEL_DISPATCH_OPERATION_FEATURE_CORE \
	tp_channel_dispatch_operation_get_feature_quark_core ()		tp_channel_dispatch_operation_get_feature_quark_core ()
	GQuark tp_channel_dispatch_operation_get_feature_quark_core (void) G_GNUC_C ONST;		GQuark tp_channel_dispatch_operation_get_feature_quark_core (void) G_GNUC_C ONST;
	#ifndef TP_DISABLE_DEPRECATED
	_TP_DEPRECATED_IN_0_20_FOR(tp_channel_dispatch_operation_get_connection)
	TpConnection * tp_channel_dispatch_operation_borrow_connection (
	TpChannelDispatchOperation *self);
	_TP_DEPRECATED_IN_0_20_FOR(tp_channel_dispatch_operation_get_account)
	TpAccount * tp_channel_dispatch_operation_borrow_account (
	TpChannelDispatchOperation *self);
	_TP_DEPRECATED_IN_0_20_FOR(tp_channel_dispatch_operation_get_channels)
	GPtrArray * tp_channel_dispatch_operation_borrow_channels (
	TpChannelDispatchOperation *self);
	_TP_DEPRECATED_IN_0_20_FOR(tp_channel_dispatch_operation_get_possible_handl
	ers)
	GStrv tp_channel_dispatch_operation_borrow_possible_handlers (
	TpChannelDispatchOperation *self);
	_TP_DEPRECATED_IN_0_20
	GHashTable * tp_channel_dispatch_operation_borrow_immutable_properties (
	TpChannelDispatchOperation *self);
	#endif
	_TP_AVAILABLE_IN_0_20		_TP_AVAILABLE_IN_0_20
	TpConnection * tp_channel_dispatch_operation_get_connection (		TpConnection * tp_channel_dispatch_operation_get_connection (
	TpChannelDispatchOperation *self);		TpChannelDispatchOperation *self);
	_TP_AVAILABLE_IN_0_20		_TP_AVAILABLE_IN_0_20
	TpAccount * tp_channel_dispatch_operation_get_account (		TpAccount * tp_channel_dispatch_operation_get_account (
	TpChannelDispatchOperation *self);		TpChannelDispatchOperation *self);
	_TP_AVAILABLE_IN_0_20		_TP_AVAILABLE_IN_0_20
	GPtrArray * tp_channel_dispatch_operation_get_channels (		GPtrArray * tp_channel_dispatch_operation_get_channels (
	skipping to change at line 141		skipping to change at line 111
	TpChannelDispatchOperation *self,		TpChannelDispatchOperation *self,
	const gchar *handler,		const gchar *handler,
	GAsyncReadyCallback callback,		GAsyncReadyCallback callback,
	gpointer user_data);		gpointer user_data);
	gboolean tp_channel_dispatch_operation_handle_with_finish (		gboolean tp_channel_dispatch_operation_handle_with_finish (
	TpChannelDispatchOperation *self,		TpChannelDispatchOperation *self,
	GAsyncResult *result,		GAsyncResult *result,
	GError **error);		GError **error);
	void tp_channel_dispatch_operation_claim_async (
	TpChannelDispatchOperation *self,
	GAsyncReadyCallback callback,
	gpointer user_data);
	gboolean tp_channel_dispatch_operation_claim_finish (
	TpChannelDispatchOperation *self,
	GAsyncResult *result,
	GError **error);
	void tp_channel_dispatch_operation_handle_with_time_async (		void tp_channel_dispatch_operation_handle_with_time_async (
	TpChannelDispatchOperation *self,		TpChannelDispatchOperation *self,
	const gchar *handler,		const gchar *handler,
	gint64 user_action_time,		gint64 user_action_time,
	GAsyncReadyCallback callback,		GAsyncReadyCallback callback,
	gpointer user_data);		gpointer user_data);
	gboolean tp_channel_dispatch_operation_handle_with_time_finish (		gboolean tp_channel_dispatch_operation_handle_with_time_finish (
	TpChannelDispatchOperation *self,		TpChannelDispatchOperation *self,
	GAsyncResult *result,		GAsyncResult *result,
	skipping to change at line 218		skipping to change at line 178
	gpointer user_data);		gpointer user_data);
	_TP_AVAILABLE_IN_0_16		_TP_AVAILABLE_IN_0_16
	gboolean tp_channel_dispatch_operation_destroy_channels_finish (		gboolean tp_channel_dispatch_operation_destroy_channels_finish (
	TpChannelDispatchOperation *self,		TpChannelDispatchOperation *self,
	GAsyncResult *result,		GAsyncResult *result,
	GError **error);		GError **error);
	G_END_DECLS		G_END_DECLS
	#include <telepathy-glib/_gen/tp-cli-channel-dispatch-operation.h>
	#endif		#endif
End of changes. 5 change blocks.
	47 lines changed or deleted		2 lines changed or added

	channel-dispatcher.h		channel-dispatcher.h
	skipping to change at line 22		skipping to change at line 22
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef TP_CHANNEL_DISPATCHER_H		#ifndef TP_CHANNEL_DISPATCHER_H
	#define TP_CHANNEL_DISPATCHER_H		#define TP_CHANNEL_DISPATCHER_H
	#include <telepathy-glib/channel.h>		#include <telepathy-glib/channel.h>
	#include <telepathy-glib/dbus.h>		#include <telepathy-glib/dbus.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	#include <telepathy-glib/proxy.h>		#include <telepathy-glib/proxy.h>
	skipping to change at line 92		skipping to change at line 92
	gpointer user_data);		gpointer user_data);
	_TP_AVAILABLE_IN_0_16		_TP_AVAILABLE_IN_0_16
	gboolean tp_channel_dispatcher_present_channel_finish (		gboolean tp_channel_dispatcher_present_channel_finish (
	TpChannelDispatcher *self,		TpChannelDispatcher *self,
	GAsyncResult *result,		GAsyncResult *result,
	GError **error);		GError **error);
	G_END_DECLS		G_END_DECLS
	#include <telepathy-glib/_gen/tp-cli-channel-dispatcher.h>
	#endif		#endif
End of changes. 2 change blocks.
	6 lines changed or deleted		2 lines changed or added

	channel-iface.h		channel-iface.h
	skipping to change at line 22		skipping to change at line 22
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef __TP_CHANNEL_IFACE_H__		#ifndef __TP_CHANNEL_IFACE_H__
	#define __TP_CHANNEL_IFACE_H__		#define __TP_CHANNEL_IFACE_H__
	#include <glib-object.h>		#include <glib-object.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	#define TP_TYPE_CHANNEL_IFACE (tp_channel_iface_get_type ())		#define TP_TYPE_CHANNEL_IFACE (tp_channel_iface_get_type ())
End of changes. 1 change blocks.
	4 lines changed or deleted		2 lines changed or added

	channel-manager.h		channel-manager.h
	skipping to change at line 23		skipping to change at line 23
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef TP_CHANNEL_MANAGER_H		#ifndef TP_CHANNEL_MANAGER_H
	#define TP_CHANNEL_MANAGER_H		#define TP_CHANNEL_MANAGER_H
	#include <glib-object.h>		#include <glib-object.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	#include <telepathy-glib/exportable-channel.h>		#include <telepathy-glib/exportable-channel.h>
	skipping to change at line 132		skipping to change at line 132
	GCallback _future[7];		GCallback _future[7];
	};		};
	GType tp_channel_manager_get_type (void);		GType tp_channel_manager_get_type (void);
	/* signal emission */		/* signal emission */
	void tp_channel_manager_emit_new_channel (gpointer instance,		void tp_channel_manager_emit_new_channel (gpointer instance,
	TpExportableChannel *channel, GSList *request_tokens);		TpExportableChannel *channel, GSList *request_tokens);
	_TP_DEPRECATED_IN_0_20
	void tp_channel_manager_emit_new_channels (gpointer instance,
	GHashTable *channels);
	void tp_channel_manager_emit_channel_closed (gpointer instance,		void tp_channel_manager_emit_channel_closed (gpointer instance,
	const gchar *path);		const gchar *path);
	void tp_channel_manager_emit_channel_closed_for_object (gpointer instance,		void tp_channel_manager_emit_channel_closed_for_object (gpointer instance,
	TpExportableChannel *channel);		TpExportableChannel *channel);
	void tp_channel_manager_emit_request_already_satisfied (		void tp_channel_manager_emit_request_already_satisfied (
	gpointer instance, gpointer request_token,		gpointer instance, gpointer request_token,
	TpExportableChannel *channel);		TpExportableChannel *channel);
	void tp_channel_manager_emit_request_failed (gpointer instance,		void tp_channel_manager_emit_request_failed (gpointer instance,
End of changes. 2 change blocks.
	8 lines changed or deleted		2 lines changed or added

	channel-request.h		channel-request.h
	skipping to change at line 22		skipping to change at line 22
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef TP_CHANNEL_REQUEST_H		#ifndef TP_CHANNEL_REQUEST_H
	#define TP_CHANNEL_REQUEST_H		#define TP_CHANNEL_REQUEST_H
	#include <telepathy-glib/account.h>		#include <telepathy-glib/account.h>
	#include <telepathy-glib/client-channel-factory.h>
	#include <telepathy-glib/dbus.h>		#include <telepathy-glib/dbus.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	#include <telepathy-glib/proxy.h>		#include <telepathy-glib/proxy.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	typedef struct _TpChannelRequest TpChannelRequest;		typedef struct _TpChannelRequest TpChannelRequest;
	typedef struct _TpChannelRequestClass TpChannelRequestClass;		typedef struct _TpChannelRequestClass TpChannelRequestClass;
	typedef struct _TpChannelRequestPrivate TpChannelRequestPrivate;		typedef struct _TpChannelRequestPrivate TpChannelRequestPrivate;
	typedef struct _TpChannelRequestClassPrivate TpChannelRequestClassPrivate;		typedef struct _TpChannelRequestClassPrivate TpChannelRequestClassPrivate;
	skipping to change at line 73		skipping to change at line 72
	(G_TYPE_CHECK_CLASS_CAST ((klass), TP_TYPE_CHANNEL_REQUEST, \		(G_TYPE_CHECK_CLASS_CAST ((klass), TP_TYPE_CHANNEL_REQUEST, \
	TpChannelRequestClass))		TpChannelRequestClass))
	#define TP_IS_CHANNEL_REQUEST(obj) \		#define TP_IS_CHANNEL_REQUEST(obj) \
	(G_TYPE_CHECK_INSTANCE_TYPE ((obj), TP_TYPE_CHANNEL_REQUEST))		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), TP_TYPE_CHANNEL_REQUEST))
	#define TP_IS_CHANNEL_REQUEST_CLASS(klass) \		#define TP_IS_CHANNEL_REQUEST_CLASS(klass) \
	(G_TYPE_CHECK_CLASS_TYPE ((klass), TP_TYPE_CHANNEL_REQUEST))		(G_TYPE_CHECK_CLASS_TYPE ((klass), TP_TYPE_CHANNEL_REQUEST))
	#define TP_CHANNEL_REQUEST_GET_CLASS(obj) \		#define TP_CHANNEL_REQUEST_GET_CLASS(obj) \
	(G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_CHANNEL_REQUEST, \		(G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_CHANNEL_REQUEST, \
	TpChannelRequestClass))		TpChannelRequestClass))
	#ifndef TP_DISABLE_DEPRECATED
	_TP_DEPRECATED_IN_0_20
	TpChannelRequest *tp_channel_request_new (TpDBusDaemon *bus_daemon,
	const gchar *object_path, GHashTable *immutable_properties,
	GError **error) G_GNUC_WARN_UNUSED_RESULT;
	#endif
	void tp_channel_request_init_known_interfaces (void);		void tp_channel_request_init_known_interfaces (void);
	#ifndef TP_DISABLE_DEPRECATED
	_TP_DEPRECATED_IN_0_16
	void tp_channel_request_set_channel_factory (TpChannelRequest *self,
	TpClientChannelFactory *factory);
	#endif
	const GHashTable * tp_channel_request_get_immutable_properties (		const GHashTable * tp_channel_request_get_immutable_properties (
	TpChannelRequest *self);		TpChannelRequest *self);
	_TP_AVAILABLE_IN_0_20		_TP_AVAILABLE_IN_0_20
	GVariant *tp_channel_request_dup_immutable_properties (TpChannelRequest *se lf);		GVariant *tp_channel_request_dup_immutable_properties (TpChannelRequest *se lf);
	TpAccount * tp_channel_request_get_account (TpChannelRequest *self);		TpAccount * tp_channel_request_get_account (TpChannelRequest *self);
	gint64 tp_channel_request_get_user_action_time (TpChannelRequest *self);		gint64 tp_channel_request_get_user_action_time (TpChannelRequest *self);
	const gchar * tp_channel_request_get_preferred_handler (TpChannelRequest *s elf);		const gchar * tp_channel_request_get_preferred_handler (TpChannelRequest *s elf);
	const GHashTable * tp_channel_request_get_hints (TpChannelRequest *self);		const GHashTable * tp_channel_request_get_hints (TpChannelRequest *self);
	_TP_AVAILABLE_IN_0_20		_TP_AVAILABLE_IN_0_20
	GVariant *tp_channel_request_dup_hints (TpChannelRequest *self);		GVariant *tp_channel_request_dup_hints (TpChannelRequest *self);
	G_END_DECLS		G_END_DECLS
	#include <telepathy-glib/_gen/tp-cli-channel-request.h>
	#endif		#endif
End of changes. 5 change blocks.
	20 lines changed or deleted		2 lines changed or added

	channel.h		channel.h
	skipping to change at line 22		skipping to change at line 22
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef __TP_CHANNEL_H__		#ifndef __TP_CHANNEL_H__
	#define __TP_CHANNEL_H__		#define __TP_CHANNEL_H__
	#include <telepathy-glib/connection.h>		#include <telepathy-glib/connection.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	#include <telepathy-glib/enums.h>		#include <telepathy-glib/enums.h>
	#include <telepathy-glib/handle.h>		#include <telepathy-glib/handle.h>
	#include <telepathy-glib/intset.h>		#include <telepathy-glib/intset.h>
	skipping to change at line 80		skipping to change at line 80
	(G_TYPE_CHECK_CLASS_CAST((klass), TP_TYPE_CHANNEL, \		(G_TYPE_CHECK_CLASS_CAST((klass), TP_TYPE_CHANNEL, \
	TpChannelClass))		TpChannelClass))
	#define TP_IS_CHANNEL(obj) \		#define TP_IS_CHANNEL(obj) \
	(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_CHANNEL))		(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_CHANNEL))
	#define TP_IS_CHANNEL_CLASS(klass) \		#define TP_IS_CHANNEL_CLASS(klass) \
	(G_TYPE_CHECK_CLASS_TYPE((klass), TP_TYPE_CHANNEL))		(G_TYPE_CHECK_CLASS_TYPE((klass), TP_TYPE_CHANNEL))
	#define TP_CHANNEL_GET_CLASS(obj) \		#define TP_CHANNEL_GET_CLASS(obj) \
	(G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_CHANNEL, \		(G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_CHANNEL, \
	TpChannelClass))		TpChannelClass))
	_TP_DEPRECATED_IN_0_20_FOR(tp_simple_client_factory_ensure_channel)
	TpChannel *tp_channel_new (TpConnection *conn,
	const gchar *object_path, const gchar *optional_channel_type,
	TpHandleType optional_handle_type, TpHandle optional_handle,
	GError **error) G_GNUC_WARN_UNUSED_RESULT;
	_TP_DEPRECATED_IN_0_20_FOR(tp_simple_client_factory_ensure_channel)
	TpChannel *tp_channel_new_from_properties (TpConnection *conn,
	const gchar *object_path, const GHashTable *immutable_properties,
	GError **error) G_GNUC_WARN_UNUSED_RESULT;
	#ifndef TP_DISABLE_DEPRECATED
	_TP_DEPRECATED_IN_0_18
	gboolean tp_channel_run_until_ready (TpChannel *self, GError **error,
	GMainLoop **loop);
	typedef void (*TpChannelWhenReadyCb) (TpChannel *channel, const GError *err
	or,
	gpointer user_data);
	_TP_DEPRECATED_IN_0_18_FOR (tp_proxy_prepare_async)
	void tp_channel_call_when_ready (TpChannel *self,
	TpChannelWhenReadyCb callback,
	gpointer user_data);
	_TP_DEPRECATED_IN_0_18_FOR (tp_proxy_is_prepared)
	gboolean tp_channel_is_ready (TpChannel *self);
	#endif
	void tp_channel_init_known_interfaces (void);		void tp_channel_init_known_interfaces (void);
	#ifndef TP_DISABLE_DEPRECATED
	_TP_DEPRECATED_IN_0_20_FOR(tp_channel_get_connection)
	TpConnection *tp_channel_borrow_connection (TpChannel *self);
	_TP_DEPRECATED_IN_0_20_FOR(tp_channel_dup_immutable_properties)
	GHashTable *tp_channel_borrow_immutable_properties (TpChannel *self);
	#endif
	_TP_AVAILABLE_IN_0_20		_TP_AVAILABLE_IN_0_20
	TpConnection *tp_channel_get_connection (TpChannel *self);		TpConnection *tp_channel_get_connection (TpChannel *self);
	_TP_AVAILABLE_IN_0_20		_TP_AVAILABLE_IN_0_20
	GVariant *tp_channel_dup_immutable_properties (TpChannel *self);		GVariant *tp_channel_dup_immutable_properties (TpChannel *self);
	void tp_channel_leave_async (TpChannel *self,		void tp_channel_leave_async (TpChannel *self,
	TpChannelGroupChangeReason reason,		TpChannelGroupChangeReason reason,
	const gchar *message,		const gchar *message,
	GAsyncReadyCallback callback,		GAsyncReadyCallback callback,
	gpointer user_data);		gpointer user_data);
	skipping to change at line 162		skipping to change at line 127
	#define TP_CHANNEL_FEATURE_CORE \		#define TP_CHANNEL_FEATURE_CORE \
	tp_channel_get_feature_quark_core ()		tp_channel_get_feature_quark_core ()
	GQuark tp_channel_get_feature_quark_core (void) G_GNUC_CONST;		GQuark tp_channel_get_feature_quark_core (void) G_GNUC_CONST;
	const gchar *tp_channel_get_channel_type (TpChannel *self);		const gchar *tp_channel_get_channel_type (TpChannel *self);
	GQuark tp_channel_get_channel_type_id (TpChannel *self);		GQuark tp_channel_get_channel_type_id (TpChannel *self);
	TpHandle tp_channel_get_handle (TpChannel *self, TpHandleType *handle_type) ;		TpHandle tp_channel_get_handle (TpChannel *self, TpHandleType *handle_type) ;
	const gchar *tp_channel_get_identifier (TpChannel *self);		const gchar *tp_channel_get_identifier (TpChannel *self);
	#ifndef TP_DISABLE_DEPRECATED		_TP_AVAILABLE_IN_0_16
	_TP_DEPRECATED_IN_0_20_FOR (tp_channel_get_initiator_contact)		TpContact *tp_channel_get_target_contact (TpChannel *self);
	TpHandle tp_channel_get_initiator_handle (TpChannel *self);		_TP_AVAILABLE_IN_0_16
			TpContact *tp_channel_get_initiator_contact (TpChannel *self);
	_TP_DEPRECATED_IN_0_20_FOR (tp_channel_get_initiator_contact)
	const gchar * tp_channel_get_initiator_identifier (TpChannel *self);
	#endif
	#define TP_CHANNEL_FEATURE_GROUP \		#define TP_CHANNEL_FEATURE_GROUP \
	tp_channel_get_feature_quark_group ()		tp_channel_get_feature_quark_group ()
			_TP_AVAILABLE_IN_1_0
	GQuark tp_channel_get_feature_quark_group (void) G_GNUC_CONST;		GQuark tp_channel_get_feature_quark_group (void) G_GNUC_CONST;
			_TP_AVAILABLE_IN_1_0
	TpChannelGroupFlags tp_channel_group_get_flags (TpChannel *self);		TpChannelGroupFlags tp_channel_group_get_flags (TpChannel *self);
	#ifndef TP_DISABLE_DEPRECATED		_TP_AVAILABLE_IN_1_0
	_TP_DEPRECATED_IN_0_20_FOR (tp_channel_group_get_self_contact)		TpContact *tp_channel_group_get_self_contact (TpChannel *self);
	TpHandle tp_channel_group_get_self_handle (TpChannel *self);		_TP_AVAILABLE_IN_1_0
			GPtrArray *tp_channel_group_dup_members (TpChannel *self);
	_TP_DEPRECATED_IN_0_20_FOR (tp_channel_group_dup_members_contacts)		_TP_AVAILABLE_IN_1_0
	const TpIntset *tp_channel_group_get_members (TpChannel *self);		GPtrArray *tp_channel_group_dup_local_pending (TpChannel *self);
			_TP_AVAILABLE_IN_1_0
	_TP_DEPRECATED_IN_0_20_FOR (tp_channel_group_dup_local_pending_contacts)		GPtrArray *tp_channel_group_dup_remote_pending (TpChannel *self);
	const TpIntset *tp_channel_group_get_local_pending (TpChannel *self);		_TP_AVAILABLE_IN_1_0
	_TP_DEPRECATED_IN_0_20_FOR (tp_channel_group_dup_remote_pending_contacts)
	const TpIntset *tp_channel_group_get_remote_pending (TpChannel *self);
	_TP_DEPRECATED_IN_0_20_FOR (tp_channel_group_get_local_pending_contact_info
	)
	gboolean tp_channel_group_get_local_pending_info (TpChannel *self,		gboolean tp_channel_group_get_local_pending_info (TpChannel *self,
	TpHandle local_pending, TpHandle *actor,		TpContact *local_pending, TpContact **actor,
	TpChannelGroupChangeReason *reason, const gchar **message);		TpChannelGroupChangeReason *reason, const gchar **message);
			_TP_AVAILABLE_IN_1_0
			TpContact *tp_channel_group_get_contact_owner (TpChannel *self,
			TpContact *contact);
	_TP_DEPRECATED_IN_0_20_FOR (tp_channel_group_get_contact_owner)		_TP_AVAILABLE_IN_1_0
	TpHandle tp_channel_group_get_handle_owner (TpChannel *self, TpHandle handl
	e);
	#endif
	_TP_AVAILABLE_IN_0_16
	void tp_channel_join_async (TpChannel *self,		void tp_channel_join_async (TpChannel *self,
	const gchar *message,		const gchar *message,
	GAsyncReadyCallback callback,		GAsyncReadyCallback callback,
	gpointer user_data);		gpointer user_data);
	_TP_AVAILABLE_IN_0_16		_TP_AVAILABLE_IN_1_0
	gboolean tp_channel_join_finish (TpChannel *self,		gboolean tp_channel_join_finish (TpChannel *self,
	GAsyncResult *result,		GAsyncResult *result,
	GError **error);		GError **error);
	#define TP_CHANNEL_FEATURE_CONTACTS \
	tp_channel_get_feature_quark_contacts ()
	_TP_AVAILABLE_IN_0_16
	GQuark tp_channel_get_feature_quark_contacts (void) G_GNUC_CONST;
	_TP_AVAILABLE_IN_0_16
	TpContact *tp_channel_get_target_contact (TpChannel *self);
	_TP_AVAILABLE_IN_0_16
	TpContact *tp_channel_get_initiator_contact (TpChannel *self);
	_TP_AVAILABLE_IN_0_16
	TpContact *tp_channel_group_get_self_contact (TpChannel *self);
	_TP_AVAILABLE_IN_0_16
	GPtrArray *tp_channel_group_dup_members_contacts (TpChannel *self);
	_TP_AVAILABLE_IN_0_16
	GPtrArray *tp_channel_group_dup_local_pending_contacts (TpChannel *self);
	_TP_AVAILABLE_IN_0_16
	GPtrArray *tp_channel_group_dup_remote_pending_contacts (TpChannel *self);
	_TP_AVAILABLE_IN_0_16
	gboolean tp_channel_group_get_local_pending_contact_info (TpChannel *self,
	TpContact *local_pending, TpContact **actor,
	TpChannelGroupChangeReason *reason, const gchar **message);
	_TP_AVAILABLE_IN_0_16
	TpContact *tp_channel_group_get_contact_owner (TpChannel *self,
	TpContact *contact);
	#define TP_CHANNEL_FEATURE_CHAT_STATES \
	tp_channel_get_feature_quark_chat_states ()
	_TP_DEPRECATED_IN_0_20_FOR(tp_text_channel_get_feature_quark_chat_states)
	GQuark tp_channel_get_feature_quark_chat_states (void) G_GNUC_CONST;
	_TP_DEPRECATED_IN_0_20_FOR(tp_text_channel_get_chat_state)
	TpChannelChatState tp_channel_get_chat_state (TpChannel *self,
	TpHandle contact);
	/* Channel.Interface.Password */		/* Channel.Interface.Password */
	#define TP_CHANNEL_FEATURE_PASSWORD \		#define TP_CHANNEL_FEATURE_PASSWORD \
	tp_channel_get_feature_quark_password ()		tp_channel_get_feature_quark_password ()
	_TP_AVAILABLE_IN_0_16		_TP_AVAILABLE_IN_0_16
	GQuark tp_channel_get_feature_quark_password (void) G_GNUC_CONST;		GQuark tp_channel_get_feature_quark_password (void) G_GNUC_CONST;
	_TP_AVAILABLE_IN_0_16		_TP_AVAILABLE_IN_0_16
	gboolean tp_channel_password_needed (TpChannel *self);		gboolean tp_channel_password_needed (TpChannel *self);
	_TP_AVAILABLE_IN_0_16		_TP_AVAILABLE_IN_0_16
	skipping to change at line 265		skipping to change at line 189
	GAsyncReadyCallback callback,		GAsyncReadyCallback callback,
	gpointer user_data);		gpointer user_data);
	_TP_AVAILABLE_IN_0_16		_TP_AVAILABLE_IN_0_16
	gboolean tp_channel_provide_password_finish (TpChannel *self,		gboolean tp_channel_provide_password_finish (TpChannel *self,
	GAsyncResult *result,		GAsyncResult *result,
	GError **error);		GError **error);
	G_END_DECLS		G_END_DECLS
	#include <telepathy-glib/_gen/tp-cli-channel.h>
	#endif		#endif
End of changes. 13 change blocks.
	106 lines changed or deleted		23 lines changed or added

	client-message.h		client-message.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef __TP_CLIENT_MESSAGE_H__		#ifndef __TP_CLIENT_MESSAGE_H__
	#define __TP_CLIENT_MESSAGE_H__		#define __TP_CLIENT_MESSAGE_H__
	#include <glib-object.h>		#include <glib-object.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	#include <telepathy-glib/message.h>		#include <telepathy-glib/message.h>
End of changes. 1 change blocks.
	4 lines changed or deleted		2 lines changed or added

	client.h		client.h
	skipping to change at line 22		skipping to change at line 22
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef TP_CLIENT_H		#ifndef TP_CLIENT_H
	#define TP_CLIENT_H		#define TP_CLIENT_H
	#include <telepathy-glib/dbus.h>		#include <telepathy-glib/dbus.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	#include <telepathy-glib/proxy.h>		#include <telepathy-glib/proxy.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	skipping to change at line 75		skipping to change at line 75
	#define TP_IS_CLIENT_CLASS(klass) \		#define TP_IS_CLIENT_CLASS(klass) \
	(G_TYPE_CHECK_CLASS_TYPE ((klass), TP_TYPE_CLIENT))		(G_TYPE_CHECK_CLASS_TYPE ((klass), TP_TYPE_CLIENT))
	#define TP_CLIENT_GET_CLASS(obj) \		#define TP_CLIENT_GET_CLASS(obj) \
	(G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_CLIENT, \		(G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_CLIENT, \
	TpClientClass))		TpClientClass))
	void tp_client_init_known_interfaces (void);		void tp_client_init_known_interfaces (void);
	G_END_DECLS		G_END_DECLS
	#include <telepathy-glib/_gen/tp-cli-client.h>
	#endif		#endif
End of changes. 2 change blocks.
	6 lines changed or deleted		2 lines changed or added

	cm-message.h		cm-message.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef __TP_CM_MESSAGE_H__		#ifndef __TP_CM_MESSAGE_H__
	#define __TP_CM_MESSAGE_H__		#define __TP_CM_MESSAGE_H__
	#include <glib.h>		#include <glib.h>
	#include <telepathy-glib/base-connection.h>		#include <telepathy-glib/base-connection.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	#include <telepathy-glib/message.h>		#include <telepathy-glib/message.h>
	skipping to change at line 70		skipping to change at line 70
	TpMessage *message);		TpMessage *message);
	void tp_cm_message_take_message (TpMessage *self,		void tp_cm_message_take_message (TpMessage *self,
	guint part,		guint part,
	const gchar *key,		const gchar *key,
	TpMessage *message);		TpMessage *message);
	TpHandle tp_cm_message_get_sender (TpMessage *self);		TpHandle tp_cm_message_get_sender (TpMessage *self);
	void tp_cm_message_set_sender (TpMessage *self,		void tp_cm_message_set_sender (TpMessage *self,
	TpHandle handle);		TpHandle handle);
	#ifndef TP_DISABLE_DEPRECATED
	_TP_DEPRECATED
	TpMessage *tp_message_new (TpBaseConnection *connection,
	guint initial_parts,
	guint size_hint) G_GNUC_WARN_UNUSED_RESULT;
	#endif
	G_END_DECLS		G_END_DECLS
	#endif /* __TP_CM_MESSAGE_H__ */		#endif /* __TP_CM_MESSAGE_H__ */
End of changes. 2 change blocks.
	11 lines changed or deleted		2 lines changed or added

	connection-contact-list.h		connection-contact-list.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef __TP_CONNECTION_CONTACT_LIST_H__		#ifndef __TP_CONNECTION_CONTACT_LIST_H__
	#define __TP_CONNECTION_CONTACT_LIST_H__		#define __TP_CONNECTION_CONTACT_LIST_H__
	#include <telepathy-glib/enums.h>		#include <telepathy-glib/enums.h>
	#include <telepathy-glib/connection.h>		#include <telepathy-glib/connection.h>
	#include <telepathy-glib/contact.h>		#include <telepathy-glib/contact.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
End of changes. 1 change blocks.
	4 lines changed or deleted		2 lines changed or added

	connection-manager.h		connection-manager.h
	skipping to change at line 22		skipping to change at line 22
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef __TP_CONNECTION_MANAGER_H__		#ifndef __TP_CONNECTION_MANAGER_H__
	#define __TP_CONNECTION_MANAGER_H__		#define __TP_CONNECTION_MANAGER_H__
	#include <telepathy-glib/dbus.h>		#include <telepathy-glib/dbus.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	#include <telepathy-glib/protocol.h>		#include <telepathy-glib/protocol.h>
	#include <telepathy-glib/proxy.h>		#include <telepathy-glib/proxy.h>
	#include <telepathy-glib/_gen/genums.h>		#include <telepathy-glib/_gen/genums.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	typedef struct _TpConnectionManager TpConnectionManager;		typedef struct _TpConnectionManager TpConnectionManager;
	typedef struct _TpConnectionManagerClass TpConnectionManagerClass;		typedef struct _TpConnectionManagerClass TpConnectionManagerClass;
	typedef struct _TpConnectionManagerPrivate TpConnectionManagerPrivate;		typedef struct _TpConnectionManagerPrivate TpConnectionManagerPrivate;
	GType tp_connection_manager_get_type (void);		GType tp_connection_manager_get_type (void);
	GType tp_connection_manager_param_get_type (void);		GType tp_connection_manager_param_get_type (void);
	GType tp_connection_manager_protocol_get_type (void);
	/* TYPE MACROS */		/* TYPE MACROS */
	#define TP_TYPE_CONNECTION_MANAGER \		#define TP_TYPE_CONNECTION_MANAGER \
	(tp_connection_manager_get_type ())		(tp_connection_manager_get_type ())
	#define TP_CONNECTION_MANAGER(obj) \		#define TP_CONNECTION_MANAGER(obj) \
	(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_CONNECTION_MANAGER, \		(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_CONNECTION_MANAGER, \
	TpConnectionManager))		TpConnectionManager))
	#define TP_CONNECTION_MANAGER_CLASS(klass) \		#define TP_CONNECTION_MANAGER_CLASS(klass) \
	(G_TYPE_CHECK_CLASS_CAST((klass), TP_TYPE_CONNECTION_MANAGER, \		(G_TYPE_CHECK_CLASS_CAST((klass), TP_TYPE_CONNECTION_MANAGER, \
	TpConnectionManagerClass))		TpConnectionManagerClass))
	#define TP_IS_CONNECTION_MANAGER(obj) \		#define TP_IS_CONNECTION_MANAGER(obj) \
	(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_CONNECTION_MANAGER))		(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_CONNECTION_MANAGER))
	#define TP_IS_CONNECTION_MANAGER_CLASS(klass) \		#define TP_IS_CONNECTION_MANAGER_CLASS(klass) \
	(G_TYPE_CHECK_CLASS_TYPE((klass), TP_TYPE_CONNECTION_MANAGER))		(G_TYPE_CHECK_CLASS_TYPE((klass), TP_TYPE_CONNECTION_MANAGER))
	#define TP_CONNECTION_MANAGER_GET_CLASS(obj) \		#define TP_CONNECTION_MANAGER_GET_CLASS(obj) \
	(G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_CONNECTION_MANAGER, \		(G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_CONNECTION_MANAGER, \
	TpConnectionManagerClass))		TpConnectionManagerClass))
	#define TP_TYPE_CONNECTION_MANAGER_PARAM \		#define TP_TYPE_CONNECTION_MANAGER_PARAM \
	(tp_connection_manager_param_get_type ())		(tp_connection_manager_param_get_type ())
	#define TP_TYPE_CONNECTION_MANAGER_PROTOCOL \
	(tp_connection_manager_protocol_get_type ())
	typedef struct _TpConnectionManagerProtocol TpConnectionManagerProtocol;
	struct _TpConnectionManagerProtocol
	{
	/*<public>*/
	gchar *name;
	TpConnectionManagerParam *params;
	/*<private>*/
	gpointer priv;
	};
	typedef enum		typedef enum
	{		{
	TP_CM_INFO_SOURCE_NONE,		TP_CM_INFO_SOURCE_NONE,
	TP_CM_INFO_SOURCE_FILE,		TP_CM_INFO_SOURCE_FILE,
	TP_CM_INFO_SOURCE_LIVE		TP_CM_INFO_SOURCE_LIVE
	} TpCMInfoSource;		} TpCMInfoSource;
	struct _TpConnectionManager {		struct _TpConnectionManager {
	/*<private>*/		/*<private>*/
	TpProxy parent;		TpProxy parent;
	const gchar *_TP_SEAL (name);
	const TpConnectionManagerProtocol * const *_TP_SEAL (protocols);
	/* These are really booleans, but gboolean is signed. Thanks, GLib */
	unsigned int _TP_SEAL (running):1;
	unsigned int _TP_SEAL (always_introspect):1;
	/* TpCMInfoSource, but can't rely on enums being unsigned */
	unsigned int _TP_SEAL (info_source):2;
	guint _TP_SEAL (reserved_flags):28;
	TpConnectionManagerPrivate *priv;		TpConnectionManagerPrivate *priv;
	};		};
	struct _TpConnectionManagerClass {		struct _TpConnectionManagerClass {
	/*<private>*/		/*<private>*/
	TpProxyClass parent_class;		TpProxyClass parent_class;
	gpointer *priv;		gpointer *priv;
	};		};
	TpConnectionManager *tp_connection_manager_new (TpDBusDaemon *dbus,		TpConnectionManager *tp_connection_manager_new (TpDBusDaemon *dbus,
	const gchar *name, const gchar *manager_filename, GError **error)		const gchar *name, const gchar *manager_filename, GError **error)
	G_GNUC_WARN_UNUSED_RESULT;		G_GNUC_WARN_UNUSED_RESULT;
	gboolean tp_connection_manager_activate (TpConnectionManager *self);		gboolean tp_connection_manager_activate (TpConnectionManager *self);
	typedef void (*TpConnectionManagerListCb) (TpConnectionManager * const *cms
	,
	gsize n_cms, const GError *error, gpointer user_data,
	GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED
	_TP_DEPRECATED_IN_0_20_FOR (tp_list_connection_managers_async)
	void tp_list_connection_managers (TpDBusDaemon *bus_daemon,
	TpConnectionManagerListCb callback,
	gpointer user_data, GDestroyNotify destroy,
	GObject *weak_object);
	#endif
	_TP_AVAILABLE_IN_0_18		_TP_AVAILABLE_IN_0_18
	void tp_list_connection_managers_async (TpDBusDaemon *dbus_daemon,		void tp_list_connection_managers_async (TpDBusDaemon *dbus_daemon,
	GAsyncReadyCallback callback,		GAsyncReadyCallback callback,
	gpointer user_data);		gpointer user_data);
	_TP_AVAILABLE_IN_0_18		_TP_AVAILABLE_IN_0_18
	GList *tp_list_connection_managers_finish (GAsyncResult *result,		GList *tp_list_connection_managers_finish (GAsyncResult *result,
	GError **error);		GError **error);
	#ifndef TP_DISABLE_DEPRECATED
	typedef void (*TpConnectionManagerWhenReadyCb) (TpConnectionManager *cm,
	const GError *error, gpointer user_data, GObject *weak_object);
	_TP_DEPRECATED_IN_0_18_FOR (tp_proxy_prepare_async)
	void tp_connection_manager_call_when_ready (TpConnectionManager *self,
	TpConnectionManagerWhenReadyCb callback,
	gpointer user_data, GDestroyNotify destroy, GObject *weak_object);
	_TP_DEPRECATED_IN_0_18_FOR (tp_proxy_is_prepared)
	gboolean tp_connection_manager_is_ready (TpConnectionManager *self);
	#endif
	const gchar *tp_connection_manager_get_name (TpConnectionManager *self);		const gchar *tp_connection_manager_get_name (TpConnectionManager *self);
	gboolean tp_connection_manager_is_running (TpConnectionManager *self);		gboolean tp_connection_manager_is_running (TpConnectionManager *self);
	TpCMInfoSource tp_connection_manager_get_info_source (		TpCMInfoSource tp_connection_manager_get_info_source (
	TpConnectionManager *self);		TpConnectionManager *self);
	gboolean tp_connection_manager_check_valid_name (const gchar *name,		gboolean tp_connection_manager_check_valid_name (const gchar *name,
	GError **error);		GError **error);
	gboolean tp_connection_manager_check_valid_protocol_name (const gchar *name ,		gboolean tp_connection_manager_check_valid_protocol_name (const gchar *name ,
	GError **error);		GError **error);
	gchar **tp_connection_manager_dup_protocol_names (TpConnectionManager *self )		gchar **tp_connection_manager_dup_protocol_names (TpConnectionManager *self )
	G_GNUC_WARN_UNUSED_RESULT;		G_GNUC_WARN_UNUSED_RESULT;
	gboolean tp_connection_manager_has_protocol (TpConnectionManager *self,		gboolean tp_connection_manager_has_protocol (TpConnectionManager *self,
	const gchar *protocol);		const gchar *protocol);
	TpProtocol *tp_connection_manager_get_protocol_object (		TpProtocol *tp_connection_manager_get_protocol (
	TpConnectionManager *self, const gchar *protocol);		TpConnectionManager *self, const gchar *protocol);
	_TP_AVAILABLE_IN_0_18		_TP_AVAILABLE_IN_0_18
	GList *tp_connection_manager_dup_protocols (TpConnectionManager *self)		GList *tp_connection_manager_dup_protocols (TpConnectionManager *self)
	G_GNUC_WARN_UNUSED_RESULT;		G_GNUC_WARN_UNUSED_RESULT;
	#ifndef TP_DISABLE_DEPRECATED
	_TP_DEPRECATED_IN_0_20_FOR (tp_connection_manager_get_protocol_object)
	const TpConnectionManagerProtocol *tp_connection_manager_get_protocol (
	TpConnectionManager *self, const gchar *protocol);
	_TP_DEPRECATED_IN_0_20_FOR (tp_protocol_dup_param_names)
	gchar **tp_connection_manager_protocol_dup_param_names (
	const TpConnectionManagerProtocol *protocol)
	G_GNUC_WARN_UNUSED_RESULT;
	_TP_DEPRECATED_IN_0_20_FOR (tp_protocol_has_param)
	gboolean tp_connection_manager_protocol_has_param (
	const TpConnectionManagerProtocol *protocol,
	const gchar *param);
	_TP_DEPRECATED_IN_0_20_FOR (tp_protocol_dup_param)
	const TpConnectionManagerParam *tp_connection_manager_protocol_get_param (
	const TpConnectionManagerProtocol *protocol, const gchar *param);
	_TP_DEPRECATED_IN_0_20_FOR (tp_protocol_can_register)
	gboolean tp_connection_manager_protocol_can_register (
	const TpConnectionManagerProtocol *protocol);
	#endif
	const gchar *tp_connection_manager_param_get_name (		const gchar *tp_connection_manager_param_get_name (
	const TpConnectionManagerParam *param);		const TpConnectionManagerParam *param);
	const gchar *tp_connection_manager_param_get_dbus_signature (		const gchar *tp_connection_manager_param_get_dbus_signature (
	const TpConnectionManagerParam *param);		const TpConnectionManagerParam *param);
	gboolean tp_connection_manager_param_is_required (		gboolean tp_connection_manager_param_is_required (
	const TpConnectionManagerParam *param);		const TpConnectionManagerParam *param);
	gboolean tp_connection_manager_param_is_required_for_registration (		gboolean tp_connection_manager_param_is_required_for_registration (
	const TpConnectionManagerParam *param);		const TpConnectionManagerParam *param);
	gboolean tp_connection_manager_param_is_secret (		gboolean tp_connection_manager_param_is_secret (
	const TpConnectionManagerParam *param);		const TpConnectionManagerParam *param);
	gboolean tp_connection_manager_param_is_dbus_property (		gboolean tp_connection_manager_param_is_dbus_property (
	const TpConnectionManagerParam *param);		const TpConnectionManagerParam *param);
	gboolean tp_connection_manager_param_get_default (		gboolean tp_connection_manager_param_get_default (
	const TpConnectionManagerParam *param, GValue *value);		const TpConnectionManagerParam *param, GValue *value);
	_TP_AVAILABLE_IN_0_20		_TP_AVAILABLE_IN_0_20
	GVariant *tp_connection_manager_param_dup_default_variant (		GVariant *tp_connection_manager_param_dup_default_variant (
	const TpConnectionManagerParam *param);		const TpConnectionManagerParam *param);
	_TP_AVAILABLE_IN_0_24
	GVariantType *tp_connection_manager_param_dup_variant_type (
	const TpConnectionManagerParam *param);
	void tp_connection_manager_init_known_interfaces (void);		void tp_connection_manager_init_known_interfaces (void);
	#define TP_CONNECTION_MANAGER_FEATURE_CORE \		#define TP_CONNECTION_MANAGER_FEATURE_CORE \
	(tp_connection_manager_get_feature_quark_core ())		(tp_connection_manager_get_feature_quark_core ())
	GQuark tp_connection_manager_get_feature_quark_core (void) G_GNUC_CONST;		GQuark tp_connection_manager_get_feature_quark_core (void) G_GNUC_CONST;
	TpConnectionManagerParam *tp_connection_manager_param_copy (		TpConnectionManagerParam *tp_connection_manager_param_copy (
	const TpConnectionManagerParam *in);		const TpConnectionManagerParam *in);
	void tp_connection_manager_param_free (TpConnectionManagerParam *param);		void tp_connection_manager_param_free (TpConnectionManagerParam *param);
	#ifndef TP_DISABLE_DEPRECATED
	_TP_DEPRECATED_IN_0_20
	TpConnectionManagerProtocol *tp_connection_manager_protocol_copy (
	const TpConnectionManagerProtocol *in);
	_TP_DEPRECATED_IN_0_20
	void tp_connection_manager_protocol_free (TpConnectionManagerProtocol *prot
	o);
	#endif
	G_END_DECLS		G_END_DECLS
	#include <telepathy-glib/_gen/tp-cli-connection-manager.h>
	#endif		#endif
End of changes. 11 change blocks.
	90 lines changed or deleted		3 lines changed or added

	connection.h		connection.h
	skipping to change at line 22		skipping to change at line 22
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef __TP_CONNECTION_H__		#ifndef __TP_CONNECTION_H__
	#define __TP_CONNECTION_H__		#define __TP_CONNECTION_H__
	#include <telepathy-glib/capabilities.h>		#include <telepathy-glib/capabilities.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	#include <telepathy-glib/enums.h>		#include <telepathy-glib/enums.h>
	#include <telepathy-glib/handle.h>		#include <telepathy-glib/handle.h>
	#include <telepathy-glib/proxy.h>		#include <telepathy-glib/proxy.h>
	skipping to change at line 143		skipping to change at line 143
	(G_TYPE_CHECK_CLASS_CAST((klass), TP_TYPE_CONNECTION, \		(G_TYPE_CHECK_CLASS_CAST((klass), TP_TYPE_CONNECTION, \
	TpConnectionClass))		TpConnectionClass))
	#define TP_IS_CONNECTION(obj) \		#define TP_IS_CONNECTION(obj) \
	(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_CONNECTION))		(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_CONNECTION))
	#define TP_IS_CONNECTION_CLASS(klass) \		#define TP_IS_CONNECTION_CLASS(klass) \
	(G_TYPE_CHECK_CLASS_TYPE((klass), TP_TYPE_CONNECTION))		(G_TYPE_CHECK_CLASS_TYPE((klass), TP_TYPE_CONNECTION))
	#define TP_CONNECTION_GET_CLASS(obj) \		#define TP_CONNECTION_GET_CLASS(obj) \
	(G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_CONNECTION, \		(G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_CONNECTION, \
	TpConnectionClass))		TpConnectionClass))
	_TP_DEPRECATED_IN_0_20_FOR(tp_simple_client_factory_ensure_connection)
	TpConnection *tp_connection_new (TpDBusDaemon *dbus, const gchar *bus_name,
	const gchar *object_path, GError **error) G_GNUC_WARN_UNUSED_RESULT;
	_TP_AVAILABLE_IN_0_16		_TP_AVAILABLE_IN_0_16
	TpAccount *tp_connection_get_account (TpConnection *self);		TpAccount *tp_connection_get_account (TpConnection *self);
	TpConnectionStatus tp_connection_get_status (TpConnection *self,		TpConnectionStatus tp_connection_get_status (TpConnection *self,
	TpConnectionStatusReason *reason);		TpConnectionStatusReason *reason);
	#ifndef TP_DISABLE_DEPRECATED
	_TP_DEPRECATED_IN_0_20_FOR (tp_connection_get_cm_name)
	const gchar *tp_connection_get_connection_manager_name (TpConnection *self)
	;
	#endif
	_TP_AVAILABLE_IN_0_20		_TP_AVAILABLE_IN_0_20
	const gchar *tp_connection_get_cm_name (TpConnection *self);		const gchar *tp_connection_get_cm_name (TpConnection *self);
	const gchar *tp_connection_get_protocol_name (TpConnection *self);		const gchar *tp_connection_get_protocol_name (TpConnection *self);
	#ifndef TP_DISABLE_DEPRECATED
	_TP_DEPRECATED_IN_0_20_FOR (tp_connection_get_self_contact)
	TpHandle tp_connection_get_self_handle (TpConnection *self);
	#endif
	TpContact *tp_connection_get_self_contact (TpConnection *self);		TpContact *tp_connection_get_self_contact (TpConnection *self);
	TpCapabilities * tp_connection_get_capabilities (TpConnection *self);		TpCapabilities * tp_connection_get_capabilities (TpConnection *self);
	TpContactInfoFlags tp_connection_get_contact_info_flags (TpConnection *self );		TpContactInfoFlags tp_connection_get_contact_info_flags (TpConnection *self );
	#ifndef TP_DISABLE_DEPRECATED
	_TP_DEPRECATED_IN_0_20_FOR (tp_connection_dup_contact_info_supported_fields
	)
	GList *tp_connection_get_contact_info_supported_fields (TpConnection *self)
	;
	#endif
	_TP_AVAILABLE_IN_0_20		_TP_AVAILABLE_IN_0_20
	GList *tp_connection_dup_contact_info_supported_fields (TpConnection *self) ;		GList *tp_connection_dup_contact_info_supported_fields (TpConnection *self) ;
	void tp_connection_set_contact_info_async (TpConnection *self,		void tp_connection_set_contact_info_async (TpConnection *self,
	GList *info, GAsyncReadyCallback callback,		GList *info, GAsyncReadyCallback callback,
	gpointer user_data);		gpointer user_data);
	gboolean tp_connection_set_contact_info_finish (TpConnection *self,		gboolean tp_connection_set_contact_info_finish (TpConnection *self,
	GAsyncResult *result, GError **error);		GAsyncResult *result, GError **error);
	#ifndef TP_DISABLE_DEPRECATED
	_TP_DEPRECATED_IN_0_18_FOR (tp_proxy_is_prepared)
	gboolean tp_connection_is_ready (TpConnection *self);
	_TP_DEPRECATED_IN_0_18
	gboolean tp_connection_run_until_ready (TpConnection *self,
	gboolean connect, GError **error,
	GMainLoop **loop);
	typedef void (*TpConnectionWhenReadyCb) (TpConnection *connection,
	const GError *error, gpointer user_data);
	_TP_DEPRECATED_IN_0_18_FOR (tp_proxy_prepare_async)
	void tp_connection_call_when_ready (TpConnection *self,
	TpConnectionWhenReadyCb callback,
	gpointer user_data);
	#endif
	typedef void (*TpConnectionNameListCb) (const gchar * const *names,		typedef void (*TpConnectionNameListCb) (const gchar * const *names,
	gsize n, const gchar * const *cms, const gchar * const *protocols,		gsize n, const gchar * const *cms, const gchar * const *protocols,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	void tp_list_connection_names (TpDBusDaemon *bus_daemon,		void tp_list_connection_names (TpDBusDaemon *bus_daemon,
	TpConnectionNameListCb callback,		TpConnectionNameListCb callback,
	gpointer user_data, GDestroyNotify destroy,		gpointer user_data, GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	void tp_connection_init_known_interfaces (void);		void tp_connection_init_known_interfaces (void);
	gint tp_connection_presence_type_cmp_availability (TpConnectionPresenceType p1,		gint tp_connection_presence_type_cmp_availability (TpConnectionPresenceType p1,
	TpConnectionPresenceType p2);		TpConnectionPresenceType p2);
	#ifndef TP_DISABLE_DEPRECATED
	_TP_DEPRECATED_IN_0_20_FOR(tp_connection_get_protocol_name)
	gboolean tp_connection_parse_object_path (TpConnection *self, gchar **proto
	col,
	gchar **cm_name);
	#endif
	_TP_AVAILABLE_IN_0_20		_TP_AVAILABLE_IN_0_20
	const gchar *tp_connection_get_detailed_error (TpConnection *self,		const gchar *tp_connection_get_detailed_error (TpConnection *self,
	const GHashTable **details);		const GHashTable **details);
	_TP_AVAILABLE_IN_0_20		_TP_AVAILABLE_IN_0_20
	gchar *tp_connection_dup_detailed_error_vardict (TpConnection *self,		gchar *tp_connection_dup_detailed_error_vardict (TpConnection *self,
	GVariant **details) G_GNUC_WARN_UNUSED_RESULT;		GVariant **details) G_GNUC_WARN_UNUSED_RESULT;
	void tp_connection_add_client_interest (TpConnection *self,		void tp_connection_add_client_interest (TpConnection *self,
	const gchar *interested_in);		const gchar *interested_in);
	void tp_connection_add_client_interest_by_id (TpConnection *self,		void tp_connection_add_client_interest_by_id (TpConnection *self,
	GQuark interested_in);		GQuark interested_in);
	gboolean tp_connection_has_immortal_handles (TpConnection *self);
	#define TP_CONNECTION_FEATURE_CORE \		#define TP_CONNECTION_FEATURE_CORE \
	(tp_connection_get_feature_quark_core ())		(tp_connection_get_feature_quark_core ())
	GQuark tp_connection_get_feature_quark_core (void) G_GNUC_CONST;		GQuark tp_connection_get_feature_quark_core (void) G_GNUC_CONST;
	#define TP_CONNECTION_FEATURE_CONNECTED \		#define TP_CONNECTION_FEATURE_CONNECTED \
	(tp_connection_get_feature_quark_connected ())		(tp_connection_get_feature_quark_connected ())
	GQuark tp_connection_get_feature_quark_connected (void) G_GNUC_CONST;		GQuark tp_connection_get_feature_quark_connected (void) G_GNUC_CONST;
	#define TP_CONNECTION_FEATURE_CAPABILITIES \		#define TP_CONNECTION_FEATURE_CAPABILITIES \
	(tp_connection_get_feature_quark_capabilities ())		(tp_connection_get_feature_quark_capabilities ())
	GQuark tp_connection_get_feature_quark_capabilities (void) G_GNUC_CONST;		GQuark tp_connection_get_feature_quark_capabilities (void) G_GNUC_CONST;
	#define TP_CONNECTION_FEATURE_CONTACT_INFO \		#define TP_CONNECTION_FEATURE_CONTACT_INFO \
	(tp_connection_get_feature_quark_contact_info ())		(tp_connection_get_feature_quark_contact_info ())
	GQuark tp_connection_get_feature_quark_contact_info (void) G_GNUC_CONST;		GQuark tp_connection_get_feature_quark_contact_info (void) G_GNUC_CONST;
	/* connection-handles.c */
	#ifndef TP_DISABLE_DEPRECATED
	typedef void (*TpConnectionHoldHandlesCb) (TpConnection *connection,
	TpHandleType handle_type, guint n_handles, const TpHandle *handles,
	const GError *error, gpointer user_data, GObject *weak_object);
	_TP_DEPRECATED_IN_0_20
	void tp_connection_hold_handles (TpConnection *self, gint timeout_ms,
	TpHandleType handle_type, guint n_handles, const TpHandle *handles,
	TpConnectionHoldHandlesCb callback,
	gpointer user_data, GDestroyNotify destroy, GObject *weak_object);
	typedef void (*TpConnectionRequestHandlesCb) (TpConnection *connection,
	TpHandleType handle_type,
	guint n_handles, const TpHandle *handles, const gchar * const *ids,
	const GError *error, gpointer user_data, GObject *weak_object);
	_TP_DEPRECATED_IN_0_20
	void tp_connection_request_handles (TpConnection *self, gint timeout_ms,
	TpHandleType handle_type, const gchar * const *ids,
	TpConnectionRequestHandlesCb callback,
	gpointer user_data, GDestroyNotify destroy, GObject *weak_object);
	_TP_DEPRECATED_IN_0_20
	void tp_connection_unref_handles (TpConnection *self,
	TpHandleType handle_type, guint n_handles, const TpHandle *handles);
	#endif
	/* connection-avatars.c */		/* connection-avatars.c */
	typedef struct _TpAvatarRequirements TpAvatarRequirements;		typedef struct _TpAvatarRequirements TpAvatarRequirements;
	struct _TpAvatarRequirements		struct _TpAvatarRequirements
	{		{
	/*<public>*/		/*<public>*/
	GStrv supported_mime_types;		GStrv supported_mime_types;
	guint minimum_width;		guint minimum_width;
	guint minimum_height;		guint minimum_height;
	guint recommended_width;		guint recommended_width;
	skipping to change at line 359		skipping to change at line 285
	_TP_AVAILABLE_IN_0_18		_TP_AVAILABLE_IN_0_18
	void tp_connection_disconnect_async (TpConnection *self,		void tp_connection_disconnect_async (TpConnection *self,
	GAsyncReadyCallback callback,		GAsyncReadyCallback callback,
	gpointer user_data);		gpointer user_data);
	_TP_AVAILABLE_IN_0_18		_TP_AVAILABLE_IN_0_18
	gboolean tp_connection_disconnect_finish (TpConnection *self,		gboolean tp_connection_disconnect_finish (TpConnection *self,
	GAsyncResult *result,		GAsyncResult *result,
	GError **error);		GError **error);
	G_END_DECLS
	#include <telepathy-glib/_gen/tp-cli-connection.h>
	G_BEGIN_DECLS
	/* connection-handles.c again - this has to come after the auto-generated
	* stuff because it uses an auto-generated typedef */
	#ifndef TP_DISABLE_DEPRECATED
	_TP_DEPRECATED_IN_0_20_FOR(tp_simple_client_factory_ensure_contact)
	void tp_connection_get_contact_attributes (TpConnection *self,
	gint timeout_ms, guint n_handles, const TpHandle *handles,
	const gchar * const *interfaces, gboolean hold,
	tp_cli_connection_interface_contacts_callback_for_get_contact_attribute
	s callback,
	gpointer user_data, GDestroyNotify destroy, GObject *weak_object);
	_TP_DEPRECATED_IN_0_20_FOR(tp_connection_dup_contact_list)
	void tp_connection_get_contact_list_attributes (TpConnection *self,
	gint timeout_ms, const gchar * const *interfaces, gboolean hold,
	tp_cli_connection_interface_contacts_callback_for_get_contact_attribute
	s callback,
	gpointer user_data, GDestroyNotify destroy, GObject *weak_object);
	#endif
	GBinding *tp_connection_bind_connection_status_to_property (TpConnection *s elf,		GBinding *tp_connection_bind_connection_status_to_property (TpConnection *s elf,
	gpointer target, const char *target_property, gboolean invert);		gpointer target, const char *target_property, gboolean invert);
	G_END_DECLS		G_END_DECLS
	#endif		#endif
End of changes. 10 change blocks.
	108 lines changed or deleted		2 lines changed or added

	contact-operations.h		contact-operations.h
	skipping to change at line 20		skipping to change at line 20
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef __TP_CONTACT_OPERATIONS_H__		#ifndef __TP_CONTACT_OPERATIONS_H__
	#define __TP_CONTACT_OPERATIONS_H__		#define __TP_CONTACT_OPERATIONS_H__
	#include <telepathy-glib/contact.h>		#include <telepathy-glib/contact.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
End of changes. 1 change blocks.
	4 lines changed or deleted		2 lines changed or added

	contact-search-result.h		contact-search-result.h
	skipping to change at line 21		skipping to change at line 21
	* This file is distributed in the hope that it will be useful,		* This file is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this code; if not, write to the Free Software		* License along with this code; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef __TP_CONTACT_SEARCH_RESULT_H__		#ifndef __TP_CONTACT_SEARCH_RESULT_H__
	#define __TP_CONTACT_SEARCH_RESULT_H__		#define __TP_CONTACT_SEARCH_RESULT_H__
	#include <telepathy-glib/channel.h>		#include <telepathy-glib/channel.h>
	#include <telepathy-glib/dbus.h>		#include <telepathy-glib/dbus.h>
	#include <telepathy-glib/util.h>		#include <telepathy-glib/util.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	skipping to change at line 74		skipping to change at line 74
	GObjectClass parent_class;		GObjectClass parent_class;
	GCallback _padding[7];		GCallback _padding[7];
	};		};
	GType tp_contact_search_result_get_type (void);		GType tp_contact_search_result_get_type (void);
	const gchar *tp_contact_search_result_get_identifier (TpContactSearchResult *self);		const gchar *tp_contact_search_result_get_identifier (TpContactSearchResult *self);
	TpContactInfoField *tp_contact_search_result_get_field (TpContactSearchResu lt *self,		TpContactInfoField *tp_contact_search_result_get_field (TpContactSearchResu lt *self,
	const gchar *field);		const gchar *field);
	#ifndef TP_DISABLE_DEPRECATED
	_TP_DEPRECATED_IN_0_20_FOR (tp_contact_search_result_dup_fields)
	GList *tp_contact_search_result_get_fields (TpContactSearchResult *self);
	#endif
	_TP_AVAILABLE_IN_0_20		_TP_AVAILABLE_IN_0_20
	GList *tp_contact_search_result_dup_fields (TpContactSearchResult *self);		GList *tp_contact_search_result_dup_fields (TpContactSearchResult *self);
	G_END_DECLS		G_END_DECLS
	#endif		#endif
End of changes. 2 change blocks.
	9 lines changed or deleted		2 lines changed or added

	contact-search.h		contact-search.h
	skipping to change at line 21		skipping to change at line 21
	* This file is distributed in the hope that it will be useful,		* This file is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this code; if not, write to the Free Software		* License along with this code; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef __TP_CONTACT_SEARCH_H__		#ifndef __TP_CONTACT_SEARCH_H__
	#define __TP_CONTACT_SEARCH_H__		#define __TP_CONTACT_SEARCH_H__
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	#include <telepathy-glib/enums.h>		#include <telepathy-glib/enums.h>
	#include <telepathy-glib/handle.h>		#include <telepathy-glib/handle.h>
	#include <telepathy-glib/proxy.h>		#include <telepathy-glib/proxy.h>
	#include <telepathy-glib/account.h>		#include <telepathy-glib/account.h>
End of changes. 1 change blocks.
	4 lines changed or deleted		2 lines changed or added

	contact.h		contact.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef __TP_CONTACT_H__		#ifndef __TP_CONTACT_H__
	#define __TP_CONTACT_H__		#define __TP_CONTACT_H__
	#include <glib-object.h>		#include <glib-object.h>
	#include <gio/gio.h>		#include <gio/gio.h>
	#include <telepathy-glib/capabilities.h>		#include <telepathy-glib/capabilities.h>
	#include <telepathy-glib/connection.h>		#include <telepathy-glib/connection.h>
	skipping to change at line 62		skipping to change at line 62
	(G_TYPE_CHECK_CLASS_CAST ((klass), TP_TYPE_CONTACT, \		(G_TYPE_CHECK_CLASS_CAST ((klass), TP_TYPE_CONTACT, \
	TpContactClass))		TpContactClass))
	#define TP_IS_CONTACT(obj) \		#define TP_IS_CONTACT(obj) \
	(G_TYPE_CHECK_INSTANCE_TYPE ((obj), TP_TYPE_CONTACT))		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), TP_TYPE_CONTACT))
	#define TP_IS_CONTACT_CLASS(klass) \		#define TP_IS_CONTACT_CLASS(klass) \
	(G_TYPE_CHECK_CLASS_TYPE ((klass), TP_TYPE_CONTACT))		(G_TYPE_CHECK_CLASS_TYPE ((klass), TP_TYPE_CONTACT))
	#define TP_CONTACT_GET_CLASS(obj) \		#define TP_CONTACT_GET_CLASS(obj) \
	(G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_CONTACT, \		(G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_CONTACT, \
	TpContactClass))		TpContactClass))
	typedef enum {		#define TP_CONTACT_FEATURE_ALIAS \
	TP_CONTACT_FEATURE_ALIAS,		(tp_contact_get_feature_quark_alias ())
	TP_CONTACT_FEATURE_AVATAR_TOKEN,		GQuark tp_contact_get_feature_quark_alias (void) G_GNUC_CONST;
	TP_CONTACT_FEATURE_PRESENCE,
	TP_CONTACT_FEATURE_LOCATION,		#define TP_CONTACT_FEATURE_AVATAR_TOKEN \
	TP_CONTACT_FEATURE_CAPABILITIES,		(tp_contact_get_feature_quark_avatar_token ())
	TP_CONTACT_FEATURE_AVATAR_DATA,		GQuark tp_contact_get_feature_quark_avatar_token (void) G_GNUC_CONST;
	TP_CONTACT_FEATURE_CONTACT_INFO,
	TP_CONTACT_FEATURE_CLIENT_TYPES,		#define TP_CONTACT_FEATURE_PRESENCE \
	TP_CONTACT_FEATURE_SUBSCRIPTION_STATES,		(tp_contact_get_feature_quark_presence ())
	TP_CONTACT_FEATURE_CONTACT_GROUPS,		GQuark tp_contact_get_feature_quark_presence (void) G_GNUC_CONST;
	TP_CONTACT_FEATURE_CONTACT_BLOCKING,
	} TpContactFeature;		#define TP_CONTACT_FEATURE_LOCATION \
	#define TP_NUM_CONTACT_FEATURES (TP_CONTACT_FEATURE_CONTACT_BLOCKING + 1)		(tp_contact_get_feature_quark_location ())
	#define NUM_TP_CONTACT_FEATURES TP_NUM_CONTACT_FEATURES		GQuark tp_contact_get_feature_quark_location (void) G_GNUC_CONST;
	#define TP_CONTACT_FEATURE_INVALID ((TpContactFeature) -1)
			#define TP_CONTACT_FEATURE_CAPABILITIES \
			(tp_contact_get_feature_quark_capabilities ())
			GQuark tp_contact_get_feature_quark_capabilities (void) G_GNUC_CONST;
			#define TP_CONTACT_FEATURE_AVATAR_DATA \
			(tp_contact_get_feature_quark_avatar_data ())
			GQuark tp_contact_get_feature_quark_avatar_data (void) G_GNUC_CONST;
			#define TP_CONTACT_FEATURE_CONTACT_INFO \
			(tp_contact_get_feature_quark_contact_info ())
			GQuark tp_contact_get_feature_quark_contact_info (void) G_GNUC_CONST;
			#define TP_CONTACT_FEATURE_CLIENT_TYPES \
			(tp_contact_get_feature_quark_client_types ())
			GQuark tp_contact_get_feature_quark_client_types (void) G_GNUC_CONST;
			#define TP_CONTACT_FEATURE_SUBSCRIPTION_STATES \
			(tp_contact_get_feature_quark_subscription_states ())
			GQuark tp_contact_get_feature_quark_subscription_states (void) G_GNUC_CONST
			;
			#define TP_CONTACT_FEATURE_CONTACT_GROUPS \
			(tp_contact_get_feature_quark_contact_groups ())
			GQuark tp_contact_get_feature_quark_contact_groups (void) G_GNUC_CONST;
			#define TP_CONTACT_FEATURE_CONTACT_BLOCKING \
			(tp_contact_get_feature_quark_contact_blocking ())
			GQuark tp_contact_get_feature_quark_contact_blocking (void) G_GNUC_CONST;
	/* Basic functionality, always available */		/* Basic functionality, always available */
	_TP_AVAILABLE_IN_0_20		_TP_AVAILABLE_IN_0_20
	TpAccount *tp_contact_get_account (TpContact *self);		TpAccount *tp_contact_get_account (TpContact *self);
	TpConnection *tp_contact_get_connection (TpContact *self);		TpConnection *tp_contact_get_connection (TpContact *self);
	TpHandle tp_contact_get_handle (TpContact *self);		TpHandle tp_contact_get_handle (TpContact *self);
	const gchar *tp_contact_get_identifier (TpContact *self);		const gchar *tp_contact_get_identifier (TpContact *self);
	gboolean tp_contact_has_feature (TpContact *self, TpContactFeature feature) ;		gboolean tp_contact_has_feature (TpContact *self, GQuark feature);
	/* TP_CONTACT_FEATURE_ALIAS */		/* TP_CONTACT_FEATURE_ALIAS */
	const gchar *tp_contact_get_alias (TpContact *self);		const gchar *tp_contact_get_alias (TpContact *self);
	/* TP_CONTACT_FEATURE_AVATAR_TOKEN */		/* TP_CONTACT_FEATURE_AVATAR_TOKEN */
	const gchar *tp_contact_get_avatar_token (TpContact *self);		const gchar *tp_contact_get_avatar_token (TpContact *self);
	/* TP_CONTACT_FEATURE_PRESENCE */		/* TP_CONTACT_FEATURE_PRESENCE */
	TpConnectionPresenceType tp_contact_get_presence_type (TpContact *self);		TpConnectionPresenceType tp_contact_get_presence_type (TpContact *self);
	const gchar *tp_contact_get_presence_status (TpContact *self);		const gchar *tp_contact_get_presence_status (TpContact *self);
	skipping to change at line 111		skipping to change at line 138
	GVariant *tp_contact_dup_location (TpContact *self);		GVariant *tp_contact_dup_location (TpContact *self);
	/* TP_CONTACT_FEATURE_CAPABILITIES */		/* TP_CONTACT_FEATURE_CAPABILITIES */
	TpCapabilities *tp_contact_get_capabilities (TpContact *self);		TpCapabilities *tp_contact_get_capabilities (TpContact *self);
	/* TP_CONTACT_FEATURE_AVATAR_DATA */		/* TP_CONTACT_FEATURE_AVATAR_DATA */
	GFile *tp_contact_get_avatar_file (TpContact *self);		GFile *tp_contact_get_avatar_file (TpContact *self);
	const gchar *tp_contact_get_avatar_mime_type (TpContact *self);		const gchar *tp_contact_get_avatar_mime_type (TpContact *self);
	/* TP_CONTACT_FEATURE_INFO */		/* TP_CONTACT_FEATURE_INFO */
	#ifndef TP_DISABLE_DEPRECATED
	_TP_DEPRECATED_IN_0_20_FOR (tp_contact_dup_contact_info)
	GList *tp_contact_get_contact_info (TpContact *self);
	#endif
	_TP_AVAILABLE_IN_0_20		_TP_AVAILABLE_IN_0_20
	GList *tp_contact_dup_contact_info (TpContact *self);		GList *tp_contact_dup_contact_info (TpContact *self);
	void tp_contact_request_contact_info_async (TpContact *self,		void tp_contact_request_contact_info_async (TpContact *self,
	GCancellable *cancellable, GAsyncReadyCallback callback,		GCancellable *cancellable, GAsyncReadyCallback callback,
	gpointer user_data);		gpointer user_data);
	gboolean tp_contact_request_contact_info_finish (TpContact *self,		gboolean tp_contact_request_contact_info_finish (TpContact *self,
	GAsyncResult *result, GError **error);		GAsyncResult *result, GError **error);
	skipping to change at line 149		skipping to change at line 171
	/* TP_CONTACT_FEATURE_CONTACT_GROUPS */		/* TP_CONTACT_FEATURE_CONTACT_GROUPS */
	const gchar * const *		const gchar * const *
	/* this comment stops gtkdoc denying that this function exists */		/* this comment stops gtkdoc denying that this function exists */
	tp_contact_get_contact_groups (TpContact *self);		tp_contact_get_contact_groups (TpContact *self);
	void tp_contact_set_contact_groups_async (TpContact *self,		void tp_contact_set_contact_groups_async (TpContact *self,
	gint n_groups, const gchar * const *groups, GAsyncReadyCallback callbac k,		gint n_groups, const gchar * const *groups, GAsyncReadyCallback callbac k,
	gpointer user_data);		gpointer user_data);
	gboolean tp_contact_set_contact_groups_finish (TpContact *self,		gboolean tp_contact_set_contact_groups_finish (TpContact *self,
	GAsyncResult *result, GError **error);		GAsyncResult *result, GError **error);
	#ifndef TP_DISABLE_DEPRECATED
	typedef void (*TpConnectionContactsByHandleCb) (TpConnection *connection,
	guint n_contacts, TpContact * const *contacts,
	guint n_failed, const TpHandle *failed,
	const GError *error, gpointer user_data, GObject *weak_object);
	_TP_DEPRECATED_IN_0_20
	void tp_connection_get_contacts_by_handle (TpConnection *self,
	guint n_handles, const TpHandle *handles,
	guint n_features, const TpContactFeature *features,
	TpConnectionContactsByHandleCb callback,
	gpointer user_data, GDestroyNotify destroy, GObject *weak_object);
	typedef void (*TpConnectionUpgradeContactsCb) (TpConnection *connection,
	guint n_contacts, TpContact * const *contacts,
	const GError *error, gpointer user_data, GObject *weak_object);
	_TP_DEPRECATED_IN_0_20_FOR(tp_connection_upgrade_contacts_async)
	void tp_connection_upgrade_contacts (TpConnection *self,
	guint n_contacts, TpContact * const *contacts,
	guint n_features, const TpContactFeature *features,
	TpConnectionUpgradeContactsCb callback,
	gpointer user_data, GDestroyNotify destroy, GObject *weak_object);
	typedef void (*TpConnectionContactsByIdCb) (TpConnection *connection,
	guint n_contacts, TpContact * const *contacts,
	const gchar * const *requested_ids, GHashTable *failed_id_errors,
	const GError *error, gpointer user_data, GObject *weak_object);
	_TP_DEPRECATED_IN_0_20_FOR(tp_connection_dup_contact_by_id_async)
	void tp_connection_get_contacts_by_id (TpConnection *self,
	guint n_ids, const gchar * const *ids,
	guint n_features, const TpContactFeature *features,
	TpConnectionContactsByIdCb callback,
	gpointer user_data, GDestroyNotify destroy, GObject *weak_object);
	#endif
	TpContact *tp_connection_dup_contact_if_possible (TpConnection *connection,		TpContact *tp_connection_dup_contact_if_possible (TpConnection *connection,
	TpHandle handle, const gchar *identifier);		TpHandle handle, const gchar *identifier);
	_TP_AVAILABLE_IN_0_20		_TP_AVAILABLE_IN_0_20
	void tp_connection_dup_contact_by_id_async (TpConnection *self,		void tp_connection_dup_contact_by_id_async (TpConnection *self,
	const gchar *id,		const gchar *id,
	guint n_features,		const GQuark *features,
	const TpContactFeature *features,
	GAsyncReadyCallback callback,		GAsyncReadyCallback callback,
	gpointer user_data);		gpointer user_data);
	_TP_AVAILABLE_IN_0_20		_TP_AVAILABLE_IN_0_20
	TpContact *tp_connection_dup_contact_by_id_finish (TpConnection *self,		TpContact *tp_connection_dup_contact_by_id_finish (TpConnection *self,
	GAsyncResult *result,		GAsyncResult *result,
	GError **error);		GError **error);
	_TP_AVAILABLE_IN_0_20		_TP_AVAILABLE_IN_0_20
	void tp_connection_upgrade_contacts_async (TpConnection *self,		void tp_connection_upgrade_contacts_async (TpConnection *self,
	guint n_contacts,		guint n_contacts,
	TpContact * const *contacts,		TpContact * const *contacts,
	guint n_features,		const GQuark *features,
	const TpContactFeature *features,
	GAsyncReadyCallback callback,		GAsyncReadyCallback callback,
	gpointer user_data);		gpointer user_data);
	_TP_AVAILABLE_IN_0_20		_TP_AVAILABLE_IN_0_20
	gboolean tp_connection_upgrade_contacts_finish (TpConnection *self,		gboolean tp_connection_upgrade_contacts_finish (TpConnection *self,
	GAsyncResult *result,		GAsyncResult *result,
	GPtrArray **contacts,		GPtrArray **contacts,
	GError **error);		GError **error);
	/* TP_CONTACT_FEATURE_CONTACT_BLOCKING */		/* TP_CONTACT_FEATURE_CONTACT_BLOCKING */
End of changes. 7 change blocks.
	67 lines changed or deleted		49 lines changed or added

	contacts-mixin.h		contacts-mixin.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef __TP_CONTACTS_MIXIN_H__		#ifndef __TP_CONTACTS_MIXIN_H__
	#define __TP_CONTACTS_MIXIN_H__		#define __TP_CONTACTS_MIXIN_H__
	#include <telepathy-glib/svc-connection.h>
	#include <telepathy-glib/handle-repo.h>		#include <telepathy-glib/handle-repo.h>
	#include "util.h"		#include "util.h"
	G_BEGIN_DECLS		G_BEGIN_DECLS
	typedef struct _TpContactsMixinClass TpContactsMixinClass;		typedef struct _TpContactsMixinClass TpContactsMixinClass;
	typedef struct _TpContactsMixinClassPrivate TpContactsMixinClassPrivate;		typedef struct _TpContactsMixinClassPrivate TpContactsMixinClassPrivate;
	typedef struct _TpContactsMixin TpContactsMixin;		typedef struct _TpContactsMixin TpContactsMixin;
	typedef struct _TpContactsMixinPrivate TpContactsMixinPrivate;		typedef struct _TpContactsMixinPrivate TpContactsMixinPrivate;
	skipping to change at line 114		skipping to change at line 113
	void tp_contacts_mixin_iface_init (gpointer g_iface, gpointer iface_data);		void tp_contacts_mixin_iface_init (gpointer g_iface, gpointer iface_data);
	void tp_contacts_mixin_add_contact_attributes_iface (GObject *obj,		void tp_contacts_mixin_add_contact_attributes_iface (GObject *obj,
	const gchar *interface,		const gchar *interface,
	TpContactsMixinFillContactAttributesFunc fill_contact_attributes);		TpContactsMixinFillContactAttributesFunc fill_contact_attributes);
	void tp_contacts_mixin_set_contact_attribute (GHashTable *contact_attribute s,		void tp_contacts_mixin_set_contact_attribute (GHashTable *contact_attribute s,
	TpHandle handle, const gchar *attribute, GValue *value);		TpHandle handle, const gchar *attribute, GValue *value);
	GHashTable *tp_contacts_mixin_get_contact_attributes (GObject *obj,		GHashTable *tp_contacts_mixin_get_contact_attributes (GObject *obj,
	const GArray *handles, const gchar **interfaces, const gchar **assumed_		const GArray *handles, const gchar **interfaces, const gchar **assumed_
	interfaces,		interfaces);
	const gchar *sender);
	G_END_DECLS		G_END_DECLS
	#endif /* #ifndef __TP_CONTACTS_MIXIN_H__ */		#endif /* #ifndef __TP_CONTACTS_MIXIN_H__ */
End of changes. 3 change blocks.
	8 lines changed or deleted		4 lines changed or added

	dbus-daemon.h		dbus-daemon.h
	skipping to change at line 96		skipping to change at line 96
	void tp_dbus_daemon_list_activatable_names (TpDBusDaemon *self,		void tp_dbus_daemon_list_activatable_names (TpDBusDaemon *self,
	gint timeout_ms, TpDBusDaemonListNamesCb callback,		gint timeout_ms, TpDBusDaemonListNamesCb callback,
	gpointer user_data, GDestroyNotify destroy, GObject *weak_object);		gpointer user_data, GDestroyNotify destroy, GObject *weak_object);
	void tp_dbus_daemon_register_object (TpDBusDaemon *self,		void tp_dbus_daemon_register_object (TpDBusDaemon *self,
	const gchar *object_path, gpointer object);		const gchar *object_path, gpointer object);
	void tp_dbus_daemon_unregister_object (TpDBusDaemon *self, gpointer object) ;		void tp_dbus_daemon_unregister_object (TpDBusDaemon *self, gpointer object) ;
	G_END_DECLS		G_END_DECLS
	#include <telepathy-glib/_gen/tp-cli-dbus-daemon.h>
	#endif		#endif
End of changes. 1 change blocks.
	2 lines changed or deleted		0 lines changed or added

	dbus-properties-mixin.h		dbus-properties-mixin.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef __TP_DBUS_PROPERTIES_MIXIN_H__		#ifndef __TP_DBUS_PROPERTIES_MIXIN_H__
	#define __TP_DBUS_PROPERTIES_MIXIN_H__		#define __TP_DBUS_PROPERTIES_MIXIN_H__
	#include <glib-object.h>		#include <glib-object.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	#include <telepathy-glib/_gen/genums.h>		#include <telepathy-glib/_gen/genums.h>
	skipping to change at line 141		skipping to change at line 141
	const gchar *interface_name, const gchar *property_name,		const gchar *interface_name, const gchar *property_name,
	GValue *value, GError **error);		GValue *value, GError **error);
	_TP_AVAILABLE_IN_0_16		_TP_AVAILABLE_IN_0_16
	gboolean tp_dbus_properties_mixin_set (		gboolean tp_dbus_properties_mixin_set (
	GObject *self,		GObject *self,
	const gchar *interface_name,		const gchar *interface_name,
	const gchar *property_name,		const gchar *property_name,
	const GValue *value,		const GValue *value,
	GError **error);		GError **error);
	_TP_AVAILABLE_IN_0_22		_TP_AVAILABLE_IN_1_0
	GHashTable *tp_dbus_properties_mixin_dup_all (GObject *self,		GHashTable *tp_dbus_properties_mixin_dup_all (GObject *self,
	const gchar *interface_name);		const gchar *interface_name);
	GHashTable *tp_dbus_properties_mixin_make_properties_hash (		GHashTable *tp_dbus_properties_mixin_make_properties_hash (
	GObject *object, const gchar *first_interface,		GObject *object, const gchar *first_interface,
	const gchar *first_property, ...)		const gchar *first_property, ...)
	G_GNUC_NULL_TERMINATED G_GNUC_WARN_UNUSED_RESULT;		G_GNUC_NULL_TERMINATED G_GNUC_WARN_UNUSED_RESULT;
	void tp_dbus_properties_mixin_fill_properties_hash (GObject *object,		void tp_dbus_properties_mixin_fill_properties_hash (GObject *object,
	GHashTable *table,		GHashTable *table,
End of changes. 2 change blocks.
	5 lines changed or deleted		3 lines changed or added

	dbus-tube-channel.h		dbus-tube-channel.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef __TP_DBUS_TUBE_CHANNEL_H__		#ifndef __TP_DBUS_TUBE_CHANNEL_H__
	#define __TP_DBUS_TUBE_CHANNEL_H__		#define __TP_DBUS_TUBE_CHANNEL_H__
	#include <telepathy-glib/channel.h>		#include <telepathy-glib/channel.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
End of changes. 1 change blocks.
	4 lines changed or deleted		2 lines changed or added

	dbus.h		dbus.h
	skipping to change at line 22		skipping to change at line 22
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef __TELEPATHY_DBUS_H__		#ifndef __TELEPATHY_DBUS_H__
	#define __TELEPATHY_DBUS_H__		#define __TELEPATHY_DBUS_H__
	#define __TP_IN_DBUS_H__		#define __TP_IN_DBUS_H__
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	#include <telepathy-glib/dbus-daemon.h>		#include <telepathy-glib/dbus-daemon.h>
	#include <telepathy-glib/_gen/genums.h>		#include <telepathy-glib/_gen/genums.h>
	skipping to change at line 137		skipping to change at line 137
	gboolean *valid);		gboolean *valid);
	void tp_asv_set_uint64 (GHashTable *asv, const gchar *key, guint64 value);		void tp_asv_set_uint64 (GHashTable *asv, const gchar *key, guint64 value);
	const GValue *tp_asv_lookup (const GHashTable *asv, const gchar *key);		const GValue *tp_asv_lookup (const GHashTable *asv, const gchar *key);
	const gchar * const *		const gchar * const *
	/* this comment stops gtkdoc denying that this function exists */		/* this comment stops gtkdoc denying that this function exists */
	tp_asv_get_strv (const GHashTable *asv, const gchar *key);		tp_asv_get_strv (const GHashTable *asv, const gchar *key);
	void tp_asv_set_strv (GHashTable *asv, const gchar *key, gchar **value);		void tp_asv_set_strv (GHashTable *asv, const gchar *key, gchar **value);
	void tp_asv_dump (GHashTable *asv);		void tp_asv_dump (GHashTable *asv);
	#ifndef TP_DISABLE_DEPRECATED
	_TP_DEPRECATED
	DBusGConnection * tp_get_bus (void);
	_TP_DEPRECATED
	DBusGProxy * tp_get_bus_proxy (void);
	#endif
	G_END_DECLS		G_END_DECLS
	#undef __TP_IN_DBUS_H__		#undef __TP_IN_DBUS_H__
	#endif /* __TELEPATHY_DBUS_H__ */		#endif /* __TELEPATHY_DBUS_H__ */
End of changes. 2 change blocks.
	12 lines changed or deleted		2 lines changed or added

	debug-client.h		debug-client.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef TP_DEBUG_CLIENT_H		#ifndef TP_DEBUG_CLIENT_H
	#define TP_DEBUG_CLIENT_H		#define TP_DEBUG_CLIENT_H
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	#include <telepathy-glib/proxy.h>		#include <telepathy-glib/proxy.h>
	#include <telepathy-glib/debug-message.h>		#include <telepathy-glib/debug-message.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	skipping to change at line 102		skipping to change at line 102
	GAsyncReadyCallback callback,		GAsyncReadyCallback callback,
	gpointer user_data);		gpointer user_data);
	_TP_AVAILABLE_IN_0_20		_TP_AVAILABLE_IN_0_20
	GPtrArray * tp_debug_client_get_messages_finish (TpDebugClient *self,		GPtrArray * tp_debug_client_get_messages_finish (TpDebugClient *self,
	GAsyncResult *result,		GAsyncResult *result,
	GError **error) G_GNUC_WARN_UNUSED_RESULT;		GError **error) G_GNUC_WARN_UNUSED_RESULT;
	G_END_DECLS		G_END_DECLS
	#include <telepathy-glib/_gen/tp-cli-debug.h>
	#endif		#endif
End of changes. 2 change blocks.
	6 lines changed or deleted		2 lines changed or added

	debug-message.h		debug-message.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef __TP_DEBUG_MESSAGE_H__		#ifndef __TP_DEBUG_MESSAGE_H__
	#define __TP_DEBUG_MESSAGE_H__		#define __TP_DEBUG_MESSAGE_H__
	#include <glib-object.h>		#include <glib-object.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
End of changes. 1 change blocks.
	4 lines changed or deleted		2 lines changed or added

	debug-sender.h		debug-sender.h
	skipping to change at line 20		skipping to change at line 20
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef __TP_DEBUG_SENDER_H__		#ifndef __TP_DEBUG_SENDER_H__
	#define __TP_DEBUG_SENDER_H__		#define __TP_DEBUG_SENDER_H__
	#include <glib-object.h>		#include <glib-object.h>
	#include <telepathy-glib/dbus-properties-mixin.h>		#include <telepathy-glib/dbus-properties-mixin.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	#include <telepathy-glib/enums.h>		#include <telepathy-glib/enums.h>
	#include <telepathy-glib/svc-debug.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	typedef struct _TpDebugSender TpDebugSender;		typedef struct _TpDebugSender TpDebugSender;
	typedef struct _TpDebugSenderClass TpDebugSenderClass;		typedef struct _TpDebugSenderClass TpDebugSenderClass;
	typedef struct _TpDebugSenderPrivate TpDebugSenderPrivate;		typedef struct _TpDebugSenderPrivate TpDebugSenderPrivate;
	#define TP_TYPE_DEBUG_SENDER tp_debug_sender_get_type()		#define TP_TYPE_DEBUG_SENDER tp_debug_sender_get_type()
	#define TP_DEBUG_SENDER(obj) \		#define TP_DEBUG_SENDER(obj) \
	(G_TYPE_CHECK_INSTANCE_CAST ((obj), TP_TYPE_DEBUG_SENDER, TpDebugSender))		(G_TYPE_CHECK_INSTANCE_CAST ((obj), TP_TYPE_DEBUG_SENDER, TpDebugSender))
End of changes. 2 change blocks.
	5 lines changed or deleted		2 lines changed or added

	debug.h		debug.h
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef __TP_DEBUG_H__		#ifndef __TP_DEBUG_H__
	#define __TP_DEBUG_H__		#define __TP_DEBUG_H__
	#include <glib.h>		#include <glib.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	void tp_debug_set_flags (const gchar *flags_string);		void tp_debug_set_flags (const gchar *flags_string);
	void tp_debug_set_persistent (gboolean persistent);		void tp_debug_set_persistent (gboolean persistent);
	void tp_debug_divert_messages (const gchar *filename);		void tp_debug_divert_messages (const gchar *filename);
	void tp_debug_timestamped_log_handler (const gchar *log_domain,		void tp_debug_timestamped_log_handler (const gchar *log_domain,
	GLogLevelFlags log_level, const gchar *message, gpointer ignored);		GLogLevelFlags log_level, const gchar *message, gpointer ignored);
	#ifndef TP_DISABLE_DEPRECATED
	_TP_DEPRECATED
	void tp_debug_set_flags_from_string (const gchar *flags_string);
	_TP_DEPRECATED
	void tp_debug_set_flags_from_env (const gchar *var);
	_TP_DEPRECATED
	void tp_debug_set_all_flags (void);
	#endif
	G_END_DECLS		G_END_DECLS
	#endif		#endif
End of changes. 2 change blocks.
	15 lines changed or deleted		2 lines changed or added

	defs.h		defs.h
	skipping to change at line 22		skipping to change at line 22
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef __TP_DEFS_H__		#ifndef __TP_DEFS_H__
	#define __TP_DEFS_H__		#define __TP_DEFS_H__
	#include <glib.h>		#include <glib.h>
	#include <telepathy-glib/version.h>		#include <telepathy-glib/version.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	/**
	* TP_CM_BUS_NAME_BASE:
	*
	* The prefix for a connection manager's bus name, to which the CM's name
	* (e.g. "gabble") should be appended.
	*/
	#define TP_CM_BUS_NAME_BASE "org.freedesktop.Telepathy.ConnectionManager
	."
	/**
	* TP_CM_OBJECT_PATH_BASE:
	*
	* The prefix for a connection manager's object path, to which the CM's nam
	e
	* (e.g. "gabble") should be appended.
	*/
	#define TP_CM_OBJECT_PATH_BASE "/org/freedesktop/Telepathy/ConnectionManage
	r/"
	/**
	* TP_CONN_BUS_NAME_BASE:
	*
	* The prefix for a connection's bus name, to which the CM's name
	* (e.g. "gabble"), the protocol (e.g. "jabber") and an element or sequence
	* of elements representing the account should be appended.
	*/
	#define TP_CONN_BUS_NAME_BASE "org.freedesktop.Telepathy.Connection."
	/**
	* TP_CONN_OBJECT_PATH_BASE:
	*
	* The prefix for a connection's object path, to which the CM's name
	* (e.g. "gabble"), the protocol (e.g. "jabber") and an element or sequence
	* of elements representing the account should be appended.
	*/
	#define TP_CONN_OBJECT_PATH_BASE "/org/freedesktop/Telepathy/Connection/"
	/**
	* TP_ACCOUNT_MANAGER_BUS_NAME:
	*
	* The account manager's well-known bus name
	*/
	#define TP_ACCOUNT_MANAGER_BUS_NAME "org.freedesktop.Telepathy.AccountManag
	er"
	/**
	* TP_ACCOUNT_MANAGER_OBJECT_PATH:
	*
	* The account manager's standard object path
	*/
	#define TP_ACCOUNT_MANAGER_OBJECT_PATH "/org/freedesktop/Telepathy/AccountM
	anager"
	/**
	* TP_ACCOUNT_OBJECT_PATH_BASE:
	*
	* The common prefix of the object path for all Account objects.
	*/
	#define TP_ACCOUNT_OBJECT_PATH_BASE "/org/freedesktop/Telepathy/Account/"
	/**
	* TP_CHANNEL_DISPATCHER_BUS_NAME:
	*
	* The channel dispatcher's well-known bus name
	*/
	#define TP_CHANNEL_DISPATCHER_BUS_NAME "org.freedesktop.Telepathy.ChannelDi
	spatcher"
	/**
	* TP_CHANNEL_DISPATCHER_OBJECT_PATH:
	*
	* The channel dispatcher's standard object path
	*/
	#define TP_CHANNEL_DISPATCHER_OBJECT_PATH "/org/freedesktop/Telepathy/Chann
	elDispatcher"
	/**
	* TP_CLIENT_BUS_NAME_BASE:
	*
	* The common prefix of the well-known bus name for any Telepathy Client.
	*/
	#define TP_CLIENT_BUS_NAME_BASE "org.freedesktop.Telepathy.Client."
	/**
	* TP_CLIENT_OBJECT_PATH_BASE:
	*
	* The common prefix of the well-known object path for any Telepathy Client
	.
	*/
	#define TP_CLIENT_OBJECT_PATH_BASE "/org/freedesktop/Telepathy/Client/"
	/**
	* TP_DEBUG_OBJECT_PATH:
	*
	* The standard path for objects implementing the Telepathy Debug interface
	* (#TpSvcDebug).
	*/
	#define TP_DEBUG_OBJECT_PATH "/org/freedesktop/Telepathy/debug"
	/**
	* TP_USER_ACTION_TIME_NOT_USER_ACTION:
	*
	* The "user action time" used by methods like
	* tp_account_channel_request_new() to represent channel requests that are
	* not a result of user action.
	*
	* See also #TpAccountChannelRequest:user-action-time,
	* tp_user_action_time_from_x11(), tp_user_action_time_should_present() and
	* %TP_USER_ACTION_TIME_CURRENT_TIME.
	*
	* Since: 0.11.13
	*/
	#define TP_USER_ACTION_TIME_NOT_USER_ACTION (G_GINT64_CONSTANT (0))
	/**
	* TP_USER_ACTION_TIME_CURRENT_TIME:
	*
	* The "user action time" used by methods like
	* tp_account_channel_request_new() to represent channel requests that shou
	ld
	* be treated as though they happened at the current time. This is the same
	* concept as %GDK_CURRENT_TIME in GDK (but note that the numerical value u
	sed
	* in Telepathy is not the same).
	*
	* See also #TpAccountChannelRequest:user-action-time,
	* tp_user_action_time_from_x11(), tp_user_action_time_should_present() and
	* %TP_USER_ACTION_TIME_NOT_USER_ACTION.
	*
	* Since: 0.11.13
	*/
	#define TP_USER_ACTION_TIME_CURRENT_TIME (G_MAXINT64)
	#define _TP_ENCODE_VERSION(major, minor) (((major) << 16) | ((minor) << 8))		#define _TP_ENCODE_VERSION(major, minor) (((major) << 16) | ((minor) << 8))
	#define TP_VERSION_0_16 (_TP_ENCODE_VERSION (0, 16))		#define TP_VERSION_0_16 (_TP_ENCODE_VERSION (0, 16))
	#define TP_VERSION_0_18 (_TP_ENCODE_VERSION (0, 18))		#define TP_VERSION_0_18 (_TP_ENCODE_VERSION (0, 18))
	#define TP_VERSION_0_20 (_TP_ENCODE_VERSION (0, 20))		#define TP_VERSION_0_20 (_TP_ENCODE_VERSION (0, 20))
	#define TP_VERSION_0_22 (_TP_ENCODE_VERSION (0, 22))		#define TP_VERSION_0_22 (_TP_ENCODE_VERSION (0, 22))
	#define TP_VERSION_0_24 (_TP_ENCODE_VERSION (0, 24))
	#define TP_VERSION_1_0 (_TP_ENCODE_VERSION (1, 0))		#define TP_VERSION_1_0 (_TP_ENCODE_VERSION (1, 0))
	#if (TP_MINOR_VERSION == 99)		#if (TP_MINOR_VERSION == 99)
	/* special case for telepathy-glib 1.0 prereleases */		/* special case for telepathy-glib 1.0 prereleases */
	# define _TP_VERSION_CUR_STABLE (_TP_ENCODE_VERSION (TP_MAJOR_VERSION + 1, 0))		# define _TP_VERSION_CUR_STABLE (_TP_ENCODE_VERSION (TP_MAJOR_VERSION + 1, 0))
	#elif (TP_MINOR_VERSION == 0)		#elif (TP_MINOR_VERSION == 0)
	/* special case for telepathy-glib 1.0 itself */		/* special case for telepathy-glib 1.0 itself */
	# define _TP_VERSION_CUR_STABLE (_TP_ENCODE_VERSION (TP_MAJOR_VERSION, 0))		# define _TP_VERSION_CUR_STABLE (_TP_ENCODE_VERSION (TP_MAJOR_VERSION, 0))
	#elif (TP_MICRO_VERSION >= 99 && (TP_MINOR_VERSION % 2) == 0)		#elif (TP_MICRO_VERSION >= 99 && (TP_MINOR_VERSION % 2) == 0)
	/* development branch about to start (0.18.999.1) */		/* development branch about to start (0.18.999.1) */
	skipping to change at line 233		skipping to change at line 109
	#endif		#endif
	#if TP_VERSION_MIN_REQUIRED >= TP_VERSION_0_22		#if TP_VERSION_MIN_REQUIRED >= TP_VERSION_0_22
	# define _TP_DEPRECATED_IN_0_22 _TP_DEPRECATED		# define _TP_DEPRECATED_IN_0_22 _TP_DEPRECATED
	# define _TP_DEPRECATED_IN_0_22_FOR(f) _TP_DEPRECATED_FOR(f)		# define _TP_DEPRECATED_IN_0_22_FOR(f) _TP_DEPRECATED_FOR(f)
	#else		#else
	# define _TP_DEPRECATED_IN_0_22 /* nothing */		# define _TP_DEPRECATED_IN_0_22 /* nothing */
	# define _TP_DEPRECATED_IN_0_22_FOR(f) /* nothing */		# define _TP_DEPRECATED_IN_0_22_FOR(f) /* nothing */
	#endif		#endif
	#if TP_VERSION_MIN_REQUIRED >= TP_VERSION_0_24
	# define _TP_DEPRECATED_IN_0_24 _TP_DEPRECATED
	# define _TP_DEPRECATED_IN_0_24_FOR(f) _TP_DEPRECATED_FOR(f)
	#else
	# define _TP_DEPRECATED_IN_0_24 /* nothing */
	# define _TP_DEPRECATED_IN_0_24_FOR(f) /* nothing */
	#endif
	#if TP_VERSION_MIN_REQUIRED >= TP_VERSION_1_0		#if TP_VERSION_MIN_REQUIRED >= TP_VERSION_1_0
	# define _TP_DEPRECATED_IN_1_0 _TP_DEPRECATED		# define _TP_DEPRECATED_IN_1_0 _TP_DEPRECATED
	# define _TP_DEPRECATED_IN_1_0_FOR(f) _TP_DEPRECATED_FOR(f)		# define _TP_DEPRECATED_IN_1_0_FOR(f) _TP_DEPRECATED_FOR(f)
	#else		#else
	# define _TP_DEPRECATED_IN_1_0 /* nothing */		# define _TP_DEPRECATED_IN_1_0 /* nothing */
	# define _TP_DEPRECATED_IN_1_0_FOR(f) /* nothing */		# define _TP_DEPRECATED_IN_1_0_FOR(f) /* nothing */
	#endif		#endif
	#if TP_VERSION_MIN_REQUIRED >= _TP_VERSION_CUR_STABLE		#if TP_VERSION_MIN_REQUIRED >= _TP_VERSION_CUR_STABLE
	# define _TP_DEPRECATED_IN_UNRELEASED _TP_DEPRECATED		# define _TP_DEPRECATED_IN_UNRELEASED _TP_DEPRECATED
	skipping to change at line 281		skipping to change at line 149
	#else		#else
	# define _TP_AVAILABLE_IN_0_20 /* nothing */		# define _TP_AVAILABLE_IN_0_20 /* nothing */
	#endif		#endif
	#if TP_VERSION_MAX_ALLOWED < TP_VERSION_0_22		#if TP_VERSION_MAX_ALLOWED < TP_VERSION_0_22
	# define _TP_AVAILABLE_IN_0_22 _TP_UNAVAILABLE(0, 22)		# define _TP_AVAILABLE_IN_0_22 _TP_UNAVAILABLE(0, 22)
	#else		#else
	# define _TP_AVAILABLE_IN_0_22 /* nothing */		# define _TP_AVAILABLE_IN_0_22 /* nothing */
	#endif		#endif
	#if TP_VERSION_MAX_ALLOWED < TP_VERSION_0_24
	# define _TP_AVAILABLE_IN_0_24 _TP_UNAVAILABLE(0, 24)
	#else
	# define _TP_AVAILABLE_IN_0_24 /* nothing */
	#endif
	#if TP_VERSION_MAX_ALLOWED < TP_VERSION_1_0		#if TP_VERSION_MAX_ALLOWED < TP_VERSION_1_0
	# define _TP_AVAILABLE_IN_1_0 _TP_UNAVAILABLE(1, 0)		# define _TP_AVAILABLE_IN_1_0 _TP_UNAVAILABLE(1, 0)
	#else		#else
	# define _TP_AVAILABLE_IN_1_0 /* nothing */		# define _TP_AVAILABLE_IN_1_0 /* nothing */
	#endif		#endif
	#if TP_VERSION_MAX_ALLOWED < _TP_VERSION_CUR_STABLE		#if TP_VERSION_MAX_ALLOWED < _TP_VERSION_CUR_STABLE
	# define _TP_AVAILABLE_IN_UNRELEASED \		# define _TP_AVAILABLE_IN_UNRELEASED \
	_TP_UNAVAILABLE (TP_MAJOR_VERSION, TP_MINOR_VERSION)		_TP_UNAVAILABLE (TP_MAJOR_VERSION, TP_MINOR_VERSION)
	#else		#else
End of changes. 5 change blocks.
	152 lines changed or deleted		2 lines changed or added

	dtmf.h		dtmf.h
	skipping to change at line 20		skipping to change at line 20
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef __TP_DTMF_H__		#ifndef __TP_DTMF_H__
	#define __TP_DTMF_H__		#define __TP_DTMF_H__
	#include <glib-object.h>		#include <glib-object.h>
	#include <telepathy-glib/enums.h>		#include <telepathy-glib/enums.h>
	gchar tp_dtmf_event_to_char (TpDTMFEvent event);		gchar tp_dtmf_event_to_char (TpDTMFEvent event);
End of changes. 1 change blocks.
	4 lines changed or deleted		2 lines changed or added

	enums.h		enums.h
			/*
			* enums.h - numeric constants
			*
			* Copyright © 2007-2012 Collabora Ltd.
			* Copyright © 2007-2009 Nokia Corporation
			*
			* This library is free software; you can redistribute it and/or
			* modify it under the terms of the GNU Lesser General Public
			* License as published by the Free Software Foundation; either
			* version 2.1 of the License, or (at your option) any later version.
			*
			* This library is distributed in the hope that it will be useful,
			* but WITHOUT ANY WARRANTY; without even the implied warranty of
			* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
			* Lesser General Public License for more details.
			*
			* You should have received a copy of the GNU Lesser General Public
			* License along with this library; if not, write to the Free Software
			* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U
			SA
			*/
	#ifndef __TP_ENUMS_H__		#ifndef __TP_ENUMS_H__
	#define __TP_ENUMS_H__		#define __TP_ENUMS_H__
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#include <telepathy-glib/_gen/telepathy-enums.h>		#include <telepathy-glib/_gen/telepathy-enums.h>
	#include <telepathy-glib/_gen/genums.h>		#include <telepathy-glib/_gen/genums.h>
			#define TP_USER_ACTION_TIME_NOT_USER_ACTION (G_GINT64_CONSTANT (0))
			#define TP_USER_ACTION_TIME_CURRENT_TIME (G_MAXINT64)
	#endif		#endif
End of changes. 3 change blocks.
	4 lines changed or deleted		28 lines changed or added

	error-str.h		error-str.h
	#define TP_ERROR_STR_NETWORK_ERROR "org.freedesktop.Telepathy.Error.Network		#define TP_ERROR_STR_NETWORK_ERROR "im.telepathy1.Error.NetworkError"
	Error"		#define TP_ERROR_STR_NOT_IMPLEMENTED "im.telepathy1.Error.NotImplemented"
	#define TP_ERROR_STR_NOT_IMPLEMENTED "org.freedesktop.Telepathy.Error.NotIm		#define TP_ERROR_STR_INVALID_ARGUMENT "im.telepathy1.Error.InvalidArgument"
	plemented"		#define TP_ERROR_STR_NOT_AVAILABLE "im.telepathy1.Error.NotAvailable"
	#define TP_ERROR_STR_INVALID_ARGUMENT "org.freedesktop.Telepathy.Error.Inva		#define TP_ERROR_STR_PERMISSION_DENIED "im.telepathy1.Error.PermissionDenie
	lidArgument"		d"
	#define TP_ERROR_STR_NOT_AVAILABLE "org.freedesktop.Telepathy.Error.NotAvai		#define TP_ERROR_STR_DISCONNECTED "im.telepathy1.Error.Disconnected"
	lable"		#define TP_ERROR_STR_INVALID_HANDLE "im.telepathy1.Error.InvalidHandle"
	#define TP_ERROR_STR_PERMISSION_DENIED "org.freedesktop.Telepathy.Error.Per		#define TP_ERROR_STR_CHANNEL_BANNED "im.telepathy1.Error.Channel.Banned"
	missionDenied"		#define TP_ERROR_STR_CHANNEL_FULL "im.telepathy1.Error.Channel.Full"
	#define TP_ERROR_STR_DISCONNECTED "org.freedesktop.Telepathy.Error.Disconne		#define TP_ERROR_STR_CHANNEL_INVITE_ONLY "im.telepathy1.Error.Channel.Invit
	cted"		eOnly"
	#define TP_ERROR_STR_INVALID_HANDLE "org.freedesktop.Telepathy.Error.Invali		#define TP_ERROR_STR_NOT_YOURS "im.telepathy1.Error.NotYours"
	dHandle"		#define TP_ERROR_STR_CANCELLED "im.telepathy1.Error.Cancelled"
	#define TP_ERROR_STR_CHANNEL_BANNED "org.freedesktop.Telepathy.Error.Channe		#define TP_ERROR_STR_AUTHENTICATION_FAILED "im.telepathy1.Error.Authenticat
	l.Banned"		ionFailed"
	#define TP_ERROR_STR_CHANNEL_FULL "org.freedesktop.Telepathy.Error.Channel.		#define TP_ERROR_STR_ENCRYPTION_NOT_AVAILABLE "im.telepathy1.Error.Encrypti
	Full"		onNotAvailable"
	#define TP_ERROR_STR_CHANNEL_INVITE_ONLY "org.freedesktop.Telepathy.Error.C		#define TP_ERROR_STR_ENCRYPTION_ERROR "im.telepathy1.Error.EncryptionError"
	hannel.InviteOnly"		#define TP_ERROR_STR_CERT_NOT_PROVIDED "im.telepathy1.Error.Cert.NotProvide
	#define TP_ERROR_STR_NOT_YOURS "org.freedesktop.Telepathy.Error.NotYours"		d"
	#define TP_ERROR_STR_CANCELLED "org.freedesktop.Telepathy.Error.Cancelled"		#define TP_ERROR_STR_CERT_UNTRUSTED "im.telepathy1.Error.Cert.Untrusted"
	#define TP_ERROR_STR_AUTHENTICATION_FAILED "org.freedesktop.Telepathy.Error		#define TP_ERROR_STR_CERT_EXPIRED "im.telepathy1.Error.Cert.Expired"
	.AuthenticationFailed"		#define TP_ERROR_STR_CERT_NOT_ACTIVATED "im.telepathy1.Error.Cert.NotActiva
	#define TP_ERROR_STR_ENCRYPTION_NOT_AVAILABLE "org.freedesktop.Telepathy.Er		ted"
	ror.EncryptionNotAvailable"		#define TP_ERROR_STR_CERT_FINGERPRINT_MISMATCH "im.telepathy1.Error.Cert.Fi
	#define TP_ERROR_STR_ENCRYPTION_ERROR "org.freedesktop.Telepathy.Error.Encr		ngerprintMismatch"
	yptionError"		#define TP_ERROR_STR_CERT_HOSTNAME_MISMATCH "im.telepathy1.Error.Cert.Hostn
	#define TP_ERROR_STR_CERT_NOT_PROVIDED "org.freedesktop.Telepathy.Error.Cer		ameMismatch"
	t.NotProvided"		#define TP_ERROR_STR_CERT_SELF_SIGNED "im.telepathy1.Error.Cert.SelfSigned"
	#define TP_ERROR_STR_CERT_UNTRUSTED "org.freedesktop.Telepathy.Error.Cert.U		#define TP_ERROR_STR_CERT_REVOKED "im.telepathy1.Error.Cert.Revoked"
	ntrusted"		#define TP_ERROR_STR_CERT_INSECURE "im.telepathy1.Error.Cert.Insecure"
	#define TP_ERROR_STR_CERT_EXPIRED "org.freedesktop.Telepathy.Error.Cert.Exp		#define TP_ERROR_STR_CERT_INVALID "im.telepathy1.Error.Cert.Invalid"
	ired"		#define TP_ERROR_STR_CERT_LIMIT_EXCEEDED "im.telepathy1.Error.Cert.LimitExc
	#define TP_ERROR_STR_CERT_NOT_ACTIVATED "org.freedesktop.Telepathy.Error.Ce		eeded"
	rt.NotActivated"		#define TP_ERROR_STR_NOT_CAPABLE "im.telepathy1.Error.NotCapable"
	#define TP_ERROR_STR_CERT_FINGERPRINT_MISMATCH "org.freedesktop.Telepathy.E		#define TP_ERROR_STR_OFFLINE "im.telepathy1.Error.Offline"
	rror.Cert.FingerprintMismatch"		#define TP_ERROR_STR_CHANNEL_KICKED "im.telepathy1.Error.Channel.Kicked"
	#define TP_ERROR_STR_CERT_HOSTNAME_MISMATCH "org.freedesktop.Telepathy.Erro		#define TP_ERROR_STR_BUSY "im.telepathy1.Error.Busy"
	r.Cert.HostnameMismatch"		#define TP_ERROR_STR_NO_ANSWER "im.telepathy1.Error.NoAnswer"
	#define TP_ERROR_STR_CERT_SELF_SIGNED "org.freedesktop.Telepathy.Error.Cert		#define TP_ERROR_STR_DOES_NOT_EXIST "im.telepathy1.Error.DoesNotExist"
	.SelfSigned"		#define TP_ERROR_STR_TERMINATED "im.telepathy1.Error.Terminated"
	#define TP_ERROR_STR_CERT_REVOKED "org.freedesktop.Telepathy.Error.Cert.Rev		#define TP_ERROR_STR_MEDIA_CODECS_INCOMPATIBLE "im.telepathy1.Error.Media.C
	oked"		odecsIncompatible"
	#define TP_ERROR_STR_CERT_INSECURE "org.freedesktop.Telepathy.Error.Cert.In		#define TP_ERROR_STR_MEDIA_UNSUPPORTED_TYPE "im.telepathy1.Error.Media.Unsu
	secure"		pportedType"
	#define TP_ERROR_STR_CERT_INVALID "org.freedesktop.Telepathy.Error.Cert.Inv		#define TP_ERROR_STR_MEDIA_STREAMING_ERROR "im.telepathy1.Error.Media.Strea
	alid"		mingError"
	#define TP_ERROR_STR_CERT_LIMIT_EXCEEDED "org.freedesktop.Telepathy.Error.C		#define TP_ERROR_STR_CONNECTION_REFUSED "im.telepathy1.Error.ConnectionRefu
	ert.LimitExceeded"		sed"
	#define TP_ERROR_STR_NOT_CAPABLE "org.freedesktop.Telepathy.Error.NotCapabl		#define TP_ERROR_STR_CONNECTION_FAILED "im.telepathy1.Error.ConnectionFaile
	e"		d"
	#define TP_ERROR_STR_OFFLINE "org.freedesktop.Telepathy.Error.Offline"		#define TP_ERROR_STR_CONNECTION_LOST "im.telepathy1.Error.ConnectionLost"
	#define TP_ERROR_STR_CHANNEL_KICKED "org.freedesktop.Telepathy.Error.Channe		#define TP_ERROR_STR_ALREADY_CONNECTED "im.telepathy1.Error.AlreadyConnecte
	l.Kicked"		d"
	#define TP_ERROR_STR_BUSY "org.freedesktop.Telepathy.Error.Busy"		#define TP_ERROR_STR_CONNECTION_REPLACED "im.telepathy1.Error.ConnectionRep
	#define TP_ERROR_STR_NO_ANSWER "org.freedesktop.Telepathy.Error.NoAnswer"		laced"
	#define TP_ERROR_STR_DOES_NOT_EXIST "org.freedesktop.Telepathy.Error.DoesNo		#define TP_ERROR_STR_REGISTRATION_EXISTS "im.telepathy1.Error.RegistrationE
	tExist"		xists"
	#define TP_ERROR_STR_TERMINATED "org.freedesktop.Telepathy.Error.Terminated		#define TP_ERROR_STR_SERVICE_BUSY "im.telepathy1.Error.ServiceBusy"
	"		#define TP_ERROR_STR_RESOURCE_UNAVAILABLE "im.telepathy1.Error.ResourceUnav
	#define TP_ERROR_STR_MEDIA_CODECS_INCOMPATIBLE "org.freedesktop.Telepathy.E		ailable"
	rror.Media.CodecsIncompatible"		#define TP_ERROR_STR_WOULD_BREAK_ANONYMITY "im.telepathy1.Error.WouldBreakA
	#define TP_ERROR_STR_MEDIA_UNSUPPORTED_TYPE "org.freedesktop.Telepathy.Erro		nonymity"
	r.Media.UnsupportedType"		#define TP_ERROR_STR_NOT_YET "im.telepathy1.Error.NotYet"
	#define TP_ERROR_STR_MEDIA_STREAMING_ERROR "org.freedesktop.Telepathy.Error		#define TP_ERROR_STR_REJECTED "im.telepathy1.Error.Rejected"
	.Media.StreamingError"		#define TP_ERROR_STR_PICKED_UP_ELSEWHERE "im.telepathy1.Error.PickedUpElsew
	#define TP_ERROR_STR_CONNECTION_REFUSED "org.freedesktop.Telepathy.Error.Co		here"
	nnectionRefused"		#define TP_ERROR_STR_SERVICE_CONFUSED "im.telepathy1.Error.ServiceConfused"
	#define TP_ERROR_STR_CONNECTION_FAILED "org.freedesktop.Telepathy.Error.Con		#define TP_ERROR_STR_CONFUSED "im.telepathy1.Error.Confused"
	nectionFailed"		#define TP_ERROR_STR_SOFTWARE_UPGRADE_REQUIRED "im.telepathy1.Error.Softwar
	#define TP_ERROR_STR_CONNECTION_LOST "org.freedesktop.Telepathy.Error.Conne		eUpgradeRequired"
	ctionLost"		#define TP_ERROR_STR_EMERGENCY_CALLS_NOT_SUPPORTED "im.telepathy1.Error.Eme
	#define TP_ERROR_STR_ALREADY_CONNECTED "org.freedesktop.Telepathy.Error.Alr		rgencyCallsNotSupported"
	eadyConnected"		#define TP_ERROR_STR_INSUFFICIENT_BALANCE "im.telepathy1.Error.Insufficient
	#define TP_ERROR_STR_CONNECTION_REPLACED "org.freedesktop.Telepathy.Error.C		Balance"
	onnectionReplaced"		#define TP_ERROR_STR_CAPTCHA_NOT_SUPPORTED "im.telepathy1.Error.CaptchaNotS
	#define TP_ERROR_STR_REGISTRATION_EXISTS "org.freedesktop.Telepathy.Error.R		upported"
	egistrationExists"
	#define TP_ERROR_STR_SERVICE_BUSY "org.freedesktop.Telepathy.Error.ServiceB
	usy"
	#define TP_ERROR_STR_RESOURCE_UNAVAILABLE "org.freedesktop.Telepathy.Error.
	ResourceUnavailable"
	#define TP_ERROR_STR_WOULD_BREAK_ANONYMITY "org.freedesktop.Telepathy.Error
	.WouldBreakAnonymity"
	#define TP_ERROR_STR_NOT_YET "org.freedesktop.Telepathy.Error.NotYet"
	#define TP_ERROR_STR_REJECTED "org.freedesktop.Telepathy.Error.Rejected"
	#define TP_ERROR_STR_PICKED_UP_ELSEWHERE "org.freedesktop.Telepathy.Error.P
	ickedUpElsewhere"
	#define TP_ERROR_STR_SERVICE_CONFUSED "org.freedesktop.Telepathy.Error.Serv
	iceConfused"
	#define TP_ERROR_STR_CONFUSED "org.freedesktop.Telepathy.Error.Confused"
	#define TP_ERROR_STR_SOFTWARE_UPGRADE_REQUIRED "org.freedesktop.Telepathy.E
	rror.SoftwareUpgradeRequired"
	#define TP_ERROR_STR_EMERGENCY_CALLS_NOT_SUPPORTED "org.freedesktop.Telepat
	hy.Error.EmergencyCallsNotSupported"
	#define TP_ERROR_STR_INSUFFICIENT_BALANCE "org.freedesktop.Telepathy.Error.
	InsufficientBalance"
	#define TP_ERROR_STR_CAPTCHA_NOT_SUPPORTED "org.freedesktop.Telepathy.Error
	.CaptchaNotSupported"
End of changes. 1 change blocks.
	lines changed or deleted		lines changed or added

	errors.h		errors.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef __TP_ERRORS_H__		#ifndef __TP_ERRORS_H__
	#define __TP_ERRORS_H__		#define __TP_ERRORS_H__
	#include <glib-object.h>		#include <glib-object.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	#include <telepathy-glib/_gen/error-str.h>		#include <telepathy-glib/_gen/error-str.h>
	#include <telepathy-glib/_gen/genums.h>		#include <telepathy-glib/_gen/genums.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	#ifndef TP_DISABLE_DEPRECATED
	_TP_DEPRECATED_FOR (TP_ERROR)
	GQuark tp_errors_quark (void);
	/* this is deliberately the old one, so that it expands to a call to a
	* deprecated function, so that gcc will warn */
	#define TP_ERRORS (tp_errors_quark ())
	#endif
	GQuark tp_error_quark (void);		GQuark tp_error_quark (void);
	#define TP_ERROR_PREFIX "org.freedesktop.Telepathy.Error"		#define TP_ERROR_PREFIX "im.telepathy1.Error"
	#define TP_ERROR (tp_error_quark ())		#define TP_ERROR (tp_error_quark ())
	void tp_g_set_error_invalid_handle_type (guint type, GError **error);		void tp_g_set_error_invalid_handle_type (guint type, GError **error);
	void tp_g_set_error_unsupported_handle_type (guint type, GError **error);		void tp_g_set_error_unsupported_handle_type (guint type, GError **error);
	typedef enum {		typedef enum {
	TP_ERROR_NETWORK_ERROR, /*< nick=NetworkError >*/		TP_ERROR_NETWORK_ERROR, /*< nick=NetworkError >*/
	TP_ERROR_NOT_IMPLEMENTED, /*< nick=NotImplemented >*/		TP_ERROR_NOT_IMPLEMENTED, /*< nick=NotImplemented >*/
	TP_ERROR_INVALID_ARGUMENT, /*< nick=InvalidArgument >*/		TP_ERROR_INVALID_ARGUMENT, /*< nick=InvalidArgument >*/
End of changes. 3 change blocks.
	14 lines changed or deleted		3 lines changed or added

	exportable-channel.h		exportable-channel.h
	skipping to change at line 22		skipping to change at line 22
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef TP_EXPORTABLE_CHANNEL_H		#ifndef TP_EXPORTABLE_CHANNEL_H
	#define TP_EXPORTABLE_CHANNEL_H		#define TP_EXPORTABLE_CHANNEL_H
	#include <glib-object.h>		#include <glib-object.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	#define TP_TYPE_EXPORTABLE_CHANNEL (tp_exportable_channel_get_type ())		#define TP_TYPE_EXPORTABLE_CHANNEL (tp_exportable_channel_get_type ())
End of changes. 1 change blocks.
	4 lines changed or deleted		2 lines changed or added

	file-transfer-channel.h		file-transfer-channel.h
	skipping to change at line 22		skipping to change at line 22
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef __TP_FILE_TRANSFER_CHANNEL_H__		#ifndef __TP_FILE_TRANSFER_CHANNEL_H__
	#define __TP_FILE_TRANSFER_CHANNEL_H__		#define __TP_FILE_TRANSFER_CHANNEL_H__
	#include <telepathy-glib/channel.h>		#include <telepathy-glib/channel.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	skipping to change at line 69		skipping to change at line 69
	#define TP_FILE_TRANSFER_CHANNEL_FEATURE_CORE \		#define TP_FILE_TRANSFER_CHANNEL_FEATURE_CORE \
	tp_file_transfer_channel_get_feature_quark_core ()		tp_file_transfer_channel_get_feature_quark_core ()
	_TP_AVAILABLE_IN_0_16		_TP_AVAILABLE_IN_0_16
	GQuark tp_file_transfer_channel_get_feature_quark_core (void) G_GNUC_CONST;		GQuark tp_file_transfer_channel_get_feature_quark_core (void) G_GNUC_CONST;
	_TP_AVAILABLE_IN_0_16		_TP_AVAILABLE_IN_0_16
	GType tp_file_transfer_channel_get_type (void);		GType tp_file_transfer_channel_get_type (void);
	/* Methods */		/* Methods */
	_TP_AVAILABLE_IN_0_16
	_TP_DEPRECATED_IN_0_20_FOR(tp_simple_client_factory_ensure_channel)
	TpFileTransferChannel * tp_file_transfer_channel_new (TpConnection *conn,
	const gchar *object_path,
	const GHashTable *immutable_properties,
	GError **error);
	_TP_AVAILABLE_IN_0_18		_TP_AVAILABLE_IN_0_18
	void tp_file_transfer_channel_accept_file_async (TpFileTransferChannel *sel f,		void tp_file_transfer_channel_accept_file_async (TpFileTransferChannel *sel f,
	GFile *file,		GFile *file,
	guint64 offset,		guint64 offset,
	GAsyncReadyCallback callback,		GAsyncReadyCallback callback,
	gpointer user_data);		gpointer user_data);
	_TP_AVAILABLE_IN_0_18		_TP_AVAILABLE_IN_0_18
	gboolean tp_file_transfer_channel_accept_file_finish (		gboolean tp_file_transfer_channel_accept_file_finish (
	TpFileTransferChannel *self,		TpFileTransferChannel *self,
End of changes. 2 change blocks.
	11 lines changed or deleted		2 lines changed or added

	genums.h		genums.h
	skipping to change at line 19		skipping to change at line 19
	G_BEGIN_DECLS		G_BEGIN_DECLS
	/* enumerations from "base-room-config.h" */		/* enumerations from "base-room-config.h" */
	GType tp_base_room_config_property_get_type (void) G_GNUC_CONST;		GType tp_base_room_config_property_get_type (void) G_GNUC_CONST;
	#define TP_TYPE_BASE_ROOM_CONFIG_PROPERTY (tp_base_room_config_property_get _type ())		#define TP_TYPE_BASE_ROOM_CONFIG_PROPERTY (tp_base_room_config_property_get _type ())
	/* enumerations from "connection-manager.h" */		/* enumerations from "connection-manager.h" */
	GType tp_cm_info_source_get_type (void) G_GNUC_CONST;		GType tp_cm_info_source_get_type (void) G_GNUC_CONST;
	#define TP_TYPE_CM_INFO_SOURCE (tp_cm_info_source_get_type ())		#define TP_TYPE_CM_INFO_SOURCE (tp_cm_info_source_get_type ())
	/* enumerations from "contact.h" */
	GType tp_contact_feature_get_type (void) G_GNUC_CONST;
	#define TP_TYPE_CONTACT_FEATURE (tp_contact_feature_get_type ())
	/* enumerations from "dbus.h" */		/* enumerations from "dbus.h" */
	GType tp_dbus_name_type_get_type (void) G_GNUC_CONST;		GType tp_dbus_name_type_get_type (void) G_GNUC_CONST;
	#define TP_TYPE_DBUS_NAME_TYPE (tp_dbus_name_type_get_type ())		#define TP_TYPE_DBUS_NAME_TYPE (tp_dbus_name_type_get_type ())
	/* enumerations from "dbus-properties-mixin.h" */		/* enumerations from "dbus-properties-mixin.h" */
	GType tp_dbus_properties_mixin_flags_get_type (void) G_GNUC_CONST;		GType tp_dbus_properties_mixin_flags_get_type (void) G_GNUC_CONST;
	#define TP_TYPE_DBUS_PROPERTIES_MIXIN_FLAGS (tp_dbus_properties_mixin_flags _get_type ())		#define TP_TYPE_DBUS_PROPERTIES_MIXIN_FLAGS (tp_dbus_properties_mixin_flags _get_type ())
	/* enumerations from "errors.h" */		/* enumerations from "errors.h" */
	GType tp_error_get_type (void) G_GNUC_CONST;		GType tp_error_get_type (void) G_GNUC_CONST;
End of changes. 1 change blocks.
	4 lines changed or deleted		0 lines changed or added

	gnio-util.h		gnio-util.h
	skipping to change at line 22		skipping to change at line 22
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#include <glib-object.h>		#include <glib-object.h>
	#include <gio/gio.h>		#include <gio/gio.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	#include <telepathy-glib/enums.h>		#include <telepathy-glib/enums.h>
	#ifndef __TP_GNIO_UTIL_H__		#ifndef __TP_GNIO_UTIL_H__
	#define __TP_GNIO_UTIL_H__		#define __TP_GNIO_UTIL_H__
End of changes. 1 change blocks.
	4 lines changed or deleted		2 lines changed or added

	group-mixin.h		group-mixin.h
	skipping to change at line 23		skipping to change at line 23
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef __TP_GROUP_MIXIN_H__		#ifndef __TP_GROUP_MIXIN_H__
	#define __TP_GROUP_MIXIN_H__		#define __TP_GROUP_MIXIN_H__
	#include <telepathy-glib/dbus-properties-mixin.h>		#include <telepathy-glib/dbus-properties-mixin.h>
	#include <telepathy-glib/handle-repo.h>		#include <telepathy-glib/handle-repo.h>
	#include <telepathy-glib/svc-channel.h>
	#include <telepathy-glib/util.h>		#include <telepathy-glib/util.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	typedef struct _TpGroupMixinClass TpGroupMixinClass;		typedef struct _TpGroupMixinClass TpGroupMixinClass;
	typedef struct _TpGroupMixinClassPrivate TpGroupMixinClassPrivate;		typedef struct _TpGroupMixinClassPrivate TpGroupMixinClassPrivate;
	typedef struct _TpGroupMixin TpGroupMixin;		typedef struct _TpGroupMixin TpGroupMixin;
	typedef struct _TpGroupMixinPrivate TpGroupMixinPrivate;		typedef struct _TpGroupMixinPrivate TpGroupMixinPrivate;
	skipping to change at line 188		skipping to change at line 187
	void tp_group_mixin_finalize (GObject *obj);		void tp_group_mixin_finalize (GObject *obj);
	gboolean tp_group_mixin_get_self_handle (GObject *obj,		gboolean tp_group_mixin_get_self_handle (GObject *obj,
	guint *ret, GError **error);		guint *ret, GError **error);
	gboolean tp_group_mixin_get_group_flags (GObject *obj,		gboolean tp_group_mixin_get_group_flags (GObject *obj,
	guint *ret, GError **error);		guint *ret, GError **error);
	gboolean tp_group_mixin_add_members (GObject *obj,		gboolean tp_group_mixin_add_members (GObject *obj,
	const GArray *contacts, const gchar *message, GError **error);		const GArray *contacts, const gchar *message, GError **error);
	gboolean tp_group_mixin_remove_members (GObject *obj,		gboolean tp_group_mixin_remove_members (GObject *obj,
	const GArray *contacts, const gchar *message, GError **error);
	gboolean tp_group_mixin_remove_members_with_reason (GObject *obj,
	const GArray *contacts, const gchar *message, guint reason,		const GArray *contacts, const gchar *message, guint reason,
	GError **error);		GError **error);
	gboolean tp_group_mixin_get_members (GObject *obj,		gboolean tp_group_mixin_get_members (GObject *obj,
	GArray **ret, GError **error);		GArray **ret, GError **error);
	gboolean tp_group_mixin_get_local_pending_members (GObject *obj,		gboolean tp_group_mixin_get_local_pending_members (GObject *obj,
	GArray **ret, GError **error);		GArray **ret, GError **error);
	gboolean tp_group_mixin_get_local_pending_members_with_info (GObject *obj,		gboolean tp_group_mixin_get_local_pending_members_with_info (GObject *obj,
	GPtrArray **ret, GError **error);		GPtrArray **ret, GError **error);
	gboolean tp_group_mixin_get_remote_pending_members (GObject *obj,		gboolean tp_group_mixin_get_remote_pending_members (GObject *obj,
	skipping to change at line 211		skipping to change at line 208
	gboolean tp_group_mixin_get_all_members (GObject *obj,		gboolean tp_group_mixin_get_all_members (GObject *obj,
	GArray **members, GArray **local_pending, GArray **remote_pending,		GArray **members, GArray **local_pending, GArray **remote_pending,
	GError **error);		GError **error);
	gboolean tp_group_mixin_get_handle_owners (GObject *obj,		gboolean tp_group_mixin_get_handle_owners (GObject *obj,
	const GArray *handles, GArray **ret, GError **error);		const GArray *handles, GArray **ret, GError **error);
	void tp_group_mixin_change_flags (GObject *obj,		void tp_group_mixin_change_flags (GObject *obj,
	TpChannelGroupFlags add, TpChannelGroupFlags del);		TpChannelGroupFlags add, TpChannelGroupFlags del);
	gboolean tp_group_mixin_change_members (GObject *obj,		gboolean tp_group_mixin_change_members (GObject *obj,
	const gchar *message, const TpIntset *add, const TpIntset *del,
	const TpIntset *add_local_pending, const TpIntset *add_remote_pending,
	TpHandle actor, TpChannelGroupChangeReason reason);
	gboolean tp_group_mixin_change_members_detailed (GObject *obj,
	const TpIntset *add, const TpIntset *del,		const TpIntset *add, const TpIntset *del,
	const TpIntset *add_local_pending, const TpIntset *add_remote_pending,		const TpIntset *add_local_pending, const TpIntset *add_remote_pending,
	const GHashTable *details);		const GHashTable *details);
	void tp_group_mixin_change_self_handle (GObject *obj,		void tp_group_mixin_change_self_handle (GObject *obj,
	TpHandle new_self_handle);		TpHandle new_self_handle);
	void tp_group_mixin_add_handle_owner (GObject *obj,		void tp_group_mixin_add_handle_owner (GObject *obj,
	TpHandle local_handle, TpHandle owner_handle);		TpHandle local_handle, TpHandle owner_handle);
	void tp_group_mixin_add_handle_owners (GObject *obj,		void tp_group_mixin_add_handle_owners (GObject *obj,
	GHashTable *local_to_owner_handle);		GHashTable *local_to_owner_handle);
End of changes. 4 change blocks.
	11 lines changed or deleted		2 lines changed or added

	gtypes.h		gtypes.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_DBUS_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directl
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath		y."
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef __TP_GTYPES_H__		#ifndef __TP_GTYPES_H__
	#define __TP_GTYPES_H__		#define __TP_GTYPES_H__
	#include <dbus/dbus-glib.h>		#include <dbus/dbus-glib.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	#include <telepathy-glib/_gen/gtypes.h>		#include <telepathy-glib/_gen/gtypes.h>
End of changes. 1 change blocks.
	4 lines changed or deleted		3 lines changed or added

	handle-channels-context.h		handle-channels-context.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef __TP_HANDLE_CHANNELS_CONTEXT_H__		#ifndef __TP_HANDLE_CHANNELS_CONTEXT_H__
	#define __TP_HANDLE_CHANNELS_CONTEXT_H__		#define __TP_HANDLE_CHANNELS_CONTEXT_H__
	#include <gio/gio.h>		#include <gio/gio.h>
	#include <glib-object.h>		#include <glib-object.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
End of changes. 1 change blocks.
	4 lines changed or deleted		2 lines changed or added

	handle-repo-dynamic.h		handle-repo-dynamic.h
	skipping to change at line 23		skipping to change at line 23
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef __TP_HANDLE_REPO_DYNAMIC_H__		#ifndef __TP_HANDLE_REPO_DYNAMIC_H__
	#define __TP_HANDLE_REPO_DYNAMIC_H__		#define __TP_HANDLE_REPO_DYNAMIC_H__
	#include <telepathy-glib/handle-repo.h>		#include <telepathy-glib/handle-repo.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	typedef struct _TpDynamicHandleRepo TpDynamicHandleRepo;		typedef struct _TpDynamicHandleRepo TpDynamicHandleRepo;
End of changes. 1 change blocks.
	4 lines changed or deleted		2 lines changed or added

	handle-repo-static.h		handle-repo-static.h
	skipping to change at line 24		skipping to change at line 24
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef __TP_HANDLE_REPO_STATIC_H__		#ifndef __TP_HANDLE_REPO_STATIC_H__
	#define __TP_HANDLE_REPO_STATIC_H__		#define __TP_HANDLE_REPO_STATIC_H__
	#include <telepathy-glib/handle-repo.h>		#include <telepathy-glib/handle-repo.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	/**		/**
End of changes. 1 change blocks.
	4 lines changed or deleted		2 lines changed or added

	handle-repo.h		handle-repo.h
	skipping to change at line 24		skipping to change at line 24
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
	* 02110-1301 USA		* 02110-1301 USA
	*		*
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef __TP_HANDLE_REPO_H__		#ifndef __TP_HANDLE_REPO_H__
	#define __TP_HANDLE_REPO_H__		#define __TP_HANDLE_REPO_H__
	#include <glib-object.h>		#include <glib-object.h>
	#include <gio/gio.h>		#include <gio/gio.h>
	#include <telepathy-glib/intset.h>		#include <telepathy-glib/intset.h>
	skipping to change at line 91		skipping to change at line 91
	GType tp_handle_repo_iface_get_type (void);		GType tp_handle_repo_iface_get_type (void);
	/* Public API for handle repositories */		/* Public API for handle repositories */
	gboolean tp_handle_is_valid (TpHandleRepoIface *self,		gboolean tp_handle_is_valid (TpHandleRepoIface *self,
	TpHandle handle, GError **error);		TpHandle handle, GError **error);
	gboolean tp_handles_are_valid (TpHandleRepoIface *self,		gboolean tp_handles_are_valid (TpHandleRepoIface *self,
	const GArray *handles, gboolean allow_zero, GError **error);		const GArray *handles, gboolean allow_zero, GError **error);
	#ifndef TP_DISABLE_DEPRECATED
	_TP_DEPRECATED_IN_0_20
	TpHandle tp_handle_ref (TpHandleRepoIface *self, TpHandle handle);
	_TP_DEPRECATED_IN_0_20
	void tp_handles_ref (TpHandleRepoIface *self, const GArray *handles);
	_TP_DEPRECATED_IN_0_20
	void tp_handle_unref (TpHandleRepoIface *self, TpHandle handle);
	_TP_DEPRECATED_IN_0_20
	void tp_handles_unref (TpHandleRepoIface *self, const GArray *handles);
	_TP_DEPRECATED_IN_0_20
	gboolean tp_handle_client_hold (TpHandleRepoIface *self,
	const gchar *client, TpHandle handle, GError **error);
	_TP_DEPRECATED_IN_0_20
	gboolean tp_handles_client_hold (TpHandleRepoIface *self,
	const gchar *client, const GArray *handles, GError **error);
	_TP_DEPRECATED_IN_0_20
	gboolean tp_handle_client_release (TpHandleRepoIface *self,
	const gchar *client, TpHandle handle, GError **error);
	_TP_DEPRECATED_IN_0_20
	gboolean tp_handles_client_release (TpHandleRepoIface *self,
	const gchar *client, const GArray *handles, GError **error);
	#endif
	const char *tp_handle_inspect (TpHandleRepoIface *self,		const char *tp_handle_inspect (TpHandleRepoIface *self,
	TpHandle handle) G_GNUC_WARN_UNUSED_RESULT;		TpHandle handle) G_GNUC_WARN_UNUSED_RESULT;
	TpHandle tp_handle_lookup (TpHandleRepoIface *self,		TpHandle tp_handle_lookup (TpHandleRepoIface *self,
	const gchar *id, gpointer context, GError **error);		const gchar *id, gpointer context, GError **error);
	TpHandle tp_handle_ensure (TpHandleRepoIface *self,		TpHandle tp_handle_ensure (TpHandleRepoIface *self,
	const gchar *id, gpointer context, GError **error)		const gchar *id, gpointer context, GError **error)
	G_GNUC_WARN_UNUSED_RESULT;		G_GNUC_WARN_UNUSED_RESULT;
	_TP_AVAILABLE_IN_0_20		_TP_AVAILABLE_IN_0_20
	void tp_handle_ensure_async (TpHandleRepoIface *self,		void tp_handle_ensure_async (TpHandleRepoIface *self,
	TpBaseConnection *connection,		TpBaseConnection *connection,
	const gchar *id,		const gchar *id,
	gpointer context,		gpointer context,
	GAsyncReadyCallback callback,		GAsyncReadyCallback callback,
	gpointer user_data);		gpointer user_data);
	_TP_AVAILABLE_IN_0_20		_TP_AVAILABLE_IN_0_20
	TpHandle tp_handle_ensure_finish (TpHandleRepoIface *self,		TpHandle tp_handle_ensure_finish (TpHandleRepoIface *self,
	GAsyncResult *result,		GAsyncResult *result,
	GError **error);		GError **error);
	#ifndef TP_DISABLE_DEPRECATED
	_TP_DEPRECATED_IN_0_20
	void tp_handle_set_qdata (TpHandleRepoIface *repo, TpHandle handle,
	GQuark key_id, gpointer data, GDestroyNotify destroy);
	_TP_DEPRECATED_IN_0_20
	gpointer tp_handle_get_qdata (TpHandleRepoIface *repo, TpHandle handle,
	GQuark key_id);
	#endif
	/* Handle set helper class */		/* Handle set helper class */
	typedef void (*TpHandleSetMemberFunc)(TpHandleSet *set, TpHandle handle,		typedef void (*TpHandleSetMemberFunc)(TpHandleSet *set, TpHandle handle,
	gpointer userdata);		gpointer userdata);
	TpHandleSet * tp_handle_set_new (TpHandleRepoIface *repo)		TpHandleSet * tp_handle_set_new (TpHandleRepoIface *repo)
	G_GNUC_WARN_UNUSED_RESULT;		G_GNUC_WARN_UNUSED_RESULT;
	TpHandleSet *tp_handle_set_copy (const TpHandleSet *other)		TpHandleSet *tp_handle_set_copy (const TpHandleSet *other)
	G_GNUC_WARN_UNUSED_RESULT;		G_GNUC_WARN_UNUSED_RESULT;
	TpHandleSet *tp_handle_set_new_from_intset (TpHandleRepoIface *repo,		TpHandleSet *tp_handle_set_new_from_intset (TpHandleRepoIface *repo,
End of changes. 3 change blocks.
	37 lines changed or deleted		2 lines changed or added

	handle.h		handle.h
	skipping to change at line 22		skipping to change at line 22
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef __TP_HANDLE_H__		#ifndef __TP_HANDLE_H__
	#define __TP_HANDLE_H__		#define __TP_HANDLE_H__
	#include <glib.h>		#include <glib.h>
	#include <telepathy-glib/enums.h>		#include <telepathy-glib/enums.h>
	#include <telepathy-glib/errors.h>		#include <telepathy-glib/errors.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
End of changes. 1 change blocks.
	4 lines changed or deleted		2 lines changed or added

	heap.h		heap.h
	skipping to change at line 23		skipping to change at line 23
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef __TP_HEAP_H__		#ifndef __TP_HEAP_H__
	#define __TP_HEAP_H__		#define __TP_HEAP_H__
	#include <glib.h>		#include <glib.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	typedef struct _TpHeap TpHeap;		typedef struct _TpHeap TpHeap;
End of changes. 1 change blocks.
	4 lines changed or deleted		2 lines changed or added

	interfaces.h		interfaces.h
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_DBUS_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directl
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath		y."
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef __TP_INTERFACES_H__		#ifndef __TP_INTERFACES_H__
	#define __TP_INTERFACES_H__		#define __TP_INTERFACES_H__
	#include <glib.h>		#include <glib.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
			#define TP_CM_BUS_NAME_BASE "im.telepathy1.ConnectionManager."
			#define TP_CM_OBJECT_PATH_BASE "/im/telepathy1/ConnectionManager/"
			#define TP_CONN_BUS_NAME_BASE "im.telepathy1.Connection."
			#define TP_CONN_OBJECT_PATH_BASE "/im/telepathy1/Connection/"
			#define TP_ACCOUNT_MANAGER_BUS_NAME "im.telepathy1.AccountManager"
			#define TP_ACCOUNT_MANAGER_OBJECT_PATH "/im/telepathy1/AccountManager"
			#define TP_ACCOUNT_OBJECT_PATH_BASE "/im/telepathy1/Account/"
			#define TP_CHANNEL_DISPATCHER_BUS_NAME "im.telepathy1.ChannelDispatcher"
			#define TP_CHANNEL_DISPATCHER_OBJECT_PATH "/im/telepathy1/ChannelDispatcher
			"
			#define TP_CLIENT_BUS_NAME_BASE "im.telepathy1.Client."
			#define TP_CLIENT_OBJECT_PATH_BASE "/im/telepathy1/Client/"
			#define TP_DEBUG_OBJECT_PATH "/im/telepathy1/debug"
	#include <telepathy-glib/_gen/telepathy-interfaces.h>		#include <telepathy-glib/_gen/telepathy-interfaces.h>
	G_END_DECLS		G_END_DECLS
	#endif		#endif
End of changes. 2 change blocks.
	4 lines changed or deleted		17 lines changed or added

	intset.h		intset.h
	skipping to change at line 23		skipping to change at line 23
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
	* 02110-1301 USA		* 02110-1301 USA
	*		*
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef __TP_INTSET_H__		#ifndef __TP_INTSET_H__
	#define __TP_INTSET_H__		#define __TP_INTSET_H__
	#include <glib-object.h>		#include <glib-object.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	#define TP_TYPE_INTSET (tp_intset_get_type ())		#define TP_TYPE_INTSET (tp_intset_get_type ())
	GType tp_intset_get_type (void);		GType tp_intset_get_type (void);
	typedef struct _TpIntset TpIntset;		typedef struct _TpIntset TpIntset;
	#ifndef TP_DISABLE_DEPRECATED
	/* See fdo#30134 for the reasoning behind the rename of TpIntSet to TpIntse
	t */
	/**
	* TpIntSet: (skip)
	*
	* Before 0.11.16, this was the name for <type>TpIntset</type>, but it's
	* now just a backwards compatibility typedef.
	*/
	typedef TpIntset TpIntSet;
	#endif
	typedef void (*TpIntFunc) (guint i, gpointer userdata);		typedef void (*TpIntFunc) (guint i, gpointer userdata);
	TpIntset *tp_intset_new (void) G_GNUC_WARN_UNUSED_RESULT;		TpIntset *tp_intset_new (void) G_GNUC_WARN_UNUSED_RESULT;
	TpIntset *tp_intset_sized_new (guint size) G_GNUC_WARN_UNUSED_RESULT;		TpIntset *tp_intset_sized_new (guint size) G_GNUC_WARN_UNUSED_RESULT;
	TpIntset *tp_intset_new_containing (guint element) G_GNUC_WARN_UNUSED_RESUL T;		TpIntset *tp_intset_new_containing (guint element) G_GNUC_WARN_UNUSED_RESUL T;
	void tp_intset_destroy (TpIntset *set);		void tp_intset_destroy (TpIntset *set);
	void tp_intset_clear (TpIntset *set);		void tp_intset_clear (TpIntset *set);
	void tp_intset_add (TpIntset *set, guint element);		void tp_intset_add (TpIntset *set, guint element);
	gboolean tp_intset_remove (TpIntset *set, guint element);		gboolean tp_intset_remove (TpIntset *set, guint element);
	skipping to change at line 89		skipping to change at line 77
	G_GNUC_WARN_UNUSED_RESULT;		G_GNUC_WARN_UNUSED_RESULT;
	TpIntset *tp_intset_union (const TpIntset *left, const TpIntset *right)		TpIntset *tp_intset_union (const TpIntset *left, const TpIntset *right)
	G_GNUC_WARN_UNUSED_RESULT;		G_GNUC_WARN_UNUSED_RESULT;
	TpIntset *tp_intset_difference (const TpIntset *left, const TpIntset *right )		TpIntset *tp_intset_difference (const TpIntset *left, const TpIntset *right )
	G_GNUC_WARN_UNUSED_RESULT;		G_GNUC_WARN_UNUSED_RESULT;
	TpIntset *tp_intset_symmetric_difference (const TpIntset *left,		TpIntset *tp_intset_symmetric_difference (const TpIntset *left,
	const TpIntset *right) G_GNUC_WARN_UNUSED_RESULT;		const TpIntset *right) G_GNUC_WARN_UNUSED_RESULT;
	gchar *tp_intset_dump (const TpIntset *set) G_GNUC_WARN_UNUSED_RESULT;		gchar *tp_intset_dump (const TpIntset *set) G_GNUC_WARN_UNUSED_RESULT;
	#ifndef TP_DISABLE_DEPRECATED
	typedef struct {
	const TpIntset *set;
	guint element;
	} TpIntsetIter;
	typedef TpIntsetIter TpIntSetIter;
	#define TP_INTSET_ITER_INIT(set) { (set), (guint)(-1) }
	_TP_DEPRECATED_IN_0_20_FOR (tp_intset_fast_iter_init)
	void tp_intset_iter_init (TpIntsetIter *iter, const TpIntset *set);
	_TP_DEPRECATED_IN_0_20_FOR (tp_intset_fast_iter_init)
	void tp_intset_iter_reset (TpIntsetIter *iter);
	_TP_DEPRECATED_IN_0_20_FOR (tp_intset_fast_iter_next)
	gboolean tp_intset_iter_next (TpIntsetIter *iter);
	#endif
	typedef struct {		typedef struct {
	/*<private>*/		/*<private>*/
	gpointer _dummy[16];		gpointer _dummy[16];
	} TpIntsetFastIter;		} TpIntsetFastIter;
	#ifndef TP_DISABLE_DEPRECATED
	typedef TpIntsetFastIter TpIntSetFastIter;
	#endif
	void tp_intset_fast_iter_init (TpIntsetFastIter *iter,		void tp_intset_fast_iter_init (TpIntsetFastIter *iter,
	const TpIntset *set);		const TpIntset *set);
	gboolean tp_intset_fast_iter_next (TpIntsetFastIter *iter,		gboolean tp_intset_fast_iter_next (TpIntsetFastIter *iter,
	guint *output);		guint *output);
	void tp_intset_union_update (TpIntset *self, const TpIntset *other);		void tp_intset_union_update (TpIntset *self, const TpIntset *other);
	void tp_intset_difference_update (TpIntset *self, const TpIntset *other);		void tp_intset_difference_update (TpIntset *self, const TpIntset *other);
	G_END_DECLS		G_END_DECLS
End of changes. 4 change blocks.
	41 lines changed or deleted		2 lines changed or added

	message-mixin.h		message-mixin.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef TP_MESSAGE_MIXIN_H		#ifndef TP_MESSAGE_MIXIN_H
	#define TP_MESSAGE_MIXIN_H		#define TP_MESSAGE_MIXIN_H
	#include <telepathy-glib/base-connection.h>		#include <telepathy-glib/base-connection.h>
	#include <telepathy-glib/cm-message.h>		#include <telepathy-glib/cm-message.h>
	#include <telepathy-glib/handle-repo.h>		#include <telepathy-glib/handle-repo.h>
	#include <telepathy-glib/message.h>		#include <telepathy-glib/message.h>
	#include <telepathy-glib/svc-channel.h>
	#include <telepathy-glib/util.h>		#include <telepathy-glib/util.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	typedef struct _TpMessageMixin TpMessageMixin;		typedef struct _TpMessageMixin TpMessageMixin;
	typedef struct _TpMessageMixinPrivate TpMessageMixinPrivate;		typedef struct _TpMessageMixinPrivate TpMessageMixinPrivate;
	struct _TpMessageMixin {		struct _TpMessageMixin {
	/*<private>*/		/*<private>*/
	TpMessageMixinPrivate *priv;		TpMessageMixinPrivate *priv;
	skipping to change at line 94		skipping to change at line 93
	TpChannelChatState state);		TpChannelChatState state);
	_TP_AVAILABLE_IN_0_20		_TP_AVAILABLE_IN_0_20
	void tp_message_mixin_implement_send_chat_state (GObject *object,		void tp_message_mixin_implement_send_chat_state (GObject *object,
	TpMessageMixinSendChatStateImpl send_chat_state);		TpMessageMixinSendChatStateImpl send_chat_state);
	_TP_AVAILABLE_IN_0_20		_TP_AVAILABLE_IN_0_20
	void tp_message_mixin_maybe_send_gone (GObject *object);		void tp_message_mixin_maybe_send_gone (GObject *object);
	/* Initialization */		/* Initialization */
	void tp_message_mixin_text_iface_init (gpointer g_iface, gpointer iface_dat		void tp_message_mixin_iface_init (gpointer g_iface, gpointer iface_data);
	a);
	void tp_message_mixin_messages_iface_init (gpointer g_iface,
	gpointer iface_data);
	void tp_message_mixin_chat_state_iface_init (gpointer g_iface,		void tp_message_mixin_chat_state_iface_init (gpointer g_iface,
	gpointer iface_data);		gpointer iface_data);
	void tp_message_mixin_init (GObject *obj, gsize offset,		void tp_message_mixin_init (GObject *obj, gsize offset,
	TpBaseConnection *connection);		TpBaseConnection *connection);
	void tp_message_mixin_init_dbus_properties (GObjectClass *cls);		void tp_message_mixin_init_dbus_properties (GObjectClass *cls);
	void tp_message_mixin_finalize (GObject *obj);		void tp_message_mixin_finalize (GObject *obj);
	G_END_DECLS		G_END_DECLS
End of changes. 3 change blocks.
	9 lines changed or deleted		3 lines changed or added

	message.h		message.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef __TP_MESSAGE_H__		#ifndef __TP_MESSAGE_H__
	#define __TP_MESSAGE_H__		#define __TP_MESSAGE_H__
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	#include <telepathy-glib/enums.h>		#include <telepathy-glib/enums.h>
	#include <telepathy-glib/handle.h>		#include <telepathy-glib/handle.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	skipping to change at line 46		skipping to change at line 46
	#define TP_MESSAGE_CLASS(obj) (G_TYPE_CHECK_CLASS_CAST ((obj), TP_TYPE_MESS AGE, TpMessageClass))		#define TP_MESSAGE_CLASS(obj) (G_TYPE_CHECK_CLASS_CAST ((obj), TP_TYPE_MESS AGE, TpMessageClass))
	#define TP_IS_MESSAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TP_TYPE_MESS AGE))		#define TP_IS_MESSAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TP_TYPE_MESS AGE))
	#define TP_IS_MESSAGE_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE ((obj), TP_TYPE_M ESSAGE))		#define TP_IS_MESSAGE_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE ((obj), TP_TYPE_M ESSAGE))
	#define TP_MESSAGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYP E_MESSAGE, TpMessageClass))		#define TP_MESSAGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYP E_MESSAGE, TpMessageClass))
	typedef struct _TpMessage TpMessage;		typedef struct _TpMessage TpMessage;
	typedef struct _TpMessageClass TpMessageClass;		typedef struct _TpMessageClass TpMessageClass;
	GType tp_message_get_type (void);		GType tp_message_get_type (void);
	void tp_message_destroy (TpMessage *self);
	guint tp_message_count_parts (TpMessage *self);		guint tp_message_count_parts (TpMessage *self);
	const GHashTable *tp_message_peek (TpMessage *self, guint part);		const GHashTable *tp_message_peek (TpMessage *self, guint part);
	_TP_AVAILABLE_IN_0_20		_TP_AVAILABLE_IN_0_20
	GVariant *tp_message_dup_part (TpMessage *self, guint part);		GVariant *tp_message_dup_part (TpMessage *self, guint part);
	guint tp_message_append_part (TpMessage *self);		guint tp_message_append_part (TpMessage *self);
	void tp_message_delete_part (TpMessage *self, guint part);		void tp_message_delete_part (TpMessage *self, guint part);
	gboolean tp_message_delete_key (TpMessage *self, guint part, const gchar *k ey);		gboolean tp_message_delete_key (TpMessage *self, guint part, const gchar *k ey);
	void tp_message_set_boolean (TpMessage *self, guint part, const gchar *key,		void tp_message_set_boolean (TpMessage *self, guint part, const gchar *key,
	gboolean b);		gboolean b);
	skipping to change at line 81		skipping to change at line 80
	void tp_message_set_string_printf (TpMessage *self, guint part,		void tp_message_set_string_printf (TpMessage *self, guint part,
	const gchar *key, const gchar *fmt, ...) G_GNUC_PRINTF (4, 5);		const gchar *key, const gchar *fmt, ...) G_GNUC_PRINTF (4, 5);
	void tp_message_set_bytes (TpMessage *self, guint part, const gchar *key,		void tp_message_set_bytes (TpMessage *self, guint part, const gchar *key,
	guint len, gconstpointer bytes);		guint len, gconstpointer bytes);
	void tp_message_set (TpMessage *self, guint part, const gchar *key,		void tp_message_set (TpMessage *self, guint part, const gchar *key,
	const GValue *source);		const GValue *source);
	_TP_AVAILABLE_IN_0_20		_TP_AVAILABLE_IN_0_20
	void tp_message_set_variant (TpMessage *self, guint part, const gchar *key,		void tp_message_set_variant (TpMessage *self, guint part, const gchar *key,
	GVariant *value);		GVariant *value);
	gchar * tp_message_to_text (TpMessage *message,		gchar * tp_message_to_text (TpMessage *message) G_GNUC_WARN_UNUSED_RESULT;
	TpChannelTextMessageFlags *out_flags) G_GNUC_WARN_UNUSED_RESULT;
	#ifndef TP_DISABLE_DEPRECATED
	/* Takes a TpCMMessage */
	_TP_DEPRECATED_FOR (tp_cm_message_set_sender)
	void tp_message_set_handle (TpMessage *self, guint part, const gchar *key,
	TpHandleType handle_type, TpHandle handle_or_0);
	_TP_DEPRECATED_FOR (tp_cm_message_take_message)
	void tp_message_take_message (TpMessage *self, guint part, const gchar *key
	,
	TpMessage *message);
	_TP_DEPRECATED_FOR (tp_cm_message_set_sender)
	void tp_message_ref_handle (TpMessage *self, TpHandleType handle_type,
	TpHandle handle);
	#endif
	gboolean tp_message_is_mutable (TpMessage *self);		gboolean tp_message_is_mutable (TpMessage *self);
	TpChannelTextMessageType tp_message_get_message_type (TpMessage *self);		TpChannelTextMessageType tp_message_get_message_type (TpMessage *self);
	const gchar *tp_message_get_token (TpMessage *self);		const gchar *tp_message_get_token (TpMessage *self);
	gint64 tp_message_get_sent_timestamp (TpMessage *self);		gint64 tp_message_get_sent_timestamp (TpMessage *self);
	gint64 tp_message_get_received_timestamp (TpMessage *self);		gint64 tp_message_get_received_timestamp (TpMessage *self);
	gboolean tp_message_is_scrollback (TpMessage *self);		gboolean tp_message_is_scrollback (TpMessage *self);
	gboolean tp_message_is_rescued (TpMessage *self);		gboolean tp_message_is_rescued (TpMessage *self);
	const gchar *tp_message_get_supersedes (TpMessage *self);		const gchar *tp_message_get_supersedes (TpMessage *self);
End of changes. 3 change blocks.
	23 lines changed or deleted		3 lines changed or added

	observe-channels-context.h		observe-channels-context.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef __TP_OBSERVE_CHANNELS_CONTEXT_H__		#ifndef __TP_OBSERVE_CHANNELS_CONTEXT_H__
	#define __TP_OBSERVE_CHANNELS_CONTEXT_H__		#define __TP_OBSERVE_CHANNELS_CONTEXT_H__
	#include <gio/gio.h>		#include <gio/gio.h>
	#include <glib-object.h>		#include <glib-object.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
End of changes. 1 change blocks.
	4 lines changed or deleted		2 lines changed or added

	presence-mixin.h		presence-mixin.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef __TP_PRESENCE_MIXIN_H__		#ifndef __TP_PRESENCE_MIXIN_H__
	#define __TP_PRESENCE_MIXIN_H__		#define __TP_PRESENCE_MIXIN_H__
	#include <telepathy-glib/enums.h>		#include <telepathy-glib/enums.h>
	#include <telepathy-glib/handle.h>		#include <telepathy-glib/handle.h>
	#include <telepathy-glib/svc-connection.h>
	#include "util.h"		#include "util.h"
	G_BEGIN_DECLS		G_BEGIN_DECLS
	typedef struct _TpPresenceStatusOptionalArgumentSpec		typedef struct _TpPresenceStatusOptionalArgumentSpec
	TpPresenceStatusOptionalArgumentSpec;		TpPresenceStatusOptionalArgumentSpec;
	typedef struct _TpPresenceStatusSpec TpPresenceStatusSpec;		typedef struct _TpPresenceStatusSpec TpPresenceStatusSpec;
	typedef struct _TpPresenceStatusSpecPrivate TpPresenceStatusSpecPrivate;
	struct _TpPresenceStatusOptionalArgumentSpec {		struct _TpPresenceStatusOptionalArgumentSpec {
	const gchar *name;		const gchar *name;
	const gchar *dtype;		const gchar *dtype;
	/*<private>*/		/*<private>*/
	gpointer _future1;		gpointer _future1;
	gpointer _future2;		gpointer _future2;
	};		};
	struct _TpPresenceStatusSpec {		struct _TpPresenceStatusSpec {
	const gchar *name;		const gchar *name;
	TpConnectionPresenceType presence_type;		TpConnectionPresenceType presence_type;
	gboolean self;		gboolean self;
	const TpPresenceStatusOptionalArgumentSpec *optional_arguments;		const TpPresenceStatusOptionalArgumentSpec *optional_arguments;
	/*<private>*/		/*<private>*/
	gpointer _future1;		gpointer _future1;
	TpPresenceStatusSpecPrivate *priv;		gpointer _future2;
	};		};
	_TP_AVAILABLE_IN_0_24
	TpConnectionPresenceType tp_presence_status_spec_get_presence_type (
	const TpPresenceStatusSpec *self);
	_TP_AVAILABLE_IN_0_24
	const gchar *tp_presence_status_spec_get_name (
	const TpPresenceStatusSpec *self);
	_TP_AVAILABLE_IN_0_24
	gboolean tp_presence_status_spec_can_set_on_self (
	const TpPresenceStatusSpec *self);
	_TP_AVAILABLE_IN_0_24
	gboolean tp_presence_status_spec_has_message (
	const TpPresenceStatusSpec *self);
	_TP_AVAILABLE_IN_0_24
	GType tp_presence_status_spec_get_type (void);
	_TP_AVAILABLE_IN_0_24
	TpPresenceStatusSpec *tp_presence_status_spec_new (const gchar *name,
	TpConnectionPresenceType type,
	gboolean can_set_on_self,
	gboolean has_message);
	_TP_AVAILABLE_IN_0_24
	TpPresenceStatusSpec *tp_presence_status_spec_copy (
	const TpPresenceStatusSpec *self);
	_TP_AVAILABLE_IN_0_24
	void tp_presence_status_spec_free (TpPresenceStatusSpec *self);
	typedef struct _TpPresenceStatus TpPresenceStatus;		typedef struct _TpPresenceStatus TpPresenceStatus;
	struct _TpPresenceStatus {		struct _TpPresenceStatus {
	guint index;		guint index;
	GHashTable *optional_arguments;		GHashTable *optional_arguments;
	/*<private>*/		/*<private>*/
	gpointer _future1;		gpointer _future1;
	gpointer _future2;		gpointer _future2;
	};		};
	TpPresenceStatus *tp_presence_status_new (guint which,		TpPresenceStatus *tp_presence_status_new (guint which,
	GHashTable *optional_arguments) G_GNUC_WARN_UNUSED_RESULT;		GHashTable *optional_arguments) G_GNUC_WARN_UNUSED_RESULT;
	void tp_presence_status_free (TpPresenceStatus *status);		void tp_presence_status_free (TpPresenceStatus *status);
	typedef gboolean (*TpPresenceMixinStatusAvailableFunc) (GObject *obj,		typedef gboolean (*TpPresenceMixinStatusAvailableFunc) (GObject *obj,
	guint which);		guint which);
	typedef GHashTable *(*TpPresenceMixinGetContactStatusesFunc) (GObject *obj,		typedef GHashTable *(*TpPresenceMixinGetContactStatusesFunc) (GObject *obj,
	const GArray *contacts, GError **error);		const GArray *contacts);
	typedef gboolean (*TpPresenceMixinSetOwnStatusFunc) (GObject *obj,		typedef gboolean (*TpPresenceMixinSetOwnStatusFunc) (GObject *obj,
	const TpPresenceStatus *status, GError **error);		const TpPresenceStatus *status, GError **error);
	typedef guint (*TpPresenceMixinGetMaximumStatusMessageLengthFunc) (		typedef guint (*TpPresenceMixinGetMaximumStatusMessageLengthFunc) (
	GObject *obj);		GObject *obj);
	typedef struct _TpPresenceMixinClass TpPresenceMixinClass;		typedef struct _TpPresenceMixinClass TpPresenceMixinClass;
	typedef struct _TpPresenceMixinClassPrivate TpPresenceMixinClassPrivate;		typedef struct _TpPresenceMixinClassPrivate TpPresenceMixinClassPrivate;
	typedef struct _TpPresenceMixin TpPresenceMixin;		typedef struct _TpPresenceMixin TpPresenceMixin;
	skipping to change at line 181		skipping to change at line 147
	void tp_presence_mixin_init (GObject *obj, glong offset);		void tp_presence_mixin_init (GObject *obj, glong offset);
	void tp_presence_mixin_finalize (GObject *obj);		void tp_presence_mixin_finalize (GObject *obj);
	void tp_presence_mixin_emit_presence_update (GObject *obj,		void tp_presence_mixin_emit_presence_update (GObject *obj,
	GHashTable *contact_presences);		GHashTable *contact_presences);
	void tp_presence_mixin_emit_one_presence_update (GObject *obj,		void tp_presence_mixin_emit_one_presence_update (GObject *obj,
	TpHandle handle, const TpPresenceStatus *status);		TpHandle handle, const TpPresenceStatus *status);
	void tp_presence_mixin_iface_init (gpointer g_iface, gpointer iface_data);		void tp_presence_mixin_iface_init (gpointer g_iface, gpointer iface_data);
	void tp_presence_mixin_simple_presence_iface_init (gpointer g_iface, gpoint		void tp_presence_mixin_init_dbus_properties (GObjectClass *cls);
	er iface_data);
	void tp_presence_mixin_simple_presence_init_dbus_properties (GObjectClass *
	cls);
	void tp_presence_mixin_simple_presence_register_with_contacts_mixin (		void tp_presence_mixin_register_with_contacts_mixin (
	GObject *obj);		GObject *obj);
	G_END_DECLS		G_END_DECLS
	#endif /* #ifndef __TP_PRESENCE_MIXIN_H__ */		#endif /* #ifndef __TP_PRESENCE_MIXIN_H__ */
End of changes. 8 change blocks.
	45 lines changed or deleted		6 lines changed or added

	protocol.h		protocol.h
	skipping to change at line 20		skipping to change at line 20
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef TP_PROTOCOL_H		#ifndef TP_PROTOCOL_H
	#define TP_PROTOCOL_H		#define TP_PROTOCOL_H
	#include <glib-object.h>		#include <glib-object.h>
	#include <telepathy-glib/capabilities.h>		#include <telepathy-glib/capabilities.h>
	#include <telepathy-glib/connection.h>		#include <telepathy-glib/connection.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	#include <telepathy-glib/proxy.h>		#include <telepathy-glib/proxy.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	typedef struct _TpConnectionManagerParam TpConnectionManagerParam;		typedef struct _TpConnectionManagerParam TpConnectionManagerParam;
	struct _TpConnectionManagerParam
	{
	/*<private>*/
	gchar *_TP_SEAL (name);
	gchar *_TP_SEAL (dbus_signature);
	GValue _TP_SEAL (default_value);
	guint _TP_SEAL (flags);
	gpointer _TP_SEAL (priv);
	};
	typedef struct _TpProtocol TpProtocol;		typedef struct _TpProtocol TpProtocol;
	typedef struct _TpProtocolClass TpProtocolClass;		typedef struct _TpProtocolClass TpProtocolClass;
	typedef struct _TpProtocolPrivate TpProtocolPrivate;		typedef struct _TpProtocolPrivate TpProtocolPrivate;
	typedef struct _TpProtocolClassPrivate TpProtocolClassPrivate;		typedef struct _TpProtocolClassPrivate TpProtocolClassPrivate;
	GType tp_protocol_get_type (void) G_GNUC_CONST;		GType tp_protocol_get_type (void) G_GNUC_CONST;
	#define TP_TYPE_PROTOCOL \		#define TP_TYPE_PROTOCOL \
	(tp_protocol_get_type ())		(tp_protocol_get_type ())
	#define TP_PROTOCOL(obj) \		#define TP_PROTOCOL(obj) \
	skipping to change at line 84		skipping to change at line 74
	TpProxy parent;		TpProxy parent;
	TpProtocolPrivate *priv;		TpProtocolPrivate *priv;
	};		};
	void tp_protocol_init_known_interfaces (void);		void tp_protocol_init_known_interfaces (void);
	TpProtocol *tp_protocol_new (TpDBusDaemon *dbus, const gchar *cm_name,		TpProtocol *tp_protocol_new (TpDBusDaemon *dbus, const gchar *cm_name,
	const gchar *protocol_name, const GHashTable *immutable_properties,		const gchar *protocol_name, const GHashTable *immutable_properties,
	GError **error);		GError **error);
	_TP_AVAILABLE_IN_0_24
	TpProtocol * tp_protocol_new_vardict (TpDBusDaemon *dbus,
	const gchar *cm_name,
	const gchar *protocol_name,
	GVariant *immutable_properties,
	GError **error);
	const gchar *tp_protocol_get_name (TpProtocol *self);		const gchar *tp_protocol_get_name (TpProtocol *self);
	_TP_AVAILABLE_IN_0_20		_TP_AVAILABLE_IN_0_20
	const gchar *tp_protocol_get_cm_name (TpProtocol *self);		const gchar *tp_protocol_get_cm_name (TpProtocol *self);
	#define TP_PROTOCOL_FEATURE_PARAMETERS \		#define TP_PROTOCOL_FEATURE_PARAMETERS \
	(tp_protocol_get_feature_quark_parameters ())		(tp_protocol_get_feature_quark_parameters ())
	GQuark tp_protocol_get_feature_quark_parameters (void) G_GNUC_CONST;		GQuark tp_protocol_get_feature_quark_parameters (void) G_GNUC_CONST;
	const TpConnectionManagerParam *tp_protocol_get_param (TpProtocol *self,		const TpConnectionManagerParam *tp_protocol_get_param (TpProtocol *self,
	const gchar *param);		const gchar *param);
	_TP_AVAILABLE_IN_0_18		_TP_AVAILABLE_IN_0_18
	TpConnectionManagerParam *tp_protocol_dup_param (TpProtocol *self,		TpConnectionManagerParam *tp_protocol_dup_param (TpProtocol *self,
	const gchar *param);		const gchar *param);
	gboolean tp_protocol_has_param (TpProtocol *self,		gboolean tp_protocol_has_param (TpProtocol *self,
	const gchar *param);		const gchar *param);
	gboolean tp_protocol_can_register (TpProtocol *self);		gboolean tp_protocol_can_register (TpProtocol *self);
	GStrv tp_protocol_dup_param_names (TpProtocol *self) G_GNUC_WARN_UNUSED_RES ULT;		GStrv tp_protocol_dup_param_names (TpProtocol *self) G_GNUC_WARN_UNUSED_RES ULT;
	_TP_AVAILABLE_IN_0_18		_TP_AVAILABLE_IN_0_18
	GList *tp_protocol_dup_params (TpProtocol *self) G_GNUC_WARN_UNUSED_RESULT;		GList *tp_protocol_dup_params (TpProtocol *self) G_GNUC_WARN_UNUSED_RESULT;
			_TP_AVAILABLE_IN_1_0
	_TP_AVAILABLE_IN_0_24		GPtrArray *tp_protocol_get_params (TpProtocol *self);
	GVariant * tp_protocol_dup_immutable_properties (TpProtocol *self);
	#ifndef TP_DISABLE_DEPRECATED
	_TP_DEPRECATED_IN_0_20_FOR(tp_protocol_dup_params)
	_TP_AVAILABLE_IN_0_18
	const TpConnectionManagerParam *tp_protocol_borrow_params (TpProtocol *self
	)
	G_GNUC_WARN_UNUSED_RESULT;
	#endif
	const gchar * const *		const gchar * const *
	/* gtk-doc sucks */		/* gtk-doc sucks */
	tp_protocol_get_authentication_types (TpProtocol *self);		tp_protocol_get_authentication_types (TpProtocol *self);
	_TP_AVAILABLE_IN_0_24
	const gchar * const *
	/* ... */
	tp_protocol_get_addressable_vcard_fields (TpProtocol *self);
	_TP_AVAILABLE_IN_0_24
	const gchar * const *
	/* ... */
	tp_protocol_get_addressable_uri_schemes (TpProtocol *self);
	_TP_AVAILABLE_IN_0_24
	GList *tp_protocol_dup_presence_statuses (TpProtocol *self)
	G_GNUC_WARN_UNUSED_RESULT;
	#define TP_PROTOCOL_FEATURE_CORE \		#define TP_PROTOCOL_FEATURE_CORE \
	(tp_protocol_get_feature_quark_core ())		(tp_protocol_get_feature_quark_core ())
	GQuark tp_protocol_get_feature_quark_core (void) G_GNUC_CONST;		GQuark tp_protocol_get_feature_quark_core (void) G_GNUC_CONST;
	const gchar *tp_protocol_get_vcard_field (TpProtocol *self);		const gchar *tp_protocol_get_vcard_field (TpProtocol *self);
	const gchar *tp_protocol_get_english_name (TpProtocol *self);		const gchar *tp_protocol_get_english_name (TpProtocol *self);
	const gchar *tp_protocol_get_icon_name (TpProtocol *self);		const gchar *tp_protocol_get_icon_name (TpProtocol *self);
	TpCapabilities *tp_protocol_get_capabilities (TpProtocol *self);		TpCapabilities *tp_protocol_get_capabilities (TpProtocol *self);
	_TP_AVAILABLE_IN_0_16		_TP_AVAILABLE_IN_0_16
	TpAvatarRequirements * tp_protocol_get_avatar_requirements (TpProtocol *sel f);		TpAvatarRequirements * tp_protocol_get_avatar_requirements (TpProtocol *sel f);
	_TP_AVAILABLE_IN_0_24
	void tp_protocol_normalize_contact_async (TpProtocol *self,
	const gchar *contact,
	GCancellable *cancellable,
	GAsyncReadyCallback callback,
	gpointer user_data);
	_TP_AVAILABLE_IN_0_24
	gchar *tp_protocol_normalize_contact_finish (TpProtocol *self,
	GAsyncResult *result,
	GError **error);
	_TP_AVAILABLE_IN_0_24
	void tp_protocol_identify_account_async (TpProtocol *self,
	GVariant *vardict,
	GCancellable *cancellable,
	GAsyncReadyCallback callback,
	gpointer user_data);
	_TP_AVAILABLE_IN_0_24
	gchar *tp_protocol_identify_account_finish (TpProtocol *self,
	GAsyncResult *result,
	GError **error);
	_TP_AVAILABLE_IN_0_24
	void tp_protocol_normalize_contact_uri_async (TpProtocol *self,
	const gchar *uri,
	GCancellable *cancellable,
	GAsyncReadyCallback callback,
	gpointer user_data);
	_TP_AVAILABLE_IN_0_24
	gchar *tp_protocol_normalize_contact_uri_finish (TpProtocol *self,
	GAsyncResult *result,
	GError **error);
	_TP_AVAILABLE_IN_0_24
	void tp_protocol_normalize_vcard_address_async (TpProtocol *self,
	const gchar *field,
	const gchar *value,
	GCancellable *cancellable,
	GAsyncReadyCallback callback,
	gpointer user_data);
	_TP_AVAILABLE_IN_0_24
	gchar *tp_protocol_normalize_vcard_address_finish (TpProtocol *self,
	GAsyncResult *result,
	GError **error);
	G_END_DECLS		G_END_DECLS
	#include <telepathy-glib/_gen/tp-cli-protocol.h>
	#endif		#endif
End of changes. 7 change blocks.
	97 lines changed or deleted		4 lines changed or added

	proxy-subclass.h		proxy-subclass.h
	skipping to change at line 26		skipping to change at line 26
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#ifndef __TP_PROXY_SUBCLASS_H__		#ifndef __TP_PROXY_SUBCLASS_H__
	#define __TP_PROXY_SUBCLASS_H__		#define __TP_PROXY_SUBCLASS_H__
	#define _TP_IN_META_HEADER		#define _TP_GLIB_H_INSIDE
	#include <telepathy-glib/proxy.h>		#include <telepathy-glib/proxy.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	typedef void (*TpProxyInvokeFunc) (TpProxy *self,		typedef void (*TpProxyInvokeFunc) (TpProxy *self,
	GError *error, GValueArray *args, GCallback callback, gpointer user_dat a,		GError *error, GValueArray *args, GCallback callback, gpointer user_dat a,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_proxy_pending_call_v0_new (TpProxy *self,		TpProxyPendingCall *tp_proxy_pending_call_v0_new (TpProxy *self,
	skipping to change at line 66		skipping to change at line 66
	void tp_proxy_signal_connection_v0_take_results		void tp_proxy_signal_connection_v0_take_results
	(TpProxySignalConnection *sc, GValueArray *args);		(TpProxySignalConnection *sc, GValueArray *args);
	typedef void (*TpProxyInterfaceAddedCb) (TpProxy *self,		typedef void (*TpProxyInterfaceAddedCb) (TpProxy *self,
	guint quark, DBusGProxy *proxy, gpointer unused);		guint quark, DBusGProxy *proxy, gpointer unused);
	void tp_proxy_or_subclass_hook_on_interface_add (GType proxy_or_subclass,		void tp_proxy_or_subclass_hook_on_interface_add (GType proxy_or_subclass,
	TpProxyInterfaceAddedCb callback);		TpProxyInterfaceAddedCb callback);
	#ifndef TP_DISABLE_DEPRECATED
	_TP_DEPRECATED_IN_0_20_FOR(tp_proxy_get_interface_by_id)
	DBusGProxy *tp_proxy_borrow_interface_by_id (TpProxy *self, GQuark iface,
	GError **error);
	#endif
	_TP_AVAILABLE_IN_0_20		_TP_AVAILABLE_IN_0_20
	DBusGProxy *tp_proxy_get_interface_by_id (TpProxy *self, GQuark iface,		DBusGProxy *tp_proxy_get_interface_by_id (TpProxy *self, GQuark iface,
	GError **error);		GError **error);
	DBusGProxy *tp_proxy_add_interface_by_id (TpProxy *self, GQuark iface);		void tp_proxy_add_interface_by_id (TpProxy *self, GQuark iface);
	void tp_proxy_add_interfaces (TpProxy *self, const gchar * const *interface s);		void tp_proxy_add_interfaces (TpProxy *self, const gchar * const *interface s);
	void tp_proxy_invalidate (TpProxy *self, const GError *error);		void tp_proxy_invalidate (TpProxy *self, const GError *error);
	void tp_proxy_subclass_add_error_mapping (GType proxy_subclass,		void tp_proxy_subclass_add_error_mapping (GType proxy_subclass,
	const gchar *static_prefix, GQuark domain, GType code_enum_type);		const gchar *static_prefix, GQuark domain, GType code_enum_type);
	gboolean tp_proxy_dbus_g_proxy_claim_for_signal_adding (DBusGProxy *proxy);		gboolean tp_proxy_dbus_g_proxy_claim_for_signal_adding (DBusGProxy *proxy);
	void tp_proxy_init_known_interfaces (void);		void tp_proxy_init_known_interfaces (void);
	G_END_DECLS		G_END_DECLS
	#undef _TP_IN_META_HEADER		#undef _TP_GLIB_H_INSIDE
	#endif /* #ifndef __TP_PROXY_SUBCLASS_H__*/		#endif /* #ifndef __TP_PROXY_SUBCLASS_H__*/
End of changes. 4 change blocks.
	9 lines changed or deleted		3 lines changed or added

	proxy.h		proxy.h
	skipping to change at line 22		skipping to change at line 22
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef __TP_PROXY_H__		#ifndef __TP_PROXY_H__
	#define __TP_PROXY_H__		#define __TP_PROXY_H__
	#include <dbus/dbus-glib.h>		#include <dbus/dbus-glib.h>
	#include <gio/gio.h>		#include <gio/gio.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	#include <telepathy-glib/_gen/genums.h>		#include <telepathy-glib/_gen/genums.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	/* Forward declaration of a subclass - from dbus.h */		/* Forward declaration of a subclass - from dbus.h */
	typedef struct _TpDBusDaemon TpDBusDaemon;		typedef struct _TpDBusDaemon TpDBusDaemon;
	/* Forward declaration - from simple-client-factory.h */		/* Forward declaration - from client-factory.h */
	typedef struct _TpSimpleClientFactory TpSimpleClientFactory;		typedef struct _TpClientFactory TpClientFactory;
	typedef struct _TpProxyPrivate TpProxyPrivate;		typedef struct _TpProxyPrivate TpProxyPrivate;
	typedef struct _TpProxy TpProxy;		typedef struct _TpProxy TpProxy;
	#define TP_DBUS_ERRORS (tp_dbus_errors_quark ())		#define TP_DBUS_ERRORS (tp_dbus_errors_quark ())
	GQuark tp_dbus_errors_quark (void);		GQuark tp_dbus_errors_quark (void);
	typedef enum {		typedef enum {
	TP_DBUS_ERROR_UNKNOWN_REMOTE_ERROR = 0,		TP_DBUS_ERROR_UNKNOWN_REMOTE_ERROR = 0,
	skipping to change at line 63		skipping to change at line 63
	TP_DBUS_ERROR_NAME_OWNER_LOST = 3,		TP_DBUS_ERROR_NAME_OWNER_LOST = 3,
	TP_DBUS_ERROR_INVALID_BUS_NAME = 4,		TP_DBUS_ERROR_INVALID_BUS_NAME = 4,
	TP_DBUS_ERROR_INVALID_INTERFACE_NAME = 5,		TP_DBUS_ERROR_INVALID_INTERFACE_NAME = 5,
	TP_DBUS_ERROR_INVALID_OBJECT_PATH = 6,		TP_DBUS_ERROR_INVALID_OBJECT_PATH = 6,
	TP_DBUS_ERROR_INVALID_MEMBER_NAME = 7,		TP_DBUS_ERROR_INVALID_MEMBER_NAME = 7,
	TP_DBUS_ERROR_OBJECT_REMOVED = 8,		TP_DBUS_ERROR_OBJECT_REMOVED = 8,
	TP_DBUS_ERROR_CANCELLED = 9,		TP_DBUS_ERROR_CANCELLED = 9,
	TP_DBUS_ERROR_INCONSISTENT = 10,		TP_DBUS_ERROR_INCONSISTENT = 10,
	} TpDBusError;		} TpDBusError;
	#define TP_NUM_DBUS_ERRORS (TP_DBUS_ERROR_INCONSISTENT + 1)		#define TP_NUM_DBUS_ERRORS (TP_DBUS_ERROR_INCONSISTENT + 1)
	#define NUM_TP_DBUS_ERRORS TP_NUM_DBUS_ERRORS
	struct _TpProxy {		struct _TpProxy {
	/*<private>*/		/*<private>*/
	GObject parent;		GObject parent;
	TpDBusDaemon *_TP_SEAL (dbus_daemon);
	DBusGConnection *_TP_SEAL (dbus_connection);
	gchar *_TP_SEAL (bus_name);
	gchar *_TP_SEAL (object_path);
	GError *_TP_SEAL (invalidated);
	TpProxyPrivate *priv;		TpProxyPrivate *priv;
	};		};
	typedef struct _TpProxyClass TpProxyClass;		typedef struct _TpProxyClass TpProxyClass;
	typedef struct _TpProxyFeature TpProxyFeature;		typedef struct _TpProxyFeature TpProxyFeature;
	typedef struct _TpProxyFeaturePrivate TpProxyFeaturePrivate;		typedef struct _TpProxyFeaturePrivate TpProxyFeaturePrivate;
	typedef void (* TpProxyPrepareAsync) (TpProxy *proxy,		typedef void (* TpProxyPrepareAsync) (TpProxy *proxy,
	const TpProxyFeature *feature,		const TpProxyFeature *feature,
	skipping to change at line 165		skipping to change at line 157
	#define TP_IS_PROXY_CLASS(klass) \		#define TP_IS_PROXY_CLASS(klass) \
	(G_TYPE_CHECK_CLASS_TYPE((klass), TP_TYPE_PROXY))		(G_TYPE_CHECK_CLASS_TYPE((klass), TP_TYPE_PROXY))
	#define TP_PROXY_GET_CLASS(obj) \		#define TP_PROXY_GET_CLASS(obj) \
	(G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_PROXY, \		(G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_PROXY, \
	TpProxyClass))		TpProxyClass))
	gboolean tp_proxy_has_interface_by_id (gpointer self, GQuark iface);		gboolean tp_proxy_has_interface_by_id (gpointer self, GQuark iface);
	gboolean tp_proxy_has_interface (gpointer self, const gchar *iface);		gboolean tp_proxy_has_interface (gpointer self, const gchar *iface);
	_TP_AVAILABLE_IN_0_16		_TP_AVAILABLE_IN_0_16
	TpSimpleClientFactory *tp_proxy_get_factory (gpointer self);		TpClientFactory *tp_proxy_get_factory (gpointer self);
	TpDBusDaemon *tp_proxy_get_dbus_daemon (gpointer self);		TpDBusDaemon *tp_proxy_get_dbus_daemon (gpointer self);
	DBusGConnection *tp_proxy_get_dbus_connection (gpointer self);		DBusGConnection *tp_proxy_get_dbus_connection (gpointer self);
	const gchar *tp_proxy_get_bus_name (gpointer self);		const gchar *tp_proxy_get_bus_name (gpointer self);
	const gchar *tp_proxy_get_object_path (gpointer self);		const gchar *tp_proxy_get_object_path (gpointer self);
	const GError *tp_proxy_get_invalidated (gpointer self);		const GError *tp_proxy_get_invalidated (gpointer self);
	skipping to change at line 191		skipping to change at line 183
	void tp_proxy_prepare_async (gpointer self,		void tp_proxy_prepare_async (gpointer self,
	const GQuark *features,		const GQuark *features,
	GAsyncReadyCallback callback,		GAsyncReadyCallback callback,
	gpointer user_data);		gpointer user_data);
	gboolean tp_proxy_prepare_finish (gpointer self,		gboolean tp_proxy_prepare_finish (gpointer self,
	GAsyncResult *result,		GAsyncResult *result,
	GError **error);		GError **error);
	G_END_DECLS		G_END_DECLS
	#include <telepathy-glib/_gen/tp-cli-generic.h>
	#endif /* #ifndef __TP_PROXY_H__*/		#endif /* #ifndef __TP_PROXY_H__*/
End of changes. 6 change blocks.
	17 lines changed or deleted		5 lines changed or added

	room-info.h		room-info.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef __TP_ROOM_INFO_H__		#ifndef __TP_ROOM_INFO_H__
	#define __TP_ROOM_INFO_H__		#define __TP_ROOM_INFO_H__
	#include <glib-object.h>		#include <glib-object.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	#include <telepathy-glib/handle.h>		#include <telepathy-glib/handle.h>
End of changes. 1 change blocks.
	4 lines changed or deleted		2 lines changed or added

	room-list.h		room-list.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef __TP_ROOM_LIST_H__		#ifndef __TP_ROOM_LIST_H__
	#define __TP_ROOM_LIST_H__		#define __TP_ROOM_LIST_H__
	#include <telepathy-glib/channel.h>		#include <telepathy-glib/channel.h>
	#include <telepathy-glib/room-info.h>		#include <telepathy-glib/room-info.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
End of changes. 1 change blocks.
	4 lines changed or deleted		2 lines changed or added

	run.h		run.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef __TP_RUN_H__		#ifndef __TP_RUN_H__
	#define __TP_RUN_H__		#define __TP_RUN_H__
	#include <telepathy-glib/base-connection-manager.h>		#include <telepathy-glib/base-connection-manager.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	int tp_run_connection_manager (const char *prog_name, const char *version,		int tp_run_connection_manager (const char *prog_name, const char *version,
End of changes. 1 change blocks.
	4 lines changed or deleted		2 lines changed or added

	signalled-message.h		signalled-message.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef __TP_SIGNALLED_MESSAGE_H__		#ifndef __TP_SIGNALLED_MESSAGE_H__
	#define __TP_SIGNALLED_MESSAGE_H__		#define __TP_SIGNALLED_MESSAGE_H__
	#include <glib-object.h>		#include <glib-object.h>
	#include <telepathy-glib/contact.h>		#include <telepathy-glib/contact.h>
	#include <telepathy-glib/message.h>		#include <telepathy-glib/message.h>
End of changes. 1 change blocks.
	4 lines changed or deleted		2 lines changed or added

	simple-approver.h		simple-approver.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef __TP_SIMPLE_APPROVER_H__		#ifndef __TP_SIMPLE_APPROVER_H__
	#define __TP_SIMPLE_APPROVER_H__		#define __TP_SIMPLE_APPROVER_H__
	#include <dbus/dbus-glib.h>		#include <dbus/dbus-glib.h>
	#include <glib-object.h>		#include <glib-object.h>
			#include <telepathy-glib/account-manager.h>
	#include <telepathy-glib/base-client.h>		#include <telepathy-glib/base-client.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	typedef struct _TpSimpleApprover TpSimpleApprover;		typedef struct _TpSimpleApprover TpSimpleApprover;
	typedef struct _TpSimpleApproverClass TpSimpleApproverClass;		typedef struct _TpSimpleApproverClass TpSimpleApproverClass;
	typedef struct _TpSimpleApproverPrivate TpSimpleApproverPrivate;		typedef struct _TpSimpleApproverPrivate TpSimpleApproverPrivate;
	struct _TpSimpleApproverClass {		struct _TpSimpleApproverClass {
	skipping to change at line 79		skipping to change at line 80
	typedef void (*TpSimpleApproverAddDispatchOperationImpl) (		typedef void (*TpSimpleApproverAddDispatchOperationImpl) (
	TpSimpleApprover *approver,		TpSimpleApprover *approver,
	TpAccount *account,		TpAccount *account,
	TpConnection *connection,		TpConnection *connection,
	GList *channels,		GList *channels,
	TpChannelDispatchOperation *dispatch_operation,		TpChannelDispatchOperation *dispatch_operation,
	TpAddDispatchOperationContext *context,		TpAddDispatchOperationContext *context,
	gpointer user_data);		gpointer user_data);
	#ifndef TP_DISABLE_DEPRECATED		TpBaseClient * tp_simple_approver_new (TpClientFactory *factory,
	_TP_DEPRECATED_IN_0_16_FOR (tp_simple_approver_new_with_factory)
	TpBaseClient * tp_simple_approver_new (TpDBusDaemon *dbus,
	const gchar *name,		const gchar *name,
	gboolean uniquify,		gboolean uniquify,
	TpSimpleApproverAddDispatchOperationImpl callback,		TpSimpleApproverAddDispatchOperationImpl callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy);		GDestroyNotify destroy);
	#endif
	TpBaseClient *tp_simple_approver_new_with_am (		TpBaseClient *tp_simple_approver_new_with_am (
	TpAccountManager *account_manager,		TpAccountManager *account_manager,
	const gchar *name,		const gchar *name,
	gboolean uniquify,		gboolean uniquify,
	TpSimpleApproverAddDispatchOperationImpl callback,		TpSimpleApproverAddDispatchOperationImpl callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy);		GDestroyNotify destroy);
	_TP_AVAILABLE_IN_0_16
	TpBaseClient *tp_simple_approver_new_with_factory (
	TpSimpleClientFactory *factory,
	const gchar *name,
	gboolean uniquify,
	TpSimpleApproverAddDispatchOperationImpl callback,
	gpointer user_data,
	GDestroyNotify destroy);
	G_END_DECLS		G_END_DECLS
	#endif		#endif
End of changes. 5 change blocks.
	17 lines changed or deleted		4 lines changed or added

	simple-handler.h		simple-handler.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef __TP_SIMPLE_HANDLER_H__		#ifndef __TP_SIMPLE_HANDLER_H__
	#define __TP_SIMPLE_HANDLER_H__		#define __TP_SIMPLE_HANDLER_H__
	#include <dbus/dbus-glib.h>		#include <dbus/dbus-glib.h>
	#include <glib-object.h>		#include <glib-object.h>
			#include <telepathy-glib/account-manager.h>
	#include <telepathy-glib/base-client.h>		#include <telepathy-glib/base-client.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	typedef struct _TpSimpleHandler TpSimpleHandler;		typedef struct _TpSimpleHandler TpSimpleHandler;
	typedef struct _TpSimpleHandlerClass TpSimpleHandlerClass;		typedef struct _TpSimpleHandlerClass TpSimpleHandlerClass;
	typedef struct _TpSimpleHandlerPrivate TpSimpleHandlerPrivate;		typedef struct _TpSimpleHandlerPrivate TpSimpleHandlerPrivate;
	struct _TpSimpleHandlerClass {		struct _TpSimpleHandlerClass {
	skipping to change at line 80		skipping to change at line 81
	typedef void (*TpSimpleHandlerHandleChannelsImpl) (		typedef void (*TpSimpleHandlerHandleChannelsImpl) (
	TpSimpleHandler *handler,		TpSimpleHandler *handler,
	TpAccount *account,		TpAccount *account,
	TpConnection *connection,		TpConnection *connection,
	GList *channels,		GList *channels,
	GList *requests_satisfied,		GList *requests_satisfied,
	gint64 user_action_time,		gint64 user_action_time,
	TpHandleChannelsContext *context,		TpHandleChannelsContext *context,
	gpointer user_data);		gpointer user_data);
	#ifndef TP_DISABLE_DEPRECATED		TpBaseClient *tp_simple_handler_new (TpClientFactory *factory,
	_TP_DEPRECATED_IN_0_16_FOR (tp_simple_handler_new_with_factory)
	TpBaseClient * tp_simple_handler_new (TpDBusDaemon *dbus,
	gboolean bypass_approval,		gboolean bypass_approval,
	gboolean requests,		gboolean requests,
	const gchar *name,		const gchar *name,
	gboolean uniquify,		gboolean uniquify,
	TpSimpleHandlerHandleChannelsImpl callback,		TpSimpleHandlerHandleChannelsImpl callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy);		GDestroyNotify destroy);
	#endif
	TpBaseClient *tp_simple_handler_new_with_am (TpAccountManager *account_mana ger,		TpBaseClient *tp_simple_handler_new_with_am (TpAccountManager *account_mana ger,
	gboolean bypass_approval,		gboolean bypass_approval,
	gboolean requests,		gboolean requests,
	const gchar *name,		const gchar *name,
	gboolean uniquify,		gboolean uniquify,
	TpSimpleHandlerHandleChannelsImpl callback,		TpSimpleHandlerHandleChannelsImpl callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy);		GDestroyNotify destroy);
	_TP_AVAILABLE_IN_0_16
	TpBaseClient *tp_simple_handler_new_with_factory (
	TpSimpleClientFactory *factory,
	gboolean bypass_approval,
	gboolean requests,
	const gchar *name,
	gboolean uniquify,
	TpSimpleHandlerHandleChannelsImpl callback,
	gpointer user_data,
	GDestroyNotify destroy);
	G_END_DECLS		G_END_DECLS
	#endif		#endif
End of changes. 5 change blocks.
	19 lines changed or deleted		4 lines changed or added

	simple-observer.h		simple-observer.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef __TP_SIMPLE_OBSERVER_H__		#ifndef __TP_SIMPLE_OBSERVER_H__
	#define __TP_SIMPLE_OBSERVER_H__		#define __TP_SIMPLE_OBSERVER_H__
	#include <dbus/dbus-glib.h>		#include <dbus/dbus-glib.h>
	#include <glib-object.h>		#include <glib-object.h>
			#include <telepathy-glib/account-manager.h>
	#include <telepathy-glib/base-client.h>		#include <telepathy-glib/base-client.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	typedef struct _TpSimpleObserver TpSimpleObserver;		typedef struct _TpSimpleObserver TpSimpleObserver;
	typedef struct _TpSimpleObserverClass TpSimpleObserverClass;		typedef struct _TpSimpleObserverClass TpSimpleObserverClass;
	typedef struct _TpSimpleObserverPrivate TpSimpleObserverPrivate;		typedef struct _TpSimpleObserverPrivate TpSimpleObserverPrivate;
	struct _TpSimpleObserverClass {		struct _TpSimpleObserverClass {
	skipping to change at line 80		skipping to change at line 81
	typedef void (*TpSimpleObserverObserveChannelsImpl) (		typedef void (*TpSimpleObserverObserveChannelsImpl) (
	TpSimpleObserver *observer,		TpSimpleObserver *observer,
	TpAccount *account,		TpAccount *account,
	TpConnection *connection,		TpConnection *connection,
	GList *channels,		GList *channels,
	TpChannelDispatchOperation *dispatch_operation,		TpChannelDispatchOperation *dispatch_operation,
	GList *requests,		GList *requests,
	TpObserveChannelsContext *context,		TpObserveChannelsContext *context,
	gpointer user_data);		gpointer user_data);
	#ifndef TP_DISABLE_DEPRECATED		TpBaseClient * tp_simple_observer_new (TpClientFactory *factory,
	_TP_DEPRECATED_IN_0_16_FOR (tp_simple_observer_new_with_factory)
	TpBaseClient * tp_simple_observer_new (TpDBusDaemon *dbus,
	gboolean recover,		gboolean recover,
	const gchar *name,		const gchar *name,
	gboolean uniquify,		gboolean uniquify,
	TpSimpleObserverObserveChannelsImpl callback,		TpSimpleObserverObserveChannelsImpl callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy);		GDestroyNotify destroy);
	#endif
	TpBaseClient *tp_simple_observer_new_with_am (		TpBaseClient *tp_simple_observer_new_with_am (
	TpAccountManager *account_manager,		TpAccountManager *account_manager,
	gboolean recover,		gboolean recover,
	const gchar *name,		const gchar *name,
	gboolean uniquify,		gboolean uniquify,
	TpSimpleObserverObserveChannelsImpl callback,		TpSimpleObserverObserveChannelsImpl callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy);		GDestroyNotify destroy);
	_TP_AVAILABLE_IN_0_16
	TpBaseClient *tp_simple_observer_new_with_factory (
	TpSimpleClientFactory *factory,
	gboolean recover,
	const gchar *name,
	gboolean uniquify,
	TpSimpleObserverObserveChannelsImpl callback,
	gpointer user_data,
	GDestroyNotify destroy);
	G_END_DECLS		G_END_DECLS
	#endif		#endif
End of changes. 5 change blocks.
	18 lines changed or deleted		4 lines changed or added

	simple-password-manager.h		simple-password-manager.h
	skipping to change at line 20		skipping to change at line 20
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef __TP_SIMPLE_PASSWORD_MANAGER_H__		#ifndef __TP_SIMPLE_PASSWORD_MANAGER_H__
	#define __TP_SIMPLE_PASSWORD_MANAGER_H__		#define __TP_SIMPLE_PASSWORD_MANAGER_H__
	#include <gio/gio.h>		#include <gio/gio.h>
	#include <telepathy-glib/base-connection.h>		#include <telepathy-glib/base-connection.h>
	#include <telepathy-glib/base-password-channel.h>		#include <telepathy-glib/base-password-channel.h>
End of changes. 1 change blocks.
	4 lines changed or deleted		2 lines changed or added

	stream-tube-channel.h		stream-tube-channel.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef __TP_STREAM_TUBE_CHANNEL_H__		#ifndef __TP_STREAM_TUBE_CHANNEL_H__
	#define __TP_STREAM_TUBE_CHANNEL_H__		#define __TP_STREAM_TUBE_CHANNEL_H__
	#include <telepathy-glib/channel.h>		#include <telepathy-glib/channel.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	/* Forward declaration of a subclass - from stream-tube-connection.h */		/* Forward declaration of a subclass - from stream-tube-connection.h */
	skipping to change at line 62		skipping to change at line 62
	struct _TpStreamTubeChannelClass		struct _TpStreamTubeChannelClass
	{		{
	/*<private>*/		/*<private>*/
	TpChannelClass parent_class;		TpChannelClass parent_class;
	GCallback _padding[7];		GCallback _padding[7];
	};		};
	GType tp_stream_tube_channel_get_type (void);		GType tp_stream_tube_channel_get_type (void);
	_TP_DEPRECATED_IN_0_20_FOR(tp_simple_client_factory_ensure_channel)
	TpStreamTubeChannel *tp_stream_tube_channel_new (TpConnection *conn,
	const gchar *object_path,
	const GHashTable *immutable_properties,
	GError **error);
	const gchar * tp_stream_tube_channel_get_service (TpStreamTubeChannel *self );		const gchar * tp_stream_tube_channel_get_service (TpStreamTubeChannel *self );
	GHashTable * tp_stream_tube_channel_get_parameters (TpStreamTubeChannel *se lf);		GHashTable * tp_stream_tube_channel_get_parameters (TpStreamTubeChannel *se lf);
	_TP_AVAILABLE_IN_0_20		_TP_AVAILABLE_IN_0_20
	GVariant *tp_stream_tube_channel_dup_parameters_vardict (		GVariant *tp_stream_tube_channel_dup_parameters_vardict (
	TpStreamTubeChannel *self);		TpStreamTubeChannel *self);
	/* Incoming tube methods */		/* Incoming tube methods */
End of changes. 2 change blocks.
	10 lines changed or deleted		2 lines changed or added

	stream-tube-connection.h		stream-tube-connection.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef __TP_STREAM_TUBE_CONNECTION_H__		#ifndef __TP_STREAM_TUBE_CONNECTION_H__
	#define __TP_STREAM_TUBE_CONNECTION_H__		#define __TP_STREAM_TUBE_CONNECTION_H__
	#include <glib-object.h>		#include <glib-object.h>
	#include <gio/gio.h>		#include <gio/gio.h>
	#include <telepathy-glib/contact.h>		#include <telepathy-glib/contact.h>
	#include <telepathy-glib/stream-tube-channel.h>		#include <telepathy-glib/stream-tube-channel.h>
End of changes. 1 change blocks.
	4 lines changed or deleted		2 lines changed or added

	svc-account-manager.h		svc-account-manager.h
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)		#if !defined (_TP_GLIB_DBUS_H_INSIDE) && !defined (_TP_COMPILATION)
	#error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directl y."		#error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directl y."
	#endif		#endif
	#ifndef __TP_META_SVC_ACCOUNT_MANAGER_H__		#ifndef __TP_META_SVC_ACCOUNT_MANAGER_H__
	#define __TP_META_SVC_ACCOUNT_MANAGER_H__		#define __TP_META_SVC_ACCOUNT_MANAGER_H__
	#include <telepathy-glib/_gen/tp-svc-account-manager.h>		#include <telepathy-glib/_gen/tp-svc-account-manager.h>
	#endif		#endif
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	svc-account.h		svc-account.h
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)		#if !defined (_TP_GLIB_DBUS_H_INSIDE) && !defined (_TP_COMPILATION)
	#error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directl y."		#error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directl y."
	#endif		#endif
	#ifndef __TP_META_SVC_ACCOUNT_H__		#ifndef __TP_META_SVC_ACCOUNT_H__
	#define __TP_META_SVC_ACCOUNT_H__		#define __TP_META_SVC_ACCOUNT_H__
	#include <telepathy-glib/_gen/tp-svc-account.h>		#include <telepathy-glib/_gen/tp-svc-account.h>
	#endif		#endif
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	svc-call.h		svc-call.h
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)		#if !defined (_TP_GLIB_DBUS_H_INSIDE) && !defined (_TP_COMPILATION)
	#error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directl y."		#error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directl y."
	#endif		#endif
	#ifndef __TP_META_SVC_ACCOUNT_H__		#ifndef __TP_META_SVC_ACCOUNT_H__
	#define __TP_META_SVC_ACCOUNT_H__		#define __TP_META_SVC_ACCOUNT_H__
	#include <telepathy-glib/_gen/tp-svc-call-content.h>		#include <telepathy-glib/_gen/tp-svc-call-content.h>
	#include <telepathy-glib/_gen/tp-svc-call-content-media-description.h>		#include <telepathy-glib/_gen/tp-svc-call-content-media-description.h>
	#include <telepathy-glib/_gen/tp-svc-call-stream.h>		#include <telepathy-glib/_gen/tp-svc-call-stream.h>
	#include <telepathy-glib/_gen/tp-svc-call-stream-endpoint.h>		#include <telepathy-glib/_gen/tp-svc-call-stream-endpoint.h>
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	svc-channel-dispatch-operation.h		svc-channel-dispatch-operation.h
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)		#if !defined (_TP_GLIB_DBUS_H_INSIDE) && !defined (_TP_COMPILATION)
	#error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directl y."		#error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directl y."
	#endif		#endif
	#ifndef __TP_META_SVC_CHANNEL_DISPATCH_OPERATION_H__		#ifndef __TP_META_SVC_CHANNEL_DISPATCH_OPERATION_H__
	#define __TP_META_SVC_CHANNEL_DISPATCH_OPERATION_H__		#define __TP_META_SVC_CHANNEL_DISPATCH_OPERATION_H__
	#include <telepathy-glib/_gen/tp-svc-channel-dispatch-operation.h>		#include <telepathy-glib/_gen/tp-svc-channel-dispatch-operation.h>
	#endif		#endif
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	svc-channel-dispatcher.h		svc-channel-dispatcher.h
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)		#if !defined (_TP_GLIB_DBUS_H_INSIDE) && !defined (_TP_COMPILATION)
	#error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directl y."		#error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directl y."
	#endif		#endif
	#ifndef __TP_META_SVC_CHANNEL_DISPATCHER_H__		#ifndef __TP_META_SVC_CHANNEL_DISPATCHER_H__
	#define __TP_META_SVC_CHANNEL_DISPATCHER_H__		#define __TP_META_SVC_CHANNEL_DISPATCHER_H__
	#include <telepathy-glib/_gen/tp-svc-channel-dispatcher.h>		#include <telepathy-glib/_gen/tp-svc-channel-dispatcher.h>
	#endif		#endif
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	svc-channel-request.h		svc-channel-request.h
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)		#if !defined (_TP_GLIB_DBUS_H_INSIDE) && !defined (_TP_COMPILATION)
	#error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directl y."		#error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directl y."
	#endif		#endif
	#ifndef __TP_META_SVC_CHANNEL_REQUEST_H__		#ifndef __TP_META_SVC_CHANNEL_REQUEST_H__
	#define __TP_META_SVC_CHANNEL_REQUEST_H__		#define __TP_META_SVC_CHANNEL_REQUEST_H__
	#include <telepathy-glib/_gen/tp-svc-channel-request.h>		#include <telepathy-glib/_gen/tp-svc-channel-request.h>
	#endif		#endif
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	svc-channel.h		svc-channel.h
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)		#if !defined (_TP_GLIB_DBUS_H_INSIDE) && !defined (_TP_COMPILATION)
	#error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directl y."		#error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directl y."
	#endif		#endif
	#ifndef __TP_META_SVC_CHANNEL_H__		#ifndef __TP_META_SVC_CHANNEL_H__
	#define __TP_META_SVC_CHANNEL_H__		#define __TP_META_SVC_CHANNEL_H__
	#include <telepathy-glib/_gen/tp-svc-channel.h>		#include <telepathy-glib/_gen/tp-svc-channel.h>
	#endif		#endif
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	svc-client.h		svc-client.h
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_DBUS_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directl
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath		y."
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef __TP_META_SVC_CLIENT_H__		#ifndef __TP_META_SVC_CLIENT_H__
	#define __TP_META_SVC_CLIENT_H__		#define __TP_META_SVC_CLIENT_H__
	#include <telepathy-glib/_gen/tp-svc-client.h>		#include <telepathy-glib/_gen/tp-svc-client.h>
	#endif		#endif
End of changes. 1 change blocks.
	4 lines changed or deleted		3 lines changed or added

	svc-connection-manager.h		svc-connection-manager.h
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)		#if !defined (_TP_GLIB_DBUS_H_INSIDE) && !defined (_TP_COMPILATION)
	#error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directl y."		#error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directl y."
	#endif		#endif
	#ifndef __TP_META_SVC_CONNECTION_MANAGER_H__		#ifndef __TP_META_SVC_CONNECTION_MANAGER_H__
	#define __TP_META_SVC_CONNECTION_MANAGER_H__		#define __TP_META_SVC_CONNECTION_MANAGER_H__
	#include <telepathy-glib/_gen/tp-svc-connection-manager.h>		#include <telepathy-glib/_gen/tp-svc-connection-manager.h>
	#endif		#endif
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	svc-connection.h		svc-connection.h
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)		#if !defined (_TP_GLIB_DBUS_H_INSIDE) && !defined (_TP_COMPILATION)
	#error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directl y."		#error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directl y."
	#endif		#endif
	#ifndef __TP_META_SVC_CONNECTION_H__		#ifndef __TP_META_SVC_CONNECTION_H__
	#define __TP_META_SVC_CONNECTION_H__		#define __TP_META_SVC_CONNECTION_H__
	#include <telepathy-glib/_gen/tp-svc-connection.h>		#include <telepathy-glib/_gen/tp-svc-connection.h>
	#endif		#endif
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	svc-debug.h		svc-debug.h
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)		#if !defined (_TP_GLIB_DBUS_H_INSIDE) && !defined (_TP_COMPILATION)
	#error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directl y."		#error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directl y."
	#endif		#endif
	#ifndef __TP_SVC_DEBUG_H__		#ifndef __TP_SVC_DEBUG_H__
	#define __TP_SVC_DEBUG_H__		#define __TP_SVC_DEBUG_H__
	#include <telepathy-glib/_gen/tp-svc-debug.h>		#include <telepathy-glib/_gen/tp-svc-debug.h>
	#endif		#endif
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	svc-generic.h		svc-generic.h
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_DBUS_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directl
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath		y."
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef __TP_SVC_GENERIC_H__		#ifndef __TP_SVC_GENERIC_H__
	#define __TP_SVC_GENERIC_H__		#define __TP_SVC_GENERIC_H__
	#include <telepathy-glib/_gen/tp-svc-generic.h>		#include <telepathy-glib/_gen/tp-svc-generic.h>
	#endif		#endif
End of changes. 1 change blocks.
	4 lines changed or deleted		3 lines changed or added

	svc-properties-interface.h		svc-properties-interface.h
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)		#if !defined (_TP_GLIB_DBUS_H_INSIDE) && !defined (_TP_COMPILATION)
	#error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directl y."		#error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directl y."
	#endif		#endif
	/* svc-properties-interface is now officially svc-generic */		/* svc-properties-interface is now officially svc-generic */
	#include <telepathy-glib/svc-generic.h>		#include <telepathy-glib/svc-generic.h>
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	svc-protocol.h		svc-protocol.h
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)		#if !defined (_TP_GLIB_DBUS_H_INSIDE) && !defined (_TP_COMPILATION)
	#error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directl y."		#error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directl y."
	#endif		#endif
	#ifndef __TP_META_SVC_PROTOCOL_H__		#ifndef __TP_META_SVC_PROTOCOL_H__
	#define __TP_META_SVC_PROTOCOL_H__		#define __TP_META_SVC_PROTOCOL_H__
	#include <telepathy-glib/_gen/tp-svc-protocol.h>		#include <telepathy-glib/_gen/tp-svc-protocol.h>
	#endif		#endif
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	svc-tls.h		svc-tls.h
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION)		#if !defined (_TP_GLIB_DBUS_H_INSIDE) && !defined (_TP_COMPILATION)
	#error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directl y."		#error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directl y."
	#endif		#endif
	#ifndef __TP_META_SVC_TLS_H__		#ifndef __TP_META_SVC_TLS_H__
	#define __TP_META_SVC_TLS_H__		#define __TP_META_SVC_TLS_H__
	#include <telepathy-glib/_gen/tp-svc-tls-cert.h>		#include <telepathy-glib/_gen/tp-svc-tls-cert.h>
	#endif		#endif
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	telepathy-enums.h		telepathy-enums.h
	skipping to change at line 21		skipping to change at line 21
	TP_CONN_MGR_PARAM_FLAG_REGISTER = 2,		TP_CONN_MGR_PARAM_FLAG_REGISTER = 2,
	TP_CONN_MGR_PARAM_FLAG_HAS_DEFAULT = 4,		TP_CONN_MGR_PARAM_FLAG_HAS_DEFAULT = 4,
	TP_CONN_MGR_PARAM_FLAG_SECRET = 8,		TP_CONN_MGR_PARAM_FLAG_SECRET = 8,
	TP_CONN_MGR_PARAM_FLAG_DBUS_PROPERTY = 16,		TP_CONN_MGR_PARAM_FLAG_DBUS_PROPERTY = 16,
	} TpConnMgrParamFlags;		} TpConnMgrParamFlags;
	typedef enum {		typedef enum {
	TP_HANDLE_TYPE_NONE = 0,		TP_HANDLE_TYPE_NONE = 0,
	TP_HANDLE_TYPE_CONTACT = 1,		TP_HANDLE_TYPE_CONTACT = 1,
	TP_HANDLE_TYPE_ROOM = 2,		TP_HANDLE_TYPE_ROOM = 2,
	TP_HANDLE_TYPE_LIST = 3,
	TP_HANDLE_TYPE_GROUP = 4,
	} TpHandleType;		} TpHandleType;
	#define TP_NUM_HANDLE_TYPES (4+1)		#define TP_NUM_HANDLE_TYPES (2+1)
	#define NUM_TP_HANDLE_TYPES TP_NUM_HANDLE_TYPES
	typedef enum {		typedef enum {
	TP_CONNECTION_STATUS_CONNECTED = 0,		TP_CONNECTION_STATUS_CONNECTED = 0,
	TP_CONNECTION_STATUS_CONNECTING = 1,		TP_CONNECTION_STATUS_CONNECTING = 1,
	TP_CONNECTION_STATUS_DISCONNECTED = 2,		TP_CONNECTION_STATUS_DISCONNECTED = 2,
	} TpConnectionStatus;		} TpConnectionStatus;
	#define TP_NUM_CONNECTION_STATUSES (2+1)		#define TP_NUM_CONNECTION_STATUSES (2+1)
	#define NUM_TP_CONNECTION_STATUSES TP_NUM_CONNECTION_STATUSES
	typedef enum {		typedef enum {
	TP_CONNECTION_STATUS_REASON_NONE_SPECIFIED = 0,		TP_CONNECTION_STATUS_REASON_NONE_SPECIFIED = 0,
	TP_CONNECTION_STATUS_REASON_REQUESTED = 1,		TP_CONNECTION_STATUS_REASON_REQUESTED = 1,
	TP_CONNECTION_STATUS_REASON_NETWORK_ERROR = 2,		TP_CONNECTION_STATUS_REASON_NETWORK_ERROR = 2,
	TP_CONNECTION_STATUS_REASON_AUTHENTICATION_FAILED = 3,		TP_CONNECTION_STATUS_REASON_AUTHENTICATION_FAILED = 3,
	TP_CONNECTION_STATUS_REASON_ENCRYPTION_ERROR = 4,		TP_CONNECTION_STATUS_REASON_ENCRYPTION_ERROR = 4,
	TP_CONNECTION_STATUS_REASON_NAME_IN_USE = 5,		TP_CONNECTION_STATUS_REASON_NAME_IN_USE = 5,
	TP_CONNECTION_STATUS_REASON_CERT_NOT_PROVIDED = 6,		TP_CONNECTION_STATUS_REASON_CERT_NOT_PROVIDED = 6,
	TP_CONNECTION_STATUS_REASON_CERT_UNTRUSTED = 7,		TP_CONNECTION_STATUS_REASON_CERT_UNTRUSTED = 7,
	skipping to change at line 55		skipping to change at line 51
	TP_CONNECTION_STATUS_REASON_CERT_NOT_ACTIVATED = 9,		TP_CONNECTION_STATUS_REASON_CERT_NOT_ACTIVATED = 9,
	TP_CONNECTION_STATUS_REASON_CERT_HOSTNAME_MISMATCH = 10,		TP_CONNECTION_STATUS_REASON_CERT_HOSTNAME_MISMATCH = 10,
	TP_CONNECTION_STATUS_REASON_CERT_FINGERPRINT_MISMATCH = 11,		TP_CONNECTION_STATUS_REASON_CERT_FINGERPRINT_MISMATCH = 11,
	TP_CONNECTION_STATUS_REASON_CERT_SELF_SIGNED = 12,		TP_CONNECTION_STATUS_REASON_CERT_SELF_SIGNED = 12,
	TP_CONNECTION_STATUS_REASON_CERT_OTHER_ERROR = 13,		TP_CONNECTION_STATUS_REASON_CERT_OTHER_ERROR = 13,
	TP_CONNECTION_STATUS_REASON_CERT_REVOKED = 14,		TP_CONNECTION_STATUS_REASON_CERT_REVOKED = 14,
	TP_CONNECTION_STATUS_REASON_CERT_INSECURE = 15,		TP_CONNECTION_STATUS_REASON_CERT_INSECURE = 15,
	TP_CONNECTION_STATUS_REASON_CERT_LIMIT_EXCEEDED = 16,		TP_CONNECTION_STATUS_REASON_CERT_LIMIT_EXCEEDED = 16,
	} TpConnectionStatusReason;		} TpConnectionStatusReason;
	#define TP_NUM_CONNECTION_STATUS_REASONS (16+1)		#define TP_NUM_CONNECTION_STATUS_REASONS (16+1)
	#define NUM_TP_CONNECTION_STATUS_REASONS TP_NUM_CONNECTION_STATUS_REASONS
	typedef enum /*< flags >*/ {		typedef enum /*< flags >*/ {
	TP_CONNECTION_ALIAS_FLAG_USER_SET = 1,		TP_CONNECTION_ALIAS_FLAG_USER_SET = 1,
	} TpConnectionAliasFlags;		} TpConnectionAliasFlags;
	typedef enum /*< flags >*/ {		typedef enum /*< flags >*/ {
	TP_ANONYMITY_MODE_CLIENT_INFO = 1,		TP_ANONYMITY_MODE_CLIENT_INFO = 1,
	TP_ANONYMITY_MODE_SHOW_CLIENT_INFO = 2,		TP_ANONYMITY_MODE_SHOW_CLIENT_INFO = 2,
	TP_ANONYMITY_MODE_NETWORK_INFO = 4,		TP_ANONYMITY_MODE_NETWORK_INFO = 4,
	} TpAnonymityModeFlags;		} TpAnonymityModeFlags;
	typedef enum /*< flags >*/ {		typedef enum /*< flags >*/ {
	TP_CONNECTION_CAPABILITY_FLAG_CREATE = 1,
	TP_CONNECTION_CAPABILITY_FLAG_INVITE = 2,
	} TpConnectionCapabilityFlags;
	typedef enum /*< flags >*/ {
	TP_CONTACT_BLOCKING_CAPABILITY_CAN_REPORT_ABUSIVE = 1,		TP_CONTACT_BLOCKING_CAPABILITY_CAN_REPORT_ABUSIVE = 1,
	} TpContactBlockingCapabilities;		} TpContactBlockingCapabilities;
	typedef enum /*< flags >*/ {		typedef enum /*< flags >*/ {
	TP_CONTACT_INFO_FLAG_CAN_SET = 1,		TP_CONTACT_INFO_FLAG_CAN_SET = 1,
	TP_CONTACT_INFO_FLAG_PUSH = 2,		TP_CONTACT_INFO_FLAG_PUSH = 2,
	} TpContactInfoFlags;		} TpContactInfoFlags;
	typedef enum /*< flags >*/ {		typedef enum /*< flags >*/ {
	TP_CONTACT_INFO_FIELD_FLAG_PARAMETERS_EXACT = 1,		TP_CONTACT_INFO_FIELD_FLAG_PARAMETERS_EXACT = 1,
	TP_CONTACT_INFO_FIELD_FLAG_OVERWRITTEN_BY_NICKNAME = 2,		TP_CONTACT_INFO_FIELD_FLAG_OVERWRITTEN_BY_NICKNAME = 2,
	} TpContactInfoFieldFlags;		} TpContactInfoFieldFlags;
	typedef enum {		typedef enum {
	TP_CONTACT_LIST_STATE_NONE = 0,		TP_CONTACT_LIST_STATE_NONE = 0,
	TP_CONTACT_LIST_STATE_WAITING = 1,		TP_CONTACT_LIST_STATE_WAITING = 1,
	TP_CONTACT_LIST_STATE_FAILURE = 2,		TP_CONTACT_LIST_STATE_FAILURE = 2,
	TP_CONTACT_LIST_STATE_SUCCESS = 3,		TP_CONTACT_LIST_STATE_SUCCESS = 3,
	} TpContactListState;		} TpContactListState;
	#define TP_NUM_CONTACT_LIST_STATES (3+1)		#define TP_NUM_CONTACT_LIST_STATES (3+1)
	#define NUM_TP_CONTACT_LIST_STATES TP_NUM_CONTACT_LIST_STATES
	typedef enum {		typedef enum {
	TP_SUBSCRIPTION_STATE_UNKNOWN = 0,		TP_SUBSCRIPTION_STATE_UNKNOWN = 0,
	TP_SUBSCRIPTION_STATE_NO = 1,		TP_SUBSCRIPTION_STATE_NO = 1,
	TP_SUBSCRIPTION_STATE_REMOVED_REMOTELY = 2,		TP_SUBSCRIPTION_STATE_REMOVED_REMOTELY = 2,
	TP_SUBSCRIPTION_STATE_ASK = 3,		TP_SUBSCRIPTION_STATE_ASK = 3,
	TP_SUBSCRIPTION_STATE_YES = 4,		TP_SUBSCRIPTION_STATE_YES = 4,
	} TpSubscriptionState;		} TpSubscriptionState;
	#define TP_NUM_SUBSCRIPTION_STATES (4+1)		#define TP_NUM_SUBSCRIPTION_STATES (4+1)
	#define NUM_TP_SUBSCRIPTION_STATES TP_NUM_SUBSCRIPTION_STATES
	typedef enum {		typedef enum {
	TP_CONTACT_METADATA_STORAGE_TYPE_NONE = 0,		TP_CONTACT_METADATA_STORAGE_TYPE_NONE = 0,
	TP_CONTACT_METADATA_STORAGE_TYPE_SUBSCRIBED_OR_PENDING = 1,		TP_CONTACT_METADATA_STORAGE_TYPE_SUBSCRIBED_OR_PENDING = 1,
	TP_CONTACT_METADATA_STORAGE_TYPE_SUBSCRIBED = 2,		TP_CONTACT_METADATA_STORAGE_TYPE_SUBSCRIBED = 2,
	TP_CONTACT_METADATA_STORAGE_TYPE_ANYONE = 3,		TP_CONTACT_METADATA_STORAGE_TYPE_ANYONE = 3,
	} TpContactMetadataStorageType;		} TpContactMetadataStorageType;
	#define TP_NUM_CONTACT_METADATA_STORAGE_TYPES (3+1)		#define TP_NUM_CONTACT_METADATA_STORAGE_TYPES (3+1)
	#define NUM_TP_CONTACT_METADATA_STORAGE_TYPES TP_NUM_CONTACT_METADATA_STORA GE_TYPES
	typedef enum {		typedef enum {
	TP_CONNECTION_PRESENCE_TYPE_UNSET = 0,		TP_CONNECTION_PRESENCE_TYPE_UNSET = 0,
	TP_CONNECTION_PRESENCE_TYPE_OFFLINE = 1,		TP_CONNECTION_PRESENCE_TYPE_OFFLINE = 1,
	TP_CONNECTION_PRESENCE_TYPE_AVAILABLE = 2,		TP_CONNECTION_PRESENCE_TYPE_AVAILABLE = 2,
	TP_CONNECTION_PRESENCE_TYPE_AWAY = 3,		TP_CONNECTION_PRESENCE_TYPE_AWAY = 3,
	TP_CONNECTION_PRESENCE_TYPE_EXTENDED_AWAY = 4,		TP_CONNECTION_PRESENCE_TYPE_EXTENDED_AWAY = 4,
	TP_CONNECTION_PRESENCE_TYPE_HIDDEN = 5,		TP_CONNECTION_PRESENCE_TYPE_HIDDEN = 5,
	TP_CONNECTION_PRESENCE_TYPE_BUSY = 6,		TP_CONNECTION_PRESENCE_TYPE_BUSY = 6,
	TP_CONNECTION_PRESENCE_TYPE_UNKNOWN = 7,		TP_CONNECTION_PRESENCE_TYPE_UNKNOWN = 7,
	TP_CONNECTION_PRESENCE_TYPE_ERROR = 8,		TP_CONNECTION_PRESENCE_TYPE_ERROR = 8,
	} TpConnectionPresenceType;		} TpConnectionPresenceType;
	#define TP_NUM_CONNECTION_PRESENCE_TYPES (8+1)		#define TP_NUM_CONNECTION_PRESENCE_TYPES (8+1)
	#define NUM_TP_CONNECTION_PRESENCE_TYPES TP_NUM_CONNECTION_PRESENCE_TYPES
	typedef enum {		typedef enum {
	TP_ACCESS_CONTROL_TYPE_WHITELIST = 0,		TP_ACCESS_CONTROL_TYPE_WHITELIST = 0,
	TP_ACCESS_CONTROL_TYPE_PUBLISH_LIST = 1,		TP_ACCESS_CONTROL_TYPE_PUBLISH_LIST = 1,
	TP_ACCESS_CONTROL_TYPE_GROUP = 2,		TP_ACCESS_CONTROL_TYPE_GROUP = 2,
	TP_ACCESS_CONTROL_TYPE_OPEN = 3,		TP_ACCESS_CONTROL_TYPE_OPEN = 3,
	TP_ACCESS_CONTROL_TYPE_SUBSCRIBE_OR_PUBLISH_LIST = 4,		TP_ACCESS_CONTROL_TYPE_SUBSCRIBE_OR_PUBLISH_LIST = 4,
	TP_ACCESS_CONTROL_TYPE_CLOSED = 5,		TP_ACCESS_CONTROL_TYPE_CLOSED = 5,
	TP_ACCESS_CONTROL_TYPE_NOT_UNDERSTOOD = 6,		TP_ACCESS_CONTROL_TYPE_NOT_UNDERSTOOD = 6,
	} TpAccessControlType;		} TpAccessControlType;
	#define TP_NUM_ACCESS_CONTROL_TYPES (6+1)		#define TP_NUM_ACCESS_CONTROL_TYPES (6+1)
	#define NUM_TP_ACCESS_CONTROL_TYPES TP_NUM_ACCESS_CONTROL_TYPES
	typedef enum {
	TP_RICH_PRESENCE_ACCESS_CONTROL_TYPE_WHITELIST = 0,
	TP_RICH_PRESENCE_ACCESS_CONTROL_TYPE_PUBLISH_LIST = 1,
	TP_RICH_PRESENCE_ACCESS_CONTROL_TYPE_GROUP = 2,
	TP_RICH_PRESENCE_ACCESS_CONTROL_TYPE_OPEN = 3,
	} TpRichPresenceAccessControlType;
	#define TP_NUM_RICH_PRESENCE_ACCESS_CONTROL_TYPES (3+1)
	#define NUM_TP_RICH_PRESENCE_ACCESS_CONTROL_TYPES TP_NUM_RICH_PRESENCE_ACCE
	SS_CONTROL_TYPES
	typedef enum /*< flags >*/ {		typedef enum /*< flags >*/ {
	TP_LOCATION_FEATURE_CAN_SET = 1,		TP_LOCATION_FEATURE_CAN_SET = 1,
	} TpLocationFeatures;		} TpLocationFeatures;
	typedef enum {		typedef enum {
	TP_SERVICE_POINT_TYPE_NONE = 0,		TP_SERVICE_POINT_TYPE_NONE = 0,
	TP_SERVICE_POINT_TYPE_EMERGENCY = 1,		TP_SERVICE_POINT_TYPE_EMERGENCY = 1,
	TP_SERVICE_POINT_TYPE_COUNSELING = 2,		TP_SERVICE_POINT_TYPE_COUNSELING = 2,
	} TpServicePointType;		} TpServicePointType;
	#define TP_NUM_SERVICE_POINT_TYPES (2+1)		#define TP_NUM_SERVICE_POINT_TYPES (2+1)
	#define NUM_TP_SERVICE_POINT_TYPES TP_NUM_SERVICE_POINT_TYPES
	typedef enum /*< flags >*/ {		typedef enum /*< flags >*/ {
	TP_MAIL_NOTIFICATION_FLAG_SUPPORTS_UNREAD_MAIL_COUNT = 1,		TP_MAIL_NOTIFICATION_FLAG_SUPPORTS_UNREAD_MAIL_COUNT = 1,
	TP_MAIL_NOTIFICATION_FLAG_SUPPORTS_UNREAD_MAILS = 2,		TP_MAIL_NOTIFICATION_FLAG_SUPPORTS_UNREAD_MAILS = 2,
	TP_MAIL_NOTIFICATION_FLAG_EMITS_MAILS_RECEIVED = 4,		TP_MAIL_NOTIFICATION_FLAG_EMITS_MAILS_RECEIVED = 4,
	TP_MAIL_NOTIFICATION_FLAG_SUPPORTS_REQUEST_INBOX_URL = 8,		TP_MAIL_NOTIFICATION_FLAG_SUPPORTS_REQUEST_INBOX_URL = 8,
	TP_MAIL_NOTIFICATION_FLAG_SUPPORTS_REQUEST_MAIL_URL = 16,		TP_MAIL_NOTIFICATION_FLAG_SUPPORTS_REQUEST_MAIL_URL = 16,
	TP_MAIL_NOTIFICATION_FLAG_THREAD_BASED = 32,		TP_MAIL_NOTIFICATION_FLAG_THREAD_BASED = 32,
	} TpMailNotificationFlags;		} TpMailNotificationFlags;
	typedef enum {		typedef enum {
	TP_HTTP_METHOD_GET = 0,		TP_HTTP_METHOD_GET = 0,
	TP_HTTP_METHOD_POST = 1,		TP_HTTP_METHOD_POST = 1,
	} TpHTTPMethod;		} TpHTTPMethod;
	#define TP_NUM_HTTP_METHODS (1+1)		#define TP_NUM_HTTP_METHODS (1+1)
	#define NUM_TP_HTTP_METHODS TP_NUM_HTTP_METHODS
			typedef enum {
			TP_CHANNEL_TEXT_SEND_ERROR_UNKNOWN = 0,
			TP_CHANNEL_TEXT_SEND_ERROR_OFFLINE = 1,
			TP_CHANNEL_TEXT_SEND_ERROR_INVALID_CONTACT = 2,
			TP_CHANNEL_TEXT_SEND_ERROR_PERMISSION_DENIED = 3,
			TP_CHANNEL_TEXT_SEND_ERROR_TOO_LONG = 4,
			TP_CHANNEL_TEXT_SEND_ERROR_NOT_IMPLEMENTED = 5,
			} TpChannelTextSendError;
			#define TP_NUM_CHANNEL_TEXT_SEND_ERRORS (5+1)
			typedef enum {
			TP_CHANNEL_TEXT_MESSAGE_TYPE_NORMAL = 0,
			TP_CHANNEL_TEXT_MESSAGE_TYPE_ACTION = 1,
			TP_CHANNEL_TEXT_MESSAGE_TYPE_NOTICE = 2,
			TP_CHANNEL_TEXT_MESSAGE_TYPE_AUTO_REPLY = 3,
			TP_CHANNEL_TEXT_MESSAGE_TYPE_DELIVERY_REPORT = 4,
			} TpChannelTextMessageType;
			#define TP_NUM_CHANNEL_TEXT_MESSAGE_TYPES (4+1)
			typedef enum /*< flags >*/ {
			TP_MESSAGE_PART_SUPPORT_FLAG_ONE_ATTACHMENT = 1,
			TP_MESSAGE_PART_SUPPORT_FLAG_MULTIPLE_ATTACHMENTS = 2,
			} TpMessagePartSupportFlags;
			typedef enum /*< flags >*/ {
			TP_MESSAGE_SENDING_FLAG_REPORT_DELIVERY = 1,
			TP_MESSAGE_SENDING_FLAG_REPORT_READ = 2,
			TP_MESSAGE_SENDING_FLAG_REPORT_DELETED = 4,
			} TpMessageSendingFlags;
			typedef enum {
			TP_DELIVERY_STATUS_UNKNOWN = 0,
			TP_DELIVERY_STATUS_DELIVERED = 1,
			TP_DELIVERY_STATUS_TEMPORARILY_FAILED = 2,
			TP_DELIVERY_STATUS_PERMANENTLY_FAILED = 3,
			TP_DELIVERY_STATUS_ACCEPTED = 4,
			TP_DELIVERY_STATUS_READ = 5,
			TP_DELIVERY_STATUS_DELETED = 6,
			} TpDeliveryStatus;
			#define TP_NUM_DELIVERY_STATUSES (6+1)
			typedef enum /*< flags >*/ {
			TP_DELIVERY_REPORTING_SUPPORT_FLAG_RECEIVE_FAILURES = 1,
			TP_DELIVERY_REPORTING_SUPPORT_FLAG_RECEIVE_SUCCESSES = 2,
			TP_DELIVERY_REPORTING_SUPPORT_FLAG_RECEIVE_READ = 4,
			TP_DELIVERY_REPORTING_SUPPORT_FLAG_RECEIVE_DELETED = 8,
			} TpDeliveryReportingSupportFlags;
			typedef enum {
			TP_MEDIA_STREAM_TYPE_AUDIO = 0,
			TP_MEDIA_STREAM_TYPE_VIDEO = 1,
			} TpMediaStreamType;
			#define TP_NUM_MEDIA_STREAM_TYPES (1+1)
	typedef enum {		typedef enum {
	TP_CALL_STATE_UNKNOWN = 0,		TP_CALL_STATE_UNKNOWN = 0,
	TP_CALL_STATE_PENDING_INITIATOR = 1,		TP_CALL_STATE_PENDING_INITIATOR = 1,
	TP_CALL_STATE_INITIALISING = 2,		TP_CALL_STATE_INITIALISING = 2,
	TP_CALL_STATE_INITIALISED = 3,		TP_CALL_STATE_INITIALISED = 3,
	TP_CALL_STATE_ACCEPTED = 4,		TP_CALL_STATE_ACCEPTED = 4,
	TP_CALL_STATE_ACTIVE = 5,		TP_CALL_STATE_ACTIVE = 5,
	TP_CALL_STATE_ENDED = 6,		TP_CALL_STATE_ENDED = 6,
	} TpCallState;		} TpCallState;
	#define TP_NUM_CALL_STATES (6+1)		#define TP_NUM_CALL_STATES (6+1)
	#define NUM_TP_CALL_STATES TP_NUM_CALL_STATES
	typedef enum /*< flags >*/ {		typedef enum /*< flags >*/ {
	TP_CALL_FLAG_LOCALLY_HELD = 1,		TP_CALL_FLAG_LOCALLY_HELD = 1,
	TP_CALL_FLAG_LOCALLY_RINGING = 2,		TP_CALL_FLAG_LOCALLY_RINGING = 2,
	TP_CALL_FLAG_LOCALLY_QUEUED = 4,		TP_CALL_FLAG_LOCALLY_QUEUED = 4,
	TP_CALL_FLAG_FORWARDED = 8,		TP_CALL_FLAG_FORWARDED = 8,
	TP_CALL_FLAG_CLEARING = 16,		TP_CALL_FLAG_CLEARING = 16,
	} TpCallFlags;		} TpCallFlags;
	typedef enum {		typedef enum {
	skipping to change at line 214		skipping to change at line 241
	TP_CALL_STATE_CHANGE_REASON_INVALID_CONTACT = 6,		TP_CALL_STATE_CHANGE_REASON_INVALID_CONTACT = 6,
	TP_CALL_STATE_CHANGE_REASON_PERMISSION_DENIED = 7,		TP_CALL_STATE_CHANGE_REASON_PERMISSION_DENIED = 7,
	TP_CALL_STATE_CHANGE_REASON_BUSY = 8,		TP_CALL_STATE_CHANGE_REASON_BUSY = 8,
	TP_CALL_STATE_CHANGE_REASON_INTERNAL_ERROR = 9,		TP_CALL_STATE_CHANGE_REASON_INTERNAL_ERROR = 9,
	TP_CALL_STATE_CHANGE_REASON_SERVICE_ERROR = 10,		TP_CALL_STATE_CHANGE_REASON_SERVICE_ERROR = 10,
	TP_CALL_STATE_CHANGE_REASON_NETWORK_ERROR = 11,		TP_CALL_STATE_CHANGE_REASON_NETWORK_ERROR = 11,
	TP_CALL_STATE_CHANGE_REASON_MEDIA_ERROR = 12,		TP_CALL_STATE_CHANGE_REASON_MEDIA_ERROR = 12,
	TP_CALL_STATE_CHANGE_REASON_CONNECTIVITY_ERROR = 13,		TP_CALL_STATE_CHANGE_REASON_CONNECTIVITY_ERROR = 13,
	} TpCallStateChangeReason;		} TpCallStateChangeReason;
	#define TP_NUM_CALL_STATE_CHANGE_REASONS (13+1)		#define TP_NUM_CALL_STATE_CHANGE_REASONS (13+1)
	#define NUM_TP_CALL_STATE_CHANGE_REASONS TP_NUM_CALL_STATE_CHANGE_REASONS
	typedef enum /*< flags >*/ {		typedef enum /*< flags >*/ {
	TP_CALL_MEMBER_FLAG_RINGING = 1,		TP_CALL_MEMBER_FLAG_RINGING = 1,
	TP_CALL_MEMBER_FLAG_HELD = 2,		TP_CALL_MEMBER_FLAG_HELD = 2,
	TP_CALL_MEMBER_FLAG_CONFERENCE_HOST = 4,		TP_CALL_MEMBER_FLAG_CONFERENCE_HOST = 4,
	} TpCallMemberFlags;		} TpCallMemberFlags;
	typedef enum {		typedef enum {
	TP_CHANNEL_CONTACT_SEARCH_STATE_NOT_STARTED = 0,		TP_CHANNEL_CONTACT_SEARCH_STATE_NOT_STARTED = 0,
	TP_CHANNEL_CONTACT_SEARCH_STATE_IN_PROGRESS = 1,		TP_CHANNEL_CONTACT_SEARCH_STATE_IN_PROGRESS = 1,
	TP_CHANNEL_CONTACT_SEARCH_STATE_MORE_AVAILABLE = 2,		TP_CHANNEL_CONTACT_SEARCH_STATE_MORE_AVAILABLE = 2,
	TP_CHANNEL_CONTACT_SEARCH_STATE_COMPLETED = 3,		TP_CHANNEL_CONTACT_SEARCH_STATE_COMPLETED = 3,
	TP_CHANNEL_CONTACT_SEARCH_STATE_FAILED = 4,		TP_CHANNEL_CONTACT_SEARCH_STATE_FAILED = 4,
	} TpChannelContactSearchState;		} TpChannelContactSearchState;
	#define TP_NUM_CHANNEL_CONTACT_SEARCH_STATES (4+1)		#define TP_NUM_CHANNEL_CONTACT_SEARCH_STATES (4+1)
	#define NUM_TP_CHANNEL_CONTACT_SEARCH_STATES TP_NUM_CHANNEL_CONTACT_SEARCH_ STATES
	typedef enum {		typedef enum {
	TP_FILE_TRANSFER_STATE_NONE = 0,		TP_FILE_TRANSFER_STATE_NONE = 0,
	TP_FILE_TRANSFER_STATE_PENDING = 1,		TP_FILE_TRANSFER_STATE_PENDING = 1,
	TP_FILE_TRANSFER_STATE_ACCEPTED = 2,		TP_FILE_TRANSFER_STATE_ACCEPTED = 2,
	TP_FILE_TRANSFER_STATE_OPEN = 3,		TP_FILE_TRANSFER_STATE_OPEN = 3,
	TP_FILE_TRANSFER_STATE_COMPLETED = 4,		TP_FILE_TRANSFER_STATE_COMPLETED = 4,
	TP_FILE_TRANSFER_STATE_CANCELLED = 5,		TP_FILE_TRANSFER_STATE_CANCELLED = 5,
	} TpFileTransferState;		} TpFileTransferState;
	#define TP_NUM_FILE_TRANSFER_STATES (5+1)		#define TP_NUM_FILE_TRANSFER_STATES (5+1)
	#define NUM_TP_FILE_TRANSFER_STATES TP_NUM_FILE_TRANSFER_STATES
	typedef enum {		typedef enum {
	TP_FILE_TRANSFER_STATE_CHANGE_REASON_NONE = 0,		TP_FILE_TRANSFER_STATE_CHANGE_REASON_NONE = 0,
	TP_FILE_TRANSFER_STATE_CHANGE_REASON_REQUESTED = 1,		TP_FILE_TRANSFER_STATE_CHANGE_REASON_REQUESTED = 1,
	TP_FILE_TRANSFER_STATE_CHANGE_REASON_LOCAL_STOPPED = 2,		TP_FILE_TRANSFER_STATE_CHANGE_REASON_LOCAL_STOPPED = 2,
	TP_FILE_TRANSFER_STATE_CHANGE_REASON_REMOTE_STOPPED = 3,		TP_FILE_TRANSFER_STATE_CHANGE_REASON_REMOTE_STOPPED = 3,
	TP_FILE_TRANSFER_STATE_CHANGE_REASON_LOCAL_ERROR = 4,		TP_FILE_TRANSFER_STATE_CHANGE_REASON_LOCAL_ERROR = 4,
	TP_FILE_TRANSFER_STATE_CHANGE_REASON_REMOTE_ERROR = 5,		TP_FILE_TRANSFER_STATE_CHANGE_REASON_REMOTE_ERROR = 5,
	} TpFileTransferStateChangeReason;		} TpFileTransferStateChangeReason;
	#define TP_NUM_FILE_TRANSFER_STATE_CHANGE_REASONS (5+1)		#define TP_NUM_FILE_TRANSFER_STATE_CHANGE_REASONS (5+1)
	#define NUM_TP_FILE_TRANSFER_STATE_CHANGE_REASONS TP_NUM_FILE_TRANSFER_STAT E_CHANGE_REASONS
	typedef enum {		typedef enum {
	TP_FILE_HASH_TYPE_NONE = 0,		TP_FILE_HASH_TYPE_NONE = 0,
	TP_FILE_HASH_TYPE_MD5 = 1,		TP_FILE_HASH_TYPE_MD5 = 1,
	TP_FILE_HASH_TYPE_SHA1 = 2,		TP_FILE_HASH_TYPE_SHA1 = 2,
	TP_FILE_HASH_TYPE_SHA256 = 3,		TP_FILE_HASH_TYPE_SHA256 = 3,
	} TpFileHashType;		} TpFileHashType;
	#define TP_NUM_FILE_HASH_TYPES (3+1)		#define TP_NUM_FILE_HASH_TYPES (3+1)
	#define NUM_TP_FILE_HASH_TYPES TP_NUM_FILE_HASH_TYPES
	typedef enum {
	TP_MEDIA_STREAM_TYPE_AUDIO = 0,
	TP_MEDIA_STREAM_TYPE_VIDEO = 1,
	} TpMediaStreamType;
	#define TP_NUM_MEDIA_STREAM_TYPES (1+1)
	#define NUM_TP_MEDIA_STREAM_TYPES TP_NUM_MEDIA_STREAM_TYPES
	typedef enum {
	TP_MEDIA_STREAM_STATE_DISCONNECTED = 0,
	TP_MEDIA_STREAM_STATE_CONNECTING = 1,
	TP_MEDIA_STREAM_STATE_CONNECTED = 2,
	} TpMediaStreamState;
	#define TP_NUM_MEDIA_STREAM_STATES (2+1)
	#define NUM_TP_MEDIA_STREAM_STATES TP_NUM_MEDIA_STREAM_STATES
	typedef enum {
	TP_MEDIA_STREAM_DIRECTION_NONE = 0,
	TP_MEDIA_STREAM_DIRECTION_SEND = 1,
	TP_MEDIA_STREAM_DIRECTION_RECEIVE = 2,
	TP_MEDIA_STREAM_DIRECTION_BIDIRECTIONAL = 3,
	} TpMediaStreamDirection;
	#define TP_NUM_MEDIA_STREAM_DIRECTIONS (3+1)
	#define NUM_TP_MEDIA_STREAM_DIRECTIONS TP_NUM_MEDIA_STREAM_DIRECTIONS
	typedef enum /*< flags >*/ {
	TP_MEDIA_STREAM_PENDING_LOCAL_SEND = 1,
	TP_MEDIA_STREAM_PENDING_REMOTE_SEND = 2,
	} TpMediaStreamPendingSend;
	typedef enum /*< flags >*/ {
	TP_CHANNEL_MEDIA_CAPABILITY_AUDIO = 1,
	TP_CHANNEL_MEDIA_CAPABILITY_VIDEO = 2,
	TP_CHANNEL_MEDIA_CAPABILITY_NAT_TRAVERSAL_STUN = 4,
	TP_CHANNEL_MEDIA_CAPABILITY_NAT_TRAVERSAL_GTALK_P2P = 8,
	TP_CHANNEL_MEDIA_CAPABILITY_NAT_TRAVERSAL_ICE_UDP = 16,
	TP_CHANNEL_MEDIA_CAPABILITY_IMMUTABLE_STREAMS = 32,
	} TpChannelMediaCapabilities;
	typedef enum {
	TP_CHANNEL_TEXT_SEND_ERROR_UNKNOWN = 0,
	TP_CHANNEL_TEXT_SEND_ERROR_OFFLINE = 1,
	TP_CHANNEL_TEXT_SEND_ERROR_INVALID_CONTACT = 2,
	TP_CHANNEL_TEXT_SEND_ERROR_PERMISSION_DENIED = 3,
	TP_CHANNEL_TEXT_SEND_ERROR_TOO_LONG = 4,
	TP_CHANNEL_TEXT_SEND_ERROR_NOT_IMPLEMENTED = 5,
	} TpChannelTextSendError;
	#define TP_NUM_CHANNEL_TEXT_SEND_ERRORS (5+1)
	#define NUM_TP_CHANNEL_TEXT_SEND_ERRORS TP_NUM_CHANNEL_TEXT_SEND_ERRORS
	typedef enum {
	TP_CHANNEL_TEXT_MESSAGE_TYPE_NORMAL = 0,
	TP_CHANNEL_TEXT_MESSAGE_TYPE_ACTION = 1,
	TP_CHANNEL_TEXT_MESSAGE_TYPE_NOTICE = 2,
	TP_CHANNEL_TEXT_MESSAGE_TYPE_AUTO_REPLY = 3,
	TP_CHANNEL_TEXT_MESSAGE_TYPE_DELIVERY_REPORT = 4,
	} TpChannelTextMessageType;
	#define TP_NUM_CHANNEL_TEXT_MESSAGE_TYPES (4+1)
	#define NUM_TP_CHANNEL_TEXT_MESSAGE_TYPES TP_NUM_CHANNEL_TEXT_MESSAGE_TYPES
	typedef enum /*< flags >*/ {
	TP_CHANNEL_TEXT_MESSAGE_FLAG_TRUNCATED = 1,
	TP_CHANNEL_TEXT_MESSAGE_FLAG_NON_TEXT_CONTENT = 2,
	TP_CHANNEL_TEXT_MESSAGE_FLAG_SCROLLBACK = 4,
	TP_CHANNEL_TEXT_MESSAGE_FLAG_RESCUED = 8,
	} TpChannelTextMessageFlags;
	typedef enum {
	TP_TUBE_TYPE_DBUS = 0,
	TP_TUBE_TYPE_STREAM = 1,
	} TpTubeType;
	#define TP_NUM_TUBE_TYPES (1+1)
	#define NUM_TP_TUBE_TYPES TP_NUM_TUBE_TYPES
	typedef enum {
	TP_TUBE_STATE_LOCAL_PENDING = 0,
	TP_TUBE_STATE_REMOTE_PENDING = 1,
	TP_TUBE_STATE_OPEN = 2,
	} TpTubeState;
	#define TP_NUM_TUBE_STATES (2+1)
	#define NUM_TP_TUBE_STATES TP_NUM_TUBE_STATES
	typedef enum /*< flags >*/ {
	TP_CHANNEL_CALL_STATE_RINGING = 1,
	TP_CHANNEL_CALL_STATE_QUEUED = 2,
	TP_CHANNEL_CALL_STATE_HELD = 4,
	TP_CHANNEL_CALL_STATE_FORWARDED = 8,
	TP_CHANNEL_CALL_STATE_IN_PROGRESS = 16,
	TP_CHANNEL_CALL_STATE_CONFERENCE_HOST = 32,
	} TpChannelCallStateFlags;
	typedef enum /*< flags >*/ {		typedef enum /*< flags >*/ {
	TP_CAPTCHA_FLAGS_REQUIRED = 1,		TP_CAPTCHA_FLAGS_REQUIRED = 1,
	} TpCaptchaFlags;		} TpCaptchaFlags;
	typedef enum {		typedef enum {
	TP_CAPTCHA_CANCEL_REASON_USER_CANCELLED = 0,		TP_CAPTCHA_CANCEL_REASON_USER_CANCELLED = 0,
	TP_CAPTCHA_CANCEL_REASON_NOT_SUPPORTED = 1,		TP_CAPTCHA_CANCEL_REASON_NOT_SUPPORTED = 1,
	TP_CAPTCHA_CANCEL_REASON_SERVICE_CONFUSED = 2,		TP_CAPTCHA_CANCEL_REASON_SERVICE_CONFUSED = 2,
	} TpCaptchaCancelReason;		} TpCaptchaCancelReason;
	#define TP_NUM_CAPTCHA_CANCEL_REASONS (2+1)		#define TP_NUM_CAPTCHA_CANCEL_REASONS (2+1)
	#define NUM_TP_CAPTCHA_CANCEL_REASONS TP_NUM_CAPTCHA_CANCEL_REASONS
	typedef enum {		typedef enum {
	TP_CAPTCHA_STATUS_LOCAL_PENDING = 0,		TP_CAPTCHA_STATUS_LOCAL_PENDING = 0,
	TP_CAPTCHA_STATUS_REMOTE_PENDING = 1,		TP_CAPTCHA_STATUS_REMOTE_PENDING = 1,
	TP_CAPTCHA_STATUS_SUCCEEDED = 2,		TP_CAPTCHA_STATUS_SUCCEEDED = 2,
	TP_CAPTCHA_STATUS_TRY_AGAIN = 3,		TP_CAPTCHA_STATUS_TRY_AGAIN = 3,
	TP_CAPTCHA_STATUS_FAILED = 4,		TP_CAPTCHA_STATUS_FAILED = 4,
	} TpCaptchaStatus;		} TpCaptchaStatus;
	#define TP_NUM_CAPTCHA_STATUSES (4+1)		#define TP_NUM_CAPTCHA_STATUSES (4+1)
	#define NUM_TP_CAPTCHA_STATUSES TP_NUM_CAPTCHA_STATUSES
	typedef enum {		typedef enum {
	TP_CHANNEL_CHAT_STATE_GONE = 0,		TP_CHANNEL_CHAT_STATE_GONE = 0,
	TP_CHANNEL_CHAT_STATE_INACTIVE = 1,		TP_CHANNEL_CHAT_STATE_INACTIVE = 1,
	TP_CHANNEL_CHAT_STATE_ACTIVE = 2,		TP_CHANNEL_CHAT_STATE_ACTIVE = 2,
	TP_CHANNEL_CHAT_STATE_PAUSED = 3,		TP_CHANNEL_CHAT_STATE_PAUSED = 3,
	TP_CHANNEL_CHAT_STATE_COMPOSING = 4,		TP_CHANNEL_CHAT_STATE_COMPOSING = 4,
	} TpChannelChatState;		} TpChannelChatState;
	#define TP_NUM_CHANNEL_CHAT_STATES (4+1)		#define TP_NUM_CHANNEL_CHAT_STATES (4+1)
	#define NUM_TP_CHANNEL_CHAT_STATES TP_NUM_CHANNEL_CHAT_STATES
	typedef enum {		typedef enum {
	TP_DTMF_EVENT_DIGIT_0 = 0,		TP_DTMF_EVENT_DIGIT_0 = 0,
	TP_DTMF_EVENT_DIGIT_1 = 1,		TP_DTMF_EVENT_DIGIT_1 = 1,
	TP_DTMF_EVENT_DIGIT_2 = 2,		TP_DTMF_EVENT_DIGIT_2 = 2,
	TP_DTMF_EVENT_DIGIT_3 = 3,		TP_DTMF_EVENT_DIGIT_3 = 3,
	TP_DTMF_EVENT_DIGIT_4 = 4,		TP_DTMF_EVENT_DIGIT_4 = 4,
	TP_DTMF_EVENT_DIGIT_5 = 5,		TP_DTMF_EVENT_DIGIT_5 = 5,
	TP_DTMF_EVENT_DIGIT_6 = 6,		TP_DTMF_EVENT_DIGIT_6 = 6,
	TP_DTMF_EVENT_DIGIT_7 = 7,		TP_DTMF_EVENT_DIGIT_7 = 7,
	TP_DTMF_EVENT_DIGIT_8 = 8,		TP_DTMF_EVENT_DIGIT_8 = 8,
	TP_DTMF_EVENT_DIGIT_9 = 9,		TP_DTMF_EVENT_DIGIT_9 = 9,
	TP_DTMF_EVENT_ASTERISK = 10,		TP_DTMF_EVENT_ASTERISK = 10,
	TP_DTMF_EVENT_HASH = 11,		TP_DTMF_EVENT_HASH = 11,
	TP_DTMF_EVENT_LETTER_A = 12,		TP_DTMF_EVENT_LETTER_A = 12,
	TP_DTMF_EVENT_LETTER_B = 13,		TP_DTMF_EVENT_LETTER_B = 13,
	TP_DTMF_EVENT_LETTER_C = 14,		TP_DTMF_EVENT_LETTER_C = 14,
	TP_DTMF_EVENT_LETTER_D = 15,		TP_DTMF_EVENT_LETTER_D = 15,
	} TpDTMFEvent;		} TpDTMFEvent;
	#define TP_NUM_DTMF_EVENTS (15+1)		#define TP_NUM_DTMF_EVENTS (15+1)
	#define NUM_TP_DTMF_EVENTS TP_NUM_DTMF_EVENTS
	typedef enum /*< flags >*/ {		typedef enum /*< flags >*/ {
	TP_CHANNEL_GROUP_FLAG_CAN_ADD = 1,		TP_CHANNEL_GROUP_FLAG_CAN_ADD = 1,
	TP_CHANNEL_GROUP_FLAG_CAN_REMOVE = 2,		TP_CHANNEL_GROUP_FLAG_CAN_REMOVE = 2,
	TP_CHANNEL_GROUP_FLAG_CAN_RESCIND = 4,		TP_CHANNEL_GROUP_FLAG_CAN_RESCIND = 4,
	TP_CHANNEL_GROUP_FLAG_MESSAGE_ADD = 8,		TP_CHANNEL_GROUP_FLAG_MESSAGE_ADD = 8,
	TP_CHANNEL_GROUP_FLAG_MESSAGE_REMOVE = 16,		TP_CHANNEL_GROUP_FLAG_MESSAGE_REMOVE = 16,
	TP_CHANNEL_GROUP_FLAG_MESSAGE_ACCEPT = 32,		TP_CHANNEL_GROUP_FLAG_MESSAGE_ACCEPT = 32,
	TP_CHANNEL_GROUP_FLAG_MESSAGE_REJECT = 64,		TP_CHANNEL_GROUP_FLAG_MESSAGE_REJECT = 64,
	TP_CHANNEL_GROUP_FLAG_MESSAGE_RESCIND = 128,		TP_CHANNEL_GROUP_FLAG_MESSAGE_RESCIND = 128,
	TP_CHANNEL_GROUP_FLAG_CHANNEL_SPECIFIC_HANDLES = 256,		TP_CHANNEL_GROUP_FLAG_CHANNEL_SPECIFIC_HANDLES = 256,
	TP_CHANNEL_GROUP_FLAG_ONLY_ONE_GROUP = 512,		TP_CHANNEL_GROUP_FLAG_ONLY_ONE_GROUP = 512,
	TP_CHANNEL_GROUP_FLAG_HANDLE_OWNERS_NOT_AVAILABLE = 1024,		TP_CHANNEL_GROUP_FLAG_HANDLE_OWNERS_NOT_AVAILABLE = 1024,
	TP_CHANNEL_GROUP_FLAG_PROPERTIES = 2048,		TP_CHANNEL_GROUP_FLAG_MESSAGE_DEPART = 2048,
	TP_CHANNEL_GROUP_FLAG_MEMBERS_CHANGED_DETAILED = 4096,
	TP_CHANNEL_GROUP_FLAG_MESSAGE_DEPART = 8192,
	} TpChannelGroupFlags;		} TpChannelGroupFlags;
	typedef enum {		typedef enum {
	TP_CHANNEL_GROUP_CHANGE_REASON_NONE = 0,		TP_CHANNEL_GROUP_CHANGE_REASON_NONE = 0,
	TP_CHANNEL_GROUP_CHANGE_REASON_OFFLINE = 1,		TP_CHANNEL_GROUP_CHANGE_REASON_OFFLINE = 1,
	TP_CHANNEL_GROUP_CHANGE_REASON_KICKED = 2,		TP_CHANNEL_GROUP_CHANGE_REASON_KICKED = 2,
	TP_CHANNEL_GROUP_CHANGE_REASON_BUSY = 3,		TP_CHANNEL_GROUP_CHANGE_REASON_BUSY = 3,
	TP_CHANNEL_GROUP_CHANGE_REASON_INVITED = 4,		TP_CHANNEL_GROUP_CHANGE_REASON_INVITED = 4,
	TP_CHANNEL_GROUP_CHANGE_REASON_BANNED = 5,		TP_CHANNEL_GROUP_CHANGE_REASON_BANNED = 5,
	TP_CHANNEL_GROUP_CHANGE_REASON_ERROR = 6,		TP_CHANNEL_GROUP_CHANGE_REASON_ERROR = 6,
	TP_CHANNEL_GROUP_CHANGE_REASON_INVALID_CONTACT = 7,		TP_CHANNEL_GROUP_CHANGE_REASON_INVALID_CONTACT = 7,
	TP_CHANNEL_GROUP_CHANGE_REASON_NO_ANSWER = 8,		TP_CHANNEL_GROUP_CHANGE_REASON_NO_ANSWER = 8,
	TP_CHANNEL_GROUP_CHANGE_REASON_RENAMED = 9,		TP_CHANNEL_GROUP_CHANGE_REASON_RENAMED = 9,
	TP_CHANNEL_GROUP_CHANGE_REASON_PERMISSION_DENIED = 10,		TP_CHANNEL_GROUP_CHANGE_REASON_PERMISSION_DENIED = 10,
	TP_CHANNEL_GROUP_CHANGE_REASON_SEPARATED = 11,		TP_CHANNEL_GROUP_CHANGE_REASON_SEPARATED = 11,
	} TpChannelGroupChangeReason;		} TpChannelGroupChangeReason;
	#define TP_NUM_CHANNEL_GROUP_CHANGE_REASONS (11+1)		#define TP_NUM_CHANNEL_GROUP_CHANGE_REASONS (11+1)
	#define NUM_TP_CHANNEL_GROUP_CHANGE_REASONS TP_NUM_CHANNEL_GROUP_CHANGE_REA SONS
	typedef enum {		typedef enum {
	TP_LOCAL_HOLD_STATE_UNHELD = 0,		TP_LOCAL_HOLD_STATE_UNHELD = 0,
	TP_LOCAL_HOLD_STATE_HELD = 1,		TP_LOCAL_HOLD_STATE_HELD = 1,
	TP_LOCAL_HOLD_STATE_PENDING_HOLD = 2,		TP_LOCAL_HOLD_STATE_PENDING_HOLD = 2,
	TP_LOCAL_HOLD_STATE_PENDING_UNHOLD = 3,		TP_LOCAL_HOLD_STATE_PENDING_UNHOLD = 3,
	} TpLocalHoldState;		} TpLocalHoldState;
	#define TP_NUM_LOCAL_HOLD_STATES (3+1)		#define TP_NUM_LOCAL_HOLD_STATES (3+1)
	#define NUM_TP_LOCAL_HOLD_STATES TP_NUM_LOCAL_HOLD_STATES
	typedef enum {		typedef enum {
	TP_LOCAL_HOLD_STATE_REASON_NONE = 0,		TP_LOCAL_HOLD_STATE_REASON_NONE = 0,
	TP_LOCAL_HOLD_STATE_REASON_REQUESTED = 1,		TP_LOCAL_HOLD_STATE_REASON_REQUESTED = 1,
	TP_LOCAL_HOLD_STATE_REASON_RESOURCE_NOT_AVAILABLE = 2,		TP_LOCAL_HOLD_STATE_REASON_RESOURCE_NOT_AVAILABLE = 2,
	} TpLocalHoldStateReason;		} TpLocalHoldStateReason;
	#define TP_NUM_LOCAL_HOLD_STATE_REASONS (2+1)		#define TP_NUM_LOCAL_HOLD_STATE_REASONS (2+1)
	#define NUM_TP_LOCAL_HOLD_STATE_REASONS TP_NUM_LOCAL_HOLD_STATE_REASONS
	typedef enum /*< flags >*/ {
	TP_MESSAGE_PART_SUPPORT_FLAG_ONE_ATTACHMENT = 1,
	TP_MESSAGE_PART_SUPPORT_FLAG_MULTIPLE_ATTACHMENTS = 2,
	} TpMessagePartSupportFlags;
	typedef enum /*< flags >*/ {
	TP_MESSAGE_SENDING_FLAG_REPORT_DELIVERY = 1,
	TP_MESSAGE_SENDING_FLAG_REPORT_READ = 2,
	TP_MESSAGE_SENDING_FLAG_REPORT_DELETED = 4,
	} TpMessageSendingFlags;
	typedef enum {
	TP_DELIVERY_STATUS_UNKNOWN = 0,
	TP_DELIVERY_STATUS_DELIVERED = 1,
	TP_DELIVERY_STATUS_TEMPORARILY_FAILED = 2,
	TP_DELIVERY_STATUS_PERMANENTLY_FAILED = 3,
	TP_DELIVERY_STATUS_ACCEPTED = 4,
	TP_DELIVERY_STATUS_READ = 5,
	TP_DELIVERY_STATUS_DELETED = 6,
	} TpDeliveryStatus;
	#define TP_NUM_DELIVERY_STATUSES (6+1)
	#define NUM_TP_DELIVERY_STATUSES TP_NUM_DELIVERY_STATUSES
	typedef enum /*< flags >*/ {
	TP_DELIVERY_REPORTING_SUPPORT_FLAG_RECEIVE_FAILURES = 1,
	TP_DELIVERY_REPORTING_SUPPORT_FLAG_RECEIVE_SUCCESSES = 2,
	TP_DELIVERY_REPORTING_SUPPORT_FLAG_RECEIVE_READ = 4,
	TP_DELIVERY_REPORTING_SUPPORT_FLAG_RECEIVE_DELETED = 8,
	} TpDeliveryReportingSupportFlags;
	typedef enum /*< flags >*/ {		typedef enum /*< flags >*/ {
	TP_CHANNEL_PASSWORD_FLAG_PROVIDE = 8,		TP_CHANNEL_PASSWORD_FLAG_PROVIDE = 8,
	TP_CHANNEL_PASSWORD_FLAG_HINT = 4,		TP_CHANNEL_PASSWORD_FLAG_HINT = 4,
	} TpChannelPasswordFlags;		} TpChannelPasswordFlags;
	typedef enum {		typedef enum {
	TP_SASL_ABORT_REASON_INVALID_CHALLENGE = 0,		TP_SASL_ABORT_REASON_INVALID_CHALLENGE = 0,
	TP_SASL_ABORT_REASON_USER_ABORT = 1,		TP_SASL_ABORT_REASON_USER_ABORT = 1,
	} TpSASLAbortReason;		} TpSASLAbortReason;
	#define TP_NUM_SASL_ABORT_REASONS (1+1)		#define TP_NUM_SASL_ABORT_REASONS (1+1)
	#define NUM_TP_SASL_ABORT_REASONS TP_NUM_SASL_ABORT_REASONS
	typedef enum {		typedef enum {
	TP_SASL_STATUS_NOT_STARTED = 0,		TP_SASL_STATUS_NOT_STARTED = 0,
	TP_SASL_STATUS_IN_PROGRESS = 1,		TP_SASL_STATUS_IN_PROGRESS = 1,
	TP_SASL_STATUS_SERVER_SUCCEEDED = 2,		TP_SASL_STATUS_SERVER_SUCCEEDED = 2,
	TP_SASL_STATUS_CLIENT_ACCEPTED = 3,		TP_SASL_STATUS_CLIENT_ACCEPTED = 3,
	TP_SASL_STATUS_SUCCEEDED = 4,		TP_SASL_STATUS_SUCCEEDED = 4,
	TP_SASL_STATUS_SERVER_FAILED = 5,		TP_SASL_STATUS_SERVER_FAILED = 5,
	TP_SASL_STATUS_CLIENT_FAILED = 6,		TP_SASL_STATUS_CLIENT_FAILED = 6,
	} TpSASLStatus;		} TpSASLStatus;
	#define TP_NUM_SASL_STATUSES (6+1)		#define TP_NUM_SASL_STATUSES (6+1)
	#define NUM_TP_SASL_STATUSES TP_NUM_SASL_STATUSES
	typedef enum {		typedef enum {
	TP_TUBE_CHANNEL_STATE_LOCAL_PENDING = 0,		TP_TUBE_CHANNEL_STATE_LOCAL_PENDING = 0,
	TP_TUBE_CHANNEL_STATE_REMOTE_PENDING = 1,		TP_TUBE_CHANNEL_STATE_REMOTE_PENDING = 1,
	TP_TUBE_CHANNEL_STATE_OPEN = 2,		TP_TUBE_CHANNEL_STATE_OPEN = 2,
	TP_TUBE_CHANNEL_STATE_NOT_OFFERED = 3,		TP_TUBE_CHANNEL_STATE_NOT_OFFERED = 3,
	} TpTubeChannelState;		} TpTubeChannelState;
	#define TP_NUM_TUBE_CHANNEL_STATES (3+1)		#define TP_NUM_TUBE_CHANNEL_STATES (3+1)
	#define NUM_TP_TUBE_CHANNEL_STATES TP_NUM_TUBE_CHANNEL_STATES
	typedef enum {		typedef enum {
	TP_SOCKET_ADDRESS_TYPE_UNIX = 0,		TP_SOCKET_ADDRESS_TYPE_UNIX = 0,
	TP_SOCKET_ADDRESS_TYPE_ABSTRACT_UNIX = 1,		TP_SOCKET_ADDRESS_TYPE_ABSTRACT_UNIX = 1,
	TP_SOCKET_ADDRESS_TYPE_IPV4 = 2,		TP_SOCKET_ADDRESS_TYPE_IPV4 = 2,
	TP_SOCKET_ADDRESS_TYPE_IPV6 = 3,		TP_SOCKET_ADDRESS_TYPE_IPV6 = 3,
	} TpSocketAddressType;		} TpSocketAddressType;
	#define TP_NUM_SOCKET_ADDRESS_TYPES (3+1)		#define TP_NUM_SOCKET_ADDRESS_TYPES (3+1)
	#define NUM_TP_SOCKET_ADDRESS_TYPES TP_NUM_SOCKET_ADDRESS_TYPES
	typedef enum {		typedef enum {
	TP_SOCKET_ACCESS_CONTROL_LOCALHOST = 0,		TP_SOCKET_ACCESS_CONTROL_LOCALHOST = 0,
	TP_SOCKET_ACCESS_CONTROL_PORT = 1,		TP_SOCKET_ACCESS_CONTROL_PORT = 1,
	TP_SOCKET_ACCESS_CONTROL_NETMASK = 2,		TP_SOCKET_ACCESS_CONTROL_CREDENTIALS = 2,
	TP_SOCKET_ACCESS_CONTROL_CREDENTIALS = 3,
	} TpSocketAccessControl;		} TpSocketAccessControl;
	#define TP_NUM_SOCKET_ACCESS_CONTROLS (3+1)		#define TP_NUM_SOCKET_ACCESS_CONTROLS (2+1)
	#define NUM_TP_SOCKET_ACCESS_CONTROLS TP_NUM_SOCKET_ACCESS_CONTROLS
	typedef enum {
	TP_MEDIA_STREAM_ERROR_UNKNOWN = 0,
	TP_MEDIA_STREAM_ERROR_EOS = 1,
	TP_MEDIA_STREAM_ERROR_CODEC_NEGOTIATION_FAILED = 2,
	TP_MEDIA_STREAM_ERROR_CONNECTION_FAILED = 3,
	TP_MEDIA_STREAM_ERROR_NETWORK_ERROR = 4,
	TP_MEDIA_STREAM_ERROR_NO_CODECS = 5,
	TP_MEDIA_STREAM_ERROR_INVALID_CM_BEHAVIOR = 6,
	TP_MEDIA_STREAM_ERROR_MEDIA_ERROR = 7,
	} TpMediaStreamError;
	#define TP_NUM_MEDIA_STREAM_ERRORS (7+1)
	#define NUM_TP_MEDIA_STREAM_ERRORS TP_NUM_MEDIA_STREAM_ERRORS
	typedef enum {
	TP_MEDIA_STREAM_BASE_PROTO_UDP = 0,
	TP_MEDIA_STREAM_BASE_PROTO_TCP = 1,
	} TpMediaStreamBaseProto;
	#define TP_NUM_MEDIA_STREAM_BASE_PROTOS (1+1)
	#define NUM_TP_MEDIA_STREAM_BASE_PROTOS TP_NUM_MEDIA_STREAM_BASE_PROTOS
	typedef enum {
	TP_MEDIA_STREAM_TRANSPORT_TYPE_LOCAL = 0,
	TP_MEDIA_STREAM_TRANSPORT_TYPE_DERIVED = 1,
	TP_MEDIA_STREAM_TRANSPORT_TYPE_RELAY = 2,
	} TpMediaStreamTransportType;
	#define TP_NUM_MEDIA_STREAM_TRANSPORT_TYPES (2+1)
	#define NUM_TP_MEDIA_STREAM_TRANSPORT_TYPES TP_NUM_MEDIA_STREAM_TRANSPORT_T
	YPES
	typedef enum /*< flags >*/ {
	TP_PROPERTY_FLAG_READ = 1,
	TP_PROPERTY_FLAG_WRITE = 2,
	} TpPropertyFlags;
	typedef enum /*< flags >*/ {		typedef enum /*< flags >*/ {
	TP_STORAGE_RESTRICTION_FLAG_CANNOT_SET_PARAMETERS = 1,		TP_STORAGE_RESTRICTION_FLAG_CANNOT_SET_PARAMETERS = 1,
	TP_STORAGE_RESTRICTION_FLAG_CANNOT_SET_ENABLED = 2,		TP_STORAGE_RESTRICTION_FLAG_CANNOT_SET_ENABLED = 2,
	TP_STORAGE_RESTRICTION_FLAG_CANNOT_SET_PRESENCE = 4,		TP_STORAGE_RESTRICTION_FLAG_CANNOT_SET_PRESENCE = 4,
	TP_STORAGE_RESTRICTION_FLAG_CANNOT_SET_SERVICE = 8,		TP_STORAGE_RESTRICTION_FLAG_CANNOT_SET_SERVICE = 8,
	} TpStorageRestrictionFlags;		} TpStorageRestrictionFlags;
	typedef enum {		typedef enum {
	TP_DEBUG_LEVEL_ERROR = 0,		TP_DEBUG_LEVEL_ERROR = 0,
	TP_DEBUG_LEVEL_CRITICAL = 1,		TP_DEBUG_LEVEL_CRITICAL = 1,
	TP_DEBUG_LEVEL_WARNING = 2,		TP_DEBUG_LEVEL_WARNING = 2,
	TP_DEBUG_LEVEL_MESSAGE = 3,		TP_DEBUG_LEVEL_MESSAGE = 3,
	TP_DEBUG_LEVEL_INFO = 4,		TP_DEBUG_LEVEL_INFO = 4,
	TP_DEBUG_LEVEL_DEBUG = 5,		TP_DEBUG_LEVEL_DEBUG = 5,
	} TpDebugLevel;		} TpDebugLevel;
	#define TP_NUM_DEBUG_LEVELS (5+1)		#define TP_NUM_DEBUG_LEVELS (5+1)
	#define NUM_TP_DEBUG_LEVELS TP_NUM_DEBUG_LEVELS
	typedef enum {		typedef enum {
	TP_TLS_CERTIFICATE_STATE_PENDING = 0,		TP_TLS_CERTIFICATE_STATE_PENDING = 0,
	TP_TLS_CERTIFICATE_STATE_ACCEPTED = 1,		TP_TLS_CERTIFICATE_STATE_ACCEPTED = 1,
	TP_TLS_CERTIFICATE_STATE_REJECTED = 2,		TP_TLS_CERTIFICATE_STATE_REJECTED = 2,
	} TpTLSCertificateState;		} TpTLSCertificateState;
	#define TP_NUM_TLS_CERTIFICATE_STATES (2+1)		#define TP_NUM_TLS_CERTIFICATE_STATES (2+1)
	#define NUM_TP_TLS_CERTIFICATE_STATES TP_NUM_TLS_CERTIFICATE_STATES
	typedef enum {		typedef enum {
	TP_TLS_CERTIFICATE_REJECT_REASON_UNKNOWN = 0,		TP_TLS_CERTIFICATE_REJECT_REASON_UNKNOWN = 0,
	TP_TLS_CERTIFICATE_REJECT_REASON_UNTRUSTED = 1,		TP_TLS_CERTIFICATE_REJECT_REASON_UNTRUSTED = 1,
	TP_TLS_CERTIFICATE_REJECT_REASON_EXPIRED = 2,		TP_TLS_CERTIFICATE_REJECT_REASON_EXPIRED = 2,
	TP_TLS_CERTIFICATE_REJECT_REASON_NOT_ACTIVATED = 3,		TP_TLS_CERTIFICATE_REJECT_REASON_NOT_ACTIVATED = 3,
	TP_TLS_CERTIFICATE_REJECT_REASON_FINGERPRINT_MISMATCH = 4,		TP_TLS_CERTIFICATE_REJECT_REASON_FINGERPRINT_MISMATCH = 4,
	TP_TLS_CERTIFICATE_REJECT_REASON_HOSTNAME_MISMATCH = 5,		TP_TLS_CERTIFICATE_REJECT_REASON_HOSTNAME_MISMATCH = 5,
	TP_TLS_CERTIFICATE_REJECT_REASON_SELF_SIGNED = 6,		TP_TLS_CERTIFICATE_REJECT_REASON_SELF_SIGNED = 6,
	TP_TLS_CERTIFICATE_REJECT_REASON_REVOKED = 7,		TP_TLS_CERTIFICATE_REJECT_REASON_REVOKED = 7,
	TP_TLS_CERTIFICATE_REJECT_REASON_INSECURE = 8,		TP_TLS_CERTIFICATE_REJECT_REASON_INSECURE = 8,
	TP_TLS_CERTIFICATE_REJECT_REASON_LIMIT_EXCEEDED = 9,		TP_TLS_CERTIFICATE_REJECT_REASON_LIMIT_EXCEEDED = 9,
	} TpTLSCertificateRejectReason;		} TpTLSCertificateRejectReason;
	#define TP_NUM_TLS_CERTIFICATE_REJECT_REASONS (9+1)		#define TP_NUM_TLS_CERTIFICATE_REJECT_REASONS (9+1)
	#define NUM_TP_TLS_CERTIFICATE_REJECT_REASONS TP_NUM_TLS_CERTIFICATE_REJECT _REASONS
	typedef enum {		typedef enum {
	TP_CALL_CONTENT_PACKETIZATION_TYPE_RTP = 0,		TP_CALL_CONTENT_PACKETIZATION_TYPE_RTP = 0,
	TP_CALL_CONTENT_PACKETIZATION_TYPE_RAW = 1,		TP_CALL_CONTENT_PACKETIZATION_TYPE_RAW = 1,
	TP_CALL_CONTENT_PACKETIZATION_TYPE_MSN_WEBCAM = 2,		TP_CALL_CONTENT_PACKETIZATION_TYPE_MSN_WEBCAM = 2,
	} TpCallContentPacketizationType;		} TpCallContentPacketizationType;
	#define TP_NUM_CALL_CONTENT_PACKETIZATION_TYPES (2+1)		#define TP_NUM_CALL_CONTENT_PACKETIZATION_TYPES (2+1)
	#define NUM_TP_CALL_CONTENT_PACKETIZATION_TYPES TP_NUM_CALL_CONTENT_PACKETI ZATION_TYPES
	typedef enum {		typedef enum {
	TP_CALL_CONTENT_DISPOSITION_NONE = 0,		TP_CALL_CONTENT_DISPOSITION_NONE = 0,
	TP_CALL_CONTENT_DISPOSITION_INITIAL = 1,		TP_CALL_CONTENT_DISPOSITION_INITIAL = 1,
	} TpCallContentDisposition;		} TpCallContentDisposition;
	#define TP_NUM_CALL_CONTENT_DISPOSITIONS (1+1)		#define TP_NUM_CALL_CONTENT_DISPOSITIONS (1+1)
	#define NUM_TP_CALL_CONTENT_DISPOSITIONS TP_NUM_CALL_CONTENT_DISPOSITIONS
	typedef enum /*< flags >*/ {		typedef enum /*< flags >*/ {
	TP_RTCP_XR_STATISTICS_FLAGS_LOSS = 1,		TP_RTCP_XR_STATISTICS_FLAGS_LOSS = 1,
	TP_RTCP_XR_STATISTICS_FLAGS_DUPLICATE = 2,		TP_RTCP_XR_STATISTICS_FLAGS_DUPLICATE = 2,
	TP_RTCP_XR_STATISTICS_FLAGS_JITTER = 4,		TP_RTCP_XR_STATISTICS_FLAGS_JITTER = 4,
	TP_RTCP_XR_STATISTICS_FLAGS_TTL = 8,		TP_RTCP_XR_STATISTICS_FLAGS_TTL = 8,
	TP_RTCP_XR_STATISTICS_FLAGS_HL = 16,		TP_RTCP_XR_STATISTICS_FLAGS_HL = 16,
	} TpRTCPXRStatisticsFlags;		} TpRTCPXRStatisticsFlags;
	typedef enum {		typedef enum {
	TP_RCPT_XR_RTT_MODE_ALL = 0,		TP_RCPT_XR_RTT_MODE_ALL = 0,
	TP_RCPT_XR_RTT_MODE_SENDER = 1,		TP_RCPT_XR_RTT_MODE_SENDER = 1,
	} TpRCPTXRRTTMode;		} TpRCPTXRRTTMode;
	#define TP_NUM_RCPT_XR_RTT_MODES (1+1)		#define TP_NUM_RCPT_XR_RTT_MODES (1+1)
	#define NUM_TP_RCPT_XR_RTT_MODES TP_NUM_RCPT_XR_RTT_MODES
			typedef enum {
			TP_MEDIA_STREAM_DIRECTION_NONE = 0,
			TP_MEDIA_STREAM_DIRECTION_SEND = 1,
			TP_MEDIA_STREAM_DIRECTION_RECEIVE = 2,
			TP_MEDIA_STREAM_DIRECTION_BIDIRECTIONAL = 3,
			} TpMediaStreamDirection;
			#define TP_NUM_MEDIA_STREAM_DIRECTIONS (3+1)
	typedef enum {		typedef enum {
	TP_STREAM_FLOW_STATE_STOPPED = 0,		TP_STREAM_FLOW_STATE_STOPPED = 0,
	TP_STREAM_FLOW_STATE_PENDING_START = 1,		TP_STREAM_FLOW_STATE_PENDING_START = 1,
	TP_STREAM_FLOW_STATE_PENDING_STOP = 2,		TP_STREAM_FLOW_STATE_PENDING_STOP = 2,
	TP_STREAM_FLOW_STATE_STARTED = 3,		TP_STREAM_FLOW_STATE_STARTED = 3,
	} TpStreamFlowState;		} TpStreamFlowState;
	#define TP_NUM_STREAM_FLOW_STATES (3+1)		#define TP_NUM_STREAM_FLOW_STATES (3+1)
	#define NUM_TP_STREAM_FLOW_STATES TP_NUM_STREAM_FLOW_STATES
	typedef enum {		typedef enum {
	TP_CALL_STREAM_CANDIDATE_TYPE_NONE = 0,		TP_CALL_STREAM_CANDIDATE_TYPE_NONE = 0,
	TP_CALL_STREAM_CANDIDATE_TYPE_HOST = 1,		TP_CALL_STREAM_CANDIDATE_TYPE_HOST = 1,
	TP_CALL_STREAM_CANDIDATE_TYPE_SERVER_REFLEXIVE = 2,		TP_CALL_STREAM_CANDIDATE_TYPE_SERVER_REFLEXIVE = 2,
	TP_CALL_STREAM_CANDIDATE_TYPE_PEER_REFLEXIVE = 3,		TP_CALL_STREAM_CANDIDATE_TYPE_PEER_REFLEXIVE = 3,
	TP_CALL_STREAM_CANDIDATE_TYPE_RELAY = 4,		TP_CALL_STREAM_CANDIDATE_TYPE_RELAY = 4,
	TP_CALL_STREAM_CANDIDATE_TYPE_MULTICAST = 5,		TP_CALL_STREAM_CANDIDATE_TYPE_MULTICAST = 5,
	} TpCallStreamCandidateType;		} TpCallStreamCandidateType;
	#define TP_NUM_CALL_STREAM_CANDIDATE_TYPES (5+1)		#define TP_NUM_CALL_STREAM_CANDIDATE_TYPES (5+1)
	#define NUM_TP_CALL_STREAM_CANDIDATE_TYPES TP_NUM_CALL_STREAM_CANDIDATE_TYP
	ES		typedef enum {
			TP_MEDIA_STREAM_BASE_PROTO_UDP = 0,
			TP_MEDIA_STREAM_BASE_PROTO_TCP = 1,
			} TpMediaStreamBaseProto;
			#define TP_NUM_MEDIA_STREAM_BASE_PROTOS (1+1)
	typedef enum {		typedef enum {
	TP_STREAM_COMPONENT_UNKNOWN = 0,		TP_STREAM_COMPONENT_UNKNOWN = 0,
	TP_STREAM_COMPONENT_DATA = 1,		TP_STREAM_COMPONENT_DATA = 1,
	TP_STREAM_COMPONENT_CONTROL = 2,		TP_STREAM_COMPONENT_CONTROL = 2,
	} TpStreamComponent;		} TpStreamComponent;
	#define TP_NUM_STREAM_COMPONENTS (2+1)		#define TP_NUM_STREAM_COMPONENTS (2+1)
	#define NUM_TP_STREAM_COMPONENTS TP_NUM_STREAM_COMPONENTS
	typedef enum {		typedef enum {
	TP_STREAM_TRANSPORT_TYPE_UNKNOWN = 0,		TP_STREAM_TRANSPORT_TYPE_UNKNOWN = 0,
	TP_STREAM_TRANSPORT_TYPE_RAW_UDP = 1,		TP_STREAM_TRANSPORT_TYPE_RAW_UDP = 1,
	TP_STREAM_TRANSPORT_TYPE_ICE = 2,		TP_STREAM_TRANSPORT_TYPE_ICE = 2,
	TP_STREAM_TRANSPORT_TYPE_GTALK_P2P = 3,		TP_STREAM_TRANSPORT_TYPE_GTALK_P2P = 3,
	TP_STREAM_TRANSPORT_TYPE_WLM_2009 = 4,		TP_STREAM_TRANSPORT_TYPE_WLM_2009 = 4,
	TP_STREAM_TRANSPORT_TYPE_SHM = 5,		TP_STREAM_TRANSPORT_TYPE_SHM = 5,
	TP_STREAM_TRANSPORT_TYPE_MULTICAST = 6,		TP_STREAM_TRANSPORT_TYPE_MULTICAST = 6,
	} TpStreamTransportType;		} TpStreamTransportType;
	#define TP_NUM_STREAM_TRANSPORT_TYPES (6+1)		#define TP_NUM_STREAM_TRANSPORT_TYPES (6+1)
	#define NUM_TP_STREAM_TRANSPORT_TYPES TP_NUM_STREAM_TRANSPORT_TYPES
	typedef enum {		typedef enum {
	TP_SENDING_STATE_NONE = 0,		TP_SENDING_STATE_NONE = 0,
	TP_SENDING_STATE_PENDING_SEND = 1,		TP_SENDING_STATE_PENDING_SEND = 1,
	TP_SENDING_STATE_SENDING = 2,		TP_SENDING_STATE_SENDING = 2,
	TP_SENDING_STATE_PENDING_STOP_SENDING = 3,		TP_SENDING_STATE_PENDING_STOP_SENDING = 3,
	} TpSendingState;		} TpSendingState;
	#define TP_NUM_SENDING_STATES (3+1)		#define TP_NUM_SENDING_STATES (3+1)
	#define NUM_TP_SENDING_STATES TP_NUM_SENDING_STATES
	typedef enum {		typedef enum {
	TP_STREAM_ENDPOINT_STATE_CONNECTING = 0,		TP_STREAM_ENDPOINT_STATE_CONNECTING = 0,
	TP_STREAM_ENDPOINT_STATE_PROVISIONALLY_CONNECTED = 1,		TP_STREAM_ENDPOINT_STATE_PROVISIONALLY_CONNECTED = 1,
	TP_STREAM_ENDPOINT_STATE_FULLY_CONNECTED = 2,		TP_STREAM_ENDPOINT_STATE_FULLY_CONNECTED = 2,
	TP_STREAM_ENDPOINT_STATE_EXHAUSTED_CANDIDATES = 3,		TP_STREAM_ENDPOINT_STATE_EXHAUSTED_CANDIDATES = 3,
	TP_STREAM_ENDPOINT_STATE_FAILED = 4,		TP_STREAM_ENDPOINT_STATE_FAILED = 4,
	} TpStreamEndpointState;		} TpStreamEndpointState;
	#define TP_NUM_STREAM_ENDPOINT_STATES (4+1)		#define TP_NUM_STREAM_ENDPOINT_STATES (4+1)
	#define NUM_TP_STREAM_ENDPOINT_STATES TP_NUM_STREAM_ENDPOINT_STATES
	#ifdef __cplusplus		#ifdef __cplusplus
	}		}
	#endif		#endif
End of changes. 44 change blocks.
	219 lines changed or deleted		72 lines changed or added

	telepathy-glib-dbus.h		telepathy-glib-dbus.h
	skipping to change at line 26		skipping to change at line 26
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#ifndef __TP_GLIB_DBUS_H__		#ifndef __TP_GLIB_DBUS_H__
	#define __TP_GLIB_DBUS_H__		#define __TP_GLIB_DBUS_H__
	#include <telepathy-glib/telepathy-glib.h>		#include <telepathy-glib/telepathy-glib.h>
	#define _TP_IN_META_HEADER		#define _TP_GLIB_DBUS_H_INSIDE
			#define _TP_GLIB_H_INSIDE
	/* common */		/* common */
	#include <telepathy-glib/gtypes.h>		#include <telepathy-glib/gtypes.h>
	#include <telepathy-glib/interfaces.h>		#include <telepathy-glib/interfaces.h>
	/* client-side */		/* client-side */
	#include <telepathy-glib/_gen/tp-cli-account.h>		#include <telepathy-glib/_gen/tp-cli-account.h>
	#include <telepathy-glib/_gen/tp-cli-account-manager.h>		#include <telepathy-glib/_gen/tp-cli-account-manager.h>
	#include <telepathy-glib/_gen/tp-cli-call-content.h>		#include <telepathy-glib/_gen/tp-cli-call-content.h>
	#include <telepathy-glib/_gen/tp-cli-call-content-media-description.h>		#include <telepathy-glib/_gen/tp-cli-call-content-media-description.h>
	skipping to change at line 49		skipping to change at line 50
	#include <telepathy-glib/_gen/tp-cli-channel-dispatcher.h>		#include <telepathy-glib/_gen/tp-cli-channel-dispatcher.h>
	#include <telepathy-glib/_gen/tp-cli-channel-dispatch-operation.h>		#include <telepathy-glib/_gen/tp-cli-channel-dispatch-operation.h>
	#include <telepathy-glib/_gen/tp-cli-channel.h>		#include <telepathy-glib/_gen/tp-cli-channel.h>
	#include <telepathy-glib/_gen/tp-cli-channel-request.h>		#include <telepathy-glib/_gen/tp-cli-channel-request.h>
	#include <telepathy-glib/_gen/tp-cli-client.h>		#include <telepathy-glib/_gen/tp-cli-client.h>
	#include <telepathy-glib/_gen/tp-cli-connection.h>		#include <telepathy-glib/_gen/tp-cli-connection.h>
	#include <telepathy-glib/_gen/tp-cli-connection-manager.h>		#include <telepathy-glib/_gen/tp-cli-connection-manager.h>
	#include <telepathy-glib/_gen/tp-cli-dbus-daemon.h>		#include <telepathy-glib/_gen/tp-cli-dbus-daemon.h>
	#include <telepathy-glib/_gen/tp-cli-debug.h>		#include <telepathy-glib/_gen/tp-cli-debug.h>
	#include <telepathy-glib/_gen/tp-cli-generic.h>		#include <telepathy-glib/_gen/tp-cli-generic.h>
	#include <telepathy-glib/_gen/tp-cli-media-session-handler.h>
	#include <telepathy-glib/_gen/tp-cli-media-stream-handler.h>
	#include <telepathy-glib/_gen/tp-cli-protocol.h>		#include <telepathy-glib/_gen/tp-cli-protocol.h>
	/* service-side */		/* service-side */
	#include <telepathy-glib/svc-account.h>		#include <telepathy-glib/svc-account.h>
	#include <telepathy-glib/svc-account-manager.h>		#include <telepathy-glib/svc-account-manager.h>
	#include <telepathy-glib/svc-call.h>		#include <telepathy-glib/svc-call.h>
	#include <telepathy-glib/svc-channel-dispatcher.h>		#include <telepathy-glib/svc-channel-dispatcher.h>
	#include <telepathy-glib/svc-channel-dispatch-operation.h>		#include <telepathy-glib/svc-channel-dispatch-operation.h>
	#include <telepathy-glib/svc-channel.h>		#include <telepathy-glib/svc-channel.h>
	#include <telepathy-glib/svc-channel-request.h>		#include <telepathy-glib/svc-channel-request.h>
	#include <telepathy-glib/svc-client.h>		#include <telepathy-glib/svc-client.h>
	#include <telepathy-glib/svc-connection.h>		#include <telepathy-glib/svc-connection.h>
	#include <telepathy-glib/svc-connection-manager.h>		#include <telepathy-glib/svc-connection-manager.h>
	#include <telepathy-glib/svc-debug.h>		#include <telepathy-glib/svc-debug.h>
	#include <telepathy-glib/svc-generic.h>		#include <telepathy-glib/svc-generic.h>
	#include <telepathy-glib/svc-media-interfaces.h>
	#include <telepathy-glib/svc-properties-interface.h>		#include <telepathy-glib/svc-properties-interface.h>
	#include <telepathy-glib/svc-protocol.h>		#include <telepathy-glib/svc-protocol.h>
	#include <telepathy-glib/svc-tls.h>		#include <telepathy-glib/svc-tls.h>
	#undef _TP_IN_META_HEADER		#undef _TP_GLIB_DBUS_H_INSIDE
			#undef _TP_GLIB_H_INSIDE
	#endif /* __TP_GLIB_DBUS_H__ */		#endif /* __TP_GLIB_DBUS_H__ */
End of changes. 4 change blocks.
	5 lines changed or deleted		4 lines changed or added

	telepathy-glib.h		telepathy-glib.h
	skipping to change at line 24		skipping to change at line 24
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#ifndef __TP_GLIB_H__		#ifndef __TP_GLIB_H__
	#define __TP_GLIB_H__		#define __TP_GLIB_H__
	#define _TP_IN_META_HEADER		#define _TP_GLIB_H_INSIDE
	#include <telepathy-glib/enums.h>		#include <telepathy-glib/enums.h>
	#include <telepathy-glib/errors.h>		#include <telepathy-glib/errors.h>
	#include <telepathy-glib/util.h>		#include <telepathy-glib/util.h>
	#include <telepathy-glib/gnio-util.h>		#include <telepathy-glib/gnio-util.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	#include <telepathy-glib/intset.h>		#include <telepathy-glib/intset.h>
	#include <telepathy-glib/heap.h>		#include <telepathy-glib/heap.h>
	#include <telepathy-glib/account-channel-request.h>		#include <telepathy-glib/account-channel-request.h>
	skipping to change at line 94		skipping to change at line 94
	#include <telepathy-glib/debug.h>		#include <telepathy-glib/debug.h>
	#include <telepathy-glib/dtmf.h>		#include <telepathy-glib/dtmf.h>
	#include <telepathy-glib/exportable-channel.h>		#include <telepathy-glib/exportable-channel.h>
	#include <telepathy-glib/file-transfer-channel.h>		#include <telepathy-glib/file-transfer-channel.h>
	#include <telepathy-glib/group-mixin.h>		#include <telepathy-glib/group-mixin.h>
	#include <telepathy-glib/handle-channels-context.h>		#include <telepathy-glib/handle-channels-context.h>
	#include <telepathy-glib/handle-repo.h>		#include <telepathy-glib/handle-repo.h>
	#include <telepathy-glib/handle-repo-dynamic.h>		#include <telepathy-glib/handle-repo-dynamic.h>
	#include <telepathy-glib/handle-repo-static.h>		#include <telepathy-glib/handle-repo-static.h>
	#include <telepathy-glib/handle.h>		#include <telepathy-glib/handle.h>
	#include <telepathy-glib/media-interfaces.h>
	#include <telepathy-glib/message.h>		#include <telepathy-glib/message.h>
	#include <telepathy-glib/message-mixin.h>		#include <telepathy-glib/message-mixin.h>
	#include <telepathy-glib/observe-channels-context.h>		#include <telepathy-glib/observe-channels-context.h>
	#include <telepathy-glib/presence-mixin.h>		#include <telepathy-glib/presence-mixin.h>
	#include <telepathy-glib/protocol.h>		#include <telepathy-glib/protocol.h>
	#include <telepathy-glib/proxy.h>		#include <telepathy-glib/proxy.h>
	#include <telepathy-glib/room-info.h>		#include <telepathy-glib/room-info.h>
	#include <telepathy-glib/room-list.h>		#include <telepathy-glib/room-list.h>
	#include <telepathy-glib/run.h>		#include <telepathy-glib/run.h>
	#include <telepathy-glib/signalled-message.h>		#include <telepathy-glib/signalled-message.h>
	#include <telepathy-glib/simple-approver.h>		#include <telepathy-glib/simple-approver.h>
	#include <telepathy-glib/simple-client-factory.h>		#include <telepathy-glib/client-factory.h>
	#include <telepathy-glib/simple-handler.h>		#include <telepathy-glib/simple-handler.h>
	#include <telepathy-glib/simple-password-manager.h>		#include <telepathy-glib/simple-password-manager.h>
	#include <telepathy-glib/simple-observer.h>		#include <telepathy-glib/simple-observer.h>
	#include <telepathy-glib/stream-tube-channel.h>		#include <telepathy-glib/stream-tube-channel.h>
	#include <telepathy-glib/stream-tube-connection.h>		#include <telepathy-glib/stream-tube-connection.h>
	#include <telepathy-glib/text-channel.h>		#include <telepathy-glib/text-channel.h>
	#include <telepathy-glib/text-mixin.h>
	#include <telepathy-glib/tls-certificate.h>		#include <telepathy-glib/tls-certificate.h>
	#include <telepathy-glib/variant-util.h>		#include <telepathy-glib/variant-util.h>
	/* deprecated, gone in 1.0 */		#undef _TP_GLIB_H_INSIDE
	#include <telepathy-glib/automatic-proxy-factory.h>
	#include <telepathy-glib/basic-proxy-factory.h>
	#include <telepathy-glib/channel-iface.h>
	#include <telepathy-glib/client-channel-factory.h>
	/* D-Bus-API-dependent, moved to telepathy-glib-dbus.h in 1.0 */
	#include <telepathy-glib/gtypes.h>
	#include <telepathy-glib/interfaces.h>
	#include <telepathy-glib/svc-generic.h>
	#include <telepathy-glib/svc-client.h>
	#undef _TP_IN_META_HEADER
	#endif /* __TP_GLIB_H__ */		#endif /* __TP_GLIB_H__ */
End of changes. 5 change blocks.
	17 lines changed or deleted		3 lines changed or added

	telepathy-interfaces.h		telepathy-interfaces.h
	/* Generated from: telepathy-glib		/* Generated from: telepathy-glib
	*/		*/
	#include <glib.h>		#include <glib.h>
	#define TP_IFACE_CONNECTION_MANAGER \		#define TP_IFACE_CONNECTION_MANAGER \
	"org.freedesktop.Telepathy.ConnectionManager"		"im.telepathy1.ConnectionManager"
	#define TP_IFACE_QUARK_CONNECTION_MANAGER \		#define TP_IFACE_QUARK_CONNECTION_MANAGER \
	(tp_iface_quark_connection_manager ())		(tp_iface_quark_connection_manager ())
	GQuark tp_iface_quark_connection_manager (void);		GQuark tp_iface_quark_connection_manager (void);
	#define TP_PROP_CONNECTION_MANAGER_PROTOCOLS \		#define TP_PROP_CONNECTION_MANAGER_PROTOCOLS \
	"org.freedesktop.Telepathy.ConnectionManager.Protocols"		"im.telepathy1.ConnectionManager.Protocols"
	#define TP_PROP_CONNECTION_MANAGER_INTERFACES \		#define TP_PROP_CONNECTION_MANAGER_INTERFACES \
	"org.freedesktop.Telepathy.ConnectionManager.Interfaces"		"im.telepathy1.ConnectionManager.Interfaces"
	#define TP_IFACE_PROTOCOL \		#define TP_IFACE_PROTOCOL \
	"org.freedesktop.Telepathy.Protocol"		"im.telepathy1.Protocol"
	#define TP_IFACE_QUARK_PROTOCOL \		#define TP_IFACE_QUARK_PROTOCOL \
	(tp_iface_quark_protocol ())		(tp_iface_quark_protocol ())
	GQuark tp_iface_quark_protocol (void);		GQuark tp_iface_quark_protocol (void);
	#define TP_PROP_PROTOCOL_INTERFACES \		#define TP_PROP_PROTOCOL_INTERFACES \
	"org.freedesktop.Telepathy.Protocol.Interfaces"		"im.telepathy1.Protocol.Interfaces"
	#define TP_PROP_PROTOCOL_PARAMETERS \		#define TP_PROP_PROTOCOL_PARAMETERS \
	"org.freedesktop.Telepathy.Protocol.Parameters"		"im.telepathy1.Protocol.Parameters"
	#define TP_PROP_PROTOCOL_CONNECTION_INTERFACES \		#define TP_PROP_PROTOCOL_CONNECTION_INTERFACES \
	"org.freedesktop.Telepathy.Protocol.ConnectionInterfaces"		"im.telepathy1.Protocol.ConnectionInterfaces"
	#define TP_PROP_PROTOCOL_REQUESTABLE_CHANNEL_CLASSES \		#define TP_PROP_PROTOCOL_REQUESTABLE_CHANNEL_CLASSES \
	"org.freedesktop.Telepathy.Protocol.RequestableChannelClasses"		"im.telepathy1.Protocol.RequestableChannelClasses"
	#define TP_PROP_PROTOCOL_VCARD_FIELD \		#define TP_PROP_PROTOCOL_VCARD_FIELD \
	"org.freedesktop.Telepathy.Protocol.VCardField"		"im.telepathy1.Protocol.VCardField"
	#define TP_PROP_PROTOCOL_ENGLISH_NAME \		#define TP_PROP_PROTOCOL_ENGLISH_NAME \
	"org.freedesktop.Telepathy.Protocol.EnglishName"		"im.telepathy1.Protocol.EnglishName"
	#define TP_PROP_PROTOCOL_ICON \		#define TP_PROP_PROTOCOL_ICON \
	"org.freedesktop.Telepathy.Protocol.Icon"		"im.telepathy1.Protocol.Icon"
	#define TP_PROP_PROTOCOL_AUTHENTICATION_TYPES \		#define TP_PROP_PROTOCOL_AUTHENTICATION_TYPES \
	"org.freedesktop.Telepathy.Protocol.AuthenticationTypes"		"im.telepathy1.Protocol.AuthenticationTypes"
	#define TP_IFACE_PROTOCOL_INTERFACE_ADDRESSING \		#define TP_IFACE_PROTOCOL_INTERFACE_ADDRESSING \
	"org.freedesktop.Telepathy.Protocol.Interface.Addressing"		"im.telepathy1.Protocol.Interface.Addressing1"
	#define TP_IFACE_QUARK_PROTOCOL_INTERFACE_ADDRESSING \		#define TP_IFACE_QUARK_PROTOCOL_INTERFACE_ADDRESSING \
	(tp_iface_quark_protocol_interface_addressing ())		(tp_iface_quark_protocol_interface_addressing ())
	GQuark tp_iface_quark_protocol_interface_addressing (void);		GQuark tp_iface_quark_protocol_interface_addressing (void);
	#define TP_PROP_PROTOCOL_INTERFACE_ADDRESSING_ADDRESSABLE_VCARD_FIELDS \		#define TP_PROP_PROTOCOL_INTERFACE_ADDRESSING_ADDRESSABLE_VCARD_FIELDS \
	"org.freedesktop.Telepathy.Protocol.Interface.Addressing.AddressableVCardFi elds"		"im.telepathy1.Protocol.Interface.Addressing1.AddressableVCardFields"
	#define TP_PROP_PROTOCOL_INTERFACE_ADDRESSING_ADDRESSABLE_URI_SCHEMES \		#define TP_PROP_PROTOCOL_INTERFACE_ADDRESSING_ADDRESSABLE_URI_SCHEMES \
	"org.freedesktop.Telepathy.Protocol.Interface.Addressing.AddressableURISche mes"		"im.telepathy1.Protocol.Interface.Addressing1.AddressableURISchemes"
	#define TP_IFACE_PROTOCOL_INTERFACE_AVATARS \		#define TP_IFACE_PROTOCOL_INTERFACE_AVATARS \
	"org.freedesktop.Telepathy.Protocol.Interface.Avatars"		"im.telepathy1.Protocol.Interface.Avatars1"
	#define TP_IFACE_QUARK_PROTOCOL_INTERFACE_AVATARS \		#define TP_IFACE_QUARK_PROTOCOL_INTERFACE_AVATARS \
	(tp_iface_quark_protocol_interface_avatars ())		(tp_iface_quark_protocol_interface_avatars ())
	GQuark tp_iface_quark_protocol_interface_avatars (void);		GQuark tp_iface_quark_protocol_interface_avatars (void);
	#define TP_PROP_PROTOCOL_INTERFACE_AVATARS_SUPPORTED_AVATAR_MIME_TYPES \		#define TP_PROP_PROTOCOL_INTERFACE_AVATARS_SUPPORTED_AVATAR_MIME_TYPES \
	"org.freedesktop.Telepathy.Protocol.Interface.Avatars.SupportedAvatarMIMETy pes"		"im.telepathy1.Protocol.Interface.Avatars1.SupportedAvatarMIMETypes"
	#define TP_PROP_PROTOCOL_INTERFACE_AVATARS_MINIMUM_AVATAR_HEIGHT \		#define TP_PROP_PROTOCOL_INTERFACE_AVATARS_MINIMUM_AVATAR_HEIGHT \
	"org.freedesktop.Telepathy.Protocol.Interface.Avatars.MinimumAvatarHeight"		"im.telepathy1.Protocol.Interface.Avatars1.MinimumAvatarHeight"
	#define TP_PROP_PROTOCOL_INTERFACE_AVATARS_MINIMUM_AVATAR_WIDTH \		#define TP_PROP_PROTOCOL_INTERFACE_AVATARS_MINIMUM_AVATAR_WIDTH \
	"org.freedesktop.Telepathy.Protocol.Interface.Avatars.MinimumAvatarWidth"		"im.telepathy1.Protocol.Interface.Avatars1.MinimumAvatarWidth"
	#define TP_PROP_PROTOCOL_INTERFACE_AVATARS_RECOMMENDED_AVATAR_HEIGHT \		#define TP_PROP_PROTOCOL_INTERFACE_AVATARS_RECOMMENDED_AVATAR_HEIGHT \
	"org.freedesktop.Telepathy.Protocol.Interface.Avatars.RecommendedAvatarHeig ht"		"im.telepathy1.Protocol.Interface.Avatars1.RecommendedAvatarHeight"
	#define TP_PROP_PROTOCOL_INTERFACE_AVATARS_RECOMMENDED_AVATAR_WIDTH \		#define TP_PROP_PROTOCOL_INTERFACE_AVATARS_RECOMMENDED_AVATAR_WIDTH \
	"org.freedesktop.Telepathy.Protocol.Interface.Avatars.RecommendedAvatarWidt h"		"im.telepathy1.Protocol.Interface.Avatars1.RecommendedAvatarWidth"
	#define TP_PROP_PROTOCOL_INTERFACE_AVATARS_MAXIMUM_AVATAR_HEIGHT \		#define TP_PROP_PROTOCOL_INTERFACE_AVATARS_MAXIMUM_AVATAR_HEIGHT \
	"org.freedesktop.Telepathy.Protocol.Interface.Avatars.MaximumAvatarHeight"		"im.telepathy1.Protocol.Interface.Avatars1.MaximumAvatarHeight"
	#define TP_PROP_PROTOCOL_INTERFACE_AVATARS_MAXIMUM_AVATAR_WIDTH \		#define TP_PROP_PROTOCOL_INTERFACE_AVATARS_MAXIMUM_AVATAR_WIDTH \
	"org.freedesktop.Telepathy.Protocol.Interface.Avatars.MaximumAvatarWidth"		"im.telepathy1.Protocol.Interface.Avatars1.MaximumAvatarWidth"
	#define TP_PROP_PROTOCOL_INTERFACE_AVATARS_MAXIMUM_AVATAR_BYTES \		#define TP_PROP_PROTOCOL_INTERFACE_AVATARS_MAXIMUM_AVATAR_BYTES \
	"org.freedesktop.Telepathy.Protocol.Interface.Avatars.MaximumAvatarBytes"		"im.telepathy1.Protocol.Interface.Avatars1.MaximumAvatarBytes"
	#define TP_IFACE_PROTOCOL_INTERFACE_PRESENCE \		#define TP_IFACE_PROTOCOL_INTERFACE_PRESENCE \
	"org.freedesktop.Telepathy.Protocol.Interface.Presence"		"im.telepathy1.Protocol.Interface.Presence1"
	#define TP_IFACE_QUARK_PROTOCOL_INTERFACE_PRESENCE \		#define TP_IFACE_QUARK_PROTOCOL_INTERFACE_PRESENCE \
	(tp_iface_quark_protocol_interface_presence ())		(tp_iface_quark_protocol_interface_presence ())
	GQuark tp_iface_quark_protocol_interface_presence (void);		GQuark tp_iface_quark_protocol_interface_presence (void);
	#define TP_PROP_PROTOCOL_INTERFACE_PRESENCE_STATUSES \		#define TP_PROP_PROTOCOL_INTERFACE_PRESENCE_STATUSES \
	"org.freedesktop.Telepathy.Protocol.Interface.Presence.Statuses"		"im.telepathy1.Protocol.Interface.Presence1.Statuses"
	#define TP_IFACE_CONNECTION \		#define TP_IFACE_CONNECTION \
	"org.freedesktop.Telepathy.Connection"		"im.telepathy1.Connection"
	#define TP_IFACE_QUARK_CONNECTION \		#define TP_IFACE_QUARK_CONNECTION \
	(tp_iface_quark_connection ())		(tp_iface_quark_connection ())
	GQuark tp_iface_quark_connection (void);		GQuark tp_iface_quark_connection (void);
	#define TP_PROP_CONNECTION_INTERFACES \		#define TP_PROP_CONNECTION_INTERFACES \
	"org.freedesktop.Telepathy.Connection.Interfaces"		"im.telepathy1.Connection.Interfaces"
	#define TP_PROP_CONNECTION_SELF_HANDLE \		#define TP_PROP_CONNECTION_SELF_HANDLE \
	"org.freedesktop.Telepathy.Connection.SelfHandle"		"im.telepathy1.Connection.SelfHandle"
	#define TP_PROP_CONNECTION_SELF_ID \		#define TP_PROP_CONNECTION_SELF_ID \
	"org.freedesktop.Telepathy.Connection.SelfID"		"im.telepathy1.Connection.SelfID"
	#define TP_PROP_CONNECTION_STATUS \		#define TP_PROP_CONNECTION_STATUS \
	"org.freedesktop.Telepathy.Connection.Status"		"im.telepathy1.Connection.Status"
	#define TP_PROP_CONNECTION_HAS_IMMORTAL_HANDLES \
	"org.freedesktop.Telepathy.Connection.HasImmortalHandles"
	#define TP_TOKEN_CONNECTION_CONTACT_ID \		#define TP_TOKEN_CONNECTION_CONTACT_ID \
	"org.freedesktop.Telepathy.Connection/contact-id"		"im.telepathy1.Connection/contact-id"
			#define TP_IFACE_CONNECTION_INTERFACE_CONTACTS \
			"im.telepathy1.Connection.Interface.Contacts"
			#define TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACTS \
			(tp_iface_quark_connection_interface_contacts ())
			GQuark tp_iface_quark_connection_interface_contacts (void);
			#define TP_IFACE_CONNECTION_INTERFACE_REQUESTS \
			"im.telepathy1.Connection.Interface.Requests"
			#define TP_IFACE_QUARK_CONNECTION_INTERFACE_REQUESTS \
			(tp_iface_quark_connection_interface_requests ())
			GQuark tp_iface_quark_connection_interface_requests (void);
			#define TP_PROP_CONNECTION_INTERFACE_REQUESTS_CHANNELS \
			"im.telepathy1.Connection.Interface.Requests.Channels"
			#define TP_PROP_CONNECTION_INTERFACE_REQUESTS_REQUESTABLE_CHANNEL_CLASSES \
			"im.telepathy1.Connection.Interface.Requests.RequestableChannelClasses"
	#define TP_IFACE_CONNECTION_INTERFACE_ADDRESSING \		#define TP_IFACE_CONNECTION_INTERFACE_ADDRESSING \
	"org.freedesktop.Telepathy.Connection.Interface.Addressing1"		"im.telepathy1.Connection.Interface.Addressing1"
	#define TP_IFACE_QUARK_CONNECTION_INTERFACE_ADDRESSING \		#define TP_IFACE_QUARK_CONNECTION_INTERFACE_ADDRESSING \
	(tp_iface_quark_connection_interface_addressing ())		(tp_iface_quark_connection_interface_addressing ())
	GQuark tp_iface_quark_connection_interface_addressing (void);		GQuark tp_iface_quark_connection_interface_addressing (void);
	#define TP_TOKEN_CONNECTION_INTERFACE_ADDRESSING_ADDRESSES \		#define TP_TOKEN_CONNECTION_INTERFACE_ADDRESSING_ADDRESSES \
	"org.freedesktop.Telepathy.Connection.Interface.Addressing1/addresses"		"im.telepathy1.Connection.Interface.Addressing1/addresses"
	#define TP_TOKEN_CONNECTION_INTERFACE_ADDRESSING_URIS \		#define TP_TOKEN_CONNECTION_INTERFACE_ADDRESSING_URIS \
	"org.freedesktop.Telepathy.Connection.Interface.Addressing1/uris"		"im.telepathy1.Connection.Interface.Addressing1/uris"
	#define TP_IFACE_CONNECTION_INTERFACE_ALIASING \		#define TP_IFACE_CONNECTION_INTERFACE_ALIASING \
	"org.freedesktop.Telepathy.Connection.Interface.Aliasing"		"im.telepathy1.Connection.Interface.Aliasing1"
	#define TP_IFACE_QUARK_CONNECTION_INTERFACE_ALIASING \		#define TP_IFACE_QUARK_CONNECTION_INTERFACE_ALIASING \
	(tp_iface_quark_connection_interface_aliasing ())		(tp_iface_quark_connection_interface_aliasing ())
	GQuark tp_iface_quark_connection_interface_aliasing (void);		GQuark tp_iface_quark_connection_interface_aliasing (void);
			#define TP_PROP_CONNECTION_INTERFACE_ALIASING_ALIAS_FLAGS \
			"im.telepathy1.Connection.Interface.Aliasing1.AliasFlags"
	#define TP_TOKEN_CONNECTION_INTERFACE_ALIASING_ALIAS \		#define TP_TOKEN_CONNECTION_INTERFACE_ALIASING_ALIAS \
	"org.freedesktop.Telepathy.Connection.Interface.Aliasing/alias"		"im.telepathy1.Connection.Interface.Aliasing1/alias"
	#define TP_IFACE_CONNECTION_INTERFACE_ANONYMITY \		#define TP_IFACE_CONNECTION_INTERFACE_ANONYMITY \
	"org.freedesktop.Telepathy.Connection.Interface.Anonymity"		"im.telepathy1.Connection.Interface.Anonymity1"
	#define TP_IFACE_QUARK_CONNECTION_INTERFACE_ANONYMITY \		#define TP_IFACE_QUARK_CONNECTION_INTERFACE_ANONYMITY \
	(tp_iface_quark_connection_interface_anonymity ())		(tp_iface_quark_connection_interface_anonymity ())
	GQuark tp_iface_quark_connection_interface_anonymity (void);		GQuark tp_iface_quark_connection_interface_anonymity (void);
	#define TP_PROP_CONNECTION_INTERFACE_ANONYMITY_SUPPORTED_ANONYMITY_MODES \		#define TP_PROP_CONNECTION_INTERFACE_ANONYMITY_SUPPORTED_ANONYMITY_MODES \
	"org.freedesktop.Telepathy.Connection.Interface.Anonymity.SupportedAnonymit yModes"		"im.telepathy1.Connection.Interface.Anonymity1.SupportedAnonymityModes"
	#define TP_PROP_CONNECTION_INTERFACE_ANONYMITY_ANONYMITY_MANDATORY \		#define TP_PROP_CONNECTION_INTERFACE_ANONYMITY_ANONYMITY_MANDATORY \
	"org.freedesktop.Telepathy.Connection.Interface.Anonymity.AnonymityMandator y"		"im.telepathy1.Connection.Interface.Anonymity1.AnonymityMandatory"
	#define TP_PROP_CONNECTION_INTERFACE_ANONYMITY_ANONYMITY_MODES \		#define TP_PROP_CONNECTION_INTERFACE_ANONYMITY_ANONYMITY_MODES \
	"org.freedesktop.Telepathy.Connection.Interface.Anonymity.AnonymityModes"		"im.telepathy1.Connection.Interface.Anonymity1.AnonymityModes"
	#define TP_IFACE_CONNECTION_INTERFACE_AVATARS \		#define TP_IFACE_CONNECTION_INTERFACE_AVATARS \
	"org.freedesktop.Telepathy.Connection.Interface.Avatars"		"im.telepathy1.Connection.Interface.Avatars1"
	#define TP_IFACE_QUARK_CONNECTION_INTERFACE_AVATARS \		#define TP_IFACE_QUARK_CONNECTION_INTERFACE_AVATARS \
	(tp_iface_quark_connection_interface_avatars ())		(tp_iface_quark_connection_interface_avatars ())
	GQuark tp_iface_quark_connection_interface_avatars (void);		GQuark tp_iface_quark_connection_interface_avatars (void);
	#define TP_PROP_CONNECTION_INTERFACE_AVATARS_SUPPORTED_AVATAR_MIME_TYPES \		#define TP_PROP_CONNECTION_INTERFACE_AVATARS_SUPPORTED_AVATAR_MIME_TYPES \
	"org.freedesktop.Telepathy.Connection.Interface.Avatars.SupportedAvatarMIME Types"		"im.telepathy1.Connection.Interface.Avatars1.SupportedAvatarMIMETypes"
	#define TP_PROP_CONNECTION_INTERFACE_AVATARS_MINIMUM_AVATAR_HEIGHT \		#define TP_PROP_CONNECTION_INTERFACE_AVATARS_MINIMUM_AVATAR_HEIGHT \
	"org.freedesktop.Telepathy.Connection.Interface.Avatars.MinimumAvatarHeight "		"im.telepathy1.Connection.Interface.Avatars1.MinimumAvatarHeight"
	#define TP_PROP_CONNECTION_INTERFACE_AVATARS_MINIMUM_AVATAR_WIDTH \		#define TP_PROP_CONNECTION_INTERFACE_AVATARS_MINIMUM_AVATAR_WIDTH \
	"org.freedesktop.Telepathy.Connection.Interface.Avatars.MinimumAvatarWidth"		"im.telepathy1.Connection.Interface.Avatars1.MinimumAvatarWidth"
	#define TP_PROP_CONNECTION_INTERFACE_AVATARS_RECOMMENDED_AVATAR_HEIGHT \		#define TP_PROP_CONNECTION_INTERFACE_AVATARS_RECOMMENDED_AVATAR_HEIGHT \
	"org.freedesktop.Telepathy.Connection.Interface.Avatars.RecommendedAvatarHe ight"		"im.telepathy1.Connection.Interface.Avatars1.RecommendedAvatarHeight"
	#define TP_PROP_CONNECTION_INTERFACE_AVATARS_RECOMMENDED_AVATAR_WIDTH \		#define TP_PROP_CONNECTION_INTERFACE_AVATARS_RECOMMENDED_AVATAR_WIDTH \
	"org.freedesktop.Telepathy.Connection.Interface.Avatars.RecommendedAvatarWi dth"		"im.telepathy1.Connection.Interface.Avatars1.RecommendedAvatarWidth"
	#define TP_PROP_CONNECTION_INTERFACE_AVATARS_MAXIMUM_AVATAR_HEIGHT \		#define TP_PROP_CONNECTION_INTERFACE_AVATARS_MAXIMUM_AVATAR_HEIGHT \
	"org.freedesktop.Telepathy.Connection.Interface.Avatars.MaximumAvatarHeight "		"im.telepathy1.Connection.Interface.Avatars1.MaximumAvatarHeight"
	#define TP_PROP_CONNECTION_INTERFACE_AVATARS_MAXIMUM_AVATAR_WIDTH \		#define TP_PROP_CONNECTION_INTERFACE_AVATARS_MAXIMUM_AVATAR_WIDTH \
	"org.freedesktop.Telepathy.Connection.Interface.Avatars.MaximumAvatarWidth"		"im.telepathy1.Connection.Interface.Avatars1.MaximumAvatarWidth"
	#define TP_PROP_CONNECTION_INTERFACE_AVATARS_MAXIMUM_AVATAR_BYTES \		#define TP_PROP_CONNECTION_INTERFACE_AVATARS_MAXIMUM_AVATAR_BYTES \
	"org.freedesktop.Telepathy.Connection.Interface.Avatars.MaximumAvatarBytes"		"im.telepathy1.Connection.Interface.Avatars1.MaximumAvatarBytes"
	#define TP_TOKEN_CONNECTION_INTERFACE_AVATARS_TOKEN \		#define TP_TOKEN_CONNECTION_INTERFACE_AVATARS_TOKEN \
	"org.freedesktop.Telepathy.Connection.Interface.Avatars/token"		"im.telepathy1.Connection.Interface.Avatars1/token"
	#define TP_IFACE_CONNECTION_INTERFACE_BALANCE \		#define TP_IFACE_CONNECTION_INTERFACE_BALANCE \
	"org.freedesktop.Telepathy.Connection.Interface.Balance"		"im.telepathy1.Connection.Interface.Balance1"
	#define TP_IFACE_QUARK_CONNECTION_INTERFACE_BALANCE \		#define TP_IFACE_QUARK_CONNECTION_INTERFACE_BALANCE \
	(tp_iface_quark_connection_interface_balance ())		(tp_iface_quark_connection_interface_balance ())
	GQuark tp_iface_quark_connection_interface_balance (void);		GQuark tp_iface_quark_connection_interface_balance (void);
	#define TP_PROP_CONNECTION_INTERFACE_BALANCE_ACCOUNT_BALANCE \		#define TP_PROP_CONNECTION_INTERFACE_BALANCE_ACCOUNT_BALANCE \
	"org.freedesktop.Telepathy.Connection.Interface.Balance.AccountBalance"		"im.telepathy1.Connection.Interface.Balance1.AccountBalance"
	#define TP_PROP_CONNECTION_INTERFACE_BALANCE_MANAGE_CREDIT_URI \		#define TP_PROP_CONNECTION_INTERFACE_BALANCE_MANAGE_CREDIT_URI \
	"org.freedesktop.Telepathy.Connection.Interface.Balance.ManageCreditURI"		"im.telepathy1.Connection.Interface.Balance1.ManageCreditURI"
	#define TP_IFACE_CONNECTION_INTERFACE_CAPABILITIES \
	"org.freedesktop.Telepathy.Connection.Interface.Capabilities"
	#define TP_IFACE_QUARK_CONNECTION_INTERFACE_CAPABILITIES \
	(tp_iface_quark_connection_interface_capabilities ())
	GQuark tp_iface_quark_connection_interface_capabilities (void);
	#define TP_TOKEN_CONNECTION_INTERFACE_CAPABILITIES_CAPS \
	"org.freedesktop.Telepathy.Connection.Interface.Capabilities/caps"
	#define TP_IFACE_CONNECTION_INTERFACE_CELLULAR \		#define TP_IFACE_CONNECTION_INTERFACE_CELLULAR \
	"org.freedesktop.Telepathy.Connection.Interface.Cellular"		"im.telepathy1.Connection.Interface.Cellular1"
	#define TP_IFACE_QUARK_CONNECTION_INTERFACE_CELLULAR \		#define TP_IFACE_QUARK_CONNECTION_INTERFACE_CELLULAR \
	(tp_iface_quark_connection_interface_cellular ())		(tp_iface_quark_connection_interface_cellular ())
	GQuark tp_iface_quark_connection_interface_cellular (void);		GQuark tp_iface_quark_connection_interface_cellular (void);
	#define TP_PROP_CONNECTION_INTERFACE_CELLULAR_MESSAGE_VALIDITY_PERIOD \		#define TP_PROP_CONNECTION_INTERFACE_CELLULAR_MESSAGE_VALIDITY_PERIOD \
	"org.freedesktop.Telepathy.Connection.Interface.Cellular.MessageValidityPer iod"		"im.telepathy1.Connection.Interface.Cellular1.MessageValidityPeriod"
	#define TP_PROP_CONNECTION_INTERFACE_CELLULAR_OVERRIDE_MESSAGE_SERVICE_CENT RE \		#define TP_PROP_CONNECTION_INTERFACE_CELLULAR_OVERRIDE_MESSAGE_SERVICE_CENT RE \
	"org.freedesktop.Telepathy.Connection.Interface.Cellular.OverrideMessageSer viceCentre"		"im.telepathy1.Connection.Interface.Cellular1.OverrideMessageServiceCentre"
	#define TP_PROP_CONNECTION_INTERFACE_CELLULAR_MESSAGE_SERVICE_CENTRE \		#define TP_PROP_CONNECTION_INTERFACE_CELLULAR_MESSAGE_SERVICE_CENTRE \
	"org.freedesktop.Telepathy.Connection.Interface.Cellular.MessageServiceCent re"		"im.telepathy1.Connection.Interface.Cellular1.MessageServiceCentre"
	#define TP_PROP_CONNECTION_INTERFACE_CELLULAR_IMSI \		#define TP_PROP_CONNECTION_INTERFACE_CELLULAR_IMSI \
	"org.freedesktop.Telepathy.Connection.Interface.Cellular.IMSI"		"im.telepathy1.Connection.Interface.Cellular1.IMSI"
	#define TP_PROP_CONNECTION_INTERFACE_CELLULAR_MESSAGE_REDUCED_CHARACTER_SET \		#define TP_PROP_CONNECTION_INTERFACE_CELLULAR_MESSAGE_REDUCED_CHARACTER_SET \
	"org.freedesktop.Telepathy.Connection.Interface.Cellular.MessageReducedChar acterSet"		"im.telepathy1.Connection.Interface.Cellular1.MessageReducedCharacterSet"
	#define TP_PROP_CONNECTION_INTERFACE_CELLULAR_MESSAGE_NATIONAL_CHARACTER_SE T \		#define TP_PROP_CONNECTION_INTERFACE_CELLULAR_MESSAGE_NATIONAL_CHARACTER_SE T \
	"org.freedesktop.Telepathy.Connection.Interface.Cellular.MessageNationalCha racterSet"		"im.telepathy1.Connection.Interface.Cellular1.MessageNationalCharacterSet"
	#define TP_IFACE_CONNECTION_INTERFACE_CLIENT_TYPES \		#define TP_IFACE_CONNECTION_INTERFACE_CLIENT_TYPES \
	"org.freedesktop.Telepathy.Connection.Interface.ClientTypes"		"im.telepathy1.Connection.Interface.ClientTypes1"
	#define TP_IFACE_QUARK_CONNECTION_INTERFACE_CLIENT_TYPES \		#define TP_IFACE_QUARK_CONNECTION_INTERFACE_CLIENT_TYPES \
	(tp_iface_quark_connection_interface_client_types ())		(tp_iface_quark_connection_interface_client_types ())
	GQuark tp_iface_quark_connection_interface_client_types (void);		GQuark tp_iface_quark_connection_interface_client_types (void);
	#define TP_TOKEN_CONNECTION_INTERFACE_CLIENT_TYPES_CLIENT_TYPES \		#define TP_TOKEN_CONNECTION_INTERFACE_CLIENT_TYPES_CLIENT_TYPES \
	"org.freedesktop.Telepathy.Connection.Interface.ClientTypes/client-types"		"im.telepathy1.Connection.Interface.ClientTypes1/client-types"
	#define TP_IFACE_CONNECTION_INTERFACE_CONTACT_BLOCKING \		#define TP_IFACE_CONNECTION_INTERFACE_CONTACT_BLOCKING \
	"org.freedesktop.Telepathy.Connection.Interface.ContactBlocking"		"im.telepathy1.Connection.Interface.ContactBlocking1"
	#define TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_BLOCKING \		#define TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_BLOCKING \
	(tp_iface_quark_connection_interface_contact_blocking ())		(tp_iface_quark_connection_interface_contact_blocking ())
	GQuark tp_iface_quark_connection_interface_contact_blocking (void);		GQuark tp_iface_quark_connection_interface_contact_blocking (void);
	#define TP_PROP_CONNECTION_INTERFACE_CONTACT_BLOCKING_CONTACT_BLOCKING_CAPA BILITIES \		#define TP_PROP_CONNECTION_INTERFACE_CONTACT_BLOCKING_CONTACT_BLOCKING_CAPA BILITIES \
	"org.freedesktop.Telepathy.Connection.Interface.ContactBlocking.ContactBloc kingCapabilities"		"im.telepathy1.Connection.Interface.ContactBlocking1.ContactBlockingCapabil ities"
	#define TP_TOKEN_CONNECTION_INTERFACE_CONTACT_BLOCKING_BLOCKED \		#define TP_TOKEN_CONNECTION_INTERFACE_CONTACT_BLOCKING_BLOCKED \
	"org.freedesktop.Telepathy.Connection.Interface.ContactBlocking/blocked"		"im.telepathy1.Connection.Interface.ContactBlocking1/blocked"
	#define TP_IFACE_CONNECTION_INTERFACE_CONTACT_CAPABILITIES \		#define TP_IFACE_CONNECTION_INTERFACE_CONTACT_CAPABILITIES \
	"org.freedesktop.Telepathy.Connection.Interface.ContactCapabilities"		"im.telepathy1.Connection.Interface.ContactCapabilities1"
	#define TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_CAPABILITIES \		#define TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_CAPABILITIES \
	(tp_iface_quark_connection_interface_contact_capabilities ())		(tp_iface_quark_connection_interface_contact_capabilities ())
	GQuark tp_iface_quark_connection_interface_contact_capabilities (void);		GQuark tp_iface_quark_connection_interface_contact_capabilities (void);
	#define TP_TOKEN_CONNECTION_INTERFACE_CONTACT_CAPABILITIES_CAPABILITIES \		#define TP_TOKEN_CONNECTION_INTERFACE_CONTACT_CAPABILITIES_CAPABILITIES \
	"org.freedesktop.Telepathy.Connection.Interface.ContactCapabilities/capabil ities"		"im.telepathy1.Connection.Interface.ContactCapabilities1/capabilities"
	#define TP_IFACE_CONNECTION_INTERFACE_CONTACT_GROUPS \		#define TP_IFACE_CONNECTION_INTERFACE_CONTACT_GROUPS \
	"org.freedesktop.Telepathy.Connection.Interface.ContactGroups"		"im.telepathy1.Connection.Interface.ContactGroups1"
	#define TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_GROUPS \		#define TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_GROUPS \
	(tp_iface_quark_connection_interface_contact_groups ())		(tp_iface_quark_connection_interface_contact_groups ())
	GQuark tp_iface_quark_connection_interface_contact_groups (void);		GQuark tp_iface_quark_connection_interface_contact_groups (void);
	#define TP_PROP_CONNECTION_INTERFACE_CONTACT_GROUPS_DISJOINT_GROUPS \		#define TP_PROP_CONNECTION_INTERFACE_CONTACT_GROUPS_DISJOINT_GROUPS \
	"org.freedesktop.Telepathy.Connection.Interface.ContactGroups.DisjointGroup s"		"im.telepathy1.Connection.Interface.ContactGroups1.DisjointGroups"
	#define TP_PROP_CONNECTION_INTERFACE_CONTACT_GROUPS_GROUP_STORAGE \		#define TP_PROP_CONNECTION_INTERFACE_CONTACT_GROUPS_GROUP_STORAGE \
	"org.freedesktop.Telepathy.Connection.Interface.ContactGroups.GroupStorage"		"im.telepathy1.Connection.Interface.ContactGroups1.GroupStorage"
	#define TP_PROP_CONNECTION_INTERFACE_CONTACT_GROUPS_GROUPS \		#define TP_PROP_CONNECTION_INTERFACE_CONTACT_GROUPS_GROUPS \
	"org.freedesktop.Telepathy.Connection.Interface.ContactGroups.Groups"		"im.telepathy1.Connection.Interface.ContactGroups1.Groups"
	#define TP_TOKEN_CONNECTION_INTERFACE_CONTACT_GROUPS_GROUPS \		#define TP_TOKEN_CONNECTION_INTERFACE_CONTACT_GROUPS_GROUPS \
	"org.freedesktop.Telepathy.Connection.Interface.ContactGroups/groups"		"im.telepathy1.Connection.Interface.ContactGroups1/groups"
	#define TP_IFACE_CONNECTION_INTERFACE_CONTACT_INFO \		#define TP_IFACE_CONNECTION_INTERFACE_CONTACT_INFO \
	"org.freedesktop.Telepathy.Connection.Interface.ContactInfo"		"im.telepathy1.Connection.Interface.ContactInfo1"
	#define TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_INFO \		#define TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_INFO \
	(tp_iface_quark_connection_interface_contact_info ())		(tp_iface_quark_connection_interface_contact_info ())
	GQuark tp_iface_quark_connection_interface_contact_info (void);		GQuark tp_iface_quark_connection_interface_contact_info (void);
	#define TP_PROP_CONNECTION_INTERFACE_CONTACT_INFO_CONTACT_INFO_FLAGS \		#define TP_PROP_CONNECTION_INTERFACE_CONTACT_INFO_CONTACT_INFO_FLAGS \
	"org.freedesktop.Telepathy.Connection.Interface.ContactInfo.ContactInfoFlag s"		"im.telepathy1.Connection.Interface.ContactInfo1.ContactInfoFlags"
	#define TP_PROP_CONNECTION_INTERFACE_CONTACT_INFO_SUPPORTED_FIELDS \		#define TP_PROP_CONNECTION_INTERFACE_CONTACT_INFO_SUPPORTED_FIELDS \
	"org.freedesktop.Telepathy.Connection.Interface.ContactInfo.SupportedFields "		"im.telepathy1.Connection.Interface.ContactInfo1.SupportedFields"
	#define TP_TOKEN_CONNECTION_INTERFACE_CONTACT_INFO_INFO \		#define TP_TOKEN_CONNECTION_INTERFACE_CONTACT_INFO_INFO \
	"org.freedesktop.Telepathy.Connection.Interface.ContactInfo/info"		"im.telepathy1.Connection.Interface.ContactInfo1/info"
	#define TP_IFACE_CONNECTION_INTERFACE_CONTACT_LIST \		#define TP_IFACE_CONNECTION_INTERFACE_CONTACT_LIST \
	"org.freedesktop.Telepathy.Connection.Interface.ContactList"		"im.telepathy1.Connection.Interface.ContactList1"
	#define TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_LIST \		#define TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_LIST \
	(tp_iface_quark_connection_interface_contact_list ())		(tp_iface_quark_connection_interface_contact_list ())
	GQuark tp_iface_quark_connection_interface_contact_list (void);		GQuark tp_iface_quark_connection_interface_contact_list (void);
	#define TP_PROP_CONNECTION_INTERFACE_CONTACT_LIST_CONTACT_LIST_STATE \		#define TP_PROP_CONNECTION_INTERFACE_CONTACT_LIST_CONTACT_LIST_STATE \
	"org.freedesktop.Telepathy.Connection.Interface.ContactList.ContactListStat e"		"im.telepathy1.Connection.Interface.ContactList1.ContactListState"
	#define TP_PROP_CONNECTION_INTERFACE_CONTACT_LIST_CONTACT_LIST_PERSISTS \		#define TP_PROP_CONNECTION_INTERFACE_CONTACT_LIST_CONTACT_LIST_PERSISTS \
	"org.freedesktop.Telepathy.Connection.Interface.ContactList.ContactListPers ists"		"im.telepathy1.Connection.Interface.ContactList1.ContactListPersists"
	#define TP_PROP_CONNECTION_INTERFACE_CONTACT_LIST_CAN_CHANGE_CONTACT_LIST \		#define TP_PROP_CONNECTION_INTERFACE_CONTACT_LIST_CAN_CHANGE_CONTACT_LIST \
	"org.freedesktop.Telepathy.Connection.Interface.ContactList.CanChangeContac tList"		"im.telepathy1.Connection.Interface.ContactList1.CanChangeContactList"
	#define TP_PROP_CONNECTION_INTERFACE_CONTACT_LIST_REQUEST_USES_MESSAGE \		#define TP_PROP_CONNECTION_INTERFACE_CONTACT_LIST_REQUEST_USES_MESSAGE \
	"org.freedesktop.Telepathy.Connection.Interface.ContactList.RequestUsesMess age"		"im.telepathy1.Connection.Interface.ContactList1.RequestUsesMessage"
	#define TP_PROP_CONNECTION_INTERFACE_CONTACT_LIST_DOWNLOAD_AT_CONNECTION \		#define TP_PROP_CONNECTION_INTERFACE_CONTACT_LIST_DOWNLOAD_AT_CONNECTION \
	"org.freedesktop.Telepathy.Connection.Interface.ContactList.DownloadAtConne ction"		"im.telepathy1.Connection.Interface.ContactList1.DownloadAtConnection"
	#define TP_TOKEN_CONNECTION_INTERFACE_CONTACT_LIST_SUBSCRIBE \		#define TP_TOKEN_CONNECTION_INTERFACE_CONTACT_LIST_SUBSCRIBE \
	"org.freedesktop.Telepathy.Connection.Interface.ContactList/subscribe"		"im.telepathy1.Connection.Interface.ContactList1/subscribe"
	#define TP_TOKEN_CONNECTION_INTERFACE_CONTACT_LIST_PUBLISH \		#define TP_TOKEN_CONNECTION_INTERFACE_CONTACT_LIST_PUBLISH \
	"org.freedesktop.Telepathy.Connection.Interface.ContactList/publish"		"im.telepathy1.Connection.Interface.ContactList1/publish"
	#define TP_TOKEN_CONNECTION_INTERFACE_CONTACT_LIST_PUBLISH_REQUEST \		#define TP_TOKEN_CONNECTION_INTERFACE_CONTACT_LIST_PUBLISH_REQUEST \
	"org.freedesktop.Telepathy.Connection.Interface.ContactList/publish-request		"im.telepathy1.Connection.Interface.ContactList1/publish-request"
	"
	#define TP_IFACE_CONNECTION_INTERFACE_RENAMING \
	"org.freedesktop.Telepathy.Connection.Interface.Renaming"
	#define TP_IFACE_QUARK_CONNECTION_INTERFACE_RENAMING \
	(tp_iface_quark_connection_interface_renaming ())
	GQuark tp_iface_quark_connection_interface_renaming (void);
	#define TP_IFACE_CONNECTION_INTERFACE_SIDECARS1 \
	"org.freedesktop.Telepathy.Connection.Interface.Sidecars1"
	#define TP_IFACE_QUARK_CONNECTION_INTERFACE_SIDECARS1 \
	(tp_iface_quark_connection_interface_sidecars1 ())
	GQuark tp_iface_quark_connection_interface_sidecars1 (void);
	#define TP_IFACE_CONNECTION_INTERFACE_SIMPLE_PRESENCE \
	"org.freedesktop.Telepathy.Connection.Interface.SimplePresence"
	#define TP_IFACE_QUARK_CONNECTION_INTERFACE_SIMPLE_PRESENCE \
	(tp_iface_quark_connection_interface_simple_presence ())
	GQuark tp_iface_quark_connection_interface_simple_presence (void);
	#define TP_PROP_CONNECTION_INTERFACE_SIMPLE_PRESENCE_STATUSES \
	"org.freedesktop.Telepathy.Connection.Interface.SimplePresence.Statuses"
	#define TP_PROP_CONNECTION_INTERFACE_SIMPLE_PRESENCE_MAXIMUM_STATUS_MESSAGE
	_LENGTH \
	"org.freedesktop.Telepathy.Connection.Interface.SimplePresence.MaximumStatu
	sMessageLength"
	#define TP_TOKEN_CONNECTION_INTERFACE_SIMPLE_PRESENCE_PRESENCE \
	"org.freedesktop.Telepathy.Connection.Interface.SimplePresence/presence"
	#define TP_IFACE_CONNECTION_INTERFACE_PRESENCE \		#define TP_IFACE_CONNECTION_INTERFACE_PRESENCE \
	"org.freedesktop.Telepathy.Connection.Interface.Presence"		"im.telepathy1.Connection.Interface.Presence1"
	#define TP_IFACE_QUARK_CONNECTION_INTERFACE_PRESENCE \		#define TP_IFACE_QUARK_CONNECTION_INTERFACE_PRESENCE \
	(tp_iface_quark_connection_interface_presence ())		(tp_iface_quark_connection_interface_presence ())
	GQuark tp_iface_quark_connection_interface_presence (void);		GQuark tp_iface_quark_connection_interface_presence (void);
	#define TP_IFACE_CONNECTION_INTERFACE_CONTACTS \		#define TP_PROP_CONNECTION_INTERFACE_PRESENCE_STATUSES \
	"org.freedesktop.Telepathy.Connection.Interface.Contacts"		"im.telepathy1.Connection.Interface.Presence1.Statuses"
	#define TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACTS \
	(tp_iface_quark_connection_interface_contacts ())
	GQuark tp_iface_quark_connection_interface_contacts (void);
	#define TP_PROP_CONNECTION_INTERFACE_CONTACTS_CONTACT_ATTRIBUTE_INTERFACES
	\
	"org.freedesktop.Telepathy.Connection.Interface.Contacts.ContactAttributeIn
	terfaces"
	#define TP_IFACE_CONNECTION_INTERFACE_REQUESTS \
	"org.freedesktop.Telepathy.Connection.Interface.Requests"
	#define TP_IFACE_QUARK_CONNECTION_INTERFACE_REQUESTS \
	(tp_iface_quark_connection_interface_requests ())
	GQuark tp_iface_quark_connection_interface_requests (void);
	#define TP_PROP_CONNECTION_INTERFACE_REQUESTS_CHANNELS \		#define TP_PROP_CONNECTION_INTERFACE_PRESENCE_MAXIMUM_STATUS_MESSAGE_LENGTH
	"org.freedesktop.Telepathy.Connection.Interface.Requests.Channels"		\
			"im.telepathy1.Connection.Interface.Presence1.MaximumStatusMessageLength"
	#define TP_PROP_CONNECTION_INTERFACE_REQUESTS_REQUESTABLE_CHANNEL_CLASSES \		#define TP_TOKEN_CONNECTION_INTERFACE_PRESENCE_PRESENCE \
	"org.freedesktop.Telepathy.Connection.Interface.Requests.RequestableChannel		"im.telepathy1.Connection.Interface.Presence1/presence"
	Classes"
	#define TP_IFACE_CONNECTION_INTERFACE_LOCATION \		#define TP_IFACE_CONNECTION_INTERFACE_LOCATION \
	"org.freedesktop.Telepathy.Connection.Interface.Location"		"im.telepathy1.Connection.Interface.Location1"
	#define TP_IFACE_QUARK_CONNECTION_INTERFACE_LOCATION \		#define TP_IFACE_QUARK_CONNECTION_INTERFACE_LOCATION \
	(tp_iface_quark_connection_interface_location ())		(tp_iface_quark_connection_interface_location ())
	GQuark tp_iface_quark_connection_interface_location (void);		GQuark tp_iface_quark_connection_interface_location (void);
	#define TP_PROP_CONNECTION_INTERFACE_LOCATION_LOCATION_ACCESS_CONTROL_TYPES \		#define TP_PROP_CONNECTION_INTERFACE_LOCATION_LOCATION_ACCESS_CONTROL_TYPES \
	"org.freedesktop.Telepathy.Connection.Interface.Location.LocationAccessCont rolTypes"		"im.telepathy1.Connection.Interface.Location1.LocationAccessControlTypes"
	#define TP_PROP_CONNECTION_INTERFACE_LOCATION_LOCATION_ACCESS_CONTROL \		#define TP_PROP_CONNECTION_INTERFACE_LOCATION_LOCATION_ACCESS_CONTROL \
	"org.freedesktop.Telepathy.Connection.Interface.Location.LocationAccessCont rol"		"im.telepathy1.Connection.Interface.Location1.LocationAccessControl"
	#define TP_PROP_CONNECTION_INTERFACE_LOCATION_SUPPORTED_LOCATION_FEATURES \		#define TP_PROP_CONNECTION_INTERFACE_LOCATION_SUPPORTED_LOCATION_FEATURES \
	"org.freedesktop.Telepathy.Connection.Interface.Location.SupportedLocationF eatures"		"im.telepathy1.Connection.Interface.Location1.SupportedLocationFeatures"
	#define TP_TOKEN_CONNECTION_INTERFACE_LOCATION_LOCATION \		#define TP_TOKEN_CONNECTION_INTERFACE_LOCATION_LOCATION \
	"org.freedesktop.Telepathy.Connection.Interface.Location/location"		"im.telepathy1.Connection.Interface.Location1/location"
	#define TP_IFACE_CONNECTION_INTERFACE_SERVICE_POINT \		#define TP_IFACE_CONNECTION_INTERFACE_SERVICE_POINT \
	"org.freedesktop.Telepathy.Connection.Interface.ServicePoint"		"im.telepathy1.Connection.Interface.ServicePoint1"
	#define TP_IFACE_QUARK_CONNECTION_INTERFACE_SERVICE_POINT \		#define TP_IFACE_QUARK_CONNECTION_INTERFACE_SERVICE_POINT \
	(tp_iface_quark_connection_interface_service_point ())		(tp_iface_quark_connection_interface_service_point ())
	GQuark tp_iface_quark_connection_interface_service_point (void);		GQuark tp_iface_quark_connection_interface_service_point (void);
	#define TP_PROP_CONNECTION_INTERFACE_SERVICE_POINT_KNOWN_SERVICE_POINTS \		#define TP_PROP_CONNECTION_INTERFACE_SERVICE_POINT_KNOWN_SERVICE_POINTS \
	"org.freedesktop.Telepathy.Connection.Interface.ServicePoint.KnownServicePo ints"		"im.telepathy1.Connection.Interface.ServicePoint1.KnownServicePoints"
	#define TP_IFACE_CONNECTION_INTERFACE_MAIL_NOTIFICATION \		#define TP_IFACE_CONNECTION_INTERFACE_MAIL_NOTIFICATION \
	"org.freedesktop.Telepathy.Connection.Interface.MailNotification"		"im.telepathy1.Connection.Interface.MailNotification1"
	#define TP_IFACE_QUARK_CONNECTION_INTERFACE_MAIL_NOTIFICATION \		#define TP_IFACE_QUARK_CONNECTION_INTERFACE_MAIL_NOTIFICATION \
	(tp_iface_quark_connection_interface_mail_notification ())		(tp_iface_quark_connection_interface_mail_notification ())
	GQuark tp_iface_quark_connection_interface_mail_notification (void);		GQuark tp_iface_quark_connection_interface_mail_notification (void);
	#define TP_PROP_CONNECTION_INTERFACE_MAIL_NOTIFICATION_MAIL_NOTIFICATION_FL AGS \		#define TP_PROP_CONNECTION_INTERFACE_MAIL_NOTIFICATION_MAIL_NOTIFICATION_FL AGS \
	"org.freedesktop.Telepathy.Connection.Interface.MailNotification.MailNotifi cationFlags"		"im.telepathy1.Connection.Interface.MailNotification1.MailNotificationFlags "
	#define TP_PROP_CONNECTION_INTERFACE_MAIL_NOTIFICATION_UNREAD_MAIL_COUNT \		#define TP_PROP_CONNECTION_INTERFACE_MAIL_NOTIFICATION_UNREAD_MAIL_COUNT \
	"org.freedesktop.Telepathy.Connection.Interface.MailNotification.UnreadMail Count"		"im.telepathy1.Connection.Interface.MailNotification1.UnreadMailCount"
	#define TP_PROP_CONNECTION_INTERFACE_MAIL_NOTIFICATION_UNREAD_MAILS \		#define TP_PROP_CONNECTION_INTERFACE_MAIL_NOTIFICATION_UNREAD_MAILS \
	"org.freedesktop.Telepathy.Connection.Interface.MailNotification.UnreadMail s"		"im.telepathy1.Connection.Interface.MailNotification1.UnreadMails"
	#define TP_PROP_CONNECTION_INTERFACE_MAIL_NOTIFICATION_MAIL_ADDRESS \		#define TP_PROP_CONNECTION_INTERFACE_MAIL_NOTIFICATION_MAIL_ADDRESS \
	"org.freedesktop.Telepathy.Connection.Interface.MailNotification.MailAddres s"		"im.telepathy1.Connection.Interface.MailNotification1.MailAddress"
	#define TP_IFACE_CONNECTION_INTERFACE_POWER_SAVING \		#define TP_IFACE_CONNECTION_INTERFACE_POWER_SAVING \
	"org.freedesktop.Telepathy.Connection.Interface.PowerSaving"		"im.telepathy1.Connection.Interface.PowerSaving1"
	#define TP_IFACE_QUARK_CONNECTION_INTERFACE_POWER_SAVING \		#define TP_IFACE_QUARK_CONNECTION_INTERFACE_POWER_SAVING \
	(tp_iface_quark_connection_interface_power_saving ())		(tp_iface_quark_connection_interface_power_saving ())
	GQuark tp_iface_quark_connection_interface_power_saving (void);		GQuark tp_iface_quark_connection_interface_power_saving (void);
	#define TP_PROP_CONNECTION_INTERFACE_POWER_SAVING_POWER_SAVING_ACTIVE \		#define TP_PROP_CONNECTION_INTERFACE_POWER_SAVING_POWER_SAVING_ACTIVE \
	"org.freedesktop.Telepathy.Connection.Interface.PowerSaving.PowerSavingActi ve"		"im.telepathy1.Connection.Interface.PowerSaving1.PowerSavingActive"
	#define TP_IFACE_CHANNEL \		#define TP_IFACE_CHANNEL \
	"org.freedesktop.Telepathy.Channel"		"im.telepathy1.Channel"
	#define TP_IFACE_QUARK_CHANNEL \		#define TP_IFACE_QUARK_CHANNEL \
	(tp_iface_quark_channel ())		(tp_iface_quark_channel ())
	GQuark tp_iface_quark_channel (void);		GQuark tp_iface_quark_channel (void);
	#define TP_PROP_CHANNEL_CHANNEL_TYPE \		#define TP_PROP_CHANNEL_CHANNEL_TYPE \
	"org.freedesktop.Telepathy.Channel.ChannelType"		"im.telepathy1.Channel.ChannelType"
	#define TP_PROP_CHANNEL_INTERFACES \		#define TP_PROP_CHANNEL_INTERFACES \
	"org.freedesktop.Telepathy.Channel.Interfaces"		"im.telepathy1.Channel.Interfaces"
	#define TP_PROP_CHANNEL_TARGET_HANDLE \		#define TP_PROP_CHANNEL_TARGET_HANDLE \
	"org.freedesktop.Telepathy.Channel.TargetHandle"		"im.telepathy1.Channel.TargetHandle"
	#define TP_PROP_CHANNEL_TARGET_ID \		#define TP_PROP_CHANNEL_TARGET_ID \
	"org.freedesktop.Telepathy.Channel.TargetID"		"im.telepathy1.Channel.TargetID"
	#define TP_PROP_CHANNEL_TARGET_HANDLE_TYPE \		#define TP_PROP_CHANNEL_TARGET_HANDLE_TYPE \
	"org.freedesktop.Telepathy.Channel.TargetHandleType"		"im.telepathy1.Channel.TargetHandleType"
	#define TP_PROP_CHANNEL_REQUESTED \		#define TP_PROP_CHANNEL_REQUESTED \
	"org.freedesktop.Telepathy.Channel.Requested"		"im.telepathy1.Channel.Requested"
	#define TP_PROP_CHANNEL_INITIATOR_HANDLE \		#define TP_PROP_CHANNEL_INITIATOR_HANDLE \
	"org.freedesktop.Telepathy.Channel.InitiatorHandle"		"im.telepathy1.Channel.InitiatorHandle"
	#define TP_PROP_CHANNEL_INITIATOR_ID \		#define TP_PROP_CHANNEL_INITIATOR_ID \
	"org.freedesktop.Telepathy.Channel.InitiatorID"		"im.telepathy1.Channel.InitiatorID"
			#define TP_IFACE_CHANNEL_TYPE_TEXT \
			"im.telepathy1.Channel.Type.Text"
			#define TP_IFACE_QUARK_CHANNEL_TYPE_TEXT \
			(tp_iface_quark_channel_type_text ())
			GQuark tp_iface_quark_channel_type_text (void);
			#define TP_PROP_CHANNEL_TYPE_TEXT_SUPPORTED_CONTENT_TYPES \
			"im.telepathy1.Channel.Type.Text.SupportedContentTypes"
			#define TP_PROP_CHANNEL_TYPE_TEXT_MESSAGE_TYPES \
			"im.telepathy1.Channel.Type.Text.MessageTypes"
			#define TP_PROP_CHANNEL_TYPE_TEXT_MESSAGE_PART_SUPPORT_FLAGS \
			"im.telepathy1.Channel.Type.Text.MessagePartSupportFlags"
			#define TP_PROP_CHANNEL_TYPE_TEXT_PENDING_MESSAGES \
			"im.telepathy1.Channel.Type.Text.PendingMessages"
			#define TP_PROP_CHANNEL_TYPE_TEXT_DELIVERY_REPORTING_SUPPORT \
			"im.telepathy1.Channel.Type.Text.DeliveryReportingSupport"
	#define TP_IFACE_CHANNEL_TYPE_CALL \		#define TP_IFACE_CHANNEL_TYPE_CALL \
	"org.freedesktop.Telepathy.Channel.Type.Call1"		"im.telepathy1.Channel.Type.Call1"
	#define TP_IFACE_QUARK_CHANNEL_TYPE_CALL \		#define TP_IFACE_QUARK_CHANNEL_TYPE_CALL \
	(tp_iface_quark_channel_type_call ())		(tp_iface_quark_channel_type_call ())
	GQuark tp_iface_quark_channel_type_call (void);		GQuark tp_iface_quark_channel_type_call (void);
	#define TP_PROP_CHANNEL_TYPE_CALL_CONTENTS \		#define TP_PROP_CHANNEL_TYPE_CALL_CONTENTS \
	"org.freedesktop.Telepathy.Channel.Type.Call1.Contents"		"im.telepathy1.Channel.Type.Call1.Contents"
	#define TP_PROP_CHANNEL_TYPE_CALL_CALL_STATE_DETAILS \		#define TP_PROP_CHANNEL_TYPE_CALL_CALL_STATE_DETAILS \
	"org.freedesktop.Telepathy.Channel.Type.Call1.CallStateDetails"		"im.telepathy1.Channel.Type.Call1.CallStateDetails"
	#define TP_PROP_CHANNEL_TYPE_CALL_CALL_STATE \		#define TP_PROP_CHANNEL_TYPE_CALL_CALL_STATE \
	"org.freedesktop.Telepathy.Channel.Type.Call1.CallState"		"im.telepathy1.Channel.Type.Call1.CallState"
	#define TP_PROP_CHANNEL_TYPE_CALL_CALL_FLAGS \		#define TP_PROP_CHANNEL_TYPE_CALL_CALL_FLAGS \
	"org.freedesktop.Telepathy.Channel.Type.Call1.CallFlags"		"im.telepathy1.Channel.Type.Call1.CallFlags"
	#define TP_PROP_CHANNEL_TYPE_CALL_CALL_STATE_REASON \		#define TP_PROP_CHANNEL_TYPE_CALL_CALL_STATE_REASON \
	"org.freedesktop.Telepathy.Channel.Type.Call1.CallStateReason"		"im.telepathy1.Channel.Type.Call1.CallStateReason"
	#define TP_PROP_CHANNEL_TYPE_CALL_HARDWARE_STREAMING \		#define TP_PROP_CHANNEL_TYPE_CALL_HARDWARE_STREAMING \
	"org.freedesktop.Telepathy.Channel.Type.Call1.HardwareStreaming"		"im.telepathy1.Channel.Type.Call1.HardwareStreaming"
	#define TP_PROP_CHANNEL_TYPE_CALL_CALL_MEMBERS \		#define TP_PROP_CHANNEL_TYPE_CALL_CALL_MEMBERS \
	"org.freedesktop.Telepathy.Channel.Type.Call1.CallMembers"		"im.telepathy1.Channel.Type.Call1.CallMembers"
	#define TP_PROP_CHANNEL_TYPE_CALL_MEMBER_IDENTIFIERS \		#define TP_PROP_CHANNEL_TYPE_CALL_MEMBER_IDENTIFIERS \
	"org.freedesktop.Telepathy.Channel.Type.Call1.MemberIdentifiers"		"im.telepathy1.Channel.Type.Call1.MemberIdentifiers"
	#define TP_PROP_CHANNEL_TYPE_CALL_INITIAL_TRANSPORT \		#define TP_PROP_CHANNEL_TYPE_CALL_INITIAL_TRANSPORT \
	"org.freedesktop.Telepathy.Channel.Type.Call1.InitialTransport"		"im.telepathy1.Channel.Type.Call1.InitialTransport"
	#define TP_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO \		#define TP_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO \
	"org.freedesktop.Telepathy.Channel.Type.Call1.InitialAudio"		"im.telepathy1.Channel.Type.Call1.InitialAudio"
	#define TP_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO \		#define TP_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO \
	"org.freedesktop.Telepathy.Channel.Type.Call1.InitialVideo"		"im.telepathy1.Channel.Type.Call1.InitialVideo"
	#define TP_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO_NAME \		#define TP_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO_NAME \
	"org.freedesktop.Telepathy.Channel.Type.Call1.InitialAudioName"		"im.telepathy1.Channel.Type.Call1.InitialAudioName"
	#define TP_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO_NAME \		#define TP_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO_NAME \
	"org.freedesktop.Telepathy.Channel.Type.Call1.InitialVideoName"		"im.telepathy1.Channel.Type.Call1.InitialVideoName"
	#define TP_PROP_CHANNEL_TYPE_CALL_MUTABLE_CONTENTS \		#define TP_PROP_CHANNEL_TYPE_CALL_MUTABLE_CONTENTS \
	"org.freedesktop.Telepathy.Channel.Type.Call1.MutableContents"		"im.telepathy1.Channel.Type.Call1.MutableContents"
	#define TP_TOKEN_CHANNEL_TYPE_CALL_AUDIO \		#define TP_TOKEN_CHANNEL_TYPE_CALL_AUDIO \
	"org.freedesktop.Telepathy.Channel.Type.Call1/audio"		"im.telepathy1.Channel.Type.Call1/audio"
	#define TP_TOKEN_CHANNEL_TYPE_CALL_VIDEO \		#define TP_TOKEN_CHANNEL_TYPE_CALL_VIDEO \
	"org.freedesktop.Telepathy.Channel.Type.Call1/video"		"im.telepathy1.Channel.Type.Call1/video"
	#define TP_TOKEN_CHANNEL_TYPE_CALL_GTALK_P2P \		#define TP_TOKEN_CHANNEL_TYPE_CALL_GTALK_P2P \
	"org.freedesktop.Telepathy.Channel.Type.Call1/gtalk-p2p"		"im.telepathy1.Channel.Type.Call1/gtalk-p2p"
	#define TP_TOKEN_CHANNEL_TYPE_CALL_ICE \		#define TP_TOKEN_CHANNEL_TYPE_CALL_ICE \
	"org.freedesktop.Telepathy.Channel.Type.Call1/ice"		"im.telepathy1.Channel.Type.Call1/ice"
	#define TP_TOKEN_CHANNEL_TYPE_CALL_WLM_2009 \		#define TP_TOKEN_CHANNEL_TYPE_CALL_WLM_2009 \
	"org.freedesktop.Telepathy.Channel.Type.Call1/wlm-2009"		"im.telepathy1.Channel.Type.Call1/wlm-2009"
	#define TP_TOKEN_CHANNEL_TYPE_CALL_SHM \		#define TP_TOKEN_CHANNEL_TYPE_CALL_SHM \
	"org.freedesktop.Telepathy.Channel.Type.Call1/shm"		"im.telepathy1.Channel.Type.Call1/shm"
	#define TP_IFACE_CHANNEL_TYPE_CONTACT_LIST \
	"org.freedesktop.Telepathy.Channel.Type.ContactList"
	#define TP_IFACE_QUARK_CHANNEL_TYPE_CONTACT_LIST \
	(tp_iface_quark_channel_type_contact_list ())
	GQuark tp_iface_quark_channel_type_contact_list (void);
	#define TP_IFACE_CHANNEL_TYPE_CONTACT_SEARCH \		#define TP_IFACE_CHANNEL_TYPE_CONTACT_SEARCH \
	"org.freedesktop.Telepathy.Channel.Type.ContactSearch"		"im.telepathy1.Channel.Type.ContactSearch1"
	#define TP_IFACE_QUARK_CHANNEL_TYPE_CONTACT_SEARCH \		#define TP_IFACE_QUARK_CHANNEL_TYPE_CONTACT_SEARCH \
	(tp_iface_quark_channel_type_contact_search ())		(tp_iface_quark_channel_type_contact_search ())
	GQuark tp_iface_quark_channel_type_contact_search (void);		GQuark tp_iface_quark_channel_type_contact_search (void);
	#define TP_PROP_CHANNEL_TYPE_CONTACT_SEARCH_SEARCH_STATE \		#define TP_PROP_CHANNEL_TYPE_CONTACT_SEARCH_SEARCH_STATE \
	"org.freedesktop.Telepathy.Channel.Type.ContactSearch.SearchState"		"im.telepathy1.Channel.Type.ContactSearch1.SearchState"
	#define TP_PROP_CHANNEL_TYPE_CONTACT_SEARCH_LIMIT \		#define TP_PROP_CHANNEL_TYPE_CONTACT_SEARCH_LIMIT \
	"org.freedesktop.Telepathy.Channel.Type.ContactSearch.Limit"		"im.telepathy1.Channel.Type.ContactSearch1.Limit"
	#define TP_PROP_CHANNEL_TYPE_CONTACT_SEARCH_AVAILABLE_SEARCH_KEYS \		#define TP_PROP_CHANNEL_TYPE_CONTACT_SEARCH_AVAILABLE_SEARCH_KEYS \
	"org.freedesktop.Telepathy.Channel.Type.ContactSearch.AvailableSearchKeys"		"im.telepathy1.Channel.Type.ContactSearch1.AvailableSearchKeys"
	#define TP_PROP_CHANNEL_TYPE_CONTACT_SEARCH_SERVER \		#define TP_PROP_CHANNEL_TYPE_CONTACT_SEARCH_SERVER \
	"org.freedesktop.Telepathy.Channel.Type.ContactSearch.Server"		"im.telepathy1.Channel.Type.ContactSearch1.Server"
	#define TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER \		#define TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER \
	"org.freedesktop.Telepathy.Channel.Type.FileTransfer"		"im.telepathy1.Channel.Type.FileTransfer1"
	#define TP_IFACE_QUARK_CHANNEL_TYPE_FILE_TRANSFER \		#define TP_IFACE_QUARK_CHANNEL_TYPE_FILE_TRANSFER \
	(tp_iface_quark_channel_type_file_transfer ())		(tp_iface_quark_channel_type_file_transfer ())
	GQuark tp_iface_quark_channel_type_file_transfer (void);		GQuark tp_iface_quark_channel_type_file_transfer (void);
	#define TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_STATE \		#define TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_STATE \
	"org.freedesktop.Telepathy.Channel.Type.FileTransfer.State"		"im.telepathy1.Channel.Type.FileTransfer1.State"
	#define TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_CONTENT_TYPE \		#define TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_CONTENT_TYPE \
	"org.freedesktop.Telepathy.Channel.Type.FileTransfer.ContentType"		"im.telepathy1.Channel.Type.FileTransfer1.ContentType"
	#define TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_FILENAME \		#define TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_FILENAME \
	"org.freedesktop.Telepathy.Channel.Type.FileTransfer.Filename"		"im.telepathy1.Channel.Type.FileTransfer1.Filename"
	#define TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_SIZE \		#define TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_SIZE \
	"org.freedesktop.Telepathy.Channel.Type.FileTransfer.Size"		"im.telepathy1.Channel.Type.FileTransfer1.Size"
	#define TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_CONTENT_HASH_TYPE \		#define TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_CONTENT_HASH_TYPE \
	"org.freedesktop.Telepathy.Channel.Type.FileTransfer.ContentHashType"		"im.telepathy1.Channel.Type.FileTransfer1.ContentHashType"
	#define TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_CONTENT_HASH \		#define TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_CONTENT_HASH \
	"org.freedesktop.Telepathy.Channel.Type.FileTransfer.ContentHash"		"im.telepathy1.Channel.Type.FileTransfer1.ContentHash"
	#define TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_DESCRIPTION \		#define TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_DESCRIPTION \
	"org.freedesktop.Telepathy.Channel.Type.FileTransfer.Description"		"im.telepathy1.Channel.Type.FileTransfer1.Description"
	#define TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_DATE \		#define TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_DATE \
	"org.freedesktop.Telepathy.Channel.Type.FileTransfer.Date"		"im.telepathy1.Channel.Type.FileTransfer1.Date"
	#define TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_AVAILABLE_SOCKET_TYPES \		#define TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_AVAILABLE_SOCKET_TYPES \
	"org.freedesktop.Telepathy.Channel.Type.FileTransfer.AvailableSocketTypes"		"im.telepathy1.Channel.Type.FileTransfer1.AvailableSocketTypes"
	#define TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_TRANSFERRED_BYTES \		#define TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_TRANSFERRED_BYTES \
	"org.freedesktop.Telepathy.Channel.Type.FileTransfer.TransferredBytes"		"im.telepathy1.Channel.Type.FileTransfer1.TransferredBytes"
	#define TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_INITIAL_OFFSET \		#define TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_INITIAL_OFFSET \
	"org.freedesktop.Telepathy.Channel.Type.FileTransfer.InitialOffset"		"im.telepathy1.Channel.Type.FileTransfer1.InitialOffset"
	#define TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_URI \		#define TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_URI \
	"org.freedesktop.Telepathy.Channel.Type.FileTransfer.URI"		"im.telepathy1.Channel.Type.FileTransfer1.URI"
	#define TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_FILE_COLLECTION \
	"org.freedesktop.Telepathy.Channel.Type.FileTransfer.FileCollection"
	#define TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA \
	"org.freedesktop.Telepathy.Channel.Type.StreamedMedia"
	#define TP_IFACE_QUARK_CHANNEL_TYPE_STREAMED_MEDIA \
	(tp_iface_quark_channel_type_streamed_media ())
	GQuark tp_iface_quark_channel_type_streamed_media (void);
	#define TP_PROP_CHANNEL_TYPE_STREAMED_MEDIA_INITIAL_AUDIO \
	"org.freedesktop.Telepathy.Channel.Type.StreamedMedia.InitialAudio"
	#define TP_PROP_CHANNEL_TYPE_STREAMED_MEDIA_INITIAL_VIDEO \
	"org.freedesktop.Telepathy.Channel.Type.StreamedMedia.InitialVideo"
	#define TP_PROP_CHANNEL_TYPE_STREAMED_MEDIA_IMMUTABLE_STREAMS \
	"org.freedesktop.Telepathy.Channel.Type.StreamedMedia.ImmutableStreams"
	#define TP_IFACE_CHANNEL_TYPE_ROOM_LIST \		#define TP_IFACE_CHANNEL_TYPE_ROOM_LIST \
	"org.freedesktop.Telepathy.Channel.Type.RoomList"		"im.telepathy1.Channel.Type.RoomList1"
	#define TP_IFACE_QUARK_CHANNEL_TYPE_ROOM_LIST \		#define TP_IFACE_QUARK_CHANNEL_TYPE_ROOM_LIST \
	(tp_iface_quark_channel_type_room_list ())		(tp_iface_quark_channel_type_room_list ())
	GQuark tp_iface_quark_channel_type_room_list (void);		GQuark tp_iface_quark_channel_type_room_list (void);
	#define TP_PROP_CHANNEL_TYPE_ROOM_LIST_SERVER \		#define TP_PROP_CHANNEL_TYPE_ROOM_LIST_SERVER \
	"org.freedesktop.Telepathy.Channel.Type.RoomList.Server"		"im.telepathy1.Channel.Type.RoomList1.Server"
	#define TP_IFACE_CHANNEL_TYPE_TEXT \
	"org.freedesktop.Telepathy.Channel.Type.Text"
	#define TP_IFACE_QUARK_CHANNEL_TYPE_TEXT \
	(tp_iface_quark_channel_type_text ())
	GQuark tp_iface_quark_channel_type_text (void);
	#define TP_IFACE_CHANNEL_TYPE_TUBES \
	"org.freedesktop.Telepathy.Channel.Type.Tubes"
	#define TP_IFACE_QUARK_CHANNEL_TYPE_TUBES \
	(tp_iface_quark_channel_type_tubes ())
	GQuark tp_iface_quark_channel_type_tubes (void);
	#define TP_IFACE_CHANNEL_TYPE_STREAM_TUBE \		#define TP_IFACE_CHANNEL_TYPE_STREAM_TUBE \
	"org.freedesktop.Telepathy.Channel.Type.StreamTube"		"im.telepathy1.Channel.Type.StreamTube1"
	#define TP_IFACE_QUARK_CHANNEL_TYPE_STREAM_TUBE \		#define TP_IFACE_QUARK_CHANNEL_TYPE_STREAM_TUBE \
	(tp_iface_quark_channel_type_stream_tube ())		(tp_iface_quark_channel_type_stream_tube ())
	GQuark tp_iface_quark_channel_type_stream_tube (void);		GQuark tp_iface_quark_channel_type_stream_tube (void);
	#define TP_PROP_CHANNEL_TYPE_STREAM_TUBE_SERVICE \		#define TP_PROP_CHANNEL_TYPE_STREAM_TUBE_SERVICE \
	"org.freedesktop.Telepathy.Channel.Type.StreamTube.Service"		"im.telepathy1.Channel.Type.StreamTube1.Service"
	#define TP_PROP_CHANNEL_TYPE_STREAM_TUBE_SUPPORTED_SOCKET_TYPES \		#define TP_PROP_CHANNEL_TYPE_STREAM_TUBE_SUPPORTED_SOCKET_TYPES \
	"org.freedesktop.Telepathy.Channel.Type.StreamTube.SupportedSocketTypes"		"im.telepathy1.Channel.Type.StreamTube1.SupportedSocketTypes"
	#define TP_IFACE_CHANNEL_TYPE_DBUS_TUBE \		#define TP_IFACE_CHANNEL_TYPE_DBUS_TUBE \
	"org.freedesktop.Telepathy.Channel.Type.DBusTube"		"im.telepathy1.Channel.Type.DBusTube1"
	#define TP_IFACE_QUARK_CHANNEL_TYPE_DBUS_TUBE \		#define TP_IFACE_QUARK_CHANNEL_TYPE_DBUS_TUBE \
	(tp_iface_quark_channel_type_dbus_tube ())		(tp_iface_quark_channel_type_dbus_tube ())
	GQuark tp_iface_quark_channel_type_dbus_tube (void);		GQuark tp_iface_quark_channel_type_dbus_tube (void);
	#define TP_PROP_CHANNEL_TYPE_DBUS_TUBE_SERVICE_NAME \		#define TP_PROP_CHANNEL_TYPE_DBUS_TUBE_SERVICE_NAME \
	"org.freedesktop.Telepathy.Channel.Type.DBusTube.ServiceName"		"im.telepathy1.Channel.Type.DBusTube1.ServiceName"
	#define TP_PROP_CHANNEL_TYPE_DBUS_TUBE_DBUS_NAMES \		#define TP_PROP_CHANNEL_TYPE_DBUS_TUBE_DBUS_NAMES \
	"org.freedesktop.Telepathy.Channel.Type.DBusTube.DBusNames"		"im.telepathy1.Channel.Type.DBusTube1.DBusNames"
	#define TP_PROP_CHANNEL_TYPE_DBUS_TUBE_SUPPORTED_ACCESS_CONTROLS \		#define TP_PROP_CHANNEL_TYPE_DBUS_TUBE_SUPPORTED_ACCESS_CONTROLS \
	"org.freedesktop.Telepathy.Channel.Type.DBusTube.SupportedAccessControls"		"im.telepathy1.Channel.Type.DBusTube1.SupportedAccessControls"
	#define TP_IFACE_CHANNEL_TYPE_SERVER_AUTHENTICATION \		#define TP_IFACE_CHANNEL_TYPE_SERVER_AUTHENTICATION \
	"org.freedesktop.Telepathy.Channel.Type.ServerAuthentication"		"im.telepathy1.Channel.Type.ServerAuthentication1"
	#define TP_IFACE_QUARK_CHANNEL_TYPE_SERVER_AUTHENTICATION \		#define TP_IFACE_QUARK_CHANNEL_TYPE_SERVER_AUTHENTICATION \
	(tp_iface_quark_channel_type_server_authentication ())		(tp_iface_quark_channel_type_server_authentication ())
	GQuark tp_iface_quark_channel_type_server_authentication (void);		GQuark tp_iface_quark_channel_type_server_authentication (void);
	#define TP_PROP_CHANNEL_TYPE_SERVER_AUTHENTICATION_AUTHENTICATION_METHOD \		#define TP_PROP_CHANNEL_TYPE_SERVER_AUTHENTICATION_AUTHENTICATION_METHOD \
	"org.freedesktop.Telepathy.Channel.Type.ServerAuthentication.Authentication Method"		"im.telepathy1.Channel.Type.ServerAuthentication1.AuthenticationMethod"
	#define TP_IFACE_CHANNEL_TYPE_SERVER_TLS_CONNECTION \		#define TP_IFACE_CHANNEL_TYPE_SERVER_TLS_CONNECTION \
	"org.freedesktop.Telepathy.Channel.Type.ServerTLSConnection"		"im.telepathy1.Channel.Type.ServerTLSConnection1"
	#define TP_IFACE_QUARK_CHANNEL_TYPE_SERVER_TLS_CONNECTION \		#define TP_IFACE_QUARK_CHANNEL_TYPE_SERVER_TLS_CONNECTION \
	(tp_iface_quark_channel_type_server_tls_connection ())		(tp_iface_quark_channel_type_server_tls_connection ())
	GQuark tp_iface_quark_channel_type_server_tls_connection (void);		GQuark tp_iface_quark_channel_type_server_tls_connection (void);
	#define TP_PROP_CHANNEL_TYPE_SERVER_TLS_CONNECTION_SERVER_CERTIFICATE \		#define TP_PROP_CHANNEL_TYPE_SERVER_TLS_CONNECTION_SERVER_CERTIFICATE \
	"org.freedesktop.Telepathy.Channel.Type.ServerTLSConnection.ServerCertifica te"		"im.telepathy1.Channel.Type.ServerTLSConnection1.ServerCertificate"
	#define TP_PROP_CHANNEL_TYPE_SERVER_TLS_CONNECTION_HOSTNAME \		#define TP_PROP_CHANNEL_TYPE_SERVER_TLS_CONNECTION_HOSTNAME \
	"org.freedesktop.Telepathy.Channel.Type.ServerTLSConnection.Hostname"		"im.telepathy1.Channel.Type.ServerTLSConnection1.Hostname"
	#define TP_PROP_CHANNEL_TYPE_SERVER_TLS_CONNECTION_REFERENCE_IDENTITIES \		#define TP_PROP_CHANNEL_TYPE_SERVER_TLS_CONNECTION_REFERENCE_IDENTITIES \
	"org.freedesktop.Telepathy.Channel.Type.ServerTLSConnection.ReferenceIdenti ties"		"im.telepathy1.Channel.Type.ServerTLSConnection1.ReferenceIdentities"
	#define TP_IFACE_CHANNEL_INTERFACE_ANONYMITY \		#define TP_IFACE_CHANNEL_INTERFACE_ANONYMITY \
	"org.freedesktop.Telepathy.Channel.Interface.Anonymity"		"im.telepathy1.Channel.Interface.Anonymity1"
	#define TP_IFACE_QUARK_CHANNEL_INTERFACE_ANONYMITY \		#define TP_IFACE_QUARK_CHANNEL_INTERFACE_ANONYMITY \
	(tp_iface_quark_channel_interface_anonymity ())		(tp_iface_quark_channel_interface_anonymity ())
	GQuark tp_iface_quark_channel_interface_anonymity (void);		GQuark tp_iface_quark_channel_interface_anonymity (void);
	#define TP_PROP_CHANNEL_INTERFACE_ANONYMITY_ANONYMITY_MODES \		#define TP_PROP_CHANNEL_INTERFACE_ANONYMITY_ANONYMITY_MODES \
	"org.freedesktop.Telepathy.Channel.Interface.Anonymity.AnonymityModes"		"im.telepathy1.Channel.Interface.Anonymity1.AnonymityModes"
	#define TP_PROP_CHANNEL_INTERFACE_ANONYMITY_ANONYMITY_MANDATORY \		#define TP_PROP_CHANNEL_INTERFACE_ANONYMITY_ANONYMITY_MANDATORY \
	"org.freedesktop.Telepathy.Channel.Interface.Anonymity.AnonymityMandatory"		"im.telepathy1.Channel.Interface.Anonymity1.AnonymityMandatory"
	#define TP_PROP_CHANNEL_INTERFACE_ANONYMITY_ANONYMOUS_ID \		#define TP_PROP_CHANNEL_INTERFACE_ANONYMITY_ANONYMOUS_ID \
	"org.freedesktop.Telepathy.Channel.Interface.Anonymity.AnonymousID"		"im.telepathy1.Channel.Interface.Anonymity1.AnonymousID"
	#define TP_IFACE_CHANNEL_INTERFACE_CALL_STATE \
	"org.freedesktop.Telepathy.Channel.Interface.CallState"
	#define TP_IFACE_QUARK_CHANNEL_INTERFACE_CALL_STATE \
	(tp_iface_quark_channel_interface_call_state ())
	GQuark tp_iface_quark_channel_interface_call_state (void);
	#define TP_IFACE_CHANNEL_INTERFACE_CAPTCHA_AUTHENTICATION \		#define TP_IFACE_CHANNEL_INTERFACE_CAPTCHA_AUTHENTICATION \
	"org.freedesktop.Telepathy.Channel.Interface.CaptchaAuthentication1"		"im.telepathy1.Channel.Interface.CaptchaAuthentication1"
	#define TP_IFACE_QUARK_CHANNEL_INTERFACE_CAPTCHA_AUTHENTICATION \		#define TP_IFACE_QUARK_CHANNEL_INTERFACE_CAPTCHA_AUTHENTICATION \
	(tp_iface_quark_channel_interface_captcha_authentication ())		(tp_iface_quark_channel_interface_captcha_authentication ())
	GQuark tp_iface_quark_channel_interface_captcha_authentication (void);		GQuark tp_iface_quark_channel_interface_captcha_authentication (void);
	#define TP_PROP_CHANNEL_INTERFACE_CAPTCHA_AUTHENTICATION_CAN_RETRY_CAPTCHA \		#define TP_PROP_CHANNEL_INTERFACE_CAPTCHA_AUTHENTICATION_CAN_RETRY_CAPTCHA \
	"org.freedesktop.Telepathy.Channel.Interface.CaptchaAuthentication1.CanRetr yCaptcha"		"im.telepathy1.Channel.Interface.CaptchaAuthentication1.CanRetryCaptcha"
	#define TP_PROP_CHANNEL_INTERFACE_CAPTCHA_AUTHENTICATION_CAPTCHA_STATUS \		#define TP_PROP_CHANNEL_INTERFACE_CAPTCHA_AUTHENTICATION_CAPTCHA_STATUS \
	"org.freedesktop.Telepathy.Channel.Interface.CaptchaAuthentication1.Captcha Status"		"im.telepathy1.Channel.Interface.CaptchaAuthentication1.CaptchaStatus"
	#define TP_PROP_CHANNEL_INTERFACE_CAPTCHA_AUTHENTICATION_CAPTCHA_ERROR \		#define TP_PROP_CHANNEL_INTERFACE_CAPTCHA_AUTHENTICATION_CAPTCHA_ERROR \
	"org.freedesktop.Telepathy.Channel.Interface.CaptchaAuthentication1.Captcha Error"		"im.telepathy1.Channel.Interface.CaptchaAuthentication1.CaptchaError"
	#define TP_PROP_CHANNEL_INTERFACE_CAPTCHA_AUTHENTICATION_CAPTCHA_ERROR_DETA ILS \		#define TP_PROP_CHANNEL_INTERFACE_CAPTCHA_AUTHENTICATION_CAPTCHA_ERROR_DETA ILS \
	"org.freedesktop.Telepathy.Channel.Interface.CaptchaAuthentication1.Captcha ErrorDetails"		"im.telepathy1.Channel.Interface.CaptchaAuthentication1.CaptchaErrorDetails "
	#define TP_IFACE_CHANNEL_INTERFACE_CHAT_STATE \		#define TP_IFACE_CHANNEL_INTERFACE_CHAT_STATE \
	"org.freedesktop.Telepathy.Channel.Interface.ChatState"		"im.telepathy1.Channel.Interface.ChatState1"
	#define TP_IFACE_QUARK_CHANNEL_INTERFACE_CHAT_STATE \		#define TP_IFACE_QUARK_CHANNEL_INTERFACE_CHAT_STATE \
	(tp_iface_quark_channel_interface_chat_state ())		(tp_iface_quark_channel_interface_chat_state ())
	GQuark tp_iface_quark_channel_interface_chat_state (void);		GQuark tp_iface_quark_channel_interface_chat_state (void);
	#define TP_PROP_CHANNEL_INTERFACE_CHAT_STATE_CHAT_STATES \		#define TP_PROP_CHANNEL_INTERFACE_CHAT_STATE_CHAT_STATES \
	"org.freedesktop.Telepathy.Channel.Interface.ChatState.ChatStates"		"im.telepathy1.Channel.Interface.ChatState1.ChatStates"
	#define TP_IFACE_CHANNEL_INTERFACE_CONFERENCE \		#define TP_IFACE_CHANNEL_INTERFACE_CONFERENCE \
	"org.freedesktop.Telepathy.Channel.Interface.Conference"		"im.telepathy1.Channel.Interface.Conference1"
	#define TP_IFACE_QUARK_CHANNEL_INTERFACE_CONFERENCE \		#define TP_IFACE_QUARK_CHANNEL_INTERFACE_CONFERENCE \
	(tp_iface_quark_channel_interface_conference ())		(tp_iface_quark_channel_interface_conference ())
	GQuark tp_iface_quark_channel_interface_conference (void);		GQuark tp_iface_quark_channel_interface_conference (void);
	#define TP_PROP_CHANNEL_INTERFACE_CONFERENCE_CHANNELS \		#define TP_PROP_CHANNEL_INTERFACE_CONFERENCE_CHANNELS \
	"org.freedesktop.Telepathy.Channel.Interface.Conference.Channels"		"im.telepathy1.Channel.Interface.Conference1.Channels"
	#define TP_PROP_CHANNEL_INTERFACE_CONFERENCE_INITIAL_CHANNELS \		#define TP_PROP_CHANNEL_INTERFACE_CONFERENCE_INITIAL_CHANNELS \
	"org.freedesktop.Telepathy.Channel.Interface.Conference.InitialChannels"		"im.telepathy1.Channel.Interface.Conference1.InitialChannels"
	#define TP_PROP_CHANNEL_INTERFACE_CONFERENCE_INITIAL_INVITEE_HANDLES \		#define TP_PROP_CHANNEL_INTERFACE_CONFERENCE_INITIAL_INVITEE_HANDLES \
	"org.freedesktop.Telepathy.Channel.Interface.Conference.InitialInviteeHandl es"		"im.telepathy1.Channel.Interface.Conference1.InitialInviteeHandles"
	#define TP_PROP_CHANNEL_INTERFACE_CONFERENCE_INITIAL_INVITEE_IDS \		#define TP_PROP_CHANNEL_INTERFACE_CONFERENCE_INITIAL_INVITEE_IDS \
	"org.freedesktop.Telepathy.Channel.Interface.Conference.InitialInviteeIDs"		"im.telepathy1.Channel.Interface.Conference1.InitialInviteeIDs"
	#define TP_PROP_CHANNEL_INTERFACE_CONFERENCE_INVITATION_MESSAGE \		#define TP_PROP_CHANNEL_INTERFACE_CONFERENCE_INVITATION_MESSAGE \
	"org.freedesktop.Telepathy.Channel.Interface.Conference.InvitationMessage"		"im.telepathy1.Channel.Interface.Conference1.InvitationMessage"
	#define TP_PROP_CHANNEL_INTERFACE_CONFERENCE_ORIGINAL_CHANNELS \		#define TP_PROP_CHANNEL_INTERFACE_CONFERENCE_ORIGINAL_CHANNELS \
	"org.freedesktop.Telepathy.Channel.Interface.Conference.OriginalChannels"		"im.telepathy1.Channel.Interface.Conference1.OriginalChannels"
	#define TP_IFACE_CHANNEL_INTERFACE_DESTROYABLE \		#define TP_IFACE_CHANNEL_INTERFACE_DESTROYABLE \
	"org.freedesktop.Telepathy.Channel.Interface.Destroyable"		"im.telepathy1.Channel.Interface.Destroyable1"
	#define TP_IFACE_QUARK_CHANNEL_INTERFACE_DESTROYABLE \		#define TP_IFACE_QUARK_CHANNEL_INTERFACE_DESTROYABLE \
	(tp_iface_quark_channel_interface_destroyable ())		(tp_iface_quark_channel_interface_destroyable ())
	GQuark tp_iface_quark_channel_interface_destroyable (void);		GQuark tp_iface_quark_channel_interface_destroyable (void);
	#define TP_IFACE_CHANNEL_INTERFACE_DTMF \		#define TP_IFACE_CHANNEL_INTERFACE_DTMF \
	"org.freedesktop.Telepathy.Channel.Interface.DTMF"		"im.telepathy1.Channel.Interface.DTMF1"
	#define TP_IFACE_QUARK_CHANNEL_INTERFACE_DTMF \		#define TP_IFACE_QUARK_CHANNEL_INTERFACE_DTMF \
	(tp_iface_quark_channel_interface_dtmf ())		(tp_iface_quark_channel_interface_dtmf ())
	GQuark tp_iface_quark_channel_interface_dtmf (void);		GQuark tp_iface_quark_channel_interface_dtmf (void);
	#define TP_PROP_CHANNEL_INTERFACE_DTMF_CURRENTLY_SENDING_TONES \		#define TP_PROP_CHANNEL_INTERFACE_DTMF_CURRENTLY_SENDING_TONES \
	"org.freedesktop.Telepathy.Channel.Interface.DTMF.CurrentlySendingTones"		"im.telepathy1.Channel.Interface.DTMF1.CurrentlySendingTones"
	#define TP_PROP_CHANNEL_INTERFACE_DTMF_INITIAL_TONES \		#define TP_PROP_CHANNEL_INTERFACE_DTMF_INITIAL_TONES \
	"org.freedesktop.Telepathy.Channel.Interface.DTMF.InitialTones"		"im.telepathy1.Channel.Interface.DTMF1.InitialTones"
	#define TP_PROP_CHANNEL_INTERFACE_DTMF_DEFERRED_TONES \		#define TP_PROP_CHANNEL_INTERFACE_DTMF_DEFERRED_TONES \
	"org.freedesktop.Telepathy.Channel.Interface.DTMF.DeferredTones"		"im.telepathy1.Channel.Interface.DTMF1.DeferredTones"
	#define TP_IFACE_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA \		#define TP_IFACE_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA \
	"org.freedesktop.Telepathy.Channel.Interface.FileTransfer.Metadata"		"im.telepathy1.Channel.Interface.FileTransfer.Metadata1"
	#define TP_IFACE_QUARK_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA \		#define TP_IFACE_QUARK_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA \
	(tp_iface_quark_channel_interface_file_transfer_metadata ())		(tp_iface_quark_channel_interface_file_transfer_metadata ())
	GQuark tp_iface_quark_channel_interface_file_transfer_metadata (void);		GQuark tp_iface_quark_channel_interface_file_transfer_metadata (void);
	#define TP_PROP_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA_SERVICE_NAME \		#define TP_PROP_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA_SERVICE_NAME \
	"org.freedesktop.Telepathy.Channel.Interface.FileTransfer.Metadata.ServiceN ame"		"im.telepathy1.Channel.Interface.FileTransfer.Metadata1.ServiceName"
	#define TP_PROP_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA_METADATA \		#define TP_PROP_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA_METADATA \
	"org.freedesktop.Telepathy.Channel.Interface.FileTransfer.Metadata.Metadata "		"im.telepathy1.Channel.Interface.FileTransfer.Metadata1.Metadata"
	#define TP_IFACE_CHANNEL_INTERFACE_GROUP \		#define TP_IFACE_CHANNEL_INTERFACE_GROUP \
	"org.freedesktop.Telepathy.Channel.Interface.Group"		"im.telepathy1.Channel.Interface.Group1"
	#define TP_IFACE_QUARK_CHANNEL_INTERFACE_GROUP \		#define TP_IFACE_QUARK_CHANNEL_INTERFACE_GROUP \
	(tp_iface_quark_channel_interface_group ())		(tp_iface_quark_channel_interface_group ())
	GQuark tp_iface_quark_channel_interface_group (void);		GQuark tp_iface_quark_channel_interface_group (void);
	#define TP_PROP_CHANNEL_INTERFACE_GROUP_GROUP_FLAGS \		#define TP_PROP_CHANNEL_INTERFACE_GROUP_GROUP_FLAGS \
	"org.freedesktop.Telepathy.Channel.Interface.Group.GroupFlags"		"im.telepathy1.Channel.Interface.Group1.GroupFlags"
	#define TP_PROP_CHANNEL_INTERFACE_GROUP_HANDLE_OWNERS \		#define TP_PROP_CHANNEL_INTERFACE_GROUP_HANDLE_OWNERS \
	"org.freedesktop.Telepathy.Channel.Interface.Group.HandleOwners"		"im.telepathy1.Channel.Interface.Group1.HandleOwners"
	#define TP_PROP_CHANNEL_INTERFACE_GROUP_LOCAL_PENDING_MEMBERS \		#define TP_PROP_CHANNEL_INTERFACE_GROUP_LOCAL_PENDING_MEMBERS \
	"org.freedesktop.Telepathy.Channel.Interface.Group.LocalPendingMembers"		"im.telepathy1.Channel.Interface.Group1.LocalPendingMembers"
	#define TP_PROP_CHANNEL_INTERFACE_GROUP_MEMBERS \		#define TP_PROP_CHANNEL_INTERFACE_GROUP_MEMBERS \
	"org.freedesktop.Telepathy.Channel.Interface.Group.Members"		"im.telepathy1.Channel.Interface.Group1.Members"
	#define TP_PROP_CHANNEL_INTERFACE_GROUP_REMOTE_PENDING_MEMBERS \		#define TP_PROP_CHANNEL_INTERFACE_GROUP_REMOTE_PENDING_MEMBERS \
	"org.freedesktop.Telepathy.Channel.Interface.Group.RemotePendingMembers"		"im.telepathy1.Channel.Interface.Group1.RemotePendingMembers"
	#define TP_PROP_CHANNEL_INTERFACE_GROUP_SELF_HANDLE \		#define TP_PROP_CHANNEL_INTERFACE_GROUP_SELF_HANDLE \
	"org.freedesktop.Telepathy.Channel.Interface.Group.SelfHandle"		"im.telepathy1.Channel.Interface.Group1.SelfHandle"
	#define TP_PROP_CHANNEL_INTERFACE_GROUP_MEMBER_IDENTIFIERS \		#define TP_PROP_CHANNEL_INTERFACE_GROUP_MEMBER_IDENTIFIERS \
	"org.freedesktop.Telepathy.Channel.Interface.Group.MemberIdentifiers"		"im.telepathy1.Channel.Interface.Group1.MemberIdentifiers"
	#define TP_IFACE_CHANNEL_INTERFACE_HOLD \		#define TP_IFACE_CHANNEL_INTERFACE_HOLD \
	"org.freedesktop.Telepathy.Channel.Interface.Hold"		"im.telepathy1.Channel.Interface.Hold1"
	#define TP_IFACE_QUARK_CHANNEL_INTERFACE_HOLD \		#define TP_IFACE_QUARK_CHANNEL_INTERFACE_HOLD \
	(tp_iface_quark_channel_interface_hold ())		(tp_iface_quark_channel_interface_hold ())
	GQuark tp_iface_quark_channel_interface_hold (void);		GQuark tp_iface_quark_channel_interface_hold (void);
	#define TP_IFACE_CHANNEL_INTERFACE_MEDIA_SIGNALLING \
	"org.freedesktop.Telepathy.Channel.Interface.MediaSignalling"
	#define TP_IFACE_QUARK_CHANNEL_INTERFACE_MEDIA_SIGNALLING \
	(tp_iface_quark_channel_interface_media_signalling ())
	GQuark tp_iface_quark_channel_interface_media_signalling (void);
	#define TP_TOKEN_CHANNEL_INTERFACE_MEDIA_SIGNALLING_GTALK_P2P \
	"org.freedesktop.Telepathy.Channel.Interface.MediaSignalling/gtalk-p2p"
	#define TP_TOKEN_CHANNEL_INTERFACE_MEDIA_SIGNALLING_ICE_UDP \
	"org.freedesktop.Telepathy.Channel.Interface.MediaSignalling/ice-udp"
	#define TP_TOKEN_CHANNEL_INTERFACE_MEDIA_SIGNALLING_WLM_8_5 \
	"org.freedesktop.Telepathy.Channel.Interface.MediaSignalling/wlm-8.5"
	#define TP_TOKEN_CHANNEL_INTERFACE_MEDIA_SIGNALLING_WLM_2009 \
	"org.freedesktop.Telepathy.Channel.Interface.MediaSignalling/wlm-2009"
	#define TP_IFACE_CHANNEL_INTERFACE_MESSAGES \
	"org.freedesktop.Telepathy.Channel.Interface.Messages"
	#define TP_IFACE_QUARK_CHANNEL_INTERFACE_MESSAGES \
	(tp_iface_quark_channel_interface_messages ())
	GQuark tp_iface_quark_channel_interface_messages (void);
	#define TP_PROP_CHANNEL_INTERFACE_MESSAGES_SUPPORTED_CONTENT_TYPES \
	"org.freedesktop.Telepathy.Channel.Interface.Messages.SupportedContentTypes
	"
	#define TP_PROP_CHANNEL_INTERFACE_MESSAGES_MESSAGE_TYPES \
	"org.freedesktop.Telepathy.Channel.Interface.Messages.MessageTypes"
	#define TP_PROP_CHANNEL_INTERFACE_MESSAGES_MESSAGE_PART_SUPPORT_FLAGS \
	"org.freedesktop.Telepathy.Channel.Interface.Messages.MessagePartSupportFla
	gs"
	#define TP_PROP_CHANNEL_INTERFACE_MESSAGES_PENDING_MESSAGES \
	"org.freedesktop.Telepathy.Channel.Interface.Messages.PendingMessages"
	#define TP_PROP_CHANNEL_INTERFACE_MESSAGES_DELIVERY_REPORTING_SUPPORT \
	"org.freedesktop.Telepathy.Channel.Interface.Messages.DeliveryReportingSupp
	ort"
	#define TP_IFACE_CHANNEL_INTERFACE_PASSWORD \		#define TP_IFACE_CHANNEL_INTERFACE_PASSWORD \
	"org.freedesktop.Telepathy.Channel.Interface.Password"		"im.telepathy1.Channel.Interface.Password1"
	#define TP_IFACE_QUARK_CHANNEL_INTERFACE_PASSWORD \		#define TP_IFACE_QUARK_CHANNEL_INTERFACE_PASSWORD \
	(tp_iface_quark_channel_interface_password ())		(tp_iface_quark_channel_interface_password ())
	GQuark tp_iface_quark_channel_interface_password (void);		GQuark tp_iface_quark_channel_interface_password (void);
	#define TP_IFACE_CHANNEL_INTERFACE_ROOM \		#define TP_IFACE_CHANNEL_INTERFACE_ROOM \
	"org.freedesktop.Telepathy.Channel.Interface.Room2"		"im.telepathy1.Channel.Interface.Room1"
	#define TP_IFACE_QUARK_CHANNEL_INTERFACE_ROOM \		#define TP_IFACE_QUARK_CHANNEL_INTERFACE_ROOM \
	(tp_iface_quark_channel_interface_room ())		(tp_iface_quark_channel_interface_room ())
	GQuark tp_iface_quark_channel_interface_room (void);		GQuark tp_iface_quark_channel_interface_room (void);
	#define TP_PROP_CHANNEL_INTERFACE_ROOM_ROOM_NAME \		#define TP_PROP_CHANNEL_INTERFACE_ROOM_ROOM_NAME \
	"org.freedesktop.Telepathy.Channel.Interface.Room2.RoomName"		"im.telepathy1.Channel.Interface.Room1.RoomName"
	#define TP_PROP_CHANNEL_INTERFACE_ROOM_SERVER \		#define TP_PROP_CHANNEL_INTERFACE_ROOM_SERVER \
	"org.freedesktop.Telepathy.Channel.Interface.Room2.Server"		"im.telepathy1.Channel.Interface.Room1.Server"
	#define TP_PROP_CHANNEL_INTERFACE_ROOM_CREATOR \		#define TP_PROP_CHANNEL_INTERFACE_ROOM_CREATOR \
	"org.freedesktop.Telepathy.Channel.Interface.Room2.Creator"		"im.telepathy1.Channel.Interface.Room1.Creator"
	#define TP_PROP_CHANNEL_INTERFACE_ROOM_CREATOR_HANDLE \		#define TP_PROP_CHANNEL_INTERFACE_ROOM_CREATOR_HANDLE \
	"org.freedesktop.Telepathy.Channel.Interface.Room2.CreatorHandle"		"im.telepathy1.Channel.Interface.Room1.CreatorHandle"
	#define TP_PROP_CHANNEL_INTERFACE_ROOM_CREATION_TIMESTAMP \		#define TP_PROP_CHANNEL_INTERFACE_ROOM_CREATION_TIMESTAMP \
	"org.freedesktop.Telepathy.Channel.Interface.Room2.CreationTimestamp"		"im.telepathy1.Channel.Interface.Room1.CreationTimestamp"
	#define TP_IFACE_CHANNEL_INTERFACE_ROOM_CONFIG \		#define TP_IFACE_CHANNEL_INTERFACE_ROOM_CONFIG \
	"org.freedesktop.Telepathy.Channel.Interface.RoomConfig1"		"im.telepathy1.Channel.Interface.RoomConfig1"
	#define TP_IFACE_QUARK_CHANNEL_INTERFACE_ROOM_CONFIG \		#define TP_IFACE_QUARK_CHANNEL_INTERFACE_ROOM_CONFIG \
	(tp_iface_quark_channel_interface_room_config ())		(tp_iface_quark_channel_interface_room_config ())
	GQuark tp_iface_quark_channel_interface_room_config (void);		GQuark tp_iface_quark_channel_interface_room_config (void);
	#define TP_PROP_CHANNEL_INTERFACE_ROOM_CONFIG_ANONYMOUS \		#define TP_PROP_CHANNEL_INTERFACE_ROOM_CONFIG_ANONYMOUS \
	"org.freedesktop.Telepathy.Channel.Interface.RoomConfig1.Anonymous"		"im.telepathy1.Channel.Interface.RoomConfig1.Anonymous"
	#define TP_PROP_CHANNEL_INTERFACE_ROOM_CONFIG_INVITEONLY \		#define TP_PROP_CHANNEL_INTERFACE_ROOM_CONFIG_INVITEONLY \
	"org.freedesktop.Telepathy.Channel.Interface.RoomConfig1.InviteOnly"		"im.telepathy1.Channel.Interface.RoomConfig1.InviteOnly"
	#define TP_PROP_CHANNEL_INTERFACE_ROOM_CONFIG_LIMIT \		#define TP_PROP_CHANNEL_INTERFACE_ROOM_CONFIG_LIMIT \
	"org.freedesktop.Telepathy.Channel.Interface.RoomConfig1.Limit"		"im.telepathy1.Channel.Interface.RoomConfig1.Limit"
	#define TP_PROP_CHANNEL_INTERFACE_ROOM_CONFIG_MODERATED \		#define TP_PROP_CHANNEL_INTERFACE_ROOM_CONFIG_MODERATED \
	"org.freedesktop.Telepathy.Channel.Interface.RoomConfig1.Moderated"		"im.telepathy1.Channel.Interface.RoomConfig1.Moderated"
	#define TP_PROP_CHANNEL_INTERFACE_ROOM_CONFIG_TITLE \		#define TP_PROP_CHANNEL_INTERFACE_ROOM_CONFIG_TITLE \
	"org.freedesktop.Telepathy.Channel.Interface.RoomConfig1.Title"		"im.telepathy1.Channel.Interface.RoomConfig1.Title"
	#define TP_PROP_CHANNEL_INTERFACE_ROOM_CONFIG_DESCRIPTION \		#define TP_PROP_CHANNEL_INTERFACE_ROOM_CONFIG_DESCRIPTION \
	"org.freedesktop.Telepathy.Channel.Interface.RoomConfig1.Description"		"im.telepathy1.Channel.Interface.RoomConfig1.Description"
	#define TP_PROP_CHANNEL_INTERFACE_ROOM_CONFIG_PERSISTENT \		#define TP_PROP_CHANNEL_INTERFACE_ROOM_CONFIG_PERSISTENT \
	"org.freedesktop.Telepathy.Channel.Interface.RoomConfig1.Persistent"		"im.telepathy1.Channel.Interface.RoomConfig1.Persistent"
	#define TP_PROP_CHANNEL_INTERFACE_ROOM_CONFIG_PRIVATE \		#define TP_PROP_CHANNEL_INTERFACE_ROOM_CONFIG_PRIVATE \
	"org.freedesktop.Telepathy.Channel.Interface.RoomConfig1.Private"		"im.telepathy1.Channel.Interface.RoomConfig1.Private"
	#define TP_PROP_CHANNEL_INTERFACE_ROOM_CONFIG_PASSWORD_PROTECTED \		#define TP_PROP_CHANNEL_INTERFACE_ROOM_CONFIG_PASSWORD_PROTECTED \
	"org.freedesktop.Telepathy.Channel.Interface.RoomConfig1.PasswordProtected"		"im.telepathy1.Channel.Interface.RoomConfig1.PasswordProtected"
	#define TP_PROP_CHANNEL_INTERFACE_ROOM_CONFIG_PASSWORD \		#define TP_PROP_CHANNEL_INTERFACE_ROOM_CONFIG_PASSWORD \
	"org.freedesktop.Telepathy.Channel.Interface.RoomConfig1.Password"		"im.telepathy1.Channel.Interface.RoomConfig1.Password"
	#define TP_PROP_CHANNEL_INTERFACE_ROOM_CONFIG_PASSWORD_HINT \		#define TP_PROP_CHANNEL_INTERFACE_ROOM_CONFIG_PASSWORD_HINT \
	"org.freedesktop.Telepathy.Channel.Interface.RoomConfig1.PasswordHint"		"im.telepathy1.Channel.Interface.RoomConfig1.PasswordHint"
	#define TP_PROP_CHANNEL_INTERFACE_ROOM_CONFIG_CAN_UPDATE_CONFIGURATION \		#define TP_PROP_CHANNEL_INTERFACE_ROOM_CONFIG_CAN_UPDATE_CONFIGURATION \
	"org.freedesktop.Telepathy.Channel.Interface.RoomConfig1.CanUpdateConfigura tion"		"im.telepathy1.Channel.Interface.RoomConfig1.CanUpdateConfiguration"
	#define TP_PROP_CHANNEL_INTERFACE_ROOM_CONFIG_MUTABLE_PROPERTIES \		#define TP_PROP_CHANNEL_INTERFACE_ROOM_CONFIG_MUTABLE_PROPERTIES \
	"org.freedesktop.Telepathy.Channel.Interface.RoomConfig1.MutableProperties"		"im.telepathy1.Channel.Interface.RoomConfig1.MutableProperties"
	#define TP_PROP_CHANNEL_INTERFACE_ROOM_CONFIG_CONFIGURATION_RETRIEVED \		#define TP_PROP_CHANNEL_INTERFACE_ROOM_CONFIG_CONFIGURATION_RETRIEVED \
	"org.freedesktop.Telepathy.Channel.Interface.RoomConfig1.ConfigurationRetri eved"		"im.telepathy1.Channel.Interface.RoomConfig1.ConfigurationRetrieved"
	#define TP_IFACE_CHANNEL_INTERFACE_SASL_AUTHENTICATION \		#define TP_IFACE_CHANNEL_INTERFACE_SASL_AUTHENTICATION \
	"org.freedesktop.Telepathy.Channel.Interface.SASLAuthentication"		"im.telepathy1.Channel.Interface.SASLAuthentication1"
	#define TP_IFACE_QUARK_CHANNEL_INTERFACE_SASL_AUTHENTICATION \		#define TP_IFACE_QUARK_CHANNEL_INTERFACE_SASL_AUTHENTICATION \
	(tp_iface_quark_channel_interface_sasl_authentication ())		(tp_iface_quark_channel_interface_sasl_authentication ())
	GQuark tp_iface_quark_channel_interface_sasl_authentication (void);		GQuark tp_iface_quark_channel_interface_sasl_authentication (void);
	#define TP_PROP_CHANNEL_INTERFACE_SASL_AUTHENTICATION_AVAILABLE_MECHANISMS \		#define TP_PROP_CHANNEL_INTERFACE_SASL_AUTHENTICATION_AVAILABLE_MECHANISMS \
	"org.freedesktop.Telepathy.Channel.Interface.SASLAuthentication.AvailableMe chanisms"		"im.telepathy1.Channel.Interface.SASLAuthentication1.AvailableMechanisms"
	#define TP_PROP_CHANNEL_INTERFACE_SASL_AUTHENTICATION_HAS_INITIAL_DATA \		#define TP_PROP_CHANNEL_INTERFACE_SASL_AUTHENTICATION_HAS_INITIAL_DATA \
	"org.freedesktop.Telepathy.Channel.Interface.SASLAuthentication.HasInitialD ata"		"im.telepathy1.Channel.Interface.SASLAuthentication1.HasInitialData"
	#define TP_PROP_CHANNEL_INTERFACE_SASL_AUTHENTICATION_CAN_TRY_AGAIN \		#define TP_PROP_CHANNEL_INTERFACE_SASL_AUTHENTICATION_CAN_TRY_AGAIN \
	"org.freedesktop.Telepathy.Channel.Interface.SASLAuthentication.CanTryAgain "		"im.telepathy1.Channel.Interface.SASLAuthentication1.CanTryAgain"
	#define TP_PROP_CHANNEL_INTERFACE_SASL_AUTHENTICATION_SASL_STATUS \		#define TP_PROP_CHANNEL_INTERFACE_SASL_AUTHENTICATION_SASL_STATUS \
	"org.freedesktop.Telepathy.Channel.Interface.SASLAuthentication.SASLStatus"		"im.telepathy1.Channel.Interface.SASLAuthentication1.SASLStatus"
	#define TP_PROP_CHANNEL_INTERFACE_SASL_AUTHENTICATION_SASL_ERROR \		#define TP_PROP_CHANNEL_INTERFACE_SASL_AUTHENTICATION_SASL_ERROR \
	"org.freedesktop.Telepathy.Channel.Interface.SASLAuthentication.SASLError"		"im.telepathy1.Channel.Interface.SASLAuthentication1.SASLError"
	#define TP_PROP_CHANNEL_INTERFACE_SASL_AUTHENTICATION_SASL_ERROR_DETAILS \		#define TP_PROP_CHANNEL_INTERFACE_SASL_AUTHENTICATION_SASL_ERROR_DETAILS \
	"org.freedesktop.Telepathy.Channel.Interface.SASLAuthentication.SASLErrorDe tails"		"im.telepathy1.Channel.Interface.SASLAuthentication1.SASLErrorDetails"
	#define TP_PROP_CHANNEL_INTERFACE_SASL_AUTHENTICATION_AUTHORIZATION_IDENTIT Y \		#define TP_PROP_CHANNEL_INTERFACE_SASL_AUTHENTICATION_AUTHORIZATION_IDENTIT Y \
	"org.freedesktop.Telepathy.Channel.Interface.SASLAuthentication.Authorizati onIdentity"		"im.telepathy1.Channel.Interface.SASLAuthentication1.AuthorizationIdentity"
	#define TP_PROP_CHANNEL_INTERFACE_SASL_AUTHENTICATION_DEFAULT_USERNAME \		#define TP_PROP_CHANNEL_INTERFACE_SASL_AUTHENTICATION_DEFAULT_USERNAME \
	"org.freedesktop.Telepathy.Channel.Interface.SASLAuthentication.DefaultUser name"		"im.telepathy1.Channel.Interface.SASLAuthentication1.DefaultUsername"
	#define TP_PROP_CHANNEL_INTERFACE_SASL_AUTHENTICATION_DEFAULT_REALM \		#define TP_PROP_CHANNEL_INTERFACE_SASL_AUTHENTICATION_DEFAULT_REALM \
	"org.freedesktop.Telepathy.Channel.Interface.SASLAuthentication.DefaultReal m"		"im.telepathy1.Channel.Interface.SASLAuthentication1.DefaultRealm"
	#define TP_PROP_CHANNEL_INTERFACE_SASL_AUTHENTICATION_MAY_SAVE_RESPONSE \		#define TP_PROP_CHANNEL_INTERFACE_SASL_AUTHENTICATION_MAY_SAVE_RESPONSE \
	"org.freedesktop.Telepathy.Channel.Interface.SASLAuthentication.MaySaveResp onse"		"im.telepathy1.Channel.Interface.SASLAuthentication1.MaySaveResponse"
	#define TP_IFACE_CHANNEL_INTERFACE_SECURABLE \		#define TP_IFACE_CHANNEL_INTERFACE_SECURABLE \
	"org.freedesktop.Telepathy.Channel.Interface.Securable"		"im.telepathy1.Channel.Interface.Securable1"
	#define TP_IFACE_QUARK_CHANNEL_INTERFACE_SECURABLE \		#define TP_IFACE_QUARK_CHANNEL_INTERFACE_SECURABLE \
	(tp_iface_quark_channel_interface_securable ())		(tp_iface_quark_channel_interface_securable ())
	GQuark tp_iface_quark_channel_interface_securable (void);		GQuark tp_iface_quark_channel_interface_securable (void);
	#define TP_PROP_CHANNEL_INTERFACE_SECURABLE_ENCRYPTED \		#define TP_PROP_CHANNEL_INTERFACE_SECURABLE_ENCRYPTED \
	"org.freedesktop.Telepathy.Channel.Interface.Securable.Encrypted"		"im.telepathy1.Channel.Interface.Securable1.Encrypted"
	#define TP_PROP_CHANNEL_INTERFACE_SECURABLE_VERIFIED \		#define TP_PROP_CHANNEL_INTERFACE_SECURABLE_VERIFIED \
	"org.freedesktop.Telepathy.Channel.Interface.Securable.Verified"		"im.telepathy1.Channel.Interface.Securable1.Verified"
	#define TP_IFACE_CHANNEL_INTERFACE_SERVICE_POINT \		#define TP_IFACE_CHANNEL_INTERFACE_SERVICE_POINT \
	"org.freedesktop.Telepathy.Channel.Interface.ServicePoint"		"im.telepathy1.Channel.Interface.ServicePoint1"
	#define TP_IFACE_QUARK_CHANNEL_INTERFACE_SERVICE_POINT \		#define TP_IFACE_QUARK_CHANNEL_INTERFACE_SERVICE_POINT \
	(tp_iface_quark_channel_interface_service_point ())		(tp_iface_quark_channel_interface_service_point ())
	GQuark tp_iface_quark_channel_interface_service_point (void);		GQuark tp_iface_quark_channel_interface_service_point (void);
	#define TP_PROP_CHANNEL_INTERFACE_SERVICE_POINT_INITIAL_SERVICE_POINT \		#define TP_PROP_CHANNEL_INTERFACE_SERVICE_POINT_INITIAL_SERVICE_POINT \
	"org.freedesktop.Telepathy.Channel.Interface.ServicePoint.InitialServicePoi nt"		"im.telepathy1.Channel.Interface.ServicePoint1.InitialServicePoint"
	#define TP_PROP_CHANNEL_INTERFACE_SERVICE_POINT_CURRENT_SERVICE_POINT \		#define TP_PROP_CHANNEL_INTERFACE_SERVICE_POINT_CURRENT_SERVICE_POINT \
	"org.freedesktop.Telepathy.Channel.Interface.ServicePoint.CurrentServicePoi nt"		"im.telepathy1.Channel.Interface.ServicePoint1.CurrentServicePoint"
	#define TP_IFACE_CHANNEL_INTERFACE_SUBJECT \		#define TP_IFACE_CHANNEL_INTERFACE_SUBJECT \
	"org.freedesktop.Telepathy.Channel.Interface.Subject2"		"im.telepathy1.Channel.Interface.Subject1"
	#define TP_IFACE_QUARK_CHANNEL_INTERFACE_SUBJECT \		#define TP_IFACE_QUARK_CHANNEL_INTERFACE_SUBJECT \
	(tp_iface_quark_channel_interface_subject ())		(tp_iface_quark_channel_interface_subject ())
	GQuark tp_iface_quark_channel_interface_subject (void);		GQuark tp_iface_quark_channel_interface_subject (void);
	#define TP_PROP_CHANNEL_INTERFACE_SUBJECT_SUBJECT \		#define TP_PROP_CHANNEL_INTERFACE_SUBJECT_SUBJECT \
	"org.freedesktop.Telepathy.Channel.Interface.Subject2.Subject"		"im.telepathy1.Channel.Interface.Subject1.Subject"
	#define TP_PROP_CHANNEL_INTERFACE_SUBJECT_ACTOR \		#define TP_PROP_CHANNEL_INTERFACE_SUBJECT_ACTOR \
	"org.freedesktop.Telepathy.Channel.Interface.Subject2.Actor"		"im.telepathy1.Channel.Interface.Subject1.Actor"
	#define TP_PROP_CHANNEL_INTERFACE_SUBJECT_ACTOR_HANDLE \		#define TP_PROP_CHANNEL_INTERFACE_SUBJECT_ACTOR_HANDLE \
	"org.freedesktop.Telepathy.Channel.Interface.Subject2.ActorHandle"		"im.telepathy1.Channel.Interface.Subject1.ActorHandle"
	#define TP_PROP_CHANNEL_INTERFACE_SUBJECT_TIMESTAMP \		#define TP_PROP_CHANNEL_INTERFACE_SUBJECT_TIMESTAMP \
	"org.freedesktop.Telepathy.Channel.Interface.Subject2.Timestamp"		"im.telepathy1.Channel.Interface.Subject1.Timestamp"
	#define TP_PROP_CHANNEL_INTERFACE_SUBJECT_CAN_SET \		#define TP_PROP_CHANNEL_INTERFACE_SUBJECT_CAN_SET \
	"org.freedesktop.Telepathy.Channel.Interface.Subject2.CanSet"		"im.telepathy1.Channel.Interface.Subject1.CanSet"
	#define TP_IFACE_CHANNEL_INTERFACE_SMS \		#define TP_IFACE_CHANNEL_INTERFACE_SMS \
	"org.freedesktop.Telepathy.Channel.Interface.SMS"		"im.telepathy1.Channel.Interface.SMS1"
	#define TP_IFACE_QUARK_CHANNEL_INTERFACE_SMS \		#define TP_IFACE_QUARK_CHANNEL_INTERFACE_SMS \
	(tp_iface_quark_channel_interface_sms ())		(tp_iface_quark_channel_interface_sms ())
	GQuark tp_iface_quark_channel_interface_sms (void);		GQuark tp_iface_quark_channel_interface_sms (void);
	#define TP_PROP_CHANNEL_INTERFACE_SMS_FLASH \		#define TP_PROP_CHANNEL_INTERFACE_SMS_FLASH \
	"org.freedesktop.Telepathy.Channel.Interface.SMS.Flash"		"im.telepathy1.Channel.Interface.SMS1.Flash"
	#define TP_PROP_CHANNEL_INTERFACE_SMS_SMS_CHANNEL \		#define TP_PROP_CHANNEL_INTERFACE_SMS_SMS_CHANNEL \
	"org.freedesktop.Telepathy.Channel.Interface.SMS.SMSChannel"		"im.telepathy1.Channel.Interface.SMS1.SMSChannel"
	#define TP_IFACE_CHANNEL_INTERFACE_TUBE \		#define TP_IFACE_CHANNEL_INTERFACE_TUBE \
	"org.freedesktop.Telepathy.Channel.Interface.Tube"		"im.telepathy1.Channel.Interface.Tube1"
	#define TP_IFACE_QUARK_CHANNEL_INTERFACE_TUBE \		#define TP_IFACE_QUARK_CHANNEL_INTERFACE_TUBE \
	(tp_iface_quark_channel_interface_tube ())		(tp_iface_quark_channel_interface_tube ())
	GQuark tp_iface_quark_channel_interface_tube (void);		GQuark tp_iface_quark_channel_interface_tube (void);
	#define TP_PROP_CHANNEL_INTERFACE_TUBE_PARAMETERS \		#define TP_PROP_CHANNEL_INTERFACE_TUBE_PARAMETERS \
	"org.freedesktop.Telepathy.Channel.Interface.Tube.Parameters"		"im.telepathy1.Channel.Interface.Tube1.Parameters"
	#define TP_PROP_CHANNEL_INTERFACE_TUBE_STATE \		#define TP_PROP_CHANNEL_INTERFACE_TUBE_STATE \
	"org.freedesktop.Telepathy.Channel.Interface.Tube.State"		"im.telepathy1.Channel.Interface.Tube1.State"
	#define TP_IFACE_MEDIA_SESSION_HANDLER \
	"org.freedesktop.Telepathy.Media.SessionHandler"
	#define TP_IFACE_QUARK_MEDIA_SESSION_HANDLER \
	(tp_iface_quark_media_session_handler ())
	GQuark tp_iface_quark_media_session_handler (void);
	#define TP_IFACE_MEDIA_STREAM_HANDLER \
	"org.freedesktop.Telepathy.Media.StreamHandler"
	#define TP_IFACE_QUARK_MEDIA_STREAM_HANDLER \
	(tp_iface_quark_media_stream_handler ())
	GQuark tp_iface_quark_media_stream_handler (void);
	#define TP_PROP_MEDIA_STREAM_HANDLER_STUN_SERVERS \
	"org.freedesktop.Telepathy.Media.StreamHandler.STUNServers"
	#define TP_PROP_MEDIA_STREAM_HANDLER_CREATED_LOCALLY \
	"org.freedesktop.Telepathy.Media.StreamHandler.CreatedLocally"
	#define TP_PROP_MEDIA_STREAM_HANDLER_NAT_TRAVERSAL \
	"org.freedesktop.Telepathy.Media.StreamHandler.NATTraversal"
	#define TP_PROP_MEDIA_STREAM_HANDLER_RELAY_INFO \
	"org.freedesktop.Telepathy.Media.StreamHandler.RelayInfo"
	#define TP_IFACE_DBUS_PEER \		#define TP_IFACE_DBUS_PEER \
	"org.freedesktop.DBus.Peer"		"org.freedesktop.DBus.Peer"
	#define TP_IFACE_QUARK_DBUS_PEER \		#define TP_IFACE_QUARK_DBUS_PEER \
	(tp_iface_quark_dbus_peer ())		(tp_iface_quark_dbus_peer ())
	GQuark tp_iface_quark_dbus_peer (void);		GQuark tp_iface_quark_dbus_peer (void);
	#define TP_IFACE_DBUS_INTROSPECTABLE \		#define TP_IFACE_DBUS_INTROSPECTABLE \
	skipping to change at line 1226		skipping to change at line 1088
	GQuark tp_iface_quark_dbus_introspectable (void);		GQuark tp_iface_quark_dbus_introspectable (void);
	#define TP_IFACE_DBUS_PROPERTIES \		#define TP_IFACE_DBUS_PROPERTIES \
	"org.freedesktop.DBus.Properties"		"org.freedesktop.DBus.Properties"
	#define TP_IFACE_QUARK_DBUS_PROPERTIES \		#define TP_IFACE_QUARK_DBUS_PROPERTIES \
	(tp_iface_quark_dbus_properties ())		(tp_iface_quark_dbus_properties ())
	GQuark tp_iface_quark_dbus_properties (void);		GQuark tp_iface_quark_dbus_properties (void);
	#define TP_IFACE_PROPERTIES_INTERFACE \
	"org.freedesktop.Telepathy.Properties"
	#define TP_IFACE_QUARK_PROPERTIES_INTERFACE \
	(tp_iface_quark_properties_interface ())
	GQuark tp_iface_quark_properties_interface (void);
	#define TP_IFACE_DBUS_DAEMON \		#define TP_IFACE_DBUS_DAEMON \
	"org.freedesktop.DBus"		"org.freedesktop.DBus"
	#define TP_IFACE_QUARK_DBUS_DAEMON \		#define TP_IFACE_QUARK_DBUS_DAEMON \
	(tp_iface_quark_dbus_daemon ())		(tp_iface_quark_dbus_daemon ())
	GQuark tp_iface_quark_dbus_daemon (void);		GQuark tp_iface_quark_dbus_daemon (void);
	#define TP_IFACE_ACCOUNT_MANAGER \		#define TP_IFACE_ACCOUNT_MANAGER \
	"org.freedesktop.Telepathy.AccountManager"		"im.telepathy1.AccountManager"
	#define TP_IFACE_QUARK_ACCOUNT_MANAGER \		#define TP_IFACE_QUARK_ACCOUNT_MANAGER \
	(tp_iface_quark_account_manager ())		(tp_iface_quark_account_manager ())
	GQuark tp_iface_quark_account_manager (void);		GQuark tp_iface_quark_account_manager (void);
	#define TP_PROP_ACCOUNT_MANAGER_INTERFACES \		#define TP_PROP_ACCOUNT_MANAGER_INTERFACES \
	"org.freedesktop.Telepathy.AccountManager.Interfaces"		"im.telepathy1.AccountManager.Interfaces"
	#define TP_PROP_ACCOUNT_MANAGER_VALID_ACCOUNTS \		#define TP_PROP_ACCOUNT_MANAGER_USABLE_ACCOUNTS \
	"org.freedesktop.Telepathy.AccountManager.ValidAccounts"		"im.telepathy1.AccountManager.UsableAccounts"
	#define TP_PROP_ACCOUNT_MANAGER_INVALID_ACCOUNTS \		#define TP_PROP_ACCOUNT_MANAGER_UNUSABLE_ACCOUNTS \
	"org.freedesktop.Telepathy.AccountManager.InvalidAccounts"		"im.telepathy1.AccountManager.UnusableAccounts"
	#define TP_PROP_ACCOUNT_MANAGER_SUPPORTED_ACCOUNT_PROPERTIES \		#define TP_PROP_ACCOUNT_MANAGER_SUPPORTED_ACCOUNT_PROPERTIES \
	"org.freedesktop.Telepathy.AccountManager.SupportedAccountProperties"		"im.telepathy1.AccountManager.SupportedAccountProperties"
	#define TP_IFACE_ACCOUNT \		#define TP_IFACE_ACCOUNT \
	"org.freedesktop.Telepathy.Account"		"im.telepathy1.Account"
	#define TP_IFACE_QUARK_ACCOUNT \		#define TP_IFACE_QUARK_ACCOUNT \
	(tp_iface_quark_account ())		(tp_iface_quark_account ())
	GQuark tp_iface_quark_account (void);		GQuark tp_iface_quark_account (void);
	#define TP_PROP_ACCOUNT_INTERFACES \		#define TP_PROP_ACCOUNT_INTERFACES \
	"org.freedesktop.Telepathy.Account.Interfaces"		"im.telepathy1.Account.Interfaces"
	#define TP_PROP_ACCOUNT_DISPLAY_NAME \		#define TP_PROP_ACCOUNT_DISPLAY_NAME \
	"org.freedesktop.Telepathy.Account.DisplayName"		"im.telepathy1.Account.DisplayName"
	#define TP_PROP_ACCOUNT_ICON \		#define TP_PROP_ACCOUNT_ICON \
	"org.freedesktop.Telepathy.Account.Icon"		"im.telepathy1.Account.Icon"
	#define TP_PROP_ACCOUNT_VALID \		#define TP_PROP_ACCOUNT_USABLE \
	"org.freedesktop.Telepathy.Account.Valid"		"im.telepathy1.Account.Usable"
	#define TP_PROP_ACCOUNT_ENABLED \		#define TP_PROP_ACCOUNT_ENABLED \
	"org.freedesktop.Telepathy.Account.Enabled"		"im.telepathy1.Account.Enabled"
	#define TP_PROP_ACCOUNT_NICKNAME \		#define TP_PROP_ACCOUNT_NICKNAME \
	"org.freedesktop.Telepathy.Account.Nickname"		"im.telepathy1.Account.Nickname"
	#define TP_PROP_ACCOUNT_SERVICE \		#define TP_PROP_ACCOUNT_SERVICE \
	"org.freedesktop.Telepathy.Account.Service"		"im.telepathy1.Account.Service"
	#define TP_PROP_ACCOUNT_PARAMETERS \		#define TP_PROP_ACCOUNT_PARAMETERS \
	"org.freedesktop.Telepathy.Account.Parameters"		"im.telepathy1.Account.Parameters"
	#define TP_PROP_ACCOUNT_AUTOMATIC_PRESENCE \		#define TP_PROP_ACCOUNT_AUTOMATIC_PRESENCE \
	"org.freedesktop.Telepathy.Account.AutomaticPresence"		"im.telepathy1.Account.AutomaticPresence"
	#define TP_PROP_ACCOUNT_CONNECT_AUTOMATICALLY \		#define TP_PROP_ACCOUNT_CONNECT_AUTOMATICALLY \
	"org.freedesktop.Telepathy.Account.ConnectAutomatically"		"im.telepathy1.Account.ConnectAutomatically"
	#define TP_PROP_ACCOUNT_CONNECTION \		#define TP_PROP_ACCOUNT_CONNECTION \
	"org.freedesktop.Telepathy.Account.Connection"		"im.telepathy1.Account.Connection"
	#define TP_PROP_ACCOUNT_CONNECTION_STATUS \		#define TP_PROP_ACCOUNT_CONNECTION_STATUS \
	"org.freedesktop.Telepathy.Account.ConnectionStatus"		"im.telepathy1.Account.ConnectionStatus"
	#define TP_PROP_ACCOUNT_CONNECTION_STATUS_REASON \		#define TP_PROP_ACCOUNT_CONNECTION_STATUS_REASON \
	"org.freedesktop.Telepathy.Account.ConnectionStatusReason"		"im.telepathy1.Account.ConnectionStatusReason"
	#define TP_PROP_ACCOUNT_CONNECTION_ERROR \		#define TP_PROP_ACCOUNT_CONNECTION_ERROR \
	"org.freedesktop.Telepathy.Account.ConnectionError"		"im.telepathy1.Account.ConnectionError"
	#define TP_PROP_ACCOUNT_CONNECTION_ERROR_DETAILS \		#define TP_PROP_ACCOUNT_CONNECTION_ERROR_DETAILS \
	"org.freedesktop.Telepathy.Account.ConnectionErrorDetails"		"im.telepathy1.Account.ConnectionErrorDetails"
	#define TP_PROP_ACCOUNT_CURRENT_PRESENCE \		#define TP_PROP_ACCOUNT_CURRENT_PRESENCE \
	"org.freedesktop.Telepathy.Account.CurrentPresence"		"im.telepathy1.Account.CurrentPresence"
	#define TP_PROP_ACCOUNT_REQUESTED_PRESENCE \		#define TP_PROP_ACCOUNT_REQUESTED_PRESENCE \
	"org.freedesktop.Telepathy.Account.RequestedPresence"		"im.telepathy1.Account.RequestedPresence"
	#define TP_PROP_ACCOUNT_CHANGING_PRESENCE \		#define TP_PROP_ACCOUNT_CHANGING_PRESENCE \
	"org.freedesktop.Telepathy.Account.ChangingPresence"		"im.telepathy1.Account.ChangingPresence"
	#define TP_PROP_ACCOUNT_NORMALIZED_NAME \		#define TP_PROP_ACCOUNT_NORMALIZED_NAME \
	"org.freedesktop.Telepathy.Account.NormalizedName"		"im.telepathy1.Account.NormalizedName"
	#define TP_PROP_ACCOUNT_HAS_BEEN_ONLINE \		#define TP_PROP_ACCOUNT_HAS_BEEN_ONLINE \
	"org.freedesktop.Telepathy.Account.HasBeenOnline"		"im.telepathy1.Account.HasBeenOnline"
	#define TP_PROP_ACCOUNT_SUPERSEDES \		#define TP_PROP_ACCOUNT_SUPERSEDES \
	"org.freedesktop.Telepathy.Account.Supersedes"		"im.telepathy1.Account.Supersedes"
	#define TP_IFACE_ACCOUNT_INTERFACE_AVATAR \		#define TP_IFACE_ACCOUNT_INTERFACE_AVATAR \
	"org.freedesktop.Telepathy.Account.Interface.Avatar"		"im.telepathy1.Account.Interface.Avatar1"
	#define TP_IFACE_QUARK_ACCOUNT_INTERFACE_AVATAR \		#define TP_IFACE_QUARK_ACCOUNT_INTERFACE_AVATAR \
	(tp_iface_quark_account_interface_avatar ())		(tp_iface_quark_account_interface_avatar ())
	GQuark tp_iface_quark_account_interface_avatar (void);		GQuark tp_iface_quark_account_interface_avatar (void);
	#define TP_PROP_ACCOUNT_INTERFACE_AVATAR_AVATAR \		#define TP_PROP_ACCOUNT_INTERFACE_AVATAR_AVATAR \
	"org.freedesktop.Telepathy.Account.Interface.Avatar.Avatar"		"im.telepathy1.Account.Interface.Avatar1.Avatar"
	#define TP_IFACE_ACCOUNT_INTERFACE_ADDRESSING \		#define TP_IFACE_ACCOUNT_INTERFACE_ADDRESSING \
	"org.freedesktop.Telepathy.Account.Interface.Addressing"		"im.telepathy1.Account.Interface.Addressing1"
	#define TP_IFACE_QUARK_ACCOUNT_INTERFACE_ADDRESSING \		#define TP_IFACE_QUARK_ACCOUNT_INTERFACE_ADDRESSING \
	(tp_iface_quark_account_interface_addressing ())		(tp_iface_quark_account_interface_addressing ())
	GQuark tp_iface_quark_account_interface_addressing (void);		GQuark tp_iface_quark_account_interface_addressing (void);
	#define TP_PROP_ACCOUNT_INTERFACE_ADDRESSING_URI_SCHEMES \		#define TP_PROP_ACCOUNT_INTERFACE_ADDRESSING_URI_SCHEMES \
	"org.freedesktop.Telepathy.Account.Interface.Addressing.URISchemes"		"im.telepathy1.Account.Interface.Addressing1.URISchemes"
	#define TP_IFACE_ACCOUNT_INTERFACE_STORAGE \		#define TP_IFACE_ACCOUNT_INTERFACE_STORAGE \
	"org.freedesktop.Telepathy.Account.Interface.Storage"		"im.telepathy1.Account.Interface.Storage1"
	#define TP_IFACE_QUARK_ACCOUNT_INTERFACE_STORAGE \		#define TP_IFACE_QUARK_ACCOUNT_INTERFACE_STORAGE \
	(tp_iface_quark_account_interface_storage ())		(tp_iface_quark_account_interface_storage ())
	GQuark tp_iface_quark_account_interface_storage (void);		GQuark tp_iface_quark_account_interface_storage (void);
	#define TP_PROP_ACCOUNT_INTERFACE_STORAGE_STORAGE_PROVIDER \		#define TP_PROP_ACCOUNT_INTERFACE_STORAGE_STORAGE_PROVIDER \
	"org.freedesktop.Telepathy.Account.Interface.Storage.StorageProvider"		"im.telepathy1.Account.Interface.Storage1.StorageProvider"
	#define TP_PROP_ACCOUNT_INTERFACE_STORAGE_STORAGE_IDENTIFIER \		#define TP_PROP_ACCOUNT_INTERFACE_STORAGE_STORAGE_IDENTIFIER \
	"org.freedesktop.Telepathy.Account.Interface.Storage.StorageIdentifier"		"im.telepathy1.Account.Interface.Storage1.StorageIdentifier"
	#define TP_PROP_ACCOUNT_INTERFACE_STORAGE_STORAGE_SPECIFIC_INFORMATION \		#define TP_PROP_ACCOUNT_INTERFACE_STORAGE_STORAGE_SPECIFIC_INFORMATION \
	"org.freedesktop.Telepathy.Account.Interface.Storage.StorageSpecificInforma tion"		"im.telepathy1.Account.Interface.Storage1.StorageSpecificInformation"
	#define TP_PROP_ACCOUNT_INTERFACE_STORAGE_STORAGE_RESTRICTIONS \		#define TP_PROP_ACCOUNT_INTERFACE_STORAGE_STORAGE_RESTRICTIONS \
	"org.freedesktop.Telepathy.Account.Interface.Storage.StorageRestrictions"		"im.telepathy1.Account.Interface.Storage1.StorageRestrictions"
	#define TP_IFACE_CHANNEL_DISPATCHER \		#define TP_IFACE_CHANNEL_DISPATCHER \
	"org.freedesktop.Telepathy.ChannelDispatcher"		"im.telepathy1.ChannelDispatcher"
	#define TP_IFACE_QUARK_CHANNEL_DISPATCHER \		#define TP_IFACE_QUARK_CHANNEL_DISPATCHER \
	(tp_iface_quark_channel_dispatcher ())		(tp_iface_quark_channel_dispatcher ())
	GQuark tp_iface_quark_channel_dispatcher (void);		GQuark tp_iface_quark_channel_dispatcher (void);
	#define TP_PROP_CHANNEL_DISPATCHER_INTERFACES \		#define TP_PROP_CHANNEL_DISPATCHER_INTERFACES \
	"org.freedesktop.Telepathy.ChannelDispatcher.Interfaces"		"im.telepathy1.ChannelDispatcher.Interfaces"
	#define TP_PROP_CHANNEL_DISPATCHER_SUPPORTS_REQUEST_HINTS \
	"org.freedesktop.Telepathy.ChannelDispatcher.SupportsRequestHints"
	#define TP_IFACE_CHANNEL_DISPATCHER_INTERFACE_MESSAGES1 \
	"org.freedesktop.Telepathy.ChannelDispatcher.Interface.Messages1"
	#define TP_IFACE_QUARK_CHANNEL_DISPATCHER_INTERFACE_MESSAGES1 \
	(tp_iface_quark_channel_dispatcher_interface_messages1 ())
	GQuark tp_iface_quark_channel_dispatcher_interface_messages1 (void);
	#define TP_IFACE_CHANNEL_DISPATCHER_INTERFACE_OPERATION_LIST \		#define TP_IFACE_CHANNEL_DISPATCHER_INTERFACE_OPERATION_LIST \
	"org.freedesktop.Telepathy.ChannelDispatcher.Interface.OperationList"		"im.telepathy1.ChannelDispatcher.Interface.OperationList1"
	#define TP_IFACE_QUARK_CHANNEL_DISPATCHER_INTERFACE_OPERATION_LIST \		#define TP_IFACE_QUARK_CHANNEL_DISPATCHER_INTERFACE_OPERATION_LIST \
	(tp_iface_quark_channel_dispatcher_interface_operation_list ())		(tp_iface_quark_channel_dispatcher_interface_operation_list ())
	GQuark tp_iface_quark_channel_dispatcher_interface_operation_list (void);		GQuark tp_iface_quark_channel_dispatcher_interface_operation_list (void);
	#define TP_PROP_CHANNEL_DISPATCHER_INTERFACE_OPERATION_LIST_DISPATCH_OPERAT IONS \		#define TP_PROP_CHANNEL_DISPATCHER_INTERFACE_OPERATION_LIST_DISPATCH_OPERAT IONS \
	"org.freedesktop.Telepathy.ChannelDispatcher.Interface.OperationList.Dispat chOperations"		"im.telepathy1.ChannelDispatcher.Interface.OperationList1.DispatchOperation s"
	#define TP_IFACE_CHANNEL_DISPATCH_OPERATION \		#define TP_IFACE_CHANNEL_DISPATCH_OPERATION \
	"org.freedesktop.Telepathy.ChannelDispatchOperation"		"im.telepathy1.ChannelDispatchOperation"
	#define TP_IFACE_QUARK_CHANNEL_DISPATCH_OPERATION \		#define TP_IFACE_QUARK_CHANNEL_DISPATCH_OPERATION \
	(tp_iface_quark_channel_dispatch_operation ())		(tp_iface_quark_channel_dispatch_operation ())
	GQuark tp_iface_quark_channel_dispatch_operation (void);		GQuark tp_iface_quark_channel_dispatch_operation (void);
	#define TP_PROP_CHANNEL_DISPATCH_OPERATION_INTERFACES \		#define TP_PROP_CHANNEL_DISPATCH_OPERATION_INTERFACES \
	"org.freedesktop.Telepathy.ChannelDispatchOperation.Interfaces"		"im.telepathy1.ChannelDispatchOperation.Interfaces"
	#define TP_PROP_CHANNEL_DISPATCH_OPERATION_CONNECTION \		#define TP_PROP_CHANNEL_DISPATCH_OPERATION_CONNECTION \
	"org.freedesktop.Telepathy.ChannelDispatchOperation.Connection"		"im.telepathy1.ChannelDispatchOperation.Connection"
	#define TP_PROP_CHANNEL_DISPATCH_OPERATION_ACCOUNT \		#define TP_PROP_CHANNEL_DISPATCH_OPERATION_ACCOUNT \
	"org.freedesktop.Telepathy.ChannelDispatchOperation.Account"		"im.telepathy1.ChannelDispatchOperation.Account"
	#define TP_PROP_CHANNEL_DISPATCH_OPERATION_CHANNELS \		#define TP_PROP_CHANNEL_DISPATCH_OPERATION_CHANNELS \
	"org.freedesktop.Telepathy.ChannelDispatchOperation.Channels"		"im.telepathy1.ChannelDispatchOperation.Channels"
	#define TP_PROP_CHANNEL_DISPATCH_OPERATION_POSSIBLE_HANDLERS \		#define TP_PROP_CHANNEL_DISPATCH_OPERATION_POSSIBLE_HANDLERS \
	"org.freedesktop.Telepathy.ChannelDispatchOperation.PossibleHandlers"		"im.telepathy1.ChannelDispatchOperation.PossibleHandlers"
	#define TP_IFACE_CHANNEL_REQUEST \		#define TP_IFACE_CHANNEL_REQUEST \
	"org.freedesktop.Telepathy.ChannelRequest"		"im.telepathy1.ChannelRequest"
	#define TP_IFACE_QUARK_CHANNEL_REQUEST \		#define TP_IFACE_QUARK_CHANNEL_REQUEST \
	(tp_iface_quark_channel_request ())		(tp_iface_quark_channel_request ())
	GQuark tp_iface_quark_channel_request (void);		GQuark tp_iface_quark_channel_request (void);
	#define TP_PROP_CHANNEL_REQUEST_ACCOUNT \		#define TP_PROP_CHANNEL_REQUEST_ACCOUNT \
	"org.freedesktop.Telepathy.ChannelRequest.Account"		"im.telepathy1.ChannelRequest.Account"
	#define TP_PROP_CHANNEL_REQUEST_USER_ACTION_TIME \		#define TP_PROP_CHANNEL_REQUEST_USER_ACTION_TIME \
	"org.freedesktop.Telepathy.ChannelRequest.UserActionTime"		"im.telepathy1.ChannelRequest.UserActionTime"
	#define TP_PROP_CHANNEL_REQUEST_PREFERRED_HANDLER \		#define TP_PROP_CHANNEL_REQUEST_PREFERRED_HANDLER \
	"org.freedesktop.Telepathy.ChannelRequest.PreferredHandler"		"im.telepathy1.ChannelRequest.PreferredHandler"
	#define TP_PROP_CHANNEL_REQUEST_REQUESTS \		#define TP_PROP_CHANNEL_REQUEST_REQUESTS \
	"org.freedesktop.Telepathy.ChannelRequest.Requests"		"im.telepathy1.ChannelRequest.Requests"
	#define TP_PROP_CHANNEL_REQUEST_INTERFACES \		#define TP_PROP_CHANNEL_REQUEST_INTERFACES \
	"org.freedesktop.Telepathy.ChannelRequest.Interfaces"		"im.telepathy1.ChannelRequest.Interfaces"
	#define TP_PROP_CHANNEL_REQUEST_HINTS \		#define TP_PROP_CHANNEL_REQUEST_HINTS \
	"org.freedesktop.Telepathy.ChannelRequest.Hints"		"im.telepathy1.ChannelRequest.Hints"
	#define TP_IFACE_CLIENT \		#define TP_IFACE_CLIENT \
	"org.freedesktop.Telepathy.Client"		"im.telepathy1.Client"
	#define TP_IFACE_QUARK_CLIENT \		#define TP_IFACE_QUARK_CLIENT \
	(tp_iface_quark_client ())		(tp_iface_quark_client ())
	GQuark tp_iface_quark_client (void);		GQuark tp_iface_quark_client (void);
	#define TP_PROP_CLIENT_INTERFACES \		#define TP_PROP_CLIENT_INTERFACES \
	"org.freedesktop.Telepathy.Client.Interfaces"		"im.telepathy1.Client.Interfaces"
	#define TP_IFACE_CLIENT_OBSERVER \		#define TP_IFACE_CLIENT_OBSERVER \
	"org.freedesktop.Telepathy.Client.Observer"		"im.telepathy1.Client.Observer"
	#define TP_IFACE_QUARK_CLIENT_OBSERVER \		#define TP_IFACE_QUARK_CLIENT_OBSERVER \
	(tp_iface_quark_client_observer ())		(tp_iface_quark_client_observer ())
	GQuark tp_iface_quark_client_observer (void);		GQuark tp_iface_quark_client_observer (void);
	#define TP_PROP_CLIENT_OBSERVER_OBSERVER_CHANNEL_FILTER \		#define TP_PROP_CLIENT_OBSERVER_OBSERVER_CHANNEL_FILTER \
	"org.freedesktop.Telepathy.Client.Observer.ObserverChannelFilter"		"im.telepathy1.Client.Observer.ObserverChannelFilter"
	#define TP_PROP_CLIENT_OBSERVER_RECOVER \		#define TP_PROP_CLIENT_OBSERVER_RECOVER \
	"org.freedesktop.Telepathy.Client.Observer.Recover"		"im.telepathy1.Client.Observer.Recover"
	#define TP_PROP_CLIENT_OBSERVER_DELAY_APPROVERS \		#define TP_PROP_CLIENT_OBSERVER_DELAY_APPROVERS \
	"org.freedesktop.Telepathy.Client.Observer.DelayApprovers"		"im.telepathy1.Client.Observer.DelayApprovers"
	#define TP_IFACE_CLIENT_APPROVER \		#define TP_IFACE_CLIENT_APPROVER \
	"org.freedesktop.Telepathy.Client.Approver"		"im.telepathy1.Client.Approver"
	#define TP_IFACE_QUARK_CLIENT_APPROVER \		#define TP_IFACE_QUARK_CLIENT_APPROVER \
	(tp_iface_quark_client_approver ())		(tp_iface_quark_client_approver ())
	GQuark tp_iface_quark_client_approver (void);		GQuark tp_iface_quark_client_approver (void);
	#define TP_PROP_CLIENT_APPROVER_APPROVER_CHANNEL_FILTER \		#define TP_PROP_CLIENT_APPROVER_APPROVER_CHANNEL_FILTER \
	"org.freedesktop.Telepathy.Client.Approver.ApproverChannelFilter"		"im.telepathy1.Client.Approver.ApproverChannelFilter"
	#define TP_IFACE_CLIENT_HANDLER \		#define TP_IFACE_CLIENT_HANDLER \
	"org.freedesktop.Telepathy.Client.Handler"		"im.telepathy1.Client.Handler"
	#define TP_IFACE_QUARK_CLIENT_HANDLER \		#define TP_IFACE_QUARK_CLIENT_HANDLER \
	(tp_iface_quark_client_handler ())		(tp_iface_quark_client_handler ())
	GQuark tp_iface_quark_client_handler (void);		GQuark tp_iface_quark_client_handler (void);
	#define TP_PROP_CLIENT_HANDLER_HANDLER_CHANNEL_FILTER \		#define TP_PROP_CLIENT_HANDLER_HANDLER_CHANNEL_FILTER \
	"org.freedesktop.Telepathy.Client.Handler.HandlerChannelFilter"		"im.telepathy1.Client.Handler.HandlerChannelFilter"
	#define TP_PROP_CLIENT_HANDLER_BYPASS_APPROVAL \		#define TP_PROP_CLIENT_HANDLER_BYPASS_APPROVAL \
	"org.freedesktop.Telepathy.Client.Handler.BypassApproval"		"im.telepathy1.Client.Handler.BypassApproval"
	#define TP_PROP_CLIENT_HANDLER_CAPABILITIES \		#define TP_PROP_CLIENT_HANDLER_CAPABILITIES \
	"org.freedesktop.Telepathy.Client.Handler.Capabilities"		"im.telepathy1.Client.Handler.Capabilities"
	#define TP_PROP_CLIENT_HANDLER_HANDLED_CHANNELS \		#define TP_PROP_CLIENT_HANDLER_HANDLED_CHANNELS \
	"org.freedesktop.Telepathy.Client.Handler.HandledChannels"		"im.telepathy1.Client.Handler.HandledChannels"
	#define TP_IFACE_CLIENT_INTERFACE_REQUESTS \		#define TP_IFACE_CLIENT_INTERFACE_REQUESTS \
	"org.freedesktop.Telepathy.Client.Interface.Requests"		"im.telepathy1.Client.Interface.Requests"
	#define TP_IFACE_QUARK_CLIENT_INTERFACE_REQUESTS \		#define TP_IFACE_QUARK_CLIENT_INTERFACE_REQUESTS \
	(tp_iface_quark_client_interface_requests ())		(tp_iface_quark_client_interface_requests ())
	GQuark tp_iface_quark_client_interface_requests (void);		GQuark tp_iface_quark_client_interface_requests (void);
	#define TP_IFACE_DEBUG \		#define TP_IFACE_DEBUG \
	"org.freedesktop.Telepathy.Debug"		"im.telepathy1.Debug1"
	#define TP_IFACE_QUARK_DEBUG \		#define TP_IFACE_QUARK_DEBUG \
	(tp_iface_quark_debug ())		(tp_iface_quark_debug ())
	GQuark tp_iface_quark_debug (void);		GQuark tp_iface_quark_debug (void);
	#define TP_PROP_DEBUG_ENABLED \		#define TP_PROP_DEBUG_ENABLED \
	"org.freedesktop.Telepathy.Debug.Enabled"		"im.telepathy1.Debug1.Enabled"
	#define TP_IFACE_AUTHENTICATION_TLS_CERTIFICATE \		#define TP_IFACE_AUTHENTICATION_TLS_CERTIFICATE \
	"org.freedesktop.Telepathy.Authentication.TLSCertificate"		"im.telepathy1.Authentication.TLSCertificate"
	#define TP_IFACE_QUARK_AUTHENTICATION_TLS_CERTIFICATE \		#define TP_IFACE_QUARK_AUTHENTICATION_TLS_CERTIFICATE \
	(tp_iface_quark_authentication_tls_certificate ())		(tp_iface_quark_authentication_tls_certificate ())
	GQuark tp_iface_quark_authentication_tls_certificate (void);		GQuark tp_iface_quark_authentication_tls_certificate (void);
	#define TP_PROP_AUTHENTICATION_TLS_CERTIFICATE_STATE \		#define TP_PROP_AUTHENTICATION_TLS_CERTIFICATE_STATE \
	"org.freedesktop.Telepathy.Authentication.TLSCertificate.State"		"im.telepathy1.Authentication.TLSCertificate.State"
	#define TP_PROP_AUTHENTICATION_TLS_CERTIFICATE_REJECTIONS \		#define TP_PROP_AUTHENTICATION_TLS_CERTIFICATE_REJECTIONS \
	"org.freedesktop.Telepathy.Authentication.TLSCertificate.Rejections"		"im.telepathy1.Authentication.TLSCertificate.Rejections"
	#define TP_PROP_AUTHENTICATION_TLS_CERTIFICATE_CERTIFICATE_TYPE \		#define TP_PROP_AUTHENTICATION_TLS_CERTIFICATE_CERTIFICATE_TYPE \
	"org.freedesktop.Telepathy.Authentication.TLSCertificate.CertificateType"		"im.telepathy1.Authentication.TLSCertificate.CertificateType"
	#define TP_PROP_AUTHENTICATION_TLS_CERTIFICATE_CERTIFICATE_CHAIN_DATA \		#define TP_PROP_AUTHENTICATION_TLS_CERTIFICATE_CERTIFICATE_CHAIN_DATA \
	"org.freedesktop.Telepathy.Authentication.TLSCertificate.CertificateChainDa ta"		"im.telepathy1.Authentication.TLSCertificate.CertificateChainData"
	#define TP_IFACE_CALL_CONTENT_INTERFACE_MEDIA \		#define TP_IFACE_CALL_CONTENT_INTERFACE_MEDIA \
	"org.freedesktop.Telepathy.Call1.Content.Interface.Media"		"im.telepathy1.Call1.Content.Interface.Media"
	#define TP_IFACE_QUARK_CALL_CONTENT_INTERFACE_MEDIA \		#define TP_IFACE_QUARK_CALL_CONTENT_INTERFACE_MEDIA \
	(tp_iface_quark_call_content_interface_media ())		(tp_iface_quark_call_content_interface_media ())
	GQuark tp_iface_quark_call_content_interface_media (void);		GQuark tp_iface_quark_call_content_interface_media (void);
	#define TP_PROP_CALL_CONTENT_INTERFACE_MEDIA_REMOTE_MEDIA_DESCRIPTIONS \		#define TP_PROP_CALL_CONTENT_INTERFACE_MEDIA_REMOTE_MEDIA_DESCRIPTIONS \
	"org.freedesktop.Telepathy.Call1.Content.Interface.Media.RemoteMediaDescrip tions"		"im.telepathy1.Call1.Content.Interface.Media.RemoteMediaDescriptions"
	#define TP_PROP_CALL_CONTENT_INTERFACE_MEDIA_LOCAL_MEDIA_DESCRIPTIONS \		#define TP_PROP_CALL_CONTENT_INTERFACE_MEDIA_LOCAL_MEDIA_DESCRIPTIONS \
	"org.freedesktop.Telepathy.Call1.Content.Interface.Media.LocalMediaDescript ions"		"im.telepathy1.Call1.Content.Interface.Media.LocalMediaDescriptions"
	#define TP_PROP_CALL_CONTENT_INTERFACE_MEDIA_MEDIA_DESCRIPTION_OFFER \		#define TP_PROP_CALL_CONTENT_INTERFACE_MEDIA_MEDIA_DESCRIPTION_OFFER \
	"org.freedesktop.Telepathy.Call1.Content.Interface.Media.MediaDescriptionOf fer"		"im.telepathy1.Call1.Content.Interface.Media.MediaDescriptionOffer"
	#define TP_PROP_CALL_CONTENT_INTERFACE_MEDIA_PACKETIZATION \		#define TP_PROP_CALL_CONTENT_INTERFACE_MEDIA_PACKETIZATION \
	"org.freedesktop.Telepathy.Call1.Content.Interface.Media.Packetization"		"im.telepathy1.Call1.Content.Interface.Media.Packetization"
	#define TP_PROP_CALL_CONTENT_INTERFACE_MEDIA_CURRENT_DTMF_EVENT \		#define TP_PROP_CALL_CONTENT_INTERFACE_MEDIA_CURRENT_DTMF_EVENT \
	"org.freedesktop.Telepathy.Call1.Content.Interface.Media.CurrentDTMFEvent"		"im.telepathy1.Call1.Content.Interface.Media.CurrentDTMFEvent"
	#define TP_PROP_CALL_CONTENT_INTERFACE_MEDIA_CURRENT_DTMF_STATE \		#define TP_PROP_CALL_CONTENT_INTERFACE_MEDIA_CURRENT_DTMF_STATE \
	"org.freedesktop.Telepathy.Call1.Content.Interface.Media.CurrentDTMFState"		"im.telepathy1.Call1.Content.Interface.Media.CurrentDTMFState"
	#define TP_IFACE_CALL_CONTENT_INTERFACE_DTMF \		#define TP_IFACE_CALL_CONTENT_INTERFACE_DTMF \
	"org.freedesktop.Telepathy.Call1.Content.Interface.DTMF"		"im.telepathy1.Call1.Content.Interface.DTMF1"
	#define TP_IFACE_QUARK_CALL_CONTENT_INTERFACE_DTMF \		#define TP_IFACE_QUARK_CALL_CONTENT_INTERFACE_DTMF \
	(tp_iface_quark_call_content_interface_dtmf ())		(tp_iface_quark_call_content_interface_dtmf ())
	GQuark tp_iface_quark_call_content_interface_dtmf (void);		GQuark tp_iface_quark_call_content_interface_dtmf (void);
	#define TP_PROP_CALL_CONTENT_INTERFACE_DTMF_CURRENTLY_SENDING_TONES \		#define TP_PROP_CALL_CONTENT_INTERFACE_DTMF_CURRENTLY_SENDING_TONES \
	"org.freedesktop.Telepathy.Call1.Content.Interface.DTMF.CurrentlySendingTon es"		"im.telepathy1.Call1.Content.Interface.DTMF1.CurrentlySendingTones"
	#define TP_PROP_CALL_CONTENT_INTERFACE_DTMF_DEFERRED_TONES \		#define TP_PROP_CALL_CONTENT_INTERFACE_DTMF_DEFERRED_TONES \
	"org.freedesktop.Telepathy.Call1.Content.Interface.DTMF.DeferredTones"		"im.telepathy1.Call1.Content.Interface.DTMF1.DeferredTones"
	#define TP_IFACE_CALL_CONTENT_INTERFACE_VIDEO_CONTROL \		#define TP_IFACE_CALL_CONTENT_INTERFACE_VIDEO_CONTROL \
	"org.freedesktop.Telepathy.Call1.Content.Interface.VideoControl"		"im.telepathy1.Call1.Content.Interface.VideoControl1"
	#define TP_IFACE_QUARK_CALL_CONTENT_INTERFACE_VIDEO_CONTROL \		#define TP_IFACE_QUARK_CALL_CONTENT_INTERFACE_VIDEO_CONTROL \
	(tp_iface_quark_call_content_interface_video_control ())		(tp_iface_quark_call_content_interface_video_control ())
	GQuark tp_iface_quark_call_content_interface_video_control (void);		GQuark tp_iface_quark_call_content_interface_video_control (void);
	#define TP_PROP_CALL_CONTENT_INTERFACE_VIDEO_CONTROL_VIDEO_RESOLUTION \		#define TP_PROP_CALL_CONTENT_INTERFACE_VIDEO_CONTROL_VIDEO_RESOLUTION \
	"org.freedesktop.Telepathy.Call1.Content.Interface.VideoControl.VideoResolu tion"		"im.telepathy1.Call1.Content.Interface.VideoControl1.VideoResolution"
	#define TP_PROP_CALL_CONTENT_INTERFACE_VIDEO_CONTROL_BITRATE \		#define TP_PROP_CALL_CONTENT_INTERFACE_VIDEO_CONTROL_BITRATE \
	"org.freedesktop.Telepathy.Call1.Content.Interface.VideoControl.Bitrate"		"im.telepathy1.Call1.Content.Interface.VideoControl1.Bitrate"
	#define TP_PROP_CALL_CONTENT_INTERFACE_VIDEO_CONTROL_FRAMERATE \		#define TP_PROP_CALL_CONTENT_INTERFACE_VIDEO_CONTROL_FRAMERATE \
	"org.freedesktop.Telepathy.Call1.Content.Interface.VideoControl.Framerate"		"im.telepathy1.Call1.Content.Interface.VideoControl1.Framerate"
	#define TP_PROP_CALL_CONTENT_INTERFACE_VIDEO_CONTROL_MTU \		#define TP_PROP_CALL_CONTENT_INTERFACE_VIDEO_CONTROL_MTU \
	"org.freedesktop.Telepathy.Call1.Content.Interface.VideoControl.MTU"		"im.telepathy1.Call1.Content.Interface.VideoControl1.MTU"
	#define TP_PROP_CALL_CONTENT_INTERFACE_VIDEO_CONTROL_MANUAL_KEY_FRAMES \		#define TP_PROP_CALL_CONTENT_INTERFACE_VIDEO_CONTROL_MANUAL_KEY_FRAMES \
	"org.freedesktop.Telepathy.Call1.Content.Interface.VideoControl.ManualKeyFr ames"		"im.telepathy1.Call1.Content.Interface.VideoControl1.ManualKeyFrames"
	#define TP_IFACE_CALL_CONTENT_INTERFACE_AUDIO_CONTROL \		#define TP_IFACE_CALL_CONTENT_INTERFACE_AUDIO_CONTROL \
	"org.freedesktop.Telepathy.Call1.Content.Interface.AudioControl"		"im.telepathy1.Call1.Content.Interface.AudioControl1"
	#define TP_IFACE_QUARK_CALL_CONTENT_INTERFACE_AUDIO_CONTROL \		#define TP_IFACE_QUARK_CALL_CONTENT_INTERFACE_AUDIO_CONTROL \
	(tp_iface_quark_call_content_interface_audio_control ())		(tp_iface_quark_call_content_interface_audio_control ())
	GQuark tp_iface_quark_call_content_interface_audio_control (void);		GQuark tp_iface_quark_call_content_interface_audio_control (void);
	#define TP_PROP_CALL_CONTENT_INTERFACE_AUDIO_CONTROL_REQUESTED_INPUT_VOLUME \		#define TP_PROP_CALL_CONTENT_INTERFACE_AUDIO_CONTROL_REQUESTED_INPUT_VOLUME \
	"org.freedesktop.Telepathy.Call1.Content.Interface.AudioControl.RequestedIn putVolume"		"im.telepathy1.Call1.Content.Interface.AudioControl1.RequestedInputVolume"
	#define TP_PROP_CALL_CONTENT_INTERFACE_AUDIO_CONTROL_REQUESTED_OUTPUT_VOLUM E \		#define TP_PROP_CALL_CONTENT_INTERFACE_AUDIO_CONTROL_REQUESTED_OUTPUT_VOLUM E \
	"org.freedesktop.Telepathy.Call1.Content.Interface.AudioControl.RequestedOu tputVolume"		"im.telepathy1.Call1.Content.Interface.AudioControl1.RequestedOutputVolume"
	#define TP_IFACE_CALL_CONTENT \		#define TP_IFACE_CALL_CONTENT \
	"org.freedesktop.Telepathy.Call1.Content"		"im.telepathy1.Call1.Content"
	#define TP_IFACE_QUARK_CALL_CONTENT \		#define TP_IFACE_QUARK_CALL_CONTENT \
	(tp_iface_quark_call_content ())		(tp_iface_quark_call_content ())
	GQuark tp_iface_quark_call_content (void);		GQuark tp_iface_quark_call_content (void);
	#define TP_PROP_CALL_CONTENT_INTERFACES \		#define TP_PROP_CALL_CONTENT_INTERFACES \
	"org.freedesktop.Telepathy.Call1.Content.Interfaces"		"im.telepathy1.Call1.Content.Interfaces"
	#define TP_PROP_CALL_CONTENT_NAME \		#define TP_PROP_CALL_CONTENT_NAME \
	"org.freedesktop.Telepathy.Call1.Content.Name"		"im.telepathy1.Call1.Content.Name"
	#define TP_PROP_CALL_CONTENT_TYPE \		#define TP_PROP_CALL_CONTENT_TYPE \
	"org.freedesktop.Telepathy.Call1.Content.Type"		"im.telepathy1.Call1.Content.Type"
	#define TP_PROP_CALL_CONTENT_DISPOSITION \		#define TP_PROP_CALL_CONTENT_DISPOSITION \
	"org.freedesktop.Telepathy.Call1.Content.Disposition"		"im.telepathy1.Call1.Content.Disposition"
	#define TP_PROP_CALL_CONTENT_STREAMS \		#define TP_PROP_CALL_CONTENT_STREAMS \
	"org.freedesktop.Telepathy.Call1.Content.Streams"		"im.telepathy1.Call1.Content.Streams"
	#define TP_IFACE_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_EXTENDED_REP ORTS \		#define TP_IFACE_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_EXTENDED_REP ORTS \
	"org.freedesktop.Telepathy.Call1.Content.MediaDescription.Interface.RTCPExt endedReports"		"im.telepathy1.Call1.Content.MediaDescription.Interface.RTCPExtendedReports 1"
	#define TP_IFACE_QUARK_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_EXTEND ED_REPORTS \		#define TP_IFACE_QUARK_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_EXTEND ED_REPORTS \
	(tp_iface_quark_call_content_media_description_interface_rtcp_extended_re ports ())		(tp_iface_quark_call_content_media_description_interface_rtcp_extended_re ports ())
	GQuark tp_iface_quark_call_content_media_description_interface_rtcp_extende d_reports (void);		GQuark tp_iface_quark_call_content_media_description_interface_rtcp_extende d_reports (void);
	#define TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_EXTENDED_REPO RTS_LOSS_RLE_MAX_SIZE \		#define TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_EXTENDED_REPO RTS_LOSS_RLE_MAX_SIZE \
	"org.freedesktop.Telepathy.Call1.Content.MediaDescription.Interface.RTCPExt endedReports.LossRLEMaxSize"		"im.telepathy1.Call1.Content.MediaDescription.Interface.RTCPExtendedReports 1.LossRLEMaxSize"
	#define TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_EXTENDED_REPO RTS_DUPLICATE_RLE_MAX_SIZE \		#define TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_EXTENDED_REPO RTS_DUPLICATE_RLE_MAX_SIZE \
	"org.freedesktop.Telepathy.Call1.Content.MediaDescription.Interface.RTCPExt endedReports.DuplicateRLEMaxSize"		"im.telepathy1.Call1.Content.MediaDescription.Interface.RTCPExtendedReports 1.DuplicateRLEMaxSize"
	#define TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_EXTENDED_REPO RTS_PACKET_RECEIPT_TIMES_MAX_SIZE \		#define TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_EXTENDED_REPO RTS_PACKET_RECEIPT_TIMES_MAX_SIZE \
	"org.freedesktop.Telepathy.Call1.Content.MediaDescription.Interface.RTCPExt endedReports.PacketReceiptTimesMaxSize"		"im.telepathy1.Call1.Content.MediaDescription.Interface.RTCPExtendedReports 1.PacketReceiptTimesMaxSize"
	#define TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_EXTENDED_REPO RTS_DLRR_MAX_SIZE \		#define TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_EXTENDED_REPO RTS_DLRR_MAX_SIZE \
	"org.freedesktop.Telepathy.Call1.Content.MediaDescription.Interface.RTCPExt endedReports.DLRRMaxSize"		"im.telepathy1.Call1.Content.MediaDescription.Interface.RTCPExtendedReports 1.DLRRMaxSize"
	#define TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_EXTENDED_REPO RTS_RTT_MODE \		#define TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_EXTENDED_REPO RTS_RTT_MODE \
	"org.freedesktop.Telepathy.Call1.Content.MediaDescription.Interface.RTCPExt endedReports.RTTMode"		"im.telepathy1.Call1.Content.MediaDescription.Interface.RTCPExtendedReports 1.RTTMode"
	#define TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_EXTENDED_REPO RTS_STATISTICS_FLAGS \		#define TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_EXTENDED_REPO RTS_STATISTICS_FLAGS \
	"org.freedesktop.Telepathy.Call1.Content.MediaDescription.Interface.RTCPExt endedReports.StatisticsFlags"		"im.telepathy1.Call1.Content.MediaDescription.Interface.RTCPExtendedReports 1.StatisticsFlags"
	#define TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_EXTENDED_REPO RTS_ENABLE_METRICS \		#define TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_EXTENDED_REPO RTS_ENABLE_METRICS \
	"org.freedesktop.Telepathy.Call1.Content.MediaDescription.Interface.RTCPExt endedReports.EnableMetrics"		"im.telepathy1.Call1.Content.MediaDescription.Interface.RTCPExtendedReports 1.EnableMetrics"
	#define TP_IFACE_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_FEEDBACK \		#define TP_IFACE_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_FEEDBACK \
	"org.freedesktop.Telepathy.Call1.Content.MediaDescription.Interface.RTCPFee dback"		"im.telepathy1.Call1.Content.MediaDescription.Interface.RTCPFeedback1"
	#define TP_IFACE_QUARK_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_FEEDBA CK \		#define TP_IFACE_QUARK_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_FEEDBA CK \
	(tp_iface_quark_call_content_media_description_interface_rtcp_feedback () )		(tp_iface_quark_call_content_media_description_interface_rtcp_feedback () )
	GQuark tp_iface_quark_call_content_media_description_interface_rtcp_feedbac k (void);		GQuark tp_iface_quark_call_content_media_description_interface_rtcp_feedbac k (void);
	#define TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_FEEDBACK_FEED BACK_MESSAGES \		#define TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_FEEDBACK_FEED BACK_MESSAGES \
	"org.freedesktop.Telepathy.Call1.Content.MediaDescription.Interface.RTCPFee dback.FeedbackMessages"		"im.telepathy1.Call1.Content.MediaDescription.Interface.RTCPFeedback1.Feedb ackMessages"
	#define TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_FEEDBACK_DOES _AVPF \		#define TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_FEEDBACK_DOES _AVPF \
	"org.freedesktop.Telepathy.Call1.Content.MediaDescription.Interface.RTCPFee dback.DoesAVPF"		"im.telepathy1.Call1.Content.MediaDescription.Interface.RTCPFeedback1.DoesA VPF"
	#define TP_IFACE_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTP_HEADER_EXTENS IONS \		#define TP_IFACE_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTP_HEADER_EXTENS IONS \
	"org.freedesktop.Telepathy.Call1.Content.MediaDescription.Interface.RTPHead erExtensions"		"im.telepathy1.Call1.Content.MediaDescription.Interface.RTPHeaderExtensions 1"
	#define TP_IFACE_QUARK_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTP_HEADER_ EXTENSIONS \		#define TP_IFACE_QUARK_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTP_HEADER_ EXTENSIONS \
	(tp_iface_quark_call_content_media_description_interface_rtp_header_exten sions ())		(tp_iface_quark_call_content_media_description_interface_rtp_header_exten sions ())
	GQuark tp_iface_quark_call_content_media_description_interface_rtp_header_e xtensions (void);		GQuark tp_iface_quark_call_content_media_description_interface_rtp_header_e xtensions (void);
	#define TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTP_HEADER_EXTENSI ONS_HEADER_EXTENSIONS \		#define TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTP_HEADER_EXTENSI ONS_HEADER_EXTENSIONS \
	"org.freedesktop.Telepathy.Call1.Content.MediaDescription.Interface.RTPHead erExtensions.HeaderExtensions"		"im.telepathy1.Call1.Content.MediaDescription.Interface.RTPHeaderExtensions 1.HeaderExtensions"
	#define TP_IFACE_CALL_CONTENT_MEDIA_DESCRIPTION \		#define TP_IFACE_CALL_CONTENT_MEDIA_DESCRIPTION \
	"org.freedesktop.Telepathy.Call1.Content.MediaDescription"		"im.telepathy1.Call1.Content.MediaDescription"
	#define TP_IFACE_QUARK_CALL_CONTENT_MEDIA_DESCRIPTION \		#define TP_IFACE_QUARK_CALL_CONTENT_MEDIA_DESCRIPTION \
	(tp_iface_quark_call_content_media_description ())		(tp_iface_quark_call_content_media_description ())
	GQuark tp_iface_quark_call_content_media_description (void);		GQuark tp_iface_quark_call_content_media_description (void);
	#define TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACES \		#define TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACES \
	"org.freedesktop.Telepathy.Call1.Content.MediaDescription.Interfaces"		"im.telepathy1.Call1.Content.MediaDescription.Interfaces"
	#define TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_FURTHER_NEGOTIATION_REQUIRED \		#define TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_FURTHER_NEGOTIATION_REQUIRED \
	"org.freedesktop.Telepathy.Call1.Content.MediaDescription.FurtherNegotiatio nRequired"		"im.telepathy1.Call1.Content.MediaDescription.FurtherNegotiationRequired"
	#define TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_HAS_REMOTE_INFORMATION \		#define TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_HAS_REMOTE_INFORMATION \
	"org.freedesktop.Telepathy.Call1.Content.MediaDescription.HasRemoteInformat ion"		"im.telepathy1.Call1.Content.MediaDescription.HasRemoteInformation"
	#define TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_CODECS \		#define TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_CODECS \
	"org.freedesktop.Telepathy.Call1.Content.MediaDescription.Codecs"		"im.telepathy1.Call1.Content.MediaDescription.Codecs"
	#define TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_REMOTE_CONTACT \		#define TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_REMOTE_CONTACT \
	"org.freedesktop.Telepathy.Call1.Content.MediaDescription.RemoteContact"		"im.telepathy1.Call1.Content.MediaDescription.RemoteContact"
	#define TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_SSRCS \		#define TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_SSRCS \
	"org.freedesktop.Telepathy.Call1.Content.MediaDescription.SSRCs"		"im.telepathy1.Call1.Content.MediaDescription.SSRCs"
	#define TP_IFACE_CALL_STREAM_INTERFACE_MEDIA \		#define TP_IFACE_CALL_STREAM_INTERFACE_MEDIA \
	"org.freedesktop.Telepathy.Call1.Stream.Interface.Media"		"im.telepathy1.Call1.Stream.Interface.Media"
	#define TP_IFACE_QUARK_CALL_STREAM_INTERFACE_MEDIA \		#define TP_IFACE_QUARK_CALL_STREAM_INTERFACE_MEDIA \
	(tp_iface_quark_call_stream_interface_media ())		(tp_iface_quark_call_stream_interface_media ())
	GQuark tp_iface_quark_call_stream_interface_media (void);		GQuark tp_iface_quark_call_stream_interface_media (void);
	#define TP_PROP_CALL_STREAM_INTERFACE_MEDIA_SENDING_STATE \		#define TP_PROP_CALL_STREAM_INTERFACE_MEDIA_SENDING_STATE \
	"org.freedesktop.Telepathy.Call1.Stream.Interface.Media.SendingState"		"im.telepathy1.Call1.Stream.Interface.Media.SendingState"
	#define TP_PROP_CALL_STREAM_INTERFACE_MEDIA_RECEIVING_STATE \		#define TP_PROP_CALL_STREAM_INTERFACE_MEDIA_RECEIVING_STATE \
	"org.freedesktop.Telepathy.Call1.Stream.Interface.Media.ReceivingState"		"im.telepathy1.Call1.Stream.Interface.Media.ReceivingState"
	#define TP_PROP_CALL_STREAM_INTERFACE_MEDIA_TRANSPORT \		#define TP_PROP_CALL_STREAM_INTERFACE_MEDIA_TRANSPORT \
	"org.freedesktop.Telepathy.Call1.Stream.Interface.Media.Transport"		"im.telepathy1.Call1.Stream.Interface.Media.Transport"
	#define TP_PROP_CALL_STREAM_INTERFACE_MEDIA_LOCAL_CANDIDATES \		#define TP_PROP_CALL_STREAM_INTERFACE_MEDIA_LOCAL_CANDIDATES \
	"org.freedesktop.Telepathy.Call1.Stream.Interface.Media.LocalCandidates"		"im.telepathy1.Call1.Stream.Interface.Media.LocalCandidates"
	#define TP_PROP_CALL_STREAM_INTERFACE_MEDIA_LOCAL_CREDENTIALS \		#define TP_PROP_CALL_STREAM_INTERFACE_MEDIA_LOCAL_CREDENTIALS \
	"org.freedesktop.Telepathy.Call1.Stream.Interface.Media.LocalCredentials"		"im.telepathy1.Call1.Stream.Interface.Media.LocalCredentials"
	#define TP_PROP_CALL_STREAM_INTERFACE_MEDIA_STUN_SERVERS \		#define TP_PROP_CALL_STREAM_INTERFACE_MEDIA_STUN_SERVERS \
	"org.freedesktop.Telepathy.Call1.Stream.Interface.Media.STUNServers"		"im.telepathy1.Call1.Stream.Interface.Media.STUNServers"
	#define TP_PROP_CALL_STREAM_INTERFACE_MEDIA_RELAY_INFO \		#define TP_PROP_CALL_STREAM_INTERFACE_MEDIA_RELAY_INFO \
	"org.freedesktop.Telepathy.Call1.Stream.Interface.Media.RelayInfo"		"im.telepathy1.Call1.Stream.Interface.Media.RelayInfo"
	#define TP_PROP_CALL_STREAM_INTERFACE_MEDIA_HAS_SERVER_INFO \		#define TP_PROP_CALL_STREAM_INTERFACE_MEDIA_HAS_SERVER_INFO \
	"org.freedesktop.Telepathy.Call1.Stream.Interface.Media.HasServerInfo"		"im.telepathy1.Call1.Stream.Interface.Media.HasServerInfo"
	#define TP_PROP_CALL_STREAM_INTERFACE_MEDIA_ENDPOINTS \		#define TP_PROP_CALL_STREAM_INTERFACE_MEDIA_ENDPOINTS \
	"org.freedesktop.Telepathy.Call1.Stream.Interface.Media.Endpoints"		"im.telepathy1.Call1.Stream.Interface.Media.Endpoints"
	#define TP_PROP_CALL_STREAM_INTERFACE_MEDIA_ICE_RESTART_PENDING \		#define TP_PROP_CALL_STREAM_INTERFACE_MEDIA_ICE_RESTART_PENDING \
	"org.freedesktop.Telepathy.Call1.Stream.Interface.Media.ICERestartPending"		"im.telepathy1.Call1.Stream.Interface.Media.ICERestartPending"
	#define TP_IFACE_CALL_STREAM \		#define TP_IFACE_CALL_STREAM \
	"org.freedesktop.Telepathy.Call1.Stream"		"im.telepathy1.Call1.Stream"
	#define TP_IFACE_QUARK_CALL_STREAM \		#define TP_IFACE_QUARK_CALL_STREAM \
	(tp_iface_quark_call_stream ())		(tp_iface_quark_call_stream ())
	GQuark tp_iface_quark_call_stream (void);		GQuark tp_iface_quark_call_stream (void);
	#define TP_PROP_CALL_STREAM_INTERFACES \		#define TP_PROP_CALL_STREAM_INTERFACES \
	"org.freedesktop.Telepathy.Call1.Stream.Interfaces"		"im.telepathy1.Call1.Stream.Interfaces"
	#define TP_PROP_CALL_STREAM_REMOTE_MEMBERS \		#define TP_PROP_CALL_STREAM_REMOTE_MEMBERS \
	"org.freedesktop.Telepathy.Call1.Stream.RemoteMembers"		"im.telepathy1.Call1.Stream.RemoteMembers"
	#define TP_PROP_CALL_STREAM_REMOTE_MEMBER_IDENTIFIERS \		#define TP_PROP_CALL_STREAM_REMOTE_MEMBER_IDENTIFIERS \
	"org.freedesktop.Telepathy.Call1.Stream.RemoteMemberIdentifiers"		"im.telepathy1.Call1.Stream.RemoteMemberIdentifiers"
	#define TP_PROP_CALL_STREAM_LOCAL_SENDING_STATE \		#define TP_PROP_CALL_STREAM_LOCAL_SENDING_STATE \
	"org.freedesktop.Telepathy.Call1.Stream.LocalSendingState"		"im.telepathy1.Call1.Stream.LocalSendingState"
	#define TP_PROP_CALL_STREAM_CAN_REQUEST_RECEIVING \		#define TP_PROP_CALL_STREAM_CAN_REQUEST_RECEIVING \
	"org.freedesktop.Telepathy.Call1.Stream.CanRequestReceiving"		"im.telepathy1.Call1.Stream.CanRequestReceiving"
	#define TP_IFACE_CALL_STREAM_ENDPOINT \		#define TP_IFACE_CALL_STREAM_ENDPOINT \
	"org.freedesktop.Telepathy.Call1.Stream.Endpoint"		"im.telepathy1.Call1.Stream.Endpoint"
	#define TP_IFACE_QUARK_CALL_STREAM_ENDPOINT \		#define TP_IFACE_QUARK_CALL_STREAM_ENDPOINT \
	(tp_iface_quark_call_stream_endpoint ())		(tp_iface_quark_call_stream_endpoint ())
	GQuark tp_iface_quark_call_stream_endpoint (void);		GQuark tp_iface_quark_call_stream_endpoint (void);
	#define TP_PROP_CALL_STREAM_ENDPOINT_REMOTE_CREDENTIALS \		#define TP_PROP_CALL_STREAM_ENDPOINT_REMOTE_CREDENTIALS \
	"org.freedesktop.Telepathy.Call1.Stream.Endpoint.RemoteCredentials"		"im.telepathy1.Call1.Stream.Endpoint.RemoteCredentials"
	#define TP_PROP_CALL_STREAM_ENDPOINT_REMOTE_CANDIDATES \		#define TP_PROP_CALL_STREAM_ENDPOINT_REMOTE_CANDIDATES \
	"org.freedesktop.Telepathy.Call1.Stream.Endpoint.RemoteCandidates"		"im.telepathy1.Call1.Stream.Endpoint.RemoteCandidates"
	#define TP_PROP_CALL_STREAM_ENDPOINT_SELECTED_CANDIDATE_PAIRS \		#define TP_PROP_CALL_STREAM_ENDPOINT_SELECTED_CANDIDATE_PAIRS \
	"org.freedesktop.Telepathy.Call1.Stream.Endpoint.SelectedCandidatePairs"		"im.telepathy1.Call1.Stream.Endpoint.SelectedCandidatePairs"
	#define TP_PROP_CALL_STREAM_ENDPOINT_ENDPOINT_STATE \		#define TP_PROP_CALL_STREAM_ENDPOINT_ENDPOINT_STATE \
	"org.freedesktop.Telepathy.Call1.Stream.Endpoint.EndpointState"		"im.telepathy1.Call1.Stream.Endpoint.EndpointState"
	#define TP_PROP_CALL_STREAM_ENDPOINT_TRANSPORT \		#define TP_PROP_CALL_STREAM_ENDPOINT_TRANSPORT \
	"org.freedesktop.Telepathy.Call1.Stream.Endpoint.Transport"		"im.telepathy1.Call1.Stream.Endpoint.Transport"
	#define TP_PROP_CALL_STREAM_ENDPOINT_CONTROLLING \		#define TP_PROP_CALL_STREAM_ENDPOINT_CONTROLLING \
	"org.freedesktop.Telepathy.Call1.Stream.Endpoint.Controlling"		"im.telepathy1.Call1.Stream.Endpoint.Controlling"
	#define TP_PROP_CALL_STREAM_ENDPOINT_IS_ICE_LITE \		#define TP_PROP_CALL_STREAM_ENDPOINT_IS_ICE_LITE \
	"org.freedesktop.Telepathy.Call1.Stream.Endpoint.IsICELite"		"im.telepathy1.Call1.Stream.Endpoint.IsICELite"
End of changes. 400 change blocks.
	616 lines changed or deleted		451 lines changed or added

	text-channel.h		text-channel.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef __TP_TEXT_CHANNEL_H__		#ifndef __TP_TEXT_CHANNEL_H__
	#define __TP_TEXT_CHANNEL_H__		#define __TP_TEXT_CHANNEL_H__
	#include <telepathy-glib/channel.h>		#include <telepathy-glib/channel.h>
	#include <telepathy-glib/client-message.h>		#include <telepathy-glib/client-message.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	#include <telepathy-glib/signalled-message.h>		#include <telepathy-glib/signalled-message.h>
	skipping to change at line 62		skipping to change at line 62
	struct _TpTextChannelClass		struct _TpTextChannelClass
	{		{
	/*<private>*/		/*<private>*/
	TpChannelClass parent_class;		TpChannelClass parent_class;
	GCallback _padding[7];		GCallback _padding[7];
	};		};
	GType tp_text_channel_get_type (void);		GType tp_text_channel_get_type (void);
	_TP_DEPRECATED_IN_0_20_FOR(tp_simple_client_factory_ensure_channel)
	TpTextChannel *tp_text_channel_new (TpConnection *conn,
	const gchar *object_path,
	const GHashTable *immutable_properties,
	GError **error);
	const gchar * const *		const gchar * const *
	/* gtk-doc sucks */		/* gtk-doc sucks */
	tp_text_channel_get_supported_content_types (TpTextChannel *self);		tp_text_channel_get_supported_content_types (TpTextChannel *self);
	TpMessagePartSupportFlags tp_text_channel_get_message_part_support_flags (		TpMessagePartSupportFlags tp_text_channel_get_message_part_support_flags (
	TpTextChannel *self);		TpTextChannel *self);
	TpDeliveryReportingSupportFlags tp_text_channel_get_delivery_reporting_supp ort (		TpDeliveryReportingSupportFlags tp_text_channel_get_delivery_reporting_supp ort (
	TpTextChannel *self);		TpTextChannel *self);
	GArray * tp_text_channel_get_message_types (TpTextChannel *self);		GArray * tp_text_channel_get_message_types (TpTextChannel *self);
	gboolean tp_text_channel_supports_message_type (TpTextChannel *self,		gboolean tp_text_channel_supports_message_type (TpTextChannel *self,
	TpChannelTextMessageType message_type);		TpChannelTextMessageType message_type);
	#define TP_TEXT_CHANNEL_FEATURE_INCOMING_MESSAGES \		#define TP_TEXT_CHANNEL_FEATURE_INCOMING_MESSAGES \
	tp_text_channel_get_feature_quark_incoming_messages ()		tp_text_channel_get_feature_quark_incoming_messages ()
	GQuark tp_text_channel_get_feature_quark_incoming_messages (void) G_GNUC_CO NST;		GQuark tp_text_channel_get_feature_quark_incoming_messages (void) G_GNUC_CO NST;
	#ifndef TP_DISABLE_DEPRECATED
	_TP_DEPRECATED_IN_0_20_FOR (tp_text_channel_dup_pending_messages)
	GList * tp_text_channel_get_pending_messages (TpTextChannel *self);
	#endif
	_TP_AVAILABLE_IN_0_20		_TP_AVAILABLE_IN_0_20
	GList * tp_text_channel_dup_pending_messages (TpTextChannel *self);		GList * tp_text_channel_dup_pending_messages (TpTextChannel *self);
	void tp_text_channel_send_message_async (TpTextChannel *self,		void tp_text_channel_send_message_async (TpTextChannel *self,
	TpMessage *message,		TpMessage *message,
	TpMessageSendingFlags flags,		TpMessageSendingFlags flags,
	GAsyncReadyCallback callback,		GAsyncReadyCallback callback,
	gpointer user_data);		gpointer user_data);
	gboolean tp_text_channel_send_message_finish (TpTextChannel *self,		gboolean tp_text_channel_send_message_finish (TpTextChannel *self,
End of changes. 3 change blocks.
	15 lines changed or deleted		2 lines changed or added

	tls-certificate.h		tls-certificate.h
	skipping to change at line 23		skipping to change at line 23
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef __TP_TLS_CERTIFICATE_H__		#ifndef __TP_TLS_CERTIFICATE_H__
	#define __TP_TLS_CERTIFICATE_H__		#define __TP_TLS_CERTIFICATE_H__
	#include <glib-object.h>		#include <glib-object.h>
	#include <gio/gio.h>		#include <gio/gio.h>
	#include <telepathy-glib/channel.h>		#include <telepathy-glib/channel.h>
	#include <telepathy-glib/enums.h>		#include <telepathy-glib/enums.h>
End of changes. 1 change blocks.
	4 lines changed or deleted		2 lines changed or added

	tp-cli-account-manager.h		tp-cli-account-manager.h
	skipping to change at line 16		skipping to change at line 16
	typedef void (*tp_cli_account_manager_signal_callback_account_removed) (TpA ccountManager *proxy,		typedef void (*tp_cli_account_manager_signal_callback_account_removed) (TpA ccountManager *proxy,
	const gchar *arg_Account,		const gchar *arg_Account,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_account_manager_connect_to_account_removed (TpAccountManager *proxy,		TpProxySignalConnection *tp_cli_account_manager_connect_to_account_removed (TpAccountManager *proxy,
	tp_cli_account_manager_signal_callback_account_removed callback,		tp_cli_account_manager_signal_callback_account_removed callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
	typedef void (*tp_cli_account_manager_signal_callback_account_validity_chan		#ifndef __GTK_DOC_IGNORE__
	ged) (TpAccountManager *proxy,		static inline TpProxySignalConnection *
			_tp_cli_account_manager_connect_to_account_removed (TpAccountManager *proxy
			,
			tp_cli_account_manager_signal_callback_account_removed callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_ACCOUNT_MANAGER (proxy), NULL);
			return tp_cli_account_manager_connect_to_account_removed (proxy, callback
			, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_account_manager_connect_to_account_removed(...) _tp_cli_acco
			unt_manager_connect_to_account_removed (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
			typedef void (*tp_cli_account_manager_signal_callback_account_usability_cha
			nged) (TpAccountManager *proxy,
	const gchar *arg_Account,		const gchar *arg_Account,
	gboolean arg_Valid,		gboolean arg_Usable,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_account_manager_connect_to_account_validity		TpProxySignalConnection *tp_cli_account_manager_connect_to_account_usabilit
	_changed (TpAccountManager *proxy,		y_changed (TpAccountManager *proxy,
	tp_cli_account_manager_signal_callback_account_validity_changed callbac		tp_cli_account_manager_signal_callback_account_usability_changed callba
	k,		ck,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_account_manager_connect_to_account_usability_changed (TpAccountMana
			ger *proxy,
			tp_cli_account_manager_signal_callback_account_usability_changed callba
			ck,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_ACCOUNT_MANAGER (proxy), NULL);
			return tp_cli_account_manager_connect_to_account_usability_changed (proxy
			, callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_account_manager_connect_to_account_usability_changed(...) _t
			p_cli_account_manager_connect_to_account_usability_changed (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_account_manager_callback_for_create_account) (TpAccou ntManager *proxy,		typedef void (*tp_cli_account_manager_callback_for_create_account) (TpAccou ntManager *proxy,
	const gchar *out_Account,		const gchar *out_Account,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_account_manager_call_create_account (TpAccountMa nager *proxy,		TpProxyPendingCall *tp_cli_account_manager_call_create_account (TpAccountMa nager *proxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar *in_Connection_Manager,		const gchar *in_Connection_Manager,
	const gchar *in_Protocol,		const gchar *in_Protocol,
	const gchar *in_Display_Name,		const gchar *in_Display_Name,
	GHashTable *in_Parameters,		GHashTable *in_Parameters,
	GHashTable *in_Properties,		GHashTable *in_Properties,
	tp_cli_account_manager_callback_for_create_account callback,		tp_cli_account_manager_callback_for_create_account callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxyPendingCall *
			_tp_cli_account_manager_call_create_account (TpAccountManager *proxy,
			gint timeout_ms,
			const gchar *in_Connection_Manager,
			const gchar *in_Protocol,
			const gchar *in_Display_Name,
			GHashTable *in_Parameters,
			GHashTable *in_Properties,
			tp_cli_account_manager_callback_for_create_account callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_ACCOUNT_MANAGER (proxy), NULL);
			return tp_cli_account_manager_call_create_account (proxy, timeout_ms,
			in_Connection_Manager,
			in_Protocol,
			in_Display_Name,
			in_Parameters,
			in_Properties,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_account_manager_call_create_account(...) _tp_cli_account_man
			ager_call_create_account (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
			void tp_cli_account_manager_add_signals (TpProxy *self,
			guint quark,
			DBusGProxy *proxy,
			gpointer unused);
	G_END_DECLS		G_END_DECLS
	#endif /* defined (TP_GEN_TP_CLI_ACCOUNT_MANAGER_H_INCLUDED) */		#endif /* defined (TP_GEN_TP_CLI_ACCOUNT_MANAGER_H_INCLUDED) */
End of changes. 5 change blocks.
	7 lines changed or deleted		76 lines changed or added

	tp-cli-account.h		tp-cli-account.h
	skipping to change at line 15		skipping to change at line 15
	typedef void (*tp_cli_account_signal_callback_removed) (TpAccount *proxy,		typedef void (*tp_cli_account_signal_callback_removed) (TpAccount *proxy,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_account_connect_to_removed (TpAccount *prox y,		TpProxySignalConnection *tp_cli_account_connect_to_removed (TpAccount *prox y,
	tp_cli_account_signal_callback_removed callback,		tp_cli_account_signal_callback_removed callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_account_connect_to_removed (TpAccount *proxy,
			tp_cli_account_signal_callback_removed callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_ACCOUNT (proxy), NULL);
			return tp_cli_account_connect_to_removed (proxy, callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_account_connect_to_removed(...) _tp_cli_account_connect_to_r
			emoved (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_account_signal_callback_account_property_changed) (Tp Account *proxy,		typedef void (*tp_cli_account_signal_callback_account_property_changed) (Tp Account *proxy,
	GHashTable *arg_Properties,		GHashTable *arg_Properties,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_account_connect_to_account_property_changed (TpAccount *proxy,		TpProxySignalConnection *tp_cli_account_connect_to_account_property_changed (TpAccount *proxy,
	tp_cli_account_signal_callback_account_property_changed callback,		tp_cli_account_signal_callback_account_property_changed callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_account_connect_to_account_property_changed (TpAccount *proxy,
			tp_cli_account_signal_callback_account_property_changed callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_ACCOUNT (proxy), NULL);
			return tp_cli_account_connect_to_account_property_changed (proxy, callbac
			k, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_account_connect_to_account_property_changed(...) _tp_cli_acc
			ount_connect_to_account_property_changed (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_account_callback_for_remove) (TpAccount *proxy,		typedef void (*tp_cli_account_callback_for_remove) (TpAccount *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_account_call_remove (TpAccount *proxy,		TpProxyPendingCall *tp_cli_account_call_remove (TpAccount *proxy,
	gint timeout_ms,		gint timeout_ms,
	tp_cli_account_callback_for_remove callback,		tp_cli_account_callback_for_remove callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxyPendingCall *
			_tp_cli_account_call_remove (TpAccount *proxy,
			gint timeout_ms,
			tp_cli_account_callback_for_remove callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_ACCOUNT (proxy), NULL);
			return tp_cli_account_call_remove (proxy, timeout_ms,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_account_call_remove(...) _tp_cli_account_call_remove (__VA_A
			RGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_account_callback_for_update_parameters) (TpAccount *p roxy,		typedef void (*tp_cli_account_callback_for_update_parameters) (TpAccount *p roxy,
	const gchar **out_Reconnect_Required,		const gchar **out_Reconnect_Required,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_account_call_update_parameters (TpAccount *proxy ,		TpProxyPendingCall *tp_cli_account_call_update_parameters (TpAccount *proxy ,
	gint timeout_ms,		gint timeout_ms,
	GHashTable *in_Set,		GHashTable *in_Set,
	const gchar **in_Unset,		const gchar **in_Unset,
	tp_cli_account_callback_for_update_parameters callback,		tp_cli_account_callback_for_update_parameters callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxyPendingCall *
			_tp_cli_account_call_update_parameters (TpAccount *proxy,
			gint timeout_ms,
			GHashTable *in_Set,
			const gchar **in_Unset,
			tp_cli_account_callback_for_update_parameters callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_ACCOUNT (proxy), NULL);
			return tp_cli_account_call_update_parameters (proxy, timeout_ms,
			in_Set,
			in_Unset,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_account_call_update_parameters(...) _tp_cli_account_call_upd
			ate_parameters (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_account_callback_for_reconnect) (TpAccount *proxy,		typedef void (*tp_cli_account_callback_for_reconnect) (TpAccount *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_account_call_reconnect (TpAccount *proxy,		TpProxyPendingCall *tp_cli_account_call_reconnect (TpAccount *proxy,
	gint timeout_ms,		gint timeout_ms,
	tp_cli_account_callback_for_reconnect callback,		tp_cli_account_callback_for_reconnect callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxyPendingCall *
			_tp_cli_account_call_reconnect (TpAccount *proxy,
			gint timeout_ms,
			tp_cli_account_callback_for_reconnect callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_ACCOUNT (proxy), NULL);
			return tp_cli_account_call_reconnect (proxy, timeout_ms,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_account_call_reconnect(...) _tp_cli_account_call_reconnect (
			__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_account_interface_addressing_callback_for_set_uri_sch eme_association) (TpAccount *proxy,		typedef void (*tp_cli_account_interface_addressing_callback_for_set_uri_sch eme_association) (TpAccount *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_account_interface_addressing_call_set_uri_scheme _association (TpAccount *proxy,		TpProxyPendingCall *tp_cli_account_interface_addressing_call_set_uri_scheme _association (TpAccount *proxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar *in_URI_Scheme,		const gchar *in_URI_Scheme,
	gboolean in_Association,		gboolean in_Association,
	tp_cli_account_interface_addressing_callback_for_set_uri_scheme_associa tion callback,		tp_cli_account_interface_addressing_callback_for_set_uri_scheme_associa tion callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxyPendingCall *
			_tp_cli_account_interface_addressing_call_set_uri_scheme_association (TpAcc
			ount *proxy,
			gint timeout_ms,
			const gchar *in_URI_Scheme,
			gboolean in_Association,
			tp_cli_account_interface_addressing_callback_for_set_uri_scheme_associa
			tion callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_ACCOUNT (proxy), NULL);
			return tp_cli_account_interface_addressing_call_set_uri_scheme_associatio
			n (proxy, timeout_ms,
			in_URI_Scheme,
			in_Association,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_account_interface_addressing_call_set_uri_scheme_association
			(...) _tp_cli_account_interface_addressing_call_set_uri_scheme_association
			(__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_account_interface_avatar_signal_callback_avatar_chang ed) (TpAccount *proxy,		typedef void (*tp_cli_account_interface_avatar_signal_callback_avatar_chang ed) (TpAccount *proxy,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_account_interface_avatar_connect_to_avatar_ changed (TpAccount *proxy,		TpProxySignalConnection *tp_cli_account_interface_avatar_connect_to_avatar_ changed (TpAccount *proxy,
	tp_cli_account_interface_avatar_signal_callback_avatar_changed callback ,		tp_cli_account_interface_avatar_signal_callback_avatar_changed callback ,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_account_interface_avatar_connect_to_avatar_changed (TpAccount *prox
			y,
			tp_cli_account_interface_avatar_signal_callback_avatar_changed callback
			,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_ACCOUNT (proxy), NULL);
			return tp_cli_account_interface_avatar_connect_to_avatar_changed (proxy,
			callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_account_interface_avatar_connect_to_avatar_changed(...) _tp_
			cli_account_interface_avatar_connect_to_avatar_changed (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
			void tp_cli_account_add_signals (TpProxy *self,
			guint quark,
			DBusGProxy *proxy,
			gpointer unused);
	G_END_DECLS		G_END_DECLS
	#endif /* defined (TP_GEN_TP_CLI_ACCOUNT_H_INCLUDED) */		#endif /* defined (TP_GEN_TP_CLI_ACCOUNT_H_INCLUDED) */
End of changes. 7 change blocks.
	0 lines changed or deleted		137 lines changed or added

	tp-cli-call-content-media-description.h		tp-cli-call-content-media-description.h
	skipping to change at line 18		skipping to change at line 18
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_call_content_media_description_call_accept (gpoi nter proxy,		TpProxyPendingCall *tp_cli_call_content_media_description_call_accept (gpoi nter proxy,
	gint timeout_ms,		gint timeout_ms,
	GHashTable *in_Local_Media_Description,		GHashTable *in_Local_Media_Description,
	tp_cli_call_content_media_description_callback_for_accept callback,		tp_cli_call_content_media_description_callback_for_accept callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxyPendingCall *
			_tp_cli_call_content_media_description_call_accept (gpointer proxy,
			gint timeout_ms,
			GHashTable *in_Local_Media_Description,
			tp_cli_call_content_media_description_callback_for_accept callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_PROXY (proxy), NULL);
			return tp_cli_call_content_media_description_call_accept (proxy, timeout_
			ms,
			in_Local_Media_Description,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_call_content_media_description_call_accept(...) _tp_cli_call
			_content_media_description_call_accept (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_call_content_media_description_callback_for_reject) ( TpProxy *proxy,		typedef void (*tp_cli_call_content_media_description_callback_for_reject) ( TpProxy *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_call_content_media_description_call_reject (gpoi nter proxy,		TpProxyPendingCall *tp_cli_call_content_media_description_call_reject (gpoi nter proxy,
	gint timeout_ms,		gint timeout_ms,
	const GValueArray *in_Reason,		const GValueArray *in_Reason,
	tp_cli_call_content_media_description_callback_for_reject callback,		tp_cli_call_content_media_description_callback_for_reject callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxyPendingCall *
			_tp_cli_call_content_media_description_call_reject (gpointer proxy,
			gint timeout_ms,
			const GValueArray *in_Reason,
			tp_cli_call_content_media_description_callback_for_reject callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_PROXY (proxy), NULL);
			return tp_cli_call_content_media_description_call_reject (proxy, timeout_
			ms,
			in_Reason,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_call_content_media_description_call_reject(...) _tp_cli_call
			_content_media_description_call_reject (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
			void tp_cli_call_content_media_description_add_signals (TpProxy *self,
			guint quark,
			DBusGProxy *proxy,
			gpointer unused);
	G_END_DECLS		G_END_DECLS
	#endif /* defined (TP_GEN_TP_CLI_CALL_CONTENT_MEDIA_DESCRIPTION_H_INCLUDED) */		#endif /* defined (TP_GEN_TP_CLI_CALL_CONTENT_MEDIA_DESCRIPTION_H_INCLUDED) */
End of changes. 2 change blocks.
	0 lines changed or deleted		45 lines changed or added

	tp-cli-call-content.h		tp-cli-call-content.h
	skipping to change at line 16		skipping to change at line 16
	typedef void (*tp_cli_call_content_signal_callback_streams_added) (TpCallCo ntent *proxy,		typedef void (*tp_cli_call_content_signal_callback_streams_added) (TpCallCo ntent *proxy,
	const GPtrArray *arg_Streams,		const GPtrArray *arg_Streams,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_call_content_connect_to_streams_added (TpCa llContent *proxy,		TpProxySignalConnection *tp_cli_call_content_connect_to_streams_added (TpCa llContent *proxy,
	tp_cli_call_content_signal_callback_streams_added callback,		tp_cli_call_content_signal_callback_streams_added callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_call_content_connect_to_streams_added (TpCallContent *proxy,
			tp_cli_call_content_signal_callback_streams_added callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_PROXY (proxy), NULL);
			return tp_cli_call_content_connect_to_streams_added (proxy, callback, use
			r_data,
			destroy, weak_object, error);
			}
			#define tp_cli_call_content_connect_to_streams_added(...) _tp_cli_call_cont
			ent_connect_to_streams_added (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_call_content_signal_callback_streams_removed) (TpCall Content *proxy,		typedef void (*tp_cli_call_content_signal_callback_streams_removed) (TpCall Content *proxy,
	const GPtrArray *arg_Streams,		const GPtrArray *arg_Streams,
	const GValueArray *arg_Reason,		const GValueArray *arg_Reason,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_call_content_connect_to_streams_removed (Tp CallContent *proxy,		TpProxySignalConnection *tp_cli_call_content_connect_to_streams_removed (Tp CallContent *proxy,
	tp_cli_call_content_signal_callback_streams_removed callback,		tp_cli_call_content_signal_callback_streams_removed callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_call_content_connect_to_streams_removed (TpCallContent *proxy,
			tp_cli_call_content_signal_callback_streams_removed callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_PROXY (proxy), NULL);
			return tp_cli_call_content_connect_to_streams_removed (proxy, callback, u
			ser_data,
			destroy, weak_object, error);
			}
			#define tp_cli_call_content_connect_to_streams_removed(...) _tp_cli_call_co
			ntent_connect_to_streams_removed (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_call_content_callback_for_remove) (TpCallContent *pro xy,		typedef void (*tp_cli_call_content_callback_for_remove) (TpCallContent *pro xy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_call_content_call_remove (TpCallContent *proxy,		TpProxyPendingCall *tp_cli_call_content_call_remove (TpCallContent *proxy,
	gint timeout_ms,		gint timeout_ms,
	tp_cli_call_content_callback_for_remove callback,		tp_cli_call_content_callback_for_remove callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxyPendingCall *
			_tp_cli_call_content_call_remove (TpCallContent *proxy,
			gint timeout_ms,
			tp_cli_call_content_callback_for_remove callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_PROXY (proxy), NULL);
			return tp_cli_call_content_call_remove (proxy, timeout_ms,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_call_content_call_remove(...) _tp_cli_call_content_call_remo
			ve (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_call_content_interface_audio_control_callback_for_rep ort_input_volume) (TpCallContent *proxy,		typedef void (*tp_cli_call_content_interface_audio_control_callback_for_rep ort_input_volume) (TpCallContent *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_call_content_interface_audio_control_call_report _input_volume (TpCallContent *proxy,		TpProxyPendingCall *tp_cli_call_content_interface_audio_control_call_report _input_volume (TpCallContent *proxy,
	gint timeout_ms,		gint timeout_ms,
	gint in_Volume,		gint in_Volume,
	tp_cli_call_content_interface_audio_control_callback_for_report_input_v olume callback,		tp_cli_call_content_interface_audio_control_callback_for_report_input_v olume callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxyPendingCall *
			_tp_cli_call_content_interface_audio_control_call_report_input_volume (TpCa
			llContent *proxy,
			gint timeout_ms,
			gint in_Volume,
			tp_cli_call_content_interface_audio_control_callback_for_report_input_v
			olume callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_PROXY (proxy), NULL);
			return tp_cli_call_content_interface_audio_control_call_report_input_volu
			me (proxy, timeout_ms,
			in_Volume,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_call_content_interface_audio_control_call_report_input_volum
			e(...) _tp_cli_call_content_interface_audio_control_call_report_input_volum
			e (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_call_content_interface_audio_control_callback_for_rep ort_output_volume) (TpCallContent *proxy,		typedef void (*tp_cli_call_content_interface_audio_control_callback_for_rep ort_output_volume) (TpCallContent *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_call_content_interface_audio_control_call_report _output_volume (TpCallContent *proxy,		TpProxyPendingCall *tp_cli_call_content_interface_audio_control_call_report _output_volume (TpCallContent *proxy,
	gint timeout_ms,		gint timeout_ms,
	gint in_Volume,		gint in_Volume,
	tp_cli_call_content_interface_audio_control_callback_for_report_output_ volume callback,		tp_cli_call_content_interface_audio_control_callback_for_report_output_ volume callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxyPendingCall *
			_tp_cli_call_content_interface_audio_control_call_report_output_volume (TpC
			allContent *proxy,
			gint timeout_ms,
			gint in_Volume,
			tp_cli_call_content_interface_audio_control_callback_for_report_output_
			volume callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_PROXY (proxy), NULL);
			return tp_cli_call_content_interface_audio_control_call_report_output_vol
			ume (proxy, timeout_ms,
			in_Volume,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_call_content_interface_audio_control_call_report_output_volu
			me(...) _tp_cli_call_content_interface_audio_control_call_report_output_vol
			ume (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_call_content_interface_dtmf_signal_callback_tones_def erred) (TpCallContent *proxy,		typedef void (*tp_cli_call_content_interface_dtmf_signal_callback_tones_def erred) (TpCallContent *proxy,
	const gchar *arg_Tones,		const gchar *arg_Tones,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_call_content_interface_dtmf_connect_to_tone s_deferred (TpCallContent *proxy,		TpProxySignalConnection *tp_cli_call_content_interface_dtmf_connect_to_tone s_deferred (TpCallContent *proxy,
	tp_cli_call_content_interface_dtmf_signal_callback_tones_deferred callb ack,		tp_cli_call_content_interface_dtmf_signal_callback_tones_deferred callb ack,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_call_content_interface_dtmf_connect_to_tones_deferred (TpCallConten
			t *proxy,
			tp_cli_call_content_interface_dtmf_signal_callback_tones_deferred callb
			ack,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_PROXY (proxy), NULL);
			return tp_cli_call_content_interface_dtmf_connect_to_tones_deferred (prox
			y, callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_call_content_interface_dtmf_connect_to_tones_deferred(...) _
			tp_cli_call_content_interface_dtmf_connect_to_tones_deferred (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_call_content_interface_dtmf_signal_callback_sending_t ones) (TpCallContent *proxy,		typedef void (*tp_cli_call_content_interface_dtmf_signal_callback_sending_t ones) (TpCallContent *proxy,
	const gchar *arg_Tones,		const gchar *arg_Tones,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_call_content_interface_dtmf_connect_to_send ing_tones (TpCallContent *proxy,		TpProxySignalConnection *tp_cli_call_content_interface_dtmf_connect_to_send ing_tones (TpCallContent *proxy,
	tp_cli_call_content_interface_dtmf_signal_callback_sending_tones callba ck,		tp_cli_call_content_interface_dtmf_signal_callback_sending_tones callba ck,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_call_content_interface_dtmf_connect_to_sending_tones (TpCallContent
			*proxy,
			tp_cli_call_content_interface_dtmf_signal_callback_sending_tones callba
			ck,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_PROXY (proxy), NULL);
			return tp_cli_call_content_interface_dtmf_connect_to_sending_tones (proxy
			, callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_call_content_interface_dtmf_connect_to_sending_tones(...) _t
			p_cli_call_content_interface_dtmf_connect_to_sending_tones (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_call_content_interface_dtmf_signal_callback_stopped_t ones) (TpCallContent *proxy,		typedef void (*tp_cli_call_content_interface_dtmf_signal_callback_stopped_t ones) (TpCallContent *proxy,
	gboolean arg_Cancelled,		gboolean arg_Cancelled,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_call_content_interface_dtmf_connect_to_stop ped_tones (TpCallContent *proxy,		TpProxySignalConnection *tp_cli_call_content_interface_dtmf_connect_to_stop ped_tones (TpCallContent *proxy,
	tp_cli_call_content_interface_dtmf_signal_callback_stopped_tones callba ck,		tp_cli_call_content_interface_dtmf_signal_callback_stopped_tones callba ck,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_call_content_interface_dtmf_connect_to_stopped_tones (TpCallContent
			*proxy,
			tp_cli_call_content_interface_dtmf_signal_callback_stopped_tones callba
			ck,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_PROXY (proxy), NULL);
			return tp_cli_call_content_interface_dtmf_connect_to_stopped_tones (proxy
			, callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_call_content_interface_dtmf_connect_to_stopped_tones(...) _t
			p_cli_call_content_interface_dtmf_connect_to_stopped_tones (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_call_content_interface_dtmf_callback_for_start_tone) (TpCallContent *proxy,		typedef void (*tp_cli_call_content_interface_dtmf_callback_for_start_tone) (TpCallContent *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_call_content_interface_dtmf_call_start_tone (TpC allContent *proxy,		TpProxyPendingCall *tp_cli_call_content_interface_dtmf_call_start_tone (TpC allContent *proxy,
	gint timeout_ms,		gint timeout_ms,
	guchar in_Event,		guchar in_Event,
	tp_cli_call_content_interface_dtmf_callback_for_start_tone callback,		tp_cli_call_content_interface_dtmf_callback_for_start_tone callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxyPendingCall *
			_tp_cli_call_content_interface_dtmf_call_start_tone (TpCallContent *proxy,
			gint timeout_ms,
			guchar in_Event,
			tp_cli_call_content_interface_dtmf_callback_for_start_tone callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_PROXY (proxy), NULL);
			return tp_cli_call_content_interface_dtmf_call_start_tone (proxy, timeout
			_ms,
			in_Event,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_call_content_interface_dtmf_call_start_tone(...) _tp_cli_cal
			l_content_interface_dtmf_call_start_tone (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_call_content_interface_dtmf_callback_for_stop_tone) ( TpCallContent *proxy,		typedef void (*tp_cli_call_content_interface_dtmf_callback_for_stop_tone) ( TpCallContent *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_call_content_interface_dtmf_call_stop_tone (TpCa llContent *proxy,		TpProxyPendingCall *tp_cli_call_content_interface_dtmf_call_stop_tone (TpCa llContent *proxy,
	gint timeout_ms,		gint timeout_ms,
	tp_cli_call_content_interface_dtmf_callback_for_stop_tone callback,		tp_cli_call_content_interface_dtmf_callback_for_stop_tone callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxyPendingCall *
			_tp_cli_call_content_interface_dtmf_call_stop_tone (TpCallContent *proxy,
			gint timeout_ms,
			tp_cli_call_content_interface_dtmf_callback_for_stop_tone callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_PROXY (proxy), NULL);
			return tp_cli_call_content_interface_dtmf_call_stop_tone (proxy, timeout_
			ms,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_call_content_interface_dtmf_call_stop_tone(...) _tp_cli_call
			_content_interface_dtmf_call_stop_tone (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_call_content_interface_dtmf_callback_for_multiple_ton es) (TpCallContent *proxy,		typedef void (*tp_cli_call_content_interface_dtmf_callback_for_multiple_ton es) (TpCallContent *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_call_content_interface_dtmf_call_multiple_tones (TpCallContent *proxy,		TpProxyPendingCall *tp_cli_call_content_interface_dtmf_call_multiple_tones (TpCallContent *proxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar *in_Tones,		const gchar *in_Tones,
	tp_cli_call_content_interface_dtmf_callback_for_multiple_tones callback ,		tp_cli_call_content_interface_dtmf_callback_for_multiple_tones callback ,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxyPendingCall *
			_tp_cli_call_content_interface_dtmf_call_multiple_tones (TpCallContent *pro
			xy,
			gint timeout_ms,
			const gchar *in_Tones,
			tp_cli_call_content_interface_dtmf_callback_for_multiple_tones callback
			,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_PROXY (proxy), NULL);
			return tp_cli_call_content_interface_dtmf_call_multiple_tones (proxy, tim
			eout_ms,
			in_Tones,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_call_content_interface_dtmf_call_multiple_tones(...) _tp_cli
			_call_content_interface_dtmf_call_multiple_tones (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_call_content_interface_media_signal_callback_new_medi a_description_offer) (TpCallContent *proxy,		typedef void (*tp_cli_call_content_interface_media_signal_callback_new_medi a_description_offer) (TpCallContent *proxy,
	const gchar *arg_Media_Description,		const gchar *arg_Media_Description,
	GHashTable *arg_Properties,		GHashTable *arg_Properties,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_call_content_interface_media_connect_to_new _media_description_offer (TpCallContent *proxy,		TpProxySignalConnection *tp_cli_call_content_interface_media_connect_to_new _media_description_offer (TpCallContent *proxy,
	tp_cli_call_content_interface_media_signal_callback_new_media_descripti on_offer callback,		tp_cli_call_content_interface_media_signal_callback_new_media_descripti on_offer callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_call_content_interface_media_connect_to_new_media_description_offer
			(TpCallContent *proxy,
			tp_cli_call_content_interface_media_signal_callback_new_media_descripti
			on_offer callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_PROXY (proxy), NULL);
			return tp_cli_call_content_interface_media_connect_to_new_media_descripti
			on_offer (proxy, callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_call_content_interface_media_connect_to_new_media_descriptio
			n_offer(...) _tp_cli_call_content_interface_media_connect_to_new_media_desc
			ription_offer (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_call_content_interface_media_signal_callback_media_de scription_offer_done) (TpCallContent *proxy,		typedef void (*tp_cli_call_content_interface_media_signal_callback_media_de scription_offer_done) (TpCallContent *proxy,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_call_content_interface_media_connect_to_med ia_description_offer_done (TpCallContent *proxy,		TpProxySignalConnection *tp_cli_call_content_interface_media_connect_to_med ia_description_offer_done (TpCallContent *proxy,
	tp_cli_call_content_interface_media_signal_callback_media_description_o ffer_done callback,		tp_cli_call_content_interface_media_signal_callback_media_description_o ffer_done callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_call_content_interface_media_connect_to_media_description_offer_don
			e (TpCallContent *proxy,
			tp_cli_call_content_interface_media_signal_callback_media_description_o
			ffer_done callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_PROXY (proxy), NULL);
			return tp_cli_call_content_interface_media_connect_to_media_description_o
			ffer_done (proxy, callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_call_content_interface_media_connect_to_media_description_of
			fer_done(...) _tp_cli_call_content_interface_media_connect_to_media_descrip
			tion_offer_done (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_call_content_interface_media_signal_callback_local_me dia_description_changed) (TpCallContent *proxy,		typedef void (*tp_cli_call_content_interface_media_signal_callback_local_me dia_description_changed) (TpCallContent *proxy,
	GHashTable *arg_Updated_Media_Description,		GHashTable *arg_Updated_Media_Description,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_call_content_interface_media_connect_to_loc al_media_description_changed (TpCallContent *proxy,		TpProxySignalConnection *tp_cli_call_content_interface_media_connect_to_loc al_media_description_changed (TpCallContent *proxy,
	tp_cli_call_content_interface_media_signal_callback_local_media_descrip tion_changed callback,		tp_cli_call_content_interface_media_signal_callback_local_media_descrip tion_changed callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_call_content_interface_media_connect_to_local_media_description_cha
			nged (TpCallContent *proxy,
			tp_cli_call_content_interface_media_signal_callback_local_media_descrip
			tion_changed callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_PROXY (proxy), NULL);
			return tp_cli_call_content_interface_media_connect_to_local_media_descrip
			tion_changed (proxy, callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_call_content_interface_media_connect_to_local_media_descript
			ion_changed(...) _tp_cli_call_content_interface_media_connect_to_local_medi
			a_description_changed (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_call_content_interface_media_signal_callback_remote_m edia_descriptions_changed) (TpCallContent *proxy,		typedef void (*tp_cli_call_content_interface_media_signal_callback_remote_m edia_descriptions_changed) (TpCallContent *proxy,
	GHashTable *arg_Updated_Media_Descriptions,		GHashTable *arg_Updated_Media_Descriptions,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_call_content_interface_media_connect_to_rem ote_media_descriptions_changed (TpCallContent *proxy,		TpProxySignalConnection *tp_cli_call_content_interface_media_connect_to_rem ote_media_descriptions_changed (TpCallContent *proxy,
	tp_cli_call_content_interface_media_signal_callback_remote_media_descri ptions_changed callback,		tp_cli_call_content_interface_media_signal_callback_remote_media_descri ptions_changed callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_call_content_interface_media_connect_to_remote_media_descriptions_c
			hanged (TpCallContent *proxy,
			tp_cli_call_content_interface_media_signal_callback_remote_media_descri
			ptions_changed callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_PROXY (proxy), NULL);
			return tp_cli_call_content_interface_media_connect_to_remote_media_descri
			ptions_changed (proxy, callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_call_content_interface_media_connect_to_remote_media_descrip
			tions_changed(...) _tp_cli_call_content_interface_media_connect_to_remote_m
			edia_descriptions_changed (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_call_content_interface_media_signal_callback_media_de scriptions_removed) (TpCallContent *proxy,		typedef void (*tp_cli_call_content_interface_media_signal_callback_media_de scriptions_removed) (TpCallContent *proxy,
	const GArray *arg_Removed_Media_Descriptions,		const GArray *arg_Removed_Media_Descriptions,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_call_content_interface_media_connect_to_med ia_descriptions_removed (TpCallContent *proxy,		TpProxySignalConnection *tp_cli_call_content_interface_media_connect_to_med ia_descriptions_removed (TpCallContent *proxy,
	tp_cli_call_content_interface_media_signal_callback_media_descriptions_ removed callback,		tp_cli_call_content_interface_media_signal_callback_media_descriptions_ removed callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_call_content_interface_media_connect_to_media_descriptions_removed
			(TpCallContent *proxy,
			tp_cli_call_content_interface_media_signal_callback_media_descriptions_
			removed callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_PROXY (proxy), NULL);
			return tp_cli_call_content_interface_media_connect_to_media_descriptions_
			removed (proxy, callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_call_content_interface_media_connect_to_media_descriptions_r
			emoved(...) _tp_cli_call_content_interface_media_connect_to_media_descripti
			ons_removed (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_call_content_interface_media_signal_callback_dtmf_cha nge_requested) (TpCallContent *proxy,		typedef void (*tp_cli_call_content_interface_media_signal_callback_dtmf_cha nge_requested) (TpCallContent *proxy,
	guchar arg_Event,		guchar arg_Event,
	guint arg_State,		guint arg_State,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_call_content_interface_media_connect_to_dtm f_change_requested (TpCallContent *proxy,		TpProxySignalConnection *tp_cli_call_content_interface_media_connect_to_dtm f_change_requested (TpCallContent *proxy,
	tp_cli_call_content_interface_media_signal_callback_dtmf_change_request ed callback,		tp_cli_call_content_interface_media_signal_callback_dtmf_change_request ed callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_call_content_interface_media_connect_to_dtmf_change_requested (TpCa
			llContent *proxy,
			tp_cli_call_content_interface_media_signal_callback_dtmf_change_request
			ed callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_PROXY (proxy), NULL);
			return tp_cli_call_content_interface_media_connect_to_dtmf_change_request
			ed (proxy, callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_call_content_interface_media_connect_to_dtmf_change_requeste
			d(...) _tp_cli_call_content_interface_media_connect_to_dtmf_change_requeste
			d (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_call_content_interface_media_callback_for_update_loca l_media_description) (TpCallContent *proxy,		typedef void (*tp_cli_call_content_interface_media_callback_for_update_loca l_media_description) (TpCallContent *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_call_content_interface_media_call_update_local_m edia_description (TpCallContent *proxy,		TpProxyPendingCall *tp_cli_call_content_interface_media_call_update_local_m edia_description (TpCallContent *proxy,
	gint timeout_ms,		gint timeout_ms,
	GHashTable *in_MediaDescription,		GHashTable *in_MediaDescription,
	tp_cli_call_content_interface_media_callback_for_update_local_media_des cription callback,		tp_cli_call_content_interface_media_callback_for_update_local_media_des cription callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxyPendingCall *
			_tp_cli_call_content_interface_media_call_update_local_media_description (T
			pCallContent *proxy,
			gint timeout_ms,
			GHashTable *in_MediaDescription,
			tp_cli_call_content_interface_media_callback_for_update_local_media_des
			cription callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_PROXY (proxy), NULL);
			return tp_cli_call_content_interface_media_call_update_local_media_descri
			ption (proxy, timeout_ms,
			in_MediaDescription,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_call_content_interface_media_call_update_local_media_descrip
			tion(...) _tp_cli_call_content_interface_media_call_update_local_media_desc
			ription (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_call_content_interface_media_callback_for_acknowledge _dtmf_change) (TpCallContent *proxy,		typedef void (*tp_cli_call_content_interface_media_callback_for_acknowledge _dtmf_change) (TpCallContent *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_call_content_interface_media_call_acknowledge_dt mf_change (TpCallContent *proxy,		TpProxyPendingCall *tp_cli_call_content_interface_media_call_acknowledge_dt mf_change (TpCallContent *proxy,
	gint timeout_ms,		gint timeout_ms,
	guchar in_Event,		guchar in_Event,
	guint in_State,		guint in_State,
	tp_cli_call_content_interface_media_callback_for_acknowledge_dtmf_chang e callback,		tp_cli_call_content_interface_media_callback_for_acknowledge_dtmf_chang e callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxyPendingCall *
			_tp_cli_call_content_interface_media_call_acknowledge_dtmf_change (TpCallCo
			ntent *proxy,
			gint timeout_ms,
			guchar in_Event,
			guint in_State,
			tp_cli_call_content_interface_media_callback_for_acknowledge_dtmf_chang
			e callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_PROXY (proxy), NULL);
			return tp_cli_call_content_interface_media_call_acknowledge_dtmf_change (
			proxy, timeout_ms,
			in_Event,
			in_State,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_call_content_interface_media_call_acknowledge_dtmf_change(..
			.) _tp_cli_call_content_interface_media_call_acknowledge_dtmf_change (__VA_
			ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_call_content_interface_media_callback_for_fail) (TpCa llContent *proxy,		typedef void (*tp_cli_call_content_interface_media_callback_for_fail) (TpCa llContent *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_call_content_interface_media_call_fail (TpCallCo ntent *proxy,		TpProxyPendingCall *tp_cli_call_content_interface_media_call_fail (TpCallCo ntent *proxy,
	gint timeout_ms,		gint timeout_ms,
	const GValueArray *in_Reason,		const GValueArray *in_Reason,
	tp_cli_call_content_interface_media_callback_for_fail callback,		tp_cli_call_content_interface_media_callback_for_fail callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxyPendingCall *
			_tp_cli_call_content_interface_media_call_fail (TpCallContent *proxy,
			gint timeout_ms,
			const GValueArray *in_Reason,
			tp_cli_call_content_interface_media_callback_for_fail callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_PROXY (proxy), NULL);
			return tp_cli_call_content_interface_media_call_fail (proxy, timeout_ms,
			in_Reason,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_call_content_interface_media_call_fail(...) _tp_cli_call_con
			tent_interface_media_call_fail (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_call_content_interface_video_control_signal_callback_ key_frame_requested) (TpCallContent *proxy,		typedef void (*tp_cli_call_content_interface_video_control_signal_callback_ key_frame_requested) (TpCallContent *proxy,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_call_content_interface_video_control_connec t_to_key_frame_requested (TpCallContent *proxy,		TpProxySignalConnection *tp_cli_call_content_interface_video_control_connec t_to_key_frame_requested (TpCallContent *proxy,
	tp_cli_call_content_interface_video_control_signal_callback_key_frame_r equested callback,		tp_cli_call_content_interface_video_control_signal_callback_key_frame_r equested callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_call_content_interface_video_control_connect_to_key_frame_requested
			(TpCallContent *proxy,
			tp_cli_call_content_interface_video_control_signal_callback_key_frame_r
			equested callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_PROXY (proxy), NULL);
			return tp_cli_call_content_interface_video_control_connect_to_key_frame_r
			equested (proxy, callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_call_content_interface_video_control_connect_to_key_frame_re
			quested(...) _tp_cli_call_content_interface_video_control_connect_to_key_fr
			ame_requested (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_call_content_interface_video_control_signal_callback_ video_resolution_changed) (TpCallContent *proxy,		typedef void (*tp_cli_call_content_interface_video_control_signal_callback_ video_resolution_changed) (TpCallContent *proxy,
	const GValueArray *arg_NewResolution,		const GValueArray *arg_NewResolution,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_call_content_interface_video_control_connec t_to_video_resolution_changed (TpCallContent *proxy,		TpProxySignalConnection *tp_cli_call_content_interface_video_control_connec t_to_video_resolution_changed (TpCallContent *proxy,
	tp_cli_call_content_interface_video_control_signal_callback_video_resol ution_changed callback,		tp_cli_call_content_interface_video_control_signal_callback_video_resol ution_changed callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_call_content_interface_video_control_connect_to_video_resolution_ch
			anged (TpCallContent *proxy,
			tp_cli_call_content_interface_video_control_signal_callback_video_resol
			ution_changed callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_PROXY (proxy), NULL);
			return tp_cli_call_content_interface_video_control_connect_to_video_resol
			ution_changed (proxy, callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_call_content_interface_video_control_connect_to_video_resolu
			tion_changed(...) _tp_cli_call_content_interface_video_control_connect_to_v
			ideo_resolution_changed (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_call_content_interface_video_control_signal_callback_ bitrate_changed) (TpCallContent *proxy,		typedef void (*tp_cli_call_content_interface_video_control_signal_callback_ bitrate_changed) (TpCallContent *proxy,
	guint arg_NewBitrate,		guint arg_NewBitrate,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_call_content_interface_video_control_connec t_to_bitrate_changed (TpCallContent *proxy,		TpProxySignalConnection *tp_cli_call_content_interface_video_control_connec t_to_bitrate_changed (TpCallContent *proxy,
	tp_cli_call_content_interface_video_control_signal_callback_bitrate_cha nged callback,		tp_cli_call_content_interface_video_control_signal_callback_bitrate_cha nged callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_call_content_interface_video_control_connect_to_bitrate_changed (Tp
			CallContent *proxy,
			tp_cli_call_content_interface_video_control_signal_callback_bitrate_cha
			nged callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_PROXY (proxy), NULL);
			return tp_cli_call_content_interface_video_control_connect_to_bitrate_cha
			nged (proxy, callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_call_content_interface_video_control_connect_to_bitrate_chan
			ged(...) _tp_cli_call_content_interface_video_control_connect_to_bitrate_ch
			anged (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_call_content_interface_video_control_signal_callback_ framerate_changed) (TpCallContent *proxy,		typedef void (*tp_cli_call_content_interface_video_control_signal_callback_ framerate_changed) (TpCallContent *proxy,
	guint arg_NewFramerate,		guint arg_NewFramerate,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_call_content_interface_video_control_connec t_to_framerate_changed (TpCallContent *proxy,		TpProxySignalConnection *tp_cli_call_content_interface_video_control_connec t_to_framerate_changed (TpCallContent *proxy,
	tp_cli_call_content_interface_video_control_signal_callback_framerate_c hanged callback,		tp_cli_call_content_interface_video_control_signal_callback_framerate_c hanged callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_call_content_interface_video_control_connect_to_framerate_changed (
			TpCallContent *proxy,
			tp_cli_call_content_interface_video_control_signal_callback_framerate_c
			hanged callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_PROXY (proxy), NULL);
			return tp_cli_call_content_interface_video_control_connect_to_framerate_c
			hanged (proxy, callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_call_content_interface_video_control_connect_to_framerate_ch
			anged(...) _tp_cli_call_content_interface_video_control_connect_to_framerat
			e_changed (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_call_content_interface_video_control_signal_callback_ mtu_changed) (TpCallContent *proxy,		typedef void (*tp_cli_call_content_interface_video_control_signal_callback_ mtu_changed) (TpCallContent *proxy,
	guint arg_NewMTU,		guint arg_NewMTU,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_call_content_interface_video_control_connec t_to_mtu_changed (TpCallContent *proxy,		TpProxySignalConnection *tp_cli_call_content_interface_video_control_connec t_to_mtu_changed (TpCallContent *proxy,
	tp_cli_call_content_interface_video_control_signal_callback_mtu_changed callback,		tp_cli_call_content_interface_video_control_signal_callback_mtu_changed callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_call_content_interface_video_control_connect_to_mtu_changed (TpCall
			Content *proxy,
			tp_cli_call_content_interface_video_control_signal_callback_mtu_changed
			callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_PROXY (proxy), NULL);
			return tp_cli_call_content_interface_video_control_connect_to_mtu_changed
			(proxy, callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_call_content_interface_video_control_connect_to_mtu_changed(
			...) _tp_cli_call_content_interface_video_control_connect_to_mtu_changed (_
			_VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
			void tp_cli_call_content_add_signals (TpProxy *self,
			guint quark,
			DBusGProxy *proxy,
			gpointer unused);
	G_END_DECLS		G_END_DECLS
	#endif /* defined (TP_GEN_TP_CLI_CALL_CONTENT_H_INCLUDED) */		#endif /* defined (TP_GEN_TP_CLI_CALL_CONTENT_H_INCLUDED) */
End of changes. 25 change blocks.
	0 lines changed or deleted		506 lines changed or added

	tp-cli-call-stream-endpoint.h		tp-cli-call-stream-endpoint.h
	skipping to change at line 17		skipping to change at line 17
	const gchar *arg_Username,		const gchar *arg_Username,
	const gchar *arg_Password,		const gchar *arg_Password,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_call_stream_endpoint_connect_to_remote_cred entials_set (gpointer proxy,		TpProxySignalConnection *tp_cli_call_stream_endpoint_connect_to_remote_cred entials_set (gpointer proxy,
	tp_cli_call_stream_endpoint_signal_callback_remote_credentials_set call back,		tp_cli_call_stream_endpoint_signal_callback_remote_credentials_set call back,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_call_stream_endpoint_connect_to_remote_credentials_set (gpointer pr
			oxy,
			tp_cli_call_stream_endpoint_signal_callback_remote_credentials_set call
			back,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_PROXY (proxy), NULL);
			return tp_cli_call_stream_endpoint_connect_to_remote_credentials_set (pro
			xy, callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_call_stream_endpoint_connect_to_remote_credentials_set(...)
			_tp_cli_call_stream_endpoint_connect_to_remote_credentials_set (__VA_ARGS__
			)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_call_stream_endpoint_signal_callback_remote_candidate s_added) (TpProxy *proxy,		typedef void (*tp_cli_call_stream_endpoint_signal_callback_remote_candidate s_added) (TpProxy *proxy,
	const GPtrArray *arg_Candidates,		const GPtrArray *arg_Candidates,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_call_stream_endpoint_connect_to_remote_cand idates_added (gpointer proxy,		TpProxySignalConnection *tp_cli_call_stream_endpoint_connect_to_remote_cand idates_added (gpointer proxy,
	tp_cli_call_stream_endpoint_signal_callback_remote_candidates_added cal lback,		tp_cli_call_stream_endpoint_signal_callback_remote_candidates_added cal lback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_call_stream_endpoint_connect_to_remote_candidates_added (gpointer p
			roxy,
			tp_cli_call_stream_endpoint_signal_callback_remote_candidates_added cal
			lback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_PROXY (proxy), NULL);
			return tp_cli_call_stream_endpoint_connect_to_remote_candidates_added (pr
			oxy, callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_call_stream_endpoint_connect_to_remote_candidates_added(...)
			_tp_cli_call_stream_endpoint_connect_to_remote_candidates_added (__VA_ARGS
			__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_call_stream_endpoint_signal_callback_candidate_pair_s elected) (TpProxy *proxy,		typedef void (*tp_cli_call_stream_endpoint_signal_callback_candidate_pair_s elected) (TpProxy *proxy,
	const GValueArray *arg_Local_Candidate,		const GValueArray *arg_Local_Candidate,
	const GValueArray *arg_Remote_Candidate,		const GValueArray *arg_Remote_Candidate,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_call_stream_endpoint_connect_to_candidate_p air_selected (gpointer proxy,		TpProxySignalConnection *tp_cli_call_stream_endpoint_connect_to_candidate_p air_selected (gpointer proxy,
	tp_cli_call_stream_endpoint_signal_callback_candidate_pair_selected cal lback,		tp_cli_call_stream_endpoint_signal_callback_candidate_pair_selected cal lback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_call_stream_endpoint_connect_to_candidate_pair_selected (gpointer p
			roxy,
			tp_cli_call_stream_endpoint_signal_callback_candidate_pair_selected cal
			lback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_PROXY (proxy), NULL);
			return tp_cli_call_stream_endpoint_connect_to_candidate_pair_selected (pr
			oxy, callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_call_stream_endpoint_connect_to_candidate_pair_selected(...)
			_tp_cli_call_stream_endpoint_connect_to_candidate_pair_selected (__VA_ARGS
			__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_call_stream_endpoint_signal_callback_endpoint_state_c hanged) (TpProxy *proxy,		typedef void (*tp_cli_call_stream_endpoint_signal_callback_endpoint_state_c hanged) (TpProxy *proxy,
	guint arg_Component,		guint arg_Component,
	guint arg_State,		guint arg_State,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_call_stream_endpoint_connect_to_endpoint_st ate_changed (gpointer proxy,		TpProxySignalConnection *tp_cli_call_stream_endpoint_connect_to_endpoint_st ate_changed (gpointer proxy,
	tp_cli_call_stream_endpoint_signal_callback_endpoint_state_changed call back,		tp_cli_call_stream_endpoint_signal_callback_endpoint_state_changed call back,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_call_stream_endpoint_connect_to_endpoint_state_changed (gpointer pr
			oxy,
			tp_cli_call_stream_endpoint_signal_callback_endpoint_state_changed call
			back,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_PROXY (proxy), NULL);
			return tp_cli_call_stream_endpoint_connect_to_endpoint_state_changed (pro
			xy, callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_call_stream_endpoint_connect_to_endpoint_state_changed(...)
			_tp_cli_call_stream_endpoint_connect_to_endpoint_state_changed (__VA_ARGS__
			)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_call_stream_endpoint_signal_callback_controlling_chan ged) (TpProxy *proxy,		typedef void (*tp_cli_call_stream_endpoint_signal_callback_controlling_chan ged) (TpProxy *proxy,
	gboolean arg_Controlling,		gboolean arg_Controlling,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_call_stream_endpoint_connect_to_controlling _changed (gpointer proxy,		TpProxySignalConnection *tp_cli_call_stream_endpoint_connect_to_controlling _changed (gpointer proxy,
	tp_cli_call_stream_endpoint_signal_callback_controlling_changed callbac k,		tp_cli_call_stream_endpoint_signal_callback_controlling_changed callbac k,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_call_stream_endpoint_connect_to_controlling_changed (gpointer proxy
			,
			tp_cli_call_stream_endpoint_signal_callback_controlling_changed callbac
			k,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_PROXY (proxy), NULL);
			return tp_cli_call_stream_endpoint_connect_to_controlling_changed (proxy,
			callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_call_stream_endpoint_connect_to_controlling_changed(...) _tp
			_cli_call_stream_endpoint_connect_to_controlling_changed (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_call_stream_endpoint_callback_for_set_selected_candid ate_pair) (TpProxy *proxy,		typedef void (*tp_cli_call_stream_endpoint_callback_for_set_selected_candid ate_pair) (TpProxy *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_call_stream_endpoint_call_set_selected_candidate _pair (gpointer proxy,		TpProxyPendingCall *tp_cli_call_stream_endpoint_call_set_selected_candidate _pair (gpointer proxy,
	gint timeout_ms,		gint timeout_ms,
	const GValueArray *in_Local_Candidate,		const GValueArray *in_Local_Candidate,
	const GValueArray *in_Remote_Candidate,		const GValueArray *in_Remote_Candidate,
	tp_cli_call_stream_endpoint_callback_for_set_selected_candidate_pair ca llback,		tp_cli_call_stream_endpoint_callback_for_set_selected_candidate_pair ca llback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxyPendingCall *
			_tp_cli_call_stream_endpoint_call_set_selected_candidate_pair (gpointer pro
			xy,
			gint timeout_ms,
			const GValueArray *in_Local_Candidate,
			const GValueArray *in_Remote_Candidate,
			tp_cli_call_stream_endpoint_callback_for_set_selected_candidate_pair ca
			llback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_PROXY (proxy), NULL);
			return tp_cli_call_stream_endpoint_call_set_selected_candidate_pair (prox
			y, timeout_ms,
			in_Local_Candidate,
			in_Remote_Candidate,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_call_stream_endpoint_call_set_selected_candidate_pair(...) _
			tp_cli_call_stream_endpoint_call_set_selected_candidate_pair (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_call_stream_endpoint_callback_for_set_endpoint_state) (TpProxy *proxy,		typedef void (*tp_cli_call_stream_endpoint_callback_for_set_endpoint_state) (TpProxy *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_call_stream_endpoint_call_set_endpoint_state (gp ointer proxy,		TpProxyPendingCall *tp_cli_call_stream_endpoint_call_set_endpoint_state (gp ointer proxy,
	gint timeout_ms,		gint timeout_ms,
	guint in_Component,		guint in_Component,
	guint in_State,		guint in_State,
	tp_cli_call_stream_endpoint_callback_for_set_endpoint_state callback,		tp_cli_call_stream_endpoint_callback_for_set_endpoint_state callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxyPendingCall *
			_tp_cli_call_stream_endpoint_call_set_endpoint_state (gpointer proxy,
			gint timeout_ms,
			guint in_Component,
			guint in_State,
			tp_cli_call_stream_endpoint_callback_for_set_endpoint_state callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_PROXY (proxy), NULL);
			return tp_cli_call_stream_endpoint_call_set_endpoint_state (proxy, timeou
			t_ms,
			in_Component,
			in_State,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_call_stream_endpoint_call_set_endpoint_state(...) _tp_cli_ca
			ll_stream_endpoint_call_set_endpoint_state (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_call_stream_endpoint_callback_for_accept_selected_can didate_pair) (TpProxy *proxy,		typedef void (*tp_cli_call_stream_endpoint_callback_for_accept_selected_can didate_pair) (TpProxy *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_call_stream_endpoint_call_accept_selected_candid ate_pair (gpointer proxy,		TpProxyPendingCall *tp_cli_call_stream_endpoint_call_accept_selected_candid ate_pair (gpointer proxy,
	gint timeout_ms,		gint timeout_ms,
	const GValueArray *in_Local_Candidate,		const GValueArray *in_Local_Candidate,
	const GValueArray *in_Remote_Candidate,		const GValueArray *in_Remote_Candidate,
	tp_cli_call_stream_endpoint_callback_for_accept_selected_candidate_pair callback,		tp_cli_call_stream_endpoint_callback_for_accept_selected_candidate_pair callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxyPendingCall *
			_tp_cli_call_stream_endpoint_call_accept_selected_candidate_pair (gpointer
			proxy,
			gint timeout_ms,
			const GValueArray *in_Local_Candidate,
			const GValueArray *in_Remote_Candidate,
			tp_cli_call_stream_endpoint_callback_for_accept_selected_candidate_pair
			callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_PROXY (proxy), NULL);
			return tp_cli_call_stream_endpoint_call_accept_selected_candidate_pair (p
			roxy, timeout_ms,
			in_Local_Candidate,
			in_Remote_Candidate,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_call_stream_endpoint_call_accept_selected_candidate_pair(...
			) _tp_cli_call_stream_endpoint_call_accept_selected_candidate_pair (__VA_AR
			GS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_call_stream_endpoint_callback_for_reject_selected_can didate_pair) (TpProxy *proxy,		typedef void (*tp_cli_call_stream_endpoint_callback_for_reject_selected_can didate_pair) (TpProxy *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_call_stream_endpoint_call_reject_selected_candid ate_pair (gpointer proxy,		TpProxyPendingCall *tp_cli_call_stream_endpoint_call_reject_selected_candid ate_pair (gpointer proxy,
	gint timeout_ms,		gint timeout_ms,
	const GValueArray *in_Local_Candidate,		const GValueArray *in_Local_Candidate,
	const GValueArray *in_Remote_Candidate,		const GValueArray *in_Remote_Candidate,
	tp_cli_call_stream_endpoint_callback_for_reject_selected_candidate_pair callback,		tp_cli_call_stream_endpoint_callback_for_reject_selected_candidate_pair callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxyPendingCall *
			_tp_cli_call_stream_endpoint_call_reject_selected_candidate_pair (gpointer
			proxy,
			gint timeout_ms,
			const GValueArray *in_Local_Candidate,
			const GValueArray *in_Remote_Candidate,
			tp_cli_call_stream_endpoint_callback_for_reject_selected_candidate_pair
			callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_PROXY (proxy), NULL);
			return tp_cli_call_stream_endpoint_call_reject_selected_candidate_pair (p
			roxy, timeout_ms,
			in_Local_Candidate,
			in_Remote_Candidate,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_call_stream_endpoint_call_reject_selected_candidate_pair(...
			) _tp_cli_call_stream_endpoint_call_reject_selected_candidate_pair (__VA_AR
			GS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_call_stream_endpoint_callback_for_set_controlling) (T pProxy *proxy,		typedef void (*tp_cli_call_stream_endpoint_callback_for_set_controlling) (T pProxy *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_call_stream_endpoint_call_set_controlling (gpoin ter proxy,		TpProxyPendingCall *tp_cli_call_stream_endpoint_call_set_controlling (gpoin ter proxy,
	gint timeout_ms,		gint timeout_ms,
	gboolean in_Controlling,		gboolean in_Controlling,
	tp_cli_call_stream_endpoint_callback_for_set_controlling callback,		tp_cli_call_stream_endpoint_callback_for_set_controlling callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxyPendingCall *
			_tp_cli_call_stream_endpoint_call_set_controlling (gpointer proxy,
			gint timeout_ms,
			gboolean in_Controlling,
			tp_cli_call_stream_endpoint_callback_for_set_controlling callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_PROXY (proxy), NULL);
			return tp_cli_call_stream_endpoint_call_set_controlling (proxy, timeout_m
			s,
			in_Controlling,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_call_stream_endpoint_call_set_controlling(...) _tp_cli_call_
			stream_endpoint_call_set_controlling (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
			void tp_cli_call_stream_endpoint_add_signals (TpProxy *self,
			guint quark,
			DBusGProxy *proxy,
			gpointer unused);
	G_END_DECLS		G_END_DECLS
	#endif /* defined (TP_GEN_TP_CLI_CALL_STREAM_ENDPOINT_H_INCLUDED) */		#endif /* defined (TP_GEN_TP_CLI_CALL_STREAM_ENDPOINT_H_INCLUDED) */
End of changes. 10 change blocks.
	0 lines changed or deleted		220 lines changed or added

	tp-cli-call-stream.h		tp-cli-call-stream.h
	skipping to change at line 19		skipping to change at line 19
	const GArray *arg_Removed,		const GArray *arg_Removed,
	const GValueArray *arg_Reason,		const GValueArray *arg_Reason,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_call_stream_connect_to_remote_members_chang ed (TpCallStream *proxy,		TpProxySignalConnection *tp_cli_call_stream_connect_to_remote_members_chang ed (TpCallStream *proxy,
	tp_cli_call_stream_signal_callback_remote_members_changed callback,		tp_cli_call_stream_signal_callback_remote_members_changed callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_call_stream_connect_to_remote_members_changed (TpCallStream *proxy,
			tp_cli_call_stream_signal_callback_remote_members_changed callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_PROXY (proxy), NULL);
			return tp_cli_call_stream_connect_to_remote_members_changed (proxy, callb
			ack, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_call_stream_connect_to_remote_members_changed(...) _tp_cli_c
			all_stream_connect_to_remote_members_changed (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_call_stream_signal_callback_local_sending_state_chang ed) (TpCallStream *proxy,		typedef void (*tp_cli_call_stream_signal_callback_local_sending_state_chang ed) (TpCallStream *proxy,
	guint arg_State,		guint arg_State,
	const GValueArray *arg_Reason,		const GValueArray *arg_Reason,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_call_stream_connect_to_local_sending_state_ changed (TpCallStream *proxy,		TpProxySignalConnection *tp_cli_call_stream_connect_to_local_sending_state_ changed (TpCallStream *proxy,
	tp_cli_call_stream_signal_callback_local_sending_state_changed callback ,		tp_cli_call_stream_signal_callback_local_sending_state_changed callback ,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_call_stream_connect_to_local_sending_state_changed (TpCallStream *p
			roxy,
			tp_cli_call_stream_signal_callback_local_sending_state_changed callback
			,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_PROXY (proxy), NULL);
			return tp_cli_call_stream_connect_to_local_sending_state_changed (proxy,
			callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_call_stream_connect_to_local_sending_state_changed(...) _tp_
			cli_call_stream_connect_to_local_sending_state_changed (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_call_stream_callback_for_set_sending) (TpCallStream * proxy,		typedef void (*tp_cli_call_stream_callback_for_set_sending) (TpCallStream * proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_call_stream_call_set_sending (TpCallStream *prox y,		TpProxyPendingCall *tp_cli_call_stream_call_set_sending (TpCallStream *prox y,
	gint timeout_ms,		gint timeout_ms,
	gboolean in_Send,		gboolean in_Send,
	tp_cli_call_stream_callback_for_set_sending callback,		tp_cli_call_stream_callback_for_set_sending callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxyPendingCall *
			_tp_cli_call_stream_call_set_sending (TpCallStream *proxy,
			gint timeout_ms,
			gboolean in_Send,
			tp_cli_call_stream_callback_for_set_sending callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_PROXY (proxy), NULL);
			return tp_cli_call_stream_call_set_sending (proxy, timeout_ms,
			in_Send,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_call_stream_call_set_sending(...) _tp_cli_call_stream_call_s
			et_sending (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_call_stream_callback_for_request_receiving) (TpCallSt ream *proxy,		typedef void (*tp_cli_call_stream_callback_for_request_receiving) (TpCallSt ream *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_call_stream_call_request_receiving (TpCallStream *proxy,		TpProxyPendingCall *tp_cli_call_stream_call_request_receiving (TpCallStream *proxy,
	gint timeout_ms,		gint timeout_ms,
	guint in_Contact,		guint in_Contact,
	gboolean in_Receive,		gboolean in_Receive,
	tp_cli_call_stream_callback_for_request_receiving callback,		tp_cli_call_stream_callback_for_request_receiving callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxyPendingCall *
			_tp_cli_call_stream_call_request_receiving (TpCallStream *proxy,
			gint timeout_ms,
			guint in_Contact,
			gboolean in_Receive,
			tp_cli_call_stream_callback_for_request_receiving callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_PROXY (proxy), NULL);
			return tp_cli_call_stream_call_request_receiving (proxy, timeout_ms,
			in_Contact,
			in_Receive,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_call_stream_call_request_receiving(...) _tp_cli_call_stream_
			call_request_receiving (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_call_stream_interface_media_signal_callback_sending_s tate_changed) (TpCallStream *proxy,		typedef void (*tp_cli_call_stream_interface_media_signal_callback_sending_s tate_changed) (TpCallStream *proxy,
	guint arg_State,		guint arg_State,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_call_stream_interface_media_connect_to_send ing_state_changed (TpCallStream *proxy,		TpProxySignalConnection *tp_cli_call_stream_interface_media_connect_to_send ing_state_changed (TpCallStream *proxy,
	tp_cli_call_stream_interface_media_signal_callback_sending_state_change d callback,		tp_cli_call_stream_interface_media_signal_callback_sending_state_change d callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_call_stream_interface_media_connect_to_sending_state_changed (TpCal
			lStream *proxy,
			tp_cli_call_stream_interface_media_signal_callback_sending_state_change
			d callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_PROXY (proxy), NULL);
			return tp_cli_call_stream_interface_media_connect_to_sending_state_change
			d (proxy, callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_call_stream_interface_media_connect_to_sending_state_changed
			(...) _tp_cli_call_stream_interface_media_connect_to_sending_state_changed
			(__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_call_stream_interface_media_signal_callback_receiving _state_changed) (TpCallStream *proxy,		typedef void (*tp_cli_call_stream_interface_media_signal_callback_receiving _state_changed) (TpCallStream *proxy,
	guint arg_State,		guint arg_State,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_call_stream_interface_media_connect_to_rece iving_state_changed (TpCallStream *proxy,		TpProxySignalConnection *tp_cli_call_stream_interface_media_connect_to_rece iving_state_changed (TpCallStream *proxy,
	tp_cli_call_stream_interface_media_signal_callback_receiving_state_chan ged callback,		tp_cli_call_stream_interface_media_signal_callback_receiving_state_chan ged callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_call_stream_interface_media_connect_to_receiving_state_changed (TpC
			allStream *proxy,
			tp_cli_call_stream_interface_media_signal_callback_receiving_state_chan
			ged callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_PROXY (proxy), NULL);
			return tp_cli_call_stream_interface_media_connect_to_receiving_state_chan
			ged (proxy, callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_call_stream_interface_media_connect_to_receiving_state_chang
			ed(...) _tp_cli_call_stream_interface_media_connect_to_receiving_state_chan
			ged (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_call_stream_interface_media_signal_callback_local_can didates_added) (TpCallStream *proxy,		typedef void (*tp_cli_call_stream_interface_media_signal_callback_local_can didates_added) (TpCallStream *proxy,
	const GPtrArray *arg_Candidates,		const GPtrArray *arg_Candidates,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_call_stream_interface_media_connect_to_loca l_candidates_added (TpCallStream *proxy,		TpProxySignalConnection *tp_cli_call_stream_interface_media_connect_to_loca l_candidates_added (TpCallStream *proxy,
	tp_cli_call_stream_interface_media_signal_callback_local_candidates_add ed callback,		tp_cli_call_stream_interface_media_signal_callback_local_candidates_add ed callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_call_stream_interface_media_connect_to_local_candidates_added (TpCa
			llStream *proxy,
			tp_cli_call_stream_interface_media_signal_callback_local_candidates_add
			ed callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_PROXY (proxy), NULL);
			return tp_cli_call_stream_interface_media_connect_to_local_candidates_add
			ed (proxy, callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_call_stream_interface_media_connect_to_local_candidates_adde
			d(...) _tp_cli_call_stream_interface_media_connect_to_local_candidates_adde
			d (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_call_stream_interface_media_signal_callback_local_cre dentials_changed) (TpCallStream *proxy,		typedef void (*tp_cli_call_stream_interface_media_signal_callback_local_cre dentials_changed) (TpCallStream *proxy,
	const gchar *arg_Username,		const gchar *arg_Username,
	const gchar *arg_Password,		const gchar *arg_Password,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_call_stream_interface_media_connect_to_loca l_credentials_changed (TpCallStream *proxy,		TpProxySignalConnection *tp_cli_call_stream_interface_media_connect_to_loca l_credentials_changed (TpCallStream *proxy,
	tp_cli_call_stream_interface_media_signal_callback_local_credentials_ch anged callback,		tp_cli_call_stream_interface_media_signal_callback_local_credentials_ch anged callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_call_stream_interface_media_connect_to_local_credentials_changed (T
			pCallStream *proxy,
			tp_cli_call_stream_interface_media_signal_callback_local_credentials_ch
			anged callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_PROXY (proxy), NULL);
			return tp_cli_call_stream_interface_media_connect_to_local_credentials_ch
			anged (proxy, callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_call_stream_interface_media_connect_to_local_credentials_cha
			nged(...) _tp_cli_call_stream_interface_media_connect_to_local_credentials_
			changed (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_call_stream_interface_media_signal_callback_relay_inf o_changed) (TpCallStream *proxy,		typedef void (*tp_cli_call_stream_interface_media_signal_callback_relay_inf o_changed) (TpCallStream *proxy,
	const GPtrArray *arg_Relay_Info,		const GPtrArray *arg_Relay_Info,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_call_stream_interface_media_connect_to_rela y_info_changed (TpCallStream *proxy,		TpProxySignalConnection *tp_cli_call_stream_interface_media_connect_to_rela y_info_changed (TpCallStream *proxy,
	tp_cli_call_stream_interface_media_signal_callback_relay_info_changed c allback,		tp_cli_call_stream_interface_media_signal_callback_relay_info_changed c allback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_call_stream_interface_media_connect_to_relay_info_changed (TpCallSt
			ream *proxy,
			tp_cli_call_stream_interface_media_signal_callback_relay_info_changed c
			allback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_PROXY (proxy), NULL);
			return tp_cli_call_stream_interface_media_connect_to_relay_info_changed (
			proxy, callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_call_stream_interface_media_connect_to_relay_info_changed(..
			.) _tp_cli_call_stream_interface_media_connect_to_relay_info_changed (__VA_
			ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_call_stream_interface_media_signal_callback_stun_serv ers_changed) (TpCallStream *proxy,		typedef void (*tp_cli_call_stream_interface_media_signal_callback_stun_serv ers_changed) (TpCallStream *proxy,
	const GPtrArray *arg_Servers,		const GPtrArray *arg_Servers,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_call_stream_interface_media_connect_to_stun _servers_changed (TpCallStream *proxy,		TpProxySignalConnection *tp_cli_call_stream_interface_media_connect_to_stun _servers_changed (TpCallStream *proxy,
	tp_cli_call_stream_interface_media_signal_callback_stun_servers_changed callback,		tp_cli_call_stream_interface_media_signal_callback_stun_servers_changed callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_call_stream_interface_media_connect_to_stun_servers_changed (TpCall
			Stream *proxy,
			tp_cli_call_stream_interface_media_signal_callback_stun_servers_changed
			callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_PROXY (proxy), NULL);
			return tp_cli_call_stream_interface_media_connect_to_stun_servers_changed
			(proxy, callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_call_stream_interface_media_connect_to_stun_servers_changed(
			...) _tp_cli_call_stream_interface_media_connect_to_stun_servers_changed (_
			_VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_call_stream_interface_media_signal_callback_server_in fo_retrieved) (TpCallStream *proxy,		typedef void (*tp_cli_call_stream_interface_media_signal_callback_server_in fo_retrieved) (TpCallStream *proxy,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_call_stream_interface_media_connect_to_serv er_info_retrieved (TpCallStream *proxy,		TpProxySignalConnection *tp_cli_call_stream_interface_media_connect_to_serv er_info_retrieved (TpCallStream *proxy,
	tp_cli_call_stream_interface_media_signal_callback_server_info_retrieve d callback,		tp_cli_call_stream_interface_media_signal_callback_server_info_retrieve d callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_call_stream_interface_media_connect_to_server_info_retrieved (TpCal
			lStream *proxy,
			tp_cli_call_stream_interface_media_signal_callback_server_info_retrieve
			d callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_PROXY (proxy), NULL);
			return tp_cli_call_stream_interface_media_connect_to_server_info_retrieve
			d (proxy, callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_call_stream_interface_media_connect_to_server_info_retrieved
			(...) _tp_cli_call_stream_interface_media_connect_to_server_info_retrieved
			(__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_call_stream_interface_media_signal_callback_endpoints _changed) (TpCallStream *proxy,		typedef void (*tp_cli_call_stream_interface_media_signal_callback_endpoints _changed) (TpCallStream *proxy,
	const GPtrArray *arg_Endpoints_Added,		const GPtrArray *arg_Endpoints_Added,
	const GPtrArray *arg_Endpoints_Removed,		const GPtrArray *arg_Endpoints_Removed,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_call_stream_interface_media_connect_to_endp oints_changed (TpCallStream *proxy,		TpProxySignalConnection *tp_cli_call_stream_interface_media_connect_to_endp oints_changed (TpCallStream *proxy,
	tp_cli_call_stream_interface_media_signal_callback_endpoints_changed ca llback,		tp_cli_call_stream_interface_media_signal_callback_endpoints_changed ca llback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_call_stream_interface_media_connect_to_endpoints_changed (TpCallStr
			eam *proxy,
			tp_cli_call_stream_interface_media_signal_callback_endpoints_changed ca
			llback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_PROXY (proxy), NULL);
			return tp_cli_call_stream_interface_media_connect_to_endpoints_changed (p
			roxy, callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_call_stream_interface_media_connect_to_endpoints_changed(...
			) _tp_cli_call_stream_interface_media_connect_to_endpoints_changed (__VA_AR
			GS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_call_stream_interface_media_signal_callback_ice_resta rt_requested) (TpCallStream *proxy,		typedef void (*tp_cli_call_stream_interface_media_signal_callback_ice_resta rt_requested) (TpCallStream *proxy,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_call_stream_interface_media_connect_to_ice_ restart_requested (TpCallStream *proxy,		TpProxySignalConnection *tp_cli_call_stream_interface_media_connect_to_ice_ restart_requested (TpCallStream *proxy,
	tp_cli_call_stream_interface_media_signal_callback_ice_restart_requeste d callback,		tp_cli_call_stream_interface_media_signal_callback_ice_restart_requeste d callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_call_stream_interface_media_connect_to_ice_restart_requested (TpCal
			lStream *proxy,
			tp_cli_call_stream_interface_media_signal_callback_ice_restart_requeste
			d callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_PROXY (proxy), NULL);
			return tp_cli_call_stream_interface_media_connect_to_ice_restart_requeste
			d (proxy, callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_call_stream_interface_media_connect_to_ice_restart_requested
			(...) _tp_cli_call_stream_interface_media_connect_to_ice_restart_requested
			(__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_call_stream_interface_media_callback_for_complete_sen ding_state_change) (TpCallStream *proxy,		typedef void (*tp_cli_call_stream_interface_media_callback_for_complete_sen ding_state_change) (TpCallStream *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_call_stream_interface_media_call_complete_sendin g_state_change (TpCallStream *proxy,		TpProxyPendingCall *tp_cli_call_stream_interface_media_call_complete_sendin g_state_change (TpCallStream *proxy,
	gint timeout_ms,		gint timeout_ms,
	guint in_State,		guint in_State,
	tp_cli_call_stream_interface_media_callback_for_complete_sending_state_ change callback,		tp_cli_call_stream_interface_media_callback_for_complete_sending_state_ change callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxyPendingCall *
			_tp_cli_call_stream_interface_media_call_complete_sending_state_change (TpC
			allStream *proxy,
			gint timeout_ms,
			guint in_State,
			tp_cli_call_stream_interface_media_callback_for_complete_sending_state_
			change callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_PROXY (proxy), NULL);
			return tp_cli_call_stream_interface_media_call_complete_sending_state_cha
			nge (proxy, timeout_ms,
			in_State,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_call_stream_interface_media_call_complete_sending_state_chan
			ge(...) _tp_cli_call_stream_interface_media_call_complete_sending_state_cha
			nge (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_call_stream_interface_media_callback_for_report_sendi ng_failure) (TpCallStream *proxy,		typedef void (*tp_cli_call_stream_interface_media_callback_for_report_sendi ng_failure) (TpCallStream *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_call_stream_interface_media_call_report_sending_ failure (TpCallStream *proxy,		TpProxyPendingCall *tp_cli_call_stream_interface_media_call_report_sending_ failure (TpCallStream *proxy,
	gint timeout_ms,		gint timeout_ms,
	guint in_Reason,		guint in_Reason,
	const gchar *in_Error,		const gchar *in_Error,
	const gchar *in_Message,		const gchar *in_Message,
	tp_cli_call_stream_interface_media_callback_for_report_sending_failure callback,		tp_cli_call_stream_interface_media_callback_for_report_sending_failure callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxyPendingCall *
			_tp_cli_call_stream_interface_media_call_report_sending_failure (TpCallStre
			am *proxy,
			gint timeout_ms,
			guint in_Reason,
			const gchar *in_Error,
			const gchar *in_Message,
			tp_cli_call_stream_interface_media_callback_for_report_sending_failure
			callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_PROXY (proxy), NULL);
			return tp_cli_call_stream_interface_media_call_report_sending_failure (pr
			oxy, timeout_ms,
			in_Reason,
			in_Error,
			in_Message,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_call_stream_interface_media_call_report_sending_failure(...)
			_tp_cli_call_stream_interface_media_call_report_sending_failure (__VA_ARGS
			__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_call_stream_interface_media_callback_for_complete_rec eiving_state_change) (TpCallStream *proxy,		typedef void (*tp_cli_call_stream_interface_media_callback_for_complete_rec eiving_state_change) (TpCallStream *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_call_stream_interface_media_call_complete_receiv ing_state_change (TpCallStream *proxy,		TpProxyPendingCall *tp_cli_call_stream_interface_media_call_complete_receiv ing_state_change (TpCallStream *proxy,
	gint timeout_ms,		gint timeout_ms,
	guint in_State,		guint in_State,
	tp_cli_call_stream_interface_media_callback_for_complete_receiving_stat e_change callback,		tp_cli_call_stream_interface_media_callback_for_complete_receiving_stat e_change callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxyPendingCall *
			_tp_cli_call_stream_interface_media_call_complete_receiving_state_change (T
			pCallStream *proxy,
			gint timeout_ms,
			guint in_State,
			tp_cli_call_stream_interface_media_callback_for_complete_receiving_stat
			e_change callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_PROXY (proxy), NULL);
			return tp_cli_call_stream_interface_media_call_complete_receiving_state_c
			hange (proxy, timeout_ms,
			in_State,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_call_stream_interface_media_call_complete_receiving_state_ch
			ange(...) _tp_cli_call_stream_interface_media_call_complete_receiving_state
			_change (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_call_stream_interface_media_callback_for_report_recei ving_failure) (TpCallStream *proxy,		typedef void (*tp_cli_call_stream_interface_media_callback_for_report_recei ving_failure) (TpCallStream *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_call_stream_interface_media_call_report_receivin g_failure (TpCallStream *proxy,		TpProxyPendingCall *tp_cli_call_stream_interface_media_call_report_receivin g_failure (TpCallStream *proxy,
	gint timeout_ms,		gint timeout_ms,
	guint in_Reason,		guint in_Reason,
	const gchar *in_Error,		const gchar *in_Error,
	const gchar *in_Message,		const gchar *in_Message,
	tp_cli_call_stream_interface_media_callback_for_report_receiving_failur e callback,		tp_cli_call_stream_interface_media_callback_for_report_receiving_failur e callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxyPendingCall *
			_tp_cli_call_stream_interface_media_call_report_receiving_failure (TpCallSt
			ream *proxy,
			gint timeout_ms,
			guint in_Reason,
			const gchar *in_Error,
			const gchar *in_Message,
			tp_cli_call_stream_interface_media_callback_for_report_receiving_failur
			e callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_PROXY (proxy), NULL);
			return tp_cli_call_stream_interface_media_call_report_receiving_failure (
			proxy, timeout_ms,
			in_Reason,
			in_Error,
			in_Message,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_call_stream_interface_media_call_report_receiving_failure(..
			.) _tp_cli_call_stream_interface_media_call_report_receiving_failure (__VA_
			ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_call_stream_interface_media_callback_for_set_credenti als) (TpCallStream *proxy,		typedef void (*tp_cli_call_stream_interface_media_callback_for_set_credenti als) (TpCallStream *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_call_stream_interface_media_call_set_credentials (TpCallStream *proxy,		TpProxyPendingCall *tp_cli_call_stream_interface_media_call_set_credentials (TpCallStream *proxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar *in_Username,		const gchar *in_Username,
	const gchar *in_Password,		const gchar *in_Password,
	tp_cli_call_stream_interface_media_callback_for_set_credentials callbac k,		tp_cli_call_stream_interface_media_callback_for_set_credentials callbac k,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxyPendingCall *
			_tp_cli_call_stream_interface_media_call_set_credentials (TpCallStream *pro
			xy,
			gint timeout_ms,
			const gchar *in_Username,
			const gchar *in_Password,
			tp_cli_call_stream_interface_media_callback_for_set_credentials callbac
			k,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_PROXY (proxy), NULL);
			return tp_cli_call_stream_interface_media_call_set_credentials (proxy, ti
			meout_ms,
			in_Username,
			in_Password,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_call_stream_interface_media_call_set_credentials(...) _tp_cl
			i_call_stream_interface_media_call_set_credentials (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_call_stream_interface_media_callback_for_add_candidat es) (TpCallStream *proxy,		typedef void (*tp_cli_call_stream_interface_media_callback_for_add_candidat es) (TpCallStream *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_call_stream_interface_media_call_add_candidates (TpCallStream *proxy,		TpProxyPendingCall *tp_cli_call_stream_interface_media_call_add_candidates (TpCallStream *proxy,
	gint timeout_ms,		gint timeout_ms,
	const GPtrArray *in_Candidates,		const GPtrArray *in_Candidates,
	tp_cli_call_stream_interface_media_callback_for_add_candidates callback ,		tp_cli_call_stream_interface_media_callback_for_add_candidates callback ,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxyPendingCall *
			_tp_cli_call_stream_interface_media_call_add_candidates (TpCallStream *prox
			y,
			gint timeout_ms,
			const GPtrArray *in_Candidates,
			tp_cli_call_stream_interface_media_callback_for_add_candidates callback
			,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_PROXY (proxy), NULL);
			return tp_cli_call_stream_interface_media_call_add_candidates (proxy, tim
			eout_ms,
			in_Candidates,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_call_stream_interface_media_call_add_candidates(...) _tp_cli
			_call_stream_interface_media_call_add_candidates (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_call_stream_interface_media_callback_for_finish_initi al_candidates) (TpCallStream *proxy,		typedef void (*tp_cli_call_stream_interface_media_callback_for_finish_initi al_candidates) (TpCallStream *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_call_stream_interface_media_call_finish_initial_ candidates (TpCallStream *proxy,		TpProxyPendingCall *tp_cli_call_stream_interface_media_call_finish_initial_ candidates (TpCallStream *proxy,
	gint timeout_ms,		gint timeout_ms,
	tp_cli_call_stream_interface_media_callback_for_finish_initial_candidat es callback,		tp_cli_call_stream_interface_media_callback_for_finish_initial_candidat es callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxyPendingCall *
			_tp_cli_call_stream_interface_media_call_finish_initial_candidates (TpCallS
			tream *proxy,
			gint timeout_ms,
			tp_cli_call_stream_interface_media_callback_for_finish_initial_candidat
			es callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_PROXY (proxy), NULL);
			return tp_cli_call_stream_interface_media_call_finish_initial_candidates
			(proxy, timeout_ms,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_call_stream_interface_media_call_finish_initial_candidates(.
			..) _tp_cli_call_stream_interface_media_call_finish_initial_candidates (__V
			A_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_call_stream_interface_media_callback_for_fail) (TpCal lStream *proxy,		typedef void (*tp_cli_call_stream_interface_media_callback_for_fail) (TpCal lStream *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_call_stream_interface_media_call_fail (TpCallStr eam *proxy,		TpProxyPendingCall *tp_cli_call_stream_interface_media_call_fail (TpCallStr eam *proxy,
	gint timeout_ms,		gint timeout_ms,
	const GValueArray *in_Reason,		const GValueArray *in_Reason,
	tp_cli_call_stream_interface_media_callback_for_fail callback,		tp_cli_call_stream_interface_media_callback_for_fail callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxyPendingCall *
			_tp_cli_call_stream_interface_media_call_fail (TpCallStream *proxy,
			gint timeout_ms,
			const GValueArray *in_Reason,
			tp_cli_call_stream_interface_media_callback_for_fail callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_PROXY (proxy), NULL);
			return tp_cli_call_stream_interface_media_call_fail (proxy, timeout_ms,
			in_Reason,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_call_stream_interface_media_call_fail(...) _tp_cli_call_stre
			am_interface_media_call_fail (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
			void tp_cli_call_stream_add_signals (TpProxy *self,
			guint quark,
			DBusGProxy *proxy,
			gpointer unused);
	G_END_DECLS		G_END_DECLS
	#endif /* defined (TP_GEN_TP_CLI_CALL_STREAM_H_INCLUDED) */		#endif /* defined (TP_GEN_TP_CLI_CALL_STREAM_H_INCLUDED) */
End of changes. 21 change blocks.
	0 lines changed or deleted		447 lines changed or added

	tp-cli-channel-dispatch-operation.h		tp-cli-channel-dispatch-operation.h
	skipping to change at line 18		skipping to change at line 18
	const gchar *arg_Error,		const gchar *arg_Error,
	const gchar *arg_Message,		const gchar *arg_Message,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_channel_dispatch_operation_connect_to_chann el_lost (TpChannelDispatchOperation *proxy,		TpProxySignalConnection *tp_cli_channel_dispatch_operation_connect_to_chann el_lost (TpChannelDispatchOperation *proxy,
	tp_cli_channel_dispatch_operation_signal_callback_channel_lost callback ,		tp_cli_channel_dispatch_operation_signal_callback_channel_lost callback ,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_channel_dispatch_operation_connect_to_channel_lost (TpChannelDispat
			chOperation *proxy,
			tp_cli_channel_dispatch_operation_signal_callback_channel_lost callback
			,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_CHANNEL_DISPATCH_OPERATION (proxy), NULL);
			return tp_cli_channel_dispatch_operation_connect_to_channel_lost (proxy,
			callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_channel_dispatch_operation_connect_to_channel_lost(...) _tp_
			cli_channel_dispatch_operation_connect_to_channel_lost (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_dispatch_operation_signal_callback_finished) (TpChannelDispatchOperation *proxy,		typedef void (*tp_cli_channel_dispatch_operation_signal_callback_finished) (TpChannelDispatchOperation *proxy,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_channel_dispatch_operation_connect_to_finis hed (TpChannelDispatchOperation *proxy,		TpProxySignalConnection *tp_cli_channel_dispatch_operation_connect_to_finis hed (TpChannelDispatchOperation *proxy,
	tp_cli_channel_dispatch_operation_signal_callback_finished callback,		tp_cli_channel_dispatch_operation_signal_callback_finished callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_channel_dispatch_operation_connect_to_finished (TpChannelDispatchOp
			eration *proxy,
			tp_cli_channel_dispatch_operation_signal_callback_finished callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_CHANNEL_DISPATCH_OPERATION (proxy), NULL);
			return tp_cli_channel_dispatch_operation_connect_to_finished (proxy, call
			back, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_channel_dispatch_operation_connect_to_finished(...) _tp_cli_
			channel_dispatch_operation_connect_to_finished (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_dispatch_operation_callback_for_handle_with) (TpChannelDispatchOperation *proxy,		typedef void (*tp_cli_channel_dispatch_operation_callback_for_handle_with) (TpChannelDispatchOperation *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_dispatch_operation_call_handle_with (TpC hannelDispatchOperation *proxy,		TpProxyPendingCall *tp_cli_channel_dispatch_operation_call_handle_with (TpC hannelDispatchOperation *proxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar *in_Handler,		const gchar *in_Handler,
	tp_cli_channel_dispatch_operation_callback_for_handle_with callback,		tp_cli_channel_dispatch_operation_callback_for_handle_with callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxyPendingCall *
			_tp_cli_channel_dispatch_operation_call_handle_with (TpChannelDispatchOpera
			tion *proxy,
			gint timeout_ms,
			const gchar *in_Handler,
			tp_cli_channel_dispatch_operation_callback_for_handle_with callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CHANNEL_DISPATCH_OPERATION (proxy), NULL);
			return tp_cli_channel_dispatch_operation_call_handle_with (proxy, timeout
			_ms,
			in_Handler,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_channel_dispatch_operation_call_handle_with(...) _tp_cli_cha
			nnel_dispatch_operation_call_handle_with (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_dispatch_operation_callback_for_claim) (TpCha nnelDispatchOperation *proxy,		typedef void (*tp_cli_channel_dispatch_operation_callback_for_claim) (TpCha nnelDispatchOperation *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_dispatch_operation_call_claim (TpChannel DispatchOperation *proxy,		TpProxyPendingCall *tp_cli_channel_dispatch_operation_call_claim (TpChannel DispatchOperation *proxy,
	gint timeout_ms,		gint timeout_ms,
	tp_cli_channel_dispatch_operation_callback_for_claim callback,		tp_cli_channel_dispatch_operation_callback_for_claim callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxyPendingCall *
			_tp_cli_channel_dispatch_operation_call_claim (TpChannelDispatchOperation *
			proxy,
			gint timeout_ms,
			tp_cli_channel_dispatch_operation_callback_for_claim callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CHANNEL_DISPATCH_OPERATION (proxy), NULL);
			return tp_cli_channel_dispatch_operation_call_claim (proxy, timeout_ms,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_channel_dispatch_operation_call_claim(...) _tp_cli_channel_d
			ispatch_operation_call_claim (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_dispatch_operation_callback_for_handle_with_t ime) (TpChannelDispatchOperation *proxy,		typedef void (*tp_cli_channel_dispatch_operation_callback_for_handle_with_t ime) (TpChannelDispatchOperation *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_dispatch_operation_call_handle_with_time (TpChannelDispatchOperation *proxy,		TpProxyPendingCall *tp_cli_channel_dispatch_operation_call_handle_with_time (TpChannelDispatchOperation *proxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar *in_Handler,		const gchar *in_Handler,
	gint64 in_UserActionTime,		gint64 in_UserActionTime,
	tp_cli_channel_dispatch_operation_callback_for_handle_with_time callbac k,		tp_cli_channel_dispatch_operation_callback_for_handle_with_time callbac k,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxyPendingCall *
			_tp_cli_channel_dispatch_operation_call_handle_with_time (TpChannelDispatch
			Operation *proxy,
			gint timeout_ms,
			const gchar *in_Handler,
			gint64 in_UserActionTime,
			tp_cli_channel_dispatch_operation_callback_for_handle_with_time callbac
			k,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CHANNEL_DISPATCH_OPERATION (proxy), NULL);
			return tp_cli_channel_dispatch_operation_call_handle_with_time (proxy, ti
			meout_ms,
			in_Handler,
			in_UserActionTime,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_channel_dispatch_operation_call_handle_with_time(...) _tp_cl
			i_channel_dispatch_operation_call_handle_with_time (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
			void tp_cli_channel_dispatch_operation_add_signals (TpProxy *self,
			guint quark,
			DBusGProxy *proxy,
			gpointer unused);
	G_END_DECLS		G_END_DECLS
	#endif /* defined (TP_GEN_TP_CLI_CHANNEL_DISPATCH_OPERATION_H_INCLUDED) */		#endif /* defined (TP_GEN_TP_CLI_CHANNEL_DISPATCH_OPERATION_H_INCLUDED) */
End of changes. 5 change blocks.
	0 lines changed or deleted		105 lines changed or added

	tp-cli-channel-dispatcher.h		tp-cli-channel-dispatcher.h
	#ifndef TP_GEN_TP_CLI_CHANNEL_DISPATCHER_H_INCLUDED		#ifndef TP_GEN_TP_CLI_CHANNEL_DISPATCHER_H_INCLUDED
	#define TP_GEN_TP_CLI_CHANNEL_DISPATCHER_H_INCLUDED		#define TP_GEN_TP_CLI_CHANNEL_DISPATCHER_H_INCLUDED
	G_BEGIN_DECLS		G_BEGIN_DECLS
	typedef void (*tp_cli_channel_dispatcher_callback_for_create_channel) (TpCh annelDispatcher *proxy,		typedef void (*tp_cli_channel_dispatcher_callback_for_create_channel) (TpCh annelDispatcher *proxy,
	const gchar *out_Request,		const gchar *out_Request,
			GHashTable *out_Properties,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_dispatcher_call_create_channel (TpChanne lDispatcher *proxy,		TpProxyPendingCall *tp_cli_channel_dispatcher_call_create_channel (TpChanne lDispatcher *proxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar *in_Account,		const gchar *in_Account,
	GHashTable *in_Requested_Properties,		GHashTable *in_Requested_Properties,
	gint64 in_User_Action_Time,		gint64 in_User_Action_Time,
	const gchar *in_Preferred_Handler,		const gchar *in_Preferred_Handler,
			GHashTable *in_Hints,
	tp_cli_channel_dispatcher_callback_for_create_channel callback,		tp_cli_channel_dispatcher_callback_for_create_channel callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	typedef void (*tp_cli_channel_dispatcher_callback_for_ensure_channel) (TpCh		#ifndef __GTK_DOC_IGNORE__
	annelDispatcher *proxy,		static inline TpProxyPendingCall *
	const gchar *out_Request,		_tp_cli_channel_dispatcher_call_create_channel (TpChannelDispatcher *proxy,
	const GError *error, gpointer user_data,
	GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_dispatcher_call_ensure_channel (TpChanne
	lDispatcher *proxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar *in_Account,		const gchar *in_Account,
	GHashTable *in_Requested_Properties,		GHashTable *in_Requested_Properties,
	gint64 in_User_Action_Time,		gint64 in_User_Action_Time,
	const gchar *in_Preferred_Handler,		const gchar *in_Preferred_Handler,
	tp_cli_channel_dispatcher_callback_for_ensure_channel callback,		GHashTable *in_Hints,
			tp_cli_channel_dispatcher_callback_for_create_channel callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CHANNEL_DISPATCHER (proxy), NULL);
			return tp_cli_channel_dispatcher_call_create_channel (proxy, timeout_ms,
			in_Account,
			in_Requested_Properties,
			in_User_Action_Time,
			in_Preferred_Handler,
			in_Hints,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_channel_dispatcher_call_create_channel(...) _tp_cli_channel_
			dispatcher_call_create_channel (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_dispatcher_callback_for_create_channel_with_h ints) (TpChannelDispatcher *proxy,		typedef void (*tp_cli_channel_dispatcher_callback_for_ensure_channel) (TpCh annelDispatcher *proxy,
	const gchar *out_Request,		const gchar *out_Request,
			GHashTable *out_Properties,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_dispatcher_call_create_channel_with_hint s (TpChannelDispatcher *proxy,		TpProxyPendingCall *tp_cli_channel_dispatcher_call_ensure_channel (TpChanne lDispatcher *proxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar *in_Account,		const gchar *in_Account,
	GHashTable *in_Requested_Properties,		GHashTable *in_Requested_Properties,
	gint64 in_User_Action_Time,		gint64 in_User_Action_Time,
	const gchar *in_Preferred_Handler,		const gchar *in_Preferred_Handler,
	GHashTable *in_Hints,		GHashTable *in_Hints,
	tp_cli_channel_dispatcher_callback_for_create_channel_with_hints callba ck,		tp_cli_channel_dispatcher_callback_for_ensure_channel callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	typedef void (*tp_cli_channel_dispatcher_callback_for_ensure_channel_with_h		#ifndef __GTK_DOC_IGNORE__
	ints) (TpChannelDispatcher *proxy,		static inline TpProxyPendingCall *
	const gchar *out_Request,		_tp_cli_channel_dispatcher_call_ensure_channel (TpChannelDispatcher *proxy,
	const GError *error, gpointer user_data,
	GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_dispatcher_call_ensure_channel_with_hint
	s (TpChannelDispatcher *proxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar *in_Account,		const gchar *in_Account,
	GHashTable *in_Requested_Properties,		GHashTable *in_Requested_Properties,
	gint64 in_User_Action_Time,		gint64 in_User_Action_Time,
	const gchar *in_Preferred_Handler,		const gchar *in_Preferred_Handler,
	GHashTable *in_Hints,		GHashTable *in_Hints,
	tp_cli_channel_dispatcher_callback_for_ensure_channel_with_hints callba ck,		tp_cli_channel_dispatcher_callback_for_ensure_channel callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CHANNEL_DISPATCHER (proxy), NULL);
			return tp_cli_channel_dispatcher_call_ensure_channel (proxy, timeout_ms,
			in_Account,
			in_Requested_Properties,
			in_User_Action_Time,
			in_Preferred_Handler,
			in_Hints,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_channel_dispatcher_call_ensure_channel(...) _tp_cli_channel_
			dispatcher_call_ensure_channel (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_dispatcher_callback_for_delegate_channels) (T pChannelDispatcher *proxy,		typedef void (*tp_cli_channel_dispatcher_callback_for_delegate_channels) (T pChannelDispatcher *proxy,
	const GPtrArray *out_Delegated,		const GPtrArray *out_Delegated,
	GHashTable *out_Not_Delegated,		GHashTable *out_Not_Delegated,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_dispatcher_call_delegate_channels (TpCha nnelDispatcher *proxy,		TpProxyPendingCall *tp_cli_channel_dispatcher_call_delegate_channels (TpCha nnelDispatcher *proxy,
	gint timeout_ms,		gint timeout_ms,
	const GPtrArray *in_Channels,		const GPtrArray *in_Channels,
	gint64 in_User_Action_Time,		gint64 in_User_Action_Time,
	const gchar *in_Preferred_Handler,		const gchar *in_Preferred_Handler,
	tp_cli_channel_dispatcher_callback_for_delegate_channels callback,		tp_cli_channel_dispatcher_callback_for_delegate_channels callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxyPendingCall *
			_tp_cli_channel_dispatcher_call_delegate_channels (TpChannelDispatcher *pro
			xy,
			gint timeout_ms,
			const GPtrArray *in_Channels,
			gint64 in_User_Action_Time,
			const gchar *in_Preferred_Handler,
			tp_cli_channel_dispatcher_callback_for_delegate_channels callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CHANNEL_DISPATCHER (proxy), NULL);
			return tp_cli_channel_dispatcher_call_delegate_channels (proxy, timeout_m
			s,
			in_Channels,
			in_User_Action_Time,
			in_Preferred_Handler,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_channel_dispatcher_call_delegate_channels(...) _tp_cli_chann
			el_dispatcher_call_delegate_channels (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_dispatcher_callback_for_present_channel) (TpC hannelDispatcher *proxy,		typedef void (*tp_cli_channel_dispatcher_callback_for_present_channel) (TpC hannelDispatcher *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_dispatcher_call_present_channel (TpChann elDispatcher *proxy,		TpProxyPendingCall *tp_cli_channel_dispatcher_call_present_channel (TpChann elDispatcher *proxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar *in_Channel,		const gchar *in_Channel,
	gint64 in_User_Action_Time,		gint64 in_User_Action_Time,
	tp_cli_channel_dispatcher_callback_for_present_channel callback,		tp_cli_channel_dispatcher_callback_for_present_channel callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	typedef void (*tp_cli_channel_dispatcher_interface_messages1_callback_for_s		#ifndef __GTK_DOC_IGNORE__
	end_message) (TpChannelDispatcher *proxy,		static inline TpProxyPendingCall *
	const gchar *out_Token,		_tp_cli_channel_dispatcher_call_present_channel (TpChannelDispatcher *proxy
	const GError *error, gpointer user_data,		,
	GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_dispatcher_interface_messages1_call_send
	_message (TpChannelDispatcher *proxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar *in_Account,		const gchar *in_Channel,
	const gchar *in_Target_ID,		gint64 in_User_Action_Time,
	const GPtrArray *in_Message,		tp_cli_channel_dispatcher_callback_for_present_channel callback,
	guint in_Flags,
	tp_cli_channel_dispatcher_interface_messages1_callback_for_send_message
	callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CHANNEL_DISPATCHER (proxy), NULL);
			return tp_cli_channel_dispatcher_call_present_channel (proxy, timeout_ms,
			in_Channel,
			in_User_Action_Time,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_channel_dispatcher_call_present_channel(...) _tp_cli_channel
			_dispatcher_call_present_channel (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_dispatcher_interface_operation_list_signal_ca llback_new_dispatch_operation) (TpChannelDispatcher *proxy,		typedef void (*tp_cli_channel_dispatcher_interface_operation_list_signal_ca llback_new_dispatch_operation) (TpChannelDispatcher *proxy,
	const gchar *arg_Dispatch_Operation,		const gchar *arg_Dispatch_Operation,
	GHashTable *arg_Properties,		GHashTable *arg_Properties,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_channel_dispatcher_interface_operation_list _connect_to_new_dispatch_operation (TpChannelDispatcher *proxy,		TpProxySignalConnection *tp_cli_channel_dispatcher_interface_operation_list _connect_to_new_dispatch_operation (TpChannelDispatcher *proxy,
	tp_cli_channel_dispatcher_interface_operation_list_signal_callback_new_ dispatch_operation callback,		tp_cli_channel_dispatcher_interface_operation_list_signal_callback_new_ dispatch_operation callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_channel_dispatcher_interface_operation_list_connect_to_new_dispatch
			_operation (TpChannelDispatcher *proxy,
			tp_cli_channel_dispatcher_interface_operation_list_signal_callback_new_
			dispatch_operation callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_CHANNEL_DISPATCHER (proxy), NULL);
			return tp_cli_channel_dispatcher_interface_operation_list_connect_to_new_
			dispatch_operation (proxy, callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_channel_dispatcher_interface_operation_list_connect_to_new_d
			ispatch_operation(...) _tp_cli_channel_dispatcher_interface_operation_list_
			connect_to_new_dispatch_operation (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_dispatcher_interface_operation_list_signal_ca llback_dispatch_operation_finished) (TpChannelDispatcher *proxy,		typedef void (*tp_cli_channel_dispatcher_interface_operation_list_signal_ca llback_dispatch_operation_finished) (TpChannelDispatcher *proxy,
	const gchar *arg_Dispatch_Operation,		const gchar *arg_Dispatch_Operation,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_channel_dispatcher_interface_operation_list _connect_to_dispatch_operation_finished (TpChannelDispatcher *proxy,		TpProxySignalConnection *tp_cli_channel_dispatcher_interface_operation_list _connect_to_dispatch_operation_finished (TpChannelDispatcher *proxy,
	tp_cli_channel_dispatcher_interface_operation_list_signal_callback_disp atch_operation_finished callback,		tp_cli_channel_dispatcher_interface_operation_list_signal_callback_disp atch_operation_finished callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_channel_dispatcher_interface_operation_list_connect_to_dispatch_ope
			ration_finished (TpChannelDispatcher *proxy,
			tp_cli_channel_dispatcher_interface_operation_list_signal_callback_disp
			atch_operation_finished callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_CHANNEL_DISPATCHER (proxy), NULL);
			return tp_cli_channel_dispatcher_interface_operation_list_connect_to_disp
			atch_operation_finished (proxy, callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_channel_dispatcher_interface_operation_list_connect_to_dispa
			tch_operation_finished(...) _tp_cli_channel_dispatcher_interface_operation_
			list_connect_to_dispatch_operation_finished (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
			void tp_cli_channel_dispatcher_add_signals (TpProxy *self,
			guint quark,
			DBusGProxy *proxy,
			gpointer unused);
	G_END_DECLS		G_END_DECLS
	#endif /* defined (TP_GEN_TP_CLI_CHANNEL_DISPATCHER_H_INCLUDED) */		#endif /* defined (TP_GEN_TP_CLI_CHANNEL_DISPATCHER_H_INCLUDED) */
End of changes. 18 change blocks.
	38 lines changed or deleted		131 lines changed or added

	tp-cli-channel-request.h		tp-cli-channel-request.h
	skipping to change at line 17		skipping to change at line 17
	const gchar *arg_Error,		const gchar *arg_Error,
	const gchar *arg_Message,		const gchar *arg_Message,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_channel_request_connect_to_failed (TpChanne lRequest *proxy,		TpProxySignalConnection *tp_cli_channel_request_connect_to_failed (TpChanne lRequest *proxy,
	tp_cli_channel_request_signal_callback_failed callback,		tp_cli_channel_request_signal_callback_failed callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
	typedef void (*tp_cli_channel_request_signal_callback_succeeded) (TpChannel		#ifndef __GTK_DOC_IGNORE__
	Request *proxy,		static inline TpProxySignalConnection *
	gpointer user_data, GObject *weak_object);		_tp_cli_channel_request_connect_to_failed (TpChannelRequest *proxy,
	TpProxySignalConnection *tp_cli_channel_request_connect_to_succeeded (TpCha		tp_cli_channel_request_signal_callback_failed callback,
	nnelRequest *proxy,
	tp_cli_channel_request_signal_callback_succeeded callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error)
			{
	typedef void (*tp_cli_channel_request_signal_callback_succeeded_with_channe		g_return_val_if_fail (TP_IS_CHANNEL_REQUEST (proxy), NULL);
	l) (TpChannelRequest *proxy,		return tp_cli_channel_request_connect_to_failed (proxy, callback, user_da
			ta,
			destroy, weak_object, error);
			}
			#define tp_cli_channel_request_connect_to_failed(...) _tp_cli_channel_reque
			st_connect_to_failed (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
			typedef void (*tp_cli_channel_request_signal_callback_succeeded) (TpChannel
			Request *proxy,
	const gchar *arg_Connection,		const gchar *arg_Connection,
	GHashTable *arg_Connection_Properties,		GHashTable *arg_Connection_Properties,
	const gchar *arg_Channel,		const gchar *arg_Channel,
	GHashTable *arg_Channel_Properties,		GHashTable *arg_Channel_Properties,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_channel_request_connect_to_succeeded_with_c		TpProxySignalConnection *tp_cli_channel_request_connect_to_succeeded (TpCha
	hannel (TpChannelRequest *proxy,		nnelRequest *proxy,
	tp_cli_channel_request_signal_callback_succeeded_with_channel callback,		tp_cli_channel_request_signal_callback_succeeded callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_channel_request_connect_to_succeeded (TpChannelRequest *proxy,
			tp_cli_channel_request_signal_callback_succeeded callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_CHANNEL_REQUEST (proxy), NULL);
			return tp_cli_channel_request_connect_to_succeeded (proxy, callback, user
			_data,
			destroy, weak_object, error);
			}
			#define tp_cli_channel_request_connect_to_succeeded(...) _tp_cli_channel_re
			quest_connect_to_succeeded (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_request_callback_for_proceed) (TpChannelReque st *proxy,		typedef void (*tp_cli_channel_request_callback_for_proceed) (TpChannelReque st *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_request_call_proceed (TpChannelRequest * proxy,		TpProxyPendingCall *tp_cli_channel_request_call_proceed (TpChannelRequest * proxy,
	gint timeout_ms,		gint timeout_ms,
	tp_cli_channel_request_callback_for_proceed callback,		tp_cli_channel_request_callback_for_proceed callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxyPendingCall *
			_tp_cli_channel_request_call_proceed (TpChannelRequest *proxy,
			gint timeout_ms,
			tp_cli_channel_request_callback_for_proceed callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CHANNEL_REQUEST (proxy), NULL);
			return tp_cli_channel_request_call_proceed (proxy, timeout_ms,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_channel_request_call_proceed(...) _tp_cli_channel_request_ca
			ll_proceed (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_request_callback_for_cancel) (TpChannelReques t *proxy,		typedef void (*tp_cli_channel_request_callback_for_cancel) (TpChannelReques t *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_request_call_cancel (TpChannelRequest *p roxy,		TpProxyPendingCall *tp_cli_channel_request_call_cancel (TpChannelRequest *p roxy,
	gint timeout_ms,		gint timeout_ms,
	tp_cli_channel_request_callback_for_cancel callback,		tp_cli_channel_request_callback_for_cancel callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxyPendingCall *
			_tp_cli_channel_request_call_cancel (TpChannelRequest *proxy,
			gint timeout_ms,
			tp_cli_channel_request_callback_for_cancel callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CHANNEL_REQUEST (proxy), NULL);
			return tp_cli_channel_request_call_cancel (proxy, timeout_ms,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_channel_request_call_cancel(...) _tp_cli_channel_request_cal
			l_cancel (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
			void tp_cli_channel_request_add_signals (TpProxy *self,
			guint quark,
			DBusGProxy *proxy,
			gpointer unused);
	G_END_DECLS		G_END_DECLS
	#endif /* defined (TP_GEN_TP_CLI_CHANNEL_REQUEST_H_INCLUDED) */		#endif /* defined (TP_GEN_TP_CLI_CHANNEL_REQUEST_H_INCLUDED) */
End of changes. 6 change blocks.
	13 lines changed or deleted		75 lines changed or added

	tp-cli-channel.h		tp-cli-channel.h
	skipping to change at line 15		skipping to change at line 15
	typedef void (*tp_cli_channel_signal_callback_closed) (TpChannel *proxy,		typedef void (*tp_cli_channel_signal_callback_closed) (TpChannel *proxy,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_channel_connect_to_closed (TpChannel *proxy ,		TpProxySignalConnection *tp_cli_channel_connect_to_closed (TpChannel *proxy ,
	tp_cli_channel_signal_callback_closed callback,		tp_cli_channel_signal_callback_closed callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_channel_connect_to_closed (TpChannel *proxy,
			tp_cli_channel_signal_callback_closed callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
			return tp_cli_channel_connect_to_closed (proxy, callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_channel_connect_to_closed(...) _tp_cli_channel_connect_to_cl
			osed (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_callback_for_close) (TpChannel *proxy,		typedef void (*tp_cli_channel_callback_for_close) (TpChannel *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_call_close (TpChannel *proxy,		TpProxyPendingCall *tp_cli_channel_call_close (TpChannel *proxy,
	gint timeout_ms,		gint timeout_ms,
	tp_cli_channel_callback_for_close callback,		tp_cli_channel_callback_for_close callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_channel_run_close (TpChannel *proxy,		static inline TpProxyPendingCall *
	gint timeout_ms,		_tp_cli_channel_call_close (TpChannel *proxy,
	GError **error,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;
	#endif /* not TP_DISABLE_DEPRECATED */
	typedef void (*tp_cli_channel_callback_for_get_channel_type) (TpChannel *pr
	oxy,
	const gchar *out_Channel_Type,
	const GError *error, gpointer user_data,
	GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_call_get_channel_type (TpChannel *proxy,
	gint timeout_ms,
	tp_cli_channel_callback_for_get_channel_type callback,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED
	gboolean tp_cli_channel_run_get_channel_type (TpChannel *proxy,
	gint timeout_ms,
	gchar **out_Channel_Type,
	GError **error,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;
	#endif /* not TP_DISABLE_DEPRECATED */
	typedef void (*tp_cli_channel_callback_for_get_handle) (TpChannel *proxy,
	guint out_Target_Handle_Type,
	guint out_Target_Handle,
	const GError *error, gpointer user_data,
	GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_call_get_handle (TpChannel *proxy,
	gint timeout_ms,
	tp_cli_channel_callback_for_get_handle callback,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED
	gboolean tp_cli_channel_run_get_handle (TpChannel *proxy,
	gint timeout_ms,
	guint *out_Target_Handle_Type,
	guint *out_Target_Handle,
	GError **error,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;
	#endif /* not TP_DISABLE_DEPRECATED */
	typedef void (*tp_cli_channel_callback_for_get_interfaces) (TpChannel *prox
	y,
	const gchar **out_Interfaces,
	const GError *error, gpointer user_data,
	GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_call_get_interfaces (TpChannel *proxy,
	gint timeout_ms,
	tp_cli_channel_callback_for_get_interfaces callback,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED
	gboolean tp_cli_channel_run_get_interfaces (TpChannel *proxy,
	gint timeout_ms,
	gchar ***out_Interfaces,
	GError **error,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;
	#endif /* not TP_DISABLE_DEPRECATED */
	typedef void (*tp_cli_channel_interface_call_state_signal_callback_call_sta
	te_changed) (TpChannel *proxy,
	guint arg_Contact,
	guint arg_State,
	gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_channel_interface_call_state_connect_to_cal
	l_state_changed (TpChannel *proxy,
	tp_cli_channel_interface_call_state_signal_callback_call_state_changed
	callback,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object,
	GError **error);
	typedef void (*tp_cli_channel_interface_call_state_callback_for_get_call_st
	ates) (TpChannel *proxy,
	GHashTable *out_States,
	const GError *error, gpointer user_data,
	GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_interface_call_state_call_get_call_state
	s (TpChannel *proxy,
	gint timeout_ms,		gint timeout_ms,
	tp_cli_channel_interface_call_state_callback_for_get_call_states callba ck,		tp_cli_channel_callback_for_close callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object)
			{
	#ifndef TP_DISABLE_DEPRECATED		g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
	gboolean tp_cli_channel_interface_call_state_run_get_call_states (TpChannel		return tp_cli_channel_call_close (proxy, timeout_ms,
	*proxy,		callback, user_data, destroy, weak_object);
	gint timeout_ms,		}
	GHashTable **out_States,		#define tp_cli_channel_call_close(...) _tp_cli_channel_call_close (__VA_ARG
	GError **error,		S__)
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		#endif /* __GTK_DOC_IGNORE__ */
	#endif /* not TP_DISABLE_DEPRECATED */
	typedef void (*tp_cli_channel_interface_captcha_authentication_callback_for _get_captchas) (TpChannel *proxy,		typedef void (*tp_cli_channel_interface_captcha_authentication_callback_for _get_captchas) (TpChannel *proxy,
	const GPtrArray *out_Captcha_Info,		const GPtrArray *out_Captcha_Info,
	guint out_Number_Required,		guint out_Number_Required,
	const gchar *out_Language,		const gchar *out_Language,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_interface_captcha_authentication_call_ge t_captchas (TpChannel *proxy,		TpProxyPendingCall *tp_cli_channel_interface_captcha_authentication_call_ge t_captchas (TpChannel *proxy,
	gint timeout_ms,		gint timeout_ms,
	tp_cli_channel_interface_captcha_authentication_callback_for_get_captch as callback,		tp_cli_channel_interface_captcha_authentication_callback_for_get_captch as callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxyPendingCall *
			_tp_cli_channel_interface_captcha_authentication_call_get_captchas (TpChann
			el *proxy,
			gint timeout_ms,
			tp_cli_channel_interface_captcha_authentication_callback_for_get_captch
			as callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
			return tp_cli_channel_interface_captcha_authentication_call_get_captchas
			(proxy, timeout_ms,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_channel_interface_captcha_authentication_call_get_captchas(.
			..) _tp_cli_channel_interface_captcha_authentication_call_get_captchas (__V
			A_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_interface_captcha_authentication_callback_for _get_captcha_data) (TpChannel *proxy,		typedef void (*tp_cli_channel_interface_captcha_authentication_callback_for _get_captcha_data) (TpChannel *proxy,
	const GArray *out_Captcha_Data,		const GArray *out_Captcha_Data,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_interface_captcha_authentication_call_ge t_captcha_data (TpChannel *proxy,		TpProxyPendingCall *tp_cli_channel_interface_captcha_authentication_call_ge t_captcha_data (TpChannel *proxy,
	gint timeout_ms,		gint timeout_ms,
	guint in_ID,		guint in_ID,
	const gchar *in_Mime_Type,		const gchar *in_Mime_Type,
	tp_cli_channel_interface_captcha_authentication_callback_for_get_captch a_data callback,		tp_cli_channel_interface_captcha_authentication_callback_for_get_captch a_data callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxyPendingCall *
			_tp_cli_channel_interface_captcha_authentication_call_get_captcha_data (TpC
			hannel *proxy,
			gint timeout_ms,
			guint in_ID,
			const gchar *in_Mime_Type,
			tp_cli_channel_interface_captcha_authentication_callback_for_get_captch
			a_data callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
			return tp_cli_channel_interface_captcha_authentication_call_get_captcha_d
			ata (proxy, timeout_ms,
			in_ID,
			in_Mime_Type,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_channel_interface_captcha_authentication_call_get_captcha_da
			ta(...) _tp_cli_channel_interface_captcha_authentication_call_get_captcha_d
			ata (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_interface_captcha_authentication_callback_for _answer_captchas) (TpChannel *proxy,		typedef void (*tp_cli_channel_interface_captcha_authentication_callback_for _answer_captchas) (TpChannel *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_interface_captcha_authentication_call_an swer_captchas (TpChannel *proxy,		TpProxyPendingCall *tp_cli_channel_interface_captcha_authentication_call_an swer_captchas (TpChannel *proxy,
	gint timeout_ms,		gint timeout_ms,
	GHashTable *in_Answers,		GHashTable *in_Answers,
	tp_cli_channel_interface_captcha_authentication_callback_for_answer_cap tchas callback,		tp_cli_channel_interface_captcha_authentication_callback_for_answer_cap tchas callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxyPendingCall *
			_tp_cli_channel_interface_captcha_authentication_call_answer_captchas (TpCh
			annel *proxy,
			gint timeout_ms,
			GHashTable *in_Answers,
			tp_cli_channel_interface_captcha_authentication_callback_for_answer_cap
			tchas callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
			return tp_cli_channel_interface_captcha_authentication_call_answer_captch
			as (proxy, timeout_ms,
			in_Answers,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_channel_interface_captcha_authentication_call_answer_captcha
			s(...) _tp_cli_channel_interface_captcha_authentication_call_answer_captcha
			s (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_interface_captcha_authentication_callback_for _cancel_captcha) (TpChannel *proxy,		typedef void (*tp_cli_channel_interface_captcha_authentication_callback_for _cancel_captcha) (TpChannel *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_interface_captcha_authentication_call_ca ncel_captcha (TpChannel *proxy,		TpProxyPendingCall *tp_cli_channel_interface_captcha_authentication_call_ca ncel_captcha (TpChannel *proxy,
	gint timeout_ms,		gint timeout_ms,
	guint in_Reason,		guint in_Reason,
	const gchar *in_Debug_Message,		const gchar *in_Debug_Message,
	tp_cli_channel_interface_captcha_authentication_callback_for_cancel_cap tcha callback,		tp_cli_channel_interface_captcha_authentication_callback_for_cancel_cap tcha callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxyPendingCall *
			_tp_cli_channel_interface_captcha_authentication_call_cancel_captcha (TpCha
			nnel *proxy,
			gint timeout_ms,
			guint in_Reason,
			const gchar *in_Debug_Message,
			tp_cli_channel_interface_captcha_authentication_callback_for_cancel_cap
			tcha callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
			return tp_cli_channel_interface_captcha_authentication_call_cancel_captch
			a (proxy, timeout_ms,
			in_Reason,
			in_Debug_Message,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_channel_interface_captcha_authentication_call_cancel_captcha
			(...) _tp_cli_channel_interface_captcha_authentication_call_cancel_captcha
			(__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_interface_chat_state_signal_callback_chat_sta te_changed) (TpChannel *proxy,		typedef void (*tp_cli_channel_interface_chat_state_signal_callback_chat_sta te_changed) (TpChannel *proxy,
	guint arg_Contact,		guint arg_Contact,
	guint arg_State,		guint arg_State,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_channel_interface_chat_state_connect_to_cha t_state_changed (TpChannel *proxy,		TpProxySignalConnection *tp_cli_channel_interface_chat_state_connect_to_cha t_state_changed (TpChannel *proxy,
	tp_cli_channel_interface_chat_state_signal_callback_chat_state_changed callback,		tp_cli_channel_interface_chat_state_signal_callback_chat_state_changed callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_channel_interface_chat_state_connect_to_chat_state_changed (TpChann
			el *proxy,
			tp_cli_channel_interface_chat_state_signal_callback_chat_state_changed
			callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
			return tp_cli_channel_interface_chat_state_connect_to_chat_state_changed
			(proxy, callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_channel_interface_chat_state_connect_to_chat_state_changed(.
			..) _tp_cli_channel_interface_chat_state_connect_to_chat_state_changed (__V
			A_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_interface_chat_state_callback_for_set_chat_st ate) (TpChannel *proxy,		typedef void (*tp_cli_channel_interface_chat_state_callback_for_set_chat_st ate) (TpChannel *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_interface_chat_state_call_set_chat_state (TpChannel *proxy,		TpProxyPendingCall *tp_cli_channel_interface_chat_state_call_set_chat_state (TpChannel *proxy,
	gint timeout_ms,		gint timeout_ms,
	guint in_State,		guint in_State,
	tp_cli_channel_interface_chat_state_callback_for_set_chat_state callbac k,		tp_cli_channel_interface_chat_state_callback_for_set_chat_state callbac k,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_channel_interface_chat_state_run_set_chat_state (TpChannel		static inline TpProxyPendingCall *
	*proxy,		_tp_cli_channel_interface_chat_state_call_set_chat_state (TpChannel *proxy,
	gint timeout_ms,		gint timeout_ms,
	guint in_State,		guint in_State,
	GError **error,		tp_cli_channel_interface_chat_state_callback_for_set_chat_state callbac
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		k,
	#endif /* not TP_DISABLE_DEPRECATED */		gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
			return tp_cli_channel_interface_chat_state_call_set_chat_state (proxy, ti
			meout_ms,
			in_State,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_channel_interface_chat_state_call_set_chat_state(...) _tp_cl
			i_channel_interface_chat_state_call_set_chat_state (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_interface_conference_signal_callback_channel_ merged) (TpChannel *proxy,		typedef void (*tp_cli_channel_interface_conference_signal_callback_channel_ merged) (TpChannel *proxy,
	const gchar *arg_Channel,		const gchar *arg_Channel,
	guint arg_Channel_Specific_Handle,		guint arg_Channel_Specific_Handle,
	GHashTable *arg_Properties,		GHashTable *arg_Properties,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_channel_interface_conference_connect_to_cha nnel_merged (TpChannel *proxy,		TpProxySignalConnection *tp_cli_channel_interface_conference_connect_to_cha nnel_merged (TpChannel *proxy,
	tp_cli_channel_interface_conference_signal_callback_channel_merged call back,		tp_cli_channel_interface_conference_signal_callback_channel_merged call back,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_channel_interface_conference_connect_to_channel_merged (TpChannel *
			proxy,
			tp_cli_channel_interface_conference_signal_callback_channel_merged call
			back,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
			return tp_cli_channel_interface_conference_connect_to_channel_merged (pro
			xy, callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_channel_interface_conference_connect_to_channel_merged(...)
			_tp_cli_channel_interface_conference_connect_to_channel_merged (__VA_ARGS__
			)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_interface_conference_signal_callback_channel_ removed) (TpChannel *proxy,		typedef void (*tp_cli_channel_interface_conference_signal_callback_channel_ removed) (TpChannel *proxy,
	const gchar *arg_Channel,		const gchar *arg_Channel,
	GHashTable *arg_Details,		GHashTable *arg_Details,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_channel_interface_conference_connect_to_cha nnel_removed (TpChannel *proxy,		TpProxySignalConnection *tp_cli_channel_interface_conference_connect_to_cha nnel_removed (TpChannel *proxy,
	tp_cli_channel_interface_conference_signal_callback_channel_removed cal lback,		tp_cli_channel_interface_conference_signal_callback_channel_removed cal lback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_channel_interface_conference_connect_to_channel_removed (TpChannel
			*proxy,
			tp_cli_channel_interface_conference_signal_callback_channel_removed cal
			lback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
			return tp_cli_channel_interface_conference_connect_to_channel_removed (pr
			oxy, callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_channel_interface_conference_connect_to_channel_removed(...)
			_tp_cli_channel_interface_conference_connect_to_channel_removed (__VA_ARGS
			__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_interface_dtmf_signal_callback_tones_deferred ) (TpChannel *proxy,		typedef void (*tp_cli_channel_interface_dtmf_signal_callback_tones_deferred ) (TpChannel *proxy,
	const gchar *arg_Tones,		const gchar *arg_Tones,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_channel_interface_dtmf_connect_to_tones_def erred (TpChannel *proxy,		TpProxySignalConnection *tp_cli_channel_interface_dtmf_connect_to_tones_def erred (TpChannel *proxy,
	tp_cli_channel_interface_dtmf_signal_callback_tones_deferred callback,		tp_cli_channel_interface_dtmf_signal_callback_tones_deferred callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_channel_interface_dtmf_connect_to_tones_deferred (TpChannel *proxy,
			tp_cli_channel_interface_dtmf_signal_callback_tones_deferred callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
			return tp_cli_channel_interface_dtmf_connect_to_tones_deferred (proxy, ca
			llback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_channel_interface_dtmf_connect_to_tones_deferred(...) _tp_cl
			i_channel_interface_dtmf_connect_to_tones_deferred (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_interface_dtmf_signal_callback_sending_tones) (TpChannel *proxy,		typedef void (*tp_cli_channel_interface_dtmf_signal_callback_sending_tones) (TpChannel *proxy,
	const gchar *arg_Tones,		const gchar *arg_Tones,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_channel_interface_dtmf_connect_to_sending_t ones (TpChannel *proxy,		TpProxySignalConnection *tp_cli_channel_interface_dtmf_connect_to_sending_t ones (TpChannel *proxy,
	tp_cli_channel_interface_dtmf_signal_callback_sending_tones callback,		tp_cli_channel_interface_dtmf_signal_callback_sending_tones callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_channel_interface_dtmf_connect_to_sending_tones (TpChannel *proxy,
			tp_cli_channel_interface_dtmf_signal_callback_sending_tones callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
			return tp_cli_channel_interface_dtmf_connect_to_sending_tones (proxy, cal
			lback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_channel_interface_dtmf_connect_to_sending_tones(...) _tp_cli
			_channel_interface_dtmf_connect_to_sending_tones (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_interface_dtmf_signal_callback_stopped_tones) (TpChannel *proxy,		typedef void (*tp_cli_channel_interface_dtmf_signal_callback_stopped_tones) (TpChannel *proxy,
	gboolean arg_Cancelled,		gboolean arg_Cancelled,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_channel_interface_dtmf_connect_to_stopped_t ones (TpChannel *proxy,		TpProxySignalConnection *tp_cli_channel_interface_dtmf_connect_to_stopped_t ones (TpChannel *proxy,
	tp_cli_channel_interface_dtmf_signal_callback_stopped_tones callback,		tp_cli_channel_interface_dtmf_signal_callback_stopped_tones callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_channel_interface_dtmf_connect_to_stopped_tones (TpChannel *proxy,
			tp_cli_channel_interface_dtmf_signal_callback_stopped_tones callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
			return tp_cli_channel_interface_dtmf_connect_to_stopped_tones (proxy, cal
			lback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_channel_interface_dtmf_connect_to_stopped_tones(...) _tp_cli
			_channel_interface_dtmf_connect_to_stopped_tones (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_interface_dtmf_callback_for_start_tone) (TpCh annel *proxy,		typedef void (*tp_cli_channel_interface_dtmf_callback_for_start_tone) (TpCh annel *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_interface_dtmf_call_start_tone (TpChanne l *proxy,		TpProxyPendingCall *tp_cli_channel_interface_dtmf_call_start_tone (TpChanne l *proxy,
	gint timeout_ms,		gint timeout_ms,
	guint in_Stream_ID,		guint in_Stream_ID,
	guchar in_Event,		guchar in_Event,
	tp_cli_channel_interface_dtmf_callback_for_start_tone callback,		tp_cli_channel_interface_dtmf_callback_for_start_tone callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_channel_interface_dtmf_run_start_tone (TpChannel *proxy,		static inline TpProxyPendingCall *
			_tp_cli_channel_interface_dtmf_call_start_tone (TpChannel *proxy,
	gint timeout_ms,		gint timeout_ms,
	guint in_Stream_ID,		guint in_Stream_ID,
	guchar in_Event,		guchar in_Event,
	GError **error,		tp_cli_channel_interface_dtmf_callback_for_start_tone callback,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		gpointer user_data,
	#endif /* not TP_DISABLE_DEPRECATED */		GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
			return tp_cli_channel_interface_dtmf_call_start_tone (proxy, timeout_ms,
			in_Stream_ID,
			in_Event,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_channel_interface_dtmf_call_start_tone(...) _tp_cli_channel_
			interface_dtmf_call_start_tone (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_interface_dtmf_callback_for_stop_tone) (TpCha nnel *proxy,		typedef void (*tp_cli_channel_interface_dtmf_callback_for_stop_tone) (TpCha nnel *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_interface_dtmf_call_stop_tone (TpChannel *proxy,		TpProxyPendingCall *tp_cli_channel_interface_dtmf_call_stop_tone (TpChannel *proxy,
	gint timeout_ms,		gint timeout_ms,
	guint in_Stream_ID,		guint in_Stream_ID,
	tp_cli_channel_interface_dtmf_callback_for_stop_tone callback,		tp_cli_channel_interface_dtmf_callback_for_stop_tone callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_channel_interface_dtmf_run_stop_tone (TpChannel *proxy,		static inline TpProxyPendingCall *
			_tp_cli_channel_interface_dtmf_call_stop_tone (TpChannel *proxy,
	gint timeout_ms,		gint timeout_ms,
	guint in_Stream_ID,		guint in_Stream_ID,
	GError **error,		tp_cli_channel_interface_dtmf_callback_for_stop_tone callback,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		gpointer user_data,
	#endif /* not TP_DISABLE_DEPRECATED */		GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
			return tp_cli_channel_interface_dtmf_call_stop_tone (proxy, timeout_ms,
			in_Stream_ID,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_channel_interface_dtmf_call_stop_tone(...) _tp_cli_channel_i
			nterface_dtmf_call_stop_tone (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_interface_dtmf_callback_for_multiple_tones) ( TpChannel *proxy,		typedef void (*tp_cli_channel_interface_dtmf_callback_for_multiple_tones) ( TpChannel *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_interface_dtmf_call_multiple_tones (TpCh annel *proxy,		TpProxyPendingCall *tp_cli_channel_interface_dtmf_call_multiple_tones (TpCh annel *proxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar *in_Tones,		const gchar *in_Tones,
	tp_cli_channel_interface_dtmf_callback_for_multiple_tones callback,		tp_cli_channel_interface_dtmf_callback_for_multiple_tones callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_channel_interface_dtmf_run_multiple_tones (TpChannel *proxy		static inline TpProxyPendingCall *
	,		_tp_cli_channel_interface_dtmf_call_multiple_tones (TpChannel *proxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar *in_Tones,		const gchar *in_Tones,
	GError **error,		tp_cli_channel_interface_dtmf_callback_for_multiple_tones callback,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		gpointer user_data,
	#endif /* not TP_DISABLE_DEPRECATED */		GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
			return tp_cli_channel_interface_dtmf_call_multiple_tones (proxy, timeout_
			ms,
			in_Tones,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_channel_interface_dtmf_call_multiple_tones(...) _tp_cli_chan
			nel_interface_dtmf_call_multiple_tones (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_interface_destroyable_callback_for_destroy) ( TpChannel *proxy,		typedef void (*tp_cli_channel_interface_destroyable_callback_for_destroy) ( TpChannel *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_interface_destroyable_call_destroy (TpCh annel *proxy,		TpProxyPendingCall *tp_cli_channel_interface_destroyable_call_destroy (TpCh annel *proxy,
	gint timeout_ms,		gint timeout_ms,
	tp_cli_channel_interface_destroyable_callback_for_destroy callback,		tp_cli_channel_interface_destroyable_callback_for_destroy callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_channel_interface_destroyable_run_destroy (TpChannel *proxy		static inline TpProxyPendingCall *
	,		_tp_cli_channel_interface_destroyable_call_destroy (TpChannel *proxy,
	gint timeout_ms,		gint timeout_ms,
	GError **error,		tp_cli_channel_interface_destroyable_callback_for_destroy callback,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;
	#endif /* not TP_DISABLE_DEPRECATED */
	typedef void (*tp_cli_channel_interface_group_signal_callback_handle_owners
	_changed) (TpChannel *proxy,
	GHashTable *arg_Added,
	const GArray *arg_Removed,
	gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_channel_interface_group_connect_to_handle_o
	wners_changed (TpChannel *proxy,
	tp_cli_channel_interface_group_signal_callback_handle_owners_changed ca
	llback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object)
	GError **error);		{
			g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
			return tp_cli_channel_interface_destroyable_call_destroy (proxy, timeout_
			ms,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_channel_interface_destroyable_call_destroy(...) _tp_cli_chan
			nel_interface_destroyable_call_destroy (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_interface_group_signal_callback_handle_owners _changed_detailed) (TpChannel *proxy,		typedef void (*tp_cli_channel_interface_group_signal_callback_handle_owners _changed) (TpChannel *proxy,
	GHashTable *arg_Added,		GHashTable *arg_Added,
	const GArray *arg_Removed,		const GArray *arg_Removed,
	GHashTable *arg_Identifiers,		GHashTable *arg_Identifiers,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_channel_interface_group_connect_to_handle_o		TpProxySignalConnection *tp_cli_channel_interface_group_connect_to_handle_o
	wners_changed_detailed (TpChannel *proxy,		wners_changed (TpChannel *proxy,
	tp_cli_channel_interface_group_signal_callback_handle_owners_changed_de		tp_cli_channel_interface_group_signal_callback_handle_owners_changed ca
	tailed callback,		llback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
	typedef void (*tp_cli_channel_interface_group_signal_callback_self_handle_c		#ifndef __GTK_DOC_IGNORE__
	hanged) (TpChannel *proxy,		static inline TpProxySignalConnection *
	guint arg_Self_Handle,		_tp_cli_channel_interface_group_connect_to_handle_owners_changed (TpChannel
	gpointer user_data, GObject *weak_object);		*proxy,
	TpProxySignalConnection *tp_cli_channel_interface_group_connect_to_self_han		tp_cli_channel_interface_group_signal_callback_handle_owners_changed ca
	dle_changed (TpChannel *proxy,		llback,
	tp_cli_channel_interface_group_signal_callback_self_handle_changed call
	back,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error)
			{
			g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
			return tp_cli_channel_interface_group_connect_to_handle_owners_changed (p
			roxy, callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_channel_interface_group_connect_to_handle_owners_changed(...
			) _tp_cli_channel_interface_group_connect_to_handle_owners_changed (__VA_AR
			GS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_interface_group_signal_callback_self_contact_ changed) (TpChannel *proxy,		typedef void (*tp_cli_channel_interface_group_signal_callback_self_contact_ changed) (TpChannel *proxy,
	guint arg_Self_Handle,		guint arg_Self_Handle,
	const gchar *arg_Self_ID,		const gchar *arg_Self_ID,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_channel_interface_group_connect_to_self_con tact_changed (TpChannel *proxy,		TpProxySignalConnection *tp_cli_channel_interface_group_connect_to_self_con tact_changed (TpChannel *proxy,
	tp_cli_channel_interface_group_signal_callback_self_contact_changed cal lback,		tp_cli_channel_interface_group_signal_callback_self_contact_changed cal lback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_channel_interface_group_connect_to_self_contact_changed (TpChannel
			*proxy,
			tp_cli_channel_interface_group_signal_callback_self_contact_changed cal
			lback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
			return tp_cli_channel_interface_group_connect_to_self_contact_changed (pr
			oxy, callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_channel_interface_group_connect_to_self_contact_changed(...)
			_tp_cli_channel_interface_group_connect_to_self_contact_changed (__VA_ARGS
			__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_interface_group_signal_callback_group_flags_c hanged) (TpChannel *proxy,		typedef void (*tp_cli_channel_interface_group_signal_callback_group_flags_c hanged) (TpChannel *proxy,
	guint arg_Added,		guint arg_Added,
	guint arg_Removed,		guint arg_Removed,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_channel_interface_group_connect_to_group_fl ags_changed (TpChannel *proxy,		TpProxySignalConnection *tp_cli_channel_interface_group_connect_to_group_fl ags_changed (TpChannel *proxy,
	tp_cli_channel_interface_group_signal_callback_group_flags_changed call back,		tp_cli_channel_interface_group_signal_callback_group_flags_changed call back,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_channel_interface_group_connect_to_group_flags_changed (TpChannel *
			proxy,
			tp_cli_channel_interface_group_signal_callback_group_flags_changed call
			back,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
			return tp_cli_channel_interface_group_connect_to_group_flags_changed (pro
			xy, callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_channel_interface_group_connect_to_group_flags_changed(...)
			_tp_cli_channel_interface_group_connect_to_group_flags_changed (__VA_ARGS__
			)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_interface_group_signal_callback_members_chang ed) (TpChannel *proxy,		typedef void (*tp_cli_channel_interface_group_signal_callback_members_chang ed) (TpChannel *proxy,
	const gchar *arg_Message,
	const GArray *arg_Added,		const GArray *arg_Added,
	const GArray *arg_Removed,		const GArray *arg_Removed,
	const GArray *arg_Local_Pending,		const GArray *arg_Local_Pending,
	const GArray *arg_Remote_Pending,		const GArray *arg_Remote_Pending,
	guint arg_Actor,		GHashTable *arg_Details,
	guint arg_Reason,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_channel_interface_group_connect_to_members_ changed (TpChannel *proxy,		TpProxySignalConnection *tp_cli_channel_interface_group_connect_to_members_ changed (TpChannel *proxy,
	tp_cli_channel_interface_group_signal_callback_members_changed callback ,		tp_cli_channel_interface_group_signal_callback_members_changed callback ,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
	typedef void (*tp_cli_channel_interface_group_signal_callback_members_chang		#ifndef __GTK_DOC_IGNORE__
	ed_detailed) (TpChannel *proxy,		static inline TpProxySignalConnection *
	const GArray *arg_Added,		_tp_cli_channel_interface_group_connect_to_members_changed (TpChannel *prox
	const GArray *arg_Removed,		y,
	const GArray *arg_Local_Pending,		tp_cli_channel_interface_group_signal_callback_members_changed callback
	const GArray *arg_Remote_Pending,		,
	GHashTable *arg_Details,
	gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_channel_interface_group_connect_to_members_
	changed_detailed (TpChannel *proxy,
	tp_cli_channel_interface_group_signal_callback_members_changed_detailed
	callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error)
			{
			g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
			return tp_cli_channel_interface_group_connect_to_members_changed (proxy,
			callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_channel_interface_group_connect_to_members_changed(...) _tp_
			cli_channel_interface_group_connect_to_members_changed (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_interface_group_callback_for_add_members) (Tp Channel *proxy,		typedef void (*tp_cli_channel_interface_group_callback_for_add_members) (Tp Channel *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_interface_group_call_add_members (TpChan nel *proxy,		TpProxyPendingCall *tp_cli_channel_interface_group_call_add_members (TpChan nel *proxy,
	gint timeout_ms,		gint timeout_ms,
	const GArray *in_Contacts,		const GArray *in_Contacts,
	const gchar *in_Message,		const gchar *in_Message,
	tp_cli_channel_interface_group_callback_for_add_members callback,		tp_cli_channel_interface_group_callback_for_add_members callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_channel_interface_group_run_add_members (TpChannel *proxy,		static inline TpProxyPendingCall *
			_tp_cli_channel_interface_group_call_add_members (TpChannel *proxy,
	gint timeout_ms,		gint timeout_ms,
	const GArray *in_Contacts,		const GArray *in_Contacts,
	const gchar *in_Message,		const gchar *in_Message,
	GError **error,		tp_cli_channel_interface_group_callback_for_add_members callback,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;
	#endif /* not TP_DISABLE_DEPRECATED */
	typedef void (*tp_cli_channel_interface_group_callback_for_get_all_members)
	(TpChannel *proxy,
	const GArray *out_Members,
	const GArray *out_Local_Pending,
	const GArray *out_Remote_Pending,
	const GError *error, gpointer user_data,
	GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_interface_group_call_get_all_members (Tp
	Channel *proxy,
	gint timeout_ms,
	tp_cli_channel_interface_group_callback_for_get_all_members callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object)
			{
	#ifndef TP_DISABLE_DEPRECATED		g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
	gboolean tp_cli_channel_interface_group_run_get_all_members (TpChannel *pro		return tp_cli_channel_interface_group_call_add_members (proxy, timeout_ms
	xy,		,
	gint timeout_ms,		in_Contacts,
	GArray **out_Members,		in_Message,
	GArray **out_Local_Pending,		callback, user_data, destroy, weak_object);
	GArray **out_Remote_Pending,		}
	GError **error,		#define tp_cli_channel_interface_group_call_add_members(...) _tp_cli_channe
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		l_interface_group_call_add_members (__VA_ARGS__)
	#endif /* not TP_DISABLE_DEPRECATED */		#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_interface_group_callback_for_get_group_flags)		typedef void (*tp_cli_channel_interface_group_callback_for_remove_members)
	(TpChannel *proxy,		(TpChannel *proxy,
	guint out_Group_Flags,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_interface_group_call_get_group_flags (Tp Channel *proxy,		TpProxyPendingCall *tp_cli_channel_interface_group_call_remove_members (TpC hannel *proxy,
	gint timeout_ms,		gint timeout_ms,
	tp_cli_channel_interface_group_callback_for_get_group_flags callback,		const GArray *in_Contacts,
			const gchar *in_Message,
			guint in_Reason,
			tp_cli_channel_interface_group_callback_for_remove_members callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_channel_interface_group_run_get_group_flags (TpChannel *pro		static inline TpProxyPendingCall *
	xy,		_tp_cli_channel_interface_group_call_remove_members (TpChannel *proxy,
	gint timeout_ms,
	guint *out_Group_Flags,
	GError **error,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;
	#endif /* not TP_DISABLE_DEPRECATED */
	typedef void (*tp_cli_channel_interface_group_callback_for_get_handle_owner
	s) (TpChannel *proxy,
	const GArray *out_Owners,
	const GError *error, gpointer user_data,
	GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_interface_group_call_get_handle_owners (
	TpChannel *proxy,
	gint timeout_ms,		gint timeout_ms,
	const GArray *in_Handles,		const GArray *in_Contacts,
	tp_cli_channel_interface_group_callback_for_get_handle_owners callback,		const gchar *in_Message,
			guint in_Reason,
			tp_cli_channel_interface_group_callback_for_remove_members callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
			return tp_cli_channel_interface_group_call_remove_members (proxy, timeout
			_ms,
			in_Contacts,
			in_Message,
			in_Reason,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_channel_interface_group_call_remove_members(...) _tp_cli_cha
			nnel_interface_group_call_remove_members (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	#ifndef TP_DISABLE_DEPRECATED		typedef void (*tp_cli_channel_interface_hold_signal_callback_hold_state_cha
	gboolean tp_cli_channel_interface_group_run_get_handle_owners (TpChannel *p		nged) (TpChannel *proxy,
	roxy,		guint arg_HoldState,
	gint timeout_ms,		guint arg_Reason,
	const GArray *in_Handles,		gpointer user_data, GObject *weak_object);
	GArray **out_Owners,		TpProxySignalConnection *tp_cli_channel_interface_hold_connect_to_hold_stat
	GError **error,		e_changed (TpChannel *proxy,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		tp_cli_channel_interface_hold_signal_callback_hold_state_changed callba
	#endif /* not TP_DISABLE_DEPRECATED */		ck,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error);
	typedef void (*tp_cli_channel_interface_group_callback_for_get_local_pendin		#ifndef __GTK_DOC_IGNORE__
	g_members) (TpChannel *proxy,		static inline TpProxySignalConnection *
	const GArray *out_Handles,		_tp_cli_channel_interface_hold_connect_to_hold_state_changed (TpChannel *pr
			oxy,
			tp_cli_channel_interface_hold_signal_callback_hold_state_changed callba
			ck,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
			return tp_cli_channel_interface_hold_connect_to_hold_state_changed (proxy
			, callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_channel_interface_hold_connect_to_hold_state_changed(...) _t
			p_cli_channel_interface_hold_connect_to_hold_state_changed (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
			typedef void (*tp_cli_channel_interface_hold_callback_for_get_hold_state) (
			TpChannel *proxy,
			guint out_HoldState,
			guint out_Reason,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_interface_group_call_get_local_pending_m embers (TpChannel *proxy,		TpProxyPendingCall *tp_cli_channel_interface_hold_call_get_hold_state (TpCh annel *proxy,
	gint timeout_ms,		gint timeout_ms,
	tp_cli_channel_interface_group_callback_for_get_local_pending_members c allback,		tp_cli_channel_interface_hold_callback_for_get_hold_state callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_channel_interface_group_run_get_local_pending_members (TpCh		static inline TpProxyPendingCall *
	annel *proxy,		_tp_cli_channel_interface_hold_call_get_hold_state (TpChannel *proxy,
	gint timeout_ms,		gint timeout_ms,
	GArray **out_Handles,		tp_cli_channel_interface_hold_callback_for_get_hold_state callback,
	GError **error,		gpointer user_data,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		GDestroyNotify destroy,
	#endif /* not TP_DISABLE_DEPRECATED */		GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
			return tp_cli_channel_interface_hold_call_get_hold_state (proxy, timeout_
			ms,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_channel_interface_hold_call_get_hold_state(...) _tp_cli_chan
			nel_interface_hold_call_get_hold_state (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_interface_group_callback_for_get_local_pendin		typedef void (*tp_cli_channel_interface_hold_callback_for_request_hold) (Tp
	g_members_with_info) (TpChannel *proxy,		Channel *proxy,
	const GPtrArray *out_Info,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_interface_group_call_get_local_pending_m embers_with_info (TpChannel *proxy,		TpProxyPendingCall *tp_cli_channel_interface_hold_call_request_hold (TpChan nel *proxy,
	gint timeout_ms,		gint timeout_ms,
	tp_cli_channel_interface_group_callback_for_get_local_pending_members_w		gboolean in_Hold,
	ith_info callback,		tp_cli_channel_interface_hold_callback_for_request_hold callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_channel_interface_group_run_get_local_pending_members_with_		static inline TpProxyPendingCall *
	info (TpChannel *proxy,		_tp_cli_channel_interface_hold_call_request_hold (TpChannel *proxy,
	gint timeout_ms,
	GPtrArray **out_Info,
	GError **error,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;
	#endif /* not TP_DISABLE_DEPRECATED */
	typedef void (*tp_cli_channel_interface_group_callback_for_get_members) (Tp
	Channel *proxy,
	const GArray *out_Handles,
	const GError *error, gpointer user_data,
	GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_interface_group_call_get_members (TpChan
	nel *proxy,
	gint timeout_ms,		gint timeout_ms,
	tp_cli_channel_interface_group_callback_for_get_members callback,		gboolean in_Hold,
			tp_cli_channel_interface_hold_callback_for_request_hold callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
			return tp_cli_channel_interface_hold_call_request_hold (proxy, timeout_ms
			,
			in_Hold,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_channel_interface_hold_call_request_hold(...) _tp_cli_channe
			l_interface_hold_call_request_hold (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	#ifndef TP_DISABLE_DEPRECATED		typedef void (*tp_cli_channel_interface_password_signal_callback_password_f
	gboolean tp_cli_channel_interface_group_run_get_members (TpChannel *proxy,		lags_changed) (TpChannel *proxy,
	gint timeout_ms,		guint arg_Added,
	GArray **out_Handles,		guint arg_Removed,
	GError **error,		gpointer user_data, GObject *weak_object);
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		TpProxySignalConnection *tp_cli_channel_interface_password_connect_to_passw
	#endif /* not TP_DISABLE_DEPRECATED */		ord_flags_changed (TpChannel *proxy,
			tp_cli_channel_interface_password_signal_callback_password_flags_change
			d callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error);
	typedef void (*tp_cli_channel_interface_group_callback_for_get_remote_pendi		#ifndef __GTK_DOC_IGNORE__
	ng_members) (TpChannel *proxy,		static inline TpProxySignalConnection *
	const GArray *out_Handles,		_tp_cli_channel_interface_password_connect_to_password_flags_changed (TpCha
			nnel *proxy,
			tp_cli_channel_interface_password_signal_callback_password_flags_change
			d callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
			return tp_cli_channel_interface_password_connect_to_password_flags_change
			d (proxy, callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_channel_interface_password_connect_to_password_flags_changed
			(...) _tp_cli_channel_interface_password_connect_to_password_flags_changed
			(__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
			typedef void (*tp_cli_channel_interface_password_callback_for_get_password_
			flags) (TpChannel *proxy,
			guint out_Password_Flags,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_interface_group_call_get_remote_pending_ members (TpChannel *proxy,		TpProxyPendingCall *tp_cli_channel_interface_password_call_get_password_fla gs (TpChannel *proxy,
	gint timeout_ms,		gint timeout_ms,
	tp_cli_channel_interface_group_callback_for_get_remote_pending_members callback,		tp_cli_channel_interface_password_callback_for_get_password_flags callb ack,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_channel_interface_group_run_get_remote_pending_members (TpC		static inline TpProxyPendingCall *
	hannel *proxy,		_tp_cli_channel_interface_password_call_get_password_flags (TpChannel *prox
			y,
	gint timeout_ms,		gint timeout_ms,
	GArray **out_Handles,		tp_cli_channel_interface_password_callback_for_get_password_flags callb
	GError **error,		ack,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		gpointer user_data,
	#endif /* not TP_DISABLE_DEPRECATED */		GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
			return tp_cli_channel_interface_password_call_get_password_flags (proxy,
			timeout_ms,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_channel_interface_password_call_get_password_flags(...) _tp_
			cli_channel_interface_password_call_get_password_flags (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_interface_group_callback_for_get_self_handle)		typedef void (*tp_cli_channel_interface_password_callback_for_provide_passw
	(TpChannel *proxy,		ord) (TpChannel *proxy,
	guint out_Self_Handle,		gboolean out_Correct,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_interface_group_call_get_self_handle (Tp Channel *proxy,		TpProxyPendingCall *tp_cli_channel_interface_password_call_provide_password (TpChannel *proxy,
	gint timeout_ms,		gint timeout_ms,
	tp_cli_channel_interface_group_callback_for_get_self_handle callback,		const gchar *in_Password,
			tp_cli_channel_interface_password_callback_for_provide_password callbac
			k,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_channel_interface_group_run_get_self_handle (TpChannel *pro		static inline TpProxyPendingCall *
	xy,		_tp_cli_channel_interface_password_call_provide_password (TpChannel *proxy,
	gint timeout_ms,		gint timeout_ms,
	guint *out_Self_Handle,		const gchar *in_Password,
	GError **error,		tp_cli_channel_interface_password_callback_for_provide_password callbac
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		k,
	#endif /* not TP_DISABLE_DEPRECATED */		gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
			return tp_cli_channel_interface_password_call_provide_password (proxy, ti
			meout_ms,
			in_Password,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_channel_interface_password_call_provide_password(...) _tp_cl
			i_channel_interface_password_call_provide_password (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_interface_group_callback_for_remove_members) (TpChannel *proxy,		typedef void (*tp_cli_channel_interface_room_config_callback_for_update_con figuration) (TpChannel *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_interface_group_call_remove_members (TpC hannel *proxy,		TpProxyPendingCall *tp_cli_channel_interface_room_config_call_update_config uration (TpChannel *proxy,
	gint timeout_ms,		gint timeout_ms,
	const GArray *in_Contacts,		GHashTable *in_Properties,
	const gchar *in_Message,		tp_cli_channel_interface_room_config_callback_for_update_configuration
	tp_cli_channel_interface_group_callback_for_remove_members callback,		callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_channel_interface_group_run_remove_members (TpChannel *prox		static inline TpProxyPendingCall *
	y,		_tp_cli_channel_interface_room_config_call_update_configuration (TpChannel
			*proxy,
	gint timeout_ms,		gint timeout_ms,
	const GArray *in_Contacts,		GHashTable *in_Properties,
	const gchar *in_Message,		tp_cli_channel_interface_room_config_callback_for_update_configuration
	GError **error,		callback,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		gpointer user_data,
	#endif /* not TP_DISABLE_DEPRECATED */		GDestroyNotify destroy,
			GObject *weak_object)
	typedef void (*tp_cli_channel_interface_group_callback_for_remove_members_w		{
	ith_reason) (TpChannel *proxy,		g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
	const GError *error, gpointer user_data,		return tp_cli_channel_interface_room_config_call_update_configuration (pr
	GObject *weak_object);		oxy, timeout_ms,
			in_Properties,
	TpProxyPendingCall *tp_cli_channel_interface_group_call_remove_members_with		callback, user_data, destroy, weak_object);
	_reason (TpChannel *proxy,		}
	gint timeout_ms,		#define tp_cli_channel_interface_room_config_call_update_configuration(...)
	const GArray *in_Contacts,		_tp_cli_channel_interface_room_config_call_update_configuration (__VA_ARGS
	const gchar *in_Message,		__)
	guint in_Reason,		#endif /* __GTK_DOC_IGNORE__ */
	tp_cli_channel_interface_group_callback_for_remove_members_with_reason
	callback,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED
	gboolean tp_cli_channel_interface_group_run_remove_members_with_reason (TpC
	hannel *proxy,
	gint timeout_ms,
	const GArray *in_Contacts,
	const gchar *in_Message,
	guint in_Reason,
	GError **error,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;
	#endif /* not TP_DISABLE_DEPRECATED */
	typedef void (*tp_cli_channel_interface_hold_signal_callback_hold_state_cha
	nged) (TpChannel *proxy,
	guint arg_HoldState,
	guint arg_Reason,
	gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_channel_interface_hold_connect_to_hold_stat
	e_changed (TpChannel *proxy,
	tp_cli_channel_interface_hold_signal_callback_hold_state_changed callba
	ck,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object,
	GError **error);
	typedef void (*tp_cli_channel_interface_hold_callback_for_get_hold_state) (
	TpChannel *proxy,
	guint out_HoldState,
	guint out_Reason,
	const GError *error, gpointer user_data,
	GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_interface_hold_call_get_hold_state (TpCh
	annel *proxy,
	gint timeout_ms,
	tp_cli_channel_interface_hold_callback_for_get_hold_state callback,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED
	gboolean tp_cli_channel_interface_hold_run_get_hold_state (TpChannel *proxy
	,
	gint timeout_ms,
	guint *out_HoldState,
	guint *out_Reason,
	GError **error,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;
	#endif /* not TP_DISABLE_DEPRECATED */
	typedef void (*tp_cli_channel_interface_hold_callback_for_request_hold) (Tp
	Channel *proxy,
	const GError *error, gpointer user_data,
	GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_interface_hold_call_request_hold (TpChan
	nel *proxy,
	gint timeout_ms,
	gboolean in_Hold,
	tp_cli_channel_interface_hold_callback_for_request_hold callback,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED
	gboolean tp_cli_channel_interface_hold_run_request_hold (TpChannel *proxy,
	gint timeout_ms,
	gboolean in_Hold,
	GError **error,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;
	#endif /* not TP_DISABLE_DEPRECATED */
	typedef void (*tp_cli_channel_interface_media_signalling_signal_callback_ne
	w_session_handler) (TpChannel *proxy,
	const gchar *arg_Session_Handler,
	const gchar *arg_Session_Type,
	gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_channel_interface_media_signalling_connect_
	to_new_session_handler (TpChannel *proxy,
	tp_cli_channel_interface_media_signalling_signal_callback_new_session_h
	andler callback,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object,
	GError **error);
	typedef void (*tp_cli_channel_interface_media_signalling_callback_for_get_s
	ession_handlers) (TpChannel *proxy,
	const GPtrArray *out_Session_Handlers,
	const GError *error, gpointer user_data,
	GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_interface_media_signalling_call_get_sess
	ion_handlers (TpChannel *proxy,
	gint timeout_ms,
	tp_cli_channel_interface_media_signalling_callback_for_get_session_hand
	lers callback,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED
	gboolean tp_cli_channel_interface_media_signalling_run_get_session_handlers
	(TpChannel *proxy,
	gint timeout_ms,
	GPtrArray **out_Session_Handlers,
	GError **error,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;
	#endif /* not TP_DISABLE_DEPRECATED */
	typedef void (*tp_cli_channel_interface_messages_signal_callback_message_se
	nt) (TpChannel *proxy,
	const GPtrArray *arg_Content,
	guint arg_Flags,
	const gchar *arg_Message_Token,
	gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_channel_interface_messages_connect_to_messa
	ge_sent (TpChannel *proxy,
	tp_cli_channel_interface_messages_signal_callback_message_sent callback
	,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object,
	GError **error);
	typedef void (*tp_cli_channel_interface_messages_signal_callback_pending_me
	ssages_removed) (TpChannel *proxy,
	const GArray *arg_Message_IDs,
	gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_channel_interface_messages_connect_to_pendi
	ng_messages_removed (TpChannel *proxy,
	tp_cli_channel_interface_messages_signal_callback_pending_messages_remo
	ved callback,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object,
	GError **error);
	typedef void (*tp_cli_channel_interface_messages_signal_callback_message_re
	ceived) (TpChannel *proxy,
	const GPtrArray *arg_Message,
	gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_channel_interface_messages_connect_to_messa
	ge_received (TpChannel *proxy,
	tp_cli_channel_interface_messages_signal_callback_message_received call
	back,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object,
	GError **error);
	typedef void (*tp_cli_channel_interface_messages_callback_for_send_message)
	(TpChannel *proxy,
	const gchar *out_Token,
	const GError *error, gpointer user_data,
	GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_interface_messages_call_send_message (Tp
	Channel *proxy,
	gint timeout_ms,
	const GPtrArray *in_Message,
	guint in_Flags,
	tp_cli_channel_interface_messages_callback_for_send_message callback,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED
	gboolean tp_cli_channel_interface_messages_run_send_message (TpChannel *pro
	xy,
	gint timeout_ms,
	const GPtrArray *in_Message,
	guint in_Flags,
	gchar **out_Token,
	GError **error,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;
	#endif /* not TP_DISABLE_DEPRECATED */
	typedef void (*tp_cli_channel_interface_messages_callback_for_get_pending_m
	essage_content) (TpChannel *proxy,
	GHashTable *out_Content,
	const GError *error, gpointer user_data,
	GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_interface_messages_call_get_pending_mess
	age_content (TpChannel *proxy,
	gint timeout_ms,
	guint in_Message_ID,
	const GArray *in_Parts,
	tp_cli_channel_interface_messages_callback_for_get_pending_message_cont
	ent callback,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED
	gboolean tp_cli_channel_interface_messages_run_get_pending_message_content
	(TpChannel *proxy,
	gint timeout_ms,
	guint in_Message_ID,
	const GArray *in_Parts,
	GHashTable **out_Content,
	GError **error,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;
	#endif /* not TP_DISABLE_DEPRECATED */
	typedef void (*tp_cli_channel_interface_password_signal_callback_password_f
	lags_changed) (TpChannel *proxy,
	guint arg_Added,
	guint arg_Removed,
	gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_channel_interface_password_connect_to_passw
	ord_flags_changed (TpChannel *proxy,
	tp_cli_channel_interface_password_signal_callback_password_flags_change
	d callback,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object,
	GError **error);
	typedef void (*tp_cli_channel_interface_password_callback_for_get_password_
	flags) (TpChannel *proxy,
	guint out_Password_Flags,
	const GError *error, gpointer user_data,
	GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_interface_password_call_get_password_fla
	gs (TpChannel *proxy,
	gint timeout_ms,
	tp_cli_channel_interface_password_callback_for_get_password_flags callb
	ack,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED
	gboolean tp_cli_channel_interface_password_run_get_password_flags (TpChanne
	l *proxy,
	gint timeout_ms,
	guint *out_Password_Flags,
	GError **error,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;
	#endif /* not TP_DISABLE_DEPRECATED */
	typedef void (*tp_cli_channel_interface_password_callback_for_provide_passw
	ord) (TpChannel *proxy,
	gboolean out_Correct,
	const GError *error, gpointer user_data,
	GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_interface_password_call_provide_password
	(TpChannel *proxy,
	gint timeout_ms,
	const gchar *in_Password,
	tp_cli_channel_interface_password_callback_for_provide_password callbac
	k,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED
	gboolean tp_cli_channel_interface_password_run_provide_password (TpChannel
	*proxy,
	gint timeout_ms,
	const gchar *in_Password,
	gboolean *out_Correct,
	GError **error,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;
	#endif /* not TP_DISABLE_DEPRECATED */
	typedef void (*tp_cli_channel_interface_room_config_callback_for_update_con
	figuration) (TpChannel *proxy,
	const GError *error, gpointer user_data,
	GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_interface_room_config_call_update_config
	uration (TpChannel *proxy,
	gint timeout_ms,
	GHashTable *in_Properties,
	tp_cli_channel_interface_room_config_callback_for_update_configuration
	callback,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object);
	typedef void (*tp_cli_channel_interface_sasl_authentication_signal_callback _sasl_status_changed) (TpChannel *proxy,		typedef void (*tp_cli_channel_interface_sasl_authentication_signal_callback _sasl_status_changed) (TpChannel *proxy,
	guint arg_Status,		guint arg_Status,
	const gchar *arg_Reason,		const gchar *arg_Reason,
	GHashTable *arg_Details,		GHashTable *arg_Details,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_channel_interface_sasl_authentication_conne ct_to_sasl_status_changed (TpChannel *proxy,		TpProxySignalConnection *tp_cli_channel_interface_sasl_authentication_conne ct_to_sasl_status_changed (TpChannel *proxy,
	tp_cli_channel_interface_sasl_authentication_signal_callback_sasl_statu s_changed callback,		tp_cli_channel_interface_sasl_authentication_signal_callback_sasl_statu s_changed callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_channel_interface_sasl_authentication_connect_to_sasl_status_change
			d (TpChannel *proxy,
			tp_cli_channel_interface_sasl_authentication_signal_callback_sasl_statu
			s_changed callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
			return tp_cli_channel_interface_sasl_authentication_connect_to_sasl_statu
			s_changed (proxy, callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_channel_interface_sasl_authentication_connect_to_sasl_status
			_changed(...) _tp_cli_channel_interface_sasl_authentication_connect_to_sasl
			_status_changed (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_interface_sasl_authentication_signal_callback _new_challenge) (TpChannel *proxy,		typedef void (*tp_cli_channel_interface_sasl_authentication_signal_callback _new_challenge) (TpChannel *proxy,
	const GArray *arg_Challenge_Data,		const GArray *arg_Challenge_Data,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_channel_interface_sasl_authentication_conne ct_to_new_challenge (TpChannel *proxy,		TpProxySignalConnection *tp_cli_channel_interface_sasl_authentication_conne ct_to_new_challenge (TpChannel *proxy,
	tp_cli_channel_interface_sasl_authentication_signal_callback_new_challe nge callback,		tp_cli_channel_interface_sasl_authentication_signal_callback_new_challe nge callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_channel_interface_sasl_authentication_connect_to_new_challenge (TpC
			hannel *proxy,
			tp_cli_channel_interface_sasl_authentication_signal_callback_new_challe
			nge callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
			return tp_cli_channel_interface_sasl_authentication_connect_to_new_challe
			nge (proxy, callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_channel_interface_sasl_authentication_connect_to_new_challen
			ge(...) _tp_cli_channel_interface_sasl_authentication_connect_to_new_challe
			nge (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_interface_sasl_authentication_callback_for_st art_mechanism) (TpChannel *proxy,		typedef void (*tp_cli_channel_interface_sasl_authentication_callback_for_st art_mechanism) (TpChannel *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_interface_sasl_authentication_call_start _mechanism (TpChannel *proxy,		TpProxyPendingCall *tp_cli_channel_interface_sasl_authentication_call_start _mechanism (TpChannel *proxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar *in_Mechanism,		const gchar *in_Mechanism,
	tp_cli_channel_interface_sasl_authentication_callback_for_start_mechani sm callback,		tp_cli_channel_interface_sasl_authentication_callback_for_start_mechani sm callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_channel_interface_sasl_authentication_run_start_mechanism (		static inline TpProxyPendingCall *
	TpChannel *proxy,		_tp_cli_channel_interface_sasl_authentication_call_start_mechanism (TpChann
			el *proxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar *in_Mechanism,		const gchar *in_Mechanism,
	GError **error,		tp_cli_channel_interface_sasl_authentication_callback_for_start_mechani
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		sm callback,
	#endif /* not TP_DISABLE_DEPRECATED */		gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
			return tp_cli_channel_interface_sasl_authentication_call_start_mechanism
			(proxy, timeout_ms,
			in_Mechanism,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_channel_interface_sasl_authentication_call_start_mechanism(.
			..) _tp_cli_channel_interface_sasl_authentication_call_start_mechanism (__V
			A_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_interface_sasl_authentication_callback_for_st art_mechanism_with_data) (TpChannel *proxy,		typedef void (*tp_cli_channel_interface_sasl_authentication_callback_for_st art_mechanism_with_data) (TpChannel *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_interface_sasl_authentication_call_start _mechanism_with_data (TpChannel *proxy,		TpProxyPendingCall *tp_cli_channel_interface_sasl_authentication_call_start _mechanism_with_data (TpChannel *proxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar *in_Mechanism,		const gchar *in_Mechanism,
	const GArray *in_Initial_Data,		const GArray *in_Initial_Data,
	tp_cli_channel_interface_sasl_authentication_callback_for_start_mechani sm_with_data callback,		tp_cli_channel_interface_sasl_authentication_callback_for_start_mechani sm_with_data callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_channel_interface_sasl_authentication_run_start_mechanism_w		static inline TpProxyPendingCall *
	ith_data (TpChannel *proxy,		_tp_cli_channel_interface_sasl_authentication_call_start_mechanism_with_dat
			a (TpChannel *proxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar *in_Mechanism,		const gchar *in_Mechanism,
	const GArray *in_Initial_Data,		const GArray *in_Initial_Data,
	GError **error,		tp_cli_channel_interface_sasl_authentication_callback_for_start_mechani
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		sm_with_data callback,
	#endif /* not TP_DISABLE_DEPRECATED */		gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
			return tp_cli_channel_interface_sasl_authentication_call_start_mechanism_
			with_data (proxy, timeout_ms,
			in_Mechanism,
			in_Initial_Data,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_channel_interface_sasl_authentication_call_start_mechanism_w
			ith_data(...) _tp_cli_channel_interface_sasl_authentication_call_start_mech
			anism_with_data (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_interface_sasl_authentication_callback_for_re spond) (TpChannel *proxy,		typedef void (*tp_cli_channel_interface_sasl_authentication_callback_for_re spond) (TpChannel *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_interface_sasl_authentication_call_respo nd (TpChannel *proxy,		TpProxyPendingCall *tp_cli_channel_interface_sasl_authentication_call_respo nd (TpChannel *proxy,
	gint timeout_ms,		gint timeout_ms,
	const GArray *in_Response_Data,		const GArray *in_Response_Data,
	tp_cli_channel_interface_sasl_authentication_callback_for_respond callb ack,		tp_cli_channel_interface_sasl_authentication_callback_for_respond callb ack,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_channel_interface_sasl_authentication_run_respond (TpChanne		static inline TpProxyPendingCall *
	l *proxy,		_tp_cli_channel_interface_sasl_authentication_call_respond (TpChannel *prox
			y,
	gint timeout_ms,		gint timeout_ms,
	const GArray *in_Response_Data,		const GArray *in_Response_Data,
	GError **error,		tp_cli_channel_interface_sasl_authentication_callback_for_respond callb
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		ack,
	#endif /* not TP_DISABLE_DEPRECATED */		gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
			return tp_cli_channel_interface_sasl_authentication_call_respond (proxy,
			timeout_ms,
			in_Response_Data,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_channel_interface_sasl_authentication_call_respond(...) _tp_
			cli_channel_interface_sasl_authentication_call_respond (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_interface_sasl_authentication_callback_for_ac cept_sasl) (TpChannel *proxy,		typedef void (*tp_cli_channel_interface_sasl_authentication_callback_for_ac cept_sasl) (TpChannel *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_interface_sasl_authentication_call_accep t_sasl (TpChannel *proxy,		TpProxyPendingCall *tp_cli_channel_interface_sasl_authentication_call_accep t_sasl (TpChannel *proxy,
	gint timeout_ms,		gint timeout_ms,
	tp_cli_channel_interface_sasl_authentication_callback_for_accept_sasl c allback,		tp_cli_channel_interface_sasl_authentication_callback_for_accept_sasl c allback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_channel_interface_sasl_authentication_run_accept_sasl (TpCh		static inline TpProxyPendingCall *
	annel *proxy,		_tp_cli_channel_interface_sasl_authentication_call_accept_sasl (TpChannel *
			proxy,
	gint timeout_ms,		gint timeout_ms,
	GError **error,		tp_cli_channel_interface_sasl_authentication_callback_for_accept_sasl c
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		allback,
	#endif /* not TP_DISABLE_DEPRECATED */		gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
			return tp_cli_channel_interface_sasl_authentication_call_accept_sasl (pro
			xy, timeout_ms,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_channel_interface_sasl_authentication_call_accept_sasl(...)
			_tp_cli_channel_interface_sasl_authentication_call_accept_sasl (__VA_ARGS__
			)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_interface_sasl_authentication_callback_for_ab ort_sasl) (TpChannel *proxy,		typedef void (*tp_cli_channel_interface_sasl_authentication_callback_for_ab ort_sasl) (TpChannel *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_interface_sasl_authentication_call_abort _sasl (TpChannel *proxy,		TpProxyPendingCall *tp_cli_channel_interface_sasl_authentication_call_abort _sasl (TpChannel *proxy,
	gint timeout_ms,		gint timeout_ms,
	guint in_Reason,		guint in_Reason,
	const gchar *in_Debug_Message,		const gchar *in_Debug_Message,
	tp_cli_channel_interface_sasl_authentication_callback_for_abort_sasl ca llback,		tp_cli_channel_interface_sasl_authentication_callback_for_abort_sasl ca llback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_channel_interface_sasl_authentication_run_abort_sasl (TpCha		static inline TpProxyPendingCall *
	nnel *proxy,		_tp_cli_channel_interface_sasl_authentication_call_abort_sasl (TpChannel *p
			roxy,
	gint timeout_ms,		gint timeout_ms,
	guint in_Reason,		guint in_Reason,
	const gchar *in_Debug_Message,		const gchar *in_Debug_Message,
	GError **error,		tp_cli_channel_interface_sasl_authentication_callback_for_abort_sasl ca
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		llback,
	#endif /* not TP_DISABLE_DEPRECATED */		gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
			return tp_cli_channel_interface_sasl_authentication_call_abort_sasl (prox
			y, timeout_ms,
			in_Reason,
			in_Debug_Message,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_channel_interface_sasl_authentication_call_abort_sasl(...) _
			tp_cli_channel_interface_sasl_authentication_call_abort_sasl (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_interface_sms_signal_callback_sms_channel_cha nged) (TpChannel *proxy,		typedef void (*tp_cli_channel_interface_sms_signal_callback_sms_channel_cha nged) (TpChannel *proxy,
	gboolean arg_SMSChannel,		gboolean arg_SMSChannel,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_channel_interface_sms_connect_to_sms_channe l_changed (TpChannel *proxy,		TpProxySignalConnection *tp_cli_channel_interface_sms_connect_to_sms_channe l_changed (TpChannel *proxy,
	tp_cli_channel_interface_sms_signal_callback_sms_channel_changed callba ck,		tp_cli_channel_interface_sms_signal_callback_sms_channel_changed callba ck,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_channel_interface_sms_connect_to_sms_channel_changed (TpChannel *pr
			oxy,
			tp_cli_channel_interface_sms_signal_callback_sms_channel_changed callba
			ck,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
			return tp_cli_channel_interface_sms_connect_to_sms_channel_changed (proxy
			, callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_channel_interface_sms_connect_to_sms_channel_changed(...) _t
			p_cli_channel_interface_sms_connect_to_sms_channel_changed (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_interface_sms_callback_for_get_sms_length) (T pChannel *proxy,		typedef void (*tp_cli_channel_interface_sms_callback_for_get_sms_length) (T pChannel *proxy,
	guint out_Chunks_Required,		guint out_Chunks_Required,
	gint out_Remaining_Characters,		gint out_Remaining_Characters,
	gint out_Estimated_Cost,		gint out_Estimated_Cost,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_interface_sms_call_get_sms_length (TpCha nnel *proxy,		TpProxyPendingCall *tp_cli_channel_interface_sms_call_get_sms_length (TpCha nnel *proxy,
	gint timeout_ms,		gint timeout_ms,
	const GPtrArray *in_Message,		const GPtrArray *in_Message,
	tp_cli_channel_interface_sms_callback_for_get_sms_length callback,		tp_cli_channel_interface_sms_callback_for_get_sms_length callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_channel_interface_sms_run_get_sms_length (TpChannel *proxy,		static inline TpProxyPendingCall *
			_tp_cli_channel_interface_sms_call_get_sms_length (TpChannel *proxy,
	gint timeout_ms,		gint timeout_ms,
	const GPtrArray *in_Message,		const GPtrArray *in_Message,
	guint *out_Chunks_Required,		tp_cli_channel_interface_sms_callback_for_get_sms_length callback,
	gint *out_Remaining_Characters,		gpointer user_data,
	gint *out_Estimated_Cost,		GDestroyNotify destroy,
	GError **error,		GObject *weak_object)
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		{
	#endif /* not TP_DISABLE_DEPRECATED */		g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
			return tp_cli_channel_interface_sms_call_get_sms_length (proxy, timeout_m
			s,
			in_Message,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_channel_interface_sms_call_get_sms_length(...) _tp_cli_chann
			el_interface_sms_call_get_sms_length (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_interface_service_point_signal_callback_servi ce_point_changed) (TpChannel *proxy,		typedef void (*tp_cli_channel_interface_service_point_signal_callback_servi ce_point_changed) (TpChannel *proxy,
	const GValueArray *arg_Service_Point,		const GValueArray *arg_Service_Point,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_channel_interface_service_point_connect_to_ service_point_changed (TpChannel *proxy,		TpProxySignalConnection *tp_cli_channel_interface_service_point_connect_to_ service_point_changed (TpChannel *proxy,
	tp_cli_channel_interface_service_point_signal_callback_service_point_ch anged callback,		tp_cli_channel_interface_service_point_signal_callback_service_point_ch anged callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_channel_interface_service_point_connect_to_service_point_changed (T
			pChannel *proxy,
			tp_cli_channel_interface_service_point_signal_callback_service_point_ch
			anged callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
			return tp_cli_channel_interface_service_point_connect_to_service_point_ch
			anged (proxy, callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_channel_interface_service_point_connect_to_service_point_cha
			nged(...) _tp_cli_channel_interface_service_point_connect_to_service_point_
			changed (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_interface_subject_callback_for_set_subject) ( TpChannel *proxy,		typedef void (*tp_cli_channel_interface_subject_callback_for_set_subject) ( TpChannel *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_interface_subject_call_set_subject (TpCh annel *proxy,		TpProxyPendingCall *tp_cli_channel_interface_subject_call_set_subject (TpCh annel *proxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar *in_Subject,		const gchar *in_Subject,
	tp_cli_channel_interface_subject_callback_for_set_subject callback,		tp_cli_channel_interface_subject_callback_for_set_subject callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxyPendingCall *
			_tp_cli_channel_interface_subject_call_set_subject (TpChannel *proxy,
			gint timeout_ms,
			const gchar *in_Subject,
			tp_cli_channel_interface_subject_callback_for_set_subject callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
			return tp_cli_channel_interface_subject_call_set_subject (proxy, timeout_
			ms,
			in_Subject,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_channel_interface_subject_call_set_subject(...) _tp_cli_chan
			nel_interface_subject_call_set_subject (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_interface_tube_signal_callback_tube_channel_s tate_changed) (TpChannel *proxy,		typedef void (*tp_cli_channel_interface_tube_signal_callback_tube_channel_s tate_changed) (TpChannel *proxy,
	guint arg_State,		guint arg_State,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_channel_interface_tube_connect_to_tube_chan nel_state_changed (TpChannel *proxy,		TpProxySignalConnection *tp_cli_channel_interface_tube_connect_to_tube_chan nel_state_changed (TpChannel *proxy,
	tp_cli_channel_interface_tube_signal_callback_tube_channel_state_change d callback,		tp_cli_channel_interface_tube_signal_callback_tube_channel_state_change d callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_channel_interface_tube_connect_to_tube_channel_state_changed (TpCha
			nnel *proxy,
			tp_cli_channel_interface_tube_signal_callback_tube_channel_state_change
			d callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
			return tp_cli_channel_interface_tube_connect_to_tube_channel_state_change
			d (proxy, callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_channel_interface_tube_connect_to_tube_channel_state_changed
			(...) _tp_cli_channel_interface_tube_connect_to_tube_channel_state_changed
			(__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_type_call_signal_callback_content_added) (TpC hannel *proxy,		typedef void (*tp_cli_channel_type_call_signal_callback_content_added) (TpC hannel *proxy,
	const gchar *arg_Content,		const gchar *arg_Content,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_channel_type_call_connect_to_content_added (TpChannel *proxy,		TpProxySignalConnection *tp_cli_channel_type_call_connect_to_content_added (TpChannel *proxy,
	tp_cli_channel_type_call_signal_callback_content_added callback,		tp_cli_channel_type_call_signal_callback_content_added callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_channel_type_call_connect_to_content_added (TpChannel *proxy,
			tp_cli_channel_type_call_signal_callback_content_added callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
			return tp_cli_channel_type_call_connect_to_content_added (proxy, callback
			, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_channel_type_call_connect_to_content_added(...) _tp_cli_chan
			nel_type_call_connect_to_content_added (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_type_call_signal_callback_content_removed) (T pChannel *proxy,		typedef void (*tp_cli_channel_type_call_signal_callback_content_removed) (T pChannel *proxy,
	const gchar *arg_Content,		const gchar *arg_Content,
	const GValueArray *arg_Reason,		const GValueArray *arg_Reason,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_channel_type_call_connect_to_content_remove d (TpChannel *proxy,		TpProxySignalConnection *tp_cli_channel_type_call_connect_to_content_remove d (TpChannel *proxy,
	tp_cli_channel_type_call_signal_callback_content_removed callback,		tp_cli_channel_type_call_signal_callback_content_removed callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_channel_type_call_connect_to_content_removed (TpChannel *proxy,
			tp_cli_channel_type_call_signal_callback_content_removed callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
			return tp_cli_channel_type_call_connect_to_content_removed (proxy, callba
			ck, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_channel_type_call_connect_to_content_removed(...) _tp_cli_ch
			annel_type_call_connect_to_content_removed (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_type_call_signal_callback_call_state_changed) (TpChannel *proxy,		typedef void (*tp_cli_channel_type_call_signal_callback_call_state_changed) (TpChannel *proxy,
	guint arg_Call_State,		guint arg_Call_State,
	guint arg_Call_Flags,		guint arg_Call_Flags,
	const GValueArray *arg_Call_State_Reason,		const GValueArray *arg_Call_State_Reason,
	GHashTable *arg_Call_State_Details,		GHashTable *arg_Call_State_Details,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_channel_type_call_connect_to_call_state_cha nged (TpChannel *proxy,		TpProxySignalConnection *tp_cli_channel_type_call_connect_to_call_state_cha nged (TpChannel *proxy,
	tp_cli_channel_type_call_signal_callback_call_state_changed callback,		tp_cli_channel_type_call_signal_callback_call_state_changed callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_channel_type_call_connect_to_call_state_changed (TpChannel *proxy,
			tp_cli_channel_type_call_signal_callback_call_state_changed callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
			return tp_cli_channel_type_call_connect_to_call_state_changed (proxy, cal
			lback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_channel_type_call_connect_to_call_state_changed(...) _tp_cli
			_channel_type_call_connect_to_call_state_changed (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_type_call_signal_callback_call_members_change d) (TpChannel *proxy,		typedef void (*tp_cli_channel_type_call_signal_callback_call_members_change d) (TpChannel *proxy,
	GHashTable *arg_Flags_Changed,		GHashTable *arg_Flags_Changed,
	GHashTable *arg_Identifiers,		GHashTable *arg_Identifiers,
	const GArray *arg_Removed,		const GArray *arg_Removed,
	const GValueArray *arg_Reason,		const GValueArray *arg_Reason,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_channel_type_call_connect_to_call_members_c hanged (TpChannel *proxy,		TpProxySignalConnection *tp_cli_channel_type_call_connect_to_call_members_c hanged (TpChannel *proxy,
	tp_cli_channel_type_call_signal_callback_call_members_changed callback,		tp_cli_channel_type_call_signal_callback_call_members_changed callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_channel_type_call_connect_to_call_members_changed (TpChannel *proxy
			,
			tp_cli_channel_type_call_signal_callback_call_members_changed callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
			return tp_cli_channel_type_call_connect_to_call_members_changed (proxy, c
			allback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_channel_type_call_connect_to_call_members_changed(...) _tp_c
			li_channel_type_call_connect_to_call_members_changed (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_type_call_callback_for_set_ringing) (TpChanne l *proxy,		typedef void (*tp_cli_channel_type_call_callback_for_set_ringing) (TpChanne l *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_type_call_call_set_ringing (TpChannel *p roxy,		TpProxyPendingCall *tp_cli_channel_type_call_call_set_ringing (TpChannel *p roxy,
	gint timeout_ms,		gint timeout_ms,
	tp_cli_channel_type_call_callback_for_set_ringing callback,		tp_cli_channel_type_call_callback_for_set_ringing callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxyPendingCall *
			_tp_cli_channel_type_call_call_set_ringing (TpChannel *proxy,
			gint timeout_ms,
			tp_cli_channel_type_call_callback_for_set_ringing callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
			return tp_cli_channel_type_call_call_set_ringing (proxy, timeout_ms,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_channel_type_call_call_set_ringing(...) _tp_cli_channel_type
			_call_call_set_ringing (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_type_call_callback_for_set_queued) (TpChannel *proxy,		typedef void (*tp_cli_channel_type_call_callback_for_set_queued) (TpChannel *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_type_call_call_set_queued (TpChannel *pr oxy,		TpProxyPendingCall *tp_cli_channel_type_call_call_set_queued (TpChannel *pr oxy,
	gint timeout_ms,		gint timeout_ms,
	tp_cli_channel_type_call_callback_for_set_queued callback,		tp_cli_channel_type_call_callback_for_set_queued callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxyPendingCall *
			_tp_cli_channel_type_call_call_set_queued (TpChannel *proxy,
			gint timeout_ms,
			tp_cli_channel_type_call_callback_for_set_queued callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
			return tp_cli_channel_type_call_call_set_queued (proxy, timeout_ms,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_channel_type_call_call_set_queued(...) _tp_cli_channel_type_
			call_call_set_queued (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_type_call_callback_for_accept) (TpChannel *pr oxy,		typedef void (*tp_cli_channel_type_call_callback_for_accept) (TpChannel *pr oxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_type_call_call_accept (TpChannel *proxy,		TpProxyPendingCall *tp_cli_channel_type_call_call_accept (TpChannel *proxy,
	gint timeout_ms,		gint timeout_ms,
	tp_cli_channel_type_call_callback_for_accept callback,		tp_cli_channel_type_call_callback_for_accept callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxyPendingCall *
			_tp_cli_channel_type_call_call_accept (TpChannel *proxy,
			gint timeout_ms,
			tp_cli_channel_type_call_callback_for_accept callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
			return tp_cli_channel_type_call_call_accept (proxy, timeout_ms,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_channel_type_call_call_accept(...) _tp_cli_channel_type_call
			_call_accept (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_type_call_callback_for_hangup) (TpChannel *pr oxy,		typedef void (*tp_cli_channel_type_call_callback_for_hangup) (TpChannel *pr oxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_type_call_call_hangup (TpChannel *proxy,		TpProxyPendingCall *tp_cli_channel_type_call_call_hangup (TpChannel *proxy,
	gint timeout_ms,		gint timeout_ms,
	guint in_Reason,		guint in_Reason,
	const gchar *in_Detailed_Hangup_Reason,		const gchar *in_Detailed_Hangup_Reason,
	const gchar *in_Message,		const gchar *in_Message,
	tp_cli_channel_type_call_callback_for_hangup callback,		tp_cli_channel_type_call_callback_for_hangup callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	typedef void (*tp_cli_channel_type_call_callback_for_add_content) (TpChanne		#ifndef __GTK_DOC_IGNORE__
	l *proxy,		static inline TpProxyPendingCall *
	const gchar *out_Content,		_tp_cli_channel_type_call_call_hangup (TpChannel *proxy,
	const GError *error, gpointer user_data,
	GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_type_call_call_add_content (TpChannel *p
	roxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar *in_Content_Name,		guint in_Reason,
			const gchar *in_Detailed_Hangup_Reason,
			const gchar *in_Message,
			tp_cli_channel_type_call_callback_for_hangup callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
			return tp_cli_channel_type_call_call_hangup (proxy, timeout_ms,
			in_Reason,
			in_Detailed_Hangup_Reason,
			in_Message,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_channel_type_call_call_hangup(...) _tp_cli_channel_type_call
			_call_hangup (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
			typedef void (*tp_cli_channel_type_call_callback_for_add_content) (TpChanne
			l *proxy,
			const gchar *out_Content,
			const GError *error, gpointer user_data,
			GObject *weak_object);
			TpProxyPendingCall *tp_cli_channel_type_call_call_add_content (TpChannel *p
			roxy,
			gint timeout_ms,
			const gchar *in_Content_Name,
	guint in_Content_Type,		guint in_Content_Type,
	guint in_InitialDirection,		guint in_InitialDirection,
	tp_cli_channel_type_call_callback_for_add_content callback,		tp_cli_channel_type_call_callback_for_add_content callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxyPendingCall *
			_tp_cli_channel_type_call_call_add_content (TpChannel *proxy,
			gint timeout_ms,
			const gchar *in_Content_Name,
			guint in_Content_Type,
			guint in_InitialDirection,
			tp_cli_channel_type_call_callback_for_add_content callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
			return tp_cli_channel_type_call_call_add_content (proxy, timeout_ms,
			in_Content_Name,
			in_Content_Type,
			in_InitialDirection,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_channel_type_call_call_add_content(...) _tp_cli_channel_type
			_call_call_add_content (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_type_contact_search_signal_callback_search_st ate_changed) (TpChannel *proxy,		typedef void (*tp_cli_channel_type_contact_search_signal_callback_search_st ate_changed) (TpChannel *proxy,
	guint arg_State,		guint arg_State,
	const gchar *arg_Error,		const gchar *arg_Error,
	GHashTable *arg_Details,		GHashTable *arg_Details,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_channel_type_contact_search_connect_to_sear ch_state_changed (TpChannel *proxy,		TpProxySignalConnection *tp_cli_channel_type_contact_search_connect_to_sear ch_state_changed (TpChannel *proxy,
	tp_cli_channel_type_contact_search_signal_callback_search_state_changed callback,		tp_cli_channel_type_contact_search_signal_callback_search_state_changed callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_channel_type_contact_search_connect_to_search_state_changed (TpChan
			nel *proxy,
			tp_cli_channel_type_contact_search_signal_callback_search_state_changed
			callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
			return tp_cli_channel_type_contact_search_connect_to_search_state_changed
			(proxy, callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_channel_type_contact_search_connect_to_search_state_changed(
			...) _tp_cli_channel_type_contact_search_connect_to_search_state_changed (_
			_VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_type_contact_search_signal_callback_search_re sult_received) (TpChannel *proxy,		typedef void (*tp_cli_channel_type_contact_search_signal_callback_search_re sult_received) (TpChannel *proxy,
	GHashTable *arg_Result,		GHashTable *arg_Result,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_channel_type_contact_search_connect_to_sear ch_result_received (TpChannel *proxy,		TpProxySignalConnection *tp_cli_channel_type_contact_search_connect_to_sear ch_result_received (TpChannel *proxy,
	tp_cli_channel_type_contact_search_signal_callback_search_result_receiv ed callback,		tp_cli_channel_type_contact_search_signal_callback_search_result_receiv ed callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_channel_type_contact_search_connect_to_search_result_received (TpCh
			annel *proxy,
			tp_cli_channel_type_contact_search_signal_callback_search_result_receiv
			ed callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
			return tp_cli_channel_type_contact_search_connect_to_search_result_receiv
			ed (proxy, callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_channel_type_contact_search_connect_to_search_result_receive
			d(...) _tp_cli_channel_type_contact_search_connect_to_search_result_receive
			d (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_type_contact_search_callback_for_search) (TpC hannel *proxy,		typedef void (*tp_cli_channel_type_contact_search_callback_for_search) (TpC hannel *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_type_contact_search_call_search (TpChann el *proxy,		TpProxyPendingCall *tp_cli_channel_type_contact_search_call_search (TpChann el *proxy,
	gint timeout_ms,		gint timeout_ms,
	GHashTable *in_Terms,		GHashTable *in_Terms,
	tp_cli_channel_type_contact_search_callback_for_search callback,		tp_cli_channel_type_contact_search_callback_for_search callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_channel_type_contact_search_run_search (TpChannel *proxy,		static inline TpProxyPendingCall *
			_tp_cli_channel_type_contact_search_call_search (TpChannel *proxy,
	gint timeout_ms,		gint timeout_ms,
	GHashTable *in_Terms,		GHashTable *in_Terms,
	GError **error,		tp_cli_channel_type_contact_search_callback_for_search callback,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		gpointer user_data,
	#endif /* not TP_DISABLE_DEPRECATED */		GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
			return tp_cli_channel_type_contact_search_call_search (proxy, timeout_ms,
			in_Terms,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_channel_type_contact_search_call_search(...) _tp_cli_channel
			_type_contact_search_call_search (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_type_contact_search_callback_for_more) (TpCha nnel *proxy,		typedef void (*tp_cli_channel_type_contact_search_callback_for_more) (TpCha nnel *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_type_contact_search_call_more (TpChannel *proxy,		TpProxyPendingCall *tp_cli_channel_type_contact_search_call_more (TpChannel *proxy,
	gint timeout_ms,		gint timeout_ms,
	tp_cli_channel_type_contact_search_callback_for_more callback,		tp_cli_channel_type_contact_search_callback_for_more callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_channel_type_contact_search_run_more (TpChannel *proxy,		static inline TpProxyPendingCall *
			_tp_cli_channel_type_contact_search_call_more (TpChannel *proxy,
	gint timeout_ms,		gint timeout_ms,
	GError **error,		tp_cli_channel_type_contact_search_callback_for_more callback,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		gpointer user_data,
	#endif /* not TP_DISABLE_DEPRECATED */		GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
			return tp_cli_channel_type_contact_search_call_more (proxy, timeout_ms,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_channel_type_contact_search_call_more(...) _tp_cli_channel_t
			ype_contact_search_call_more (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_type_contact_search_callback_for_stop) (TpCha nnel *proxy,		typedef void (*tp_cli_channel_type_contact_search_callback_for_stop) (TpCha nnel *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_type_contact_search_call_stop (TpChannel *proxy,		TpProxyPendingCall *tp_cli_channel_type_contact_search_call_stop (TpChannel *proxy,
	gint timeout_ms,		gint timeout_ms,
	tp_cli_channel_type_contact_search_callback_for_stop callback,		tp_cli_channel_type_contact_search_callback_for_stop callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_channel_type_contact_search_run_stop (TpChannel *proxy,		static inline TpProxyPendingCall *
			_tp_cli_channel_type_contact_search_call_stop (TpChannel *proxy,
	gint timeout_ms,		gint timeout_ms,
	GError **error,		tp_cli_channel_type_contact_search_callback_for_stop callback,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		gpointer user_data,
	#endif /* not TP_DISABLE_DEPRECATED */		GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
			return tp_cli_channel_type_contact_search_call_stop (proxy, timeout_ms,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_channel_type_contact_search_call_stop(...) _tp_cli_channel_t
			ype_contact_search_call_stop (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_type_dbus_tube_signal_callback_dbus_names_cha nged) (TpChannel *proxy,		typedef void (*tp_cli_channel_type_dbus_tube_signal_callback_dbus_names_cha nged) (TpChannel *proxy,
	GHashTable *arg_Added,		GHashTable *arg_Added,
	const GArray *arg_Removed,		const GArray *arg_Removed,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_channel_type_dbus_tube_connect_to_dbus_name s_changed (TpChannel *proxy,		TpProxySignalConnection *tp_cli_channel_type_dbus_tube_connect_to_dbus_name s_changed (TpChannel *proxy,
	tp_cli_channel_type_dbus_tube_signal_callback_dbus_names_changed callba ck,		tp_cli_channel_type_dbus_tube_signal_callback_dbus_names_changed callba ck,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_channel_type_dbus_tube_connect_to_dbus_names_changed (TpChannel *pr
			oxy,
			tp_cli_channel_type_dbus_tube_signal_callback_dbus_names_changed callba
			ck,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
			return tp_cli_channel_type_dbus_tube_connect_to_dbus_names_changed (proxy
			, callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_channel_type_dbus_tube_connect_to_dbus_names_changed(...) _t
			p_cli_channel_type_dbus_tube_connect_to_dbus_names_changed (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_type_dbus_tube_callback_for_offer) (TpChannel *proxy,		typedef void (*tp_cli_channel_type_dbus_tube_callback_for_offer) (TpChannel *proxy,
	const gchar *out_address,		const gchar *out_address,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_type_dbus_tube_call_offer (TpChannel *pr oxy,		TpProxyPendingCall *tp_cli_channel_type_dbus_tube_call_offer (TpChannel *pr oxy,
	gint timeout_ms,		gint timeout_ms,
	GHashTable *in_parameters,		GHashTable *in_parameters,
	guint in_access_control,		guint in_access_control,
	tp_cli_channel_type_dbus_tube_callback_for_offer callback,		tp_cli_channel_type_dbus_tube_callback_for_offer callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_channel_type_dbus_tube_run_offer (TpChannel *proxy,		static inline TpProxyPendingCall *
			_tp_cli_channel_type_dbus_tube_call_offer (TpChannel *proxy,
	gint timeout_ms,		gint timeout_ms,
	GHashTable *in_parameters,		GHashTable *in_parameters,
	guint in_access_control,		guint in_access_control,
	gchar **out_address,		tp_cli_channel_type_dbus_tube_callback_for_offer callback,
	GError **error,		gpointer user_data,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		GDestroyNotify destroy,
	#endif /* not TP_DISABLE_DEPRECATED */		GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
			return tp_cli_channel_type_dbus_tube_call_offer (proxy, timeout_ms,
			in_parameters,
			in_access_control,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_channel_type_dbus_tube_call_offer(...) _tp_cli_channel_type_
			dbus_tube_call_offer (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_type_dbus_tube_callback_for_accept) (TpChanne l *proxy,		typedef void (*tp_cli_channel_type_dbus_tube_callback_for_accept) (TpChanne l *proxy,
	const gchar *out_address,		const gchar *out_address,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_type_dbus_tube_call_accept (TpChannel *p roxy,		TpProxyPendingCall *tp_cli_channel_type_dbus_tube_call_accept (TpChannel *p roxy,
	gint timeout_ms,		gint timeout_ms,
	guint in_access_control,		guint in_access_control,
	tp_cli_channel_type_dbus_tube_callback_for_accept callback,		tp_cli_channel_type_dbus_tube_callback_for_accept callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_channel_type_dbus_tube_run_accept (TpChannel *proxy,		static inline TpProxyPendingCall *
			_tp_cli_channel_type_dbus_tube_call_accept (TpChannel *proxy,
	gint timeout_ms,		gint timeout_ms,
	guint in_access_control,		guint in_access_control,
	gchar **out_address,		tp_cli_channel_type_dbus_tube_callback_for_accept callback,
	GError **error,		gpointer user_data,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		GDestroyNotify destroy,
	#endif /* not TP_DISABLE_DEPRECATED */		GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
			return tp_cli_channel_type_dbus_tube_call_accept (proxy, timeout_ms,
			in_access_control,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_channel_type_dbus_tube_call_accept(...) _tp_cli_channel_type
			_dbus_tube_call_accept (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_type_file_transfer_signal_callback_file_trans fer_state_changed) (TpChannel *proxy,		typedef void (*tp_cli_channel_type_file_transfer_signal_callback_file_trans fer_state_changed) (TpChannel *proxy,
	guint arg_State,		guint arg_State,
	guint arg_Reason,		guint arg_Reason,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_channel_type_file_transfer_connect_to_file_ transfer_state_changed (TpChannel *proxy,		TpProxySignalConnection *tp_cli_channel_type_file_transfer_connect_to_file_ transfer_state_changed (TpChannel *proxy,
	tp_cli_channel_type_file_transfer_signal_callback_file_transfer_state_c hanged callback,		tp_cli_channel_type_file_transfer_signal_callback_file_transfer_state_c hanged callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_channel_type_file_transfer_connect_to_file_transfer_state_changed (
			TpChannel *proxy,
			tp_cli_channel_type_file_transfer_signal_callback_file_transfer_state_c
			hanged callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
			return tp_cli_channel_type_file_transfer_connect_to_file_transfer_state_c
			hanged (proxy, callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_channel_type_file_transfer_connect_to_file_transfer_state_ch
			anged(...) _tp_cli_channel_type_file_transfer_connect_to_file_transfer_stat
			e_changed (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_type_file_transfer_signal_callback_transferre d_bytes_changed) (TpChannel *proxy,		typedef void (*tp_cli_channel_type_file_transfer_signal_callback_transferre d_bytes_changed) (TpChannel *proxy,
	guint64 arg_Count,		guint64 arg_Count,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_channel_type_file_transfer_connect_to_trans ferred_bytes_changed (TpChannel *proxy,		TpProxySignalConnection *tp_cli_channel_type_file_transfer_connect_to_trans ferred_bytes_changed (TpChannel *proxy,
	tp_cli_channel_type_file_transfer_signal_callback_transferred_bytes_cha nged callback,		tp_cli_channel_type_file_transfer_signal_callback_transferred_bytes_cha nged callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_channel_type_file_transfer_connect_to_transferred_bytes_changed (Tp
			Channel *proxy,
			tp_cli_channel_type_file_transfer_signal_callback_transferred_bytes_cha
			nged callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
			return tp_cli_channel_type_file_transfer_connect_to_transferred_bytes_cha
			nged (proxy, callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_channel_type_file_transfer_connect_to_transferred_bytes_chan
			ged(...) _tp_cli_channel_type_file_transfer_connect_to_transferred_bytes_ch
			anged (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_type_file_transfer_signal_callback_initial_of fset_defined) (TpChannel *proxy,		typedef void (*tp_cli_channel_type_file_transfer_signal_callback_initial_of fset_defined) (TpChannel *proxy,
	guint64 arg_InitialOffset,		guint64 arg_InitialOffset,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_channel_type_file_transfer_connect_to_initi al_offset_defined (TpChannel *proxy,		TpProxySignalConnection *tp_cli_channel_type_file_transfer_connect_to_initi al_offset_defined (TpChannel *proxy,
	tp_cli_channel_type_file_transfer_signal_callback_initial_offset_define d callback,		tp_cli_channel_type_file_transfer_signal_callback_initial_offset_define d callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_channel_type_file_transfer_connect_to_initial_offset_defined (TpCha
			nnel *proxy,
			tp_cli_channel_type_file_transfer_signal_callback_initial_offset_define
			d callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
			return tp_cli_channel_type_file_transfer_connect_to_initial_offset_define
			d (proxy, callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_channel_type_file_transfer_connect_to_initial_offset_defined
			(...) _tp_cli_channel_type_file_transfer_connect_to_initial_offset_defined
			(__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_type_file_transfer_signal_callback_uri_define d) (TpChannel *proxy,		typedef void (*tp_cli_channel_type_file_transfer_signal_callback_uri_define d) (TpChannel *proxy,
	const gchar *arg_URI,		const gchar *arg_URI,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_channel_type_file_transfer_connect_to_uri_d efined (TpChannel *proxy,		TpProxySignalConnection *tp_cli_channel_type_file_transfer_connect_to_uri_d efined (TpChannel *proxy,
	tp_cli_channel_type_file_transfer_signal_callback_uri_defined callback,		tp_cli_channel_type_file_transfer_signal_callback_uri_defined callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_channel_type_file_transfer_connect_to_uri_defined (TpChannel *proxy
			,
			tp_cli_channel_type_file_transfer_signal_callback_uri_defined callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
			return tp_cli_channel_type_file_transfer_connect_to_uri_defined (proxy, c
			allback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_channel_type_file_transfer_connect_to_uri_defined(...) _tp_c
			li_channel_type_file_transfer_connect_to_uri_defined (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_type_file_transfer_callback_for_accept_file) (TpChannel *proxy,		typedef void (*tp_cli_channel_type_file_transfer_callback_for_accept_file) (TpChannel *proxy,
	const GValue *out_Address,		const GValue *out_Address,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_type_file_transfer_call_accept_file (TpC hannel *proxy,		TpProxyPendingCall *tp_cli_channel_type_file_transfer_call_accept_file (TpC hannel *proxy,
	gint timeout_ms,		gint timeout_ms,
	guint in_Address_Type,		guint in_Address_Type,
	guint in_Access_Control,		guint in_Access_Control,
	const GValue *in_Access_Control_Param,		const GValue *in_Access_Control_Param,
	guint64 in_Offset,		guint64 in_Offset,
	tp_cli_channel_type_file_transfer_callback_for_accept_file callback,		tp_cli_channel_type_file_transfer_callback_for_accept_file callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_channel_type_file_transfer_run_accept_file (TpChannel *prox		static inline TpProxyPendingCall *
	y,		_tp_cli_channel_type_file_transfer_call_accept_file (TpChannel *proxy,
	gint timeout_ms,		gint timeout_ms,
	guint in_Address_Type,		guint in_Address_Type,
	guint in_Access_Control,		guint in_Access_Control,
	const GValue *in_Access_Control_Param,		const GValue *in_Access_Control_Param,
	guint64 in_Offset,		guint64 in_Offset,
	GValue **out_Address,		tp_cli_channel_type_file_transfer_callback_for_accept_file callback,
	GError **error,		gpointer user_data,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		GDestroyNotify destroy,
	#endif /* not TP_DISABLE_DEPRECATED */		GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
			return tp_cli_channel_type_file_transfer_call_accept_file (proxy, timeout
			_ms,
			in_Address_Type,
			in_Access_Control,
			in_Access_Control_Param,
			in_Offset,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_channel_type_file_transfer_call_accept_file(...) _tp_cli_cha
			nnel_type_file_transfer_call_accept_file (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_type_file_transfer_callback_for_provide_file) (TpChannel *proxy,		typedef void (*tp_cli_channel_type_file_transfer_callback_for_provide_file) (TpChannel *proxy,
	const GValue *out_Address,		const GValue *out_Address,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_type_file_transfer_call_provide_file (Tp Channel *proxy,		TpProxyPendingCall *tp_cli_channel_type_file_transfer_call_provide_file (Tp Channel *proxy,
	gint timeout_ms,		gint timeout_ms,
	guint in_Address_Type,		guint in_Address_Type,
	guint in_Access_Control,		guint in_Access_Control,
	const GValue *in_Access_Control_Param,		const GValue *in_Access_Control_Param,
	tp_cli_channel_type_file_transfer_callback_for_provide_file callback,		tp_cli_channel_type_file_transfer_callback_for_provide_file callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_channel_type_file_transfer_run_provide_file (TpChannel *pro		static inline TpProxyPendingCall *
	xy,		_tp_cli_channel_type_file_transfer_call_provide_file (TpChannel *proxy,
	gint timeout_ms,		gint timeout_ms,
	guint in_Address_Type,		guint in_Address_Type,
	guint in_Access_Control,		guint in_Access_Control,
	const GValue *in_Access_Control_Param,		const GValue *in_Access_Control_Param,
	GValue **out_Address,		tp_cli_channel_type_file_transfer_callback_for_provide_file callback,
	GError **error,		gpointer user_data,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		GDestroyNotify destroy,
	#endif /* not TP_DISABLE_DEPRECATED */		GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
			return tp_cli_channel_type_file_transfer_call_provide_file (proxy, timeou
			t_ms,
			in_Address_Type,
			in_Access_Control,
			in_Access_Control_Param,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_channel_type_file_transfer_call_provide_file(...) _tp_cli_ch
			annel_type_file_transfer_call_provide_file (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_type_room_list_signal_callback_got_rooms) (Tp Channel *proxy,		typedef void (*tp_cli_channel_type_room_list_signal_callback_got_rooms) (Tp Channel *proxy,
	const GPtrArray *arg_Rooms,		const GPtrArray *arg_Rooms,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_channel_type_room_list_connect_to_got_rooms (TpChannel *proxy,		TpProxySignalConnection *tp_cli_channel_type_room_list_connect_to_got_rooms (TpChannel *proxy,
	tp_cli_channel_type_room_list_signal_callback_got_rooms callback,		tp_cli_channel_type_room_list_signal_callback_got_rooms callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_channel_type_room_list_connect_to_got_rooms (TpChannel *proxy,
			tp_cli_channel_type_room_list_signal_callback_got_rooms callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
			return tp_cli_channel_type_room_list_connect_to_got_rooms (proxy, callbac
			k, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_channel_type_room_list_connect_to_got_rooms(...) _tp_cli_cha
			nnel_type_room_list_connect_to_got_rooms (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_type_room_list_signal_callback_listing_rooms) (TpChannel *proxy,		typedef void (*tp_cli_channel_type_room_list_signal_callback_listing_rooms) (TpChannel *proxy,
	gboolean arg_Listing,		gboolean arg_Listing,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_channel_type_room_list_connect_to_listing_r ooms (TpChannel *proxy,		TpProxySignalConnection *tp_cli_channel_type_room_list_connect_to_listing_r ooms (TpChannel *proxy,
	tp_cli_channel_type_room_list_signal_callback_listing_rooms callback,		tp_cli_channel_type_room_list_signal_callback_listing_rooms callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_channel_type_room_list_connect_to_listing_rooms (TpChannel *proxy,
			tp_cli_channel_type_room_list_signal_callback_listing_rooms callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
			return tp_cli_channel_type_room_list_connect_to_listing_rooms (proxy, cal
			lback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_channel_type_room_list_connect_to_listing_rooms(...) _tp_cli
			_channel_type_room_list_connect_to_listing_rooms (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_type_room_list_callback_for_get_listing_rooms ) (TpChannel *proxy,		typedef void (*tp_cli_channel_type_room_list_callback_for_get_listing_rooms ) (TpChannel *proxy,
	gboolean out_In_Progress,		gboolean out_In_Progress,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_type_room_list_call_get_listing_rooms (T pChannel *proxy,		TpProxyPendingCall *tp_cli_channel_type_room_list_call_get_listing_rooms (T pChannel *proxy,
	gint timeout_ms,		gint timeout_ms,
	tp_cli_channel_type_room_list_callback_for_get_listing_rooms callback,		tp_cli_channel_type_room_list_callback_for_get_listing_rooms callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_channel_type_room_list_run_get_listing_rooms (TpChannel *pr		static inline TpProxyPendingCall *
	oxy,		_tp_cli_channel_type_room_list_call_get_listing_rooms (TpChannel *proxy,
	gint timeout_ms,		gint timeout_ms,
	gboolean *out_In_Progress,		tp_cli_channel_type_room_list_callback_for_get_listing_rooms callback,
	GError **error,		gpointer user_data,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		GDestroyNotify destroy,
	#endif /* not TP_DISABLE_DEPRECATED */		GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
			return tp_cli_channel_type_room_list_call_get_listing_rooms (proxy, timeo
			ut_ms,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_channel_type_room_list_call_get_listing_rooms(...) _tp_cli_c
			hannel_type_room_list_call_get_listing_rooms (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_type_room_list_callback_for_list_rooms) (TpCh annel *proxy,		typedef void (*tp_cli_channel_type_room_list_callback_for_list_rooms) (TpCh annel *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_type_room_list_call_list_rooms (TpChanne l *proxy,		TpProxyPendingCall *tp_cli_channel_type_room_list_call_list_rooms (TpChanne l *proxy,
	gint timeout_ms,		gint timeout_ms,
	tp_cli_channel_type_room_list_callback_for_list_rooms callback,		tp_cli_channel_type_room_list_callback_for_list_rooms callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_channel_type_room_list_run_list_rooms (TpChannel *proxy,		static inline TpProxyPendingCall *
			_tp_cli_channel_type_room_list_call_list_rooms (TpChannel *proxy,
	gint timeout_ms,		gint timeout_ms,
	GError **error,		tp_cli_channel_type_room_list_callback_for_list_rooms callback,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		gpointer user_data,
	#endif /* not TP_DISABLE_DEPRECATED */		GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
			return tp_cli_channel_type_room_list_call_list_rooms (proxy, timeout_ms,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_channel_type_room_list_call_list_rooms(...) _tp_cli_channel_
			type_room_list_call_list_rooms (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_type_room_list_callback_for_stop_listing) (Tp Channel *proxy,		typedef void (*tp_cli_channel_type_room_list_callback_for_stop_listing) (Tp Channel *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_type_room_list_call_stop_listing (TpChan nel *proxy,		TpProxyPendingCall *tp_cli_channel_type_room_list_call_stop_listing (TpChan nel *proxy,
	gint timeout_ms,		gint timeout_ms,
	tp_cli_channel_type_room_list_callback_for_stop_listing callback,		tp_cli_channel_type_room_list_callback_for_stop_listing callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_channel_type_room_list_run_stop_listing (TpChannel *proxy,		static inline TpProxyPendingCall *
			_tp_cli_channel_type_room_list_call_stop_listing (TpChannel *proxy,
	gint timeout_ms,		gint timeout_ms,
	GError **error,		tp_cli_channel_type_room_list_callback_for_stop_listing callback,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		gpointer user_data,
	#endif /* not TP_DISABLE_DEPRECATED */		GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
			return tp_cli_channel_type_room_list_call_stop_listing (proxy, timeout_ms
			,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_channel_type_room_list_call_stop_listing(...) _tp_cli_channe
			l_type_room_list_call_stop_listing (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_type_stream_tube_signal_callback_new_remote_c onnection) (TpChannel *proxy,		typedef void (*tp_cli_channel_type_stream_tube_signal_callback_new_remote_c onnection) (TpChannel *proxy,
	guint arg_Handle,		guint arg_Handle,
			const gchar *arg_Identifier,
	const GValue *arg_Connection_Param,		const GValue *arg_Connection_Param,
	guint arg_Connection_ID,		guint arg_Connection_ID,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_channel_type_stream_tube_connect_to_new_rem ote_connection (TpChannel *proxy,		TpProxySignalConnection *tp_cli_channel_type_stream_tube_connect_to_new_rem ote_connection (TpChannel *proxy,
	tp_cli_channel_type_stream_tube_signal_callback_new_remote_connection c allback,		tp_cli_channel_type_stream_tube_signal_callback_new_remote_connection c allback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_channel_type_stream_tube_connect_to_new_remote_connection (TpChanne
			l *proxy,
			tp_cli_channel_type_stream_tube_signal_callback_new_remote_connection c
			allback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
			return tp_cli_channel_type_stream_tube_connect_to_new_remote_connection (
			proxy, callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_channel_type_stream_tube_connect_to_new_remote_connection(..
			.) _tp_cli_channel_type_stream_tube_connect_to_new_remote_connection (__VA_
			ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_type_stream_tube_signal_callback_new_local_co nnection) (TpChannel *proxy,		typedef void (*tp_cli_channel_type_stream_tube_signal_callback_new_local_co nnection) (TpChannel *proxy,
	guint arg_Connection_ID,		guint arg_Connection_ID,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_channel_type_stream_tube_connect_to_new_loc al_connection (TpChannel *proxy,		TpProxySignalConnection *tp_cli_channel_type_stream_tube_connect_to_new_loc al_connection (TpChannel *proxy,
	tp_cli_channel_type_stream_tube_signal_callback_new_local_connection ca llback,		tp_cli_channel_type_stream_tube_signal_callback_new_local_connection ca llback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_channel_type_stream_tube_connect_to_new_local_connection (TpChannel
			*proxy,
			tp_cli_channel_type_stream_tube_signal_callback_new_local_connection ca
			llback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
			return tp_cli_channel_type_stream_tube_connect_to_new_local_connection (p
			roxy, callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_channel_type_stream_tube_connect_to_new_local_connection(...
			) _tp_cli_channel_type_stream_tube_connect_to_new_local_connection (__VA_AR
			GS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_type_stream_tube_signal_callback_connection_c losed) (TpChannel *proxy,		typedef void (*tp_cli_channel_type_stream_tube_signal_callback_connection_c losed) (TpChannel *proxy,
	guint arg_Connection_ID,		guint arg_Connection_ID,
	const gchar *arg_Error,		const gchar *arg_Error,
	const gchar *arg_Message,		const gchar *arg_Message,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_channel_type_stream_tube_connect_to_connect ion_closed (TpChannel *proxy,		TpProxySignalConnection *tp_cli_channel_type_stream_tube_connect_to_connect ion_closed (TpChannel *proxy,
	tp_cli_channel_type_stream_tube_signal_callback_connection_closed callb ack,		tp_cli_channel_type_stream_tube_signal_callback_connection_closed callb ack,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_channel_type_stream_tube_connect_to_connection_closed (TpChannel *p
			roxy,
			tp_cli_channel_type_stream_tube_signal_callback_connection_closed callb
			ack,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
			return tp_cli_channel_type_stream_tube_connect_to_connection_closed (prox
			y, callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_channel_type_stream_tube_connect_to_connection_closed(...) _
			tp_cli_channel_type_stream_tube_connect_to_connection_closed (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_type_stream_tube_callback_for_offer) (TpChann el *proxy,		typedef void (*tp_cli_channel_type_stream_tube_callback_for_offer) (TpChann el *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_type_stream_tube_call_offer (TpChannel * proxy,		TpProxyPendingCall *tp_cli_channel_type_stream_tube_call_offer (TpChannel * proxy,
	gint timeout_ms,		gint timeout_ms,
	guint in_address_type,		guint in_address_type,
	const GValue *in_address,		const GValue *in_address,
	guint in_access_control,		guint in_access_control,
	GHashTable *in_parameters,		GHashTable *in_parameters,
	tp_cli_channel_type_stream_tube_callback_for_offer callback,		tp_cli_channel_type_stream_tube_callback_for_offer callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_channel_type_stream_tube_run_offer (TpChannel *proxy,		static inline TpProxyPendingCall *
			_tp_cli_channel_type_stream_tube_call_offer (TpChannel *proxy,
	gint timeout_ms,		gint timeout_ms,
	guint in_address_type,		guint in_address_type,
	const GValue *in_address,		const GValue *in_address,
	guint in_access_control,		guint in_access_control,
	GHashTable *in_parameters,		GHashTable *in_parameters,
	GError **error,		tp_cli_channel_type_stream_tube_callback_for_offer callback,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		gpointer user_data,
	#endif /* not TP_DISABLE_DEPRECATED */		GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
			return tp_cli_channel_type_stream_tube_call_offer (proxy, timeout_ms,
			in_address_type,
			in_address,
			in_access_control,
			in_parameters,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_channel_type_stream_tube_call_offer(...) _tp_cli_channel_typ
			e_stream_tube_call_offer (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_type_stream_tube_callback_for_accept) (TpChan nel *proxy,		typedef void (*tp_cli_channel_type_stream_tube_callback_for_accept) (TpChan nel *proxy,
	const GValue *out_address,		const GValue *out_address,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_type_stream_tube_call_accept (TpChannel *proxy,		TpProxyPendingCall *tp_cli_channel_type_stream_tube_call_accept (TpChannel *proxy,
	gint timeout_ms,		gint timeout_ms,
	guint in_address_type,		guint in_address_type,
	guint in_access_control,		guint in_access_control,
	const GValue *in_access_control_param,		const GValue *in_access_control_param,
	tp_cli_channel_type_stream_tube_callback_for_accept callback,		tp_cli_channel_type_stream_tube_callback_for_accept callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_channel_type_stream_tube_run_accept (TpChannel *proxy,		static inline TpProxyPendingCall *
			_tp_cli_channel_type_stream_tube_call_accept (TpChannel *proxy,
	gint timeout_ms,		gint timeout_ms,
	guint in_address_type,		guint in_address_type,
	guint in_access_control,		guint in_access_control,
	const GValue *in_access_control_param,		const GValue *in_access_control_param,
	GValue **out_address,		tp_cli_channel_type_stream_tube_callback_for_accept callback,
	GError **error,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;
	#endif /* not TP_DISABLE_DEPRECATED */
	typedef void (*tp_cli_channel_type_streamed_media_signal_callback_stream_ad
	ded) (TpChannel *proxy,
	guint arg_Stream_ID,
	guint arg_Contact_Handle,
	guint arg_Stream_Type,
	gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_channel_type_streamed_media_connect_to_stre
	am_added (TpChannel *proxy,
	tp_cli_channel_type_streamed_media_signal_callback_stream_added callbac
	k,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object,
	GError **error);
	typedef void (*tp_cli_channel_type_streamed_media_signal_callback_stream_di
	rection_changed) (TpChannel *proxy,
	guint arg_Stream_ID,
	guint arg_Stream_Direction,
	guint arg_Pending_Flags,
	gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_channel_type_streamed_media_connect_to_stre
	am_direction_changed (TpChannel *proxy,
	tp_cli_channel_type_streamed_media_signal_callback_stream_direction_cha
	nged callback,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object,
	GError **error);
	typedef void (*tp_cli_channel_type_streamed_media_signal_callback_stream_er
	ror) (TpChannel *proxy,
	guint arg_Stream_ID,
	guint arg_Error_Code,
	const gchar *arg_Message,
	gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_channel_type_streamed_media_connect_to_stre
	am_error (TpChannel *proxy,
	tp_cli_channel_type_streamed_media_signal_callback_stream_error callbac
	k,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object)
	GError **error);		{
			g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
			return tp_cli_channel_type_stream_tube_call_accept (proxy, timeout_ms,
			in_address_type,
			in_access_control,
			in_access_control_param,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_channel_type_stream_tube_call_accept(...) _tp_cli_channel_ty
			pe_stream_tube_call_accept (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_type_streamed_media_signal_callback_stream_re		typedef void (*tp_cli_channel_type_text_signal_callback_message_sent) (TpCh
	moved) (TpChannel *proxy,		annel *proxy,
	guint arg_Stream_ID,		const GPtrArray *arg_Content,
			guint arg_Flags,
			const gchar *arg_Message_Token,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_channel_type_streamed_media_connect_to_stre		TpProxySignalConnection *tp_cli_channel_type_text_connect_to_message_sent (
	am_removed (TpChannel *proxy,		TpChannel *proxy,
	tp_cli_channel_type_streamed_media_signal_callback_stream_removed callb		tp_cli_channel_type_text_signal_callback_message_sent callback,
	ack,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
	typedef void (*tp_cli_channel_type_streamed_media_signal_callback_stream_st		#ifndef __GTK_DOC_IGNORE__
	ate_changed) (TpChannel *proxy,		static inline TpProxySignalConnection *
	guint arg_Stream_ID,		_tp_cli_channel_type_text_connect_to_message_sent (TpChannel *proxy,
	guint arg_Stream_State,		tp_cli_channel_type_text_signal_callback_message_sent callback,
	gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_channel_type_streamed_media_connect_to_stre
	am_state_changed (TpChannel *proxy,
	tp_cli_channel_type_streamed_media_signal_callback_stream_state_changed
	callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error)
			{
	typedef void (*tp_cli_channel_type_streamed_media_callback_for_list_streams		g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
	) (TpChannel *proxy,		return tp_cli_channel_type_text_connect_to_message_sent (proxy, callback,
	const GPtrArray *out_Streams,		user_data,
	const GError *error, gpointer user_data,		destroy, weak_object, error);
	GObject *weak_object);		}
			#define tp_cli_channel_type_text_connect_to_message_sent(...) _tp_cli_chann
	TpProxyPendingCall *tp_cli_channel_type_streamed_media_call_list_streams (T		el_type_text_connect_to_message_sent (__VA_ARGS__)
	pChannel *proxy,		#endif /* __GTK_DOC_IGNORE__ */
	gint timeout_ms,		typedef void (*tp_cli_channel_type_text_signal_callback_pending_messages_re
	tp_cli_channel_type_streamed_media_callback_for_list_streams callback,		moved) (TpChannel *proxy,
	gpointer user_data,		const GArray *arg_Message_IDs,
	GDestroyNotify destroy,
	GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED
	gboolean tp_cli_channel_type_streamed_media_run_list_streams (TpChannel *pr
	oxy,
	gint timeout_ms,
	GPtrArray **out_Streams,
	GError **error,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;
	#endif /* not TP_DISABLE_DEPRECATED */
	typedef void (*tp_cli_channel_type_streamed_media_callback_for_remove_strea
	ms) (TpChannel *proxy,
	const GError *error, gpointer user_data,
	GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_type_streamed_media_call_remove_streams
	(TpChannel *proxy,
	gint timeout_ms,
	const GArray *in_Streams,
	tp_cli_channel_type_streamed_media_callback_for_remove_streams callback
	,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED
	gboolean tp_cli_channel_type_streamed_media_run_remove_streams (TpChannel *
	proxy,
	gint timeout_ms,
	const GArray *in_Streams,
	GError **error,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;
	#endif /* not TP_DISABLE_DEPRECATED */
	typedef void (*tp_cli_channel_type_streamed_media_callback_for_request_stre
	am_direction) (TpChannel *proxy,
	const GError *error, gpointer user_data,
	GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_type_streamed_media_call_request_stream_
	direction (TpChannel *proxy,
	gint timeout_ms,
	guint in_Stream_ID,
	guint in_Stream_Direction,
	tp_cli_channel_type_streamed_media_callback_for_request_stream_directio
	n callback,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED
	gboolean tp_cli_channel_type_streamed_media_run_request_stream_direction (T
	pChannel *proxy,
	gint timeout_ms,
	guint in_Stream_ID,
	guint in_Stream_Direction,
	GError **error,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;
	#endif /* not TP_DISABLE_DEPRECATED */
	typedef void (*tp_cli_channel_type_streamed_media_callback_for_request_stre
	ams) (TpChannel *proxy,
	const GPtrArray *out_Streams,
	const GError *error, gpointer user_data,
	GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_type_streamed_media_call_request_streams
	(TpChannel *proxy,
	gint timeout_ms,
	guint in_Contact_Handle,
	const GArray *in_Types,
	tp_cli_channel_type_streamed_media_callback_for_request_streams callbac
	k,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED
	gboolean tp_cli_channel_type_streamed_media_run_request_streams (TpChannel
	*proxy,
	gint timeout_ms,
	guint in_Contact_Handle,
	const GArray *in_Types,
	GPtrArray **out_Streams,
	GError **error,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;
	#endif /* not TP_DISABLE_DEPRECATED */
	typedef void (*tp_cli_channel_type_text_signal_callback_lost_message) (TpCh
	annel *proxy,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_channel_type_text_connect_to_lost_message (		TpProxySignalConnection *tp_cli_channel_type_text_connect_to_pending_messag
	TpChannel *proxy,		es_removed (TpChannel *proxy,
	tp_cli_channel_type_text_signal_callback_lost_message callback,		tp_cli_channel_type_text_signal_callback_pending_messages_removed callb
			ack,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
	typedef void (*tp_cli_channel_type_text_signal_callback_received) (TpChanne		#ifndef __GTK_DOC_IGNORE__
	l *proxy,		static inline TpProxySignalConnection *
	guint arg_ID,		_tp_cli_channel_type_text_connect_to_pending_messages_removed (TpChannel *p
	guint arg_Timestamp,		roxy,
	guint arg_Sender,		tp_cli_channel_type_text_signal_callback_pending_messages_removed callb
	guint arg_Type,		ack,
	guint arg_Flags,
	const gchar *arg_Text,
	gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_channel_type_text_connect_to_received (TpCh
	annel *proxy,
	tp_cli_channel_type_text_signal_callback_received callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error)
			{
	typedef void (*tp_cli_channel_type_text_signal_callback_send_error) (TpChan		g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
	nel *proxy,		return tp_cli_channel_type_text_connect_to_pending_messages_removed (prox
	guint arg_Error,		y, callback, user_data,
	guint arg_Timestamp,		destroy, weak_object, error);
	guint arg_Type,		}
	const gchar *arg_Text,		#define tp_cli_channel_type_text_connect_to_pending_messages_removed(...) _
			tp_cli_channel_type_text_connect_to_pending_messages_removed (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
			typedef void (*tp_cli_channel_type_text_signal_callback_message_received) (
			TpChannel *proxy,
			const GPtrArray *arg_Message,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_channel_type_text_connect_to_send_error (Tp		TpProxySignalConnection *tp_cli_channel_type_text_connect_to_message_receiv
	Channel *proxy,		ed (TpChannel *proxy,
	tp_cli_channel_type_text_signal_callback_send_error callback,		tp_cli_channel_type_text_signal_callback_message_received callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
	typedef void (*tp_cli_channel_type_text_signal_callback_sent) (TpChannel *p		#ifndef __GTK_DOC_IGNORE__
	roxy,		static inline TpProxySignalConnection *
	guint arg_Timestamp,		_tp_cli_channel_type_text_connect_to_message_received (TpChannel *proxy,
	guint arg_Type,		tp_cli_channel_type_text_signal_callback_message_received callback,
	const gchar *arg_Text,
	gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_channel_type_text_connect_to_sent (TpChanne
	l *proxy,
	tp_cli_channel_type_text_signal_callback_sent callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error)
			{
			g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
			return tp_cli_channel_type_text_connect_to_message_received (proxy, callb
			ack, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_channel_type_text_connect_to_message_received(...) _tp_cli_c
			hannel_type_text_connect_to_message_received (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_type_text_callback_for_acknowledge_pending_me ssages) (TpChannel *proxy,		typedef void (*tp_cli_channel_type_text_callback_for_acknowledge_pending_me ssages) (TpChannel *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_type_text_call_acknowledge_pending_messa ges (TpChannel *proxy,		TpProxyPendingCall *tp_cli_channel_type_text_call_acknowledge_pending_messa ges (TpChannel *proxy,
	gint timeout_ms,		gint timeout_ms,
	const GArray *in_IDs,		const GArray *in_IDs,
	tp_cli_channel_type_text_callback_for_acknowledge_pending_messages call back,		tp_cli_channel_type_text_callback_for_acknowledge_pending_messages call back,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_channel_type_text_run_acknowledge_pending_messages (TpChann		static inline TpProxyPendingCall *
	el *proxy,		_tp_cli_channel_type_text_call_acknowledge_pending_messages (TpChannel *pro
			xy,
	gint timeout_ms,		gint timeout_ms,
	const GArray *in_IDs,		const GArray *in_IDs,
	GError **error,		tp_cli_channel_type_text_callback_for_acknowledge_pending_messages call
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		back,
	#endif /* not TP_DISABLE_DEPRECATED */
	typedef void (*tp_cli_channel_type_text_callback_for_get_message_types) (Tp
	Channel *proxy,
	const GArray *out_Available_Types,
	const GError *error, gpointer user_data,
	GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_type_text_call_get_message_types (TpChan
	nel *proxy,
	gint timeout_ms,
	tp_cli_channel_type_text_callback_for_get_message_types callback,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED
	gboolean tp_cli_channel_type_text_run_get_message_types (TpChannel *proxy,
	gint timeout_ms,
	GArray **out_Available_Types,
	GError **error,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;
	#endif /* not TP_DISABLE_DEPRECATED */
	typedef void (*tp_cli_channel_type_text_callback_for_list_pending_messages)
	(TpChannel *proxy,
	const GPtrArray *out_Pending_Messages,
	const GError *error, gpointer user_data,
	GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_type_text_call_list_pending_messages (Tp
	Channel *proxy,
	gint timeout_ms,
	gboolean in_Clear,
	tp_cli_channel_type_text_callback_for_list_pending_messages callback,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED
	gboolean tp_cli_channel_type_text_run_list_pending_messages (TpChannel *pro
	xy,
	gint timeout_ms,
	gboolean in_Clear,
	GPtrArray **out_Pending_Messages,
	GError **error,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;
	#endif /* not TP_DISABLE_DEPRECATED */
	typedef void (*tp_cli_channel_type_text_callback_for_send) (TpChannel *prox
	y,
	const GError *error, gpointer user_data,
	GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_type_text_call_send (TpChannel *proxy,
	gint timeout_ms,
	guint in_Type,
	const gchar *in_Text,
	tp_cli_channel_type_text_callback_for_send callback,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED
	gboolean tp_cli_channel_type_text_run_send (TpChannel *proxy,
	gint timeout_ms,
	guint in_Type,
	const gchar *in_Text,
	GError **error,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;
	#endif /* not TP_DISABLE_DEPRECATED */
	typedef void (*tp_cli_channel_type_tubes_signal_callback_new_tube) (TpChann
	el *proxy,
	guint arg_ID,
	guint arg_Initiator,
	guint arg_Type,
	const gchar *arg_Service,
	GHashTable *arg_Parameters,
	guint arg_State,
	gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_channel_type_tubes_connect_to_new_tube (TpC
	hannel *proxy,
	tp_cli_channel_type_tubes_signal_callback_new_tube callback,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object,
	GError **error);
	typedef void (*tp_cli_channel_type_tubes_signal_callback_tube_state_changed
	) (TpChannel *proxy,
	guint arg_ID,
	guint arg_State,
	gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_channel_type_tubes_connect_to_tube_state_ch
	anged (TpChannel *proxy,
	tp_cli_channel_type_tubes_signal_callback_tube_state_changed callback,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object,
	GError **error);
	typedef void (*tp_cli_channel_type_tubes_signal_callback_tube_closed) (TpCh
	annel *proxy,
	guint arg_ID,
	gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_channel_type_tubes_connect_to_tube_closed (
	TpChannel *proxy,
	tp_cli_channel_type_tubes_signal_callback_tube_closed callback,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object,
	GError **error);
	typedef void (*tp_cli_channel_type_tubes_signal_callback_d_bus_names_change
	d) (TpChannel *proxy,
	guint arg_ID,
	const GPtrArray *arg_Added,
	const GArray *arg_Removed,
	gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_channel_type_tubes_connect_to_d_bus_names_c
	hanged (TpChannel *proxy,
	tp_cli_channel_type_tubes_signal_callback_d_bus_names_changed callback,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object,
	GError **error);
	typedef void (*tp_cli_channel_type_tubes_signal_callback_stream_tube_new_co
	nnection) (TpChannel *proxy,
	guint arg_ID,
	guint arg_Handle,
	gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_channel_type_tubes_connect_to_stream_tube_n
	ew_connection (TpChannel *proxy,
	tp_cli_channel_type_tubes_signal_callback_stream_tube_new_connection ca
	llback,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object,
	GError **error);
	typedef void (*tp_cli_channel_type_tubes_callback_for_get_available_stream_
	tube_types) (TpChannel *proxy,
	GHashTable *out_Available_Stream_Tube_Types,
	const GError *error, gpointer user_data,
	GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_type_tubes_call_get_available_stream_tub
	e_types (TpChannel *proxy,
	gint timeout_ms,
	tp_cli_channel_type_tubes_callback_for_get_available_stream_tube_types
	callback,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED
	gboolean tp_cli_channel_type_tubes_run_get_available_stream_tube_types (TpC
	hannel *proxy,
	gint timeout_ms,
	GHashTable **out_Available_Stream_Tube_Types,
	GError **error,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;
	#endif /* not TP_DISABLE_DEPRECATED */
	typedef void (*tp_cli_channel_type_tubes_callback_for_get_available_tube_ty
	pes) (TpChannel *proxy,
	const GArray *out_Available_Tube_Types,
	const GError *error, gpointer user_data,
	GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_type_tubes_call_get_available_tube_types
	(TpChannel *proxy,
	gint timeout_ms,
	tp_cli_channel_type_tubes_callback_for_get_available_tube_types callbac
	k,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED
	gboolean tp_cli_channel_type_tubes_run_get_available_tube_types (TpChannel
	*proxy,
	gint timeout_ms,
	GArray **out_Available_Tube_Types,
	GError **error,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;
	#endif /* not TP_DISABLE_DEPRECATED */
	typedef void (*tp_cli_channel_type_tubes_callback_for_list_tubes) (TpChanne
	l *proxy,
	const GPtrArray *out_Tubes,
	const GError *error, gpointer user_data,
	GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_type_tubes_call_list_tubes (TpChannel *p
	roxy,
	gint timeout_ms,
	tp_cli_channel_type_tubes_callback_for_list_tubes callback,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED
	gboolean tp_cli_channel_type_tubes_run_list_tubes (TpChannel *proxy,
	gint timeout_ms,
	GPtrArray **out_Tubes,
	GError **error,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;
	#endif /* not TP_DISABLE_DEPRECATED */
	typedef void (*tp_cli_channel_type_tubes_callback_for_offer_d_bus_tube) (Tp
	Channel *proxy,
	guint out_Tube_ID,
	const GError *error, gpointer user_data,
	GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_type_tubes_call_offer_d_bus_tube (TpChan
	nel *proxy,
	gint timeout_ms,
	const gchar *in_Service,
	GHashTable *in_Parameters,
	tp_cli_channel_type_tubes_callback_for_offer_d_bus_tube callback,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED
	gboolean tp_cli_channel_type_tubes_run_offer_d_bus_tube (TpChannel *proxy,
	gint timeout_ms,
	const gchar *in_Service,
	GHashTable *in_Parameters,
	guint *out_Tube_ID,
	GError **error,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;
	#endif /* not TP_DISABLE_DEPRECATED */
	typedef void (*tp_cli_channel_type_tubes_callback_for_offer_stream_tube) (T
	pChannel *proxy,
	guint out_Tube_ID,
	const GError *error, gpointer user_data,
	GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_type_tubes_call_offer_stream_tube (TpCha
	nnel *proxy,
	gint timeout_ms,
	const gchar *in_Service,
	GHashTable *in_Parameters,
	guint in_Address_Type,
	const GValue *in_Address,
	guint in_Access_Control,
	const GValue *in_Access_Control_Param,
	tp_cli_channel_type_tubes_callback_for_offer_stream_tube callback,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED
	gboolean tp_cli_channel_type_tubes_run_offer_stream_tube (TpChannel *proxy,
	gint timeout_ms,
	const gchar *in_Service,
	GHashTable *in_Parameters,
	guint in_Address_Type,
	const GValue *in_Address,
	guint in_Access_Control,
	const GValue *in_Access_Control_Param,
	guint *out_Tube_ID,
	GError **error,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;
	#endif /* not TP_DISABLE_DEPRECATED */
	typedef void (*tp_cli_channel_type_tubes_callback_for_accept_d_bus_tube) (T
	pChannel *proxy,
	const gchar *out_Address,
	const GError *error, gpointer user_data,
	GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_type_tubes_call_accept_d_bus_tube (TpCha
	nnel *proxy,
	gint timeout_ms,
	guint in_ID,
	tp_cli_channel_type_tubes_callback_for_accept_d_bus_tube callback,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED
	gboolean tp_cli_channel_type_tubes_run_accept_d_bus_tube (TpChannel *proxy,
	gint timeout_ms,
	guint in_ID,
	gchar **out_Address,
	GError **error,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;
	#endif /* not TP_DISABLE_DEPRECATED */
	typedef void (*tp_cli_channel_type_tubes_callback_for_accept_stream_tube) (
	TpChannel *proxy,
	const GValue *out_Address,
	const GError *error, gpointer user_data,
	GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_type_tubes_call_accept_stream_tube (TpCh
	annel *proxy,
	gint timeout_ms,
	guint in_ID,
	guint in_Address_Type,
	guint in_Access_Control,
	const GValue *in_Access_Control_Param,
	tp_cli_channel_type_tubes_callback_for_accept_stream_tube callback,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED
	gboolean tp_cli_channel_type_tubes_run_accept_stream_tube (TpChannel *proxy
	,
	gint timeout_ms,
	guint in_ID,
	guint in_Address_Type,
	guint in_Access_Control,
	const GValue *in_Access_Control_Param,
	GValue **out_Address,
	GError **error,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;
	#endif /* not TP_DISABLE_DEPRECATED */
	typedef void (*tp_cli_channel_type_tubes_callback_for_close_tube) (TpChanne
	l *proxy,
	const GError *error, gpointer user_data,
	GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_type_tubes_call_close_tube (TpChannel *p
	roxy,
	gint timeout_ms,
	guint in_ID,
	tp_cli_channel_type_tubes_callback_for_close_tube callback,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED
	gboolean tp_cli_channel_type_tubes_run_close_tube (TpChannel *proxy,
	gint timeout_ms,
	guint in_ID,
	GError **error,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;
	#endif /* not TP_DISABLE_DEPRECATED */
	typedef void (*tp_cli_channel_type_tubes_callback_for_get_d_bus_tube_addres
	s) (TpChannel *proxy,
	const gchar *out_Address,
	const GError *error, gpointer user_data,
	GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_type_tubes_call_get_d_bus_tube_address (
	TpChannel *proxy,
	gint timeout_ms,
	guint in_ID,
	tp_cli_channel_type_tubes_callback_for_get_d_bus_tube_address callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object)
			{
	#ifndef TP_DISABLE_DEPRECATED		g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
	gboolean tp_cli_channel_type_tubes_run_get_d_bus_tube_address (TpChannel *p		return tp_cli_channel_type_text_call_acknowledge_pending_messages (proxy,
	roxy,		timeout_ms,
	gint timeout_ms,		in_IDs,
	guint in_ID,		callback, user_data, destroy, weak_object);
	gchar **out_Address,		}
	GError **error,		#define tp_cli_channel_type_text_call_acknowledge_pending_messages(...) _tp
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		_cli_channel_type_text_call_acknowledge_pending_messages (__VA_ARGS__)
	#endif /* not TP_DISABLE_DEPRECATED */		#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_type_tubes_callback_for_get_d_bus_names) (TpC		typedef void (*tp_cli_channel_type_text_callback_for_send_message) (TpChann
	hannel *proxy,		el *proxy,
	const GPtrArray *out_DBus_Names,		const gchar *out_Token,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_type_tubes_call_get_d_bus_names (TpChann el *proxy,		TpProxyPendingCall *tp_cli_channel_type_text_call_send_message (TpChannel * proxy,
	gint timeout_ms,		gint timeout_ms,
	guint in_ID,		const GPtrArray *in_Message,
	tp_cli_channel_type_tubes_callback_for_get_d_bus_names callback,		guint in_Flags,
			tp_cli_channel_type_text_callback_for_send_message callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_channel_type_tubes_run_get_d_bus_names (TpChannel *proxy,		static inline TpProxyPendingCall *
			_tp_cli_channel_type_text_call_send_message (TpChannel *proxy,
	gint timeout_ms,		gint timeout_ms,
	guint in_ID,		const GPtrArray *in_Message,
	GPtrArray **out_DBus_Names,		guint in_Flags,
	GError **error,		tp_cli_channel_type_text_callback_for_send_message callback,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;
	#endif /* not TP_DISABLE_DEPRECATED */
	typedef void (*tp_cli_channel_type_tubes_callback_for_get_stream_tube_socke
	t_address) (TpChannel *proxy,
	guint out_Address_Type,
	const GValue *out_Address,
	const GError *error, gpointer user_data,
	GObject *weak_object);
	TpProxyPendingCall *tp_cli_channel_type_tubes_call_get_stream_tube_socket_a
	ddress (TpChannel *proxy,
	gint timeout_ms,
	guint in_ID,
	tp_cli_channel_type_tubes_callback_for_get_stream_tube_socket_address c
	allback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object)
			{
	#ifndef TP_DISABLE_DEPRECATED		g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
	gboolean tp_cli_channel_type_tubes_run_get_stream_tube_socket_address (TpCh		return tp_cli_channel_type_text_call_send_message (proxy, timeout_ms,
	annel *proxy,		in_Message,
	gint timeout_ms,		in_Flags,
	guint in_ID,		callback, user_data, destroy, weak_object);
	guint *out_Address_Type,		}
	GValue **out_Address,		#define tp_cli_channel_type_text_call_send_message(...) _tp_cli_channel_typ
	GError **error,		e_text_call_send_message (__VA_ARGS__)
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		#endif /* __GTK_DOC_IGNORE__ */
	#endif /* not TP_DISABLE_DEPRECATED */
			void tp_cli_channel_add_signals (TpProxy *self,
			guint quark,
			DBusGProxy *proxy,
			gpointer unused);
	G_END_DECLS		G_END_DECLS
	#endif /* defined (TP_GEN_TP_CLI_CHANNEL_H_INCLUDED) */		#endif /* defined (TP_GEN_TP_CLI_CHANNEL_H_INCLUDED) */
End of changes. 157 change blocks.
	1355 lines changed or deleted		1573 lines changed or added

	tp-cli-client.h		tp-cli-client.h
	skipping to change at line 20		skipping to change at line 20
	TpProxyPendingCall *tp_cli_client_approver_call_add_dispatch_operation (TpC lient *proxy,		TpProxyPendingCall *tp_cli_client_approver_call_add_dispatch_operation (TpC lient *proxy,
	gint timeout_ms,		gint timeout_ms,
	const GPtrArray *in_Channels,		const GPtrArray *in_Channels,
	const gchar *in_DispatchOperation,		const gchar *in_DispatchOperation,
	GHashTable *in_Properties,		GHashTable *in_Properties,
	tp_cli_client_approver_callback_for_add_dispatch_operation callback,		tp_cli_client_approver_callback_for_add_dispatch_operation callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxyPendingCall *
			_tp_cli_client_approver_call_add_dispatch_operation (TpClient *proxy,
			gint timeout_ms,
			const GPtrArray *in_Channels,
			const gchar *in_DispatchOperation,
			GHashTable *in_Properties,
			tp_cli_client_approver_callback_for_add_dispatch_operation callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CLIENT (proxy), NULL);
			return tp_cli_client_approver_call_add_dispatch_operation (proxy, timeout
			_ms,
			in_Channels,
			in_DispatchOperation,
			in_Properties,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_client_approver_call_add_dispatch_operation(...) _tp_cli_cli
			ent_approver_call_add_dispatch_operation (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_client_handler_callback_for_handle_channels) (TpClien t *proxy,		typedef void (*tp_cli_client_handler_callback_for_handle_channels) (TpClien t *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_client_handler_call_handle_channels (TpClient *p roxy,		TpProxyPendingCall *tp_cli_client_handler_call_handle_channels (TpClient *p roxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar *in_Account,		const gchar *in_Account,
	const gchar *in_Connection,		const gchar *in_Connection,
	const GPtrArray *in_Channels,		const GPtrArray *in_Channels,
	const GPtrArray *in_Requests_Satisfied,		const GPtrArray *in_Requests_Satisfied,
	guint64 in_User_Action_Time,		guint64 in_User_Action_Time,
	GHashTable *in_Handler_Info,		GHashTable *in_Handler_Info,
	tp_cli_client_handler_callback_for_handle_channels callback,		tp_cli_client_handler_callback_for_handle_channels callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxyPendingCall *
			_tp_cli_client_handler_call_handle_channels (TpClient *proxy,
			gint timeout_ms,
			const gchar *in_Account,
			const gchar *in_Connection,
			const GPtrArray *in_Channels,
			const GPtrArray *in_Requests_Satisfied,
			guint64 in_User_Action_Time,
			GHashTable *in_Handler_Info,
			tp_cli_client_handler_callback_for_handle_channels callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CLIENT (proxy), NULL);
			return tp_cli_client_handler_call_handle_channels (proxy, timeout_ms,
			in_Account,
			in_Connection,
			in_Channels,
			in_Requests_Satisfied,
			in_User_Action_Time,
			in_Handler_Info,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_client_handler_call_handle_channels(...) _tp_cli_client_hand
			ler_call_handle_channels (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_client_interface_requests_callback_for_add_request) ( TpClient *proxy,		typedef void (*tp_cli_client_interface_requests_callback_for_add_request) ( TpClient *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_client_interface_requests_call_add_request (TpCl ient *proxy,		TpProxyPendingCall *tp_cli_client_interface_requests_call_add_request (TpCl ient *proxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar *in_Request,		const gchar *in_Request,
	GHashTable *in_Properties,		GHashTable *in_Properties,
	tp_cli_client_interface_requests_callback_for_add_request callback,		tp_cli_client_interface_requests_callback_for_add_request callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxyPendingCall *
			_tp_cli_client_interface_requests_call_add_request (TpClient *proxy,
			gint timeout_ms,
			const gchar *in_Request,
			GHashTable *in_Properties,
			tp_cli_client_interface_requests_callback_for_add_request callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CLIENT (proxy), NULL);
			return tp_cli_client_interface_requests_call_add_request (proxy, timeout_
			ms,
			in_Request,
			in_Properties,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_client_interface_requests_call_add_request(...) _tp_cli_clie
			nt_interface_requests_call_add_request (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_client_interface_requests_callback_for_remove_request ) (TpClient *proxy,		typedef void (*tp_cli_client_interface_requests_callback_for_remove_request ) (TpClient *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_client_interface_requests_call_remove_request (T pClient *proxy,		TpProxyPendingCall *tp_cli_client_interface_requests_call_remove_request (T pClient *proxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar *in_Request,		const gchar *in_Request,
	const gchar *in_Error,		const gchar *in_Error,
	const gchar *in_Message,		const gchar *in_Message,
	tp_cli_client_interface_requests_callback_for_remove_request callback,		tp_cli_client_interface_requests_callback_for_remove_request callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxyPendingCall *
			_tp_cli_client_interface_requests_call_remove_request (TpClient *proxy,
			gint timeout_ms,
			const gchar *in_Request,
			const gchar *in_Error,
			const gchar *in_Message,
			tp_cli_client_interface_requests_callback_for_remove_request callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CLIENT (proxy), NULL);
			return tp_cli_client_interface_requests_call_remove_request (proxy, timeo
			ut_ms,
			in_Request,
			in_Error,
			in_Message,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_client_interface_requests_call_remove_request(...) _tp_cli_c
			lient_interface_requests_call_remove_request (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_client_observer_callback_for_observe_channels) (TpCli ent *proxy,		typedef void (*tp_cli_client_observer_callback_for_observe_channels) (TpCli ent *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_client_observer_call_observe_channels (TpClient *proxy,		TpProxyPendingCall *tp_cli_client_observer_call_observe_channels (TpClient *proxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar *in_Account,		const gchar *in_Account,
	const gchar *in_Connection,		const gchar *in_Connection,
	const GPtrArray *in_Channels,		const GPtrArray *in_Channels,
	const gchar *in_Dispatch_Operation,		const gchar *in_Dispatch_Operation,
	const GPtrArray *in_Requests_Satisfied,		const GPtrArray *in_Requests_Satisfied,
	GHashTable *in_Observer_Info,		GHashTable *in_Observer_Info,
	tp_cli_client_observer_callback_for_observe_channels callback,		tp_cli_client_observer_callback_for_observe_channels callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxyPendingCall *
			_tp_cli_client_observer_call_observe_channels (TpClient *proxy,
			gint timeout_ms,
			const gchar *in_Account,
			const gchar *in_Connection,
			const GPtrArray *in_Channels,
			const gchar *in_Dispatch_Operation,
			const GPtrArray *in_Requests_Satisfied,
			GHashTable *in_Observer_Info,
			tp_cli_client_observer_callback_for_observe_channels callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CLIENT (proxy), NULL);
			return tp_cli_client_observer_call_observe_channels (proxy, timeout_ms,
			in_Account,
			in_Connection,
			in_Channels,
			in_Dispatch_Operation,
			in_Requests_Satisfied,
			in_Observer_Info,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_client_observer_call_observe_channels(...) _tp_cli_client_ob
			server_call_observe_channels (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
			void tp_cli_client_add_signals (TpProxy *self,
			guint quark,
			DBusGProxy *proxy,
			gpointer unused);
	G_END_DECLS		G_END_DECLS
	#endif /* defined (TP_GEN_TP_CLI_CLIENT_H_INCLUDED) */		#endif /* defined (TP_GEN_TP_CLI_CLIENT_H_INCLUDED) */
End of changes. 5 change blocks.
	0 lines changed or deleted		133 lines changed or added

	tp-cli-connection-manager.h		tp-cli-connection-manager.h
	skipping to change at line 18		skipping to change at line 18
	const gchar *arg_Object_Path,		const gchar *arg_Object_Path,
	const gchar *arg_Protocol,		const gchar *arg_Protocol,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_connection_manager_connect_to_new_connectio n (TpConnectionManager *proxy,		TpProxySignalConnection *tp_cli_connection_manager_connect_to_new_connectio n (TpConnectionManager *proxy,
	tp_cli_connection_manager_signal_callback_new_connection callback,		tp_cli_connection_manager_signal_callback_new_connection callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
	typedef void (*tp_cli_connection_manager_callback_for_get_parameters) (TpCo		#ifndef __GTK_DOC_IGNORE__
	nnectionManager *proxy,		static inline TpProxySignalConnection *
	const GPtrArray *out_Parameters,		_tp_cli_connection_manager_connect_to_new_connection (TpConnectionManager *
	const GError *error, gpointer user_data,		proxy,
	GObject *weak_object);		tp_cli_connection_manager_signal_callback_new_connection callback,
	TpProxyPendingCall *tp_cli_connection_manager_call_get_parameters (TpConnec
	tionManager *proxy,
	gint timeout_ms,
	const gchar *in_Protocol,
	tp_cli_connection_manager_callback_for_get_parameters callback,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED
	gboolean tp_cli_connection_manager_run_get_parameters (TpConnectionManager
	*proxy,
	gint timeout_ms,
	const gchar *in_Protocol,
	GPtrArray **out_Parameters,
	GError **error,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;
	#endif /* not TP_DISABLE_DEPRECATED */
	typedef void (*tp_cli_connection_manager_callback_for_list_protocols) (TpCo
	nnectionManager *proxy,
	const gchar **out_Protocols,
	const GError *error, gpointer user_data,
	GObject *weak_object);
	TpProxyPendingCall *tp_cli_connection_manager_call_list_protocols (TpConnec
	tionManager *proxy,
	gint timeout_ms,
	tp_cli_connection_manager_callback_for_list_protocols callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object,
			GError **error)
	#ifndef TP_DISABLE_DEPRECATED		{
	gboolean tp_cli_connection_manager_run_list_protocols (TpConnectionManager		g_return_val_if_fail (TP_IS_CONNECTION_MANAGER (proxy), NULL);
	*proxy,		return tp_cli_connection_manager_connect_to_new_connection (proxy, callba
	gint timeout_ms,		ck, user_data,
	gchar ***out_Protocols,		destroy, weak_object, error);
	GError **error,		}
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		#define tp_cli_connection_manager_connect_to_new_connection(...) _tp_cli_co
	#endif /* not TP_DISABLE_DEPRECATED */		nnection_manager_connect_to_new_connection (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_connection_manager_callback_for_request_connection) ( TpConnectionManager *proxy,		typedef void (*tp_cli_connection_manager_callback_for_request_connection) ( TpConnectionManager *proxy,
	const gchar *out_Bus_Name,		const gchar *out_Bus_Name,
	const gchar *out_Object_Path,		const gchar *out_Object_Path,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_connection_manager_call_request_connection (TpCo nnectionManager *proxy,		TpProxyPendingCall *tp_cli_connection_manager_call_request_connection (TpCo nnectionManager *proxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar *in_Protocol,		const gchar *in_Protocol,
	GHashTable *in_Parameters,		GHashTable *in_Parameters,
	tp_cli_connection_manager_callback_for_request_connection callback,		tp_cli_connection_manager_callback_for_request_connection callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_connection_manager_run_request_connection (TpConnectionMana		static inline TpProxyPendingCall *
	ger *proxy,		_tp_cli_connection_manager_call_request_connection (TpConnectionManager *pr
			oxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar *in_Protocol,		const gchar *in_Protocol,
	GHashTable *in_Parameters,		GHashTable *in_Parameters,
	gchar **out_Bus_Name,		tp_cli_connection_manager_callback_for_request_connection callback,
	gchar **out_Object_Path,		gpointer user_data,
	GError **error,		GDestroyNotify destroy,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		GObject *weak_object)
	#endif /* not TP_DISABLE_DEPRECATED */		{
			g_return_val_if_fail (TP_IS_CONNECTION_MANAGER (proxy), NULL);
			return tp_cli_connection_manager_call_request_connection (proxy, timeout_
			ms,
			in_Protocol,
			in_Parameters,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_connection_manager_call_request_connection(...) _tp_cli_conn
			ection_manager_call_request_connection (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
			void tp_cli_connection_manager_add_signals (TpProxy *self,
			guint quark,
			DBusGProxy *proxy,
			gpointer unused);
	G_END_DECLS		G_END_DECLS
	#endif /* defined (TP_GEN_TP_CLI_CONNECTION_MANAGER_H_INCLUDED) */		#endif /* defined (TP_GEN_TP_CLI_CONNECTION_MANAGER_H_INCLUDED) */
End of changes. 4 change blocks.
	54 lines changed or deleted		40 lines changed or added

	tp-cli-connection.h		tp-cli-connection.h
	#ifndef TP_GEN_TP_CLI_CONNECTION_H_INCLUDED		#ifndef TP_GEN_TP_CLI_CONNECTION_H_INCLUDED
	#define TP_GEN_TP_CLI_CONNECTION_H_INCLUDED		#define TP_GEN_TP_CLI_CONNECTION_H_INCLUDED
	G_BEGIN_DECLS		G_BEGIN_DECLS
	typedef void (*tp_cli_connection_signal_callback_self_handle_changed) (TpCo
	nnection *proxy,
	guint arg_Self_Handle,
	gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_connection_connect_to_self_handle_changed (
	TpConnection *proxy,
	tp_cli_connection_signal_callback_self_handle_changed callback,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object,
	GError **error);
	typedef void (*tp_cli_connection_signal_callback_self_contact_changed) (TpC onnection *proxy,		typedef void (*tp_cli_connection_signal_callback_self_contact_changed) (TpC onnection *proxy,
	guint arg_Self_Handle,		guint arg_Self_Handle,
	const gchar *arg_Self_ID,		const gchar *arg_Self_ID,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_connection_connect_to_self_contact_changed (TpConnection *proxy,		TpProxySignalConnection *tp_cli_connection_connect_to_self_contact_changed (TpConnection *proxy,
	tp_cli_connection_signal_callback_self_contact_changed callback,		tp_cli_connection_signal_callback_self_contact_changed callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
	typedef void (*tp_cli_connection_signal_callback_new_channel) (TpConnection		#ifndef __GTK_DOC_IGNORE__
	*proxy,		static inline TpProxySignalConnection *
	const gchar *arg_Object_Path,		_tp_cli_connection_connect_to_self_contact_changed (TpConnection *proxy,
	const gchar *arg_Channel_Type,		tp_cli_connection_signal_callback_self_contact_changed callback,
	guint arg_Handle_Type,
	guint arg_Handle,
	gboolean arg_Suppress_Handler,
	gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_connection_connect_to_new_channel (TpConnec
	tion *proxy,
	tp_cli_connection_signal_callback_new_channel callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error)
			{
			g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
			return tp_cli_connection_connect_to_self_contact_changed (proxy, callback
			, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_connection_connect_to_self_contact_changed(...) _tp_cli_conn
			ection_connect_to_self_contact_changed (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_connection_signal_callback_connection_error) (TpConne ction *proxy,		typedef void (*tp_cli_connection_signal_callback_connection_error) (TpConne ction *proxy,
	const gchar *arg_Error,		const gchar *arg_Error,
	GHashTable *arg_Details,		GHashTable *arg_Details,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_connection_connect_to_connection_error (TpC onnection *proxy,		TpProxySignalConnection *tp_cli_connection_connect_to_connection_error (TpC onnection *proxy,
	tp_cli_connection_signal_callback_connection_error callback,		tp_cli_connection_signal_callback_connection_error callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_connection_connect_to_connection_error (TpConnection *proxy,
			tp_cli_connection_signal_callback_connection_error callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
			return tp_cli_connection_connect_to_connection_error (proxy, callback, us
			er_data,
			destroy, weak_object, error);
			}
			#define tp_cli_connection_connect_to_connection_error(...) _tp_cli_connecti
			on_connect_to_connection_error (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_connection_signal_callback_status_changed) (TpConnect ion *proxy,		typedef void (*tp_cli_connection_signal_callback_status_changed) (TpConnect ion *proxy,
	guint arg_Status,		guint arg_Status,
	guint arg_Reason,		guint arg_Reason,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_connection_connect_to_status_changed (TpCon nection *proxy,		TpProxySignalConnection *tp_cli_connection_connect_to_status_changed (TpCon nection *proxy,
	tp_cli_connection_signal_callback_status_changed callback,		tp_cli_connection_signal_callback_status_changed callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_connection_connect_to_status_changed (TpConnection *proxy,
			tp_cli_connection_signal_callback_status_changed callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
			return tp_cli_connection_connect_to_status_changed (proxy, callback, user
			_data,
			destroy, weak_object, error);
			}
			#define tp_cli_connection_connect_to_status_changed(...) _tp_cli_connection
			_connect_to_status_changed (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_connection_callback_for_connect) (TpConnection *proxy ,		typedef void (*tp_cli_connection_callback_for_connect) (TpConnection *proxy ,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_connection_call_connect (TpConnection *proxy,		TpProxyPendingCall *tp_cli_connection_call_connect (TpConnection *proxy,
	gint timeout_ms,		gint timeout_ms,
	tp_cli_connection_callback_for_connect callback,		tp_cli_connection_callback_for_connect callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_connection_run_connect (TpConnection *proxy,		static inline TpProxyPendingCall *
			_tp_cli_connection_call_connect (TpConnection *proxy,
	gint timeout_ms,		gint timeout_ms,
	GError **error,		tp_cli_connection_callback_for_connect callback,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		gpointer user_data,
	#endif /* not TP_DISABLE_DEPRECATED */		GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
			return tp_cli_connection_call_connect (proxy, timeout_ms,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_connection_call_connect(...) _tp_cli_connection_call_connect
			(__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_connection_callback_for_disconnect) (TpConnection *pr oxy,		typedef void (*tp_cli_connection_callback_for_disconnect) (TpConnection *pr oxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_connection_call_disconnect (TpConnection *proxy,		TpProxyPendingCall *tp_cli_connection_call_disconnect (TpConnection *proxy,
	gint timeout_ms,		gint timeout_ms,
	tp_cli_connection_callback_for_disconnect callback,		tp_cli_connection_callback_for_disconnect callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_connection_run_disconnect (TpConnection *proxy,		static inline TpProxyPendingCall *
	gint timeout_ms,		_tp_cli_connection_call_disconnect (TpConnection *proxy,
	GError **error,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;
	#endif /* not TP_DISABLE_DEPRECATED */
	typedef void (*tp_cli_connection_callback_for_get_interfaces) (TpConnection
	*proxy,
	const gchar **out_Interfaces,
	const GError *error, gpointer user_data,
	GObject *weak_object);
	TpProxyPendingCall *tp_cli_connection_call_get_interfaces (TpConnection *pr
	oxy,
	gint timeout_ms,
	tp_cli_connection_callback_for_get_interfaces callback,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED
	gboolean tp_cli_connection_run_get_interfaces (TpConnection *proxy,
	gint timeout_ms,
	gchar ***out_Interfaces,
	GError **error,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;
	#endif /* not TP_DISABLE_DEPRECATED */
	typedef void (*tp_cli_connection_callback_for_get_protocol) (TpConnection *
	proxy,
	const gchar *out_Protocol,
	const GError *error, gpointer user_data,
	GObject *weak_object);
	TpProxyPendingCall *tp_cli_connection_call_get_protocol (TpConnection *prox
	y,
	gint timeout_ms,		gint timeout_ms,
	tp_cli_connection_callback_for_get_protocol callback,		tp_cli_connection_callback_for_disconnect callback,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED
	gboolean tp_cli_connection_run_get_protocol (TpConnection *proxy,
	gint timeout_ms,
	gchar **out_Protocol,
	GError **error,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;
	#endif /* not TP_DISABLE_DEPRECATED */
	typedef void (*tp_cli_connection_callback_for_get_self_handle) (TpConnectio
	n *proxy,
	guint out_Self_Handle,
	const GError *error, gpointer user_data,
	GObject *weak_object);
	TpProxyPendingCall *tp_cli_connection_call_get_self_handle (TpConnection *p
	roxy,
	gint timeout_ms,
	tp_cli_connection_callback_for_get_self_handle callback,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED
	gboolean tp_cli_connection_run_get_self_handle (TpConnection *proxy,
	gint timeout_ms,
	guint *out_Self_Handle,
	GError **error,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;
	#endif /* not TP_DISABLE_DEPRECATED */
	typedef void (*tp_cli_connection_callback_for_get_status) (TpConnection *pr
	oxy,
	guint out_Status,
	const GError *error, gpointer user_data,
	GObject *weak_object);
	TpProxyPendingCall *tp_cli_connection_call_get_status (TpConnection *proxy,
	gint timeout_ms,
	tp_cli_connection_callback_for_get_status callback,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED
	gboolean tp_cli_connection_run_get_status (TpConnection *proxy,
	gint timeout_ms,
	guint *out_Status,
	GError **error,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;
	#endif /* not TP_DISABLE_DEPRECATED */
	typedef void (*tp_cli_connection_callback_for_hold_handles) (TpConnection *
	proxy,
	const GError *error, gpointer user_data,
	GObject *weak_object);
	TpProxyPendingCall *tp_cli_connection_call_hold_handles (TpConnection *prox
	y,
	gint timeout_ms,
	guint in_Handle_Type,
	const GArray *in_Handles,
	tp_cli_connection_callback_for_hold_handles callback,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED
	gboolean tp_cli_connection_run_hold_handles (TpConnection *proxy,
	gint timeout_ms,
	guint in_Handle_Type,
	const GArray *in_Handles,
	GError **error,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;
	#endif /* not TP_DISABLE_DEPRECATED */
	typedef void (*tp_cli_connection_callback_for_inspect_handles) (TpConnectio
	n *proxy,
	const gchar **out_Identifiers,
	const GError *error, gpointer user_data,
	GObject *weak_object);
	TpProxyPendingCall *tp_cli_connection_call_inspect_handles (TpConnection *p
	roxy,
	gint timeout_ms,
	guint in_Handle_Type,
	const GArray *in_Handles,
	tp_cli_connection_callback_for_inspect_handles callback,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED
	gboolean tp_cli_connection_run_inspect_handles (TpConnection *proxy,
	gint timeout_ms,
	guint in_Handle_Type,
	const GArray *in_Handles,
	gchar ***out_Identifiers,
	GError **error,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;
	#endif /* not TP_DISABLE_DEPRECATED */
	typedef void (*tp_cli_connection_callback_for_list_channels) (TpConnection
	*proxy,
	const GPtrArray *out_Channel_Info,
	const GError *error, gpointer user_data,
	GObject *weak_object);
	TpProxyPendingCall *tp_cli_connection_call_list_channels (TpConnection *pro
	xy,
	gint timeout_ms,
	tp_cli_connection_callback_for_list_channels callback,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED
	gboolean tp_cli_connection_run_list_channels (TpConnection *proxy,
	gint timeout_ms,
	GPtrArray **out_Channel_Info,
	GError **error,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;
	#endif /* not TP_DISABLE_DEPRECATED */
	typedef void (*tp_cli_connection_callback_for_release_handles) (TpConnectio
	n *proxy,
	const GError *error, gpointer user_data,
	GObject *weak_object);
	TpProxyPendingCall *tp_cli_connection_call_release_handles (TpConnection *p
	roxy,
	gint timeout_ms,
	guint in_Handle_Type,
	const GArray *in_Handles,
	tp_cli_connection_callback_for_release_handles callback,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED
	gboolean tp_cli_connection_run_release_handles (TpConnection *proxy,
	gint timeout_ms,
	guint in_Handle_Type,
	const GArray *in_Handles,
	GError **error,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;
	#endif /* not TP_DISABLE_DEPRECATED */
	typedef void (*tp_cli_connection_callback_for_request_channel) (TpConnectio
	n *proxy,
	const gchar *out_Object_Path,
	const GError *error, gpointer user_data,
	GObject *weak_object);
	TpProxyPendingCall *tp_cli_connection_call_request_channel (TpConnection *p
	roxy,
	gint timeout_ms,
	const gchar *in_Type,
	guint in_Handle_Type,
	guint in_Handle,
	gboolean in_Suppress_Handler,
	tp_cli_connection_callback_for_request_channel callback,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED
	gboolean tp_cli_connection_run_request_channel (TpConnection *proxy,
	gint timeout_ms,
	const gchar *in_Type,
	guint in_Handle_Type,
	guint in_Handle,
	gboolean in_Suppress_Handler,
	gchar **out_Object_Path,
	GError **error,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;
	#endif /* not TP_DISABLE_DEPRECATED */
	typedef void (*tp_cli_connection_callback_for_request_handles) (TpConnectio
	n *proxy,
	const GArray *out_Handles,
	const GError *error, gpointer user_data,
	GObject *weak_object);
	TpProxyPendingCall *tp_cli_connection_call_request_handles (TpConnection *p
	roxy,
	gint timeout_ms,
	guint in_Handle_Type,
	const gchar **in_Identifiers,
	tp_cli_connection_callback_for_request_handles callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object)
			{
	#ifndef TP_DISABLE_DEPRECATED		g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
	gboolean tp_cli_connection_run_request_handles (TpConnection *proxy,		return tp_cli_connection_call_disconnect (proxy, timeout_ms,
	gint timeout_ms,		callback, user_data, destroy, weak_object);
	guint in_Handle_Type,		}
	const gchar **in_Identifiers,		#define tp_cli_connection_call_disconnect(...) _tp_cli_connection_call_disc
	GArray **out_Handles,		onnect (__VA_ARGS__)
	GError **error,		#endif /* __GTK_DOC_IGNORE__ */
	GMainLoop **loop) _TP_GNUC_DEPRECATED;
	#endif /* not TP_DISABLE_DEPRECATED */
	typedef void (*tp_cli_connection_callback_for_add_client_interest) (TpConne ction *proxy,		typedef void (*tp_cli_connection_callback_for_add_client_interest) (TpConne ction *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_connection_call_add_client_interest (TpConnectio n *proxy,		TpProxyPendingCall *tp_cli_connection_call_add_client_interest (TpConnectio n *proxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar **in_Tokens,		const gchar **in_Tokens,
	tp_cli_connection_callback_for_add_client_interest callback,		tp_cli_connection_callback_for_add_client_interest callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_connection_run_add_client_interest (TpConnection *proxy,		static inline TpProxyPendingCall *
			_tp_cli_connection_call_add_client_interest (TpConnection *proxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar **in_Tokens,		const gchar **in_Tokens,
	GError **error,		tp_cli_connection_callback_for_add_client_interest callback,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		gpointer user_data,
	#endif /* not TP_DISABLE_DEPRECATED */		GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
			return tp_cli_connection_call_add_client_interest (proxy, timeout_ms,
			in_Tokens,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_connection_call_add_client_interest(...) _tp_cli_connection_
			call_add_client_interest (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_connection_callback_for_remove_client_interest) (TpCo nnection *proxy,		typedef void (*tp_cli_connection_callback_for_remove_client_interest) (TpCo nnection *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_connection_call_remove_client_interest (TpConnec tion *proxy,		TpProxyPendingCall *tp_cli_connection_call_remove_client_interest (TpConnec tion *proxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar **in_Tokens,		const gchar **in_Tokens,
	tp_cli_connection_callback_for_remove_client_interest callback,		tp_cli_connection_callback_for_remove_client_interest callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_connection_run_remove_client_interest (TpConnection *proxy,		static inline TpProxyPendingCall *
			_tp_cli_connection_call_remove_client_interest (TpConnection *proxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar **in_Tokens,		const gchar **in_Tokens,
	GError **error,		tp_cli_connection_callback_for_remove_client_interest callback,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		gpointer user_data,
	#endif /* not TP_DISABLE_DEPRECATED */		GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
			return tp_cli_connection_call_remove_client_interest (proxy, timeout_ms,
			in_Tokens,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_connection_call_remove_client_interest(...) _tp_cli_connecti
			on_call_remove_client_interest (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_connection_interface_addressing_callback_for_get_cont acts_by_vcard_field) (TpConnection *proxy,		typedef void (*tp_cli_connection_interface_addressing_callback_for_get_cont acts_by_vcard_field) (TpConnection *proxy,
	GHashTable *out_Requested,		GHashTable *out_Requested,
	GHashTable *out_Attributes,		GHashTable *out_Attributes,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_connection_interface_addressing_call_get_contact s_by_vcard_field (TpConnection *proxy,		TpProxyPendingCall *tp_cli_connection_interface_addressing_call_get_contact s_by_vcard_field (TpConnection *proxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar *in_Field,		const gchar *in_Field,
	const gchar **in_Addresses,		const gchar **in_Addresses,
	const gchar **in_Interfaces,		const gchar **in_Interfaces,
	tp_cli_connection_interface_addressing_callback_for_get_contacts_by_vca rd_field callback,		tp_cli_connection_interface_addressing_callback_for_get_contacts_by_vca rd_field callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxyPendingCall *
			_tp_cli_connection_interface_addressing_call_get_contacts_by_vcard_field (T
			pConnection *proxy,
			gint timeout_ms,
			const gchar *in_Field,
			const gchar **in_Addresses,
			const gchar **in_Interfaces,
			tp_cli_connection_interface_addressing_callback_for_get_contacts_by_vca
			rd_field callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
			return tp_cli_connection_interface_addressing_call_get_contacts_by_vcard_
			field (proxy, timeout_ms,
			in_Field,
			in_Addresses,
			in_Interfaces,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_connection_interface_addressing_call_get_contacts_by_vcard_f
			ield(...) _tp_cli_connection_interface_addressing_call_get_contacts_by_vcar
			d_field (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_connection_interface_addressing_callback_for_get_cont acts_by_uri) (TpConnection *proxy,		typedef void (*tp_cli_connection_interface_addressing_callback_for_get_cont acts_by_uri) (TpConnection *proxy,
	GHashTable *out_Requested,		GHashTable *out_Requested,
	GHashTable *out_Attributes,		GHashTable *out_Attributes,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_connection_interface_addressing_call_get_contact s_by_uri (TpConnection *proxy,		TpProxyPendingCall *tp_cli_connection_interface_addressing_call_get_contact s_by_uri (TpConnection *proxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar **in_URIs,		const gchar **in_URIs,
	const gchar **in_Interfaces,		const gchar **in_Interfaces,
	tp_cli_connection_interface_addressing_callback_for_get_contacts_by_uri callback,		tp_cli_connection_interface_addressing_callback_for_get_contacts_by_uri callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxyPendingCall *
			_tp_cli_connection_interface_addressing_call_get_contacts_by_uri (TpConnect
			ion *proxy,
			gint timeout_ms,
			const gchar **in_URIs,
			const gchar **in_Interfaces,
			tp_cli_connection_interface_addressing_callback_for_get_contacts_by_uri
			callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
			return tp_cli_connection_interface_addressing_call_get_contacts_by_uri (p
			roxy, timeout_ms,
			in_URIs,
			in_Interfaces,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_connection_interface_addressing_call_get_contacts_by_uri(...
			) _tp_cli_connection_interface_addressing_call_get_contacts_by_uri (__VA_AR
			GS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_connection_interface_aliasing_signal_callback_aliases _changed) (TpConnection *proxy,		typedef void (*tp_cli_connection_interface_aliasing_signal_callback_aliases _changed) (TpConnection *proxy,
	const GPtrArray *arg_Aliases,		GHashTable *arg_Aliases,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_connection_interface_aliasing_connect_to_al iases_changed (TpConnection *proxy,		TpProxySignalConnection *tp_cli_connection_interface_aliasing_connect_to_al iases_changed (TpConnection *proxy,
	tp_cli_connection_interface_aliasing_signal_callback_aliases_changed ca llback,		tp_cli_connection_interface_aliasing_signal_callback_aliases_changed ca llback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
	typedef void (*tp_cli_connection_interface_aliasing_callback_for_get_alias_		#ifndef __GTK_DOC_IGNORE__
	flags) (TpConnection *proxy,		static inline TpProxySignalConnection *
	guint out_Alias_Flags,		_tp_cli_connection_interface_aliasing_connect_to_aliases_changed (TpConnect
	const GError *error, gpointer user_data,		ion *proxy,
	GObject *weak_object);		tp_cli_connection_interface_aliasing_signal_callback_aliases_changed ca
			llback,
	TpProxyPendingCall *tp_cli_connection_interface_aliasing_call_get_alias_fla
	gs (TpConnection *proxy,
	gint timeout_ms,
	tp_cli_connection_interface_aliasing_callback_for_get_alias_flags callb
	ack,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object,
			GError **error)
	#ifndef TP_DISABLE_DEPRECATED		{
	gboolean tp_cli_connection_interface_aliasing_run_get_alias_flags (TpConnec		g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
	tion *proxy,		return tp_cli_connection_interface_aliasing_connect_to_aliases_changed (p
	gint timeout_ms,		roxy, callback, user_data,
	guint *out_Alias_Flags,		destroy, weak_object, error);
	GError **error,		}
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		#define tp_cli_connection_interface_aliasing_connect_to_aliases_changed(...
	#endif /* not TP_DISABLE_DEPRECATED */		) _tp_cli_connection_interface_aliasing_connect_to_aliases_changed (__VA_AR
			GS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_connection_interface_aliasing_callback_for_request_al iases) (TpConnection *proxy,		typedef void (*tp_cli_connection_interface_aliasing_callback_for_request_al iases) (TpConnection *proxy,
	const gchar **out_Aliases,		const gchar **out_Aliases,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_connection_interface_aliasing_call_request_alias es (TpConnection *proxy,		TpProxyPendingCall *tp_cli_connection_interface_aliasing_call_request_alias es (TpConnection *proxy,
	gint timeout_ms,		gint timeout_ms,
	const GArray *in_Contacts,		const GArray *in_Contacts,
	tp_cli_connection_interface_aliasing_callback_for_request_aliases callb ack,		tp_cli_connection_interface_aliasing_callback_for_request_aliases callb ack,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_connection_interface_aliasing_run_request_aliases (TpConnec		static inline TpProxyPendingCall *
	tion *proxy,		_tp_cli_connection_interface_aliasing_call_request_aliases (TpConnection *p
	gint timeout_ms,		roxy,
	const GArray *in_Contacts,
	gchar ***out_Aliases,
	GError **error,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;
	#endif /* not TP_DISABLE_DEPRECATED */
	typedef void (*tp_cli_connection_interface_aliasing_callback_for_get_aliase
	s) (TpConnection *proxy,
	GHashTable *out_Aliases,
	const GError *error, gpointer user_data,
	GObject *weak_object);
	TpProxyPendingCall *tp_cli_connection_interface_aliasing_call_get_aliases (
	TpConnection *proxy,
	gint timeout_ms,		gint timeout_ms,
	const GArray *in_Contacts,		const GArray *in_Contacts,
	tp_cli_connection_interface_aliasing_callback_for_get_aliases callback,		tp_cli_connection_interface_aliasing_callback_for_request_aliases callb ack,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object)
			{
	#ifndef TP_DISABLE_DEPRECATED		g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
	gboolean tp_cli_connection_interface_aliasing_run_get_aliases (TpConnection		return tp_cli_connection_interface_aliasing_call_request_aliases (proxy,
	*proxy,		timeout_ms,
	gint timeout_ms,		in_Contacts,
	const GArray *in_Contacts,		callback, user_data, destroy, weak_object);
	GHashTable **out_Aliases,		}
	GError **error,		#define tp_cli_connection_interface_aliasing_call_request_aliases(...) _tp_
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		cli_connection_interface_aliasing_call_request_aliases (__VA_ARGS__)
	#endif /* not TP_DISABLE_DEPRECATED */		#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_connection_interface_aliasing_callback_for_set_aliase s) (TpConnection *proxy,		typedef void (*tp_cli_connection_interface_aliasing_callback_for_set_aliase s) (TpConnection *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_connection_interface_aliasing_call_set_aliases ( TpConnection *proxy,		TpProxyPendingCall *tp_cli_connection_interface_aliasing_call_set_aliases ( TpConnection *proxy,
	gint timeout_ms,		gint timeout_ms,
	GHashTable *in_Aliases,		GHashTable *in_Aliases,
	tp_cli_connection_interface_aliasing_callback_for_set_aliases callback,		tp_cli_connection_interface_aliasing_callback_for_set_aliases callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_connection_interface_aliasing_run_set_aliases (TpConnection		static inline TpProxyPendingCall *
	*proxy,		_tp_cli_connection_interface_aliasing_call_set_aliases (TpConnection *proxy
			,
	gint timeout_ms,		gint timeout_ms,
	GHashTable *in_Aliases,		GHashTable *in_Aliases,
	GError **error,		tp_cli_connection_interface_aliasing_callback_for_set_aliases callback,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		gpointer user_data,
	#endif /* not TP_DISABLE_DEPRECATED */		GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
			return tp_cli_connection_interface_aliasing_call_set_aliases (proxy, time
			out_ms,
			in_Aliases,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_connection_interface_aliasing_call_set_aliases(...) _tp_cli_
			connection_interface_aliasing_call_set_aliases (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_connection_interface_anonymity_signal_callback_anonym ity_modes_changed) (TpConnection *proxy,		typedef void (*tp_cli_connection_interface_anonymity_signal_callback_anonym ity_modes_changed) (TpConnection *proxy,
	guint arg_Modes,		guint arg_Modes,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_connection_interface_anonymity_connect_to_a nonymity_modes_changed (TpConnection *proxy,		TpProxySignalConnection *tp_cli_connection_interface_anonymity_connect_to_a nonymity_modes_changed (TpConnection *proxy,
	tp_cli_connection_interface_anonymity_signal_callback_anonymity_modes_c hanged callback,		tp_cli_connection_interface_anonymity_signal_callback_anonymity_modes_c hanged callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_connection_interface_anonymity_connect_to_anonymity_modes_changed (
			TpConnection *proxy,
			tp_cli_connection_interface_anonymity_signal_callback_anonymity_modes_c
			hanged callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
			return tp_cli_connection_interface_anonymity_connect_to_anonymity_modes_c
			hanged (proxy, callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_connection_interface_anonymity_connect_to_anonymity_modes_ch
			anged(...) _tp_cli_connection_interface_anonymity_connect_to_anonymity_mode
			s_changed (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_connection_interface_avatars_signal_callback_avatar_u pdated) (TpConnection *proxy,		typedef void (*tp_cli_connection_interface_avatars_signal_callback_avatar_u pdated) (TpConnection *proxy,
	guint arg_Contact,		guint arg_Contact,
	const gchar *arg_New_Avatar_Token,		const gchar *arg_New_Avatar_Token,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_connection_interface_avatars_connect_to_ava tar_updated (TpConnection *proxy,		TpProxySignalConnection *tp_cli_connection_interface_avatars_connect_to_ava tar_updated (TpConnection *proxy,
	tp_cli_connection_interface_avatars_signal_callback_avatar_updated call back,		tp_cli_connection_interface_avatars_signal_callback_avatar_updated call back,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_connection_interface_avatars_connect_to_avatar_updated (TpConnectio
			n *proxy,
			tp_cli_connection_interface_avatars_signal_callback_avatar_updated call
			back,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
			return tp_cli_connection_interface_avatars_connect_to_avatar_updated (pro
			xy, callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_connection_interface_avatars_connect_to_avatar_updated(...)
			_tp_cli_connection_interface_avatars_connect_to_avatar_updated (__VA_ARGS__
			)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_connection_interface_avatars_signal_callback_avatar_r etrieved) (TpConnection *proxy,		typedef void (*tp_cli_connection_interface_avatars_signal_callback_avatar_r etrieved) (TpConnection *proxy,
	guint arg_Contact,		guint arg_Contact,
	const gchar *arg_Token,		const gchar *arg_Token,
	const GArray *arg_Avatar,		const GArray *arg_Avatar,
	const gchar *arg_Type,		const gchar *arg_Type,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_connection_interface_avatars_connect_to_ava tar_retrieved (TpConnection *proxy,		TpProxySignalConnection *tp_cli_connection_interface_avatars_connect_to_ava tar_retrieved (TpConnection *proxy,
	tp_cli_connection_interface_avatars_signal_callback_avatar_retrieved ca llback,		tp_cli_connection_interface_avatars_signal_callback_avatar_retrieved ca llback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
	typedef void (*tp_cli_connection_interface_avatars_callback_for_get_avatar_		#ifndef __GTK_DOC_IGNORE__
	requirements) (TpConnection *proxy,		static inline TpProxySignalConnection *
	const gchar **out_MIME_Types,		_tp_cli_connection_interface_avatars_connect_to_avatar_retrieved (TpConnect
	guint out_Min_Width,		ion *proxy,
	guint out_Min_Height,		tp_cli_connection_interface_avatars_signal_callback_avatar_retrieved ca
	guint out_Max_Width,		llback,
	guint out_Max_Height,
	guint out_Max_Bytes,
	const GError *error, gpointer user_data,
	GObject *weak_object);
	TpProxyPendingCall *tp_cli_connection_interface_avatars_call_get_avatar_req
	uirements (TpConnection *proxy,
	gint timeout_ms,
	tp_cli_connection_interface_avatars_callback_for_get_avatar_requirement
	s callback,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED
	gboolean tp_cli_connection_interface_avatars_run_get_avatar_requirements (T
	pConnection *proxy,
	gint timeout_ms,
	gchar ***out_MIME_Types,
	guint *out_Min_Width,
	guint *out_Min_Height,
	guint *out_Max_Width,
	guint *out_Max_Height,
	guint *out_Max_Bytes,
	GError **error,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;
	#endif /* not TP_DISABLE_DEPRECATED */
	typedef void (*tp_cli_connection_interface_avatars_callback_for_get_avatar_
	tokens) (TpConnection *proxy,
	const gchar **out_Tokens,
	const GError *error, gpointer user_data,
	GObject *weak_object);
	TpProxyPendingCall *tp_cli_connection_interface_avatars_call_get_avatar_tok
	ens (TpConnection *proxy,
	gint timeout_ms,
	const GArray *in_Contacts,
	tp_cli_connection_interface_avatars_callback_for_get_avatar_tokens call
	back,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object,
			GError **error)
	#ifndef TP_DISABLE_DEPRECATED		{
	gboolean tp_cli_connection_interface_avatars_run_get_avatar_tokens (TpConne		g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
	ction *proxy,		return tp_cli_connection_interface_avatars_connect_to_avatar_retrieved (p
	gint timeout_ms,		roxy, callback, user_data,
	const GArray *in_Contacts,		destroy, weak_object, error);
	gchar ***out_Tokens,		}
	GError **error,		#define tp_cli_connection_interface_avatars_connect_to_avatar_retrieved(...
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		) _tp_cli_connection_interface_avatars_connect_to_avatar_retrieved (__VA_AR
	#endif /* not TP_DISABLE_DEPRECATED */		GS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_connection_interface_avatars_callback_for_get_known_a vatar_tokens) (TpConnection *proxy,		typedef void (*tp_cli_connection_interface_avatars_callback_for_get_known_a vatar_tokens) (TpConnection *proxy,
	GHashTable *out_Tokens,		GHashTable *out_Tokens,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_connection_interface_avatars_call_get_known_avat ar_tokens (TpConnection *proxy,		TpProxyPendingCall *tp_cli_connection_interface_avatars_call_get_known_avat ar_tokens (TpConnection *proxy,
	gint timeout_ms,		gint timeout_ms,
	const GArray *in_Contacts,		const GArray *in_Contacts,
	tp_cli_connection_interface_avatars_callback_for_get_known_avatar_token s callback,		tp_cli_connection_interface_avatars_callback_for_get_known_avatar_token s callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_connection_interface_avatars_run_get_known_avatar_tokens (T		static inline TpProxyPendingCall *
	pConnection *proxy,		_tp_cli_connection_interface_avatars_call_get_known_avatar_tokens (TpConnec
			tion *proxy,
	gint timeout_ms,		gint timeout_ms,
	const GArray *in_Contacts,		const GArray *in_Contacts,
	GHashTable **out_Tokens,		tp_cli_connection_interface_avatars_callback_for_get_known_avatar_token
	GError **error,		s callback,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;
	#endif /* not TP_DISABLE_DEPRECATED */
	typedef void (*tp_cli_connection_interface_avatars_callback_for_request_ava
	tar) (TpConnection *proxy,
	const GArray *out_Data,
	const gchar *out_MIME_Type,
	const GError *error, gpointer user_data,
	GObject *weak_object);
	TpProxyPendingCall *tp_cli_connection_interface_avatars_call_request_avatar
	(TpConnection *proxy,
	gint timeout_ms,
	guint in_Contact,
	tp_cli_connection_interface_avatars_callback_for_request_avatar callbac
	k,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object)
			{
	#ifndef TP_DISABLE_DEPRECATED		g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
	gboolean tp_cli_connection_interface_avatars_run_request_avatar (TpConnecti		return tp_cli_connection_interface_avatars_call_get_known_avatar_tokens (
	on *proxy,		proxy, timeout_ms,
	gint timeout_ms,		in_Contacts,
	guint in_Contact,		callback, user_data, destroy, weak_object);
	GArray **out_Data,		}
	gchar **out_MIME_Type,		#define tp_cli_connection_interface_avatars_call_get_known_avatar_tokens(..
	GError **error,		.) _tp_cli_connection_interface_avatars_call_get_known_avatar_tokens (__VA_
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		ARGS__)
	#endif /* not TP_DISABLE_DEPRECATED */		#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_connection_interface_avatars_callback_for_request_ava tars) (TpConnection *proxy,		typedef void (*tp_cli_connection_interface_avatars_callback_for_request_ava tars) (TpConnection *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_connection_interface_avatars_call_request_avatar s (TpConnection *proxy,		TpProxyPendingCall *tp_cli_connection_interface_avatars_call_request_avatar s (TpConnection *proxy,
	gint timeout_ms,		gint timeout_ms,
	const GArray *in_Contacts,		const GArray *in_Contacts,
	tp_cli_connection_interface_avatars_callback_for_request_avatars callba ck,		tp_cli_connection_interface_avatars_callback_for_request_avatars callba ck,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_connection_interface_avatars_run_request_avatars (TpConnect		static inline TpProxyPendingCall *
	ion *proxy,		_tp_cli_connection_interface_avatars_call_request_avatars (TpConnection *pr
			oxy,
	gint timeout_ms,		gint timeout_ms,
	const GArray *in_Contacts,		const GArray *in_Contacts,
	GError **error,		tp_cli_connection_interface_avatars_callback_for_request_avatars callba
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		ck,
	#endif /* not TP_DISABLE_DEPRECATED */		gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
			return tp_cli_connection_interface_avatars_call_request_avatars (proxy, t
			imeout_ms,
			in_Contacts,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_connection_interface_avatars_call_request_avatars(...) _tp_c
			li_connection_interface_avatars_call_request_avatars (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_connection_interface_avatars_callback_for_set_avatar) (TpConnection *proxy,		typedef void (*tp_cli_connection_interface_avatars_callback_for_set_avatar) (TpConnection *proxy,
	const gchar *out_Token,		const gchar *out_Token,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_connection_interface_avatars_call_set_avatar (Tp Connection *proxy,		TpProxyPendingCall *tp_cli_connection_interface_avatars_call_set_avatar (Tp Connection *proxy,
	gint timeout_ms,		gint timeout_ms,
	const GArray *in_Avatar,		const GArray *in_Avatar,
	const gchar *in_MIME_Type,		const gchar *in_MIME_Type,
	tp_cli_connection_interface_avatars_callback_for_set_avatar callback,		tp_cli_connection_interface_avatars_callback_for_set_avatar callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_connection_interface_avatars_run_set_avatar (TpConnection *		static inline TpProxyPendingCall *
	proxy,		_tp_cli_connection_interface_avatars_call_set_avatar (TpConnection *proxy,
	gint timeout_ms,		gint timeout_ms,
	const GArray *in_Avatar,		const GArray *in_Avatar,
	const gchar *in_MIME_Type,		const gchar *in_MIME_Type,
	gchar **out_Token,		tp_cli_connection_interface_avatars_callback_for_set_avatar callback,
	GError **error,		gpointer user_data,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		GDestroyNotify destroy,
	#endif /* not TP_DISABLE_DEPRECATED */		GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
			return tp_cli_connection_interface_avatars_call_set_avatar (proxy, timeou
			t_ms,
			in_Avatar,
			in_MIME_Type,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_connection_interface_avatars_call_set_avatar(...) _tp_cli_co
			nnection_interface_avatars_call_set_avatar (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_connection_interface_avatars_callback_for_clear_avata r) (TpConnection *proxy,		typedef void (*tp_cli_connection_interface_avatars_callback_for_clear_avata r) (TpConnection *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_connection_interface_avatars_call_clear_avatar ( TpConnection *proxy,		TpProxyPendingCall *tp_cli_connection_interface_avatars_call_clear_avatar ( TpConnection *proxy,
	gint timeout_ms,		gint timeout_ms,
	tp_cli_connection_interface_avatars_callback_for_clear_avatar callback,		tp_cli_connection_interface_avatars_callback_for_clear_avatar callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_connection_interface_avatars_run_clear_avatar (TpConnection		static inline TpProxyPendingCall *
	*proxy,		_tp_cli_connection_interface_avatars_call_clear_avatar (TpConnection *proxy
			,
	gint timeout_ms,		gint timeout_ms,
	GError **error,		tp_cli_connection_interface_avatars_callback_for_clear_avatar callback,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		gpointer user_data,
	#endif /* not TP_DISABLE_DEPRECATED */		GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
			return tp_cli_connection_interface_avatars_call_clear_avatar (proxy, time
			out_ms,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_connection_interface_avatars_call_clear_avatar(...) _tp_cli_
			connection_interface_avatars_call_clear_avatar (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_connection_interface_balance_signal_callback_balance_ changed) (TpConnection *proxy,		typedef void (*tp_cli_connection_interface_balance_signal_callback_balance_ changed) (TpConnection *proxy,
	const GValueArray *arg_Balance,		const GValueArray *arg_Balance,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_connection_interface_balance_connect_to_bal ance_changed (TpConnection *proxy,		TpProxySignalConnection *tp_cli_connection_interface_balance_connect_to_bal ance_changed (TpConnection *proxy,
	tp_cli_connection_interface_balance_signal_callback_balance_changed cal lback,		tp_cli_connection_interface_balance_signal_callback_balance_changed cal lback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
	typedef void (*tp_cli_connection_interface_capabilities_signal_callback_cap		#ifndef __GTK_DOC_IGNORE__
	abilities_changed) (TpConnection *proxy,		static inline TpProxySignalConnection *
	const GPtrArray *arg_Caps,		_tp_cli_connection_interface_balance_connect_to_balance_changed (TpConnecti
	gpointer user_data, GObject *weak_object);		on *proxy,
	TpProxySignalConnection *tp_cli_connection_interface_capabilities_connect_t		tp_cli_connection_interface_balance_signal_callback_balance_changed cal
	o_capabilities_changed (TpConnection *proxy,		lback,
	tp_cli_connection_interface_capabilities_signal_callback_capabilities_c
	hanged callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error)
			{
	typedef void (*tp_cli_connection_interface_capabilities_callback_for_advert		g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
	ise_capabilities) (TpConnection *proxy,		return tp_cli_connection_interface_balance_connect_to_balance_changed (pr
	const GPtrArray *out_Self_Capabilities,		oxy, callback, user_data,
	const GError *error, gpointer user_data,		destroy, weak_object, error);
	GObject *weak_object);		}
			#define tp_cli_connection_interface_balance_connect_to_balance_changed(...)
	TpProxyPendingCall *tp_cli_connection_interface_capabilities_call_advertise		_tp_cli_connection_interface_balance_connect_to_balance_changed (__VA_ARGS
	_capabilities (TpConnection *proxy,		__)
	gint timeout_ms,		#endif /* __GTK_DOC_IGNORE__ */
	const GPtrArray *in_Add,
	const gchar **in_Remove,
	tp_cli_connection_interface_capabilities_callback_for_advertise_capabil
	ities callback,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED
	gboolean tp_cli_connection_interface_capabilities_run_advertise_capabilitie
	s (TpConnection *proxy,
	gint timeout_ms,
	const GPtrArray *in_Add,
	const gchar **in_Remove,
	GPtrArray **out_Self_Capabilities,
	GError **error,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;
	#endif /* not TP_DISABLE_DEPRECATED */
	typedef void (*tp_cli_connection_interface_capabilities_callback_for_get_ca
	pabilities) (TpConnection *proxy,
	const GPtrArray *out_Contact_Capabilities,
	const GError *error, gpointer user_data,
	GObject *weak_object);
	TpProxyPendingCall *tp_cli_connection_interface_capabilities_call_get_capab
	ilities (TpConnection *proxy,
	gint timeout_ms,
	const GArray *in_Handles,
	tp_cli_connection_interface_capabilities_callback_for_get_capabilities
	callback,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED
	gboolean tp_cli_connection_interface_capabilities_run_get_capabilities (TpC
	onnection *proxy,
	gint timeout_ms,
	const GArray *in_Handles,
	GPtrArray **out_Contact_Capabilities,
	GError **error,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;
	#endif /* not TP_DISABLE_DEPRECATED */
	typedef void (*tp_cli_connection_interface_cellular_signal_callback_imsi_ch anged) (TpConnection *proxy,		typedef void (*tp_cli_connection_interface_cellular_signal_callback_imsi_ch anged) (TpConnection *proxy,
	const gchar *arg_IMSI,		const gchar *arg_IMSI,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_connection_interface_cellular_connect_to_im si_changed (TpConnection *proxy,		TpProxySignalConnection *tp_cli_connection_interface_cellular_connect_to_im si_changed (TpConnection *proxy,
	tp_cli_connection_interface_cellular_signal_callback_imsi_changed callb ack,		tp_cli_connection_interface_cellular_signal_callback_imsi_changed callb ack,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_connection_interface_cellular_connect_to_imsi_changed (TpConnection
			*proxy,
			tp_cli_connection_interface_cellular_signal_callback_imsi_changed callb
			ack,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
			return tp_cli_connection_interface_cellular_connect_to_imsi_changed (prox
			y, callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_connection_interface_cellular_connect_to_imsi_changed(...) _
			tp_cli_connection_interface_cellular_connect_to_imsi_changed (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_connection_interface_client_types_signal_callback_cli ent_types_updated) (TpConnection *proxy,		typedef void (*tp_cli_connection_interface_client_types_signal_callback_cli ent_types_updated) (TpConnection *proxy,
	guint arg_Contact,		guint arg_Contact,
	const gchar **arg_Client_Types,		const gchar **arg_Client_Types,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_connection_interface_client_types_connect_t o_client_types_updated (TpConnection *proxy,		TpProxySignalConnection *tp_cli_connection_interface_client_types_connect_t o_client_types_updated (TpConnection *proxy,
	tp_cli_connection_interface_client_types_signal_callback_client_types_u pdated callback,		tp_cli_connection_interface_client_types_signal_callback_client_types_u pdated callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
	typedef void (*tp_cli_connection_interface_client_types_callback_for_get_cl		#ifndef __GTK_DOC_IGNORE__
	ient_types) (TpConnection *proxy,		static inline TpProxySignalConnection *
	GHashTable *out_Client_Types,		_tp_cli_connection_interface_client_types_connect_to_client_types_updated (
	const GError *error, gpointer user_data,		TpConnection *proxy,
	GObject *weak_object);		tp_cli_connection_interface_client_types_signal_callback_client_types_u
			pdated callback,
	TpProxyPendingCall *tp_cli_connection_interface_client_types_call_get_clien
	t_types (TpConnection *proxy,
	gint timeout_ms,
	const GArray *in_Contacts,
	tp_cli_connection_interface_client_types_callback_for_get_client_types
	callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object,
			GError **error)
	#ifndef TP_DISABLE_DEPRECATED		{
	gboolean tp_cli_connection_interface_client_types_run_get_client_types (TpC		g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
	onnection *proxy,		return tp_cli_connection_interface_client_types_connect_to_client_types_u
	gint timeout_ms,		pdated (proxy, callback, user_data,
	const GArray *in_Contacts,		destroy, weak_object, error);
	GHashTable **out_Client_Types,		}
	GError **error,		#define tp_cli_connection_interface_client_types_connect_to_client_types_up
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		dated(...) _tp_cli_connection_interface_client_types_connect_to_client_type
	#endif /* not TP_DISABLE_DEPRECATED */		s_updated (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_connection_interface_client_types_callback_for_reques t_client_types) (TpConnection *proxy,		typedef void (*tp_cli_connection_interface_client_types_callback_for_reques t_client_types) (TpConnection *proxy,
	const gchar **out_Client_Types,		const gchar **out_Client_Types,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_connection_interface_client_types_call_request_c lient_types (TpConnection *proxy,		TpProxyPendingCall *tp_cli_connection_interface_client_types_call_request_c lient_types (TpConnection *proxy,
	gint timeout_ms,		gint timeout_ms,
	guint in_Contact,		guint in_Contact,
	tp_cli_connection_interface_client_types_callback_for_request_client_ty pes callback,		tp_cli_connection_interface_client_types_callback_for_request_client_ty pes callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_connection_interface_client_types_run_request_client_types		static inline TpProxyPendingCall *
	(TpConnection *proxy,		_tp_cli_connection_interface_client_types_call_request_client_types (TpConn
			ection *proxy,
	gint timeout_ms,		gint timeout_ms,
	guint in_Contact,		guint in_Contact,
	gchar ***out_Client_Types,		tp_cli_connection_interface_client_types_callback_for_request_client_ty
	GError **error,		pes callback,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		gpointer user_data,
	#endif /* not TP_DISABLE_DEPRECATED */		GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
			return tp_cli_connection_interface_client_types_call_request_client_types
			(proxy, timeout_ms,
			in_Contact,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_connection_interface_client_types_call_request_client_types(
			...) _tp_cli_connection_interface_client_types_call_request_client_types (_
			_VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_connection_interface_contact_blocking_signal_callback _blocked_contacts_changed) (TpConnection *proxy,		typedef void (*tp_cli_connection_interface_contact_blocking_signal_callback _blocked_contacts_changed) (TpConnection *proxy,
	GHashTable *arg_Blocked_Contacts,		GHashTable *arg_Blocked_Contacts,
	GHashTable *arg_Unblocked_Contacts,		GHashTable *arg_Unblocked_Contacts,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_connection_interface_contact_blocking_conne ct_to_blocked_contacts_changed (TpConnection *proxy,		TpProxySignalConnection *tp_cli_connection_interface_contact_blocking_conne ct_to_blocked_contacts_changed (TpConnection *proxy,
	tp_cli_connection_interface_contact_blocking_signal_callback_blocked_co ntacts_changed callback,		tp_cli_connection_interface_contact_blocking_signal_callback_blocked_co ntacts_changed callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_connection_interface_contact_blocking_connect_to_blocked_contacts_c
			hanged (TpConnection *proxy,
			tp_cli_connection_interface_contact_blocking_signal_callback_blocked_co
			ntacts_changed callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
			return tp_cli_connection_interface_contact_blocking_connect_to_blocked_co
			ntacts_changed (proxy, callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_connection_interface_contact_blocking_connect_to_blocked_con
			tacts_changed(...) _tp_cli_connection_interface_contact_blocking_connect_to
			_blocked_contacts_changed (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_connection_interface_contact_blocking_callback_for_bl ock_contacts) (TpConnection *proxy,		typedef void (*tp_cli_connection_interface_contact_blocking_callback_for_bl ock_contacts) (TpConnection *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_connection_interface_contact_blocking_call_block _contacts (TpConnection *proxy,		TpProxyPendingCall *tp_cli_connection_interface_contact_blocking_call_block _contacts (TpConnection *proxy,
	gint timeout_ms,		gint timeout_ms,
	const GArray *in_Contacts,		const GArray *in_Contacts,
	gboolean in_Report_Abusive,		gboolean in_Report_Abusive,
	tp_cli_connection_interface_contact_blocking_callback_for_block_contact s callback,		tp_cli_connection_interface_contact_blocking_callback_for_block_contact s callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_connection_interface_contact_blocking_run_block_contacts (T		static inline TpProxyPendingCall *
	pConnection *proxy,		_tp_cli_connection_interface_contact_blocking_call_block_contacts (TpConnec
			tion *proxy,
	gint timeout_ms,		gint timeout_ms,
	const GArray *in_Contacts,		const GArray *in_Contacts,
	gboolean in_Report_Abusive,		gboolean in_Report_Abusive,
	GError **error,		tp_cli_connection_interface_contact_blocking_callback_for_block_contact
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		s callback,
	#endif /* not TP_DISABLE_DEPRECATED */		gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
			return tp_cli_connection_interface_contact_blocking_call_block_contacts (
			proxy, timeout_ms,
			in_Contacts,
			in_Report_Abusive,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_connection_interface_contact_blocking_call_block_contacts(..
			.) _tp_cli_connection_interface_contact_blocking_call_block_contacts (__VA_
			ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_connection_interface_contact_blocking_callback_for_un block_contacts) (TpConnection *proxy,		typedef void (*tp_cli_connection_interface_contact_blocking_callback_for_un block_contacts) (TpConnection *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_connection_interface_contact_blocking_call_unblo ck_contacts (TpConnection *proxy,		TpProxyPendingCall *tp_cli_connection_interface_contact_blocking_call_unblo ck_contacts (TpConnection *proxy,
	gint timeout_ms,		gint timeout_ms,
	const GArray *in_Contacts,		const GArray *in_Contacts,
	tp_cli_connection_interface_contact_blocking_callback_for_unblock_conta cts callback,		tp_cli_connection_interface_contact_blocking_callback_for_unblock_conta cts callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_connection_interface_contact_blocking_run_unblock_contacts		static inline TpProxyPendingCall *
	(TpConnection *proxy,		_tp_cli_connection_interface_contact_blocking_call_unblock_contacts (TpConn
			ection *proxy,
	gint timeout_ms,		gint timeout_ms,
	const GArray *in_Contacts,		const GArray *in_Contacts,
	GError **error,		tp_cli_connection_interface_contact_blocking_callback_for_unblock_conta
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		cts callback,
	#endif /* not TP_DISABLE_DEPRECATED */		gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
			return tp_cli_connection_interface_contact_blocking_call_unblock_contacts
			(proxy, timeout_ms,
			in_Contacts,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_connection_interface_contact_blocking_call_unblock_contacts(
			...) _tp_cli_connection_interface_contact_blocking_call_unblock_contacts (_
			_VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_connection_interface_contact_blocking_callback_for_re quest_blocked_contacts) (TpConnection *proxy,		typedef void (*tp_cli_connection_interface_contact_blocking_callback_for_re quest_blocked_contacts) (TpConnection *proxy,
	GHashTable *out_Contacts,		GHashTable *out_Contacts,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_connection_interface_contact_blocking_call_reque st_blocked_contacts (TpConnection *proxy,		TpProxyPendingCall *tp_cli_connection_interface_contact_blocking_call_reque st_blocked_contacts (TpConnection *proxy,
	gint timeout_ms,		gint timeout_ms,
	tp_cli_connection_interface_contact_blocking_callback_for_request_block ed_contacts callback,		tp_cli_connection_interface_contact_blocking_callback_for_request_block ed_contacts callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_connection_interface_contact_blocking_run_request_blocked_c		static inline TpProxyPendingCall *
	ontacts (TpConnection *proxy,		_tp_cli_connection_interface_contact_blocking_call_request_blocked_contacts
			(TpConnection *proxy,
	gint timeout_ms,		gint timeout_ms,
	GHashTable **out_Contacts,		tp_cli_connection_interface_contact_blocking_callback_for_request_block
	GError **error,		ed_contacts callback,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		gpointer user_data,
	#endif /* not TP_DISABLE_DEPRECATED */		GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
			return tp_cli_connection_interface_contact_blocking_call_request_blocked_
			contacts (proxy, timeout_ms,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_connection_interface_contact_blocking_call_request_blocked_c
			ontacts(...) _tp_cli_connection_interface_contact_blocking_call_request_blo
			cked_contacts (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_connection_interface_contact_capabilities_signal_call back_contact_capabilities_changed) (TpConnection *proxy,		typedef void (*tp_cli_connection_interface_contact_capabilities_signal_call back_contact_capabilities_changed) (TpConnection *proxy,
	GHashTable *arg_caps,		GHashTable *arg_caps,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_connection_interface_contact_capabilities_c onnect_to_contact_capabilities_changed (TpConnection *proxy,		TpProxySignalConnection *tp_cli_connection_interface_contact_capabilities_c onnect_to_contact_capabilities_changed (TpConnection *proxy,
	tp_cli_connection_interface_contact_capabilities_signal_callback_contac t_capabilities_changed callback,		tp_cli_connection_interface_contact_capabilities_signal_callback_contac t_capabilities_changed callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_connection_interface_contact_capabilities_connect_to_contact_capabi
			lities_changed (TpConnection *proxy,
			tp_cli_connection_interface_contact_capabilities_signal_callback_contac
			t_capabilities_changed callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
			return tp_cli_connection_interface_contact_capabilities_connect_to_contac
			t_capabilities_changed (proxy, callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_connection_interface_contact_capabilities_connect_to_contact
			_capabilities_changed(...) _tp_cli_connection_interface_contact_capabilitie
			s_connect_to_contact_capabilities_changed (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_connection_interface_contact_capabilities_callback_fo r_update_capabilities) (TpConnection *proxy,		typedef void (*tp_cli_connection_interface_contact_capabilities_callback_fo r_update_capabilities) (TpConnection *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_connection_interface_contact_capabilities_call_u pdate_capabilities (TpConnection *proxy,		TpProxyPendingCall *tp_cli_connection_interface_contact_capabilities_call_u pdate_capabilities (TpConnection *proxy,
	gint timeout_ms,		gint timeout_ms,
	const GPtrArray *in_Handler_Capabilities,		const GPtrArray *in_Handler_Capabilities,
	tp_cli_connection_interface_contact_capabilities_callback_for_update_ca pabilities callback,		tp_cli_connection_interface_contact_capabilities_callback_for_update_ca pabilities callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_connection_interface_contact_capabilities_run_update_capabi		static inline TpProxyPendingCall *
	lities (TpConnection *proxy,		_tp_cli_connection_interface_contact_capabilities_call_update_capabilities
			(TpConnection *proxy,
	gint timeout_ms,		gint timeout_ms,
	const GPtrArray *in_Handler_Capabilities,		const GPtrArray *in_Handler_Capabilities,
	GError **error,		tp_cli_connection_interface_contact_capabilities_callback_for_update_ca
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		pabilities callback,
	#endif /* not TP_DISABLE_DEPRECATED */
	typedef void (*tp_cli_connection_interface_contact_capabilities_callback_fo
	r_get_contact_capabilities) (TpConnection *proxy,
	GHashTable *out_Contact_Capabilities,
	const GError *error, gpointer user_data,
	GObject *weak_object);
	TpProxyPendingCall *tp_cli_connection_interface_contact_capabilities_call_g
	et_contact_capabilities (TpConnection *proxy,
	gint timeout_ms,
	const GArray *in_Handles,
	tp_cli_connection_interface_contact_capabilities_callback_for_get_conta
	ct_capabilities callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object)
			{
	#ifndef TP_DISABLE_DEPRECATED		g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
	gboolean tp_cli_connection_interface_contact_capabilities_run_get_contact_c		return tp_cli_connection_interface_contact_capabilities_call_update_capab
	apabilities (TpConnection *proxy,		ilities (proxy, timeout_ms,
	gint timeout_ms,		in_Handler_Capabilities,
	const GArray *in_Handles,		callback, user_data, destroy, weak_object);
	GHashTable **out_Contact_Capabilities,		}
	GError **error,		#define tp_cli_connection_interface_contact_capabilities_call_update_capabi
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		lities(...) _tp_cli_connection_interface_contact_capabilities_call_update_c
	#endif /* not TP_DISABLE_DEPRECATED */		apabilities (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_connection_interface_contact_groups_signal_callback_g roups_changed) (TpConnection *proxy,		typedef void (*tp_cli_connection_interface_contact_groups_signal_callback_g roups_changed) (TpConnection *proxy,
	const GArray *arg_Contact,		const GArray *arg_Contact,
	const gchar **arg_Added,		const gchar **arg_Added,
	const gchar **arg_Removed,		const gchar **arg_Removed,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_connection_interface_contact_groups_connect _to_groups_changed (TpConnection *proxy,		TpProxySignalConnection *tp_cli_connection_interface_contact_groups_connect _to_groups_changed (TpConnection *proxy,
	tp_cli_connection_interface_contact_groups_signal_callback_groups_chang ed callback,		tp_cli_connection_interface_contact_groups_signal_callback_groups_chang ed callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_connection_interface_contact_groups_connect_to_groups_changed (TpCo
			nnection *proxy,
			tp_cli_connection_interface_contact_groups_signal_callback_groups_chang
			ed callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
			return tp_cli_connection_interface_contact_groups_connect_to_groups_chang
			ed (proxy, callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_connection_interface_contact_groups_connect_to_groups_change
			d(...) _tp_cli_connection_interface_contact_groups_connect_to_groups_change
			d (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_connection_interface_contact_groups_signal_callback_g roups_created) (TpConnection *proxy,		typedef void (*tp_cli_connection_interface_contact_groups_signal_callback_g roups_created) (TpConnection *proxy,
	const gchar **arg_Names,		const gchar **arg_Names,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_connection_interface_contact_groups_connect _to_groups_created (TpConnection *proxy,		TpProxySignalConnection *tp_cli_connection_interface_contact_groups_connect _to_groups_created (TpConnection *proxy,
	tp_cli_connection_interface_contact_groups_signal_callback_groups_creat ed callback,		tp_cli_connection_interface_contact_groups_signal_callback_groups_creat ed callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_connection_interface_contact_groups_connect_to_groups_created (TpCo
			nnection *proxy,
			tp_cli_connection_interface_contact_groups_signal_callback_groups_creat
			ed callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
			return tp_cli_connection_interface_contact_groups_connect_to_groups_creat
			ed (proxy, callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_connection_interface_contact_groups_connect_to_groups_create
			d(...) _tp_cli_connection_interface_contact_groups_connect_to_groups_create
			d (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_connection_interface_contact_groups_signal_callback_g roup_renamed) (TpConnection *proxy,		typedef void (*tp_cli_connection_interface_contact_groups_signal_callback_g roup_renamed) (TpConnection *proxy,
	const gchar *arg_Old_Name,		const gchar *arg_Old_Name,
	const gchar *arg_New_Name,		const gchar *arg_New_Name,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_connection_interface_contact_groups_connect _to_group_renamed (TpConnection *proxy,		TpProxySignalConnection *tp_cli_connection_interface_contact_groups_connect _to_group_renamed (TpConnection *proxy,
	tp_cli_connection_interface_contact_groups_signal_callback_group_rename d callback,		tp_cli_connection_interface_contact_groups_signal_callback_group_rename d callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_connection_interface_contact_groups_connect_to_group_renamed (TpCon
			nection *proxy,
			tp_cli_connection_interface_contact_groups_signal_callback_group_rename
			d callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
			return tp_cli_connection_interface_contact_groups_connect_to_group_rename
			d (proxy, callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_connection_interface_contact_groups_connect_to_group_renamed
			(...) _tp_cli_connection_interface_contact_groups_connect_to_group_renamed
			(__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_connection_interface_contact_groups_signal_callback_g roups_removed) (TpConnection *proxy,		typedef void (*tp_cli_connection_interface_contact_groups_signal_callback_g roups_removed) (TpConnection *proxy,
	const gchar **arg_Names,		const gchar **arg_Names,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_connection_interface_contact_groups_connect _to_groups_removed (TpConnection *proxy,		TpProxySignalConnection *tp_cli_connection_interface_contact_groups_connect _to_groups_removed (TpConnection *proxy,
	tp_cli_connection_interface_contact_groups_signal_callback_groups_remov ed callback,		tp_cli_connection_interface_contact_groups_signal_callback_groups_remov ed callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_connection_interface_contact_groups_connect_to_groups_removed (TpCo
			nnection *proxy,
			tp_cli_connection_interface_contact_groups_signal_callback_groups_remov
			ed callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
			return tp_cli_connection_interface_contact_groups_connect_to_groups_remov
			ed (proxy, callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_connection_interface_contact_groups_connect_to_groups_remove
			d(...) _tp_cli_connection_interface_contact_groups_connect_to_groups_remove
			d (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_connection_interface_contact_groups_callback_for_set_ contact_groups) (TpConnection *proxy,		typedef void (*tp_cli_connection_interface_contact_groups_callback_for_set_ contact_groups) (TpConnection *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_connection_interface_contact_groups_call_set_con tact_groups (TpConnection *proxy,		TpProxyPendingCall *tp_cli_connection_interface_contact_groups_call_set_con tact_groups (TpConnection *proxy,
	gint timeout_ms,		gint timeout_ms,
	guint in_Contact,		guint in_Contact,
	const gchar **in_Groups,		const gchar **in_Groups,
	tp_cli_connection_interface_contact_groups_callback_for_set_contact_gro ups callback,		tp_cli_connection_interface_contact_groups_callback_for_set_contact_gro ups callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_connection_interface_contact_groups_run_set_contact_groups		static inline TpProxyPendingCall *
	(TpConnection *proxy,		_tp_cli_connection_interface_contact_groups_call_set_contact_groups (TpConn
			ection *proxy,
	gint timeout_ms,		gint timeout_ms,
	guint in_Contact,		guint in_Contact,
	const gchar **in_Groups,		const gchar **in_Groups,
	GError **error,		tp_cli_connection_interface_contact_groups_callback_for_set_contact_gro
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		ups callback,
	#endif /* not TP_DISABLE_DEPRECATED */		gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
			return tp_cli_connection_interface_contact_groups_call_set_contact_groups
			(proxy, timeout_ms,
			in_Contact,
			in_Groups,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_connection_interface_contact_groups_call_set_contact_groups(
			...) _tp_cli_connection_interface_contact_groups_call_set_contact_groups (_
			_VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_connection_interface_contact_groups_callback_for_set_ group_members) (TpConnection *proxy,		typedef void (*tp_cli_connection_interface_contact_groups_callback_for_set_ group_members) (TpConnection *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_connection_interface_contact_groups_call_set_gro up_members (TpConnection *proxy,		TpProxyPendingCall *tp_cli_connection_interface_contact_groups_call_set_gro up_members (TpConnection *proxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar *in_Group,		const gchar *in_Group,
	const GArray *in_Members,		const GArray *in_Members,
	tp_cli_connection_interface_contact_groups_callback_for_set_group_membe rs callback,		tp_cli_connection_interface_contact_groups_callback_for_set_group_membe rs callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_connection_interface_contact_groups_run_set_group_members (		static inline TpProxyPendingCall *
	TpConnection *proxy,		_tp_cli_connection_interface_contact_groups_call_set_group_members (TpConne
			ction *proxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar *in_Group,		const gchar *in_Group,
	const GArray *in_Members,		const GArray *in_Members,
	GError **error,		tp_cli_connection_interface_contact_groups_callback_for_set_group_membe
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		rs callback,
	#endif /* not TP_DISABLE_DEPRECATED */		gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
			return tp_cli_connection_interface_contact_groups_call_set_group_members
			(proxy, timeout_ms,
			in_Group,
			in_Members,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_connection_interface_contact_groups_call_set_group_members(.
			..) _tp_cli_connection_interface_contact_groups_call_set_group_members (__V
			A_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_connection_interface_contact_groups_callback_for_add_ to_group) (TpConnection *proxy,		typedef void (*tp_cli_connection_interface_contact_groups_callback_for_add_ to_group) (TpConnection *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_connection_interface_contact_groups_call_add_to_ group (TpConnection *proxy,		TpProxyPendingCall *tp_cli_connection_interface_contact_groups_call_add_to_ group (TpConnection *proxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar *in_Group,		const gchar *in_Group,
	const GArray *in_Members,		const GArray *in_Members,
	tp_cli_connection_interface_contact_groups_callback_for_add_to_group ca llback,		tp_cli_connection_interface_contact_groups_callback_for_add_to_group ca llback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_connection_interface_contact_groups_run_add_to_group (TpCon		static inline TpProxyPendingCall *
	nection *proxy,		_tp_cli_connection_interface_contact_groups_call_add_to_group (TpConnection
			*proxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar *in_Group,		const gchar *in_Group,
	const GArray *in_Members,		const GArray *in_Members,
	GError **error,		tp_cli_connection_interface_contact_groups_callback_for_add_to_group ca
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		llback,
	#endif /* not TP_DISABLE_DEPRECATED */		gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
			return tp_cli_connection_interface_contact_groups_call_add_to_group (prox
			y, timeout_ms,
			in_Group,
			in_Members,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_connection_interface_contact_groups_call_add_to_group(...) _
			tp_cli_connection_interface_contact_groups_call_add_to_group (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_connection_interface_contact_groups_callback_for_remo ve_from_group) (TpConnection *proxy,		typedef void (*tp_cli_connection_interface_contact_groups_callback_for_remo ve_from_group) (TpConnection *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_connection_interface_contact_groups_call_remove_ from_group (TpConnection *proxy,		TpProxyPendingCall *tp_cli_connection_interface_contact_groups_call_remove_ from_group (TpConnection *proxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar *in_Group,		const gchar *in_Group,
	const GArray *in_Members,		const GArray *in_Members,
	tp_cli_connection_interface_contact_groups_callback_for_remove_from_gro up callback,		tp_cli_connection_interface_contact_groups_callback_for_remove_from_gro up callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_connection_interface_contact_groups_run_remove_from_group (		static inline TpProxyPendingCall *
	TpConnection *proxy,		_tp_cli_connection_interface_contact_groups_call_remove_from_group (TpConne
			ction *proxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar *in_Group,		const gchar *in_Group,
	const GArray *in_Members,		const GArray *in_Members,
	GError **error,		tp_cli_connection_interface_contact_groups_callback_for_remove_from_gro
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		up callback,
	#endif /* not TP_DISABLE_DEPRECATED */		gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
			return tp_cli_connection_interface_contact_groups_call_remove_from_group
			(proxy, timeout_ms,
			in_Group,
			in_Members,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_connection_interface_contact_groups_call_remove_from_group(.
			..) _tp_cli_connection_interface_contact_groups_call_remove_from_group (__V
			A_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_connection_interface_contact_groups_callback_for_remo ve_group) (TpConnection *proxy,		typedef void (*tp_cli_connection_interface_contact_groups_callback_for_remo ve_group) (TpConnection *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_connection_interface_contact_groups_call_remove_ group (TpConnection *proxy,		TpProxyPendingCall *tp_cli_connection_interface_contact_groups_call_remove_ group (TpConnection *proxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar *in_Group,		const gchar *in_Group,
	tp_cli_connection_interface_contact_groups_callback_for_remove_group ca llback,		tp_cli_connection_interface_contact_groups_callback_for_remove_group ca llback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_connection_interface_contact_groups_run_remove_group (TpCon		static inline TpProxyPendingCall *
	nection *proxy,		_tp_cli_connection_interface_contact_groups_call_remove_group (TpConnection
			*proxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar *in_Group,		const gchar *in_Group,
	GError **error,		tp_cli_connection_interface_contact_groups_callback_for_remove_group ca
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		llback,
	#endif /* not TP_DISABLE_DEPRECATED */		gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
			return tp_cli_connection_interface_contact_groups_call_remove_group (prox
			y, timeout_ms,
			in_Group,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_connection_interface_contact_groups_call_remove_group(...) _
			tp_cli_connection_interface_contact_groups_call_remove_group (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_connection_interface_contact_groups_callback_for_rena me_group) (TpConnection *proxy,		typedef void (*tp_cli_connection_interface_contact_groups_callback_for_rena me_group) (TpConnection *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_connection_interface_contact_groups_call_rename_ group (TpConnection *proxy,		TpProxyPendingCall *tp_cli_connection_interface_contact_groups_call_rename_ group (TpConnection *proxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar *in_Old_Name,		const gchar *in_Old_Name,
	const gchar *in_New_Name,		const gchar *in_New_Name,
	tp_cli_connection_interface_contact_groups_callback_for_rename_group ca llback,		tp_cli_connection_interface_contact_groups_callback_for_rename_group ca llback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_connection_interface_contact_groups_run_rename_group (TpCon		static inline TpProxyPendingCall *
	nection *proxy,		_tp_cli_connection_interface_contact_groups_call_rename_group (TpConnection
			*proxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar *in_Old_Name,		const gchar *in_Old_Name,
	const gchar *in_New_Name,		const gchar *in_New_Name,
	GError **error,		tp_cli_connection_interface_contact_groups_callback_for_rename_group ca
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		llback,
	#endif /* not TP_DISABLE_DEPRECATED */		gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
			return tp_cli_connection_interface_contact_groups_call_rename_group (prox
			y, timeout_ms,
			in_Old_Name,
			in_New_Name,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_connection_interface_contact_groups_call_rename_group(...) _
			tp_cli_connection_interface_contact_groups_call_rename_group (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_connection_interface_contact_info_signal_callback_con tact_info_changed) (TpConnection *proxy,		typedef void (*tp_cli_connection_interface_contact_info_signal_callback_con tact_info_changed) (TpConnection *proxy,
	guint arg_Contact,		guint arg_Contact,
	const GPtrArray *arg_ContactInfo,		const GPtrArray *arg_ContactInfo,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_connection_interface_contact_info_connect_t o_contact_info_changed (TpConnection *proxy,		TpProxySignalConnection *tp_cli_connection_interface_contact_info_connect_t o_contact_info_changed (TpConnection *proxy,
	tp_cli_connection_interface_contact_info_signal_callback_contact_info_c hanged callback,		tp_cli_connection_interface_contact_info_signal_callback_contact_info_c hanged callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
	typedef void (*tp_cli_connection_interface_contact_info_callback_for_get_co		#ifndef __GTK_DOC_IGNORE__
	ntact_info) (TpConnection *proxy,		static inline TpProxySignalConnection *
	GHashTable *out_ContactInfo,		_tp_cli_connection_interface_contact_info_connect_to_contact_info_changed (
	const GError *error, gpointer user_data,		TpConnection *proxy,
	GObject *weak_object);		tp_cli_connection_interface_contact_info_signal_callback_contact_info_c
			hanged callback,
	TpProxyPendingCall *tp_cli_connection_interface_contact_info_call_get_conta
	ct_info (TpConnection *proxy,
	gint timeout_ms,
	const GArray *in_Contacts,
	tp_cli_connection_interface_contact_info_callback_for_get_contact_info
	callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object,
			GError **error)
	#ifndef TP_DISABLE_DEPRECATED		{
	gboolean tp_cli_connection_interface_contact_info_run_get_contact_info (TpC		g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
	onnection *proxy,		return tp_cli_connection_interface_contact_info_connect_to_contact_info_c
	gint timeout_ms,		hanged (proxy, callback, user_data,
	const GArray *in_Contacts,		destroy, weak_object, error);
	GHashTable **out_ContactInfo,		}
	GError **error,		#define tp_cli_connection_interface_contact_info_connect_to_contact_info_ch
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		anged(...) _tp_cli_connection_interface_contact_info_connect_to_contact_inf
	#endif /* not TP_DISABLE_DEPRECATED */		o_changed (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_connection_interface_contact_info_callback_for_refres h_contact_info) (TpConnection *proxy,		typedef void (*tp_cli_connection_interface_contact_info_callback_for_refres h_contact_info) (TpConnection *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_connection_interface_contact_info_call_refresh_c ontact_info (TpConnection *proxy,		TpProxyPendingCall *tp_cli_connection_interface_contact_info_call_refresh_c ontact_info (TpConnection *proxy,
	gint timeout_ms,		gint timeout_ms,
	const GArray *in_Contacts,		const GArray *in_Contacts,
	tp_cli_connection_interface_contact_info_callback_for_refresh_contact_i nfo callback,		tp_cli_connection_interface_contact_info_callback_for_refresh_contact_i nfo callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_connection_interface_contact_info_run_refresh_contact_info		static inline TpProxyPendingCall *
	(TpConnection *proxy,		_tp_cli_connection_interface_contact_info_call_refresh_contact_info (TpConn
			ection *proxy,
	gint timeout_ms,		gint timeout_ms,
	const GArray *in_Contacts,		const GArray *in_Contacts,
	GError **error,		tp_cli_connection_interface_contact_info_callback_for_refresh_contact_i
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		nfo callback,
	#endif /* not TP_DISABLE_DEPRECATED */		gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
			return tp_cli_connection_interface_contact_info_call_refresh_contact_info
			(proxy, timeout_ms,
			in_Contacts,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_connection_interface_contact_info_call_refresh_contact_info(
			...) _tp_cli_connection_interface_contact_info_call_refresh_contact_info (_
			_VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_connection_interface_contact_info_callback_for_reques t_contact_info) (TpConnection *proxy,		typedef void (*tp_cli_connection_interface_contact_info_callback_for_reques t_contact_info) (TpConnection *proxy,
	const GPtrArray *out_Contact_Info,		const GPtrArray *out_Contact_Info,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_connection_interface_contact_info_call_request_c ontact_info (TpConnection *proxy,		TpProxyPendingCall *tp_cli_connection_interface_contact_info_call_request_c ontact_info (TpConnection *proxy,
	gint timeout_ms,		gint timeout_ms,
	guint in_Contact,		guint in_Contact,
	tp_cli_connection_interface_contact_info_callback_for_request_contact_i nfo callback,		tp_cli_connection_interface_contact_info_callback_for_request_contact_i nfo callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_connection_interface_contact_info_run_request_contact_info		static inline TpProxyPendingCall *
	(TpConnection *proxy,		_tp_cli_connection_interface_contact_info_call_request_contact_info (TpConn
			ection *proxy,
	gint timeout_ms,		gint timeout_ms,
	guint in_Contact,		guint in_Contact,
	GPtrArray **out_Contact_Info,		tp_cli_connection_interface_contact_info_callback_for_request_contact_i
	GError **error,		nfo callback,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		gpointer user_data,
	#endif /* not TP_DISABLE_DEPRECATED */		GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
			return tp_cli_connection_interface_contact_info_call_request_contact_info
			(proxy, timeout_ms,
			in_Contact,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_connection_interface_contact_info_call_request_contact_info(
			...) _tp_cli_connection_interface_contact_info_call_request_contact_info (_
			_VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_connection_interface_contact_info_callback_for_set_co ntact_info) (TpConnection *proxy,		typedef void (*tp_cli_connection_interface_contact_info_callback_for_set_co ntact_info) (TpConnection *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_connection_interface_contact_info_call_set_conta ct_info (TpConnection *proxy,		TpProxyPendingCall *tp_cli_connection_interface_contact_info_call_set_conta ct_info (TpConnection *proxy,
	gint timeout_ms,		gint timeout_ms,
	const GPtrArray *in_ContactInfo,		const GPtrArray *in_ContactInfo,
	tp_cli_connection_interface_contact_info_callback_for_set_contact_info callback,		tp_cli_connection_interface_contact_info_callback_for_set_contact_info callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_connection_interface_contact_info_run_set_contact_info (TpC		static inline TpProxyPendingCall *
	onnection *proxy,		_tp_cli_connection_interface_contact_info_call_set_contact_info (TpConnecti
			on *proxy,
	gint timeout_ms,		gint timeout_ms,
	const GPtrArray *in_ContactInfo,		const GPtrArray *in_ContactInfo,
	GError **error,		tp_cli_connection_interface_contact_info_callback_for_set_contact_info
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		callback,
	#endif /* not TP_DISABLE_DEPRECATED */		gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
			return tp_cli_connection_interface_contact_info_call_set_contact_info (pr
			oxy, timeout_ms,
			in_ContactInfo,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_connection_interface_contact_info_call_set_contact_info(...)
			_tp_cli_connection_interface_contact_info_call_set_contact_info (__VA_ARGS
			__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_connection_interface_contact_list_signal_callback_con tact_list_state_changed) (TpConnection *proxy,		typedef void (*tp_cli_connection_interface_contact_list_signal_callback_con tact_list_state_changed) (TpConnection *proxy,
	guint arg_Contact_List_State,		guint arg_Contact_List_State,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_connection_interface_contact_list_connect_t o_contact_list_state_changed (TpConnection *proxy,		TpProxySignalConnection *tp_cli_connection_interface_contact_list_connect_t o_contact_list_state_changed (TpConnection *proxy,
	tp_cli_connection_interface_contact_list_signal_callback_contact_list_s tate_changed callback,		tp_cli_connection_interface_contact_list_signal_callback_contact_list_s tate_changed callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
	typedef void (*tp_cli_connection_interface_contact_list_signal_callback_con		#ifndef __GTK_DOC_IGNORE__
	tacts_changed_with_id) (TpConnection *proxy,		static inline TpProxySignalConnection *
	GHashTable *arg_Changes,		_tp_cli_connection_interface_contact_list_connect_to_contact_list_state_cha
	GHashTable *arg_Identifiers,		nged (TpConnection *proxy,
	GHashTable *arg_Removals,		tp_cli_connection_interface_contact_list_signal_callback_contact_list_s
	gpointer user_data, GObject *weak_object);		tate_changed callback,
	TpProxySignalConnection *tp_cli_connection_interface_contact_list_connect_t
	o_contacts_changed_with_id (TpConnection *proxy,
	tp_cli_connection_interface_contact_list_signal_callback_contacts_chang
	ed_with_id callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error)
			{
			g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
			return tp_cli_connection_interface_contact_list_connect_to_contact_list_s
			tate_changed (proxy, callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_connection_interface_contact_list_connect_to_contact_list_st
			ate_changed(...) _tp_cli_connection_interface_contact_list_connect_to_conta
			ct_list_state_changed (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_connection_interface_contact_list_signal_callback_con tacts_changed) (TpConnection *proxy,		typedef void (*tp_cli_connection_interface_contact_list_signal_callback_con tacts_changed) (TpConnection *proxy,
	GHashTable *arg_Changes,		GHashTable *arg_Changes,
	const GArray *arg_Removals,		GHashTable *arg_Identifiers,
			GHashTable *arg_Removals,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_connection_interface_contact_list_connect_t o_contacts_changed (TpConnection *proxy,		TpProxySignalConnection *tp_cli_connection_interface_contact_list_connect_t o_contacts_changed (TpConnection *proxy,
	tp_cli_connection_interface_contact_list_signal_callback_contacts_chang ed callback,		tp_cli_connection_interface_contact_list_signal_callback_contacts_chang ed callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_connection_interface_contact_list_connect_to_contacts_changed (TpCo
			nnection *proxy,
			tp_cli_connection_interface_contact_list_signal_callback_contacts_chang
			ed callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
			return tp_cli_connection_interface_contact_list_connect_to_contacts_chang
			ed (proxy, callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_connection_interface_contact_list_connect_to_contacts_change
			d(...) _tp_cli_connection_interface_contact_list_connect_to_contacts_change
			d (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_connection_interface_contact_list_callback_for_get_co ntact_list_attributes) (TpConnection *proxy,		typedef void (*tp_cli_connection_interface_contact_list_callback_for_get_co ntact_list_attributes) (TpConnection *proxy,
	GHashTable *out_Attributes,		GHashTable *out_Attributes,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_connection_interface_contact_list_call_get_conta ct_list_attributes (TpConnection *proxy,		TpProxyPendingCall *tp_cli_connection_interface_contact_list_call_get_conta ct_list_attributes (TpConnection *proxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar **in_Interfaces,		const gchar **in_Interfaces,
	gboolean in_Hold,
	tp_cli_connection_interface_contact_list_callback_for_get_contact_list_ attributes callback,		tp_cli_connection_interface_contact_list_callback_for_get_contact_list_ attributes callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_connection_interface_contact_list_run_get_contact_list_attr		static inline TpProxyPendingCall *
	ibutes (TpConnection *proxy,		_tp_cli_connection_interface_contact_list_call_get_contact_list_attributes
			(TpConnection *proxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar **in_Interfaces,		const gchar **in_Interfaces,
	gboolean in_Hold,		tp_cli_connection_interface_contact_list_callback_for_get_contact_list_
	GHashTable **out_Attributes,		attributes callback,
	GError **error,		gpointer user_data,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		GDestroyNotify destroy,
	#endif /* not TP_DISABLE_DEPRECATED */		GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
			return tp_cli_connection_interface_contact_list_call_get_contact_list_att
			ributes (proxy, timeout_ms,
			in_Interfaces,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_connection_interface_contact_list_call_get_contact_list_attr
			ibutes(...) _tp_cli_connection_interface_contact_list_call_get_contact_list
			_attributes (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_connection_interface_contact_list_callback_for_reques t_subscription) (TpConnection *proxy,		typedef void (*tp_cli_connection_interface_contact_list_callback_for_reques t_subscription) (TpConnection *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_connection_interface_contact_list_call_request_s ubscription (TpConnection *proxy,		TpProxyPendingCall *tp_cli_connection_interface_contact_list_call_request_s ubscription (TpConnection *proxy,
	gint timeout_ms,		gint timeout_ms,
	const GArray *in_Contacts,		const GArray *in_Contacts,
	const gchar *in_Message,		const gchar *in_Message,
	tp_cli_connection_interface_contact_list_callback_for_request_subscript ion callback,		tp_cli_connection_interface_contact_list_callback_for_request_subscript ion callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_connection_interface_contact_list_run_request_subscription		static inline TpProxyPendingCall *
	(TpConnection *proxy,		_tp_cli_connection_interface_contact_list_call_request_subscription (TpConn
			ection *proxy,
	gint timeout_ms,		gint timeout_ms,
	const GArray *in_Contacts,		const GArray *in_Contacts,
	const gchar *in_Message,		const gchar *in_Message,
	GError **error,		tp_cli_connection_interface_contact_list_callback_for_request_subscript
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		ion callback,
	#endif /* not TP_DISABLE_DEPRECATED */		gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
			return tp_cli_connection_interface_contact_list_call_request_subscription
			(proxy, timeout_ms,
			in_Contacts,
			in_Message,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_connection_interface_contact_list_call_request_subscription(
			...) _tp_cli_connection_interface_contact_list_call_request_subscription (_
			_VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_connection_interface_contact_list_callback_for_author ize_publication) (TpConnection *proxy,		typedef void (*tp_cli_connection_interface_contact_list_callback_for_author ize_publication) (TpConnection *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_connection_interface_contact_list_call_authorize _publication (TpConnection *proxy,		TpProxyPendingCall *tp_cli_connection_interface_contact_list_call_authorize _publication (TpConnection *proxy,
	gint timeout_ms,		gint timeout_ms,
	const GArray *in_Contacts,		const GArray *in_Contacts,
	tp_cli_connection_interface_contact_list_callback_for_authorize_publica tion callback,		tp_cli_connection_interface_contact_list_callback_for_authorize_publica tion callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_connection_interface_contact_list_run_authorize_publication		static inline TpProxyPendingCall *
	(TpConnection *proxy,		_tp_cli_connection_interface_contact_list_call_authorize_publication (TpCon
			nection *proxy,
	gint timeout_ms,		gint timeout_ms,
	const GArray *in_Contacts,		const GArray *in_Contacts,
	GError **error,		tp_cli_connection_interface_contact_list_callback_for_authorize_publica
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		tion callback,
	#endif /* not TP_DISABLE_DEPRECATED */		gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
			return tp_cli_connection_interface_contact_list_call_authorize_publicatio
			n (proxy, timeout_ms,
			in_Contacts,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_connection_interface_contact_list_call_authorize_publication
			(...) _tp_cli_connection_interface_contact_list_call_authorize_publication
			(__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_connection_interface_contact_list_callback_for_remove _contacts) (TpConnection *proxy,		typedef void (*tp_cli_connection_interface_contact_list_callback_for_remove _contacts) (TpConnection *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_connection_interface_contact_list_call_remove_co ntacts (TpConnection *proxy,		TpProxyPendingCall *tp_cli_connection_interface_contact_list_call_remove_co ntacts (TpConnection *proxy,
	gint timeout_ms,		gint timeout_ms,
	const GArray *in_Contacts,		const GArray *in_Contacts,
	tp_cli_connection_interface_contact_list_callback_for_remove_contacts c allback,		tp_cli_connection_interface_contact_list_callback_for_remove_contacts c allback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_connection_interface_contact_list_run_remove_contacts (TpCo		static inline TpProxyPendingCall *
	nnection *proxy,		_tp_cli_connection_interface_contact_list_call_remove_contacts (TpConnectio
			n *proxy,
	gint timeout_ms,		gint timeout_ms,
	const GArray *in_Contacts,		const GArray *in_Contacts,
	GError **error,		tp_cli_connection_interface_contact_list_callback_for_remove_contacts c
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		allback,
	#endif /* not TP_DISABLE_DEPRECATED */		gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
			return tp_cli_connection_interface_contact_list_call_remove_contacts (pro
			xy, timeout_ms,
			in_Contacts,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_connection_interface_contact_list_call_remove_contacts(...)
			_tp_cli_connection_interface_contact_list_call_remove_contacts (__VA_ARGS__
			)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_connection_interface_contact_list_callback_for_unsubs cribe) (TpConnection *proxy,		typedef void (*tp_cli_connection_interface_contact_list_callback_for_unsubs cribe) (TpConnection *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_connection_interface_contact_list_call_unsubscri be (TpConnection *proxy,		TpProxyPendingCall *tp_cli_connection_interface_contact_list_call_unsubscri be (TpConnection *proxy,
	gint timeout_ms,		gint timeout_ms,
	const GArray *in_Contacts,		const GArray *in_Contacts,
	tp_cli_connection_interface_contact_list_callback_for_unsubscribe callb ack,		tp_cli_connection_interface_contact_list_callback_for_unsubscribe callb ack,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_connection_interface_contact_list_run_unsubscribe (TpConnec		static inline TpProxyPendingCall *
	tion *proxy,		_tp_cli_connection_interface_contact_list_call_unsubscribe (TpConnection *p
			roxy,
	gint timeout_ms,		gint timeout_ms,
	const GArray *in_Contacts,		const GArray *in_Contacts,
	GError **error,		tp_cli_connection_interface_contact_list_callback_for_unsubscribe callb
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		ack,
	#endif /* not TP_DISABLE_DEPRECATED */		gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
			return tp_cli_connection_interface_contact_list_call_unsubscribe (proxy,
			timeout_ms,
			in_Contacts,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_connection_interface_contact_list_call_unsubscribe(...) _tp_
			cli_connection_interface_contact_list_call_unsubscribe (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_connection_interface_contact_list_callback_for_unpubl ish) (TpConnection *proxy,		typedef void (*tp_cli_connection_interface_contact_list_callback_for_unpubl ish) (TpConnection *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_connection_interface_contact_list_call_unpublish (TpConnection *proxy,		TpProxyPendingCall *tp_cli_connection_interface_contact_list_call_unpublish (TpConnection *proxy,
	gint timeout_ms,		gint timeout_ms,
	const GArray *in_Contacts,		const GArray *in_Contacts,
	tp_cli_connection_interface_contact_list_callback_for_unpublish callbac k,		tp_cli_connection_interface_contact_list_callback_for_unpublish callbac k,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_connection_interface_contact_list_run_unpublish (TpConnecti		static inline TpProxyPendingCall *
	on *proxy,		_tp_cli_connection_interface_contact_list_call_unpublish (TpConnection *pro
			xy,
	gint timeout_ms,		gint timeout_ms,
	const GArray *in_Contacts,		const GArray *in_Contacts,
	GError **error,		tp_cli_connection_interface_contact_list_callback_for_unpublish callbac
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		k,
	#endif /* not TP_DISABLE_DEPRECATED */		gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
			return tp_cli_connection_interface_contact_list_call_unpublish (proxy, ti
			meout_ms,
			in_Contacts,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_connection_interface_contact_list_call_unpublish(...) _tp_cl
			i_connection_interface_contact_list_call_unpublish (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_connection_interface_contact_list_callback_for_downlo ad) (TpConnection *proxy,		typedef void (*tp_cli_connection_interface_contact_list_callback_for_downlo ad) (TpConnection *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_connection_interface_contact_list_call_download (TpConnection *proxy,		TpProxyPendingCall *tp_cli_connection_interface_contact_list_call_download (TpConnection *proxy,
	gint timeout_ms,		gint timeout_ms,
	tp_cli_connection_interface_contact_list_callback_for_download callback ,		tp_cli_connection_interface_contact_list_callback_for_download callback ,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxyPendingCall *
			_tp_cli_connection_interface_contact_list_call_download (TpConnection *prox
			y,
			gint timeout_ms,
			tp_cli_connection_interface_contact_list_callback_for_download callback
			,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
			return tp_cli_connection_interface_contact_list_call_download (proxy, tim
			eout_ms,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_connection_interface_contact_list_call_download(...) _tp_cli
			_connection_interface_contact_list_call_download (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_connection_interface_contacts_callback_for_get_contac t_attributes) (TpConnection *proxy,		typedef void (*tp_cli_connection_interface_contacts_callback_for_get_contac t_attributes) (TpConnection *proxy,
	GHashTable *out_Attributes,		GHashTable *out_Attributes,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_connection_interface_contacts_call_get_contact_a ttributes (TpConnection *proxy,		TpProxyPendingCall *tp_cli_connection_interface_contacts_call_get_contact_a ttributes (TpConnection *proxy,
	gint timeout_ms,		gint timeout_ms,
	const GArray *in_Handles,		const GArray *in_Handles,
	const gchar **in_Interfaces,		const gchar **in_Interfaces,
	gboolean in_Hold,
	tp_cli_connection_interface_contacts_callback_for_get_contact_attribute s callback,		tp_cli_connection_interface_contacts_callback_for_get_contact_attribute s callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_connection_interface_contacts_run_get_contact_attributes (T		static inline TpProxyPendingCall *
	pConnection *proxy,		_tp_cli_connection_interface_contacts_call_get_contact_attributes (TpConnec
			tion *proxy,
	gint timeout_ms,		gint timeout_ms,
	const GArray *in_Handles,		const GArray *in_Handles,
	const gchar **in_Interfaces,		const gchar **in_Interfaces,
	gboolean in_Hold,		tp_cli_connection_interface_contacts_callback_for_get_contact_attribute
	GHashTable **out_Attributes,		s callback,
	GError **error,		gpointer user_data,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		GDestroyNotify destroy,
	#endif /* not TP_DISABLE_DEPRECATED */		GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
			return tp_cli_connection_interface_contacts_call_get_contact_attributes (
			proxy, timeout_ms,
			in_Handles,
			in_Interfaces,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_connection_interface_contacts_call_get_contact_attributes(..
			.) _tp_cli_connection_interface_contacts_call_get_contact_attributes (__VA_
			ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_connection_interface_contacts_callback_for_get_contac t_by_id) (TpConnection *proxy,		typedef void (*tp_cli_connection_interface_contacts_callback_for_get_contac t_by_id) (TpConnection *proxy,
	guint out_Handle,		guint out_Handle,
	GHashTable *out_Attributes,		GHashTable *out_Attributes,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_connection_interface_contacts_call_get_contact_b y_id (TpConnection *proxy,		TpProxyPendingCall *tp_cli_connection_interface_contacts_call_get_contact_b y_id (TpConnection *proxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar *in_Identifier,		const gchar *in_Identifier,
	const gchar **in_Interfaces,		const gchar **in_Interfaces,
	tp_cli_connection_interface_contacts_callback_for_get_contact_by_id cal lback,		tp_cli_connection_interface_contacts_callback_for_get_contact_by_id cal lback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxyPendingCall *
			_tp_cli_connection_interface_contacts_call_get_contact_by_id (TpConnection
			*proxy,
			gint timeout_ms,
			const gchar *in_Identifier,
			const gchar **in_Interfaces,
			tp_cli_connection_interface_contacts_callback_for_get_contact_by_id cal
			lback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
			return tp_cli_connection_interface_contacts_call_get_contact_by_id (proxy
			, timeout_ms,
			in_Identifier,
			in_Interfaces,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_connection_interface_contacts_call_get_contact_by_id(...) _t
			p_cli_connection_interface_contacts_call_get_contact_by_id (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_connection_interface_location_signal_callback_locatio n_updated) (TpConnection *proxy,		typedef void (*tp_cli_connection_interface_location_signal_callback_locatio n_updated) (TpConnection *proxy,
	guint arg_Contact,		guint arg_Contact,
	GHashTable *arg_Location,		GHashTable *arg_Location,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_connection_interface_location_connect_to_lo cation_updated (TpConnection *proxy,		TpProxySignalConnection *tp_cli_connection_interface_location_connect_to_lo cation_updated (TpConnection *proxy,
	tp_cli_connection_interface_location_signal_callback_location_updated c allback,		tp_cli_connection_interface_location_signal_callback_location_updated c allback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
	typedef void (*tp_cli_connection_interface_location_callback_for_get_locati		#ifndef __GTK_DOC_IGNORE__
	ons) (TpConnection *proxy,		static inline TpProxySignalConnection *
	GHashTable *out_Locations,		_tp_cli_connection_interface_location_connect_to_location_updated (TpConnec
	const GError *error, gpointer user_data,		tion *proxy,
	GObject *weak_object);		tp_cli_connection_interface_location_signal_callback_location_updated c
			allback,
	TpProxyPendingCall *tp_cli_connection_interface_location_call_get_locations
	(TpConnection *proxy,
	gint timeout_ms,
	const GArray *in_Contacts,
	tp_cli_connection_interface_location_callback_for_get_locations callbac
	k,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object,
			GError **error)
	#ifndef TP_DISABLE_DEPRECATED		{
	gboolean tp_cli_connection_interface_location_run_get_locations (TpConnecti		g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
	on *proxy,		return tp_cli_connection_interface_location_connect_to_location_updated (
	gint timeout_ms,		proxy, callback, user_data,
	const GArray *in_Contacts,		destroy, weak_object, error);
	GHashTable **out_Locations,		}
	GError **error,		#define tp_cli_connection_interface_location_connect_to_location_updated(..
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		.) _tp_cli_connection_interface_location_connect_to_location_updated (__VA_
	#endif /* not TP_DISABLE_DEPRECATED */		ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_connection_interface_location_callback_for_request_lo cation) (TpConnection *proxy,		typedef void (*tp_cli_connection_interface_location_callback_for_request_lo cation) (TpConnection *proxy,
	GHashTable *out_Location,		GHashTable *out_Location,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_connection_interface_location_call_request_locat ion (TpConnection *proxy,		TpProxyPendingCall *tp_cli_connection_interface_location_call_request_locat ion (TpConnection *proxy,
	gint timeout_ms,		gint timeout_ms,
	guint in_Contact,		guint in_Contact,
	tp_cli_connection_interface_location_callback_for_request_location call back,		tp_cli_connection_interface_location_callback_for_request_location call back,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_connection_interface_location_run_request_location (TpConne		static inline TpProxyPendingCall *
	ction *proxy,		_tp_cli_connection_interface_location_call_request_location (TpConnection *
			proxy,
	gint timeout_ms,		gint timeout_ms,
	guint in_Contact,		guint in_Contact,
	GHashTable **out_Location,		tp_cli_connection_interface_location_callback_for_request_location call
	GError **error,		back,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		gpointer user_data,
	#endif /* not TP_DISABLE_DEPRECATED */		GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
			return tp_cli_connection_interface_location_call_request_location (proxy,
			timeout_ms,
			in_Contact,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_connection_interface_location_call_request_location(...) _tp
			_cli_connection_interface_location_call_request_location (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_connection_interface_location_callback_for_set_locati on) (TpConnection *proxy,		typedef void (*tp_cli_connection_interface_location_callback_for_set_locati on) (TpConnection *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_connection_interface_location_call_set_location (TpConnection *proxy,		TpProxyPendingCall *tp_cli_connection_interface_location_call_set_location (TpConnection *proxy,
	gint timeout_ms,		gint timeout_ms,
	GHashTable *in_Location,		GHashTable *in_Location,
	tp_cli_connection_interface_location_callback_for_set_location callback ,		tp_cli_connection_interface_location_callback_for_set_location callback ,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_connection_interface_location_run_set_location (TpConnectio		static inline TpProxyPendingCall *
	n *proxy,		_tp_cli_connection_interface_location_call_set_location (TpConnection *prox
			y,
	gint timeout_ms,		gint timeout_ms,
	GHashTable *in_Location,		GHashTable *in_Location,
	GError **error,		tp_cli_connection_interface_location_callback_for_set_location callback
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		,
	#endif /* not TP_DISABLE_DEPRECATED */		gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
			return tp_cli_connection_interface_location_call_set_location (proxy, tim
			eout_ms,
			in_Location,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_connection_interface_location_call_set_location(...) _tp_cli
			_connection_interface_location_call_set_location (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_connection_interface_mail_notification_signal_callbac k_mails_received) (TpConnection *proxy,		typedef void (*tp_cli_connection_interface_mail_notification_signal_callbac k_mails_received) (TpConnection *proxy,
	const GPtrArray *arg_Mails,		const GPtrArray *arg_Mails,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_connection_interface_mail_notification_conn ect_to_mails_received (TpConnection *proxy,		TpProxySignalConnection *tp_cli_connection_interface_mail_notification_conn ect_to_mails_received (TpConnection *proxy,
	tp_cli_connection_interface_mail_notification_signal_callback_mails_rec eived callback,		tp_cli_connection_interface_mail_notification_signal_callback_mails_rec eived callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_connection_interface_mail_notification_connect_to_mails_received (T
			pConnection *proxy,
			tp_cli_connection_interface_mail_notification_signal_callback_mails_rec
			eived callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
			return tp_cli_connection_interface_mail_notification_connect_to_mails_rec
			eived (proxy, callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_connection_interface_mail_notification_connect_to_mails_rece
			ived(...) _tp_cli_connection_interface_mail_notification_connect_to_mails_r
			eceived (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_connection_interface_mail_notification_signal_callbac k_unread_mails_changed) (TpConnection *proxy,		typedef void (*tp_cli_connection_interface_mail_notification_signal_callbac k_unread_mails_changed) (TpConnection *proxy,
	guint arg_Count,		guint arg_Count,
	const GPtrArray *arg_Mails_Added,		const GPtrArray *arg_Mails_Added,
	const gchar **arg_Mails_Removed,		const gchar **arg_Mails_Removed,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_connection_interface_mail_notification_conn ect_to_unread_mails_changed (TpConnection *proxy,		TpProxySignalConnection *tp_cli_connection_interface_mail_notification_conn ect_to_unread_mails_changed (TpConnection *proxy,
	tp_cli_connection_interface_mail_notification_signal_callback_unread_ma ils_changed callback,		tp_cli_connection_interface_mail_notification_signal_callback_unread_ma ils_changed callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_connection_interface_mail_notification_connect_to_unread_mails_chan
			ged (TpConnection *proxy,
			tp_cli_connection_interface_mail_notification_signal_callback_unread_ma
			ils_changed callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
			return tp_cli_connection_interface_mail_notification_connect_to_unread_ma
			ils_changed (proxy, callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_connection_interface_mail_notification_connect_to_unread_mai
			ls_changed(...) _tp_cli_connection_interface_mail_notification_connect_to_u
			nread_mails_changed (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_connection_interface_mail_notification_callback_for_r equest_inbox_url) (TpConnection *proxy,		typedef void (*tp_cli_connection_interface_mail_notification_callback_for_r equest_inbox_url) (TpConnection *proxy,
	const GValueArray *out_URL,		const GValueArray *out_URL,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_connection_interface_mail_notification_call_requ est_inbox_url (TpConnection *proxy,		TpProxyPendingCall *tp_cli_connection_interface_mail_notification_call_requ est_inbox_url (TpConnection *proxy,
	gint timeout_ms,		gint timeout_ms,
	tp_cli_connection_interface_mail_notification_callback_for_request_inbo x_url callback,		tp_cli_connection_interface_mail_notification_callback_for_request_inbo x_url callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_connection_interface_mail_notification_run_request_inbox_ur		static inline TpProxyPendingCall *
	l (TpConnection *proxy,		_tp_cli_connection_interface_mail_notification_call_request_inbox_url (TpCo
			nnection *proxy,
	gint timeout_ms,		gint timeout_ms,
	GValueArray **out_URL,		tp_cli_connection_interface_mail_notification_callback_for_request_inbo
	GError **error,		x_url callback,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		gpointer user_data,
	#endif /* not TP_DISABLE_DEPRECATED */		GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
			return tp_cli_connection_interface_mail_notification_call_request_inbox_u
			rl (proxy, timeout_ms,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_connection_interface_mail_notification_call_request_inbox_ur
			l(...) _tp_cli_connection_interface_mail_notification_call_request_inbox_ur
			l (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_connection_interface_mail_notification_callback_for_r equest_mail_url) (TpConnection *proxy,		typedef void (*tp_cli_connection_interface_mail_notification_callback_for_r equest_mail_url) (TpConnection *proxy,
	const GValueArray *out_URL,		const GValueArray *out_URL,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_connection_interface_mail_notification_call_requ est_mail_url (TpConnection *proxy,		TpProxyPendingCall *tp_cli_connection_interface_mail_notification_call_requ est_mail_url (TpConnection *proxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar *in_ID,		const gchar *in_ID,
	const GValue *in_URL_Data,		const GValue *in_URL_Data,
	tp_cli_connection_interface_mail_notification_callback_for_request_mail _url callback,		tp_cli_connection_interface_mail_notification_callback_for_request_mail _url callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_connection_interface_mail_notification_run_request_mail_url		static inline TpProxyPendingCall *
	(TpConnection *proxy,		_tp_cli_connection_interface_mail_notification_call_request_mail_url (TpCon
			nection *proxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar *in_ID,		const gchar *in_ID,
	const GValue *in_URL_Data,		const GValue *in_URL_Data,
	GValueArray **out_URL,		tp_cli_connection_interface_mail_notification_callback_for_request_mail
	GError **error,		_url callback,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		gpointer user_data,
	#endif /* not TP_DISABLE_DEPRECATED */		GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
			return tp_cli_connection_interface_mail_notification_call_request_mail_ur
			l (proxy, timeout_ms,
			in_ID,
			in_URL_Data,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_connection_interface_mail_notification_call_request_mail_url
			(...) _tp_cli_connection_interface_mail_notification_call_request_mail_url
			(__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_connection_interface_power_saving_signal_callback_pow er_saving_changed) (TpConnection *proxy,		typedef void (*tp_cli_connection_interface_power_saving_signal_callback_pow er_saving_changed) (TpConnection *proxy,
	gboolean arg_Active,		gboolean arg_Active,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_connection_interface_power_saving_connect_t o_power_saving_changed (TpConnection *proxy,		TpProxySignalConnection *tp_cli_connection_interface_power_saving_connect_t o_power_saving_changed (TpConnection *proxy,
	tp_cli_connection_interface_power_saving_signal_callback_power_saving_c hanged callback,		tp_cli_connection_interface_power_saving_signal_callback_power_saving_c hanged callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_connection_interface_power_saving_connect_to_power_saving_changed (
			TpConnection *proxy,
			tp_cli_connection_interface_power_saving_signal_callback_power_saving_c
			hanged callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
			return tp_cli_connection_interface_power_saving_connect_to_power_saving_c
			hanged (proxy, callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_connection_interface_power_saving_connect_to_power_saving_ch
			anged(...) _tp_cli_connection_interface_power_saving_connect_to_power_savin
			g_changed (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_connection_interface_power_saving_callback_for_set_po wer_saving) (TpConnection *proxy,		typedef void (*tp_cli_connection_interface_power_saving_callback_for_set_po wer_saving) (TpConnection *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_connection_interface_power_saving_call_set_power _saving (TpConnection *proxy,		TpProxyPendingCall *tp_cli_connection_interface_power_saving_call_set_power _saving (TpConnection *proxy,
	gint timeout_ms,		gint timeout_ms,
	gboolean in_Activate,		gboolean in_Activate,
	tp_cli_connection_interface_power_saving_callback_for_set_power_saving callback,		tp_cli_connection_interface_power_saving_callback_for_set_power_saving callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_connection_interface_power_saving_run_set_power_saving (TpC		static inline TpProxyPendingCall *
	onnection *proxy,		_tp_cli_connection_interface_power_saving_call_set_power_saving (TpConnecti
			on *proxy,
	gint timeout_ms,		gint timeout_ms,
	gboolean in_Activate,		gboolean in_Activate,
	GError **error,		tp_cli_connection_interface_power_saving_callback_for_set_power_saving
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		callback,
	#endif /* not TP_DISABLE_DEPRECATED */		gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
			return tp_cli_connection_interface_power_saving_call_set_power_saving (pr
			oxy, timeout_ms,
			in_Activate,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_connection_interface_power_saving_call_set_power_saving(...)
			_tp_cli_connection_interface_power_saving_call_set_power_saving (__VA_ARGS
			__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_connection_interface_presence_signal_callback_presenc e_update) (TpConnection *proxy,		typedef void (*tp_cli_connection_interface_presence_signal_callback_presenc es_changed) (TpConnection *proxy,
	GHashTable *arg_Presence,		GHashTable *arg_Presence,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_connection_interface_presence_connect_to_pr		TpProxySignalConnection *tp_cli_connection_interface_presence_connect_to_pr
	esence_update (TpConnection *proxy,		esences_changed (TpConnection *proxy,
	tp_cli_connection_interface_presence_signal_callback_presence_update ca		tp_cli_connection_interface_presence_signal_callback_presences_changed
	llback,		callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
	typedef void (*tp_cli_connection_interface_presence_callback_for_add_status		#ifndef __GTK_DOC_IGNORE__
	) (TpConnection *proxy,		static inline TpProxySignalConnection *
	const GError *error, gpointer user_data,		_tp_cli_connection_interface_presence_connect_to_presences_changed (TpConne
	GObject *weak_object);		ction *proxy,
			tp_cli_connection_interface_presence_signal_callback_presences_changed
	TpProxyPendingCall *tp_cli_connection_interface_presence_call_add_status (T		callback,
	pConnection *proxy,
	gint timeout_ms,
	const gchar *in_Status,
	GHashTable *in_Parameters,
	tp_cli_connection_interface_presence_callback_for_add_status callback,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED
	gboolean tp_cli_connection_interface_presence_run_add_status (TpConnection
	*proxy,
	gint timeout_ms,
	const gchar *in_Status,
	GHashTable *in_Parameters,
	GError **error,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;
	#endif /* not TP_DISABLE_DEPRECATED */
	typedef void (*tp_cli_connection_interface_presence_callback_for_clear_stat
	us) (TpConnection *proxy,
	const GError *error, gpointer user_data,
	GObject *weak_object);
	TpProxyPendingCall *tp_cli_connection_interface_presence_call_clear_status
	(TpConnection *proxy,
	gint timeout_ms,
	tp_cli_connection_interface_presence_callback_for_clear_status callback
	,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED
	gboolean tp_cli_connection_interface_presence_run_clear_status (TpConnectio
	n *proxy,
	gint timeout_ms,
	GError **error,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;
	#endif /* not TP_DISABLE_DEPRECATED */
	typedef void (*tp_cli_connection_interface_presence_callback_for_get_presen
	ce) (TpConnection *proxy,
	GHashTable *out_Presence,
	const GError *error, gpointer user_data,
	GObject *weak_object);
	TpProxyPendingCall *tp_cli_connection_interface_presence_call_get_presence
	(TpConnection *proxy,
	gint timeout_ms,
	const GArray *in_Contacts,
	tp_cli_connection_interface_presence_callback_for_get_presence callback
	,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED
	gboolean tp_cli_connection_interface_presence_run_get_presence (TpConnectio
	n *proxy,
	gint timeout_ms,
	const GArray *in_Contacts,
	GHashTable **out_Presence,
	GError **error,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;
	#endif /* not TP_DISABLE_DEPRECATED */
	typedef void (*tp_cli_connection_interface_presence_callback_for_get_status
	es) (TpConnection *proxy,
	GHashTable *out_Available_Statuses,
	const GError *error, gpointer user_data,
	GObject *weak_object);
	TpProxyPendingCall *tp_cli_connection_interface_presence_call_get_statuses
	(TpConnection *proxy,
	gint timeout_ms,
	tp_cli_connection_interface_presence_callback_for_get_statuses callback
	,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object,
			GError **error)
	#ifndef TP_DISABLE_DEPRECATED		{
	gboolean tp_cli_connection_interface_presence_run_get_statuses (TpConnectio		g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
	n *proxy,		return tp_cli_connection_interface_presence_connect_to_presences_changed
	gint timeout_ms,		(proxy, callback, user_data,
	GHashTable **out_Available_Statuses,		destroy, weak_object, error);
	GError **error,		}
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		#define tp_cli_connection_interface_presence_connect_to_presences_changed(.
	#endif /* not TP_DISABLE_DEPRECATED */		..) _tp_cli_connection_interface_presence_connect_to_presences_changed (__V
			A_ARGS__)
	typedef void (*tp_cli_connection_interface_presence_callback_for_remove_sta		#endif /* __GTK_DOC_IGNORE__ */
	tus) (TpConnection *proxy,		typedef void (*tp_cli_connection_interface_presence_callback_for_set_presen
			ce) (TpConnection *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_connection_interface_presence_call_remove_status (TpConnection *proxy,		TpProxyPendingCall *tp_cli_connection_interface_presence_call_set_presence (TpConnection *proxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar *in_Status,		const gchar *in_Status,
	tp_cli_connection_interface_presence_callback_for_remove_status callbac		const gchar *in_Status_Message,
	k,		tp_cli_connection_interface_presence_callback_for_set_presence callback
			,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_connection_interface_presence_run_remove_status (TpConnecti		static inline TpProxyPendingCall *
	on *proxy,		_tp_cli_connection_interface_presence_call_set_presence (TpConnection *prox
			y,
	gint timeout_ms,		gint timeout_ms,
	const gchar *in_Status,		const gchar *in_Status,
	GError **error,		const gchar *in_Status_Message,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		tp_cli_connection_interface_presence_callback_for_set_presence callback
	#endif /* not TP_DISABLE_DEPRECATED */		,
	typedef void (*tp_cli_connection_interface_presence_callback_for_request_pr
	esence) (TpConnection *proxy,
	const GError *error, gpointer user_data,
	GObject *weak_object);
	TpProxyPendingCall *tp_cli_connection_interface_presence_call_request_prese
	nce (TpConnection *proxy,
	gint timeout_ms,
	const GArray *in_Contacts,
	tp_cli_connection_interface_presence_callback_for_request_presence call
	back,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED
	gboolean tp_cli_connection_interface_presence_run_request_presence (TpConne
	ction *proxy,
	gint timeout_ms,
	const GArray *in_Contacts,
	GError **error,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;
	#endif /* not TP_DISABLE_DEPRECATED */
	typedef void (*tp_cli_connection_interface_presence_callback_for_set_last_a
	ctivity_time) (TpConnection *proxy,
	const GError *error, gpointer user_data,
	GObject *weak_object);
	TpProxyPendingCall *tp_cli_connection_interface_presence_call_set_last_acti
	vity_time (TpConnection *proxy,
	gint timeout_ms,
	guint in_Time,
	tp_cli_connection_interface_presence_callback_for_set_last_activity_tim
	e callback,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED
	gboolean tp_cli_connection_interface_presence_run_set_last_activity_time (T
	pConnection *proxy,
	gint timeout_ms,
	guint in_Time,
	GError **error,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;
	#endif /* not TP_DISABLE_DEPRECATED */
	typedef void (*tp_cli_connection_interface_presence_callback_for_set_status
	) (TpConnection *proxy,
	const GError *error, gpointer user_data,
	GObject *weak_object);
	TpProxyPendingCall *tp_cli_connection_interface_presence_call_set_status (T
	pConnection *proxy,
	gint timeout_ms,
	GHashTable *in_Statuses,
	tp_cli_connection_interface_presence_callback_for_set_status callback,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED
	gboolean tp_cli_connection_interface_presence_run_set_status (TpConnection
	*proxy,
	gint timeout_ms,
	GHashTable *in_Statuses,
	GError **error,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;
	#endif /* not TP_DISABLE_DEPRECATED */
	typedef void (*tp_cli_connection_interface_renaming_signal_callback_renamed
	) (TpConnection *proxy,
	guint arg_Original,
	guint arg_New,
	gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_connection_interface_renaming_connect_to_re
	named (TpConnection *proxy,
	tp_cli_connection_interface_renaming_signal_callback_renamed callback,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object,
	GError **error);
	typedef void (*tp_cli_connection_interface_renaming_callback_for_request_re
	name) (TpConnection *proxy,
	const GError *error, gpointer user_data,
	GObject *weak_object);
	TpProxyPendingCall *tp_cli_connection_interface_renaming_call_request_renam
	e (TpConnection *proxy,
	gint timeout_ms,
	const gchar *in_Identifier,
	tp_cli_connection_interface_renaming_callback_for_request_rename callba
	ck,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
			return tp_cli_connection_interface_presence_call_set_presence (proxy, tim
			eout_ms,
			in_Status,
			in_Status_Message,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_connection_interface_presence_call_set_presence(...) _tp_cli
			_connection_interface_presence_call_set_presence (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_connection_interface_requests_signal_callback_new_cha nnels) (TpConnection *proxy,		typedef void (*tp_cli_connection_interface_requests_signal_callback_new_cha nnels) (TpConnection *proxy,
	const GPtrArray *arg_Channels,		const GPtrArray *arg_Channels,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_connection_interface_requests_connect_to_ne w_channels (TpConnection *proxy,		TpProxySignalConnection *tp_cli_connection_interface_requests_connect_to_ne w_channels (TpConnection *proxy,
	tp_cli_connection_interface_requests_signal_callback_new_channels callb ack,		tp_cli_connection_interface_requests_signal_callback_new_channels callb ack,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_connection_interface_requests_connect_to_new_channels (TpConnection
			*proxy,
			tp_cli_connection_interface_requests_signal_callback_new_channels callb
			ack,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
			return tp_cli_connection_interface_requests_connect_to_new_channels (prox
			y, callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_connection_interface_requests_connect_to_new_channels(...) _
			tp_cli_connection_interface_requests_connect_to_new_channels (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_connection_interface_requests_signal_callback_channel _closed) (TpConnection *proxy,		typedef void (*tp_cli_connection_interface_requests_signal_callback_channel _closed) (TpConnection *proxy,
	const gchar *arg_Removed,		const gchar *arg_Removed,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_connection_interface_requests_connect_to_ch annel_closed (TpConnection *proxy,		TpProxySignalConnection *tp_cli_connection_interface_requests_connect_to_ch annel_closed (TpConnection *proxy,
	tp_cli_connection_interface_requests_signal_callback_channel_closed cal lback,		tp_cli_connection_interface_requests_signal_callback_channel_closed cal lback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_connection_interface_requests_connect_to_channel_closed (TpConnecti
			on *proxy,
			tp_cli_connection_interface_requests_signal_callback_channel_closed cal
			lback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
			return tp_cli_connection_interface_requests_connect_to_channel_closed (pr
			oxy, callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_connection_interface_requests_connect_to_channel_closed(...)
			_tp_cli_connection_interface_requests_connect_to_channel_closed (__VA_ARGS
			__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_connection_interface_requests_callback_for_create_cha nnel) (TpConnection *proxy,		typedef void (*tp_cli_connection_interface_requests_callback_for_create_cha nnel) (TpConnection *proxy,
	const gchar *out_Channel,		const gchar *out_Channel,
	GHashTable *out_Properties,		GHashTable *out_Properties,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_connection_interface_requests_call_create_channe l (TpConnection *proxy,		TpProxyPendingCall *tp_cli_connection_interface_requests_call_create_channe l (TpConnection *proxy,
	gint timeout_ms,		gint timeout_ms,
	GHashTable *in_Request,		GHashTable *in_Request,
	tp_cli_connection_interface_requests_callback_for_create_channel callba ck,		tp_cli_connection_interface_requests_callback_for_create_channel callba ck,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_connection_interface_requests_run_create_channel (TpConnect		static inline TpProxyPendingCall *
	ion *proxy,		_tp_cli_connection_interface_requests_call_create_channel (TpConnection *pr
			oxy,
	gint timeout_ms,		gint timeout_ms,
	GHashTable *in_Request,		GHashTable *in_Request,
	gchar **out_Channel,		tp_cli_connection_interface_requests_callback_for_create_channel callba
	GHashTable **out_Properties,		ck,
	GError **error,		gpointer user_data,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		GDestroyNotify destroy,
	#endif /* not TP_DISABLE_DEPRECATED */		GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
			return tp_cli_connection_interface_requests_call_create_channel (proxy, t
			imeout_ms,
			in_Request,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_connection_interface_requests_call_create_channel(...) _tp_c
			li_connection_interface_requests_call_create_channel (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_connection_interface_requests_callback_for_ensure_cha nnel) (TpConnection *proxy,		typedef void (*tp_cli_connection_interface_requests_callback_for_ensure_cha nnel) (TpConnection *proxy,
	gboolean out_Yours,		gboolean out_Yours,
	const gchar *out_Channel,		const gchar *out_Channel,
	GHashTable *out_Properties,		GHashTable *out_Properties,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_connection_interface_requests_call_ensure_channe l (TpConnection *proxy,		TpProxyPendingCall *tp_cli_connection_interface_requests_call_ensure_channe l (TpConnection *proxy,
	gint timeout_ms,		gint timeout_ms,
	GHashTable *in_Request,		GHashTable *in_Request,
	tp_cli_connection_interface_requests_callback_for_ensure_channel callba ck,		tp_cli_connection_interface_requests_callback_for_ensure_channel callba ck,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_connection_interface_requests_run_ensure_channel (TpConnect		static inline TpProxyPendingCall *
	ion *proxy,		_tp_cli_connection_interface_requests_call_ensure_channel (TpConnection *pr
			oxy,
	gint timeout_ms,		gint timeout_ms,
	GHashTable *in_Request,		GHashTable *in_Request,
	gboolean *out_Yours,		tp_cli_connection_interface_requests_callback_for_ensure_channel callba
	gchar **out_Channel,		ck,
	GHashTable **out_Properties,		gpointer user_data,
	GError **error,		GDestroyNotify destroy,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		GObject *weak_object)
	#endif /* not TP_DISABLE_DEPRECATED */		{
			g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
			return tp_cli_connection_interface_requests_call_ensure_channel (proxy, t
			imeout_ms,
			in_Request,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_connection_interface_requests_call_ensure_channel(...) _tp_c
			li_connection_interface_requests_call_ensure_channel (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_connection_interface_service_point_signal_callback_se rvice_points_changed) (TpConnection *proxy,		typedef void (*tp_cli_connection_interface_service_point_signal_callback_se rvice_points_changed) (TpConnection *proxy,
	const GPtrArray *arg_Service_Points,		const GPtrArray *arg_Service_Points,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_connection_interface_service_point_connect_ to_service_points_changed (TpConnection *proxy,		TpProxySignalConnection *tp_cli_connection_interface_service_point_connect_ to_service_points_changed (TpConnection *proxy,
	tp_cli_connection_interface_service_point_signal_callback_service_point s_changed callback,		tp_cli_connection_interface_service_point_signal_callback_service_point s_changed callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
	typedef void (*tp_cli_connection_interface_sidecars1_callback_for_ensure_si		#ifndef __GTK_DOC_IGNORE__
	decar) (TpConnection *proxy,		static inline TpProxySignalConnection *
	const gchar *out_Path,		_tp_cli_connection_interface_service_point_connect_to_service_points_change
	GHashTable *out_Properties,		d (TpConnection *proxy,
	const GError *error, gpointer user_data,		tp_cli_connection_interface_service_point_signal_callback_service_point
	GObject *weak_object);		s_changed callback,
	TpProxyPendingCall *tp_cli_connection_interface_sidecars1_call_ensure_sidec
	ar (TpConnection *proxy,
	gint timeout_ms,
	const gchar *in_Main_Interface,
	tp_cli_connection_interface_sidecars1_callback_for_ensure_sidecar callb
	ack,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object);
	typedef void (*tp_cli_connection_interface_simple_presence_signal_callback_
	presences_changed) (TpConnection *proxy,
	GHashTable *arg_Presence,
	gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_connection_interface_simple_presence_connec
	t_to_presences_changed (TpConnection *proxy,
	tp_cli_connection_interface_simple_presence_signal_callback_presences_c
	hanged callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error)
			{
	typedef void (*tp_cli_connection_interface_simple_presence_callback_for_set		g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
	_presence) (TpConnection *proxy,		return tp_cli_connection_interface_service_point_connect_to_service_point
	const GError *error, gpointer user_data,		s_changed (proxy, callback, user_data,
	GObject *weak_object);		destroy, weak_object, error);
			}
	TpProxyPendingCall *tp_cli_connection_interface_simple_presence_call_set_pr		#define tp_cli_connection_interface_service_point_connect_to_service_points
	esence (TpConnection *proxy,		_changed(...) _tp_cli_connection_interface_service_point_connect_to_service
	gint timeout_ms,		_points_changed (__VA_ARGS__)
	const gchar *in_Status,		#endif /* __GTK_DOC_IGNORE__ */
	const gchar *in_Status_Message,		void tp_cli_connection_add_signals (TpProxy *self,
	tp_cli_connection_interface_simple_presence_callback_for_set_presence c		guint quark,
	allback,		DBusGProxy *proxy,
	gpointer user_data,		gpointer unused);
	GDestroyNotify destroy,
	GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED
	gboolean tp_cli_connection_interface_simple_presence_run_set_presence (TpCo
	nnection *proxy,
	gint timeout_ms,
	const gchar *in_Status,
	const gchar *in_Status_Message,
	GError **error,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;
	#endif /* not TP_DISABLE_DEPRECATED */
	typedef void (*tp_cli_connection_interface_simple_presence_callback_for_get
	_presences) (TpConnection *proxy,
	GHashTable *out_Presence,
	const GError *error, gpointer user_data,
	GObject *weak_object);
	TpProxyPendingCall *tp_cli_connection_interface_simple_presence_call_get_pr
	esences (TpConnection *proxy,
	gint timeout_ms,
	const GArray *in_Contacts,
	tp_cli_connection_interface_simple_presence_callback_for_get_presences
	callback,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED
	gboolean tp_cli_connection_interface_simple_presence_run_get_presences (TpC
	onnection *proxy,
	gint timeout_ms,
	const GArray *in_Contacts,
	GHashTable **out_Presence,
	GError **error,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;
	#endif /* not TP_DISABLE_DEPRECATED */
	G_END_DECLS		G_END_DECLS
	#endif /* defined (TP_GEN_TP_CLI_CONNECTION_H_INCLUDED) */		#endif /* defined (TP_GEN_TP_CLI_CONNECTION_H_INCLUDED) */
End of changes. 133 change blocks.
	1095 lines changed or deleted		1360 lines changed or added

	tp-cli-dbus-daemon.h		tp-cli-dbus-daemon.h
	skipping to change at line 18		skipping to change at line 18
	const gchar *arg1,		const gchar *arg1,
	const gchar *arg2,		const gchar *arg2,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_dbus_daemon_connect_to_name_owner_changed ( TpDBusDaemon *proxy,		TpProxySignalConnection *tp_cli_dbus_daemon_connect_to_name_owner_changed ( TpDBusDaemon *proxy,
	tp_cli_dbus_daemon_signal_callback_name_owner_changed callback,		tp_cli_dbus_daemon_signal_callback_name_owner_changed callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_dbus_daemon_connect_to_name_owner_changed (TpDBusDaemon *proxy,
			tp_cli_dbus_daemon_signal_callback_name_owner_changed callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_DBUS_DAEMON (proxy), NULL);
			return tp_cli_dbus_daemon_connect_to_name_owner_changed (proxy, callback,
			user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_dbus_daemon_connect_to_name_owner_changed(...) _tp_cli_dbus_
			daemon_connect_to_name_owner_changed (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_dbus_daemon_signal_callback_name_lost) (TpDBusDaemon *proxy,		typedef void (*tp_cli_dbus_daemon_signal_callback_name_lost) (TpDBusDaemon *proxy,
	const gchar *arg0,		const gchar *arg0,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_dbus_daemon_connect_to_name_lost (TpDBusDae mon *proxy,		TpProxySignalConnection *tp_cli_dbus_daemon_connect_to_name_lost (TpDBusDae mon *proxy,
	tp_cli_dbus_daemon_signal_callback_name_lost callback,		tp_cli_dbus_daemon_signal_callback_name_lost callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_dbus_daemon_connect_to_name_lost (TpDBusDaemon *proxy,
			tp_cli_dbus_daemon_signal_callback_name_lost callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_DBUS_DAEMON (proxy), NULL);
			return tp_cli_dbus_daemon_connect_to_name_lost (proxy, callback, user_dat
			a,
			destroy, weak_object, error);
			}
			#define tp_cli_dbus_daemon_connect_to_name_lost(...) _tp_cli_dbus_daemon_co
			nnect_to_name_lost (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_dbus_daemon_signal_callback_name_acquired) (TpDBusDae mon *proxy,		typedef void (*tp_cli_dbus_daemon_signal_callback_name_acquired) (TpDBusDae mon *proxy,
	const gchar *arg0,		const gchar *arg0,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_dbus_daemon_connect_to_name_acquired (TpDBu sDaemon *proxy,		TpProxySignalConnection *tp_cli_dbus_daemon_connect_to_name_acquired (TpDBu sDaemon *proxy,
	tp_cli_dbus_daemon_signal_callback_name_acquired callback,		tp_cli_dbus_daemon_signal_callback_name_acquired callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_dbus_daemon_connect_to_name_acquired (TpDBusDaemon *proxy,
			tp_cli_dbus_daemon_signal_callback_name_acquired callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_DBUS_DAEMON (proxy), NULL);
			return tp_cli_dbus_daemon_connect_to_name_acquired (proxy, callback, user
			_data,
			destroy, weak_object, error);
			}
			#define tp_cli_dbus_daemon_connect_to_name_acquired(...) _tp_cli_dbus_daemo
			n_connect_to_name_acquired (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_dbus_daemon_callback_for_hello) (TpDBusDaemon *proxy,		typedef void (*tp_cli_dbus_daemon_callback_for_hello) (TpDBusDaemon *proxy,
	const gchar *out0,		const gchar *out0,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_dbus_daemon_call_hello (TpDBusDaemon *proxy,		TpProxyPendingCall *tp_cli_dbus_daemon_call_hello (TpDBusDaemon *proxy,
	gint timeout_ms,		gint timeout_ms,
	tp_cli_dbus_daemon_callback_for_hello callback,		tp_cli_dbus_daemon_callback_for_hello callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_dbus_daemon_run_hello (TpDBusDaemon *proxy,		static inline TpProxyPendingCall *
			_tp_cli_dbus_daemon_call_hello (TpDBusDaemon *proxy,
	gint timeout_ms,		gint timeout_ms,
	gchar **out0,		tp_cli_dbus_daemon_callback_for_hello callback,
	GError **error,		gpointer user_data,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		GDestroyNotify destroy,
	#endif /* not TP_DISABLE_DEPRECATED */		GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_DBUS_DAEMON (proxy), NULL);
			return tp_cli_dbus_daemon_call_hello (proxy, timeout_ms,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_dbus_daemon_call_hello(...) _tp_cli_dbus_daemon_call_hello (
			__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_dbus_daemon_callback_for_request_name) (TpDBusDaemon *proxy,		typedef void (*tp_cli_dbus_daemon_callback_for_request_name) (TpDBusDaemon *proxy,
	guint out0,		guint out0,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_dbus_daemon_call_request_name (TpDBusDaemon *pro xy,		TpProxyPendingCall *tp_cli_dbus_daemon_call_request_name (TpDBusDaemon *pro xy,
	gint timeout_ms,		gint timeout_ms,
	const gchar *in0,		const gchar *in0,
	guint in1,		guint in1,
	tp_cli_dbus_daemon_callback_for_request_name callback,		tp_cli_dbus_daemon_callback_for_request_name callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_dbus_daemon_run_request_name (TpDBusDaemon *proxy,		static inline TpProxyPendingCall *
			_tp_cli_dbus_daemon_call_request_name (TpDBusDaemon *proxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar *in0,		const gchar *in0,
	guint in1,		guint in1,
	guint *out0,		tp_cli_dbus_daemon_callback_for_request_name callback,
	GError **error,		gpointer user_data,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		GDestroyNotify destroy,
	#endif /* not TP_DISABLE_DEPRECATED */		GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_DBUS_DAEMON (proxy), NULL);
			return tp_cli_dbus_daemon_call_request_name (proxy, timeout_ms,
			in0,
			in1,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_dbus_daemon_call_request_name(...) _tp_cli_dbus_daemon_call_
			request_name (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_dbus_daemon_callback_for_release_name) (TpDBusDaemon *proxy,		typedef void (*tp_cli_dbus_daemon_callback_for_release_name) (TpDBusDaemon *proxy,
	guint out0,		guint out0,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_dbus_daemon_call_release_name (TpDBusDaemon *pro xy,		TpProxyPendingCall *tp_cli_dbus_daemon_call_release_name (TpDBusDaemon *pro xy,
	gint timeout_ms,		gint timeout_ms,
	const gchar *in0,		const gchar *in0,
	tp_cli_dbus_daemon_callback_for_release_name callback,		tp_cli_dbus_daemon_callback_for_release_name callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_dbus_daemon_run_release_name (TpDBusDaemon *proxy,		static inline TpProxyPendingCall *
			_tp_cli_dbus_daemon_call_release_name (TpDBusDaemon *proxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar *in0,		const gchar *in0,
	guint *out0,		tp_cli_dbus_daemon_callback_for_release_name callback,
	GError **error,		gpointer user_data,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		GDestroyNotify destroy,
	#endif /* not TP_DISABLE_DEPRECATED */		GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_DBUS_DAEMON (proxy), NULL);
			return tp_cli_dbus_daemon_call_release_name (proxy, timeout_ms,
			in0,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_dbus_daemon_call_release_name(...) _tp_cli_dbus_daemon_call_
			release_name (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_dbus_daemon_callback_for_start_service_by_name) (TpDB usDaemon *proxy,		typedef void (*tp_cli_dbus_daemon_callback_for_start_service_by_name) (TpDB usDaemon *proxy,
	guint out0,		guint out0,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_dbus_daemon_call_start_service_by_name (TpDBusDa emon *proxy,		TpProxyPendingCall *tp_cli_dbus_daemon_call_start_service_by_name (TpDBusDa emon *proxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar *in0,		const gchar *in0,
	guint in1,		guint in1,
	tp_cli_dbus_daemon_callback_for_start_service_by_name callback,		tp_cli_dbus_daemon_callback_for_start_service_by_name callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_dbus_daemon_run_start_service_by_name (TpDBusDaemon *proxy,		static inline TpProxyPendingCall *
			_tp_cli_dbus_daemon_call_start_service_by_name (TpDBusDaemon *proxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar *in0,		const gchar *in0,
	guint in1,		guint in1,
	guint *out0,		tp_cli_dbus_daemon_callback_for_start_service_by_name callback,
	GError **error,		gpointer user_data,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		GDestroyNotify destroy,
	#endif /* not TP_DISABLE_DEPRECATED */		GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_DBUS_DAEMON (proxy), NULL);
			return tp_cli_dbus_daemon_call_start_service_by_name (proxy, timeout_ms,
			in0,
			in1,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_dbus_daemon_call_start_service_by_name(...) _tp_cli_dbus_dae
			mon_call_start_service_by_name (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_dbus_daemon_callback_for_name_has_owner) (TpDBusDaemo n *proxy,		typedef void (*tp_cli_dbus_daemon_callback_for_name_has_owner) (TpDBusDaemo n *proxy,
	gboolean out0,		gboolean out0,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_dbus_daemon_call_name_has_owner (TpDBusDaemon *p roxy,		TpProxyPendingCall *tp_cli_dbus_daemon_call_name_has_owner (TpDBusDaemon *p roxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar *in0,		const gchar *in0,
	tp_cli_dbus_daemon_callback_for_name_has_owner callback,		tp_cli_dbus_daemon_callback_for_name_has_owner callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_dbus_daemon_run_name_has_owner (TpDBusDaemon *proxy,		static inline TpProxyPendingCall *
			_tp_cli_dbus_daemon_call_name_has_owner (TpDBusDaemon *proxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar *in0,		const gchar *in0,
	gboolean *out0,		tp_cli_dbus_daemon_callback_for_name_has_owner callback,
	GError **error,		gpointer user_data,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		GDestroyNotify destroy,
	#endif /* not TP_DISABLE_DEPRECATED */		GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_DBUS_DAEMON (proxy), NULL);
			return tp_cli_dbus_daemon_call_name_has_owner (proxy, timeout_ms,
			in0,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_dbus_daemon_call_name_has_owner(...) _tp_cli_dbus_daemon_cal
			l_name_has_owner (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_dbus_daemon_callback_for_list_names) (TpDBusDaemon *p roxy,		typedef void (*tp_cli_dbus_daemon_callback_for_list_names) (TpDBusDaemon *p roxy,
	const gchar **out0,		const gchar **out0,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_dbus_daemon_call_list_names (TpDBusDaemon *proxy ,		TpProxyPendingCall *tp_cli_dbus_daemon_call_list_names (TpDBusDaemon *proxy ,
	gint timeout_ms,		gint timeout_ms,
	tp_cli_dbus_daemon_callback_for_list_names callback,		tp_cli_dbus_daemon_callback_for_list_names callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_dbus_daemon_run_list_names (TpDBusDaemon *proxy,		static inline TpProxyPendingCall *
			_tp_cli_dbus_daemon_call_list_names (TpDBusDaemon *proxy,
	gint timeout_ms,		gint timeout_ms,
	gchar ***out0,		tp_cli_dbus_daemon_callback_for_list_names callback,
	GError **error,		gpointer user_data,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		GDestroyNotify destroy,
	#endif /* not TP_DISABLE_DEPRECATED */		GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_DBUS_DAEMON (proxy), NULL);
			return tp_cli_dbus_daemon_call_list_names (proxy, timeout_ms,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_dbus_daemon_call_list_names(...) _tp_cli_dbus_daemon_call_li
			st_names (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_dbus_daemon_callback_for_list_activatable_names) (TpD BusDaemon *proxy,		typedef void (*tp_cli_dbus_daemon_callback_for_list_activatable_names) (TpD BusDaemon *proxy,
	const gchar **out0,		const gchar **out0,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_dbus_daemon_call_list_activatable_names (TpDBusD aemon *proxy,		TpProxyPendingCall *tp_cli_dbus_daemon_call_list_activatable_names (TpDBusD aemon *proxy,
	gint timeout_ms,		gint timeout_ms,
	tp_cli_dbus_daemon_callback_for_list_activatable_names callback,		tp_cli_dbus_daemon_callback_for_list_activatable_names callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_dbus_daemon_run_list_activatable_names (TpDBusDaemon *proxy		static inline TpProxyPendingCall *
	,		_tp_cli_dbus_daemon_call_list_activatable_names (TpDBusDaemon *proxy,
	gint timeout_ms,		gint timeout_ms,
	gchar ***out0,		tp_cli_dbus_daemon_callback_for_list_activatable_names callback,
	GError **error,		gpointer user_data,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		GDestroyNotify destroy,
	#endif /* not TP_DISABLE_DEPRECATED */		GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_DBUS_DAEMON (proxy), NULL);
			return tp_cli_dbus_daemon_call_list_activatable_names (proxy, timeout_ms,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_dbus_daemon_call_list_activatable_names(...) _tp_cli_dbus_da
			emon_call_list_activatable_names (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_dbus_daemon_callback_for_add_match) (TpDBusDaemon *pr oxy,		typedef void (*tp_cli_dbus_daemon_callback_for_add_match) (TpDBusDaemon *pr oxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_dbus_daemon_call_add_match (TpDBusDaemon *proxy,		TpProxyPendingCall *tp_cli_dbus_daemon_call_add_match (TpDBusDaemon *proxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar *in0,		const gchar *in0,
	tp_cli_dbus_daemon_callback_for_add_match callback,		tp_cli_dbus_daemon_callback_for_add_match callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_dbus_daemon_run_add_match (TpDBusDaemon *proxy,		static inline TpProxyPendingCall *
			_tp_cli_dbus_daemon_call_add_match (TpDBusDaemon *proxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar *in0,		const gchar *in0,
	GError **error,		tp_cli_dbus_daemon_callback_for_add_match callback,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		gpointer user_data,
	#endif /* not TP_DISABLE_DEPRECATED */		GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_DBUS_DAEMON (proxy), NULL);
			return tp_cli_dbus_daemon_call_add_match (proxy, timeout_ms,
			in0,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_dbus_daemon_call_add_match(...) _tp_cli_dbus_daemon_call_add
			_match (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_dbus_daemon_callback_for_remove_match) (TpDBusDaemon *proxy,		typedef void (*tp_cli_dbus_daemon_callback_for_remove_match) (TpDBusDaemon *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_dbus_daemon_call_remove_match (TpDBusDaemon *pro xy,		TpProxyPendingCall *tp_cli_dbus_daemon_call_remove_match (TpDBusDaemon *pro xy,
	gint timeout_ms,		gint timeout_ms,
	const gchar *in0,		const gchar *in0,
	tp_cli_dbus_daemon_callback_for_remove_match callback,		tp_cli_dbus_daemon_callback_for_remove_match callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_dbus_daemon_run_remove_match (TpDBusDaemon *proxy,		static inline TpProxyPendingCall *
			_tp_cli_dbus_daemon_call_remove_match (TpDBusDaemon *proxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar *in0,		const gchar *in0,
	GError **error,		tp_cli_dbus_daemon_callback_for_remove_match callback,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		gpointer user_data,
	#endif /* not TP_DISABLE_DEPRECATED */		GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_DBUS_DAEMON (proxy), NULL);
			return tp_cli_dbus_daemon_call_remove_match (proxy, timeout_ms,
			in0,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_dbus_daemon_call_remove_match(...) _tp_cli_dbus_daemon_call_
			remove_match (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_dbus_daemon_callback_for_get_name_owner) (TpDBusDaemo n *proxy,		typedef void (*tp_cli_dbus_daemon_callback_for_get_name_owner) (TpDBusDaemo n *proxy,
	const gchar *out0,		const gchar *out0,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_dbus_daemon_call_get_name_owner (TpDBusDaemon *p roxy,		TpProxyPendingCall *tp_cli_dbus_daemon_call_get_name_owner (TpDBusDaemon *p roxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar *in0,		const gchar *in0,
	tp_cli_dbus_daemon_callback_for_get_name_owner callback,		tp_cli_dbus_daemon_callback_for_get_name_owner callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_dbus_daemon_run_get_name_owner (TpDBusDaemon *proxy,		static inline TpProxyPendingCall *
			_tp_cli_dbus_daemon_call_get_name_owner (TpDBusDaemon *proxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar *in0,		const gchar *in0,
	gchar **out0,		tp_cli_dbus_daemon_callback_for_get_name_owner callback,
	GError **error,		gpointer user_data,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		GDestroyNotify destroy,
	#endif /* not TP_DISABLE_DEPRECATED */		GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_DBUS_DAEMON (proxy), NULL);
			return tp_cli_dbus_daemon_call_get_name_owner (proxy, timeout_ms,
			in0,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_dbus_daemon_call_get_name_owner(...) _tp_cli_dbus_daemon_cal
			l_get_name_owner (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_dbus_daemon_callback_for_list_queued_owners) (TpDBusD aemon *proxy,		typedef void (*tp_cli_dbus_daemon_callback_for_list_queued_owners) (TpDBusD aemon *proxy,
	const gchar **out0,		const gchar **out0,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_dbus_daemon_call_list_queued_owners (TpDBusDaemo n *proxy,		TpProxyPendingCall *tp_cli_dbus_daemon_call_list_queued_owners (TpDBusDaemo n *proxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar *in0,		const gchar *in0,
	tp_cli_dbus_daemon_callback_for_list_queued_owners callback,		tp_cli_dbus_daemon_callback_for_list_queued_owners callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_dbus_daemon_run_list_queued_owners (TpDBusDaemon *proxy,		static inline TpProxyPendingCall *
			_tp_cli_dbus_daemon_call_list_queued_owners (TpDBusDaemon *proxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar *in0,		const gchar *in0,
	gchar ***out0,		tp_cli_dbus_daemon_callback_for_list_queued_owners callback,
	GError **error,		gpointer user_data,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		GDestroyNotify destroy,
	#endif /* not TP_DISABLE_DEPRECATED */		GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_DBUS_DAEMON (proxy), NULL);
			return tp_cli_dbus_daemon_call_list_queued_owners (proxy, timeout_ms,
			in0,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_dbus_daemon_call_list_queued_owners(...) _tp_cli_dbus_daemon
			_call_list_queued_owners (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_dbus_daemon_callback_for_get_connection_unix_user) (T pDBusDaemon *proxy,		typedef void (*tp_cli_dbus_daemon_callback_for_get_connection_unix_user) (T pDBusDaemon *proxy,
	guint out0,		guint out0,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_dbus_daemon_call_get_connection_unix_user (TpDBu sDaemon *proxy,		TpProxyPendingCall *tp_cli_dbus_daemon_call_get_connection_unix_user (TpDBu sDaemon *proxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar *in0,		const gchar *in0,
	tp_cli_dbus_daemon_callback_for_get_connection_unix_user callback,		tp_cli_dbus_daemon_callback_for_get_connection_unix_user callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_dbus_daemon_run_get_connection_unix_user (TpDBusDaemon *pro		static inline TpProxyPendingCall *
	xy,		_tp_cli_dbus_daemon_call_get_connection_unix_user (TpDBusDaemon *proxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar *in0,		const gchar *in0,
	guint *out0,		tp_cli_dbus_daemon_callback_for_get_connection_unix_user callback,
	GError **error,		gpointer user_data,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		GDestroyNotify destroy,
	#endif /* not TP_DISABLE_DEPRECATED */		GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_DBUS_DAEMON (proxy), NULL);
			return tp_cli_dbus_daemon_call_get_connection_unix_user (proxy, timeout_m
			s,
			in0,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_dbus_daemon_call_get_connection_unix_user(...) _tp_cli_dbus_
			daemon_call_get_connection_unix_user (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_dbus_daemon_callback_for_get_connection_unix_process_ id) (TpDBusDaemon *proxy,		typedef void (*tp_cli_dbus_daemon_callback_for_get_connection_unix_process_ id) (TpDBusDaemon *proxy,
	guint out0,		guint out0,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_dbus_daemon_call_get_connection_unix_process_id (TpDBusDaemon *proxy,		TpProxyPendingCall *tp_cli_dbus_daemon_call_get_connection_unix_process_id (TpDBusDaemon *proxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar *in0,		const gchar *in0,
	tp_cli_dbus_daemon_callback_for_get_connection_unix_process_id callback ,		tp_cli_dbus_daemon_callback_for_get_connection_unix_process_id callback ,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_dbus_daemon_run_get_connection_unix_process_id (TpDBusDaemo		static inline TpProxyPendingCall *
	n *proxy,		_tp_cli_dbus_daemon_call_get_connection_unix_process_id (TpDBusDaemon *prox
			y,
	gint timeout_ms,		gint timeout_ms,
	const gchar *in0,		const gchar *in0,
	guint *out0,		tp_cli_dbus_daemon_callback_for_get_connection_unix_process_id callback
	GError **error,		,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		gpointer user_data,
	#endif /* not TP_DISABLE_DEPRECATED */		GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_DBUS_DAEMON (proxy), NULL);
			return tp_cli_dbus_daemon_call_get_connection_unix_process_id (proxy, tim
			eout_ms,
			in0,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_dbus_daemon_call_get_connection_unix_process_id(...) _tp_cli
			_dbus_daemon_call_get_connection_unix_process_id (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_dbus_daemon_callback_for_get_connection_se_linux_secu rity_context) (TpDBusDaemon *proxy,		typedef void (*tp_cli_dbus_daemon_callback_for_get_connection_se_linux_secu rity_context) (TpDBusDaemon *proxy,
	const GArray *out0,		const GArray *out0,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_dbus_daemon_call_get_connection_se_linux_securit y_context (TpDBusDaemon *proxy,		TpProxyPendingCall *tp_cli_dbus_daemon_call_get_connection_se_linux_securit y_context (TpDBusDaemon *proxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar *in0,		const gchar *in0,
	tp_cli_dbus_daemon_callback_for_get_connection_se_linux_security_contex t callback,		tp_cli_dbus_daemon_callback_for_get_connection_se_linux_security_contex t callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_dbus_daemon_run_get_connection_se_linux_security_context (T		static inline TpProxyPendingCall *
	pDBusDaemon *proxy,		_tp_cli_dbus_daemon_call_get_connection_se_linux_security_context (TpDBusDa
			emon *proxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar *in0,		const gchar *in0,
	GArray **out0,		tp_cli_dbus_daemon_callback_for_get_connection_se_linux_security_contex
	GError **error,		t callback,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		gpointer user_data,
	#endif /* not TP_DISABLE_DEPRECATED */		GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_DBUS_DAEMON (proxy), NULL);
			return tp_cli_dbus_daemon_call_get_connection_se_linux_security_context (
			proxy, timeout_ms,
			in0,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_dbus_daemon_call_get_connection_se_linux_security_context(..
			.) _tp_cli_dbus_daemon_call_get_connection_se_linux_security_context (__VA_
			ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_dbus_daemon_callback_for_reload_config) (TpDBusDaemon *proxy,		typedef void (*tp_cli_dbus_daemon_callback_for_reload_config) (TpDBusDaemon *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_dbus_daemon_call_reload_config (TpDBusDaemon *pr oxy,		TpProxyPendingCall *tp_cli_dbus_daemon_call_reload_config (TpDBusDaemon *pr oxy,
	gint timeout_ms,		gint timeout_ms,
	tp_cli_dbus_daemon_callback_for_reload_config callback,		tp_cli_dbus_daemon_callback_for_reload_config callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_dbus_daemon_run_reload_config (TpDBusDaemon *proxy,		static inline TpProxyPendingCall *
			_tp_cli_dbus_daemon_call_reload_config (TpDBusDaemon *proxy,
	gint timeout_ms,		gint timeout_ms,
	GError **error,		tp_cli_dbus_daemon_callback_for_reload_config callback,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		gpointer user_data,
	#endif /* not TP_DISABLE_DEPRECATED */		GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_DBUS_DAEMON (proxy), NULL);
			return tp_cli_dbus_daemon_call_reload_config (proxy, timeout_ms,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_dbus_daemon_call_reload_config(...) _tp_cli_dbus_daemon_call
			_reload_config (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_dbus_daemon_callback_for_get_id) (TpDBusDaemon *proxy ,		typedef void (*tp_cli_dbus_daemon_callback_for_get_id) (TpDBusDaemon *proxy ,
	const gchar *out0,		const gchar *out0,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_dbus_daemon_call_get_id (TpDBusDaemon *proxy,		TpProxyPendingCall *tp_cli_dbus_daemon_call_get_id (TpDBusDaemon *proxy,
	gint timeout_ms,		gint timeout_ms,
	tp_cli_dbus_daemon_callback_for_get_id callback,		tp_cli_dbus_daemon_callback_for_get_id callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_dbus_daemon_run_get_id (TpDBusDaemon *proxy,		static inline TpProxyPendingCall *
			_tp_cli_dbus_daemon_call_get_id (TpDBusDaemon *proxy,
	gint timeout_ms,		gint timeout_ms,
	gchar **out0,		tp_cli_dbus_daemon_callback_for_get_id callback,
	GError **error,		gpointer user_data,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		GDestroyNotify destroy,
	#endif /* not TP_DISABLE_DEPRECATED */		GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_DBUS_DAEMON (proxy), NULL);
			return tp_cli_dbus_daemon_call_get_id (proxy, timeout_ms,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_dbus_daemon_call_get_id(...) _tp_cli_dbus_daemon_call_get_id
			(__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
			void tp_cli_dbus_daemon_add_signals (TpProxy *self,
			guint quark,
			DBusGProxy *proxy,
			gpointer unused);
	G_END_DECLS		G_END_DECLS
	#endif /* defined (TP_GEN_TP_CLI_DBUS_DAEMON_H_INCLUDED) */		#endif /* defined (TP_GEN_TP_CLI_DBUS_DAEMON_H_INCLUDED) */
End of changes. 35 change blocks.
	97 lines changed or deleted		317 lines changed or added

	tp-cli-debug.h		tp-cli-debug.h
	skipping to change at line 19		skipping to change at line 19
	guint arg_level,		guint arg_level,
	const gchar *arg_message,		const gchar *arg_message,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_debug_connect_to_new_debug_message (TpDebug Client *proxy,		TpProxySignalConnection *tp_cli_debug_connect_to_new_debug_message (TpDebug Client *proxy,
	tp_cli_debug_signal_callback_new_debug_message callback,		tp_cli_debug_signal_callback_new_debug_message callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_debug_connect_to_new_debug_message (TpDebugClient *proxy,
			tp_cli_debug_signal_callback_new_debug_message callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_DEBUG_CLIENT (proxy), NULL);
			return tp_cli_debug_connect_to_new_debug_message (proxy, callback, user_d
			ata,
			destroy, weak_object, error);
			}
			#define tp_cli_debug_connect_to_new_debug_message(...) _tp_cli_debug_connec
			t_to_new_debug_message (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_debug_callback_for_get_messages) (TpDebugClient *prox y,		typedef void (*tp_cli_debug_callback_for_get_messages) (TpDebugClient *prox y,
	const GPtrArray *out_Messages,		const GPtrArray *out_Messages,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_debug_call_get_messages (TpDebugClient *proxy,		TpProxyPendingCall *tp_cli_debug_call_get_messages (TpDebugClient *proxy,
	gint timeout_ms,		gint timeout_ms,
	tp_cli_debug_callback_for_get_messages callback,		tp_cli_debug_callback_for_get_messages callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxyPendingCall *
			_tp_cli_debug_call_get_messages (TpDebugClient *proxy,
			gint timeout_ms,
			tp_cli_debug_callback_for_get_messages callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_DEBUG_CLIENT (proxy), NULL);
			return tp_cli_debug_call_get_messages (proxy, timeout_ms,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_debug_call_get_messages(...) _tp_cli_debug_call_get_messages
			(__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
			void tp_cli_debug_add_signals (TpProxy *self,
			guint quark,
			DBusGProxy *proxy,
			gpointer unused);
	G_END_DECLS		G_END_DECLS
	#endif /* defined (TP_GEN_TP_CLI_DEBUG_H_INCLUDED) */		#endif /* defined (TP_GEN_TP_CLI_DEBUG_H_INCLUDED) */
End of changes. 2 change blocks.
	0 lines changed or deleted		39 lines changed or added

	tp-cli-generic.h		tp-cli-generic.h
	skipping to change at line 18		skipping to change at line 18
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_dbus_introspectable_call_introspect (gpointer pr oxy,		TpProxyPendingCall *tp_cli_dbus_introspectable_call_introspect (gpointer pr oxy,
	gint timeout_ms,		gint timeout_ms,
	tp_cli_dbus_introspectable_callback_for_introspect callback,		tp_cli_dbus_introspectable_callback_for_introspect callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_dbus_introspectable_run_introspect (gpointer proxy,		static inline TpProxyPendingCall *
			_tp_cli_dbus_introspectable_call_introspect (gpointer proxy,
	gint timeout_ms,		gint timeout_ms,
	gchar **out_XML_Data,		tp_cli_dbus_introspectable_callback_for_introspect callback,
	GError **error,		gpointer user_data,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		GDestroyNotify destroy,
	#endif /* not TP_DISABLE_DEPRECATED */		GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_PROXY (proxy), NULL);
			return tp_cli_dbus_introspectable_call_introspect (proxy, timeout_ms,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_dbus_introspectable_call_introspect(...) _tp_cli_dbus_intros
			pectable_call_introspect (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_dbus_peer_callback_for_ping) (TpProxy *proxy,		typedef void (*tp_cli_dbus_peer_callback_for_ping) (TpProxy *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_dbus_peer_call_ping (gpointer proxy,		TpProxyPendingCall *tp_cli_dbus_peer_call_ping (gpointer proxy,
	gint timeout_ms,		gint timeout_ms,
	tp_cli_dbus_peer_callback_for_ping callback,		tp_cli_dbus_peer_callback_for_ping callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_dbus_peer_run_ping (gpointer proxy,		static inline TpProxyPendingCall *
			_tp_cli_dbus_peer_call_ping (gpointer proxy,
	gint timeout_ms,		gint timeout_ms,
	GError **error,		tp_cli_dbus_peer_callback_for_ping callback,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		gpointer user_data,
	#endif /* not TP_DISABLE_DEPRECATED */		GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_PROXY (proxy), NULL);
			return tp_cli_dbus_peer_call_ping (proxy, timeout_ms,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_dbus_peer_call_ping(...) _tp_cli_dbus_peer_call_ping (__VA_A
			RGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_dbus_peer_callback_for_get_machine_id) (TpProxy *prox y,		typedef void (*tp_cli_dbus_peer_callback_for_get_machine_id) (TpProxy *prox y,
	const gchar *out_Machine_UUID,		const gchar *out_Machine_UUID,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_dbus_peer_call_get_machine_id (gpointer proxy,		TpProxyPendingCall *tp_cli_dbus_peer_call_get_machine_id (gpointer proxy,
	gint timeout_ms,		gint timeout_ms,
	tp_cli_dbus_peer_callback_for_get_machine_id callback,		tp_cli_dbus_peer_callback_for_get_machine_id callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_dbus_peer_run_get_machine_id (gpointer proxy,		static inline TpProxyPendingCall *
			_tp_cli_dbus_peer_call_get_machine_id (gpointer proxy,
	gint timeout_ms,		gint timeout_ms,
	gchar **out_Machine_UUID,		tp_cli_dbus_peer_callback_for_get_machine_id callback,
	GError **error,		gpointer user_data,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		GDestroyNotify destroy,
	#endif /* not TP_DISABLE_DEPRECATED */		GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_PROXY (proxy), NULL);
			return tp_cli_dbus_peer_call_get_machine_id (proxy, timeout_ms,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_dbus_peer_call_get_machine_id(...) _tp_cli_dbus_peer_call_ge
			t_machine_id (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_dbus_properties_signal_callback_properties_changed) ( TpProxy *proxy,		typedef void (*tp_cli_dbus_properties_signal_callback_properties_changed) ( TpProxy *proxy,
	const gchar *arg_Interface_Name,		const gchar *arg_Interface_Name,
	GHashTable *arg_Changed_Properties,		GHashTable *arg_Changed_Properties,
	const gchar **arg_Invalidated_Properties,		const gchar **arg_Invalidated_Properties,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_dbus_properties_connect_to_properties_chang ed (gpointer proxy,		TpProxySignalConnection *tp_cli_dbus_properties_connect_to_properties_chang ed (gpointer proxy,
	tp_cli_dbus_properties_signal_callback_properties_changed callback,		tp_cli_dbus_properties_signal_callback_properties_changed callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_dbus_properties_connect_to_properties_changed (gpointer proxy,
			tp_cli_dbus_properties_signal_callback_properties_changed callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_PROXY (proxy), NULL);
			return tp_cli_dbus_properties_connect_to_properties_changed (proxy, callb
			ack, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_dbus_properties_connect_to_properties_changed(...) _tp_cli_d
			bus_properties_connect_to_properties_changed (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_dbus_properties_callback_for_get) (TpProxy *proxy,		typedef void (*tp_cli_dbus_properties_callback_for_get) (TpProxy *proxy,
	const GValue *out_Value,		const GValue *out_Value,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_dbus_properties_call_get (gpointer proxy,		TpProxyPendingCall *tp_cli_dbus_properties_call_get (gpointer proxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar *in_Interface_Name,		const gchar *in_Interface_Name,
	const gchar *in_Property_Name,		const gchar *in_Property_Name,
	tp_cli_dbus_properties_callback_for_get callback,		tp_cli_dbus_properties_callback_for_get callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_dbus_properties_run_get (gpointer proxy,		static inline TpProxyPendingCall *
			_tp_cli_dbus_properties_call_get (gpointer proxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar *in_Interface_Name,		const gchar *in_Interface_Name,
	const gchar *in_Property_Name,		const gchar *in_Property_Name,
	GValue **out_Value,		tp_cli_dbus_properties_callback_for_get callback,
	GError **error,		gpointer user_data,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		GDestroyNotify destroy,
	#endif /* not TP_DISABLE_DEPRECATED */		GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_PROXY (proxy), NULL);
			return tp_cli_dbus_properties_call_get (proxy, timeout_ms,
			in_Interface_Name,
			in_Property_Name,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_dbus_properties_call_get(...) _tp_cli_dbus_properties_call_g
			et (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_dbus_properties_callback_for_set) (TpProxy *proxy,		typedef void (*tp_cli_dbus_properties_callback_for_set) (TpProxy *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_dbus_properties_call_set (gpointer proxy,		TpProxyPendingCall *tp_cli_dbus_properties_call_set (gpointer proxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar *in_Interface_Name,		const gchar *in_Interface_Name,
	const gchar *in_Property_Name,		const gchar *in_Property_Name,
	const GValue *in_Value,		const GValue *in_Value,
	tp_cli_dbus_properties_callback_for_set callback,		tp_cli_dbus_properties_callback_for_set callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_dbus_properties_run_set (gpointer proxy,		static inline TpProxyPendingCall *
			_tp_cli_dbus_properties_call_set (gpointer proxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar *in_Interface_Name,		const gchar *in_Interface_Name,
	const gchar *in_Property_Name,		const gchar *in_Property_Name,
	const GValue *in_Value,		const GValue *in_Value,
	GError **error,		tp_cli_dbus_properties_callback_for_set callback,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		gpointer user_data,
	#endif /* not TP_DISABLE_DEPRECATED */		GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_PROXY (proxy), NULL);
			return tp_cli_dbus_properties_call_set (proxy, timeout_ms,
			in_Interface_Name,
			in_Property_Name,
			in_Value,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_dbus_properties_call_set(...) _tp_cli_dbus_properties_call_s
			et (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_dbus_properties_callback_for_get_all) (TpProxy *proxy ,		typedef void (*tp_cli_dbus_properties_callback_for_get_all) (TpProxy *proxy ,
	GHashTable *out_Properties,		GHashTable *out_Properties,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_dbus_properties_call_get_all (gpointer proxy,		TpProxyPendingCall *tp_cli_dbus_properties_call_get_all (gpointer proxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar *in_Interface_Name,		const gchar *in_Interface_Name,
	tp_cli_dbus_properties_callback_for_get_all callback,		tp_cli_dbus_properties_callback_for_get_all callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef __GTK_DOC_IGNORE__
	gboolean tp_cli_dbus_properties_run_get_all (gpointer proxy,		static inline TpProxyPendingCall *
			_tp_cli_dbus_properties_call_get_all (gpointer proxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar *in_Interface_Name,		const gchar *in_Interface_Name,
	GHashTable **out_Properties,		tp_cli_dbus_properties_callback_for_get_all callback,
	GError **error,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;
	#endif /* not TP_DISABLE_DEPRECATED */
	typedef void (*tp_cli_properties_interface_signal_callback_properties_chang
	ed) (TpProxy *proxy,
	const GPtrArray *arg_Properties,
	gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_properties_interface_connect_to_properties_
	changed (gpointer proxy,
	tp_cli_properties_interface_signal_callback_properties_changed callback
	,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object,
	GError **error);
	typedef void (*tp_cli_properties_interface_signal_callback_property_flags_c
	hanged) (TpProxy *proxy,
	const GPtrArray *arg_Properties,
	gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_properties_interface_connect_to_property_fl
	ags_changed (gpointer proxy,
	tp_cli_properties_interface_signal_callback_property_flags_changed call
	back,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object,
	GError **error);
	typedef void (*tp_cli_properties_interface_callback_for_get_properties) (Tp
	Proxy *proxy,
	const GPtrArray *out_Values,
	const GError *error, gpointer user_data,
	GObject *weak_object);
	TpProxyPendingCall *tp_cli_properties_interface_call_get_properties (gpoint
	er proxy,
	gint timeout_ms,
	const GArray *in_Properties,
	tp_cli_properties_interface_callback_for_get_properties callback,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED
	gboolean tp_cli_properties_interface_run_get_properties (gpointer proxy,
	gint timeout_ms,
	const GArray *in_Properties,
	GPtrArray **out_Values,
	GError **error,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;
	#endif /* not TP_DISABLE_DEPRECATED */
	typedef void (*tp_cli_properties_interface_callback_for_list_properties) (T
	pProxy *proxy,
	const GPtrArray *out_Available_Properties,
	const GError *error, gpointer user_data,
	GObject *weak_object);
	TpProxyPendingCall *tp_cli_properties_interface_call_list_properties (gpoin
	ter proxy,
	gint timeout_ms,
	tp_cli_properties_interface_callback_for_list_properties callback,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object);
	#ifndef TP_DISABLE_DEPRECATED
	gboolean tp_cli_properties_interface_run_list_properties (gpointer proxy,
	gint timeout_ms,
	GPtrArray **out_Available_Properties,
	GError **error,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;
	#endif /* not TP_DISABLE_DEPRECATED */
	typedef void (*tp_cli_properties_interface_callback_for_set_properties) (Tp
	Proxy *proxy,
	const GError *error, gpointer user_data,
	GObject *weak_object);
	TpProxyPendingCall *tp_cli_properties_interface_call_set_properties (gpoint
	er proxy,
	gint timeout_ms,
	const GPtrArray *in_Properties,
	tp_cli_properties_interface_callback_for_set_properties callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object)
			{
	#ifndef TP_DISABLE_DEPRECATED		g_return_val_if_fail (TP_IS_PROXY (proxy), NULL);
	gboolean tp_cli_properties_interface_run_set_properties (gpointer proxy,		return tp_cli_dbus_properties_call_get_all (proxy, timeout_ms,
	gint timeout_ms,		in_Interface_Name,
	const GPtrArray *in_Properties,		callback, user_data, destroy, weak_object);
	GError **error,		}
	GMainLoop **loop) _TP_GNUC_DEPRECATED;		#define tp_cli_dbus_properties_call_get_all(...) _tp_cli_dbus_properties_ca
	#endif /* not TP_DISABLE_DEPRECATED */		ll_get_all (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
			void tp_cli_generic_add_signals (TpProxy *self,
			guint quark,
			DBusGProxy *proxy,
			gpointer unused);
	G_END_DECLS		G_END_DECLS
	#endif /* defined (TP_GEN_TP_CLI_GENERIC_H_INCLUDED) */		#endif /* defined (TP_GEN_TP_CLI_GENERIC_H_INCLUDED) */
End of changes. 14 change blocks.
	126 lines changed or deleted		116 lines changed or added

	tp-cli-protocol.h		tp-cli-protocol.h
	skipping to change at line 19		skipping to change at line 19
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_protocol_call_identify_account (gpointer proxy,		TpProxyPendingCall *tp_cli_protocol_call_identify_account (gpointer proxy,
	gint timeout_ms,		gint timeout_ms,
	GHashTable *in_Parameters,		GHashTable *in_Parameters,
	tp_cli_protocol_callback_for_identify_account callback,		tp_cli_protocol_callback_for_identify_account callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxyPendingCall *
			_tp_cli_protocol_call_identify_account (gpointer proxy,
			gint timeout_ms,
			GHashTable *in_Parameters,
			tp_cli_protocol_callback_for_identify_account callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_PROXY (proxy), NULL);
			return tp_cli_protocol_call_identify_account (proxy, timeout_ms,
			in_Parameters,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_protocol_call_identify_account(...) _tp_cli_protocol_call_id
			entify_account (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_protocol_callback_for_normalize_contact) (TpProxy *pr oxy,		typedef void (*tp_cli_protocol_callback_for_normalize_contact) (TpProxy *pr oxy,
	const gchar *out_Normalized_Contact_ID,		const gchar *out_Normalized_Contact_ID,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_protocol_call_normalize_contact (gpointer proxy,		TpProxyPendingCall *tp_cli_protocol_call_normalize_contact (gpointer proxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar *in_Contact_ID,		const gchar *in_Contact_ID,
	tp_cli_protocol_callback_for_normalize_contact callback,		tp_cli_protocol_callback_for_normalize_contact callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxyPendingCall *
			_tp_cli_protocol_call_normalize_contact (gpointer proxy,
			gint timeout_ms,
			const gchar *in_Contact_ID,
			tp_cli_protocol_callback_for_normalize_contact callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_PROXY (proxy), NULL);
			return tp_cli_protocol_call_normalize_contact (proxy, timeout_ms,
			in_Contact_ID,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_protocol_call_normalize_contact(...) _tp_cli_protocol_call_n
			ormalize_contact (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_protocol_interface_addressing_callback_for_normalize_ vcard_address) (TpProxy *proxy,		typedef void (*tp_cli_protocol_interface_addressing_callback_for_normalize_ vcard_address) (TpProxy *proxy,
	const gchar *out_Normalized_VCard_Address,		const gchar *out_Normalized_VCard_Address,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_protocol_interface_addressing_call_normalize_vca rd_address (gpointer proxy,		TpProxyPendingCall *tp_cli_protocol_interface_addressing_call_normalize_vca rd_address (gpointer proxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar *in_VCard_Field,		const gchar *in_VCard_Field,
	const gchar *in_VCard_Address,		const gchar *in_VCard_Address,
	tp_cli_protocol_interface_addressing_callback_for_normalize_vcard_addre ss callback,		tp_cli_protocol_interface_addressing_callback_for_normalize_vcard_addre ss callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxyPendingCall *
			_tp_cli_protocol_interface_addressing_call_normalize_vcard_address (gpointe
			r proxy,
			gint timeout_ms,
			const gchar *in_VCard_Field,
			const gchar *in_VCard_Address,
			tp_cli_protocol_interface_addressing_callback_for_normalize_vcard_addre
			ss callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_PROXY (proxy), NULL);
			return tp_cli_protocol_interface_addressing_call_normalize_vcard_address
			(proxy, timeout_ms,
			in_VCard_Field,
			in_VCard_Address,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_protocol_interface_addressing_call_normalize_vcard_address(.
			..) _tp_cli_protocol_interface_addressing_call_normalize_vcard_address (__V
			A_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_protocol_interface_addressing_callback_for_normalize_ contact_uri) (TpProxy *proxy,		typedef void (*tp_cli_protocol_interface_addressing_callback_for_normalize_ contact_uri) (TpProxy *proxy,
	const gchar *out_Normalized_URI,		const gchar *out_Normalized_URI,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_protocol_interface_addressing_call_normalize_con tact_uri (gpointer proxy,		TpProxyPendingCall *tp_cli_protocol_interface_addressing_call_normalize_con tact_uri (gpointer proxy,
	gint timeout_ms,		gint timeout_ms,
	const gchar *in_URI,		const gchar *in_URI,
	tp_cli_protocol_interface_addressing_callback_for_normalize_contact_uri callback,		tp_cli_protocol_interface_addressing_callback_for_normalize_contact_uri callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxyPendingCall *
			_tp_cli_protocol_interface_addressing_call_normalize_contact_uri (gpointer
			proxy,
			gint timeout_ms,
			const gchar *in_URI,
			tp_cli_protocol_interface_addressing_callback_for_normalize_contact_uri
			callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_PROXY (proxy), NULL);
			return tp_cli_protocol_interface_addressing_call_normalize_contact_uri (p
			roxy, timeout_ms,
			in_URI,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_protocol_interface_addressing_call_normalize_contact_uri(...
			) _tp_cli_protocol_interface_addressing_call_normalize_contact_uri (__VA_AR
			GS__)
			#endif /* __GTK_DOC_IGNORE__ */
			void tp_cli_protocol_add_signals (TpProxy *self,
			guint quark,
			DBusGProxy *proxy,
			gpointer unused);
	G_END_DECLS		G_END_DECLS
	#endif /* defined (TP_GEN_TP_CLI_PROTOCOL_H_INCLUDED) */		#endif /* defined (TP_GEN_TP_CLI_PROTOCOL_H_INCLUDED) */
End of changes. 4 change blocks.
	0 lines changed or deleted		91 lines changed or added

	tp-cli-tls-cert.h		tp-cli-tls-cert.h
	skipping to change at line 15		skipping to change at line 15
	typedef void (*tp_cli_authentication_tls_certificate_signal_callback_accept ed) (TpTLSCertificate *proxy,		typedef void (*tp_cli_authentication_tls_certificate_signal_callback_accept ed) (TpTLSCertificate *proxy,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_authentication_tls_certificate_connect_to_a ccepted (TpTLSCertificate *proxy,		TpProxySignalConnection *tp_cli_authentication_tls_certificate_connect_to_a ccepted (TpTLSCertificate *proxy,
	tp_cli_authentication_tls_certificate_signal_callback_accepted callback ,		tp_cli_authentication_tls_certificate_signal_callback_accepted callback ,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_authentication_tls_certificate_connect_to_accepted (TpTLSCertificat
			e *proxy,
			tp_cli_authentication_tls_certificate_signal_callback_accepted callback
			,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_TLS_CERTIFICATE (proxy), NULL);
			return tp_cli_authentication_tls_certificate_connect_to_accepted (proxy,
			callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_authentication_tls_certificate_connect_to_accepted(...) _tp_
			cli_authentication_tls_certificate_connect_to_accepted (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_authentication_tls_certificate_signal_callback_reject ed) (TpTLSCertificate *proxy,		typedef void (*tp_cli_authentication_tls_certificate_signal_callback_reject ed) (TpTLSCertificate *proxy,
	const GPtrArray *arg_Rejections,		const GPtrArray *arg_Rejections,
	gpointer user_data, GObject *weak_object);		gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_authentication_tls_certificate_connect_to_r ejected (TpTLSCertificate *proxy,		TpProxySignalConnection *tp_cli_authentication_tls_certificate_connect_to_r ejected (TpTLSCertificate *proxy,
	tp_cli_authentication_tls_certificate_signal_callback_rejected callback ,		tp_cli_authentication_tls_certificate_signal_callback_rejected callback ,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object,		GObject *weak_object,
	GError **error);		GError **error);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxySignalConnection *
			_tp_cli_authentication_tls_certificate_connect_to_rejected (TpTLSCertificat
			e *proxy,
			tp_cli_authentication_tls_certificate_signal_callback_rejected callback
			,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object,
			GError **error)
			{
			g_return_val_if_fail (TP_IS_TLS_CERTIFICATE (proxy), NULL);
			return tp_cli_authentication_tls_certificate_connect_to_rejected (proxy,
			callback, user_data,
			destroy, weak_object, error);
			}
			#define tp_cli_authentication_tls_certificate_connect_to_rejected(...) _tp_
			cli_authentication_tls_certificate_connect_to_rejected (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_authentication_tls_certificate_callback_for_accept) ( TpTLSCertificate *proxy,		typedef void (*tp_cli_authentication_tls_certificate_callback_for_accept) ( TpTLSCertificate *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_authentication_tls_certificate_call_accept (TpTL SCertificate *proxy,		TpProxyPendingCall *tp_cli_authentication_tls_certificate_call_accept (TpTL SCertificate *proxy,
	gint timeout_ms,		gint timeout_ms,
	tp_cli_authentication_tls_certificate_callback_for_accept callback,		tp_cli_authentication_tls_certificate_callback_for_accept callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxyPendingCall *
			_tp_cli_authentication_tls_certificate_call_accept (TpTLSCertificate *proxy
			,
			gint timeout_ms,
			tp_cli_authentication_tls_certificate_callback_for_accept callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_TLS_CERTIFICATE (proxy), NULL);
			return tp_cli_authentication_tls_certificate_call_accept (proxy, timeout_
			ms,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_authentication_tls_certificate_call_accept(...) _tp_cli_auth
			entication_tls_certificate_call_accept (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_authentication_tls_certificate_callback_for_reject) ( TpTLSCertificate *proxy,		typedef void (*tp_cli_authentication_tls_certificate_callback_for_reject) ( TpTLSCertificate *proxy,
	const GError *error, gpointer user_data,		const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_cli_authentication_tls_certificate_call_reject (TpTL SCertificate *proxy,		TpProxyPendingCall *tp_cli_authentication_tls_certificate_call_reject (TpTL SCertificate *proxy,
	gint timeout_ms,		gint timeout_ms,
	const GPtrArray *in_Rejections,		const GPtrArray *in_Rejections,
	tp_cli_authentication_tls_certificate_callback_for_reject callback,		tp_cli_authentication_tls_certificate_callback_for_reject callback,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy,		GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
			#ifndef __GTK_DOC_IGNORE__
			static inline TpProxyPendingCall *
			_tp_cli_authentication_tls_certificate_call_reject (TpTLSCertificate *proxy
			,
			gint timeout_ms,
			const GPtrArray *in_Rejections,
			tp_cli_authentication_tls_certificate_callback_for_reject callback,
			gpointer user_data,
			GDestroyNotify destroy,
			GObject *weak_object)
			{
			g_return_val_if_fail (TP_IS_TLS_CERTIFICATE (proxy), NULL);
			return tp_cli_authentication_tls_certificate_call_reject (proxy, timeout_
			ms,
			in_Rejections,
			callback, user_data, destroy, weak_object);
			}
			#define tp_cli_authentication_tls_certificate_call_reject(...) _tp_cli_auth
			entication_tls_certificate_call_reject (__VA_ARGS__)
			#endif /* __GTK_DOC_IGNORE__ */
			void tp_cli_tls_cert_add_signals (TpProxy *self,
			guint quark,
			DBusGProxy *proxy,
			gpointer unused);
	G_END_DECLS		G_END_DECLS
	#endif /* defined (TP_GEN_TP_CLI_TLS_CERT_H_INCLUDED) */		#endif /* defined (TP_GEN_TP_CLI_TLS_CERT_H_INCLUDED) */
End of changes. 4 change blocks.
	0 lines changed or deleted		83 lines changed or added

	tp-svc-account-manager.h		tp-svc-account-manager.h
	#include <glib-object.h>		#include <glib-object.h>
	#include <dbus/dbus-glib.h>		#include <dbus/dbus-glib.h>
	#include <telepathy-glib/dbus.h>
	#include <telepathy-glib/dbus-properties-mixin.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	typedef struct _TpSvcAccountManager TpSvcAccountManager;		typedef struct _TpSvcAccountManager TpSvcAccountManager;
	typedef struct _TpSvcAccountManagerClass TpSvcAccountManagerClass;		typedef struct _TpSvcAccountManagerClass TpSvcAccountManagerClass;
	GType tp_svc_account_manager_get_type (void);		GType tp_svc_account_manager_get_type (void);
	#define TP_TYPE_SVC_ACCOUNT_MANAGER \		#define TP_TYPE_SVC_ACCOUNT_MANAGER \
	(tp_svc_account_manager_get_type ())		(tp_svc_account_manager_get_type ())
	skipping to change at line 44		skipping to change at line 42
	static inline void		static inline void
	tp_svc_account_manager_return_from_create_account (DBusGMethodInvocation *c ontext,		tp_svc_account_manager_return_from_create_account (DBusGMethodInvocation *c ontext,
	const gchar *out_Account)		const gchar *out_Account)
	{		{
	dbus_g_method_return (context,		dbus_g_method_return (context,
	out_Account);		out_Account);
	}		}
	void tp_svc_account_manager_emit_account_removed (gpointer instance,		void tp_svc_account_manager_emit_account_removed (gpointer instance,
	const gchar *arg_Account);		const gchar *arg_Account);
	void tp_svc_account_manager_emit_account_validity_changed (gpointer instanc e,		void tp_svc_account_manager_emit_account_usability_changed (gpointer instan ce,
	const gchar *arg_Account,		const gchar *arg_Account,
	gboolean arg_Valid);		gboolean arg_Usable);
	G_END_DECLS		G_END_DECLS
End of changes. 3 change blocks.
	4 lines changed or deleted		2 lines changed or added

	tp-svc-account.h		tp-svc-account.h
	#include <glib-object.h>		#include <glib-object.h>
	#include <dbus/dbus-glib.h>		#include <dbus/dbus-glib.h>
	#include <telepathy-glib/dbus.h>
	#include <telepathy-glib/dbus-properties-mixin.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	typedef struct _TpSvcAccount TpSvcAccount;		typedef struct _TpSvcAccount TpSvcAccount;
	typedef struct _TpSvcAccountClass TpSvcAccountClass;		typedef struct _TpSvcAccountClass TpSvcAccountClass;
	GType tp_svc_account_get_type (void);		GType tp_svc_account_get_type (void);
	#define TP_TYPE_SVC_ACCOUNT \		#define TP_TYPE_SVC_ACCOUNT \
	(tp_svc_account_get_type ())		(tp_svc_account_get_type ())
End of changes. 1 change blocks.
	2 lines changed or deleted		0 lines changed or added

	tp-svc-call-content-media-description.h		tp-svc-call-content-media-description.h
	#include <glib-object.h>		#include <glib-object.h>
	#include <dbus/dbus-glib.h>		#include <dbus/dbus-glib.h>
	#include <telepathy-glib/dbus.h>
	#include <telepathy-glib/dbus-properties-mixin.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	typedef struct _TpSvcCallContentMediaDescription TpSvcCallContentMediaDescr iption;		typedef struct _TpSvcCallContentMediaDescription TpSvcCallContentMediaDescr iption;
	typedef struct _TpSvcCallContentMediaDescriptionClass TpSvcCallContentMedia DescriptionClass;		typedef struct _TpSvcCallContentMediaDescriptionClass TpSvcCallContentMedia DescriptionClass;
	GType tp_svc_call_content_media_description_get_type (void);		GType tp_svc_call_content_media_description_get_type (void);
	#define TP_TYPE_SVC_CALL_CONTENT_MEDIA_DESCRIPTION \		#define TP_TYPE_SVC_CALL_CONTENT_MEDIA_DESCRIPTION \
	(tp_svc_call_content_media_description_get_type ())		(tp_svc_call_content_media_description_get_type ())
End of changes. 1 change blocks.
	2 lines changed or deleted		0 lines changed or added

	tp-svc-call-content.h		tp-svc-call-content.h
	#include <glib-object.h>		#include <glib-object.h>
	#include <dbus/dbus-glib.h>		#include <dbus/dbus-glib.h>
	#include <telepathy-glib/dbus.h>
	#include <telepathy-glib/dbus-properties-mixin.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	typedef struct _TpSvcCallContent TpSvcCallContent;		typedef struct _TpSvcCallContent TpSvcCallContent;
	typedef struct _TpSvcCallContentClass TpSvcCallContentClass;		typedef struct _TpSvcCallContentClass TpSvcCallContentClass;
	GType tp_svc_call_content_get_type (void);		GType tp_svc_call_content_get_type (void);
	#define TP_TYPE_SVC_CALL_CONTENT \		#define TP_TYPE_SVC_CALL_CONTENT \
	(tp_svc_call_content_get_type ())		(tp_svc_call_content_get_type ())
End of changes. 1 change blocks.
	2 lines changed or deleted		0 lines changed or added

	tp-svc-call-stream-endpoint.h		tp-svc-call-stream-endpoint.h
	#include <glib-object.h>		#include <glib-object.h>
	#include <dbus/dbus-glib.h>		#include <dbus/dbus-glib.h>
	#include <telepathy-glib/dbus.h>
	#include <telepathy-glib/dbus-properties-mixin.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	typedef struct _TpSvcCallStreamEndpoint TpSvcCallStreamEndpoint;		typedef struct _TpSvcCallStreamEndpoint TpSvcCallStreamEndpoint;
	typedef struct _TpSvcCallStreamEndpointClass TpSvcCallStreamEndpointClass;		typedef struct _TpSvcCallStreamEndpointClass TpSvcCallStreamEndpointClass;
	GType tp_svc_call_stream_endpoint_get_type (void);		GType tp_svc_call_stream_endpoint_get_type (void);
	#define TP_TYPE_SVC_CALL_STREAM_ENDPOINT \		#define TP_TYPE_SVC_CALL_STREAM_ENDPOINT \
	(tp_svc_call_stream_endpoint_get_type ())		(tp_svc_call_stream_endpoint_get_type ())
End of changes. 1 change blocks.
	2 lines changed or deleted		0 lines changed or added

	tp-svc-call-stream.h		tp-svc-call-stream.h
	#include <glib-object.h>		#include <glib-object.h>
	#include <dbus/dbus-glib.h>		#include <dbus/dbus-glib.h>
	#include <telepathy-glib/dbus.h>
	#include <telepathy-glib/dbus-properties-mixin.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	typedef struct _TpSvcCallStream TpSvcCallStream;		typedef struct _TpSvcCallStream TpSvcCallStream;
	typedef struct _TpSvcCallStreamClass TpSvcCallStreamClass;		typedef struct _TpSvcCallStreamClass TpSvcCallStreamClass;
	GType tp_svc_call_stream_get_type (void);		GType tp_svc_call_stream_get_type (void);
	#define TP_TYPE_SVC_CALL_STREAM \		#define TP_TYPE_SVC_CALL_STREAM \
	(tp_svc_call_stream_get_type ())		(tp_svc_call_stream_get_type ())
End of changes. 1 change blocks.
	2 lines changed or deleted		0 lines changed or added

	tp-svc-channel-dispatch-operation.h		tp-svc-channel-dispatch-operation.h
	#include <glib-object.h>		#include <glib-object.h>
	#include <dbus/dbus-glib.h>		#include <dbus/dbus-glib.h>
	#include <telepathy-glib/dbus.h>
	#include <telepathy-glib/dbus-properties-mixin.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	typedef struct _TpSvcChannelDispatchOperation TpSvcChannelDispatchOperation ;		typedef struct _TpSvcChannelDispatchOperation TpSvcChannelDispatchOperation ;
	typedef struct _TpSvcChannelDispatchOperationClass TpSvcChannelDispatchOper ationClass;		typedef struct _TpSvcChannelDispatchOperationClass TpSvcChannelDispatchOper ationClass;
	GType tp_svc_channel_dispatch_operation_get_type (void);		GType tp_svc_channel_dispatch_operation_get_type (void);
	#define TP_TYPE_SVC_CHANNEL_DISPATCH_OPERATION \		#define TP_TYPE_SVC_CHANNEL_DISPATCH_OPERATION \
	(tp_svc_channel_dispatch_operation_get_type ())		(tp_svc_channel_dispatch_operation_get_type ())
End of changes. 1 change blocks.
	2 lines changed or deleted		0 lines changed or added

	tp-svc-channel-dispatcher.h		tp-svc-channel-dispatcher.h
	#include <glib-object.h>		#include <glib-object.h>
	#include <dbus/dbus-glib.h>		#include <dbus/dbus-glib.h>
	#include <telepathy-glib/dbus.h>
	#include <telepathy-glib/dbus-properties-mixin.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	typedef struct _TpSvcChannelDispatcher TpSvcChannelDispatcher;		typedef struct _TpSvcChannelDispatcher TpSvcChannelDispatcher;
	typedef struct _TpSvcChannelDispatcherClass TpSvcChannelDispatcherClass;		typedef struct _TpSvcChannelDispatcherClass TpSvcChannelDispatcherClass;
	GType tp_svc_channel_dispatcher_get_type (void);		GType tp_svc_channel_dispatcher_get_type (void);
	#define TP_TYPE_SVC_CHANNEL_DISPATCHER \		#define TP_TYPE_SVC_CHANNEL_DISPATCHER \
	(tp_svc_channel_dispatcher_get_type ())		(tp_svc_channel_dispatcher_get_type ())
	skipping to change at line 27		skipping to change at line 25
	#define TP_IS_SVC_CHANNEL_DISPATCHER(obj) \		#define TP_IS_SVC_CHANNEL_DISPATCHER(obj) \
	(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CHANNEL_DISPATCHER))		(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CHANNEL_DISPATCHER))
	#define TP_SVC_CHANNEL_DISPATCHER_GET_CLASS(obj) \		#define TP_SVC_CHANNEL_DISPATCHER_GET_CLASS(obj) \
	(G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CHANNEL_DISPATCHER, TpS vcChannelDispatcherClass))		(G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CHANNEL_DISPATCHER, TpS vcChannelDispatcherClass))
	typedef void (*tp_svc_channel_dispatcher_create_channel_impl) (TpSvcChannel Dispatcher *self,		typedef void (*tp_svc_channel_dispatcher_create_channel_impl) (TpSvcChannel Dispatcher *self,
	const gchar *in_Account,		const gchar *in_Account,
	GHashTable *in_Requested_Properties,		GHashTable *in_Requested_Properties,
	gint64 in_User_Action_Time,		gint64 in_User_Action_Time,
	const gchar *in_Preferred_Handler,		const gchar *in_Preferred_Handler,
			GHashTable *in_Hints,
	DBusGMethodInvocation *context);		DBusGMethodInvocation *context);
	void tp_svc_channel_dispatcher_implement_create_channel (TpSvcChannelDispat cherClass *klass, tp_svc_channel_dispatcher_create_channel_impl impl);		void tp_svc_channel_dispatcher_implement_create_channel (TpSvcChannelDispat cherClass *klass, tp_svc_channel_dispatcher_create_channel_impl impl);
	static inline		static inline
	/* this comment is to stop gtkdoc realising this is static */		/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_channel_dispatcher_return_from_create_channel (DBusGMethodInvoc ation *context,		void tp_svc_channel_dispatcher_return_from_create_channel (DBusGMethodInvoc ation *context,
	const gchar *out_Request);		const gchar *out_Request,
			GHashTable *out_Properties);
	static inline void		static inline void
	tp_svc_channel_dispatcher_return_from_create_channel (DBusGMethodInvocation *context,		tp_svc_channel_dispatcher_return_from_create_channel (DBusGMethodInvocation *context,
	const gchar *out_Request)		const gchar *out_Request,
			GHashTable *out_Properties)
	{		{
	dbus_g_method_return (context,		dbus_g_method_return (context,
	out_Request);		out_Request,
			out_Properties);
	}		}
	typedef void (*tp_svc_channel_dispatcher_ensure_channel_impl) (TpSvcChannel Dispatcher *self,		typedef void (*tp_svc_channel_dispatcher_ensure_channel_impl) (TpSvcChannel Dispatcher *self,
	const gchar *in_Account,		const gchar *in_Account,
	GHashTable *in_Requested_Properties,		GHashTable *in_Requested_Properties,
	gint64 in_User_Action_Time,		gint64 in_User_Action_Time,
	const gchar *in_Preferred_Handler,		const gchar *in_Preferred_Handler,
			GHashTable *in_Hints,
	DBusGMethodInvocation *context);		DBusGMethodInvocation *context);
	void tp_svc_channel_dispatcher_implement_ensure_channel (TpSvcChannelDispat cherClass *klass, tp_svc_channel_dispatcher_ensure_channel_impl impl);		void tp_svc_channel_dispatcher_implement_ensure_channel (TpSvcChannelDispat cherClass *klass, tp_svc_channel_dispatcher_ensure_channel_impl impl);
	static inline		static inline
	/* this comment is to stop gtkdoc realising this is static */		/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_channel_dispatcher_return_from_ensure_channel (DBusGMethodInvoc ation *context,		void tp_svc_channel_dispatcher_return_from_ensure_channel (DBusGMethodInvoc ation *context,
	const gchar *out_Request);		const gchar *out_Request,
			GHashTable *out_Properties);
	static inline void		static inline void
	tp_svc_channel_dispatcher_return_from_ensure_channel (DBusGMethodInvocation *context,		tp_svc_channel_dispatcher_return_from_ensure_channel (DBusGMethodInvocation *context,
	const gchar *out_Request)		const gchar *out_Request,
	{		GHashTable *out_Properties)
	dbus_g_method_return (context,
	out_Request);
	}
	typedef void (*tp_svc_channel_dispatcher_create_channel_with_hints_impl) (T
	pSvcChannelDispatcher *self,
	const gchar *in_Account,
	GHashTable *in_Requested_Properties,
	gint64 in_User_Action_Time,
	const gchar *in_Preferred_Handler,
	GHashTable *in_Hints,
	DBusGMethodInvocation *context);
	void tp_svc_channel_dispatcher_implement_create_channel_with_hints (TpSvcCh
	annelDispatcherClass *klass, tp_svc_channel_dispatcher_create_channel_with_
	hints_impl impl);
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_channel_dispatcher_return_from_create_channel_with_hints (DBusG
	MethodInvocation *context,
	const gchar *out_Request);
	static inline void
	tp_svc_channel_dispatcher_return_from_create_channel_with_hints (DBusGMetho
	dInvocation *context,
	const gchar *out_Request)
	{
	dbus_g_method_return (context,
	out_Request);
	}
	typedef void (*tp_svc_channel_dispatcher_ensure_channel_with_hints_impl) (T
	pSvcChannelDispatcher *self,
	const gchar *in_Account,
	GHashTable *in_Requested_Properties,
	gint64 in_User_Action_Time,
	const gchar *in_Preferred_Handler,
	GHashTable *in_Hints,
	DBusGMethodInvocation *context);
	void tp_svc_channel_dispatcher_implement_ensure_channel_with_hints (TpSvcCh
	annelDispatcherClass *klass, tp_svc_channel_dispatcher_ensure_channel_with_
	hints_impl impl);
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_channel_dispatcher_return_from_ensure_channel_with_hints (DBusG
	MethodInvocation *context,
	const gchar *out_Request);
	static inline void
	tp_svc_channel_dispatcher_return_from_ensure_channel_with_hints (DBusGMetho
	dInvocation *context,
	const gchar *out_Request)
	{		{
	dbus_g_method_return (context,		dbus_g_method_return (context,
	out_Request);		out_Request,
			out_Properties);
	}		}
	typedef void (*tp_svc_channel_dispatcher_delegate_channels_impl) (TpSvcChan nelDispatcher *self,		typedef void (*tp_svc_channel_dispatcher_delegate_channels_impl) (TpSvcChan nelDispatcher *self,
	const GPtrArray *in_Channels,		const GPtrArray *in_Channels,
	gint64 in_User_Action_Time,		gint64 in_User_Action_Time,
	const gchar *in_Preferred_Handler,		const gchar *in_Preferred_Handler,
	DBusGMethodInvocation *context);		DBusGMethodInvocation *context);
	void tp_svc_channel_dispatcher_implement_delegate_channels (TpSvcChannelDis patcherClass *klass, tp_svc_channel_dispatcher_delegate_channels_impl impl) ;		void tp_svc_channel_dispatcher_implement_delegate_channels (TpSvcChannelDis patcherClass *klass, tp_svc_channel_dispatcher_delegate_channels_impl impl) ;
	static inline		static inline
	/* this comment is to stop gtkdoc realising this is static */		/* this comment is to stop gtkdoc realising this is static */
	skipping to change at line 135		skipping to change at line 101
	void tp_svc_channel_dispatcher_implement_present_channel (TpSvcChannelDispa tcherClass *klass, tp_svc_channel_dispatcher_present_channel_impl impl);		void tp_svc_channel_dispatcher_implement_present_channel (TpSvcChannelDispa tcherClass *klass, tp_svc_channel_dispatcher_present_channel_impl impl);
	static inline		static inline
	/* this comment is to stop gtkdoc realising this is static */		/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_channel_dispatcher_return_from_present_channel (DBusGMethodInvo cation *context);		void tp_svc_channel_dispatcher_return_from_present_channel (DBusGMethodInvo cation *context);
	static inline void		static inline void
	tp_svc_channel_dispatcher_return_from_present_channel (DBusGMethodInvocatio n *context)		tp_svc_channel_dispatcher_return_from_present_channel (DBusGMethodInvocatio n *context)
	{		{
	dbus_g_method_return (context);		dbus_g_method_return (context);
	}		}
	typedef struct _TpSvcChannelDispatcherInterfaceMessages1 TpSvcChannelDispat
	cherInterfaceMessages1;
	typedef struct _TpSvcChannelDispatcherInterfaceMessages1Class TpSvcChannelD
	ispatcherInterfaceMessages1Class;
	GType tp_svc_channel_dispatcher_interface_messages1_get_type (void);
	#define TP_TYPE_SVC_CHANNEL_DISPATCHER_INTERFACE_MESSAGES1 \
	(tp_svc_channel_dispatcher_interface_messages1_get_type ())
	#define TP_SVC_CHANNEL_DISPATCHER_INTERFACE_MESSAGES1(obj) \
	(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CHANNEL_DISPATCHER_INTERFA
	CE_MESSAGES1, TpSvcChannelDispatcherInterfaceMessages1))
	#define TP_IS_SVC_CHANNEL_DISPATCHER_INTERFACE_MESSAGES1(obj) \
	(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CHANNEL_DISPATCHER_INTERFA
	CE_MESSAGES1))
	#define TP_SVC_CHANNEL_DISPATCHER_INTERFACE_MESSAGES1_GET_CLASS(obj) \
	(G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CHANNEL_DISPATCHER_INTE
	RFACE_MESSAGES1, TpSvcChannelDispatcherInterfaceMessages1Class))
	typedef void (*tp_svc_channel_dispatcher_interface_messages1_send_message_i
	mpl) (TpSvcChannelDispatcherInterfaceMessages1 *self,
	const gchar *in_Account,
	const gchar *in_Target_ID,
	const GPtrArray *in_Message,
	guint in_Flags,
	DBusGMethodInvocation *context);
	void tp_svc_channel_dispatcher_interface_messages1_implement_send_message (
	TpSvcChannelDispatcherInterfaceMessages1Class *klass, tp_svc_channel_dispat
	cher_interface_messages1_send_message_impl impl);
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_channel_dispatcher_interface_messages1_return_from_send_message
	(DBusGMethodInvocation *context,
	const gchar *out_Token);
	static inline void
	tp_svc_channel_dispatcher_interface_messages1_return_from_send_message (DBu
	sGMethodInvocation *context,
	const gchar *out_Token)
	{
	dbus_g_method_return (context,
	out_Token);
	}
	typedef struct _TpSvcChannelDispatcherInterfaceOperationList TpSvcChannelDi spatcherInterfaceOperationList;		typedef struct _TpSvcChannelDispatcherInterfaceOperationList TpSvcChannelDi spatcherInterfaceOperationList;
	typedef struct _TpSvcChannelDispatcherInterfaceOperationListClass TpSvcChan nelDispatcherInterfaceOperationListClass;		typedef struct _TpSvcChannelDispatcherInterfaceOperationListClass TpSvcChan nelDispatcherInterfaceOperationListClass;
	GType tp_svc_channel_dispatcher_interface_operation_list_get_type (void);		GType tp_svc_channel_dispatcher_interface_operation_list_get_type (void);
	#define TP_TYPE_SVC_CHANNEL_DISPATCHER_INTERFACE_OPERATION_LIST \		#define TP_TYPE_SVC_CHANNEL_DISPATCHER_INTERFACE_OPERATION_LIST \
	(tp_svc_channel_dispatcher_interface_operation_list_get_type ())		(tp_svc_channel_dispatcher_interface_operation_list_get_type ())
	#define TP_SVC_CHANNEL_DISPATCHER_INTERFACE_OPERATION_LIST(obj) \		#define TP_SVC_CHANNEL_DISPATCHER_INTERFACE_OPERATION_LIST(obj) \
	(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CHANNEL_DISPATCHER_INTERFA CE_OPERATION_LIST, TpSvcChannelDispatcherInterfaceOperationList))		(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CHANNEL_DISPATCHER_INTERFA CE_OPERATION_LIST, TpSvcChannelDispatcherInterfaceOperationList))
	#define TP_IS_SVC_CHANNEL_DISPATCHER_INTERFACE_OPERATION_LIST(obj) \		#define TP_IS_SVC_CHANNEL_DISPATCHER_INTERFACE_OPERATION_LIST(obj) \
End of changes. 10 change blocks.
	101 lines changed or deleted		14 lines changed or added

	tp-svc-channel-request.h		tp-svc-channel-request.h
	#include <glib-object.h>		#include <glib-object.h>
	#include <dbus/dbus-glib.h>		#include <dbus/dbus-glib.h>
	#include <telepathy-glib/dbus.h>
	#include <telepathy-glib/dbus-properties-mixin.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	typedef struct _TpSvcChannelRequest TpSvcChannelRequest;		typedef struct _TpSvcChannelRequest TpSvcChannelRequest;
	typedef struct _TpSvcChannelRequestClass TpSvcChannelRequestClass;		typedef struct _TpSvcChannelRequestClass TpSvcChannelRequestClass;
	GType tp_svc_channel_request_get_type (void);		GType tp_svc_channel_request_get_type (void);
	#define TP_TYPE_SVC_CHANNEL_REQUEST \		#define TP_TYPE_SVC_CHANNEL_REQUEST \
	(tp_svc_channel_request_get_type ())		(tp_svc_channel_request_get_type ())
	skipping to change at line 49		skipping to change at line 47
	void tp_svc_channel_request_return_from_cancel (DBusGMethodInvocation *cont ext);		void tp_svc_channel_request_return_from_cancel (DBusGMethodInvocation *cont ext);
	static inline void		static inline void
	tp_svc_channel_request_return_from_cancel (DBusGMethodInvocation *context)		tp_svc_channel_request_return_from_cancel (DBusGMethodInvocation *context)
	{		{
	dbus_g_method_return (context);		dbus_g_method_return (context);
	}		}
	void tp_svc_channel_request_emit_failed (gpointer instance,		void tp_svc_channel_request_emit_failed (gpointer instance,
	const gchar *arg_Error,		const gchar *arg_Error,
	const gchar *arg_Message);		const gchar *arg_Message);
	void tp_svc_channel_request_emit_succeeded (gpointer instance);		void tp_svc_channel_request_emit_succeeded (gpointer instance,
	void tp_svc_channel_request_emit_succeeded_with_channel (gpointer instance,
	const gchar *arg_Connection,		const gchar *arg_Connection,
	GHashTable *arg_Connection_Properties,		GHashTable *arg_Connection_Properties,
	const gchar *arg_Channel,		const gchar *arg_Channel,
	GHashTable *arg_Channel_Properties);		GHashTable *arg_Channel_Properties);
	G_END_DECLS		G_END_DECLS
End of changes. 2 change blocks.
	4 lines changed or deleted		1 lines changed or added

	tp-svc-channel.h		tp-svc-channel.h
	#include <glib-object.h>		#include <glib-object.h>
	#include <dbus/dbus-glib.h>		#include <dbus/dbus-glib.h>
	#include <telepathy-glib/dbus.h>
	#include <telepathy-glib/dbus-properties-mixin.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	typedef struct _TpSvcChannel TpSvcChannel;		typedef struct _TpSvcChannel TpSvcChannel;
	typedef struct _TpSvcChannelClass TpSvcChannelClass;		typedef struct _TpSvcChannelClass TpSvcChannelClass;
	GType tp_svc_channel_get_type (void);		GType tp_svc_channel_get_type (void);
	#define TP_TYPE_SVC_CHANNEL \		#define TP_TYPE_SVC_CHANNEL \
	(tp_svc_channel_get_type ())		(tp_svc_channel_get_type ())
	skipping to change at line 34		skipping to change at line 32
	void tp_svc_channel_implement_close (TpSvcChannelClass *klass, tp_svc_chann el_close_impl impl);		void tp_svc_channel_implement_close (TpSvcChannelClass *klass, tp_svc_chann el_close_impl impl);
	static inline		static inline
	/* this comment is to stop gtkdoc realising this is static */		/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_channel_return_from_close (DBusGMethodInvocation *context);		void tp_svc_channel_return_from_close (DBusGMethodInvocation *context);
	static inline void		static inline void
	tp_svc_channel_return_from_close (DBusGMethodInvocation *context)		tp_svc_channel_return_from_close (DBusGMethodInvocation *context)
	{		{
	dbus_g_method_return (context);		dbus_g_method_return (context);
	}		}
	typedef void (*tp_svc_channel_get_channel_type_impl) (TpSvcChannel *self,
	DBusGMethodInvocation *context);
	void tp_svc_channel_implement_get_channel_type (TpSvcChannelClass *klass, t
	p_svc_channel_get_channel_type_impl impl);
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_channel_return_from_get_channel_type (DBusGMethodInvocation *co
	ntext,
	const gchar *out_Channel_Type);
	static inline void
	tp_svc_channel_return_from_get_channel_type (DBusGMethodInvocation *context
	,
	const gchar *out_Channel_Type)
	{
	dbus_g_method_return (context,
	out_Channel_Type);
	}
	typedef void (*tp_svc_channel_get_handle_impl) (TpSvcChannel *self,
	DBusGMethodInvocation *context);
	void tp_svc_channel_implement_get_handle (TpSvcChannelClass *klass, tp_svc_
	channel_get_handle_impl impl);
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_channel_return_from_get_handle (DBusGMethodInvocation *context,
	guint out_Target_Handle_Type,
	guint out_Target_Handle);
	static inline void
	tp_svc_channel_return_from_get_handle (DBusGMethodInvocation *context,
	guint out_Target_Handle_Type,
	guint out_Target_Handle)
	{
	dbus_g_method_return (context,
	out_Target_Handle_Type,
	out_Target_Handle);
	}
	typedef void (*tp_svc_channel_get_interfaces_impl) (TpSvcChannel *self,
	DBusGMethodInvocation *context);
	void tp_svc_channel_implement_get_interfaces (TpSvcChannelClass *klass, tp_
	svc_channel_get_interfaces_impl impl);
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_channel_return_from_get_interfaces (DBusGMethodInvocation *cont
	ext,
	const gchar **out_Interfaces);
	static inline void
	tp_svc_channel_return_from_get_interfaces (DBusGMethodInvocation *context,
	const gchar **out_Interfaces)
	{
	dbus_g_method_return (context,
	out_Interfaces);
	}
	void tp_svc_channel_emit_closed (gpointer instance);		void tp_svc_channel_emit_closed (gpointer instance);
	typedef struct _TpSvcChannelInterfaceAnonymity TpSvcChannelInterfaceAnonymi ty;		typedef struct _TpSvcChannelInterfaceAnonymity TpSvcChannelInterfaceAnonymi ty;
	typedef struct _TpSvcChannelInterfaceAnonymityClass TpSvcChannelInterfaceAn onymityClass;		typedef struct _TpSvcChannelInterfaceAnonymityClass TpSvcChannelInterfaceAn onymityClass;
	GType tp_svc_channel_interface_anonymity_get_type (void);		GType tp_svc_channel_interface_anonymity_get_type (void);
	#define TP_TYPE_SVC_CHANNEL_INTERFACE_ANONYMITY \		#define TP_TYPE_SVC_CHANNEL_INTERFACE_ANONYMITY \
	(tp_svc_channel_interface_anonymity_get_type ())		(tp_svc_channel_interface_anonymity_get_type ())
	#define TP_SVC_CHANNEL_INTERFACE_ANONYMITY(obj) \		#define TP_SVC_CHANNEL_INTERFACE_ANONYMITY(obj) \
	(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CHANNEL_INTERFACE_ANONYMIT Y, TpSvcChannelInterfaceAnonymity))		(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CHANNEL_INTERFACE_ANONYMIT Y, TpSvcChannelInterfaceAnonymity))
	#define TP_IS_SVC_CHANNEL_INTERFACE_ANONYMITY(obj) \		#define TP_IS_SVC_CHANNEL_INTERFACE_ANONYMITY(obj) \
	(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CHANNEL_INTERFACE_ANONYMIT Y))		(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CHANNEL_INTERFACE_ANONYMIT Y))
	#define TP_SVC_CHANNEL_INTERFACE_ANONYMITY_GET_CLASS(obj) \		#define TP_SVC_CHANNEL_INTERFACE_ANONYMITY_GET_CLASS(obj) \
	(G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CHANNEL_INTERFACE_ANONY MITY, TpSvcChannelInterfaceAnonymityClass))		(G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CHANNEL_INTERFACE_ANONY MITY, TpSvcChannelInterfaceAnonymityClass))
	typedef struct _TpSvcChannelInterfaceCallState TpSvcChannelInterfaceCallSta
	te;
	typedef struct _TpSvcChannelInterfaceCallStateClass TpSvcChannelInterfaceCa
	llStateClass;
	GType tp_svc_channel_interface_call_state_get_type (void);
	#define TP_TYPE_SVC_CHANNEL_INTERFACE_CALL_STATE \
	(tp_svc_channel_interface_call_state_get_type ())
	#define TP_SVC_CHANNEL_INTERFACE_CALL_STATE(obj) \
	(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CHANNEL_INTERFACE_CALL_STA
	TE, TpSvcChannelInterfaceCallState))
	#define TP_IS_SVC_CHANNEL_INTERFACE_CALL_STATE(obj) \
	(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CHANNEL_INTERFACE_CALL_STA
	TE))
	#define TP_SVC_CHANNEL_INTERFACE_CALL_STATE_GET_CLASS(obj) \
	(G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CHANNEL_INTERFACE_CALL_
	STATE, TpSvcChannelInterfaceCallStateClass))
	typedef void (*tp_svc_channel_interface_call_state_get_call_states_impl) (T
	pSvcChannelInterfaceCallState *self,
	DBusGMethodInvocation *context);
	void tp_svc_channel_interface_call_state_implement_get_call_states (TpSvcCh
	annelInterfaceCallStateClass *klass, tp_svc_channel_interface_call_state_ge
	t_call_states_impl impl);
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_channel_interface_call_state_return_from_get_call_states (DBusG
	MethodInvocation *context,
	GHashTable *out_States);
	static inline void
	tp_svc_channel_interface_call_state_return_from_get_call_states (DBusGMetho
	dInvocation *context,
	GHashTable *out_States)
	{
	dbus_g_method_return (context,
	out_States);
	}
	void tp_svc_channel_interface_call_state_emit_call_state_changed (gpointer
	instance,
	guint arg_Contact,
	guint arg_State);
	typedef struct _TpSvcChannelInterfaceCaptchaAuthentication TpSvcChannelInte rfaceCaptchaAuthentication;		typedef struct _TpSvcChannelInterfaceCaptchaAuthentication TpSvcChannelInte rfaceCaptchaAuthentication;
	typedef struct _TpSvcChannelInterfaceCaptchaAuthenticationClass TpSvcChanne lInterfaceCaptchaAuthenticationClass;		typedef struct _TpSvcChannelInterfaceCaptchaAuthenticationClass TpSvcChanne lInterfaceCaptchaAuthenticationClass;
	GType tp_svc_channel_interface_captcha_authentication_get_type (void);		GType tp_svc_channel_interface_captcha_authentication_get_type (void);
	#define TP_TYPE_SVC_CHANNEL_INTERFACE_CAPTCHA_AUTHENTICATION \		#define TP_TYPE_SVC_CHANNEL_INTERFACE_CAPTCHA_AUTHENTICATION \
	(tp_svc_channel_interface_captcha_authentication_get_type ())		(tp_svc_channel_interface_captcha_authentication_get_type ())
	#define TP_SVC_CHANNEL_INTERFACE_CAPTCHA_AUTHENTICATION(obj) \		#define TP_SVC_CHANNEL_INTERFACE_CAPTCHA_AUTHENTICATION(obj) \
	(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CHANNEL_INTERFACE_CAPTCHA_ AUTHENTICATION, TpSvcChannelInterfaceCaptchaAuthentication))		(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CHANNEL_INTERFACE_CAPTCHA_ AUTHENTICATION, TpSvcChannelInterfaceCaptchaAuthentication))
	#define TP_IS_SVC_CHANNEL_INTERFACE_CAPTCHA_AUTHENTICATION(obj) \		#define TP_IS_SVC_CHANNEL_INTERFACE_CAPTCHA_AUTHENTICATION(obj) \
	skipping to change at line 392		skipping to change at line 309
	void tp_svc_channel_interface_group_implement_add_members (TpSvcChannelInte rfaceGroupClass *klass, tp_svc_channel_interface_group_add_members_impl imp l);		void tp_svc_channel_interface_group_implement_add_members (TpSvcChannelInte rfaceGroupClass *klass, tp_svc_channel_interface_group_add_members_impl imp l);
	static inline		static inline
	/* this comment is to stop gtkdoc realising this is static */		/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_channel_interface_group_return_from_add_members (DBusGMethodInv ocation *context);		void tp_svc_channel_interface_group_return_from_add_members (DBusGMethodInv ocation *context);
	static inline void		static inline void
	tp_svc_channel_interface_group_return_from_add_members (DBusGMethodInvocati on *context)		tp_svc_channel_interface_group_return_from_add_members (DBusGMethodInvocati on *context)
	{		{
	dbus_g_method_return (context);		dbus_g_method_return (context);
	}		}
	typedef void (*tp_svc_channel_interface_group_get_all_members_impl) (TpSvcC
	hannelInterfaceGroup *self,
	DBusGMethodInvocation *context);
	void tp_svc_channel_interface_group_implement_get_all_members (TpSvcChannel
	InterfaceGroupClass *klass, tp_svc_channel_interface_group_get_all_members_
	impl impl);
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_channel_interface_group_return_from_get_all_members (DBusGMetho
	dInvocation *context,
	const GArray *out_Members,
	const GArray *out_Local_Pending,
	const GArray *out_Remote_Pending);
	static inline void
	tp_svc_channel_interface_group_return_from_get_all_members (DBusGMethodInvo
	cation *context,
	const GArray *out_Members,
	const GArray *out_Local_Pending,
	const GArray *out_Remote_Pending)
	{
	dbus_g_method_return (context,
	out_Members,
	out_Local_Pending,
	out_Remote_Pending);
	}
	typedef void (*tp_svc_channel_interface_group_get_group_flags_impl) (TpSvcC
	hannelInterfaceGroup *self,
	DBusGMethodInvocation *context);
	void tp_svc_channel_interface_group_implement_get_group_flags (TpSvcChannel
	InterfaceGroupClass *klass, tp_svc_channel_interface_group_get_group_flags_
	impl impl);
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_channel_interface_group_return_from_get_group_flags (DBusGMetho
	dInvocation *context,
	guint out_Group_Flags);
	static inline void
	tp_svc_channel_interface_group_return_from_get_group_flags (DBusGMethodInvo
	cation *context,
	guint out_Group_Flags)
	{
	dbus_g_method_return (context,
	out_Group_Flags);
	}
	typedef void (*tp_svc_channel_interface_group_get_handle_owners_impl) (TpSv
	cChannelInterfaceGroup *self,
	const GArray *in_Handles,
	DBusGMethodInvocation *context);
	void tp_svc_channel_interface_group_implement_get_handle_owners (TpSvcChann
	elInterfaceGroupClass *klass, tp_svc_channel_interface_group_get_handle_own
	ers_impl impl);
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_channel_interface_group_return_from_get_handle_owners (DBusGMet
	hodInvocation *context,
	const GArray *out_Owners);
	static inline void
	tp_svc_channel_interface_group_return_from_get_handle_owners (DBusGMethodIn
	vocation *context,
	const GArray *out_Owners)
	{
	dbus_g_method_return (context,
	out_Owners);
	}
	typedef void (*tp_svc_channel_interface_group_get_local_pending_members_imp
	l) (TpSvcChannelInterfaceGroup *self,
	DBusGMethodInvocation *context);
	void tp_svc_channel_interface_group_implement_get_local_pending_members (Tp
	SvcChannelInterfaceGroupClass *klass, tp_svc_channel_interface_group_get_lo
	cal_pending_members_impl impl);
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_channel_interface_group_return_from_get_local_pending_members (
	DBusGMethodInvocation *context,
	const GArray *out_Handles);
	static inline void
	tp_svc_channel_interface_group_return_from_get_local_pending_members (DBusG
	MethodInvocation *context,
	const GArray *out_Handles)
	{
	dbus_g_method_return (context,
	out_Handles);
	}
	typedef void (*tp_svc_channel_interface_group_get_local_pending_members_wit
	h_info_impl) (TpSvcChannelInterfaceGroup *self,
	DBusGMethodInvocation *context);
	void tp_svc_channel_interface_group_implement_get_local_pending_members_wit
	h_info (TpSvcChannelInterfaceGroupClass *klass, tp_svc_channel_interface_gr
	oup_get_local_pending_members_with_info_impl impl);
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_channel_interface_group_return_from_get_local_pending_members_w
	ith_info (DBusGMethodInvocation *context,
	const GPtrArray *out_Info);
	static inline void
	tp_svc_channel_interface_group_return_from_get_local_pending_members_with_i
	nfo (DBusGMethodInvocation *context,
	const GPtrArray *out_Info)
	{
	dbus_g_method_return (context,
	out_Info);
	}
	typedef void (*tp_svc_channel_interface_group_get_members_impl) (TpSvcChann
	elInterfaceGroup *self,
	DBusGMethodInvocation *context);
	void tp_svc_channel_interface_group_implement_get_members (TpSvcChannelInte
	rfaceGroupClass *klass, tp_svc_channel_interface_group_get_members_impl imp
	l);
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_channel_interface_group_return_from_get_members (DBusGMethodInv
	ocation *context,
	const GArray *out_Handles);
	static inline void
	tp_svc_channel_interface_group_return_from_get_members (DBusGMethodInvocati
	on *context,
	const GArray *out_Handles)
	{
	dbus_g_method_return (context,
	out_Handles);
	}
	typedef void (*tp_svc_channel_interface_group_get_remote_pending_members_im
	pl) (TpSvcChannelInterfaceGroup *self,
	DBusGMethodInvocation *context);
	void tp_svc_channel_interface_group_implement_get_remote_pending_members (T
	pSvcChannelInterfaceGroupClass *klass, tp_svc_channel_interface_group_get_r
	emote_pending_members_impl impl);
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_channel_interface_group_return_from_get_remote_pending_members
	(DBusGMethodInvocation *context,
	const GArray *out_Handles);
	static inline void
	tp_svc_channel_interface_group_return_from_get_remote_pending_members (DBus
	GMethodInvocation *context,
	const GArray *out_Handles)
	{
	dbus_g_method_return (context,
	out_Handles);
	}
	typedef void (*tp_svc_channel_interface_group_get_self_handle_impl) (TpSvcC
	hannelInterfaceGroup *self,
	DBusGMethodInvocation *context);
	void tp_svc_channel_interface_group_implement_get_self_handle (TpSvcChannel
	InterfaceGroupClass *klass, tp_svc_channel_interface_group_get_self_handle_
	impl impl);
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_channel_interface_group_return_from_get_self_handle (DBusGMetho
	dInvocation *context,
	guint out_Self_Handle);
	static inline void
	tp_svc_channel_interface_group_return_from_get_self_handle (DBusGMethodInvo
	cation *context,
	guint out_Self_Handle)
	{
	dbus_g_method_return (context,
	out_Self_Handle);
	}
	typedef void (*tp_svc_channel_interface_group_remove_members_impl) (TpSvcCh annelInterfaceGroup *self,		typedef void (*tp_svc_channel_interface_group_remove_members_impl) (TpSvcCh annelInterfaceGroup *self,
	const GArray *in_Contacts,		const GArray *in_Contacts,
	const gchar *in_Message,		const gchar *in_Message,
			guint in_Reason,
	DBusGMethodInvocation *context);		DBusGMethodInvocation *context);
	void tp_svc_channel_interface_group_implement_remove_members (TpSvcChannelI nterfaceGroupClass *klass, tp_svc_channel_interface_group_remove_members_im pl impl);		void tp_svc_channel_interface_group_implement_remove_members (TpSvcChannelI nterfaceGroupClass *klass, tp_svc_channel_interface_group_remove_members_im pl impl);
	static inline		static inline
	/* this comment is to stop gtkdoc realising this is static */		/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_channel_interface_group_return_from_remove_members (DBusGMethod Invocation *context);		void tp_svc_channel_interface_group_return_from_remove_members (DBusGMethod Invocation *context);
	static inline void		static inline void
	tp_svc_channel_interface_group_return_from_remove_members (DBusGMethodInvoc ation *context)		tp_svc_channel_interface_group_return_from_remove_members (DBusGMethodInvoc ation *context)
	{		{
	dbus_g_method_return (context);		dbus_g_method_return (context);
	}		}
	typedef void (*tp_svc_channel_interface_group_remove_members_with_reason_im
	pl) (TpSvcChannelInterfaceGroup *self,
	const GArray *in_Contacts,
	const gchar *in_Message,
	guint in_Reason,
	DBusGMethodInvocation *context);
	void tp_svc_channel_interface_group_implement_remove_members_with_reason (T
	pSvcChannelInterfaceGroupClass *klass, tp_svc_channel_interface_group_remov
	e_members_with_reason_impl impl);
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_channel_interface_group_return_from_remove_members_with_reason
	(DBusGMethodInvocation *context);
	static inline void
	tp_svc_channel_interface_group_return_from_remove_members_with_reason (DBus
	GMethodInvocation *context)
	{
	dbus_g_method_return (context);
	}
	void tp_svc_channel_interface_group_emit_handle_owners_changed (gpointer in stance,		void tp_svc_channel_interface_group_emit_handle_owners_changed (gpointer in stance,
	GHashTable *arg_Added,		GHashTable *arg_Added,
	const GArray *arg_Removed);
	void tp_svc_channel_interface_group_emit_handle_owners_changed_detailed (gp
	ointer instance,
	GHashTable *arg_Added,
	const GArray *arg_Removed,		const GArray *arg_Removed,
	GHashTable *arg_Identifiers);		GHashTable *arg_Identifiers);
	void tp_svc_channel_interface_group_emit_self_handle_changed (gpointer inst
	ance,
	guint arg_Self_Handle);
	void tp_svc_channel_interface_group_emit_self_contact_changed (gpointer ins tance,		void tp_svc_channel_interface_group_emit_self_contact_changed (gpointer ins tance,
	guint arg_Self_Handle,		guint arg_Self_Handle,
	const gchar *arg_Self_ID);		const gchar *arg_Self_ID);
	void tp_svc_channel_interface_group_emit_group_flags_changed (gpointer inst ance,		void tp_svc_channel_interface_group_emit_group_flags_changed (gpointer inst ance,
	guint arg_Added,		guint arg_Added,
	guint arg_Removed);		guint arg_Removed);
	void tp_svc_channel_interface_group_emit_members_changed (gpointer instance ,		void tp_svc_channel_interface_group_emit_members_changed (gpointer instance ,
	const gchar *arg_Message,
	const GArray *arg_Added,
	const GArray *arg_Removed,
	const GArray *arg_Local_Pending,
	const GArray *arg_Remote_Pending,
	guint arg_Actor,
	guint arg_Reason);
	void tp_svc_channel_interface_group_emit_members_changed_detailed (gpointer
	instance,
	const GArray *arg_Added,		const GArray *arg_Added,
	const GArray *arg_Removed,		const GArray *arg_Removed,
	const GArray *arg_Local_Pending,		const GArray *arg_Local_Pending,
	const GArray *arg_Remote_Pending,		const GArray *arg_Remote_Pending,
	GHashTable *arg_Details);		GHashTable *arg_Details);
	typedef struct _TpSvcChannelInterfaceHold TpSvcChannelInterfaceHold;		typedef struct _TpSvcChannelInterfaceHold TpSvcChannelInterfaceHold;
	typedef struct _TpSvcChannelInterfaceHoldClass TpSvcChannelInterfaceHoldCla ss;		typedef struct _TpSvcChannelInterfaceHoldClass TpSvcChannelInterfaceHoldCla ss;
	skipping to change at line 627		skipping to change at line 390
	static inline void		static inline void
	tp_svc_channel_interface_hold_return_from_request_hold (DBusGMethodInvocati on *context)		tp_svc_channel_interface_hold_return_from_request_hold (DBusGMethodInvocati on *context)
	{		{
	dbus_g_method_return (context);		dbus_g_method_return (context);
	}		}
	void tp_svc_channel_interface_hold_emit_hold_state_changed (gpointer instan ce,		void tp_svc_channel_interface_hold_emit_hold_state_changed (gpointer instan ce,
	guint arg_HoldState,		guint arg_HoldState,
	guint arg_Reason);		guint arg_Reason);
	typedef struct _TpSvcChannelInterfaceMediaSignalling TpSvcChannelInterfaceM
	ediaSignalling;
	typedef struct _TpSvcChannelInterfaceMediaSignallingClass TpSvcChannelInter
	faceMediaSignallingClass;
	GType tp_svc_channel_interface_media_signalling_get_type (void);
	#define TP_TYPE_SVC_CHANNEL_INTERFACE_MEDIA_SIGNALLING \
	(tp_svc_channel_interface_media_signalling_get_type ())
	#define TP_SVC_CHANNEL_INTERFACE_MEDIA_SIGNALLING(obj) \
	(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CHANNEL_INTERFACE_MEDIA_SI
	GNALLING, TpSvcChannelInterfaceMediaSignalling))
	#define TP_IS_SVC_CHANNEL_INTERFACE_MEDIA_SIGNALLING(obj) \
	(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CHANNEL_INTERFACE_MEDIA_SI
	GNALLING))
	#define TP_SVC_CHANNEL_INTERFACE_MEDIA_SIGNALLING_GET_CLASS(obj) \
	(G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CHANNEL_INTERFACE_MEDIA
	_SIGNALLING, TpSvcChannelInterfaceMediaSignallingClass))
	typedef void (*tp_svc_channel_interface_media_signalling_get_session_handle
	rs_impl) (TpSvcChannelInterfaceMediaSignalling *self,
	DBusGMethodInvocation *context);
	void tp_svc_channel_interface_media_signalling_implement_get_session_handle
	rs (TpSvcChannelInterfaceMediaSignallingClass *klass, tp_svc_channel_interf
	ace_media_signalling_get_session_handlers_impl impl);
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_channel_interface_media_signalling_return_from_get_session_hand
	lers (DBusGMethodInvocation *context,
	const GPtrArray *out_Session_Handlers);
	static inline void
	tp_svc_channel_interface_media_signalling_return_from_get_session_handlers
	(DBusGMethodInvocation *context,
	const GPtrArray *out_Session_Handlers)
	{
	dbus_g_method_return (context,
	out_Session_Handlers);
	}
	void tp_svc_channel_interface_media_signalling_emit_new_session_handler (gp
	ointer instance,
	const gchar *arg_Session_Handler,
	const gchar *arg_Session_Type);
	typedef struct _TpSvcChannelInterfaceMessages TpSvcChannelInterfaceMessages
	;
	typedef struct _TpSvcChannelInterfaceMessagesClass TpSvcChannelInterfaceMes
	sagesClass;
	GType tp_svc_channel_interface_messages_get_type (void);
	#define TP_TYPE_SVC_CHANNEL_INTERFACE_MESSAGES \
	(tp_svc_channel_interface_messages_get_type ())
	#define TP_SVC_CHANNEL_INTERFACE_MESSAGES(obj) \
	(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CHANNEL_INTERFACE_MESSAGES
	, TpSvcChannelInterfaceMessages))
	#define TP_IS_SVC_CHANNEL_INTERFACE_MESSAGES(obj) \
	(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CHANNEL_INTERFACE_MESSAGES
	))
	#define TP_SVC_CHANNEL_INTERFACE_MESSAGES_GET_CLASS(obj) \
	(G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CHANNEL_INTERFACE_MESSA
	GES, TpSvcChannelInterfaceMessagesClass))
	typedef void (*tp_svc_channel_interface_messages_send_message_impl) (TpSvcC
	hannelInterfaceMessages *self,
	const GPtrArray *in_Message,
	guint in_Flags,
	DBusGMethodInvocation *context);
	void tp_svc_channel_interface_messages_implement_send_message (TpSvcChannel
	InterfaceMessagesClass *klass, tp_svc_channel_interface_messages_send_messa
	ge_impl impl);
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_channel_interface_messages_return_from_send_message (DBusGMetho
	dInvocation *context,
	const gchar *out_Token);
	static inline void
	tp_svc_channel_interface_messages_return_from_send_message (DBusGMethodInvo
	cation *context,
	const gchar *out_Token)
	{
	dbus_g_method_return (context,
	out_Token);
	}
	typedef void (*tp_svc_channel_interface_messages_get_pending_message_conten
	t_impl) (TpSvcChannelInterfaceMessages *self,
	guint in_Message_ID,
	const GArray *in_Parts,
	DBusGMethodInvocation *context);
	void tp_svc_channel_interface_messages_implement_get_pending_message_conten
	t (TpSvcChannelInterfaceMessagesClass *klass, tp_svc_channel_interface_mess
	ages_get_pending_message_content_impl impl);
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_channel_interface_messages_return_from_get_pending_message_cont
	ent (DBusGMethodInvocation *context,
	GHashTable *out_Content);
	static inline void
	tp_svc_channel_interface_messages_return_from_get_pending_message_content (
	DBusGMethodInvocation *context,
	GHashTable *out_Content)
	{
	dbus_g_method_return (context,
	out_Content);
	}
	void tp_svc_channel_interface_messages_emit_message_sent (gpointer instance
	,
	const GPtrArray *arg_Content,
	guint arg_Flags,
	const gchar *arg_Message_Token);
	void tp_svc_channel_interface_messages_emit_pending_messages_removed (gpoin
	ter instance,
	const GArray *arg_Message_IDs);
	void tp_svc_channel_interface_messages_emit_message_received (gpointer inst
	ance,
	const GPtrArray *arg_Message);
	typedef struct _TpSvcChannelInterfacePassword TpSvcChannelInterfacePassword ;		typedef struct _TpSvcChannelInterfacePassword TpSvcChannelInterfacePassword ;
	typedef struct _TpSvcChannelInterfacePasswordClass TpSvcChannelInterfacePas swordClass;		typedef struct _TpSvcChannelInterfacePasswordClass TpSvcChannelInterfacePas swordClass;
	GType tp_svc_channel_interface_password_get_type (void);		GType tp_svc_channel_interface_password_get_type (void);
	#define TP_TYPE_SVC_CHANNEL_INTERFACE_PASSWORD \		#define TP_TYPE_SVC_CHANNEL_INTERFACE_PASSWORD \
	(tp_svc_channel_interface_password_get_type ())		(tp_svc_channel_interface_password_get_type ())
	#define TP_SVC_CHANNEL_INTERFACE_PASSWORD(obj) \		#define TP_SVC_CHANNEL_INTERFACE_PASSWORD(obj) \
	(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CHANNEL_INTERFACE_PASSWORD , TpSvcChannelInterfacePassword))		(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CHANNEL_INTERFACE_PASSWORD , TpSvcChannelInterfacePassword))
	#define TP_IS_SVC_CHANNEL_INTERFACE_PASSWORD(obj) \		#define TP_IS_SVC_CHANNEL_INTERFACE_PASSWORD(obj) \
	skipping to change at line 1107		skipping to change at line 780
	guint arg_Call_State,		guint arg_Call_State,
	guint arg_Call_Flags,		guint arg_Call_Flags,
	const GValueArray *arg_Call_State_Reason,		const GValueArray *arg_Call_State_Reason,
	GHashTable *arg_Call_State_Details);		GHashTable *arg_Call_State_Details);
	void tp_svc_channel_type_call_emit_call_members_changed (gpointer instance,		void tp_svc_channel_type_call_emit_call_members_changed (gpointer instance,
	GHashTable *arg_Flags_Changed,		GHashTable *arg_Flags_Changed,
	GHashTable *arg_Identifiers,		GHashTable *arg_Identifiers,
	const GArray *arg_Removed,		const GArray *arg_Removed,
	const GValueArray *arg_Reason);		const GValueArray *arg_Reason);
	typedef struct _TpSvcChannelTypeContactList TpSvcChannelTypeContactList;
	typedef struct _TpSvcChannelTypeContactListClass TpSvcChannelTypeContactLis
	tClass;
	GType tp_svc_channel_type_contact_list_get_type (void);
	#define TP_TYPE_SVC_CHANNEL_TYPE_CONTACT_LIST \
	(tp_svc_channel_type_contact_list_get_type ())
	#define TP_SVC_CHANNEL_TYPE_CONTACT_LIST(obj) \
	(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CHANNEL_TYPE_CONTACT_LIST,
	TpSvcChannelTypeContactList))
	#define TP_IS_SVC_CHANNEL_TYPE_CONTACT_LIST(obj) \
	(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CHANNEL_TYPE_CONTACT_LIST)
	)
	#define TP_SVC_CHANNEL_TYPE_CONTACT_LIST_GET_CLASS(obj) \
	(G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CHANNEL_TYPE_CONTACT_LI
	ST, TpSvcChannelTypeContactListClass))
	typedef struct _TpSvcChannelTypeContactSearch TpSvcChannelTypeContactSearch ;		typedef struct _TpSvcChannelTypeContactSearch TpSvcChannelTypeContactSearch ;
	typedef struct _TpSvcChannelTypeContactSearchClass TpSvcChannelTypeContactS earchClass;		typedef struct _TpSvcChannelTypeContactSearchClass TpSvcChannelTypeContactS earchClass;
	GType tp_svc_channel_type_contact_search_get_type (void);		GType tp_svc_channel_type_contact_search_get_type (void);
	#define TP_TYPE_SVC_CHANNEL_TYPE_CONTACT_SEARCH \		#define TP_TYPE_SVC_CHANNEL_TYPE_CONTACT_SEARCH \
	(tp_svc_channel_type_contact_search_get_type ())		(tp_svc_channel_type_contact_search_get_type ())
	#define TP_SVC_CHANNEL_TYPE_CONTACT_SEARCH(obj) \		#define TP_SVC_CHANNEL_TYPE_CONTACT_SEARCH(obj) \
	(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CHANNEL_TYPE_CONTACT_SEARC H, TpSvcChannelTypeContactSearch))		(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CHANNEL_TYPE_CONTACT_SEARC H, TpSvcChannelTypeContactSearch))
	#define TP_IS_SVC_CHANNEL_TYPE_CONTACT_SEARCH(obj) \		#define TP_IS_SVC_CHANNEL_TYPE_CONTACT_SEARCH(obj) \
	skipping to change at line 1427		skipping to change at line 1086
	static inline void		static inline void
	tp_svc_channel_type_stream_tube_return_from_accept (DBusGMethodInvocation * context,		tp_svc_channel_type_stream_tube_return_from_accept (DBusGMethodInvocation * context,
	const GValue *out_address)		const GValue *out_address)
	{		{
	dbus_g_method_return (context,		dbus_g_method_return (context,
	out_address);		out_address);
	}		}
	void tp_svc_channel_type_stream_tube_emit_new_remote_connection (gpointer i nstance,		void tp_svc_channel_type_stream_tube_emit_new_remote_connection (gpointer i nstance,
	guint arg_Handle,		guint arg_Handle,
			const gchar *arg_Identifier,
	const GValue *arg_Connection_Param,		const GValue *arg_Connection_Param,
	guint arg_Connection_ID);		guint arg_Connection_ID);
	void tp_svc_channel_type_stream_tube_emit_new_local_connection (gpointer in stance,		void tp_svc_channel_type_stream_tube_emit_new_local_connection (gpointer in stance,
	guint arg_Connection_ID);		guint arg_Connection_ID);
	void tp_svc_channel_type_stream_tube_emit_connection_closed (gpointer insta nce,		void tp_svc_channel_type_stream_tube_emit_connection_closed (gpointer insta nce,
	guint arg_Connection_ID,		guint arg_Connection_ID,
	const gchar *arg_Error,		const gchar *arg_Error,
	const gchar *arg_Message);		const gchar *arg_Message);
	typedef struct _TpSvcChannelTypeStreamedMedia TpSvcChannelTypeStreamedMedia
	;
	typedef struct _TpSvcChannelTypeStreamedMediaClass TpSvcChannelTypeStreamed
	MediaClass;
	GType tp_svc_channel_type_streamed_media_get_type (void);
	#define TP_TYPE_SVC_CHANNEL_TYPE_STREAMED_MEDIA \
	(tp_svc_channel_type_streamed_media_get_type ())
	#define TP_SVC_CHANNEL_TYPE_STREAMED_MEDIA(obj) \
	(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CHANNEL_TYPE_STREAMED_MEDI
	A, TpSvcChannelTypeStreamedMedia))
	#define TP_IS_SVC_CHANNEL_TYPE_STREAMED_MEDIA(obj) \
	(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CHANNEL_TYPE_STREAMED_MEDI
	A))
	#define TP_SVC_CHANNEL_TYPE_STREAMED_MEDIA_GET_CLASS(obj) \
	(G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CHANNEL_TYPE_STREAMED_M
	EDIA, TpSvcChannelTypeStreamedMediaClass))
	typedef void (*tp_svc_channel_type_streamed_media_list_streams_impl) (TpSvc
	ChannelTypeStreamedMedia *self,
	DBusGMethodInvocation *context);
	void tp_svc_channel_type_streamed_media_implement_list_streams (TpSvcChanne
	lTypeStreamedMediaClass *klass, tp_svc_channel_type_streamed_media_list_str
	eams_impl impl);
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_channel_type_streamed_media_return_from_list_streams (DBusGMeth
	odInvocation *context,
	const GPtrArray *out_Streams);
	static inline void
	tp_svc_channel_type_streamed_media_return_from_list_streams (DBusGMethodInv
	ocation *context,
	const GPtrArray *out_Streams)
	{
	dbus_g_method_return (context,
	out_Streams);
	}
	typedef void (*tp_svc_channel_type_streamed_media_remove_streams_impl) (TpS
	vcChannelTypeStreamedMedia *self,
	const GArray *in_Streams,
	DBusGMethodInvocation *context);
	void tp_svc_channel_type_streamed_media_implement_remove_streams (TpSvcChan
	nelTypeStreamedMediaClass *klass, tp_svc_channel_type_streamed_media_remove
	_streams_impl impl);
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_channel_type_streamed_media_return_from_remove_streams (DBusGMe
	thodInvocation *context);
	static inline void
	tp_svc_channel_type_streamed_media_return_from_remove_streams (DBusGMethodI
	nvocation *context)
	{
	dbus_g_method_return (context);
	}
	typedef void (*tp_svc_channel_type_streamed_media_request_stream_direction_
	impl) (TpSvcChannelTypeStreamedMedia *self,
	guint in_Stream_ID,
	guint in_Stream_Direction,
	DBusGMethodInvocation *context);
	void tp_svc_channel_type_streamed_media_implement_request_stream_direction
	(TpSvcChannelTypeStreamedMediaClass *klass, tp_svc_channel_type_streamed_me
	dia_request_stream_direction_impl impl);
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_channel_type_streamed_media_return_from_request_stream_directio
	n (DBusGMethodInvocation *context);
	static inline void
	tp_svc_channel_type_streamed_media_return_from_request_stream_direction (DB
	usGMethodInvocation *context)
	{
	dbus_g_method_return (context);
	}
	typedef void (*tp_svc_channel_type_streamed_media_request_streams_impl) (Tp
	SvcChannelTypeStreamedMedia *self,
	guint in_Contact_Handle,
	const GArray *in_Types,
	DBusGMethodInvocation *context);
	void tp_svc_channel_type_streamed_media_implement_request_streams (TpSvcCha
	nnelTypeStreamedMediaClass *klass, tp_svc_channel_type_streamed_media_reque
	st_streams_impl impl);
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_channel_type_streamed_media_return_from_request_streams (DBusGM
	ethodInvocation *context,
	const GPtrArray *out_Streams);
	static inline void
	tp_svc_channel_type_streamed_media_return_from_request_streams (DBusGMethod
	Invocation *context,
	const GPtrArray *out_Streams)
	{
	dbus_g_method_return (context,
	out_Streams);
	}
	void tp_svc_channel_type_streamed_media_emit_stream_added (gpointer instanc
	e,
	guint arg_Stream_ID,
	guint arg_Contact_Handle,
	guint arg_Stream_Type);
	void tp_svc_channel_type_streamed_media_emit_stream_direction_changed (gpoi
	nter instance,
	guint arg_Stream_ID,
	guint arg_Stream_Direction,
	guint arg_Pending_Flags);
	void tp_svc_channel_type_streamed_media_emit_stream_error (gpointer instanc
	e,
	guint arg_Stream_ID,
	guint arg_Error_Code,
	const gchar *arg_Message);
	void tp_svc_channel_type_streamed_media_emit_stream_removed (gpointer insta
	nce,
	guint arg_Stream_ID);
	void tp_svc_channel_type_streamed_media_emit_stream_state_changed (gpointer
	instance,
	guint arg_Stream_ID,
	guint arg_Stream_State);
	typedef struct _TpSvcChannelTypeText TpSvcChannelTypeText;		typedef struct _TpSvcChannelTypeText TpSvcChannelTypeText;
	typedef struct _TpSvcChannelTypeTextClass TpSvcChannelTypeTextClass;		typedef struct _TpSvcChannelTypeTextClass TpSvcChannelTypeTextClass;
	GType tp_svc_channel_type_text_get_type (void);		GType tp_svc_channel_type_text_get_type (void);
	#define TP_TYPE_SVC_CHANNEL_TYPE_TEXT \		#define TP_TYPE_SVC_CHANNEL_TYPE_TEXT \
	(tp_svc_channel_type_text_get_type ())		(tp_svc_channel_type_text_get_type ())
	#define TP_SVC_CHANNEL_TYPE_TEXT(obj) \		#define TP_SVC_CHANNEL_TYPE_TEXT(obj) \
	(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CHANNEL_TYPE_TEXT, TpSvcCh annelTypeText))		(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CHANNEL_TYPE_TEXT, TpSvcCh annelTypeText))
	#define TP_IS_SVC_CHANNEL_TYPE_TEXT(obj) \		#define TP_IS_SVC_CHANNEL_TYPE_TEXT(obj) \
	skipping to change at line 1554		skipping to change at line 1123
	void tp_svc_channel_type_text_implement_acknowledge_pending_messages (TpSvc ChannelTypeTextClass *klass, tp_svc_channel_type_text_acknowledge_pending_m essages_impl impl);		void tp_svc_channel_type_text_implement_acknowledge_pending_messages (TpSvc ChannelTypeTextClass *klass, tp_svc_channel_type_text_acknowledge_pending_m essages_impl impl);
	static inline		static inline
	/* this comment is to stop gtkdoc realising this is static */		/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_channel_type_text_return_from_acknowledge_pending_messages (DBu sGMethodInvocation *context);		void tp_svc_channel_type_text_return_from_acknowledge_pending_messages (DBu sGMethodInvocation *context);
	static inline void		static inline void
	tp_svc_channel_type_text_return_from_acknowledge_pending_messages (DBusGMet hodInvocation *context)		tp_svc_channel_type_text_return_from_acknowledge_pending_messages (DBusGMet hodInvocation *context)
	{		{
	dbus_g_method_return (context);		dbus_g_method_return (context);
	}		}
	typedef void (*tp_svc_channel_type_text_get_message_types_impl) (TpSvcChann		typedef void (*tp_svc_channel_type_text_send_message_impl) (TpSvcChannelTyp
	elTypeText *self,		eText *self,
	DBusGMethodInvocation *context);		const GPtrArray *in_Message,
	void tp_svc_channel_type_text_implement_get_message_types (TpSvcChannelType		guint in_Flags,
	TextClass *klass, tp_svc_channel_type_text_get_message_types_impl impl);
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_channel_type_text_return_from_get_message_types (DBusGMethodInv
	ocation *context,
	const GArray *out_Available_Types);
	static inline void
	tp_svc_channel_type_text_return_from_get_message_types (DBusGMethodInvocati
	on *context,
	const GArray *out_Available_Types)
	{
	dbus_g_method_return (context,
	out_Available_Types);
	}
	typedef void (*tp_svc_channel_type_text_list_pending_messages_impl) (TpSvcC
	hannelTypeText *self,
	gboolean in_Clear,
	DBusGMethodInvocation *context);		DBusGMethodInvocation *context);
	void tp_svc_channel_type_text_implement_list_pending_messages (TpSvcChannel TypeTextClass *klass, tp_svc_channel_type_text_list_pending_messages_impl i mpl);		void tp_svc_channel_type_text_implement_send_message (TpSvcChannelTypeTextC lass *klass, tp_svc_channel_type_text_send_message_impl impl);
	static inline		static inline
	/* this comment is to stop gtkdoc realising this is static */		/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_channel_type_text_return_from_list_pending_messages (DBusGMetho		void tp_svc_channel_type_text_return_from_send_message (DBusGMethodInvocati
	dInvocation *context,		on *context,
	const GPtrArray *out_Pending_Messages);		const gchar *out_Token);
	static inline void		static inline void
	tp_svc_channel_type_text_return_from_list_pending_messages (DBusGMethodInvo		tp_svc_channel_type_text_return_from_send_message (DBusGMethodInvocation *c
	cation *context,		ontext,
	const GPtrArray *out_Pending_Messages)		const gchar *out_Token)
	{		{
	dbus_g_method_return (context,		dbus_g_method_return (context,
	out_Pending_Messages);		out_Token);
	}
	typedef void (*tp_svc_channel_type_text_send_impl) (TpSvcChannelTypeText *s
	elf,
	guint in_Type,
	const gchar *in_Text,
	DBusGMethodInvocation *context);
	void tp_svc_channel_type_text_implement_send (TpSvcChannelTypeTextClass *kl
	ass, tp_svc_channel_type_text_send_impl impl);
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_channel_type_text_return_from_send (DBusGMethodInvocation *cont
	ext);
	static inline void
	tp_svc_channel_type_text_return_from_send (DBusGMethodInvocation *context)
	{
	dbus_g_method_return (context);
	}		}
	void tp_svc_channel_type_text_emit_lost_message (gpointer instance);		void tp_svc_channel_type_text_emit_message_sent (gpointer instance,
	void tp_svc_channel_type_text_emit_received (gpointer instance,		const GPtrArray *arg_Content,
	guint arg_ID,
	guint arg_Timestamp,
	guint arg_Sender,
	guint arg_Type,
	guint arg_Flags,		guint arg_Flags,
	const gchar *arg_Text);		const gchar *arg_Message_Token);
	void tp_svc_channel_type_text_emit_send_error (gpointer instance,		void tp_svc_channel_type_text_emit_pending_messages_removed (gpointer insta
	guint arg_Error,		nce,
	guint arg_Timestamp,		const GArray *arg_Message_IDs);
	guint arg_Type,		void tp_svc_channel_type_text_emit_message_received (gpointer instance,
	const gchar *arg_Text);		const GPtrArray *arg_Message);
	void tp_svc_channel_type_text_emit_sent (gpointer instance,
	guint arg_Timestamp,
	guint arg_Type,
	const gchar *arg_Text);
	typedef struct _TpSvcChannelTypeTubes TpSvcChannelTypeTubes;
	typedef struct _TpSvcChannelTypeTubesClass TpSvcChannelTypeTubesClass;
	GType tp_svc_channel_type_tubes_get_type (void);
	#define TP_TYPE_SVC_CHANNEL_TYPE_TUBES \
	(tp_svc_channel_type_tubes_get_type ())
	#define TP_SVC_CHANNEL_TYPE_TUBES(obj) \
	(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CHANNEL_TYPE_TUBES, TpSvcC
	hannelTypeTubes))
	#define TP_IS_SVC_CHANNEL_TYPE_TUBES(obj) \
	(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CHANNEL_TYPE_TUBES))
	#define TP_SVC_CHANNEL_TYPE_TUBES_GET_CLASS(obj) \
	(G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CHANNEL_TYPE_TUBES, TpS
	vcChannelTypeTubesClass))
	typedef void (*tp_svc_channel_type_tubes_get_available_stream_tube_types_im
	pl) (TpSvcChannelTypeTubes *self,
	DBusGMethodInvocation *context);
	void tp_svc_channel_type_tubes_implement_get_available_stream_tube_types (T
	pSvcChannelTypeTubesClass *klass, tp_svc_channel_type_tubes_get_available_s
	tream_tube_types_impl impl);
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_channel_type_tubes_return_from_get_available_stream_tube_types
	(DBusGMethodInvocation *context,
	GHashTable *out_Available_Stream_Tube_Types);
	static inline void
	tp_svc_channel_type_tubes_return_from_get_available_stream_tube_types (DBus
	GMethodInvocation *context,
	GHashTable *out_Available_Stream_Tube_Types)
	{
	dbus_g_method_return (context,
	out_Available_Stream_Tube_Types);
	}
	typedef void (*tp_svc_channel_type_tubes_get_available_tube_types_impl) (Tp
	SvcChannelTypeTubes *self,
	DBusGMethodInvocation *context);
	void tp_svc_channel_type_tubes_implement_get_available_tube_types (TpSvcCha
	nnelTypeTubesClass *klass, tp_svc_channel_type_tubes_get_available_tube_typ
	es_impl impl);
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_channel_type_tubes_return_from_get_available_tube_types (DBusGM
	ethodInvocation *context,
	const GArray *out_Available_Tube_Types);
	static inline void
	tp_svc_channel_type_tubes_return_from_get_available_tube_types (DBusGMethod
	Invocation *context,
	const GArray *out_Available_Tube_Types)
	{
	dbus_g_method_return (context,
	out_Available_Tube_Types);
	}
	typedef void (*tp_svc_channel_type_tubes_list_tubes_impl) (TpSvcChannelType
	Tubes *self,
	DBusGMethodInvocation *context);
	void tp_svc_channel_type_tubes_implement_list_tubes (TpSvcChannelTypeTubesC
	lass *klass, tp_svc_channel_type_tubes_list_tubes_impl impl);
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_channel_type_tubes_return_from_list_tubes (DBusGMethodInvocatio
	n *context,
	const GPtrArray *out_Tubes);
	static inline void
	tp_svc_channel_type_tubes_return_from_list_tubes (DBusGMethodInvocation *co
	ntext,
	const GPtrArray *out_Tubes)
	{
	dbus_g_method_return (context,
	out_Tubes);
	}
	typedef void (*tp_svc_channel_type_tubes_offer_d_bus_tube_impl) (TpSvcChann
	elTypeTubes *self,
	const gchar *in_Service,
	GHashTable *in_Parameters,
	DBusGMethodInvocation *context);
	void tp_svc_channel_type_tubes_implement_offer_d_bus_tube (TpSvcChannelType
	TubesClass *klass, tp_svc_channel_type_tubes_offer_d_bus_tube_impl impl);
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_channel_type_tubes_return_from_offer_d_bus_tube (DBusGMethodInv
	ocation *context,
	guint out_Tube_ID);
	static inline void
	tp_svc_channel_type_tubes_return_from_offer_d_bus_tube (DBusGMethodInvocati
	on *context,
	guint out_Tube_ID)
	{
	dbus_g_method_return (context,
	out_Tube_ID);
	}
	typedef void (*tp_svc_channel_type_tubes_offer_stream_tube_impl) (TpSvcChan
	nelTypeTubes *self,
	const gchar *in_Service,
	GHashTable *in_Parameters,
	guint in_Address_Type,
	const GValue *in_Address,
	guint in_Access_Control,
	const GValue *in_Access_Control_Param,
	DBusGMethodInvocation *context);
	void tp_svc_channel_type_tubes_implement_offer_stream_tube (TpSvcChannelTyp
	eTubesClass *klass, tp_svc_channel_type_tubes_offer_stream_tube_impl impl);
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_channel_type_tubes_return_from_offer_stream_tube (DBusGMethodIn
	vocation *context,
	guint out_Tube_ID);
	static inline void
	tp_svc_channel_type_tubes_return_from_offer_stream_tube (DBusGMethodInvocat
	ion *context,
	guint out_Tube_ID)
	{
	dbus_g_method_return (context,
	out_Tube_ID);
	}
	typedef void (*tp_svc_channel_type_tubes_accept_d_bus_tube_impl) (TpSvcChan
	nelTypeTubes *self,
	guint in_ID,
	DBusGMethodInvocation *context);
	void tp_svc_channel_type_tubes_implement_accept_d_bus_tube (TpSvcChannelTyp
	eTubesClass *klass, tp_svc_channel_type_tubes_accept_d_bus_tube_impl impl);
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_channel_type_tubes_return_from_accept_d_bus_tube (DBusGMethodIn
	vocation *context,
	const gchar *out_Address);
	static inline void
	tp_svc_channel_type_tubes_return_from_accept_d_bus_tube (DBusGMethodInvocat
	ion *context,
	const gchar *out_Address)
	{
	dbus_g_method_return (context,
	out_Address);
	}
	typedef void (*tp_svc_channel_type_tubes_accept_stream_tube_impl) (TpSvcCha
	nnelTypeTubes *self,
	guint in_ID,
	guint in_Address_Type,
	guint in_Access_Control,
	const GValue *in_Access_Control_Param,
	DBusGMethodInvocation *context);
	void tp_svc_channel_type_tubes_implement_accept_stream_tube (TpSvcChannelTy
	peTubesClass *klass, tp_svc_channel_type_tubes_accept_stream_tube_impl impl
	);
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_channel_type_tubes_return_from_accept_stream_tube (DBusGMethodI
	nvocation *context,
	const GValue *out_Address);
	static inline void
	tp_svc_channel_type_tubes_return_from_accept_stream_tube (DBusGMethodInvoca
	tion *context,
	const GValue *out_Address)
	{
	dbus_g_method_return (context,
	out_Address);
	}
	typedef void (*tp_svc_channel_type_tubes_close_tube_impl) (TpSvcChannelType
	Tubes *self,
	guint in_ID,
	DBusGMethodInvocation *context);
	void tp_svc_channel_type_tubes_implement_close_tube (TpSvcChannelTypeTubesC
	lass *klass, tp_svc_channel_type_tubes_close_tube_impl impl);
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_channel_type_tubes_return_from_close_tube (DBusGMethodInvocatio
	n *context);
	static inline void
	tp_svc_channel_type_tubes_return_from_close_tube (DBusGMethodInvocation *co
	ntext)
	{
	dbus_g_method_return (context);
	}
	typedef void (*tp_svc_channel_type_tubes_get_d_bus_tube_address_impl) (TpSv
	cChannelTypeTubes *self,
	guint in_ID,
	DBusGMethodInvocation *context);
	void tp_svc_channel_type_tubes_implement_get_d_bus_tube_address (TpSvcChann
	elTypeTubesClass *klass, tp_svc_channel_type_tubes_get_d_bus_tube_address_i
	mpl impl);
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_channel_type_tubes_return_from_get_d_bus_tube_address (DBusGMet
	hodInvocation *context,
	const gchar *out_Address);
	static inline void
	tp_svc_channel_type_tubes_return_from_get_d_bus_tube_address (DBusGMethodIn
	vocation *context,
	const gchar *out_Address)
	{
	dbus_g_method_return (context,
	out_Address);
	}
	typedef void (*tp_svc_channel_type_tubes_get_d_bus_names_impl) (TpSvcChanne
	lTypeTubes *self,
	guint in_ID,
	DBusGMethodInvocation *context);
	void tp_svc_channel_type_tubes_implement_get_d_bus_names (TpSvcChannelTypeT
	ubesClass *klass, tp_svc_channel_type_tubes_get_d_bus_names_impl impl);
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_channel_type_tubes_return_from_get_d_bus_names (DBusGMethodInvo
	cation *context,
	const GPtrArray *out_DBus_Names);
	static inline void
	tp_svc_channel_type_tubes_return_from_get_d_bus_names (DBusGMethodInvocatio
	n *context,
	const GPtrArray *out_DBus_Names)
	{
	dbus_g_method_return (context,
	out_DBus_Names);
	}
	typedef void (*tp_svc_channel_type_tubes_get_stream_tube_socket_address_imp
	l) (TpSvcChannelTypeTubes *self,
	guint in_ID,
	DBusGMethodInvocation *context);
	void tp_svc_channel_type_tubes_implement_get_stream_tube_socket_address (Tp
	SvcChannelTypeTubesClass *klass, tp_svc_channel_type_tubes_get_stream_tube_
	socket_address_impl impl);
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_channel_type_tubes_return_from_get_stream_tube_socket_address (
	DBusGMethodInvocation *context,
	guint out_Address_Type,
	const GValue *out_Address);
	static inline void
	tp_svc_channel_type_tubes_return_from_get_stream_tube_socket_address (DBusG
	MethodInvocation *context,
	guint out_Address_Type,
	const GValue *out_Address)
	{
	dbus_g_method_return (context,
	out_Address_Type,
	out_Address);
	}
	void tp_svc_channel_type_tubes_emit_new_tube (gpointer instance,
	guint arg_ID,
	guint arg_Initiator,
	guint arg_Type,
	const gchar *arg_Service,
	GHashTable *arg_Parameters,
	guint arg_State);
	void tp_svc_channel_type_tubes_emit_tube_state_changed (gpointer instance,
	guint arg_ID,
	guint arg_State);
	void tp_svc_channel_type_tubes_emit_tube_closed (gpointer instance,
	guint arg_ID);
	void tp_svc_channel_type_tubes_emit_d_bus_names_changed (gpointer instance,
	guint arg_ID,
	const GPtrArray *arg_Added,
	const GArray *arg_Removed);
	void tp_svc_channel_type_tubes_emit_stream_tube_new_connection (gpointer in
	stance,
	guint arg_ID,
	guint arg_Handle);
	G_END_DECLS		G_END_DECLS
End of changes. 20 change blocks.
	892 lines changed or deleted		22 lines changed or added

	tp-svc-client.h		tp-svc-client.h
	#include <glib-object.h>		#include <glib-object.h>
	#include <dbus/dbus-glib.h>		#include <dbus/dbus-glib.h>
	#include <telepathy-glib/dbus.h>
	#include <telepathy-glib/dbus-properties-mixin.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	typedef struct _TpSvcClient TpSvcClient;		typedef struct _TpSvcClient TpSvcClient;
	typedef struct _TpSvcClientClass TpSvcClientClass;		typedef struct _TpSvcClientClass TpSvcClientClass;
	GType tp_svc_client_get_type (void);		GType tp_svc_client_get_type (void);
	#define TP_TYPE_SVC_CLIENT \		#define TP_TYPE_SVC_CLIENT \
	(tp_svc_client_get_type ())		(tp_svc_client_get_type ())
End of changes. 1 change blocks.
	2 lines changed or deleted		0 lines changed or added

	tp-svc-connection-manager.h		tp-svc-connection-manager.h
	#include <glib-object.h>		#include <glib-object.h>
	#include <dbus/dbus-glib.h>		#include <dbus/dbus-glib.h>
	#include <telepathy-glib/dbus.h>
	#include <telepathy-glib/dbus-properties-mixin.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	typedef struct _TpSvcConnectionManager TpSvcConnectionManager;		typedef struct _TpSvcConnectionManager TpSvcConnectionManager;
	typedef struct _TpSvcConnectionManagerClass TpSvcConnectionManagerClass;		typedef struct _TpSvcConnectionManagerClass TpSvcConnectionManagerClass;
	GType tp_svc_connection_manager_get_type (void);		GType tp_svc_connection_manager_get_type (void);
	#define TP_TYPE_SVC_CONNECTION_MANAGER \		#define TP_TYPE_SVC_CONNECTION_MANAGER \
	(tp_svc_connection_manager_get_type ())		(tp_svc_connection_manager_get_type ())
	#define TP_SVC_CONNECTION_MANAGER(obj) \		#define TP_SVC_CONNECTION_MANAGER(obj) \
	(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CONNECTION_MANAGER, TpSvcC onnectionManager))		(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CONNECTION_MANAGER, TpSvcC onnectionManager))
	#define TP_IS_SVC_CONNECTION_MANAGER(obj) \		#define TP_IS_SVC_CONNECTION_MANAGER(obj) \
	(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CONNECTION_MANAGER))		(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CONNECTION_MANAGER))
	#define TP_SVC_CONNECTION_MANAGER_GET_CLASS(obj) \		#define TP_SVC_CONNECTION_MANAGER_GET_CLASS(obj) \
	(G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CONNECTION_MANAGER, TpS vcConnectionManagerClass))		(G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CONNECTION_MANAGER, TpS vcConnectionManagerClass))
	typedef void (*tp_svc_connection_manager_get_parameters_impl) (TpSvcConnect
	ionManager *self,
	const gchar *in_Protocol,
	DBusGMethodInvocation *context);
	void tp_svc_connection_manager_implement_get_parameters (TpSvcConnectionMan
	agerClass *klass, tp_svc_connection_manager_get_parameters_impl impl);
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_connection_manager_return_from_get_parameters (DBusGMethodInvoc
	ation *context,
	const GPtrArray *out_Parameters);
	static inline void
	tp_svc_connection_manager_return_from_get_parameters (DBusGMethodInvocation
	*context,
	const GPtrArray *out_Parameters)
	{
	dbus_g_method_return (context,
	out_Parameters);
	}
	typedef void (*tp_svc_connection_manager_list_protocols_impl) (TpSvcConnect
	ionManager *self,
	DBusGMethodInvocation *context);
	void tp_svc_connection_manager_implement_list_protocols (TpSvcConnectionMan
	agerClass *klass, tp_svc_connection_manager_list_protocols_impl impl);
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_connection_manager_return_from_list_protocols (DBusGMethodInvoc
	ation *context,
	const gchar **out_Protocols);
	static inline void
	tp_svc_connection_manager_return_from_list_protocols (DBusGMethodInvocation
	*context,
	const gchar **out_Protocols)
	{
	dbus_g_method_return (context,
	out_Protocols);
	}
	typedef void (*tp_svc_connection_manager_request_connection_impl) (TpSvcCon nectionManager *self,		typedef void (*tp_svc_connection_manager_request_connection_impl) (TpSvcCon nectionManager *self,
	const gchar *in_Protocol,		const gchar *in_Protocol,
	GHashTable *in_Parameters,		GHashTable *in_Parameters,
	DBusGMethodInvocation *context);		DBusGMethodInvocation *context);
	void tp_svc_connection_manager_implement_request_connection (TpSvcConnectio nManagerClass *klass, tp_svc_connection_manager_request_connection_impl imp l);		void tp_svc_connection_manager_implement_request_connection (TpSvcConnectio nManagerClass *klass, tp_svc_connection_manager_request_connection_impl imp l);
	static inline		static inline
	/* this comment is to stop gtkdoc realising this is static */		/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_connection_manager_return_from_request_connection (DBusGMethodI nvocation *context,		void tp_svc_connection_manager_return_from_request_connection (DBusGMethodI nvocation *context,
	const gchar *out_Bus_Name,		const gchar *out_Bus_Name,
	const gchar *out_Object_Path);		const gchar *out_Object_Path);
End of changes. 2 change blocks.
	41 lines changed or deleted		0 lines changed or added

	tp-svc-connection.h		tp-svc-connection.h
	#include <glib-object.h>		#include <glib-object.h>
	#include <dbus/dbus-glib.h>		#include <dbus/dbus-glib.h>
	#include <telepathy-glib/dbus.h>
	#include <telepathy-glib/dbus-properties-mixin.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	typedef struct _TpSvcConnection TpSvcConnection;		typedef struct _TpSvcConnection TpSvcConnection;
	typedef struct _TpSvcConnectionClass TpSvcConnectionClass;		typedef struct _TpSvcConnectionClass TpSvcConnectionClass;
	GType tp_svc_connection_get_type (void);		GType tp_svc_connection_get_type (void);
	#define TP_TYPE_SVC_CONNECTION \		#define TP_TYPE_SVC_CONNECTION \
	(tp_svc_connection_get_type ())		(tp_svc_connection_get_type ())
	skipping to change at line 46		skipping to change at line 44
	void tp_svc_connection_implement_disconnect (TpSvcConnectionClass *klass, t p_svc_connection_disconnect_impl impl);		void tp_svc_connection_implement_disconnect (TpSvcConnectionClass *klass, t p_svc_connection_disconnect_impl impl);
	static inline		static inline
	/* this comment is to stop gtkdoc realising this is static */		/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_connection_return_from_disconnect (DBusGMethodInvocation *conte xt);		void tp_svc_connection_return_from_disconnect (DBusGMethodInvocation *conte xt);
	static inline void		static inline void
	tp_svc_connection_return_from_disconnect (DBusGMethodInvocation *context)		tp_svc_connection_return_from_disconnect (DBusGMethodInvocation *context)
	{		{
	dbus_g_method_return (context);		dbus_g_method_return (context);
	}		}
	typedef void (*tp_svc_connection_get_interfaces_impl) (TpSvcConnection *sel
	f,
	DBusGMethodInvocation *context);
	void tp_svc_connection_implement_get_interfaces (TpSvcConnectionClass *klas
	s, tp_svc_connection_get_interfaces_impl impl);
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_connection_return_from_get_interfaces (DBusGMethodInvocation *c
	ontext,
	const gchar **out_Interfaces);
	static inline void
	tp_svc_connection_return_from_get_interfaces (DBusGMethodInvocation *contex
	t,
	const gchar **out_Interfaces)
	{
	dbus_g_method_return (context,
	out_Interfaces);
	}
	typedef void (*tp_svc_connection_get_protocol_impl) (TpSvcConnection *self,
	DBusGMethodInvocation *context);
	void tp_svc_connection_implement_get_protocol (TpSvcConnectionClass *klass,
	tp_svc_connection_get_protocol_impl impl);
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_connection_return_from_get_protocol (DBusGMethodInvocation *con
	text,
	const gchar *out_Protocol);
	static inline void
	tp_svc_connection_return_from_get_protocol (DBusGMethodInvocation *context,
	const gchar *out_Protocol)
	{
	dbus_g_method_return (context,
	out_Protocol);
	}
	typedef void (*tp_svc_connection_get_self_handle_impl) (TpSvcConnection *se
	lf,
	DBusGMethodInvocation *context);
	void tp_svc_connection_implement_get_self_handle (TpSvcConnectionClass *kla
	ss, tp_svc_connection_get_self_handle_impl impl);
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_connection_return_from_get_self_handle (DBusGMethodInvocation *
	context,
	guint out_Self_Handle);
	static inline void
	tp_svc_connection_return_from_get_self_handle (DBusGMethodInvocation *conte
	xt,
	guint out_Self_Handle)
	{
	dbus_g_method_return (context,
	out_Self_Handle);
	}
	typedef void (*tp_svc_connection_get_status_impl) (TpSvcConnection *self,
	DBusGMethodInvocation *context);
	void tp_svc_connection_implement_get_status (TpSvcConnectionClass *klass, t
	p_svc_connection_get_status_impl impl);
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_connection_return_from_get_status (DBusGMethodInvocation *conte
	xt,
	guint out_Status);
	static inline void
	tp_svc_connection_return_from_get_status (DBusGMethodInvocation *context,
	guint out_Status)
	{
	dbus_g_method_return (context,
	out_Status);
	}
	typedef void (*tp_svc_connection_hold_handles_impl) (TpSvcConnection *self,
	guint in_Handle_Type,
	const GArray *in_Handles,
	DBusGMethodInvocation *context);
	void tp_svc_connection_implement_hold_handles (TpSvcConnectionClass *klass,
	tp_svc_connection_hold_handles_impl impl);
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_connection_return_from_hold_handles (DBusGMethodInvocation *con
	text);
	static inline void
	tp_svc_connection_return_from_hold_handles (DBusGMethodInvocation *context)
	{
	dbus_g_method_return (context);
	}
	typedef void (*tp_svc_connection_inspect_handles_impl) (TpSvcConnection *se
	lf,
	guint in_Handle_Type,
	const GArray *in_Handles,
	DBusGMethodInvocation *context);
	void tp_svc_connection_implement_inspect_handles (TpSvcConnectionClass *kla
	ss, tp_svc_connection_inspect_handles_impl impl);
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_connection_return_from_inspect_handles (DBusGMethodInvocation *
	context,
	const gchar **out_Identifiers);
	static inline void
	tp_svc_connection_return_from_inspect_handles (DBusGMethodInvocation *conte
	xt,
	const gchar **out_Identifiers)
	{
	dbus_g_method_return (context,
	out_Identifiers);
	}
	typedef void (*tp_svc_connection_list_channels_impl) (TpSvcConnection *self
	,
	DBusGMethodInvocation *context);
	void tp_svc_connection_implement_list_channels (TpSvcConnectionClass *klass
	, tp_svc_connection_list_channels_impl impl);
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_connection_return_from_list_channels (DBusGMethodInvocation *co
	ntext,
	const GPtrArray *out_Channel_Info);
	static inline void
	tp_svc_connection_return_from_list_channels (DBusGMethodInvocation *context
	,
	const GPtrArray *out_Channel_Info)
	{
	dbus_g_method_return (context,
	out_Channel_Info);
	}
	typedef void (*tp_svc_connection_release_handles_impl) (TpSvcConnection *se
	lf,
	guint in_Handle_Type,
	const GArray *in_Handles,
	DBusGMethodInvocation *context);
	void tp_svc_connection_implement_release_handles (TpSvcConnectionClass *kla
	ss, tp_svc_connection_release_handles_impl impl);
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_connection_return_from_release_handles (DBusGMethodInvocation *
	context);
	static inline void
	tp_svc_connection_return_from_release_handles (DBusGMethodInvocation *conte
	xt)
	{
	dbus_g_method_return (context);
	}
	typedef void (*tp_svc_connection_request_channel_impl) (TpSvcConnection *se
	lf,
	const gchar *in_Type,
	guint in_Handle_Type,
	guint in_Handle,
	gboolean in_Suppress_Handler,
	DBusGMethodInvocation *context);
	void tp_svc_connection_implement_request_channel (TpSvcConnectionClass *kla
	ss, tp_svc_connection_request_channel_impl impl);
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_connection_return_from_request_channel (DBusGMethodInvocation *
	context,
	const gchar *out_Object_Path);
	static inline void
	tp_svc_connection_return_from_request_channel (DBusGMethodInvocation *conte
	xt,
	const gchar *out_Object_Path)
	{
	dbus_g_method_return (context,
	out_Object_Path);
	}
	typedef void (*tp_svc_connection_request_handles_impl) (TpSvcConnection *se
	lf,
	guint in_Handle_Type,
	const gchar **in_Identifiers,
	DBusGMethodInvocation *context);
	void tp_svc_connection_implement_request_handles (TpSvcConnectionClass *kla
	ss, tp_svc_connection_request_handles_impl impl);
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_connection_return_from_request_handles (DBusGMethodInvocation *
	context,
	const GArray *out_Handles);
	static inline void
	tp_svc_connection_return_from_request_handles (DBusGMethodInvocation *conte
	xt,
	const GArray *out_Handles)
	{
	dbus_g_method_return (context,
	out_Handles);
	}
	typedef void (*tp_svc_connection_add_client_interest_impl) (TpSvcConnection *self,		typedef void (*tp_svc_connection_add_client_interest_impl) (TpSvcConnection *self,
	const gchar **in_Tokens,		const gchar **in_Tokens,
	DBusGMethodInvocation *context);		DBusGMethodInvocation *context);
	void tp_svc_connection_implement_add_client_interest (TpSvcConnectionClass *klass, tp_svc_connection_add_client_interest_impl impl);		void tp_svc_connection_implement_add_client_interest (TpSvcConnectionClass *klass, tp_svc_connection_add_client_interest_impl impl);
	static inline		static inline
	/* this comment is to stop gtkdoc realising this is static */		/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_connection_return_from_add_client_interest (DBusGMethodInvocati on *context);		void tp_svc_connection_return_from_add_client_interest (DBusGMethodInvocati on *context);
	static inline void		static inline void
	tp_svc_connection_return_from_add_client_interest (DBusGMethodInvocation *c ontext)		tp_svc_connection_return_from_add_client_interest (DBusGMethodInvocation *c ontext)
	{		{
	skipping to change at line 228		skipping to change at line 70
	void tp_svc_connection_implement_remove_client_interest (TpSvcConnectionCla ss *klass, tp_svc_connection_remove_client_interest_impl impl);		void tp_svc_connection_implement_remove_client_interest (TpSvcConnectionCla ss *klass, tp_svc_connection_remove_client_interest_impl impl);
	static inline		static inline
	/* this comment is to stop gtkdoc realising this is static */		/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_connection_return_from_remove_client_interest (DBusGMethodInvoc ation *context);		void tp_svc_connection_return_from_remove_client_interest (DBusGMethodInvoc ation *context);
	static inline void		static inline void
	tp_svc_connection_return_from_remove_client_interest (DBusGMethodInvocation *context)		tp_svc_connection_return_from_remove_client_interest (DBusGMethodInvocation *context)
	{		{
	dbus_g_method_return (context);		dbus_g_method_return (context);
	}		}
	void tp_svc_connection_emit_self_handle_changed (gpointer instance,
	guint arg_Self_Handle);
	void tp_svc_connection_emit_self_contact_changed (gpointer instance,		void tp_svc_connection_emit_self_contact_changed (gpointer instance,
	guint arg_Self_Handle,		guint arg_Self_Handle,
	const gchar *arg_Self_ID);		const gchar *arg_Self_ID);
	void tp_svc_connection_emit_new_channel (gpointer instance,
	const gchar *arg_Object_Path,
	const gchar *arg_Channel_Type,
	guint arg_Handle_Type,
	guint arg_Handle,
	gboolean arg_Suppress_Handler);
	void tp_svc_connection_emit_connection_error (gpointer instance,		void tp_svc_connection_emit_connection_error (gpointer instance,
	const gchar *arg_Error,		const gchar *arg_Error,
	GHashTable *arg_Details);		GHashTable *arg_Details);
	void tp_svc_connection_emit_status_changed (gpointer instance,		void tp_svc_connection_emit_status_changed (gpointer instance,
	guint arg_Status,		guint arg_Status,
	guint arg_Reason);		guint arg_Reason);
	typedef struct _TpSvcConnectionInterfaceAddressing TpSvcConnectionInterface Addressing;		typedef struct _TpSvcConnectionInterfaceAddressing TpSvcConnectionInterface Addressing;
	typedef struct _TpSvcConnectionInterfaceAddressingClass TpSvcConnectionInte rfaceAddressingClass;		typedef struct _TpSvcConnectionInterfaceAddressingClass TpSvcConnectionInte rfaceAddressingClass;
	skipping to change at line 315		skipping to change at line 149
	GType tp_svc_connection_interface_aliasing_get_type (void);		GType tp_svc_connection_interface_aliasing_get_type (void);
	#define TP_TYPE_SVC_CONNECTION_INTERFACE_ALIASING \		#define TP_TYPE_SVC_CONNECTION_INTERFACE_ALIASING \
	(tp_svc_connection_interface_aliasing_get_type ())		(tp_svc_connection_interface_aliasing_get_type ())
	#define TP_SVC_CONNECTION_INTERFACE_ALIASING(obj) \		#define TP_SVC_CONNECTION_INTERFACE_ALIASING(obj) \
	(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_ALIAS ING, TpSvcConnectionInterfaceAliasing))		(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_ALIAS ING, TpSvcConnectionInterfaceAliasing))
	#define TP_IS_SVC_CONNECTION_INTERFACE_ALIASING(obj) \		#define TP_IS_SVC_CONNECTION_INTERFACE_ALIASING(obj) \
	(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_ALIAS ING))		(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_ALIAS ING))
	#define TP_SVC_CONNECTION_INTERFACE_ALIASING_GET_CLASS(obj) \		#define TP_SVC_CONNECTION_INTERFACE_ALIASING_GET_CLASS(obj) \
	(G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_AL IASING, TpSvcConnectionInterfaceAliasingClass))		(G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_AL IASING, TpSvcConnectionInterfaceAliasingClass))
	typedef void (*tp_svc_connection_interface_aliasing_get_alias_flags_impl) (
	TpSvcConnectionInterfaceAliasing *self,
	DBusGMethodInvocation *context);
	void tp_svc_connection_interface_aliasing_implement_get_alias_flags (TpSvcC
	onnectionInterfaceAliasingClass *klass, tp_svc_connection_interface_aliasin
	g_get_alias_flags_impl impl);
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_connection_interface_aliasing_return_from_get_alias_flags (DBus
	GMethodInvocation *context,
	guint out_Alias_Flags);
	static inline void
	tp_svc_connection_interface_aliasing_return_from_get_alias_flags (DBusGMeth
	odInvocation *context,
	guint out_Alias_Flags)
	{
	dbus_g_method_return (context,
	out_Alias_Flags);
	}
	typedef void (*tp_svc_connection_interface_aliasing_request_aliases_impl) ( TpSvcConnectionInterfaceAliasing *self,		typedef void (*tp_svc_connection_interface_aliasing_request_aliases_impl) ( TpSvcConnectionInterfaceAliasing *self,
	const GArray *in_Contacts,		const GArray *in_Contacts,
	DBusGMethodInvocation *context);		DBusGMethodInvocation *context);
	void tp_svc_connection_interface_aliasing_implement_request_aliases (TpSvcC onnectionInterfaceAliasingClass *klass, tp_svc_connection_interface_aliasin g_request_aliases_impl impl);		void tp_svc_connection_interface_aliasing_implement_request_aliases (TpSvcC onnectionInterfaceAliasingClass *klass, tp_svc_connection_interface_aliasin g_request_aliases_impl impl);
	static inline		static inline
	/* this comment is to stop gtkdoc realising this is static */		/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_connection_interface_aliasing_return_from_request_aliases (DBus GMethodInvocation *context,		void tp_svc_connection_interface_aliasing_return_from_request_aliases (DBus GMethodInvocation *context,
	const gchar **out_Aliases);		const gchar **out_Aliases);
	static inline void		static inline void
	tp_svc_connection_interface_aliasing_return_from_request_aliases (DBusGMeth odInvocation *context,		tp_svc_connection_interface_aliasing_return_from_request_aliases (DBusGMeth odInvocation *context,
	const gchar **out_Aliases)		const gchar **out_Aliases)
	{		{
	dbus_g_method_return (context,		dbus_g_method_return (context,
	out_Aliases);		out_Aliases);
	}		}
	typedef void (*tp_svc_connection_interface_aliasing_get_aliases_impl) (TpSv
	cConnectionInterfaceAliasing *self,
	const GArray *in_Contacts,
	DBusGMethodInvocation *context);
	void tp_svc_connection_interface_aliasing_implement_get_aliases (TpSvcConne
	ctionInterfaceAliasingClass *klass, tp_svc_connection_interface_aliasing_ge
	t_aliases_impl impl);
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_connection_interface_aliasing_return_from_get_aliases (DBusGMet
	hodInvocation *context,
	GHashTable *out_Aliases);
	static inline void
	tp_svc_connection_interface_aliasing_return_from_get_aliases (DBusGMethodIn
	vocation *context,
	GHashTable *out_Aliases)
	{
	dbus_g_method_return (context,
	out_Aliases);
	}
	typedef void (*tp_svc_connection_interface_aliasing_set_aliases_impl) (TpSv cConnectionInterfaceAliasing *self,		typedef void (*tp_svc_connection_interface_aliasing_set_aliases_impl) (TpSv cConnectionInterfaceAliasing *self,
	GHashTable *in_Aliases,		GHashTable *in_Aliases,
	DBusGMethodInvocation *context);		DBusGMethodInvocation *context);
	void tp_svc_connection_interface_aliasing_implement_set_aliases (TpSvcConne ctionInterfaceAliasingClass *klass, tp_svc_connection_interface_aliasing_se t_aliases_impl impl);		void tp_svc_connection_interface_aliasing_implement_set_aliases (TpSvcConne ctionInterfaceAliasingClass *klass, tp_svc_connection_interface_aliasing_se t_aliases_impl impl);
	static inline		static inline
	/* this comment is to stop gtkdoc realising this is static */		/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_connection_interface_aliasing_return_from_set_aliases (DBusGMet hodInvocation *context);		void tp_svc_connection_interface_aliasing_return_from_set_aliases (DBusGMet hodInvocation *context);
	static inline void		static inline void
	tp_svc_connection_interface_aliasing_return_from_set_aliases (DBusGMethodIn vocation *context)		tp_svc_connection_interface_aliasing_return_from_set_aliases (DBusGMethodIn vocation *context)
	{		{
	dbus_g_method_return (context);		dbus_g_method_return (context);
	}		}
	void tp_svc_connection_interface_aliasing_emit_aliases_changed (gpointer in stance,		void tp_svc_connection_interface_aliasing_emit_aliases_changed (gpointer in stance,
	const GPtrArray *arg_Aliases);		GHashTable *arg_Aliases);
	typedef struct _TpSvcConnectionInterfaceAnonymity TpSvcConnectionInterfaceA nonymity;		typedef struct _TpSvcConnectionInterfaceAnonymity TpSvcConnectionInterfaceA nonymity;
	typedef struct _TpSvcConnectionInterfaceAnonymityClass TpSvcConnectionInter faceAnonymityClass;		typedef struct _TpSvcConnectionInterfaceAnonymityClass TpSvcConnectionInter faceAnonymityClass;
	GType tp_svc_connection_interface_anonymity_get_type (void);		GType tp_svc_connection_interface_anonymity_get_type (void);
	#define TP_TYPE_SVC_CONNECTION_INTERFACE_ANONYMITY \		#define TP_TYPE_SVC_CONNECTION_INTERFACE_ANONYMITY \
	(tp_svc_connection_interface_anonymity_get_type ())		(tp_svc_connection_interface_anonymity_get_type ())
	#define TP_SVC_CONNECTION_INTERFACE_ANONYMITY(obj) \		#define TP_SVC_CONNECTION_INTERFACE_ANONYMITY(obj) \
	(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_ANONY MITY, TpSvcConnectionInterfaceAnonymity))		(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_ANONY MITY, TpSvcConnectionInterfaceAnonymity))
	skipping to change at line 409		skipping to change at line 212
	GType tp_svc_connection_interface_avatars_get_type (void);		GType tp_svc_connection_interface_avatars_get_type (void);
	#define TP_TYPE_SVC_CONNECTION_INTERFACE_AVATARS \		#define TP_TYPE_SVC_CONNECTION_INTERFACE_AVATARS \
	(tp_svc_connection_interface_avatars_get_type ())		(tp_svc_connection_interface_avatars_get_type ())
	#define TP_SVC_CONNECTION_INTERFACE_AVATARS(obj) \		#define TP_SVC_CONNECTION_INTERFACE_AVATARS(obj) \
	(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_AVATA RS, TpSvcConnectionInterfaceAvatars))		(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_AVATA RS, TpSvcConnectionInterfaceAvatars))
	#define TP_IS_SVC_CONNECTION_INTERFACE_AVATARS(obj) \		#define TP_IS_SVC_CONNECTION_INTERFACE_AVATARS(obj) \
	(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_AVATA RS))		(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_AVATA RS))
	#define TP_SVC_CONNECTION_INTERFACE_AVATARS_GET_CLASS(obj) \		#define TP_SVC_CONNECTION_INTERFACE_AVATARS_GET_CLASS(obj) \
	(G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_AV ATARS, TpSvcConnectionInterfaceAvatarsClass))		(G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_AV ATARS, TpSvcConnectionInterfaceAvatarsClass))
	typedef void (*tp_svc_connection_interface_avatars_get_avatar_requirements_
	impl) (TpSvcConnectionInterfaceAvatars *self,
	DBusGMethodInvocation *context);
	void tp_svc_connection_interface_avatars_implement_get_avatar_requirements
	(TpSvcConnectionInterfaceAvatarsClass *klass, tp_svc_connection_interface_a
	vatars_get_avatar_requirements_impl impl);
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_connection_interface_avatars_return_from_get_avatar_requirement
	s (DBusGMethodInvocation *context,
	const gchar **out_MIME_Types,
	guint out_Min_Width,
	guint out_Min_Height,
	guint out_Max_Width,
	guint out_Max_Height,
	guint out_Max_Bytes);
	static inline void
	tp_svc_connection_interface_avatars_return_from_get_avatar_requirements (DB
	usGMethodInvocation *context,
	const gchar **out_MIME_Types,
	guint out_Min_Width,
	guint out_Min_Height,
	guint out_Max_Width,
	guint out_Max_Height,
	guint out_Max_Bytes)
	{
	dbus_g_method_return (context,
	out_MIME_Types,
	out_Min_Width,
	out_Min_Height,
	out_Max_Width,
	out_Max_Height,
	out_Max_Bytes);
	}
	typedef void (*tp_svc_connection_interface_avatars_get_avatar_tokens_impl)
	(TpSvcConnectionInterfaceAvatars *self,
	const GArray *in_Contacts,
	DBusGMethodInvocation *context);
	void tp_svc_connection_interface_avatars_implement_get_avatar_tokens (TpSvc
	ConnectionInterfaceAvatarsClass *klass, tp_svc_connection_interface_avatars
	_get_avatar_tokens_impl impl);
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_connection_interface_avatars_return_from_get_avatar_tokens (DBu
	sGMethodInvocation *context,
	const gchar **out_Tokens);
	static inline void
	tp_svc_connection_interface_avatars_return_from_get_avatar_tokens (DBusGMet
	hodInvocation *context,
	const gchar **out_Tokens)
	{
	dbus_g_method_return (context,
	out_Tokens);
	}
	typedef void (*tp_svc_connection_interface_avatars_get_known_avatar_tokens_ impl) (TpSvcConnectionInterfaceAvatars *self,		typedef void (*tp_svc_connection_interface_avatars_get_known_avatar_tokens_ impl) (TpSvcConnectionInterfaceAvatars *self,
	const GArray *in_Contacts,		const GArray *in_Contacts,
	DBusGMethodInvocation *context);		DBusGMethodInvocation *context);
	void tp_svc_connection_interface_avatars_implement_get_known_avatar_tokens (TpSvcConnectionInterfaceAvatarsClass *klass, tp_svc_connection_interface_a vatars_get_known_avatar_tokens_impl impl);		void tp_svc_connection_interface_avatars_implement_get_known_avatar_tokens (TpSvcConnectionInterfaceAvatarsClass *klass, tp_svc_connection_interface_a vatars_get_known_avatar_tokens_impl impl);
	static inline		static inline
	/* this comment is to stop gtkdoc realising this is static */		/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_connection_interface_avatars_return_from_get_known_avatar_token s (DBusGMethodInvocation *context,		void tp_svc_connection_interface_avatars_return_from_get_known_avatar_token s (DBusGMethodInvocation *context,
	GHashTable *out_Tokens);		GHashTable *out_Tokens);
	static inline void		static inline void
	tp_svc_connection_interface_avatars_return_from_get_known_avatar_tokens (DB usGMethodInvocation *context,		tp_svc_connection_interface_avatars_return_from_get_known_avatar_tokens (DB usGMethodInvocation *context,
	GHashTable *out_Tokens)		GHashTable *out_Tokens)
	{		{
	dbus_g_method_return (context,		dbus_g_method_return (context,
	out_Tokens);		out_Tokens);
	}		}
	typedef void (*tp_svc_connection_interface_avatars_request_avatar_impl) (Tp
	SvcConnectionInterfaceAvatars *self,
	guint in_Contact,
	DBusGMethodInvocation *context);
	void tp_svc_connection_interface_avatars_implement_request_avatar (TpSvcCon
	nectionInterfaceAvatarsClass *klass, tp_svc_connection_interface_avatars_re
	quest_avatar_impl impl);
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_connection_interface_avatars_return_from_request_avatar (DBusGM
	ethodInvocation *context,
	const GArray *out_Data,
	const gchar *out_MIME_Type);
	static inline void
	tp_svc_connection_interface_avatars_return_from_request_avatar (DBusGMethod
	Invocation *context,
	const GArray *out_Data,
	const gchar *out_MIME_Type)
	{
	dbus_g_method_return (context,
	out_Data,
	out_MIME_Type);
	}
	typedef void (*tp_svc_connection_interface_avatars_request_avatars_impl) (T pSvcConnectionInterfaceAvatars *self,		typedef void (*tp_svc_connection_interface_avatars_request_avatars_impl) (T pSvcConnectionInterfaceAvatars *self,
	const GArray *in_Contacts,		const GArray *in_Contacts,
	DBusGMethodInvocation *context);		DBusGMethodInvocation *context);
	void tp_svc_connection_interface_avatars_implement_request_avatars (TpSvcCo nnectionInterfaceAvatarsClass *klass, tp_svc_connection_interface_avatars_r equest_avatars_impl impl);		void tp_svc_connection_interface_avatars_implement_request_avatars (TpSvcCo nnectionInterfaceAvatarsClass *klass, tp_svc_connection_interface_avatars_r equest_avatars_impl impl);
	static inline		static inline
	/* this comment is to stop gtkdoc realising this is static */		/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_connection_interface_avatars_return_from_request_avatars (DBusG MethodInvocation *context);		void tp_svc_connection_interface_avatars_return_from_request_avatars (DBusG MethodInvocation *context);
	static inline void		static inline void
	tp_svc_connection_interface_avatars_return_from_request_avatars (DBusGMetho dInvocation *context)		tp_svc_connection_interface_avatars_return_from_request_avatars (DBusGMetho dInvocation *context)
	{		{
	skipping to change at line 558		skipping to change at line 296
	#define TP_SVC_CONNECTION_INTERFACE_BALANCE(obj) \		#define TP_SVC_CONNECTION_INTERFACE_BALANCE(obj) \
	(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_BALAN CE, TpSvcConnectionInterfaceBalance))		(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_BALAN CE, TpSvcConnectionInterfaceBalance))
	#define TP_IS_SVC_CONNECTION_INTERFACE_BALANCE(obj) \		#define TP_IS_SVC_CONNECTION_INTERFACE_BALANCE(obj) \
	(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_BALAN CE))		(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_BALAN CE))
	#define TP_SVC_CONNECTION_INTERFACE_BALANCE_GET_CLASS(obj) \		#define TP_SVC_CONNECTION_INTERFACE_BALANCE_GET_CLASS(obj) \
	(G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_BA LANCE, TpSvcConnectionInterfaceBalanceClass))		(G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_BA LANCE, TpSvcConnectionInterfaceBalanceClass))
	void tp_svc_connection_interface_balance_emit_balance_changed (gpointer ins tance,		void tp_svc_connection_interface_balance_emit_balance_changed (gpointer ins tance,
	const GValueArray *arg_Balance);		const GValueArray *arg_Balance);
	typedef struct _TpSvcConnectionInterfaceCapabilities TpSvcConnectionInterfa
	ceCapabilities;
	typedef struct _TpSvcConnectionInterfaceCapabilitiesClass TpSvcConnectionIn
	terfaceCapabilitiesClass;
	GType tp_svc_connection_interface_capabilities_get_type (void);
	#define TP_TYPE_SVC_CONNECTION_INTERFACE_CAPABILITIES \
	(tp_svc_connection_interface_capabilities_get_type ())
	#define TP_SVC_CONNECTION_INTERFACE_CAPABILITIES(obj) \
	(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_CAPAB
	ILITIES, TpSvcConnectionInterfaceCapabilities))
	#define TP_IS_SVC_CONNECTION_INTERFACE_CAPABILITIES(obj) \
	(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_CAPAB
	ILITIES))
	#define TP_SVC_CONNECTION_INTERFACE_CAPABILITIES_GET_CLASS(obj) \
	(G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_CA
	PABILITIES, TpSvcConnectionInterfaceCapabilitiesClass))
	typedef void (*tp_svc_connection_interface_capabilities_advertise_capabilit
	ies_impl) (TpSvcConnectionInterfaceCapabilities *self,
	const GPtrArray *in_Add,
	const gchar **in_Remove,
	DBusGMethodInvocation *context);
	void tp_svc_connection_interface_capabilities_implement_advertise_capabilit
	ies (TpSvcConnectionInterfaceCapabilitiesClass *klass, tp_svc_connection_in
	terface_capabilities_advertise_capabilities_impl impl);
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_connection_interface_capabilities_return_from_advertise_capabil
	ities (DBusGMethodInvocation *context,
	const GPtrArray *out_Self_Capabilities);
	static inline void
	tp_svc_connection_interface_capabilities_return_from_advertise_capabilities
	(DBusGMethodInvocation *context,
	const GPtrArray *out_Self_Capabilities)
	{
	dbus_g_method_return (context,
	out_Self_Capabilities);
	}
	typedef void (*tp_svc_connection_interface_capabilities_get_capabilities_im
	pl) (TpSvcConnectionInterfaceCapabilities *self,
	const GArray *in_Handles,
	DBusGMethodInvocation *context);
	void tp_svc_connection_interface_capabilities_implement_get_capabilities (T
	pSvcConnectionInterfaceCapabilitiesClass *klass, tp_svc_connection_interfac
	e_capabilities_get_capabilities_impl impl);
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_connection_interface_capabilities_return_from_get_capabilities
	(DBusGMethodInvocation *context,
	const GPtrArray *out_Contact_Capabilities);
	static inline void
	tp_svc_connection_interface_capabilities_return_from_get_capabilities (DBus
	GMethodInvocation *context,
	const GPtrArray *out_Contact_Capabilities)
	{
	dbus_g_method_return (context,
	out_Contact_Capabilities);
	}
	void tp_svc_connection_interface_capabilities_emit_capabilities_changed (gp
	ointer instance,
	const GPtrArray *arg_Caps);
	typedef struct _TpSvcConnectionInterfaceCellular TpSvcConnectionInterfaceCe llular;		typedef struct _TpSvcConnectionInterfaceCellular TpSvcConnectionInterfaceCe llular;
	typedef struct _TpSvcConnectionInterfaceCellularClass TpSvcConnectionInterf aceCellularClass;		typedef struct _TpSvcConnectionInterfaceCellularClass TpSvcConnectionInterf aceCellularClass;
	GType tp_svc_connection_interface_cellular_get_type (void);		GType tp_svc_connection_interface_cellular_get_type (void);
	#define TP_TYPE_SVC_CONNECTION_INTERFACE_CELLULAR \		#define TP_TYPE_SVC_CONNECTION_INTERFACE_CELLULAR \
	(tp_svc_connection_interface_cellular_get_type ())		(tp_svc_connection_interface_cellular_get_type ())
	#define TP_SVC_CONNECTION_INTERFACE_CELLULAR(obj) \		#define TP_SVC_CONNECTION_INTERFACE_CELLULAR(obj) \
	(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_CELLU LAR, TpSvcConnectionInterfaceCellular))		(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_CELLU LAR, TpSvcConnectionInterfaceCellular))
	#define TP_IS_SVC_CONNECTION_INTERFACE_CELLULAR(obj) \		#define TP_IS_SVC_CONNECTION_INTERFACE_CELLULAR(obj) \
	skipping to change at line 639		skipping to change at line 327
	GType tp_svc_connection_interface_client_types_get_type (void);		GType tp_svc_connection_interface_client_types_get_type (void);
	#define TP_TYPE_SVC_CONNECTION_INTERFACE_CLIENT_TYPES \		#define TP_TYPE_SVC_CONNECTION_INTERFACE_CLIENT_TYPES \
	(tp_svc_connection_interface_client_types_get_type ())		(tp_svc_connection_interface_client_types_get_type ())
	#define TP_SVC_CONNECTION_INTERFACE_CLIENT_TYPES(obj) \		#define TP_SVC_CONNECTION_INTERFACE_CLIENT_TYPES(obj) \
	(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_CLIEN T_TYPES, TpSvcConnectionInterfaceClientTypes))		(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_CLIEN T_TYPES, TpSvcConnectionInterfaceClientTypes))
	#define TP_IS_SVC_CONNECTION_INTERFACE_CLIENT_TYPES(obj) \		#define TP_IS_SVC_CONNECTION_INTERFACE_CLIENT_TYPES(obj) \
	(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_CLIEN T_TYPES))		(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_CLIEN T_TYPES))
	#define TP_SVC_CONNECTION_INTERFACE_CLIENT_TYPES_GET_CLASS(obj) \		#define TP_SVC_CONNECTION_INTERFACE_CLIENT_TYPES_GET_CLASS(obj) \
	(G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_CL IENT_TYPES, TpSvcConnectionInterfaceClientTypesClass))		(G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_CL IENT_TYPES, TpSvcConnectionInterfaceClientTypesClass))
	typedef void (*tp_svc_connection_interface_client_types_get_client_types_im
	pl) (TpSvcConnectionInterfaceClientTypes *self,
	const GArray *in_Contacts,
	DBusGMethodInvocation *context);
	void tp_svc_connection_interface_client_types_implement_get_client_types (T
	pSvcConnectionInterfaceClientTypesClass *klass, tp_svc_connection_interface
	_client_types_get_client_types_impl impl);
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_connection_interface_client_types_return_from_get_client_types
	(DBusGMethodInvocation *context,
	GHashTable *out_Client_Types);
	static inline void
	tp_svc_connection_interface_client_types_return_from_get_client_types (DBus
	GMethodInvocation *context,
	GHashTable *out_Client_Types)
	{
	dbus_g_method_return (context,
	out_Client_Types);
	}
	typedef void (*tp_svc_connection_interface_client_types_request_client_type s_impl) (TpSvcConnectionInterfaceClientTypes *self,		typedef void (*tp_svc_connection_interface_client_types_request_client_type s_impl) (TpSvcConnectionInterfaceClientTypes *self,
	guint in_Contact,		guint in_Contact,
	DBusGMethodInvocation *context);		DBusGMethodInvocation *context);
	void tp_svc_connection_interface_client_types_implement_request_client_type s (TpSvcConnectionInterfaceClientTypesClass *klass, tp_svc_connection_inter face_client_types_request_client_types_impl impl);		void tp_svc_connection_interface_client_types_implement_request_client_type s (TpSvcConnectionInterfaceClientTypesClass *klass, tp_svc_connection_inter face_client_types_request_client_types_impl impl);
	static inline		static inline
	/* this comment is to stop gtkdoc realising this is static */		/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_connection_interface_client_types_return_from_request_client_ty pes (DBusGMethodInvocation *context,		void tp_svc_connection_interface_client_types_return_from_request_client_ty pes (DBusGMethodInvocation *context,
	const gchar **out_Client_Types);		const gchar **out_Client_Types);
	static inline void		static inline void
	tp_svc_connection_interface_client_types_return_from_request_client_types ( DBusGMethodInvocation *context,		tp_svc_connection_interface_client_types_return_from_request_client_types ( DBusGMethodInvocation *context,
	skipping to change at line 762		skipping to change at line 434
	void tp_svc_connection_interface_contact_capabilities_implement_update_capa bilities (TpSvcConnectionInterfaceContactCapabilitiesClass *klass, tp_svc_c onnection_interface_contact_capabilities_update_capabilities_impl impl);		void tp_svc_connection_interface_contact_capabilities_implement_update_capa bilities (TpSvcConnectionInterfaceContactCapabilitiesClass *klass, tp_svc_c onnection_interface_contact_capabilities_update_capabilities_impl impl);
	static inline		static inline
	/* this comment is to stop gtkdoc realising this is static */		/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_connection_interface_contact_capabilities_return_from_update_ca pabilities (DBusGMethodInvocation *context);		void tp_svc_connection_interface_contact_capabilities_return_from_update_ca pabilities (DBusGMethodInvocation *context);
	static inline void		static inline void
	tp_svc_connection_interface_contact_capabilities_return_from_update_capabil ities (DBusGMethodInvocation *context)		tp_svc_connection_interface_contact_capabilities_return_from_update_capabil ities (DBusGMethodInvocation *context)
	{		{
	dbus_g_method_return (context);		dbus_g_method_return (context);
	}		}
	typedef void (*tp_svc_connection_interface_contact_capabilities_get_contact
	_capabilities_impl) (TpSvcConnectionInterfaceContactCapabilities *self,
	const GArray *in_Handles,
	DBusGMethodInvocation *context);
	void tp_svc_connection_interface_contact_capabilities_implement_get_contact
	_capabilities (TpSvcConnectionInterfaceContactCapabilitiesClass *klass, tp_
	svc_connection_interface_contact_capabilities_get_contact_capabilities_impl
	impl);
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_connection_interface_contact_capabilities_return_from_get_conta
	ct_capabilities (DBusGMethodInvocation *context,
	GHashTable *out_Contact_Capabilities);
	static inline void
	tp_svc_connection_interface_contact_capabilities_return_from_get_contact_ca
	pabilities (DBusGMethodInvocation *context,
	GHashTable *out_Contact_Capabilities)
	{
	dbus_g_method_return (context,
	out_Contact_Capabilities);
	}
	void tp_svc_connection_interface_contact_capabilities_emit_contact_capabili ties_changed (gpointer instance,		void tp_svc_connection_interface_contact_capabilities_emit_contact_capabili ties_changed (gpointer instance,
	GHashTable *arg_caps);		GHashTable *arg_caps);
	typedef struct _TpSvcConnectionInterfaceContactGroups TpSvcConnectionInterf aceContactGroups;		typedef struct _TpSvcConnectionInterfaceContactGroups TpSvcConnectionInterf aceContactGroups;
	typedef struct _TpSvcConnectionInterfaceContactGroupsClass TpSvcConnectionI nterfaceContactGroupsClass;		typedef struct _TpSvcConnectionInterfaceContactGroupsClass TpSvcConnectionI nterfaceContactGroupsClass;
	GType tp_svc_connection_interface_contact_groups_get_type (void);		GType tp_svc_connection_interface_contact_groups_get_type (void);
	#define TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_GROUPS \		#define TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_GROUPS \
	(tp_svc_connection_interface_contact_groups_get_type ())		(tp_svc_connection_interface_contact_groups_get_type ())
	skipping to change at line 904		skipping to change at line 560
	GType tp_svc_connection_interface_contact_info_get_type (void);		GType tp_svc_connection_interface_contact_info_get_type (void);
	#define TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_INFO \		#define TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_INFO \
	(tp_svc_connection_interface_contact_info_get_type ())		(tp_svc_connection_interface_contact_info_get_type ())
	#define TP_SVC_CONNECTION_INTERFACE_CONTACT_INFO(obj) \		#define TP_SVC_CONNECTION_INTERFACE_CONTACT_INFO(obj) \
	(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_CONTA CT_INFO, TpSvcConnectionInterfaceContactInfo))		(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_CONTA CT_INFO, TpSvcConnectionInterfaceContactInfo))
	#define TP_IS_SVC_CONNECTION_INTERFACE_CONTACT_INFO(obj) \		#define TP_IS_SVC_CONNECTION_INTERFACE_CONTACT_INFO(obj) \
	(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_CONTA CT_INFO))		(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_CONTA CT_INFO))
	#define TP_SVC_CONNECTION_INTERFACE_CONTACT_INFO_GET_CLASS(obj) \		#define TP_SVC_CONNECTION_INTERFACE_CONTACT_INFO_GET_CLASS(obj) \
	(G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_CO NTACT_INFO, TpSvcConnectionInterfaceContactInfoClass))		(G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_CO NTACT_INFO, TpSvcConnectionInterfaceContactInfoClass))
	typedef void (*tp_svc_connection_interface_contact_info_get_contact_info_im
	pl) (TpSvcConnectionInterfaceContactInfo *self,
	const GArray *in_Contacts,
	DBusGMethodInvocation *context);
	void tp_svc_connection_interface_contact_info_implement_get_contact_info (T
	pSvcConnectionInterfaceContactInfoClass *klass, tp_svc_connection_interface
	_contact_info_get_contact_info_impl impl);
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_connection_interface_contact_info_return_from_get_contact_info
	(DBusGMethodInvocation *context,
	GHashTable *out_ContactInfo);
	static inline void
	tp_svc_connection_interface_contact_info_return_from_get_contact_info (DBus
	GMethodInvocation *context,
	GHashTable *out_ContactInfo)
	{
	dbus_g_method_return (context,
	out_ContactInfo);
	}
	typedef void (*tp_svc_connection_interface_contact_info_refresh_contact_inf o_impl) (TpSvcConnectionInterfaceContactInfo *self,		typedef void (*tp_svc_connection_interface_contact_info_refresh_contact_inf o_impl) (TpSvcConnectionInterfaceContactInfo *self,
	const GArray *in_Contacts,		const GArray *in_Contacts,
	DBusGMethodInvocation *context);		DBusGMethodInvocation *context);
	void tp_svc_connection_interface_contact_info_implement_refresh_contact_inf o (TpSvcConnectionInterfaceContactInfoClass *klass, tp_svc_connection_inter face_contact_info_refresh_contact_info_impl impl);		void tp_svc_connection_interface_contact_info_implement_refresh_contact_inf o (TpSvcConnectionInterfaceContactInfoClass *klass, tp_svc_connection_inter face_contact_info_refresh_contact_info_impl impl);
	static inline		static inline
	/* this comment is to stop gtkdoc realising this is static */		/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_connection_interface_contact_info_return_from_refresh_contact_i nfo (DBusGMethodInvocation *context);		void tp_svc_connection_interface_contact_info_return_from_refresh_contact_i nfo (DBusGMethodInvocation *context);
	static inline void		static inline void
	tp_svc_connection_interface_contact_info_return_from_refresh_contact_info ( DBusGMethodInvocation *context)		tp_svc_connection_interface_contact_info_return_from_refresh_contact_info ( DBusGMethodInvocation *context)
	{		{
	skipping to change at line 982		skipping to change at line 622
	(tp_svc_connection_interface_contact_list_get_type ())		(tp_svc_connection_interface_contact_list_get_type ())
	#define TP_SVC_CONNECTION_INTERFACE_CONTACT_LIST(obj) \		#define TP_SVC_CONNECTION_INTERFACE_CONTACT_LIST(obj) \
	(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_CONTA CT_LIST, TpSvcConnectionInterfaceContactList))		(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_CONTA CT_LIST, TpSvcConnectionInterfaceContactList))
	#define TP_IS_SVC_CONNECTION_INTERFACE_CONTACT_LIST(obj) \		#define TP_IS_SVC_CONNECTION_INTERFACE_CONTACT_LIST(obj) \
	(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_CONTA CT_LIST))		(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_CONTA CT_LIST))
	#define TP_SVC_CONNECTION_INTERFACE_CONTACT_LIST_GET_CLASS(obj) \		#define TP_SVC_CONNECTION_INTERFACE_CONTACT_LIST_GET_CLASS(obj) \
	(G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_CO NTACT_LIST, TpSvcConnectionInterfaceContactListClass))		(G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_CO NTACT_LIST, TpSvcConnectionInterfaceContactListClass))
	typedef void (*tp_svc_connection_interface_contact_list_get_contact_list_at tributes_impl) (TpSvcConnectionInterfaceContactList *self,		typedef void (*tp_svc_connection_interface_contact_list_get_contact_list_at tributes_impl) (TpSvcConnectionInterfaceContactList *self,
	const gchar **in_Interfaces,		const gchar **in_Interfaces,
	gboolean in_Hold,
	DBusGMethodInvocation *context);		DBusGMethodInvocation *context);
	void tp_svc_connection_interface_contact_list_implement_get_contact_list_at tributes (TpSvcConnectionInterfaceContactListClass *klass, tp_svc_connectio n_interface_contact_list_get_contact_list_attributes_impl impl);		void tp_svc_connection_interface_contact_list_implement_get_contact_list_at tributes (TpSvcConnectionInterfaceContactListClass *klass, tp_svc_connectio n_interface_contact_list_get_contact_list_attributes_impl impl);
	static inline		static inline
	/* this comment is to stop gtkdoc realising this is static */		/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_connection_interface_contact_list_return_from_get_contact_list_ attributes (DBusGMethodInvocation *context,		void tp_svc_connection_interface_contact_list_return_from_get_contact_list_ attributes (DBusGMethodInvocation *context,
	GHashTable *out_Attributes);		GHashTable *out_Attributes);
	static inline void		static inline void
	tp_svc_connection_interface_contact_list_return_from_get_contact_list_attri butes (DBusGMethodInvocation *context,		tp_svc_connection_interface_contact_list_return_from_get_contact_list_attri butes (DBusGMethodInvocation *context,
	GHashTable *out_Attributes)		GHashTable *out_Attributes)
	{		{
	skipping to change at line 1077		skipping to change at line 716
	/* this comment is to stop gtkdoc realising this is static */		/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_connection_interface_contact_list_return_from_download (DBusGMe thodInvocation *context);		void tp_svc_connection_interface_contact_list_return_from_download (DBusGMe thodInvocation *context);
	static inline void		static inline void
	tp_svc_connection_interface_contact_list_return_from_download (DBusGMethodI nvocation *context)		tp_svc_connection_interface_contact_list_return_from_download (DBusGMethodI nvocation *context)
	{		{
	dbus_g_method_return (context);		dbus_g_method_return (context);
	}		}
	void tp_svc_connection_interface_contact_list_emit_contact_list_state_chang ed (gpointer instance,		void tp_svc_connection_interface_contact_list_emit_contact_list_state_chang ed (gpointer instance,
	guint arg_Contact_List_State);		guint arg_Contact_List_State);
	void tp_svc_connection_interface_contact_list_emit_contacts_changed_with_id (gpointer instance,		void tp_svc_connection_interface_contact_list_emit_contacts_changed (gpoint er instance,
	GHashTable *arg_Changes,		GHashTable *arg_Changes,
	GHashTable *arg_Identifiers,		GHashTable *arg_Identifiers,
	GHashTable *arg_Removals);		GHashTable *arg_Removals);
	void tp_svc_connection_interface_contact_list_emit_contacts_changed (gpoint
	er instance,
	GHashTable *arg_Changes,
	const GArray *arg_Removals);
	typedef struct _TpSvcConnectionInterfaceContacts TpSvcConnectionInterfaceCo ntacts;		typedef struct _TpSvcConnectionInterfaceContacts TpSvcConnectionInterfaceCo ntacts;
	typedef struct _TpSvcConnectionInterfaceContactsClass TpSvcConnectionInterf aceContactsClass;		typedef struct _TpSvcConnectionInterfaceContactsClass TpSvcConnectionInterf aceContactsClass;
	GType tp_svc_connection_interface_contacts_get_type (void);		GType tp_svc_connection_interface_contacts_get_type (void);
	#define TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACTS \		#define TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACTS \
	(tp_svc_connection_interface_contacts_get_type ())		(tp_svc_connection_interface_contacts_get_type ())
	#define TP_SVC_CONNECTION_INTERFACE_CONTACTS(obj) \		#define TP_SVC_CONNECTION_INTERFACE_CONTACTS(obj) \
	(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_CONTA CTS, TpSvcConnectionInterfaceContacts))		(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_CONTA CTS, TpSvcConnectionInterfaceContacts))
	#define TP_IS_SVC_CONNECTION_INTERFACE_CONTACTS(obj) \		#define TP_IS_SVC_CONNECTION_INTERFACE_CONTACTS(obj) \
	(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_CONTA CTS))		(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_CONTA CTS))
	#define TP_SVC_CONNECTION_INTERFACE_CONTACTS_GET_CLASS(obj) \		#define TP_SVC_CONNECTION_INTERFACE_CONTACTS_GET_CLASS(obj) \
	(G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_CO NTACTS, TpSvcConnectionInterfaceContactsClass))		(G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_CO NTACTS, TpSvcConnectionInterfaceContactsClass))
	typedef void (*tp_svc_connection_interface_contacts_get_contact_attributes_ impl) (TpSvcConnectionInterfaceContacts *self,		typedef void (*tp_svc_connection_interface_contacts_get_contact_attributes_ impl) (TpSvcConnectionInterfaceContacts *self,
	const GArray *in_Handles,		const GArray *in_Handles,
	const gchar **in_Interfaces,		const gchar **in_Interfaces,
	gboolean in_Hold,
	DBusGMethodInvocation *context);		DBusGMethodInvocation *context);
	void tp_svc_connection_interface_contacts_implement_get_contact_attributes (TpSvcConnectionInterfaceContactsClass *klass, tp_svc_connection_interface_ contacts_get_contact_attributes_impl impl);		void tp_svc_connection_interface_contacts_implement_get_contact_attributes (TpSvcConnectionInterfaceContactsClass *klass, tp_svc_connection_interface_ contacts_get_contact_attributes_impl impl);
	static inline		static inline
	/* this comment is to stop gtkdoc realising this is static */		/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_connection_interface_contacts_return_from_get_contact_attribute s (DBusGMethodInvocation *context,		void tp_svc_connection_interface_contacts_return_from_get_contact_attribute s (DBusGMethodInvocation *context,
	GHashTable *out_Attributes);		GHashTable *out_Attributes);
	static inline void		static inline void
	tp_svc_connection_interface_contacts_return_from_get_contact_attributes (DB usGMethodInvocation *context,		tp_svc_connection_interface_contacts_return_from_get_contact_attributes (DB usGMethodInvocation *context,
	GHashTable *out_Attributes)		GHashTable *out_Attributes)
	{		{
	skipping to change at line 1151		skipping to change at line 786
	GType tp_svc_connection_interface_location_get_type (void);		GType tp_svc_connection_interface_location_get_type (void);
	#define TP_TYPE_SVC_CONNECTION_INTERFACE_LOCATION \		#define TP_TYPE_SVC_CONNECTION_INTERFACE_LOCATION \
	(tp_svc_connection_interface_location_get_type ())		(tp_svc_connection_interface_location_get_type ())
	#define TP_SVC_CONNECTION_INTERFACE_LOCATION(obj) \		#define TP_SVC_CONNECTION_INTERFACE_LOCATION(obj) \
	(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_LOCAT ION, TpSvcConnectionInterfaceLocation))		(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_LOCAT ION, TpSvcConnectionInterfaceLocation))
	#define TP_IS_SVC_CONNECTION_INTERFACE_LOCATION(obj) \		#define TP_IS_SVC_CONNECTION_INTERFACE_LOCATION(obj) \
	(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_LOCAT ION))		(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_LOCAT ION))
	#define TP_SVC_CONNECTION_INTERFACE_LOCATION_GET_CLASS(obj) \		#define TP_SVC_CONNECTION_INTERFACE_LOCATION_GET_CLASS(obj) \
	(G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_LO CATION, TpSvcConnectionInterfaceLocationClass))		(G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_LO CATION, TpSvcConnectionInterfaceLocationClass))
	typedef void (*tp_svc_connection_interface_location_get_locations_impl) (Tp
	SvcConnectionInterfaceLocation *self,
	const GArray *in_Contacts,
	DBusGMethodInvocation *context);
	void tp_svc_connection_interface_location_implement_get_locations (TpSvcCon
	nectionInterfaceLocationClass *klass, tp_svc_connection_interface_location_
	get_locations_impl impl);
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_connection_interface_location_return_from_get_locations (DBusGM
	ethodInvocation *context,
	GHashTable *out_Locations);
	static inline void
	tp_svc_connection_interface_location_return_from_get_locations (DBusGMethod
	Invocation *context,
	GHashTable *out_Locations)
	{
	dbus_g_method_return (context,
	out_Locations);
	}
	typedef void (*tp_svc_connection_interface_location_request_location_impl) (TpSvcConnectionInterfaceLocation *self,		typedef void (*tp_svc_connection_interface_location_request_location_impl) (TpSvcConnectionInterfaceLocation *self,
	guint in_Contact,		guint in_Contact,
	DBusGMethodInvocation *context);		DBusGMethodInvocation *context);
	void tp_svc_connection_interface_location_implement_request_location (TpSvc ConnectionInterfaceLocationClass *klass, tp_svc_connection_interface_locati on_request_location_impl impl);		void tp_svc_connection_interface_location_implement_request_location (TpSvc ConnectionInterfaceLocationClass *klass, tp_svc_connection_interface_locati on_request_location_impl impl);
	static inline		static inline
	/* this comment is to stop gtkdoc realising this is static */		/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_connection_interface_location_return_from_request_location (DBu sGMethodInvocation *context,		void tp_svc_connection_interface_location_return_from_request_location (DBu sGMethodInvocation *context,
	GHashTable *out_Location);		GHashTable *out_Location);
	static inline void		static inline void
	tp_svc_connection_interface_location_return_from_request_location (DBusGMet hodInvocation *context,		tp_svc_connection_interface_location_return_from_request_location (DBusGMet hodInvocation *context,
	skipping to change at line 1297		skipping to change at line 916
	GType tp_svc_connection_interface_presence_get_type (void);		GType tp_svc_connection_interface_presence_get_type (void);
	#define TP_TYPE_SVC_CONNECTION_INTERFACE_PRESENCE \		#define TP_TYPE_SVC_CONNECTION_INTERFACE_PRESENCE \
	(tp_svc_connection_interface_presence_get_type ())		(tp_svc_connection_interface_presence_get_type ())
	#define TP_SVC_CONNECTION_INTERFACE_PRESENCE(obj) \		#define TP_SVC_CONNECTION_INTERFACE_PRESENCE(obj) \
	(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_PRESE NCE, TpSvcConnectionInterfacePresence))		(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_PRESE NCE, TpSvcConnectionInterfacePresence))
	#define TP_IS_SVC_CONNECTION_INTERFACE_PRESENCE(obj) \		#define TP_IS_SVC_CONNECTION_INTERFACE_PRESENCE(obj) \
	(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_PRESE NCE))		(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_PRESE NCE))
	#define TP_SVC_CONNECTION_INTERFACE_PRESENCE_GET_CLASS(obj) \		#define TP_SVC_CONNECTION_INTERFACE_PRESENCE_GET_CLASS(obj) \
	(G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_PR ESENCE, TpSvcConnectionInterfacePresenceClass))		(G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_PR ESENCE, TpSvcConnectionInterfacePresenceClass))
	typedef void (*tp_svc_connection_interface_presence_add_status_impl) (TpSvc ConnectionInterfacePresence *self,		typedef void (*tp_svc_connection_interface_presence_set_presence_impl) (TpS vcConnectionInterfacePresence *self,
	const gchar *in_Status,		const gchar *in_Status,
	GHashTable *in_Parameters,		const gchar *in_Status_Message,
	DBusGMethodInvocation *context);
	void tp_svc_connection_interface_presence_implement_add_status (TpSvcConnec
	tionInterfacePresenceClass *klass, tp_svc_connection_interface_presence_add
	_status_impl impl);
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_connection_interface_presence_return_from_add_status (DBusGMeth
	odInvocation *context);
	static inline void
	tp_svc_connection_interface_presence_return_from_add_status (DBusGMethodInv
	ocation *context)
	{
	dbus_g_method_return (context);
	}
	typedef void (*tp_svc_connection_interface_presence_clear_status_impl) (TpS
	vcConnectionInterfacePresence *self,
	DBusGMethodInvocation *context);
	void tp_svc_connection_interface_presence_implement_clear_status (TpSvcConn
	ectionInterfacePresenceClass *klass, tp_svc_connection_interface_presence_c
	lear_status_impl impl);
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_connection_interface_presence_return_from_clear_status (DBusGMe
	thodInvocation *context);
	static inline void
	tp_svc_connection_interface_presence_return_from_clear_status (DBusGMethodI
	nvocation *context)
	{
	dbus_g_method_return (context);
	}
	typedef void (*tp_svc_connection_interface_presence_get_presence_impl) (TpS
	vcConnectionInterfacePresence *self,
	const GArray *in_Contacts,
	DBusGMethodInvocation *context);
	void tp_svc_connection_interface_presence_implement_get_presence (TpSvcConn
	ectionInterfacePresenceClass *klass, tp_svc_connection_interface_presence_g
	et_presence_impl impl);
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_connection_interface_presence_return_from_get_presence (DBusGMe
	thodInvocation *context,
	GHashTable *out_Presence);
	static inline void
	tp_svc_connection_interface_presence_return_from_get_presence (DBusGMethodI
	nvocation *context,
	GHashTable *out_Presence)
	{
	dbus_g_method_return (context,
	out_Presence);
	}
	typedef void (*tp_svc_connection_interface_presence_get_statuses_impl) (TpS
	vcConnectionInterfacePresence *self,
	DBusGMethodInvocation *context);
	void tp_svc_connection_interface_presence_implement_get_statuses (TpSvcConn
	ectionInterfacePresenceClass *klass, tp_svc_connection_interface_presence_g
	et_statuses_impl impl);
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_connection_interface_presence_return_from_get_statuses (DBusGMe
	thodInvocation *context,
	GHashTable *out_Available_Statuses);
	static inline void
	tp_svc_connection_interface_presence_return_from_get_statuses (DBusGMethodI
	nvocation *context,
	GHashTable *out_Available_Statuses)
	{
	dbus_g_method_return (context,
	out_Available_Statuses);
	}
	typedef void (*tp_svc_connection_interface_presence_remove_status_impl) (Tp
	SvcConnectionInterfacePresence *self,
	const gchar *in_Status,
	DBusGMethodInvocation *context);
	void tp_svc_connection_interface_presence_implement_remove_status (TpSvcCon
	nectionInterfacePresenceClass *klass, tp_svc_connection_interface_presence_
	remove_status_impl impl);
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_connection_interface_presence_return_from_remove_status (DBusGM
	ethodInvocation *context);
	static inline void
	tp_svc_connection_interface_presence_return_from_remove_status (DBusGMethod
	Invocation *context)
	{
	dbus_g_method_return (context);
	}
	typedef void (*tp_svc_connection_interface_presence_request_presence_impl)
	(TpSvcConnectionInterfacePresence *self,
	const GArray *in_Contacts,
	DBusGMethodInvocation *context);
	void tp_svc_connection_interface_presence_implement_request_presence (TpSvc
	ConnectionInterfacePresenceClass *klass, tp_svc_connection_interface_presen
	ce_request_presence_impl impl);
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_connection_interface_presence_return_from_request_presence (DBu
	sGMethodInvocation *context);
	static inline void
	tp_svc_connection_interface_presence_return_from_request_presence (DBusGMet
	hodInvocation *context)
	{
	dbus_g_method_return (context);
	}
	typedef void (*tp_svc_connection_interface_presence_set_last_activity_time_
	impl) (TpSvcConnectionInterfacePresence *self,
	guint in_Time,
	DBusGMethodInvocation *context);
	void tp_svc_connection_interface_presence_implement_set_last_activity_time
	(TpSvcConnectionInterfacePresenceClass *klass, tp_svc_connection_interface_
	presence_set_last_activity_time_impl impl);
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_connection_interface_presence_return_from_set_last_activity_tim
	e (DBusGMethodInvocation *context);
	static inline void
	tp_svc_connection_interface_presence_return_from_set_last_activity_time (DB
	usGMethodInvocation *context)
	{
	dbus_g_method_return (context);
	}
	typedef void (*tp_svc_connection_interface_presence_set_status_impl) (TpSvc
	ConnectionInterfacePresence *self,
	GHashTable *in_Statuses,
	DBusGMethodInvocation *context);		DBusGMethodInvocation *context);
	void tp_svc_connection_interface_presence_implement_set_status (TpSvcConnec tionInterfacePresenceClass *klass, tp_svc_connection_interface_presence_set _status_impl impl);		void tp_svc_connection_interface_presence_implement_set_presence (TpSvcConn ectionInterfacePresenceClass *klass, tp_svc_connection_interface_presence_s et_presence_impl impl);
	static inline		static inline
	/* this comment is to stop gtkdoc realising this is static */		/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_connection_interface_presence_return_from_set_status (DBusGMeth odInvocation *context);		void tp_svc_connection_interface_presence_return_from_set_presence (DBusGMe thodInvocation *context);
	static inline void		static inline void
	tp_svc_connection_interface_presence_return_from_set_status (DBusGMethodInv ocation *context)		tp_svc_connection_interface_presence_return_from_set_presence (DBusGMethodI nvocation *context)
	{		{
	dbus_g_method_return (context);		dbus_g_method_return (context);
	}		}
	void tp_svc_connection_interface_presence_emit_presence_update (gpointer in stance,		void tp_svc_connection_interface_presence_emit_presences_changed (gpointer instance,
	GHashTable *arg_Presence);		GHashTable *arg_Presence);
	typedef struct _TpSvcConnectionInterfaceRenaming TpSvcConnectionInterfaceRe
	naming;
	typedef struct _TpSvcConnectionInterfaceRenamingClass TpSvcConnectionInterf
	aceRenamingClass;
	GType tp_svc_connection_interface_renaming_get_type (void);
	#define TP_TYPE_SVC_CONNECTION_INTERFACE_RENAMING \
	(tp_svc_connection_interface_renaming_get_type ())
	#define TP_SVC_CONNECTION_INTERFACE_RENAMING(obj) \
	(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_RENAM
	ING, TpSvcConnectionInterfaceRenaming))
	#define TP_IS_SVC_CONNECTION_INTERFACE_RENAMING(obj) \
	(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_RENAM
	ING))
	#define TP_SVC_CONNECTION_INTERFACE_RENAMING_GET_CLASS(obj) \
	(G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_RE
	NAMING, TpSvcConnectionInterfaceRenamingClass))
	typedef void (*tp_svc_connection_interface_renaming_request_rename_impl) (T
	pSvcConnectionInterfaceRenaming *self,
	const gchar *in_Identifier,
	DBusGMethodInvocation *context);
	void tp_svc_connection_interface_renaming_implement_request_rename (TpSvcCo
	nnectionInterfaceRenamingClass *klass, tp_svc_connection_interface_renaming
	_request_rename_impl impl);
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_connection_interface_renaming_return_from_request_rename (DBusG
	MethodInvocation *context);
	static inline void
	tp_svc_connection_interface_renaming_return_from_request_rename (DBusGMetho
	dInvocation *context)
	{
	dbus_g_method_return (context);
	}
	void tp_svc_connection_interface_renaming_emit_renamed (gpointer instance,
	guint arg_Original,
	guint arg_New);
	typedef struct _TpSvcConnectionInterfaceRequests TpSvcConnectionInterfaceRe quests;		typedef struct _TpSvcConnectionInterfaceRequests TpSvcConnectionInterfaceRe quests;
	typedef struct _TpSvcConnectionInterfaceRequestsClass TpSvcConnectionInterf aceRequestsClass;		typedef struct _TpSvcConnectionInterfaceRequestsClass TpSvcConnectionInterf aceRequestsClass;
	GType tp_svc_connection_interface_requests_get_type (void);		GType tp_svc_connection_interface_requests_get_type (void);
	#define TP_TYPE_SVC_CONNECTION_INTERFACE_REQUESTS \		#define TP_TYPE_SVC_CONNECTION_INTERFACE_REQUESTS \
	(tp_svc_connection_interface_requests_get_type ())		(tp_svc_connection_interface_requests_get_type ())
	#define TP_SVC_CONNECTION_INTERFACE_REQUESTS(obj) \		#define TP_SVC_CONNECTION_INTERFACE_REQUESTS(obj) \
	(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_REQUE STS, TpSvcConnectionInterfaceRequests))		(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_REQUE STS, TpSvcConnectionInterfaceRequests))
	#define TP_IS_SVC_CONNECTION_INTERFACE_REQUESTS(obj) \		#define TP_IS_SVC_CONNECTION_INTERFACE_REQUESTS(obj) \
	skipping to change at line 1517		skipping to change at line 1010
	#define TP_SVC_CONNECTION_INTERFACE_SERVICE_POINT(obj) \		#define TP_SVC_CONNECTION_INTERFACE_SERVICE_POINT(obj) \
	(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_SERVI CE_POINT, TpSvcConnectionInterfaceServicePoint))		(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_SERVI CE_POINT, TpSvcConnectionInterfaceServicePoint))
	#define TP_IS_SVC_CONNECTION_INTERFACE_SERVICE_POINT(obj) \		#define TP_IS_SVC_CONNECTION_INTERFACE_SERVICE_POINT(obj) \
	(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_SERVI CE_POINT))		(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_SERVI CE_POINT))
	#define TP_SVC_CONNECTION_INTERFACE_SERVICE_POINT_GET_CLASS(obj) \		#define TP_SVC_CONNECTION_INTERFACE_SERVICE_POINT_GET_CLASS(obj) \
	(G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_SE RVICE_POINT, TpSvcConnectionInterfaceServicePointClass))		(G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_SE RVICE_POINT, TpSvcConnectionInterfaceServicePointClass))
	void tp_svc_connection_interface_service_point_emit_service_points_changed (gpointer instance,		void tp_svc_connection_interface_service_point_emit_service_points_changed (gpointer instance,
	const GPtrArray *arg_Service_Points);		const GPtrArray *arg_Service_Points);
	typedef struct _TpSvcConnectionInterfaceSidecars1 TpSvcConnectionInterfaceS
	idecars1;
	typedef struct _TpSvcConnectionInterfaceSidecars1Class TpSvcConnectionInter
	faceSidecars1Class;
	GType tp_svc_connection_interface_sidecars1_get_type (void);
	#define TP_TYPE_SVC_CONNECTION_INTERFACE_SIDECARS1 \
	(tp_svc_connection_interface_sidecars1_get_type ())
	#define TP_SVC_CONNECTION_INTERFACE_SIDECARS1(obj) \
	(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_SIDEC
	ARS1, TpSvcConnectionInterfaceSidecars1))
	#define TP_IS_SVC_CONNECTION_INTERFACE_SIDECARS1(obj) \
	(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_SIDEC
	ARS1))
	#define TP_SVC_CONNECTION_INTERFACE_SIDECARS1_GET_CLASS(obj) \
	(G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_SI
	DECARS1, TpSvcConnectionInterfaceSidecars1Class))
	typedef void (*tp_svc_connection_interface_sidecars1_ensure_sidecar_impl) (
	TpSvcConnectionInterfaceSidecars1 *self,
	const gchar *in_Main_Interface,
	DBusGMethodInvocation *context);
	void tp_svc_connection_interface_sidecars1_implement_ensure_sidecar (TpSvcC
	onnectionInterfaceSidecars1Class *klass, tp_svc_connection_interface_sideca
	rs1_ensure_sidecar_impl impl);
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_connection_interface_sidecars1_return_from_ensure_sidecar (DBus
	GMethodInvocation *context,
	const gchar *out_Path,
	GHashTable *out_Properties);
	static inline void
	tp_svc_connection_interface_sidecars1_return_from_ensure_sidecar (DBusGMeth
	odInvocation *context,
	const gchar *out_Path,
	GHashTable *out_Properties)
	{
	dbus_g_method_return (context,
	out_Path,
	out_Properties);
	}
	typedef struct _TpSvcConnectionInterfaceSimplePresence TpSvcConnectionInter
	faceSimplePresence;
	typedef struct _TpSvcConnectionInterfaceSimplePresenceClass TpSvcConnection
	InterfaceSimplePresenceClass;
	GType tp_svc_connection_interface_simple_presence_get_type (void);
	#define TP_TYPE_SVC_CONNECTION_INTERFACE_SIMPLE_PRESENCE \
	(tp_svc_connection_interface_simple_presence_get_type ())
	#define TP_SVC_CONNECTION_INTERFACE_SIMPLE_PRESENCE(obj) \
	(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_SIMPL
	E_PRESENCE, TpSvcConnectionInterfaceSimplePresence))
	#define TP_IS_SVC_CONNECTION_INTERFACE_SIMPLE_PRESENCE(obj) \
	(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_SIMPL
	E_PRESENCE))
	#define TP_SVC_CONNECTION_INTERFACE_SIMPLE_PRESENCE_GET_CLASS(obj) \
	(G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_SI
	MPLE_PRESENCE, TpSvcConnectionInterfaceSimplePresenceClass))
	typedef void (*tp_svc_connection_interface_simple_presence_set_presence_imp
	l) (TpSvcConnectionInterfaceSimplePresence *self,
	const gchar *in_Status,
	const gchar *in_Status_Message,
	DBusGMethodInvocation *context);
	void tp_svc_connection_interface_simple_presence_implement_set_presence (Tp
	SvcConnectionInterfaceSimplePresenceClass *klass, tp_svc_connection_interfa
	ce_simple_presence_set_presence_impl impl);
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_connection_interface_simple_presence_return_from_set_presence (
	DBusGMethodInvocation *context);
	static inline void
	tp_svc_connection_interface_simple_presence_return_from_set_presence (DBusG
	MethodInvocation *context)
	{
	dbus_g_method_return (context);
	}
	typedef void (*tp_svc_connection_interface_simple_presence_get_presences_im
	pl) (TpSvcConnectionInterfaceSimplePresence *self,
	const GArray *in_Contacts,
	DBusGMethodInvocation *context);
	void tp_svc_connection_interface_simple_presence_implement_get_presences (T
	pSvcConnectionInterfaceSimplePresenceClass *klass, tp_svc_connection_interf
	ace_simple_presence_get_presences_impl impl);
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_connection_interface_simple_presence_return_from_get_presences
	(DBusGMethodInvocation *context,
	GHashTable *out_Presence);
	static inline void
	tp_svc_connection_interface_simple_presence_return_from_get_presences (DBus
	GMethodInvocation *context,
	GHashTable *out_Presence)
	{
	dbus_g_method_return (context,
	out_Presence);
	}
	void tp_svc_connection_interface_simple_presence_emit_presences_changed (gp
	ointer instance,
	GHashTable *arg_Presence);
	G_END_DECLS		G_END_DECLS
End of changes. 26 change blocks.
	763 lines changed or deleted		8 lines changed or added

	tp-svc-debug.h		tp-svc-debug.h
	#include <glib-object.h>		#include <glib-object.h>
	#include <dbus/dbus-glib.h>		#include <dbus/dbus-glib.h>
	#include <telepathy-glib/dbus.h>
	#include <telepathy-glib/dbus-properties-mixin.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	typedef struct _TpSvcDebug TpSvcDebug;		typedef struct _TpSvcDebug TpSvcDebug;
	typedef struct _TpSvcDebugClass TpSvcDebugClass;		typedef struct _TpSvcDebugClass TpSvcDebugClass;
	GType tp_svc_debug_get_type (void);		GType tp_svc_debug_get_type (void);
	#define TP_TYPE_SVC_DEBUG \		#define TP_TYPE_SVC_DEBUG \
	(tp_svc_debug_get_type ())		(tp_svc_debug_get_type ())
End of changes. 1 change blocks.
	2 lines changed or deleted		0 lines changed or added

	tp-svc-generic.h		tp-svc-generic.h
	#include <glib-object.h>		#include <glib-object.h>
	#include <dbus/dbus-glib.h>		#include <dbus/dbus-glib.h>
	#include <telepathy-glib/dbus.h>
	#include <telepathy-glib/dbus-properties-mixin.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	typedef struct _TpSvcDBusIntrospectable TpSvcDBusIntrospectable;		typedef struct _TpSvcDBusIntrospectable TpSvcDBusIntrospectable;
	typedef struct _TpSvcDBusIntrospectableClass TpSvcDBusIntrospectableClass;		typedef struct _TpSvcDBusIntrospectableClass TpSvcDBusIntrospectableClass;
	GType tp_svc_dbus_introspectable_get_type (void);		GType tp_svc_dbus_introspectable_get_type (void);
	#define TP_TYPE_SVC_DBUS_INTROSPECTABLE \		#define TP_TYPE_SVC_DBUS_INTROSPECTABLE \
	(tp_svc_dbus_introspectable_get_type ())		(tp_svc_dbus_introspectable_get_type ())
	skipping to change at line 104		skipping to change at line 102
	{		{
	dbus_g_method_return (context,		dbus_g_method_return (context,
	out_Properties);		out_Properties);
	}		}
	void tp_svc_dbus_properties_emit_properties_changed (gpointer instance,		void tp_svc_dbus_properties_emit_properties_changed (gpointer instance,
	const gchar *arg_Interface_Name,		const gchar *arg_Interface_Name,
	GHashTable *arg_Changed_Properties,		GHashTable *arg_Changed_Properties,
	const gchar **arg_Invalidated_Properties);		const gchar **arg_Invalidated_Properties);
	typedef struct _TpSvcPropertiesInterface TpSvcPropertiesInterface;
	typedef struct _TpSvcPropertiesInterfaceClass TpSvcPropertiesInterfaceClass
	;
	GType tp_svc_properties_interface_get_type (void);
	#define TP_TYPE_SVC_PROPERTIES_INTERFACE \
	(tp_svc_properties_interface_get_type ())
	#define TP_SVC_PROPERTIES_INTERFACE(obj) \
	(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_PROPERTIES_INTERFACE, TpSv
	cPropertiesInterface))
	#define TP_IS_SVC_PROPERTIES_INTERFACE(obj) \
	(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_PROPERTIES_INTERFACE))
	#define TP_SVC_PROPERTIES_INTERFACE_GET_CLASS(obj) \
	(G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_PROPERTIES_INTERFACE, T
	pSvcPropertiesInterfaceClass))
	typedef void (*tp_svc_properties_interface_get_properties_impl) (TpSvcPrope
	rtiesInterface *self,
	const GArray *in_Properties,
	DBusGMethodInvocation *context);
	void tp_svc_properties_interface_implement_get_properties (TpSvcPropertiesI
	nterfaceClass *klass, tp_svc_properties_interface_get_properties_impl impl)
	;
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_properties_interface_return_from_get_properties (DBusGMethodInv
	ocation *context,
	const GPtrArray *out_Values);
	static inline void
	tp_svc_properties_interface_return_from_get_properties (DBusGMethodInvocati
	on *context,
	const GPtrArray *out_Values)
	{
	dbus_g_method_return (context,
	out_Values);
	}
	typedef void (*tp_svc_properties_interface_list_properties_impl) (TpSvcProp
	ertiesInterface *self,
	DBusGMethodInvocation *context);
	void tp_svc_properties_interface_implement_list_properties (TpSvcProperties
	InterfaceClass *klass, tp_svc_properties_interface_list_properties_impl imp
	l);
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_properties_interface_return_from_list_properties (DBusGMethodIn
	vocation *context,
	const GPtrArray *out_Available_Properties);
	static inline void
	tp_svc_properties_interface_return_from_list_properties (DBusGMethodInvocat
	ion *context,
	const GPtrArray *out_Available_Properties)
	{
	dbus_g_method_return (context,
	out_Available_Properties);
	}
	typedef void (*tp_svc_properties_interface_set_properties_impl) (TpSvcPrope
	rtiesInterface *self,
	const GPtrArray *in_Properties,
	DBusGMethodInvocation *context);
	void tp_svc_properties_interface_implement_set_properties (TpSvcPropertiesI
	nterfaceClass *klass, tp_svc_properties_interface_set_properties_impl impl)
	;
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_properties_interface_return_from_set_properties (DBusGMethodInv
	ocation *context);
	static inline void
	tp_svc_properties_interface_return_from_set_properties (DBusGMethodInvocati
	on *context)
	{
	dbus_g_method_return (context);
	}
	void tp_svc_properties_interface_emit_properties_changed (gpointer instance
	,
	const GPtrArray *arg_Properties);
	void tp_svc_properties_interface_emit_property_flags_changed (gpointer inst
	ance,
	const GPtrArray *arg_Properties);
	G_END_DECLS		G_END_DECLS
End of changes. 2 change blocks.
	85 lines changed or deleted		0 lines changed or added

	tp-svc-protocol.h		tp-svc-protocol.h
	#include <glib-object.h>		#include <glib-object.h>
	#include <dbus/dbus-glib.h>		#include <dbus/dbus-glib.h>
	#include <telepathy-glib/dbus.h>
	#include <telepathy-glib/dbus-properties-mixin.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	typedef struct _TpSvcProtocol TpSvcProtocol;		typedef struct _TpSvcProtocol TpSvcProtocol;
	typedef struct _TpSvcProtocolClass TpSvcProtocolClass;		typedef struct _TpSvcProtocolClass TpSvcProtocolClass;
	GType tp_svc_protocol_get_type (void);		GType tp_svc_protocol_get_type (void);
	#define TP_TYPE_SVC_PROTOCOL \		#define TP_TYPE_SVC_PROTOCOL \
	(tp_svc_protocol_get_type ())		(tp_svc_protocol_get_type ())
End of changes. 1 change blocks.
	2 lines changed or deleted		0 lines changed or added

	tp-svc-tls-cert.h		tp-svc-tls-cert.h
	#include <glib-object.h>		#include <glib-object.h>
	#include <dbus/dbus-glib.h>		#include <dbus/dbus-glib.h>
	#include <telepathy-glib/dbus.h>
	#include <telepathy-glib/dbus-properties-mixin.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	typedef struct _TpSvcAuthenticationTLSCertificate TpSvcAuthenticationTLSCer tificate;		typedef struct _TpSvcAuthenticationTLSCertificate TpSvcAuthenticationTLSCer tificate;
	typedef struct _TpSvcAuthenticationTLSCertificateClass TpSvcAuthenticationT LSCertificateClass;		typedef struct _TpSvcAuthenticationTLSCertificateClass TpSvcAuthenticationT LSCertificateClass;
	GType tp_svc_authentication_tls_certificate_get_type (void);		GType tp_svc_authentication_tls_certificate_get_type (void);
	#define TP_TYPE_SVC_AUTHENTICATION_TLS_CERTIFICATE \		#define TP_TYPE_SVC_AUTHENTICATION_TLS_CERTIFICATE \
	(tp_svc_authentication_tls_certificate_get_type ())		(tp_svc_authentication_tls_certificate_get_type ())
End of changes. 1 change blocks.
	2 lines changed or deleted		0 lines changed or added

	util.h		util.h
	skipping to change at line 22		skipping to change at line 22
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef __TP_UTIL_H__		#ifndef __TP_UTIL_H__
	#define __TP_UTIL_H__		#define __TP_UTIL_H__
	#define __TP_IN_UTIL_H__		#define __TP_IN_UTIL_H__
	#include <gio/gio.h>		#include <gio/gio.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	#include <telepathy-glib/verify.h>
	#define tp_verify_statement(R) ((void) tp_verify_true (R))
	G_BEGIN_DECLS		G_BEGIN_DECLS
	gboolean tp_g_ptr_array_contains (GPtrArray *haystack, gpointer needle);		gboolean tp_g_ptr_array_contains (GPtrArray *haystack, gpointer needle);
	void tp_g_ptr_array_extend (GPtrArray *target, GPtrArray *source);		void tp_g_ptr_array_extend (GPtrArray *target, GPtrArray *source);
	#ifndef __GI_SCANNER__		#ifndef __GI_SCANNER__
	/* Functions with _new in their names confuse the g-i scanner, but these		/* Functions with _new in their names confuse the g-i scanner, but these
	* are all (skip)'d anyway. */		* are all (skip)'d anyway. */
	skipping to change at line 98		skipping to change at line 95
	gpointer tp_mixin_offset_cast (gpointer instance, guint offset);		gpointer tp_mixin_offset_cast (gpointer instance, guint offset);
	guint tp_mixin_instance_get_offset (gpointer instance, GQuark quark);		guint tp_mixin_instance_get_offset (gpointer instance, GQuark quark);
	guint tp_mixin_class_get_offset (gpointer klass, GQuark quark);		guint tp_mixin_class_get_offset (gpointer klass, GQuark quark);
	gchar *tp_escape_as_identifier (const gchar *name) G_GNUC_WARN_UNUSED_RESUL T;		gchar *tp_escape_as_identifier (const gchar *name) G_GNUC_WARN_UNUSED_RESUL T;
	/* See https://bugzilla.gnome.org/show_bug.cgi?id=685880 for glib inclusion */		/* See https://bugzilla.gnome.org/show_bug.cgi?id=685880 for glib inclusion */
	gboolean tp_strv_contains (const gchar * const *strv, const gchar *str);		gboolean tp_strv_contains (const gchar * const *strv, const gchar *str);
	#ifndef TP_DISABLE_DEPRECATED
	_TP_DEPRECATED_IN_0_22_FOR(g_key_file_get_int64)
	gint64 tp_g_key_file_get_int64 (GKeyFile *key_file, const gchar *group_name
	,
	const gchar *key, GError **error);
	_TP_DEPRECATED_IN_0_22_FOR(g_key_file_get_uint64)
	guint64 tp_g_key_file_get_uint64 (GKeyFile *key_file, const gchar *group_na
	me,
	const gchar *key, GError **error);
	#endif
	/* g_signal_connect_object() has been fixed in GLib 2.36, we can deprecate this		/* g_signal_connect_object() has been fixed in GLib 2.36, we can deprecate this
	* once we depend on that version. */		* once we depend on that version. */
	gulong tp_g_signal_connect_object (gpointer instance,		gulong tp_g_signal_connect_object (gpointer instance,
	const gchar *detailed_signal, GCallback c_handler, gpointer gobject,		const gchar *detailed_signal, GCallback c_handler, gpointer gobject,
	GConnectFlags connect_flags);		GConnectFlags connect_flags);
	GValueArray *tp_value_array_build (gsize length,		GValueArray *tp_value_array_build (gsize length,
	GType type,		GType type,
	...) G_GNUC_WARN_UNUSED_RESULT;		...) G_GNUC_WARN_UNUSED_RESULT;
	void tp_value_array_unpack (GValueArray *array,		void tp_value_array_unpack (GValueArray *array,
	gsize len,		gsize len,
	...);		...);
	/* Work around GLib having deprecated something that is part of our API. */
	_TP_AVAILABLE_IN_0_24
	void tp_value_array_free (GValueArray *va);
	#if TP_VERSION_MAX_ALLOWED >= TP_VERSION_0_24
	#define tp_value_array_free(va) _tp_value_array_free_inline (va)
	#ifndef __GTK_DOC_IGNORE__ /* gtk-doc can't parse this */
	static inline void
	_tp_value_array_free_inline (GValueArray *va)
	{
	G_GNUC_BEGIN_IGNORE_DEPRECATIONS
	g_value_array_free (va);
	G_GNUC_END_IGNORE_DEPRECATIONS
	}
	#endif
	#endif
	/* See https://bugzilla.gnome.org/show_bug.cgi?id=680813 for glib inclusion */		/* See https://bugzilla.gnome.org/show_bug.cgi?id=680813 for glib inclusion */
	typedef struct _TpWeakRef TpWeakRef;		typedef struct _TpWeakRef TpWeakRef;
	TpWeakRef *tp_weak_ref_new (gpointer object,		TpWeakRef *tp_weak_ref_new (gpointer object,
	gpointer user_data,		gpointer user_data,
	GDestroyNotify destroy) G_GNUC_WARN_UNUSED_RESULT;		GDestroyNotify destroy) G_GNUC_WARN_UNUSED_RESULT;
	gpointer tp_weak_ref_get_user_data (TpWeakRef *self) G_GNUC_WARN_UNUSED_RES ULT;		gpointer tp_weak_ref_get_user_data (TpWeakRef *self) G_GNUC_WARN_UNUSED_RES ULT;
	gpointer tp_weak_ref_dup_object (TpWeakRef *self) G_GNUC_WARN_UNUSED_RESULT ;		gpointer tp_weak_ref_dup_object (TpWeakRef *self) G_GNUC_WARN_UNUSED_RESULT ;
	void tp_weak_ref_destroy (TpWeakRef *self);		void tp_weak_ref_destroy (TpWeakRef *self);
	#define tp_clear_pointer(pp, destroy) \		#define tp_clear_pointer(pp, destroy) \
End of changes. 4 change blocks.
	34 lines changed or deleted		2 lines changed or added

	variant-util.h		variant-util.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&		#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
	!defined (_TP_COMPILATION)		#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
	y-glib-dbus.h> can be included directly."
	#endif		#endif
	#ifndef __TP_VARIANT_UTIL_H__		#ifndef __TP_VARIANT_UTIL_H__
	#define __TP_VARIANT_UTIL_H__		#define __TP_VARIANT_UTIL_H__
	#include <glib.h>		#include <glib.h>
	#include <gio/gio.h>		#include <gio/gio.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
End of changes. 1 change blocks.
	4 lines changed or deleted		2 lines changed or added

	version.h		version.h
	/* telepathy-glib/version.h. Generated from version.h.in by configure. */		/* telepathy-glib/version.h. Generated from version.h.in by configure. */
	#define TP_MAJOR_VERSION 0		#define TP_MAJOR_VERSION 0
	#define TP_MINOR_VERSION 24		#define TP_MINOR_VERSION 99
	#define TP_MICRO_VERSION 1		#define TP_MICRO_VERSION 1
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/