libtelepathy-glib: headers diff between 0.18.2 and 0.19.0 versions

	account-channel-request.h	account-channel-request.h

	skipping to change at line 75	skipping to change at line 75

	TpAccount * tp_account_channel_request_get_account (	TpAccount * tp_account_channel_request_get_account (
	TpAccountChannelRequest *self);	TpAccountChannelRequest *self);

	GHashTable * tp_account_channel_request_get_request (	GHashTable * tp_account_channel_request_get_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 (	void tp_account_channel_request_set_channel_factory (
	TpAccountChannelRequest *self,	TpAccountChannelRequest *self,

	TpClientChannelFactory *factory) _TP_GNUC_DEPRECATED;	TpClientChannelFactory *factory);
		#endif

	TpChannelRequest * tp_account_channel_request_get_channel_request (	TpChannelRequest * tp_account_channel_request_get_channel_request (
	TpAccountChannelRequest *self);	TpAccountChannelRequest *self);

	void tp_account_channel_request_set_hints (TpAccountChannelRequest *self,	void tp_account_channel_request_set_hints (TpAccountChannelRequest *self,
	GHashTable *hints);	GHashTable *hints);


		_TP_AVAILABLE_IN_0_16
	void tp_account_channel_request_set_delegate_to_preferred_handler (	void tp_account_channel_request_set_delegate_to_preferred_handler (
	TpAccountChannelRequest *self,	TpAccountChannelRequest *self,
	gboolean delegate);	gboolean delegate);


		/* Text */

		_TP_AVAILABLE_IN_0_20
		TpAccountChannelRequest *tp_account_channel_request_new_text (
		TpAccount *account,
		gint64 user_action_time) G_GNUC_WARN_UNUSED_RESULT;

		/* Calls */

		_TP_AVAILABLE_IN_0_20
		TpAccountChannelRequest *tp_account_channel_request_new_audio_call (
		TpAccount *account,
		gint64 user_action_time) G_GNUC_WARN_UNUSED_RESULT;
		_TP_AVAILABLE_IN_0_20
		TpAccountChannelRequest *tp_account_channel_request_new_audio_video_call (
		TpAccount *account,
		gint64 user_action_time) G_GNUC_WARN_UNUSED_RESULT;

		/* File transfer */

		_TP_AVAILABLE_IN_0_20
		TpAccountChannelRequest *tp_account_channel_request_new_file_transfer (
		TpAccount *account,
		const gchar *filename,
		const gchar *mime_type,
		guint64 size,
		gint64 user_action_time) G_GNUC_WARN_UNUSED_RESULT;

		_TP_AVAILABLE_IN_0_20
		void tp_account_channel_request_set_file_transfer_description (
		TpAccountChannelRequest *self,
		const gchar *description);
		_TP_AVAILABLE_IN_0_20
		void tp_account_channel_request_set_file_transfer_uri (
		TpAccountChannelRequest *self,
		const gchar *uri);
		_TP_AVAILABLE_IN_0_20
		void tp_account_channel_request_set_file_transfer_timestamp (
		TpAccountChannelRequest *self,
		guint64 timestamp);
		_TP_AVAILABLE_IN_0_20
		void tp_account_channel_request_set_file_transfer_initial_offset (
		TpAccountChannelRequest *self,
		guint64 offset);

		/* Channel target (shared between all channel types) */

		_TP_AVAILABLE_IN_0_20
		void tp_account_channel_request_set_target_contact (
		TpAccountChannelRequest *self,
		TpContact *contact);
		_TP_AVAILABLE_IN_0_20
		void tp_account_channel_request_set_target_id (TpAccountChannelRequest *sel
		f,
		TpHandleType handle_type,
		const gchar *identifier);

		/* Generic low-level */

		_TP_AVAILABLE_IN_0_20
		void tp_account_channel_request_set_request_property (
		TpAccountChannelRequest *self,
		const gchar *name,
		GVariant *value);

	/* Request and handle API */	/* Request and handle API */

	void tp_account_channel_request_create_and_handle_channel_async (	void tp_account_channel_request_create_and_handle_channel_async (
	TpAccountChannelRequest *self,	TpAccountChannelRequest *self,
	GCancellable *cancellable,	GCancellable *cancellable,
	GAsyncReadyCallback callback,	GAsyncReadyCallback callback,
	gpointer user_data);	gpointer user_data);

	TpChannel * tp_account_channel_request_create_and_handle_channel_finish (	TpChannel * tp_account_channel_request_create_and_handle_channel_finish (
	TpAccountChannelRequest *self,	TpAccountChannelRequest *self,

	skipping to change at line 120	skipping to change at line 188
	TpAccountChannelRequest *self,	TpAccountChannelRequest *self,
	GAsyncResult *result,	GAsyncResult *result,
	TpHandleChannelsContext **context,	TpHandleChannelsContext **context,
	GError **error) G_GNUC_WARN_UNUSED_RESULT;	GError **error) G_GNUC_WARN_UNUSED_RESULT;

	typedef void (*TpAccountChannelRequestDelegatedChannelCb) (	typedef void (*TpAccountChannelRequestDelegatedChannelCb) (
	TpAccountChannelRequest *request,	TpAccountChannelRequest *request,
	TpChannel *channel,	TpChannel *channel,
	gpointer user_data);	gpointer user_data);


		_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 */	/* Request and forget API */

	void tp_account_channel_request_create_channel_async (	void tp_account_channel_request_create_channel_async (
	TpAccountChannelRequest *self,	TpAccountChannelRequest *self,

End of changes. 5 change blocks.
	1 lines changed or deleted	71 lines changed or added

	account-manager.h	account-manager.h

	skipping to change at line 79	skipping to change at line 79
	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;	TpSimpleClientFactory *factory) G_GNUC_WARN_UNUSED_RESULT;


		_TP_AVAILABLE_IN_0_16
	void tp_account_manager_set_default (TpAccountManager *manager);	void tp_account_manager_set_default (TpAccountManager *manager);
	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,	TpAccount tp_account_manager_ensure_account (TpAccountManager manager,

	const gchar *path)	const gchar *path);
	_TP_GNUC_DEPRECATED_FOR (tp_simple_client_factory_ensure_account);	#endif

	GList tp_account_manager_get_valid_accounts (TpAccountManager manager)	GList tp_account_manager_get_valid_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);


	skipping to change at line 109	skipping to change at line 112
	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;

	gboolean tp_account_manager_is_prepared (TpAccountManager *manager,	gboolean tp_account_manager_is_prepared (TpAccountManager *manager,
	GQuark feature);	GQuark feature);


		#ifndef TP_DISABLE_DEPRECATED
		_TP_DEPRECATED_IN_0_16_FOR (tp_proxy_prepare_async)
	void tp_account_manager_prepare_async (TpAccountManager *manager,	void tp_account_manager_prepare_async (TpAccountManager *manager,
	const GQuark *features,	const GQuark *features,
	GAsyncReadyCallback callback,	GAsyncReadyCallback callback,

	gpointer user_data) _TP_GNUC_DEPRECATED_FOR (tp_proxy_prepare_async);	gpointer user_data);


		_TP_DEPRECATED_IN_0_16_FOR (tp_proxy_prepare_finish)
	gboolean tp_account_manager_prepare_finish (TpAccountManager *manager,	gboolean tp_account_manager_prepare_finish (TpAccountManager *manager,
	GAsyncResult *result,	GAsyncResult *result,

	GError **error) _TP_GNUC_DEPRECATED_FOR (tp_proxy_prepare_finish);	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>	#include <telepathy-glib/_gen/tp-cli-account-manager.h>

	#endif	#endif

End of changes. 7 change blocks.
	4 lines changed or deleted	11 lines changed or added

	automatic-proxy-factory.h	automatic-proxy-factory.h

	skipping to change at line 61	skipping to change at line 61
	(G_TYPE_CHECK_CLASS_CAST ((klass), TP_TYPE_AUTOMATIC_PROXY_FACTORY, \	(G_TYPE_CHECK_CLASS_CAST ((klass), TP_TYPE_AUTOMATIC_PROXY_FACTORY, \
	TpAutomaticProxyFactoryClass))	TpAutomaticProxyFactoryClass))
	#define TP_IS_AUTOMATIC_PROXY_FACTORY(obj) \	#define TP_IS_AUTOMATIC_PROXY_FACTORY(obj) \
	(G_TYPE_CHECK_INSTANCE_TYPE ((obj), TP_TYPE_AUTOMATIC_PROXY_FACTORY))	(G_TYPE_CHECK_INSTANCE_TYPE ((obj), TP_TYPE_AUTOMATIC_PROXY_FACTORY))
	#define TP_IS_AUTOMATIC_PROXY_FACTORY_CLASS(klass) \	#define TP_IS_AUTOMATIC_PROXY_FACTORY_CLASS(klass) \
	(G_TYPE_CHECK_CLASS_TYPE ((klass), TP_TYPE_AUTOMATIC_PROXY_FACTORY))	(G_TYPE_CHECK_CLASS_TYPE ((klass), TP_TYPE_AUTOMATIC_PROXY_FACTORY))
	#define TP_AUTOMATIC_PROXY_FACTORY_GET_CLASS(obj) \	#define TP_AUTOMATIC_PROXY_FACTORY_GET_CLASS(obj) \
	(G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_AUTOMATIC_PROXY_FACTORY, \	(G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_AUTOMATIC_PROXY_FACTORY, \
	TpAutomaticProxyFactoryClass))	TpAutomaticProxyFactoryClass))


	TpAutomaticProxyFactory * tp_automatic_proxy_factory_new (void)	#ifndef TP_DISABLE_DEPRECATED
	_TP_GNUC_DEPRECATED_FOR (tp_automatic_client_factory_new);	_TP_DEPRECATED_IN_0_16_FOR (tp_automatic_client_factory_new)
	TpAutomaticProxyFactory * tp_automatic_proxy_factory_dup (void)	TpAutomaticProxyFactory * tp_automatic_proxy_factory_new (void);
	_TP_GNUC_DEPRECATED_FOR (tp_automatic_client_factory_new);
		_TP_DEPRECATED_IN_0_16_FOR (tp_automatic_client_factory_new)
		TpAutomaticProxyFactory * tp_automatic_proxy_factory_dup (void);
		#endif

	G_END_DECLS	G_END_DECLS

	#endif	#endif

End of changes. 1 change blocks.
	4 lines changed or deleted	7 lines changed or added

	base-call-channel.h	base-call-channel.h

	skipping to change at line 27	skipping to change at line 27
	* 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_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>

	G_BEGIN_DECLS	G_BEGIN_DECLS

	typedef struct _TpBaseCallChannel TpBaseCallChannel;	typedef struct _TpBaseCallChannel TpBaseCallChannel;
	typedef struct _TpBaseCallChannelPrivate TpBaseCallChannelPrivate;	typedef struct _TpBaseCallChannelPrivate TpBaseCallChannelPrivate;
	typedef struct _TpBaseCallChannelClass TpBaseCallChannelClass;	typedef struct _TpBaseCallChannelClass TpBaseCallChannelClass;

	typedef void (TpBaseCallChannelVoidFunc) (TpBaseCallChannel self);	typedef void (TpBaseCallChannelVoidFunc) (TpBaseCallChannel self);
	typedef TpBaseCallContent * (*TpBaseCallChannelAddContentFunc) (	typedef TpBaseCallContent * (*TpBaseCallChannelAddContentFunc) (
	TpBaseCallChannel *self,	TpBaseCallChannel *self,

	skipping to change at line 72	skipping to change at line 73
	gpointer future[4];	gpointer future[4];
	};	};

	struct _TpBaseCallChannel {	struct _TpBaseCallChannel {
	/<private>/	/<private>/
	TpBaseChannel parent;	TpBaseChannel parent;

	TpBaseCallChannelPrivate *priv;	TpBaseCallChannelPrivate *priv;
	};	};


		_TP_AVAILABLE_IN_0_18
	GType tp_base_call_channel_get_type (void);	GType tp_base_call_channel_get_type (void);

	/* TYPE MACROS */	/* TYPE MACROS */
	#define TP_TYPE_BASE_CALL_CHANNEL \	#define TP_TYPE_BASE_CALL_CHANNEL \
	(tp_base_call_channel_get_type ())	(tp_base_call_channel_get_type ())
	#define TP_BASE_CALL_CHANNEL(obj) \	#define TP_BASE_CALL_CHANNEL(obj) \
	(G_TYPE_CHECK_INSTANCE_CAST ((obj), \	(G_TYPE_CHECK_INSTANCE_CAST ((obj), \
	TP_TYPE_BASE_CALL_CHANNEL, TpBaseCallChannel))	TP_TYPE_BASE_CALL_CHANNEL, TpBaseCallChannel))
	#define TP_BASE_CALL_CHANNEL_CLASS(klass) \	#define TP_BASE_CALL_CHANNEL_CLASS(klass) \
	(G_TYPE_CHECK_CLASS_CAST((klass), \	(G_TYPE_CHECK_CLASS_CAST((klass), \
	TP_TYPE_BASE_CALL_CHANNEL, TpBaseCallChannelClass))	TP_TYPE_BASE_CALL_CHANNEL, TpBaseCallChannelClass))
	#define TP_IS_BASE_CALL_CHANNEL(obj) \	#define TP_IS_BASE_CALL_CHANNEL(obj) \
	(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_BASE_CALL_CHANNEL))	(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_BASE_CALL_CHANNEL))
	#define TP_IS_BASE_CALL_CHANNEL_CLASS(klass) \	#define TP_IS_BASE_CALL_CHANNEL_CLASS(klass) \
	(G_TYPE_CHECK_CLASS_TYPE((klass), TP_TYPE_BASE_CALL_CHANNEL))	(G_TYPE_CHECK_CLASS_TYPE((klass), TP_TYPE_BASE_CALL_CHANNEL))
	#define TP_BASE_CALL_CHANNEL_GET_CLASS(obj) \	#define TP_BASE_CALL_CHANNEL_GET_CLASS(obj) \
	(G_TYPE_INSTANCE_GET_CLASS ((obj), \	(G_TYPE_INSTANCE_GET_CLASS ((obj), \
	TP_TYPE_BASE_CALL_CHANNEL, TpBaseCallChannelClass))	TP_TYPE_BASE_CALL_CHANNEL, TpBaseCallChannelClass))


		_TP_AVAILABLE_IN_0_18
	TpCallState tp_base_call_channel_get_state (TpBaseCallChannel *self);	TpCallState tp_base_call_channel_get_state (TpBaseCallChannel *self);

		_TP_AVAILABLE_IN_0_18
	void tp_base_call_channel_set_state (TpBaseCallChannel *self,	void tp_base_call_channel_set_state (TpBaseCallChannel *self,
	TpCallState state,	TpCallState state,
	guint actor_handle,	guint actor_handle,
	TpCallStateChangeReason reason,	TpCallStateChangeReason reason,
	const gchar *dbus_reason,	const gchar *dbus_reason,
	const gchar *message);	const gchar *message);


		_TP_AVAILABLE_IN_0_18
	gboolean tp_base_call_channel_has_initial_audio (TpBaseCallChannel *self,	gboolean tp_base_call_channel_has_initial_audio (TpBaseCallChannel *self,
	const gchar **initial_audio_name);	const gchar **initial_audio_name);

		_TP_AVAILABLE_IN_0_18
	gboolean tp_base_call_channel_has_initial_video (TpBaseCallChannel *self,	gboolean tp_base_call_channel_has_initial_video (TpBaseCallChannel *self,
	const gchar **initial_video_name);	const gchar **initial_video_name);


		_TP_AVAILABLE_IN_0_18
	gboolean tp_base_call_channel_has_mutable_contents (TpBaseCallChannel *self );	gboolean tp_base_call_channel_has_mutable_contents (TpBaseCallChannel *self );

		_TP_AVAILABLE_IN_0_18
	GList * tp_base_call_channel_get_contents (TpBaseCallChannel *self);	GList * tp_base_call_channel_get_contents (TpBaseCallChannel *self);

		_TP_AVAILABLE_IN_0_18
	void tp_base_call_channel_add_content (TpBaseCallChannel *self,	void tp_base_call_channel_add_content (TpBaseCallChannel *self,
	TpBaseCallContent *content);	TpBaseCallContent *content);

		_TP_AVAILABLE_IN_0_18
	void tp_base_call_channel_remove_content (TpBaseCallChannel *self,	void tp_base_call_channel_remove_content (TpBaseCallChannel *self,
	TpBaseCallContent *content,	TpBaseCallContent *content,
	TpHandle actor_handle,	TpHandle actor_handle,
	TpCallStateChangeReason reason,	TpCallStateChangeReason reason,
	const gchar *dbus_reason,	const gchar *dbus_reason,
	const gchar *message);	const gchar *message);


		_TP_AVAILABLE_IN_0_18
	void tp_base_call_channel_update_member_flags (TpBaseCallChannel *self,	void tp_base_call_channel_update_member_flags (TpBaseCallChannel *self,
	TpHandle contact,	TpHandle contact,
	TpCallMemberFlags new_flags,	TpCallMemberFlags new_flags,
	TpHandle actor_handle,	TpHandle actor_handle,
	TpCallStateChangeReason reason,	TpCallStateChangeReason reason,
	const gchar *dbus_reason,	const gchar *dbus_reason,
	const gchar *message);	const gchar *message);

		_TP_AVAILABLE_IN_0_18
	void tp_base_call_channel_remove_member (TpBaseCallChannel *self,	void tp_base_call_channel_remove_member (TpBaseCallChannel *self,
	TpHandle contact,	TpHandle contact,
	TpHandle actor_handle,	TpHandle actor_handle,
	TpCallStateChangeReason reason,	TpCallStateChangeReason reason,
	const gchar *dbus_reason,	const gchar *dbus_reason,
	const gchar *message);	const gchar *message);

		_TP_AVAILABLE_IN_0_18
	GHashTable tp_base_call_channel_get_call_members (TpBaseCallChannel self) ;	GHashTable tp_base_call_channel_get_call_members (TpBaseCallChannel self) ;


		_TP_AVAILABLE_IN_0_18
	void tp_base_call_channel_remote_accept (TpBaseCallChannel *self);	void tp_base_call_channel_remote_accept (TpBaseCallChannel *self);


		_TP_AVAILABLE_IN_0_18
	gboolean tp_base_call_channel_is_accepted (TpBaseCallChannel *self);	gboolean tp_base_call_channel_is_accepted (TpBaseCallChannel *self);

	G_END_DECLS	G_END_DECLS

	#endif /* #ifndef __TP_BASE_CALL_CHANNEL_H__*/	#endif /* #ifndef __TP_BASE_CALL_CHANNEL_H__*/

End of changes. 15 change blocks.
	0 lines changed or deleted	15 lines changed or added

	base-call-content.h	base-call-content.h

	skipping to change at line 31	skipping to change at line 31
	*/	*/

	#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>

		#include <telepathy-glib/defs.h>

	G_BEGIN_DECLS	G_BEGIN_DECLS

	typedef struct _TpBaseCallContent TpBaseCallContent;	typedef struct _TpBaseCallContent TpBaseCallContent;
	typedef struct _TpBaseCallContentPrivate TpBaseCallContentPrivate;	typedef struct _TpBaseCallContentPrivate TpBaseCallContentPrivate;
	typedef struct _TpBaseCallContentClass TpBaseCallContentClass;	typedef struct _TpBaseCallContentClass TpBaseCallContentClass;

	typedef GPtrArray * (*TpBaseCallContentGetInterfacesFunc) (	typedef GPtrArray * (*TpBaseCallContentGetInterfacesFunc) (
	TpBaseCallContent *self);	TpBaseCallContent *self);
	typedef void (TpBaseCallContentDeinitFunc) (TpBaseCallContent self);	typedef void (TpBaseCallContentDeinitFunc) (TpBaseCallContent self);

	skipping to change at line 75	skipping to change at line 76
	gpointer future[4];	gpointer future[4];
	};	};

	struct _TpBaseCallContent {	struct _TpBaseCallContent {
	/<private>/	/<private>/
	GObject parent;	GObject parent;

	TpBaseCallContentPrivate *priv;	TpBaseCallContentPrivate *priv;
	};	};


		_TP_AVAILABLE_IN_0_18
	GType tp_base_call_content_get_type (void);	GType tp_base_call_content_get_type (void);

	/* TYPE MACROS */	/* TYPE MACROS */
	#define TP_TYPE_BASE_CALL_CONTENT \	#define TP_TYPE_BASE_CALL_CONTENT \
	(tp_base_call_content_get_type ())	(tp_base_call_content_get_type ())
	#define TP_BASE_CALL_CONTENT(obj) \	#define TP_BASE_CALL_CONTENT(obj) \
	(G_TYPE_CHECK_INSTANCE_CAST((obj), \	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
	TP_TYPE_BASE_CALL_CONTENT, TpBaseCallContent))	TP_TYPE_BASE_CALL_CONTENT, TpBaseCallContent))
	#define TP_BASE_CALL_CONTENT_CLASS(klass) \	#define TP_BASE_CALL_CONTENT_CLASS(klass) \
	(G_TYPE_CHECK_CLASS_CAST((klass), \	(G_TYPE_CHECK_CLASS_CAST((klass), \
	TP_TYPE_BASE_CALL_CONTENT, TpBaseCallContentClass))	TP_TYPE_BASE_CALL_CONTENT, TpBaseCallContentClass))
	#define TP_IS_BASE_CALL_CONTENT(obj) \	#define TP_IS_BASE_CALL_CONTENT(obj) \
	(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_BASE_CALL_CONTENT))	(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_BASE_CALL_CONTENT))
	#define TP_IS_BASE_CALL_CONTENT_CLASS(klass) \	#define TP_IS_BASE_CALL_CONTENT_CLASS(klass) \
	(G_TYPE_CHECK_CLASS_TYPE((klass), TP_TYPE_BASE_CALL_CONTENT))	(G_TYPE_CHECK_CLASS_TYPE((klass), TP_TYPE_BASE_CALL_CONTENT))
	#define TP_BASE_CALL_CONTENT_GET_CLASS(obj) \	#define TP_BASE_CALL_CONTENT_GET_CLASS(obj) \
	(G_TYPE_INSTANCE_GET_CLASS ((obj), \	(G_TYPE_INSTANCE_GET_CLASS ((obj), \
	TP_TYPE_BASE_CALL_CONTENT, TpBaseCallContentClass))	TP_TYPE_BASE_CALL_CONTENT, TpBaseCallContentClass))


		_TP_AVAILABLE_IN_0_18
	TpBaseConnection tp_base_call_content_get_connection (TpBaseCallContent s elf);	TpBaseConnection tp_base_call_content_get_connection (TpBaseCallContent s elf);

		_TP_AVAILABLE_IN_0_18
	const gchar tp_base_call_content_get_object_path (TpBaseCallContent self) ;	const gchar tp_base_call_content_get_object_path (TpBaseCallContent self) ;


		_TP_AVAILABLE_IN_0_18
	const gchar tp_base_call_content_get_name (TpBaseCallContent self);	const gchar tp_base_call_content_get_name (TpBaseCallContent self);

		_TP_AVAILABLE_IN_0_18
	TpMediaStreamType tp_base_call_content_get_media_type (TpBaseCallContent *s elf);	TpMediaStreamType tp_base_call_content_get_media_type (TpBaseCallContent *s elf);

		_TP_AVAILABLE_IN_0_18
	TpCallContentDisposition tp_base_call_content_get_disposition (	TpCallContentDisposition tp_base_call_content_get_disposition (
	TpBaseCallContent *self);	TpBaseCallContent *self);


		_TP_AVAILABLE_IN_0_18
	GList tp_base_call_content_get_streams (TpBaseCallContent self);	GList tp_base_call_content_get_streams (TpBaseCallContent self);

		_TP_AVAILABLE_IN_0_18
	void tp_base_call_content_add_stream (TpBaseCallContent *self,	void tp_base_call_content_add_stream (TpBaseCallContent *self,
	TpBaseCallStream *stream);	TpBaseCallStream *stream);

		_TP_AVAILABLE_IN_0_18
	void tp_base_call_content_remove_stream (TpBaseCallContent *self,	void tp_base_call_content_remove_stream (TpBaseCallContent *self,
	TpBaseCallStream *stream,	TpBaseCallStream *stream,
	TpHandle actor_handle,	TpHandle actor_handle,
	TpCallStateChangeReason reason,	TpCallStateChangeReason reason,
	const gchar *dbus_reason,	const gchar *dbus_reason,
	const gchar *message);	const gchar *message);

	G_END_DECLS	G_END_DECLS

	#endif /* #ifndef __TP_BASE_CALL_CONTENT_H__*/	#endif /* #ifndef __TP_BASE_CALL_CONTENT_H__*/

End of changes. 10 change blocks.
	0 lines changed or deleted	10 lines changed or added

	base-call-stream.h	base-call-stream.h

	skipping to change at line 30	skipping to change at line 30
	* 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_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>

	G_BEGIN_DECLS	G_BEGIN_DECLS

	typedef struct _TpBaseCallStream TpBaseCallStream;	typedef struct _TpBaseCallStream TpBaseCallStream;
	typedef struct _TpBaseCallStreamPrivate TpBaseCallStreamPrivate;	typedef struct _TpBaseCallStreamPrivate TpBaseCallStreamPrivate;
	typedef struct _TpBaseCallStreamClass TpBaseCallStreamClass;	typedef struct _TpBaseCallStreamClass TpBaseCallStreamClass;

	typedef GPtrArray * (*TpBaseCallStreamGetInterfacesFunc) (	typedef GPtrArray * (*TpBaseCallStreamGetInterfacesFunc) (
	TpBaseCallStream *self);	TpBaseCallStream *self);
	typedef gboolean (TpBaseCallStreamSetSendingFunc) (TpBaseCallStream self,	typedef gboolean (TpBaseCallStreamSetSendingFunc) (TpBaseCallStream self,

	skipping to change at line 69	skipping to change at line 70
	gpointer future[4];	gpointer future[4];
	};	};

	struct _TpBaseCallStream {	struct _TpBaseCallStream {
	/<private>/	/<private>/
	GObject parent;	GObject parent;

	TpBaseCallStreamPrivate *priv;	TpBaseCallStreamPrivate *priv;
	};	};


		_TP_AVAILABLE_IN_0_18
	GType tp_base_call_stream_get_type (void);	GType tp_base_call_stream_get_type (void);

	/* TYPE MACROS */	/* TYPE MACROS */
	#define TP_TYPE_BASE_CALL_STREAM \	#define TP_TYPE_BASE_CALL_STREAM \
	(tp_base_call_stream_get_type ())	(tp_base_call_stream_get_type ())
	#define TP_BASE_CALL_STREAM(obj) \	#define TP_BASE_CALL_STREAM(obj) \
	(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_BASE_CALL_STREAM, TpBaseCallSt ream))	(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_BASE_CALL_STREAM, TpBaseCallSt ream))
	#define TP_BASE_CALL_STREAM_CLASS(klass) \	#define TP_BASE_CALL_STREAM_CLASS(klass) \
	(G_TYPE_CHECK_CLASS_CAST((klass), TP_TYPE_BASE_CALL_STREAM, \	(G_TYPE_CHECK_CLASS_CAST((klass), TP_TYPE_BASE_CALL_STREAM, \
	TpBaseCallStreamClass))	TpBaseCallStreamClass))
	#define TP_IS_BASE_CALL_STREAM(obj) \	#define TP_IS_BASE_CALL_STREAM(obj) \
	(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_BASE_CALL_STREAM))	(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_BASE_CALL_STREAM))
	#define TP_IS_BASE_CALL_STREAM_CLASS(klass) \	#define TP_IS_BASE_CALL_STREAM_CLASS(klass) \
	(G_TYPE_CHECK_CLASS_TYPE((klass), TP_TYPE_BASE_CALL_STREAM))	(G_TYPE_CHECK_CLASS_TYPE((klass), TP_TYPE_BASE_CALL_STREAM))
	#define TP_BASE_CALL_STREAM_GET_CLASS(obj) \	#define TP_BASE_CALL_STREAM_GET_CLASS(obj) \
	(G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_BASE_CALL_STREAM, \	(G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_BASE_CALL_STREAM, \
	TpBaseCallStreamClass))	TpBaseCallStreamClass))


		_TP_AVAILABLE_IN_0_18
	TpBaseConnection *tp_base_call_stream_get_connection (	TpBaseConnection *tp_base_call_stream_get_connection (
	TpBaseCallStream *self);	TpBaseCallStream *self);

		_TP_AVAILABLE_IN_0_18
	const gchar *tp_base_call_stream_get_object_path (	const gchar *tp_base_call_stream_get_object_path (
	TpBaseCallStream *self);	TpBaseCallStream *self);


		_TP_AVAILABLE_IN_0_18
	TpSendingState tp_base_call_stream_get_local_sending_state (	TpSendingState tp_base_call_stream_get_local_sending_state (
	TpBaseCallStream *self);	TpBaseCallStream *self);

		_TP_AVAILABLE_IN_0_18
	gboolean tp_base_call_stream_update_local_sending_state (	gboolean tp_base_call_stream_update_local_sending_state (
	TpBaseCallStream *self,	TpBaseCallStream *self,
	TpSendingState new_state,	TpSendingState new_state,
	TpHandle actor_handle,	TpHandle actor_handle,
	TpCallStateChangeReason reason,	TpCallStateChangeReason reason,
	const gchar *dbus_reason,	const gchar *dbus_reason,
	const gchar *message);	const gchar *message);


		_TP_AVAILABLE_IN_0_18
	TpSendingState tp_base_call_stream_get_remote_sending_state (	TpSendingState tp_base_call_stream_get_remote_sending_state (
	TpBaseCallStream *self,	TpBaseCallStream *self,
	TpHandle contact);	TpHandle contact);

		_TP_AVAILABLE_IN_0_18
	gboolean tp_base_call_stream_update_remote_sending_state (	gboolean tp_base_call_stream_update_remote_sending_state (
	TpBaseCallStream *self,	TpBaseCallStream *self,
	TpHandle contact,	TpHandle contact,
	TpSendingState new_state,	TpSendingState new_state,
	TpHandle actor_handle,	TpHandle actor_handle,
	TpCallStateChangeReason reason,	TpCallStateChangeReason reason,
	const gchar *dbus_reason,	const gchar *dbus_reason,
	const gchar *message);	const gchar *message);

		_TP_AVAILABLE_IN_0_18
	gboolean tp_base_call_stream_remove_member (	gboolean tp_base_call_stream_remove_member (
	TpBaseCallStream *self,	TpBaseCallStream *self,
	TpHandle contact,	TpHandle contact,
	TpHandle actor_handle,	TpHandle actor_handle,
	TpCallStateChangeReason reason,	TpCallStateChangeReason reason,
	const gchar *dbus_reason,	const gchar *dbus_reason,
	const gchar *message);	const gchar *message);

	G_END_DECLS	G_END_DECLS


End of changes. 9 change blocks.
	0 lines changed or deleted	9 lines changed or added

	base-client.h	base-client.h

	skipping to change at line 142	skipping to change at line 142

	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,	void tp_base_client_add_account_features (TpBaseClient *self,

	const GQuark *features, gssize n)	const GQuark *features, gssize n);
	_TP_GNUC_DEPRECATED_FOR (tp_simple_client_factory_add_account_features)
	;


		_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,	void tp_base_client_add_account_features_varargs (TpBaseClient *self,

	GQuark feature, ...)	GQuark feature, ...);
	_TP_GNUC_DEPRECATED_FOR (tp_simple_client_factory_add_account_features_
	varargs);


		_TP_DEPRECATED_IN_0_16_FOR (tp_simple_client_factory_add_channel_features)
	void tp_base_client_add_channel_features (TpBaseClient *self,	void tp_base_client_add_channel_features (TpBaseClient *self,

	const GQuark *features, gssize n)	const GQuark *features, gssize n);
	_TP_GNUC_DEPRECATED_FOR (tp_simple_client_factory_add_channel_features)
	;	_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,	void tp_base_client_add_channel_features_varargs (TpBaseClient *self,

	GQuark feature, ...)	GQuark feature, ...);
	_TP_GNUC_DEPRECATED_FOR (tp_simple_client_factory_add_channel_features_
	varargs);


		_TP_DEPRECATED_IN_0_16_FOR (tp_simple_client_factory_add_connection_feature s)
	void tp_base_client_add_connection_features (TpBaseClient *self,	void tp_base_client_add_connection_features (TpBaseClient *self,

	const GQuark *features, gssize n)	const GQuark *features, gssize n);
	_TP_GNUC_DEPRECATED_FOR (tp_simple_client_factory_add_connection_featur
	es);	_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,	void tp_base_client_add_connection_features_varargs (TpBaseClient *self,

	GQuark feature, ...)	GQuark feature, ...);
	_TP_GNUC_DEPRECATED_FOR (tp_simple_client_factory_add_connection_featur
	es_varargs);


		_TP_DEPRECATED_IN_0_16
	void tp_base_client_set_channel_factory (TpBaseClient *self,	void tp_base_client_set_channel_factory (TpBaseClient *self,

	TpClientChannelFactory *factory) _TP_GNUC_DEPRECATED;	TpClientChannelFactory *factory);


		_TP_DEPRECATED_IN_0_16
	TpClientChannelFactory *tp_base_client_get_channel_factory (	TpClientChannelFactory *tp_base_client_get_channel_factory (

	TpBaseClient *self) _TP_GNUC_DEPRECATED;	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
	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);

	/* 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);
	*/	*/


	skipping to change at line 196	skipping to change at line 203
	GError **error);	GError **error);

	/* Normal methods, can be called at any time */	/* Normal methods, can be called at any time */

	GList tp_base_client_get_pending_requests (TpBaseClient self);	GList tp_base_client_get_pending_requests (TpBaseClient self);
	GList tp_base_client_get_handled_channels (TpBaseClient self);	GList tp_base_client_get_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
	void tp_base_client_delegate_channels_async (TpBaseClient *self,	void tp_base_client_delegate_channels_async (TpBaseClient *self,
	GList *channels,	GList *channels,
	gint64 user_action_time,	gint64 user_action_time,
	const gchar *preferred_handler,	const gchar *preferred_handler,
	GAsyncReadyCallback callback,	GAsyncReadyCallback callback,
	gpointer user_data);	gpointer user_data);


		_TP_AVAILABLE_IN_0_16
	gboolean tp_base_client_delegate_channels_finish (TpBaseClient *self,	gboolean tp_base_client_delegate_channels_finish (TpBaseClient *self,
	GAsyncResult *result,	GAsyncResult *result,
	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);

	TpAccountManager tp_base_client_get_account_manager (TpBaseClient self)
	_TP_GNUC_DEPRECATED;	#ifndef TP_DISABLE_DEPRECATED
		_TP_DEPRECATED_IN_0_16
		TpAccountManager tp_base_client_get_account_manager (TpBaseClient self);
		#endif

	void tp_base_client_unregister (TpBaseClient *self);	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, \

End of changes. 18 change blocks.
	22 lines changed or deleted	30 lines changed or added

	base-connection.h	base-connection.h

	skipping to change at line 47	skipping to change at line 47
	typedef struct _TpBaseConnection TpBaseConnection;	typedef struct _TpBaseConnection TpBaseConnection;
	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[NUM_TP_HANDLE_TYPES]);	TpHandleRepoIface *repos[TP_NUM_HANDLE_TYPES]);

	typedef GPtrArray (TpBaseConnectionCreateChannelFactoriesImpl) (	typedef GPtrArray (TpBaseConnectionCreateChannelFactoriesImpl) (
	TpBaseConnection *self);	TpBaseConnection *self);

	typedef GPtrArray (TpBaseConnectionCreateChannelManagersImpl) (	typedef GPtrArray (TpBaseConnectionCreateChannelManagersImpl) (
	TpBaseConnection *self);	TpBaseConnection *self);

	typedef gchar (TpBaseConnectionGetUniqueConnectionNameImpl) (	typedef gchar (TpBaseConnectionGetUniqueConnectionNameImpl) (
	TpBaseConnection *self);	TpBaseConnection *self);


	skipping to change at line 133	skipping to change at line 133

	/* FIXME: when dbus-glib exposes its GError -> D-Bus error name mapping,	/* FIXME: when dbus-glib exposes its GError -> D-Bus error name mapping,
	we could also add:	we could also add:
	void tp_base_connection_disconnect_with_error (TpBaseConnection *self,	void tp_base_connection_disconnect_with_error (TpBaseConnection *self,
	const GError error, GHashTable details, TpConnectionStatusReason reas on);	const GError error, GHashTable details, TpConnectionStatusReason reas on);
	*/	*/

	void tp_base_connection_disconnect_with_dbus_error (TpBaseConnection *self,	void tp_base_connection_disconnect_with_dbus_error (TpBaseConnection *self,
	const gchar error_name, GHashTable details,	const gchar error_name, GHashTable details,
	TpConnectionStatusReason reason);	TpConnectionStatusReason reason);

		void tp_base_connection_disconnect_with_dbus_error_vardict (
		TpBaseConnection *self,
		const gchar *error_name,
		GVariant *details,
		TpConnectionStatusReason reason);

	void tp_base_connection_change_status (TpBaseConnection *self,	void tp_base_connection_change_status (TpBaseConnection *self,
	TpConnectionStatus status, TpConnectionStatusReason reason);	TpConnectionStatus status, TpConnectionStatusReason reason);

	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,	void tp_base_connection_dbus_request_handles (TpSvcConnection *iface,
	guint handle_type, const gchar *names, DBusGMethodInvocation context) ;	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 191	skipping to change at line 199
	(G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_BASE_CONNECTION, \	(G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_BASE_CONNECTION, \
	TpBaseConnectionClass))	TpBaseConnectionClass))

	/* The cast of a string literal to (gchar ) is to keep C++ compilers happy /	/* The cast of a string literal to (gchar ) is to keep C++ compilers happy /
	#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); \
	\	\
	if (c->status != TP_CONNECTION_STATUS_CONNECTED) \	if (c->status != TP_CONNECTION_STATUS_CONNECTED) \
	{ \	{ \

	GError e = { TP_ERRORS, TP_ERROR_DISCONNECTED, \	GError e = { TP_ERROR, TP_ERROR_DISCONNECTED, \
	(gchar *) "Connection is disconnected" }; \	(gchar *) "Connection is disconnected" }; \
	\	\
	dbus_g_method_return_error ((context), &e); \	dbus_g_method_return_error ((context), &e); \
	return; \	return; \
	} \	} \
	} 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,

End of changes. 5 change blocks.
	2 lines changed or deleted	10 lines changed or added

	base-contact-list.h	base-contact-list.h

	skipping to change at line 27	skipping to change at line 27
	* 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_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/handle-repo.h>	#include <telepathy-glib/handle-repo.h>
	#include <telepathy-glib/svc-connection.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 ;


	skipping to change at line 67	skipping to change at line 68
	#define TP_BASE_CONTACT_LIST_GET_CLASS(obj) \	#define TP_BASE_CONTACT_LIST_GET_CLASS(obj) \
	(G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_BASE_CONTACT_LIST, \	(G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_BASE_CONTACT_LIST, \
	TpBaseContactListClass))	TpBaseContactListClass))

	/* ---- Utility stuff which subclasses can use ---- */	/* ---- Utility stuff which subclasses can use ---- */

	TpContactListState tp_base_contact_list_get_state (TpBaseContactList *self,	TpContactListState tp_base_contact_list_get_state (TpBaseContactList *self,
	GError **error);	GError **error);
	TpBaseConnection *tp_base_contact_list_get_connection (	TpBaseConnection *tp_base_contact_list_get_connection (
	TpBaseContactList self, GError *error);	TpBaseContactList self, GError *error);

		_TP_AVAILABLE_IN_0_18
	gboolean tp_base_contact_list_get_download_at_connection (	gboolean tp_base_contact_list_get_download_at_connection (
	TpBaseContactList *self);	TpBaseContactList *self);

	/* ---- Called by subclasses for ContactList (or both) ---- */	/* ---- Called by subclasses for ContactList (or both) ---- */

	void tp_base_contact_list_set_list_pending (TpBaseContactList *self);	void tp_base_contact_list_set_list_pending (TpBaseContactList *self);
	void tp_base_contact_list_set_list_failed (TpBaseContactList *self,	void tp_base_contact_list_set_list_failed (TpBaseContactList *self,
	GQuark domain,	GQuark domain,
	gint code,	gint code,
	const gchar *message);	const gchar *message);

	skipping to change at line 122	skipping to change at line 124
	TpHandle contact,	TpHandle contact,
	TpSubscriptionState *subscribe,	TpSubscriptionState *subscribe,
	TpSubscriptionState *publish,	TpSubscriptionState *publish,
	gchar **publish_request);	gchar **publish_request);

	typedef void (*TpBaseContactListAsyncFunc) (	typedef void (*TpBaseContactListAsyncFunc) (
	TpBaseContactList *self,	TpBaseContactList *self,
	GAsyncReadyCallback callback,	GAsyncReadyCallback callback,
	gpointer user_data);	gpointer user_data);


		_TP_AVAILABLE_IN_0_18
	void tp_base_contact_list_download_async (TpBaseContactList *self,	void tp_base_contact_list_download_async (TpBaseContactList *self,
	GAsyncReadyCallback callback,	GAsyncReadyCallback callback,
	gpointer user_data);	gpointer user_data);


		_TP_AVAILABLE_IN_0_18
	gboolean tp_base_contact_list_download_finish (TpBaseContactList *self,	gboolean tp_base_contact_list_download_finish (TpBaseContactList *self,
	GAsyncResult *result,	GAsyncResult *result,
	GError **error);	GError **error);

	typedef gboolean (TpBaseContactListAsyncFinishFunc) (TpBaseContactList se lf,	typedef gboolean (TpBaseContactListAsyncFinishFunc) (TpBaseContactList se lf,
	GAsyncResult *result,	GAsyncResult *result,
	GError **error);	GError **error);

	struct _TpBaseContactListClass {	struct _TpBaseContactListClass {
	GObjectClass parent_class;	GObjectClass parent_class;

	skipping to change at line 307	skipping to change at line 311

	void tp_base_contact_list_block_contacts_async (TpBaseContactList *self,	void tp_base_contact_list_block_contacts_async (TpBaseContactList *self,
	TpHandleSet *contacts,	TpHandleSet *contacts,
	GAsyncReadyCallback callback,	GAsyncReadyCallback callback,
	gpointer user_data);	gpointer user_data);

	gboolean tp_base_contact_list_block_contacts_finish (TpBaseContactList *sel f,	gboolean tp_base_contact_list_block_contacts_finish (TpBaseContactList *sel f,
	GAsyncResult *result,	GAsyncResult *result,
	GError **error);	GError **error);


		_TP_AVAILABLE_IN_0_16
	void tp_base_contact_list_block_contacts_with_abuse_async (	void tp_base_contact_list_block_contacts_with_abuse_async (
	TpBaseContactList *self,	TpBaseContactList *self,
	TpHandleSet *contacts,	TpHandleSet *contacts,
	gboolean report_abusive,	gboolean report_abusive,
	GAsyncReadyCallback callback,	GAsyncReadyCallback callback,
	gpointer user_data);	gpointer user_data);

		_TP_AVAILABLE_IN_0_16
	gboolean tp_base_contact_list_block_contacts_with_abuse_finish (	gboolean tp_base_contact_list_block_contacts_with_abuse_finish (
	TpBaseContactList *self,	TpBaseContactList *self,
	GAsyncResult *result,	GAsyncResult *result,
	GError **error);	GError **error);

	void tp_base_contact_list_unblock_contacts_async (TpBaseContactList *self,	void tp_base_contact_list_unblock_contacts_async (TpBaseContactList *self,
	TpHandleSet *contacts,	TpHandleSet *contacts,
	GAsyncReadyCallback callback,	GAsyncReadyCallback callback,
	gpointer user_data);	gpointer user_data);


	skipping to change at line 586	skipping to change at line 592

	/* ---- 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);	TpBaseConnection *conn);
	void tp_base_contact_list_mixin_list_iface_init (	void tp_base_contact_list_mixin_list_iface_init (
	TpSvcConnectionInterfaceContactListClass *klass);	TpSvcConnectionInterfaceContactListClass *klass);
	void tp_base_contact_list_mixin_groups_iface_init (	void tp_base_contact_list_mixin_groups_iface_init (
	TpSvcConnectionInterfaceContactGroupsClass *klass);	TpSvcConnectionInterfaceContactGroupsClass *klass);

		_TP_AVAILABLE_IN_0_16
	void tp_base_contact_list_mixin_blocking_iface_init (	void tp_base_contact_list_mixin_blocking_iface_init (
	TpSvcConnectionInterfaceContactBlockingClass *klass);	TpSvcConnectionInterfaceContactBlockingClass *klass);

	G_END_DECLS	G_END_DECLS

	#endif	#endif

End of changes. 7 change blocks.
	0 lines changed or deleted	7 lines changed or added

	base-media-call-content.h	base-media-call-content.h

	skipping to change at line 29	skipping to change at line 29
	* 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_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>

	G_BEGIN_DECLS	G_BEGIN_DECLS

	typedef struct _TpBaseMediaCallContent TpBaseMediaCallContent;	typedef struct _TpBaseMediaCallContent TpBaseMediaCallContent;
	typedef struct _TpBaseMediaCallContentPrivate TpBaseMediaCallContentPrivate ;	typedef struct _TpBaseMediaCallContentPrivate TpBaseMediaCallContentPrivate ;
	typedef struct _TpBaseMediaCallContentClass TpBaseMediaCallContentClass;	typedef struct _TpBaseMediaCallContentClass TpBaseMediaCallContentClass;

	struct _TpBaseMediaCallContentClass {	struct _TpBaseMediaCallContentClass {
	/<private>/	/<private>/
	TpBaseCallContentClass parent_class;	TpBaseCallContentClass parent_class;

	skipping to change at line 69	skipping to change at line 70
	(G_TYPE_CHECK_CLASS_CAST((klass), \	(G_TYPE_CHECK_CLASS_CAST((klass), \
	TP_TYPE_BASE_MEDIA_CALL_CONTENT, TpBaseMediaCallContentClass))	TP_TYPE_BASE_MEDIA_CALL_CONTENT, TpBaseMediaCallContentClass))
	#define TP_IS_BASE_MEDIA_CALL_CONTENT(obj) \	#define TP_IS_BASE_MEDIA_CALL_CONTENT(obj) \
	(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_BASE_MEDIA_CALL_CONTENT))	(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_BASE_MEDIA_CALL_CONTENT))
	#define TP_IS_BASE_MEDIA_CALL_CONTENT_CLASS(klass) \	#define TP_IS_BASE_MEDIA_CALL_CONTENT_CLASS(klass) \
	(G_TYPE_CHECK_CLASS_TYPE((klass), TP_TYPE_BASE_MEDIA_CALL_CONTENT))	(G_TYPE_CHECK_CLASS_TYPE((klass), TP_TYPE_BASE_MEDIA_CALL_CONTENT))
	#define TP_BASE_MEDIA_CALL_CONTENT_GET_CLASS(obj) \	#define TP_BASE_MEDIA_CALL_CONTENT_GET_CLASS(obj) \
	(G_TYPE_INSTANCE_GET_CLASS ((obj), \	(G_TYPE_INSTANCE_GET_CLASS ((obj), \
	TP_TYPE_BASE_MEDIA_CALL_CONTENT, TpBaseMediaCallContentClass))	TP_TYPE_BASE_MEDIA_CALL_CONTENT, TpBaseMediaCallContentClass))


		_TP_AVAILABLE_IN_0_18
	GHashTable *tp_base_media_call_content_get_local_media_description (	GHashTable *tp_base_media_call_content_get_local_media_description (
	TpBaseMediaCallContent *self,	TpBaseMediaCallContent *self,
	TpHandle contact);	TpHandle contact);


		_TP_AVAILABLE_IN_0_18
	void tp_base_media_call_content_offer_media_description_async (	void tp_base_media_call_content_offer_media_description_async (
	TpBaseMediaCallContent *self,	TpBaseMediaCallContent *self,
	TpCallContentMediaDescription *md,	TpCallContentMediaDescription *md,
	GAsyncReadyCallback callback,	GAsyncReadyCallback callback,
	gpointer user_data);	gpointer user_data);

		_TP_AVAILABLE_IN_0_18
	gboolean tp_base_media_call_content_offer_media_description_finish (	gboolean tp_base_media_call_content_offer_media_description_finish (
	TpBaseMediaCallContent *self,	TpBaseMediaCallContent *self,
	GAsyncResult *result,	GAsyncResult *result,
	GError **error);	GError **error);

	G_END_DECLS	G_END_DECLS

	#endif /* #ifndef __TP_BASE_MEDIA_CALL_CONTENT_H__*/	#endif /* #ifndef __TP_BASE_MEDIA_CALL_CONTENT_H__*/

End of changes. 4 change blocks.
	0 lines changed or deleted	4 lines changed or added

	base-media-call-stream.h	base-media-call-stream.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_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>

	G_BEGIN_DECLS	G_BEGIN_DECLS

	typedef struct _TpBaseMediaCallStream TpBaseMediaCallStream;	typedef struct _TpBaseMediaCallStream TpBaseMediaCallStream;
	typedef struct _TpBaseMediaCallStreamPrivate TpBaseMediaCallStreamPrivate;	typedef struct _TpBaseMediaCallStreamPrivate TpBaseMediaCallStreamPrivate;
	typedef struct _TpBaseMediaCallStreamClass TpBaseMediaCallStreamClass;	typedef struct _TpBaseMediaCallStreamClass TpBaseMediaCallStreamClass;

	typedef gboolean (*TpBaseMediaCallStreamFinishInitialCandidatesFunc) (	typedef gboolean (*TpBaseMediaCallStreamFinishInitialCandidatesFunc) (
	TpBaseMediaCallStream *self,	TpBaseMediaCallStream *self,
	GError **error);	GError **error);

	skipping to change at line 80	skipping to change at line 81
	gpointer future[4];	gpointer future[4];
	};	};

	struct _TpBaseMediaCallStream {	struct _TpBaseMediaCallStream {
	/<private>/	/<private>/
	TpBaseCallStream parent;	TpBaseCallStream parent;

	TpBaseMediaCallStreamPrivate *priv;	TpBaseMediaCallStreamPrivate *priv;
	};	};


		_TP_AVAILABLE_IN_0_18
	GType tp_base_media_call_stream_get_type (void);	GType tp_base_media_call_stream_get_type (void);

	/* TYPE MACROS */	/* TYPE MACROS */
	#define TP_TYPE_BASE_MEDIA_CALL_STREAM \	#define TP_TYPE_BASE_MEDIA_CALL_STREAM \
	(tp_base_media_call_stream_get_type ())	(tp_base_media_call_stream_get_type ())
	#define TP_BASE_MEDIA_CALL_STREAM(obj) \	#define TP_BASE_MEDIA_CALL_STREAM(obj) \
	(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_BASE_MEDIA_CALL_STREAM, TpBase MediaCallStream))	(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_BASE_MEDIA_CALL_STREAM, TpBase MediaCallStream))
	#define TP_BASE_MEDIA_CALL_STREAM_CLASS(klass) \	#define TP_BASE_MEDIA_CALL_STREAM_CLASS(klass) \
	(G_TYPE_CHECK_CLASS_CAST((klass), TP_TYPE_BASE_MEDIA_CALL_STREAM, \	(G_TYPE_CHECK_CLASS_CAST((klass), TP_TYPE_BASE_MEDIA_CALL_STREAM, \
	TpBaseMediaCallStreamClass))	TpBaseMediaCallStreamClass))
	#define TP_IS_BASE_MEDIA_CALL_STREAM(obj) \	#define TP_IS_BASE_MEDIA_CALL_STREAM(obj) \
	(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_BASE_MEDIA_CALL_STREAM))	(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_BASE_MEDIA_CALL_STREAM))
	#define TP_IS_BASE_MEDIA_CALL_STREAM_CLASS(klass) \	#define TP_IS_BASE_MEDIA_CALL_STREAM_CLASS(klass) \
	(G_TYPE_CHECK_CLASS_TYPE((klass), TP_TYPE_BASE_MEDIA_CALL_STREAM))	(G_TYPE_CHECK_CLASS_TYPE((klass), TP_TYPE_BASE_MEDIA_CALL_STREAM))
	#define TP_BASE_MEDIA_CALL_STREAM_GET_CLASS(obj) \	#define TP_BASE_MEDIA_CALL_STREAM_GET_CLASS(obj) \
	(G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_BASE_MEDIA_CALL_STREAM, \	(G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_BASE_MEDIA_CALL_STREAM, \
	TpBaseMediaCallStreamClass))	TpBaseMediaCallStreamClass))


		_TP_AVAILABLE_IN_0_18
	void tp_base_media_call_stream_set_relay_info (TpBaseMediaCallStream *self,	void tp_base_media_call_stream_set_relay_info (TpBaseMediaCallStream *self,
	GPtrArray *relays);	GPtrArray *relays);

		_TP_AVAILABLE_IN_0_18
	void tp_base_media_call_stream_set_stun_servers (TpBaseMediaCallStream *sel f,	void tp_base_media_call_stream_set_stun_servers (TpBaseMediaCallStream *sel f,
	GPtrArray *stun_servers);	GPtrArray *stun_servers);

		_TP_AVAILABLE_IN_0_18
	void tp_base_media_call_stream_add_endpoint (TpBaseMediaCallStream *self,	void tp_base_media_call_stream_add_endpoint (TpBaseMediaCallStream *self,
	TpCallStreamEndpoint *endpoint);	TpCallStreamEndpoint *endpoint);

		_TP_AVAILABLE_IN_0_18
	void tp_base_media_call_stream_remove_endpoint (TpBaseMediaCallStream *self ,	void tp_base_media_call_stream_remove_endpoint (TpBaseMediaCallStream *self ,
	TpCallStreamEndpoint *endpoint);	TpCallStreamEndpoint *endpoint);

		_TP_AVAILABLE_IN_0_18
	GList tp_base_media_call_stream_get_endpoints (TpBaseMediaCallStream self );	GList tp_base_media_call_stream_get_endpoints (TpBaseMediaCallStream self );

		_TP_AVAILABLE_IN_0_18
	const gchar *tp_base_media_call_stream_get_username (	const gchar *tp_base_media_call_stream_get_username (
	TpBaseMediaCallStream *self);	TpBaseMediaCallStream *self);

		_TP_AVAILABLE_IN_0_18
	const gchar *tp_base_media_call_stream_get_password (	const gchar *tp_base_media_call_stream_get_password (
	TpBaseMediaCallStream *self);	TpBaseMediaCallStream *self);

		_TP_AVAILABLE_IN_0_18
	TpStreamFlowState tp_base_media_call_stream_get_sending_state (	TpStreamFlowState tp_base_media_call_stream_get_sending_state (
	TpBaseMediaCallStream *self);	TpBaseMediaCallStream *self);

		_TP_AVAILABLE_IN_0_18
	TpStreamFlowState tp_base_media_call_stream_get_receiving_state (	TpStreamFlowState tp_base_media_call_stream_get_receiving_state (
	TpBaseMediaCallStream *self);	TpBaseMediaCallStream *self);

		_TP_AVAILABLE_IN_0_18
	void tp_base_media_call_stream_update_receiving_state (	void tp_base_media_call_stream_update_receiving_state (
	TpBaseMediaCallStream *self);	TpBaseMediaCallStream *self);

		_TP_AVAILABLE_IN_0_18
	void tp_base_media_call_stream_update_sending_state (	void tp_base_media_call_stream_update_sending_state (
	TpBaseMediaCallStream *self);	TpBaseMediaCallStream *self);

		_TP_AVAILABLE_IN_0_18
	void tp_base_media_call_stream_set_local_sending (TpBaseMediaCallStream *se lf,	void tp_base_media_call_stream_set_local_sending (TpBaseMediaCallStream *se lf,
	gboolean sending);	gboolean sending);

		_TP_AVAILABLE_IN_0_18
	gboolean tp_base_media_call_stream_get_local_sending (	gboolean tp_base_media_call_stream_get_local_sending (
	TpBaseMediaCallStream *self);	TpBaseMediaCallStream *self);

		_TP_AVAILABLE_IN_0_18
	GPtrArray *tp_base_media_call_stream_get_local_candidates (	GPtrArray *tp_base_media_call_stream_get_local_candidates (
	TpBaseMediaCallStream *self);	TpBaseMediaCallStream *self);

	G_END_DECLS	G_END_DECLS

	#endif /* #ifndef __TP_BASE_MEDIA_CALL_STREAM_H__*/	#endif /* #ifndef __TP_BASE_MEDIA_CALL_STREAM_H__*/

End of changes. 16 change blocks.
	0 lines changed or deleted	16 lines changed or added

	base-protocol.h	base-protocol.h

	skipping to change at line 27	skipping to change at line 27
	* 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_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/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);

	typedef gboolean (TpCMParamFilter) (const TpCMParamSpec paramspec,	typedef gboolean (TpCMParamFilter) (const TpCMParamSpec paramspec,

	skipping to change at line 226	skipping to change at line 227

	TpBaseProtocolDupSupportedVCardFieldsFunc dup_supported_vcard_fields;	TpBaseProtocolDupSupportedVCardFieldsFunc dup_supported_vcard_fields;

	TpBaseProtocolDupSupportedURISchemesFunc dup_supported_uri_schemes;	TpBaseProtocolDupSupportedURISchemesFunc dup_supported_uri_schemes;

	TpBaseProtocolNormalizeVCardAddressFunc normalize_vcard_address;	TpBaseProtocolNormalizeVCardAddressFunc normalize_vcard_address;

	TpBaseProtocolNormalizeURIFunc normalize_contact_uri;	TpBaseProtocolNormalizeURIFunc normalize_contact_uri;
	};	};


		_TP_AVAILABLE_IN_0_18
	GType tp_protocol_addressing_get_type (void) G_GNUC_CONST;	GType tp_protocol_addressing_get_type (void) G_GNUC_CONST;

	G_END_DECLS	G_END_DECLS

	#endif	#endif

End of changes. 2 change blocks.
	0 lines changed or deleted	2 lines changed or added

	base-room-config.h	base-room-config.h

	skipping to change at line 25	skipping to change at line 25
	* 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
	*/	*/

	#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/_gen/genums.h>	#include <telepathy-glib/_gen/genums.h>

	typedef struct _TpBaseRoomConfig TpBaseRoomConfig;	typedef struct _TpBaseRoomConfig TpBaseRoomConfig;
	typedef struct _TpBaseRoomConfigClass TpBaseRoomConfigClass;	typedef struct _TpBaseRoomConfigClass TpBaseRoomConfigClass;
	typedef struct _TpBaseRoomConfigPrivate TpBaseRoomConfigPrivate;	typedef struct _TpBaseRoomConfigPrivate TpBaseRoomConfigPrivate;

	typedef void (*TpBaseRoomConfigUpdateAsync) (	typedef void (*TpBaseRoomConfigUpdateAsync) (
	TpBaseRoomConfig *self,	TpBaseRoomConfig *self,
	GHashTable *validated_properties,	GHashTable *validated_properties,
	GAsyncReadyCallback callback,	GAsyncReadyCallback callback,

	skipping to change at line 75	skipping to change at line 76
	TP_BASE_ROOM_CONFIG_DESCRIPTION, /< nick=Description >/	TP_BASE_ROOM_CONFIG_DESCRIPTION, /< nick=Description >/
	TP_BASE_ROOM_CONFIG_PERSISTENT, /< nick=Persistent >/	TP_BASE_ROOM_CONFIG_PERSISTENT, /< nick=Persistent >/
	TP_BASE_ROOM_CONFIG_PRIVATE, /< nick=Private >/	TP_BASE_ROOM_CONFIG_PRIVATE, /< nick=Private >/
	TP_BASE_ROOM_CONFIG_PASSWORD_PROTECTED, /< nick=PasswordProtected >/	TP_BASE_ROOM_CONFIG_PASSWORD_PROTECTED, /< nick=PasswordProtected >/
	TP_BASE_ROOM_CONFIG_PASSWORD, /< nick=Password >/	TP_BASE_ROOM_CONFIG_PASSWORD, /< nick=Password >/
	TP_BASE_ROOM_CONFIG_PASSWORD_HINT, /< nick=PasswordHint >/	TP_BASE_ROOM_CONFIG_PASSWORD_HINT, /< nick=PasswordHint >/

	TP_NUM_BASE_ROOM_CONFIG_PROPERTIES /< skip >/	TP_NUM_BASE_ROOM_CONFIG_PROPERTIES /< skip >/
	} TpBaseRoomConfigProperty;	} TpBaseRoomConfigProperty;


		_TP_AVAILABLE_IN_0_16
	GType tp_base_room_config_get_type (void);	GType tp_base_room_config_get_type (void);

	#define TP_TYPE_BASE_ROOM_CONFIG \	#define TP_TYPE_BASE_ROOM_CONFIG \
	(tp_base_room_config_get_type ())	(tp_base_room_config_get_type ())
	#define TP_BASE_ROOM_CONFIG(obj) \	#define TP_BASE_ROOM_CONFIG(obj) \
	(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_BASE_ROOM_CONFIG, TpBaseRoomCo nfig))	(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_BASE_ROOM_CONFIG, TpBaseRoomCo nfig))
	#define TP_BASE_ROOM_CONFIG_CLASS(klass) \	#define TP_BASE_ROOM_CONFIG_CLASS(klass) \
	(G_TYPE_CHECK_CLASS_CAST((klass), TP_TYPE_BASE_ROOM_CONFIG,\	(G_TYPE_CHECK_CLASS_CAST((klass), TP_TYPE_BASE_ROOM_CONFIG,\
	TpBaseRoomConfigClass))	TpBaseRoomConfigClass))
	#define TP_IS_BASE_ROOM_CONFIG(obj) \	#define TP_IS_BASE_ROOM_CONFIG(obj) \
	(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_BASE_ROOM_CONFIG))	(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_BASE_ROOM_CONFIG))
	#define TP_IS_BASE_ROOM_CONFIG_CLASS(klass) \	#define TP_IS_BASE_ROOM_CONFIG_CLASS(klass) \
	(G_TYPE_CHECK_CLASS_TYPE((klass), TP_TYPE_BASE_ROOM_CONFIG))	(G_TYPE_CHECK_CLASS_TYPE((klass), TP_TYPE_BASE_ROOM_CONFIG))
	#define TP_BASE_ROOM_CONFIG_GET_CLASS(obj) \	#define TP_BASE_ROOM_CONFIG_GET_CLASS(obj) \
	(G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_BASE_ROOM_CONFIG, \	(G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_BASE_ROOM_CONFIG, \
	TpBaseRoomConfigClass))	TpBaseRoomConfigClass))


		_TP_AVAILABLE_IN_0_16
	void tp_base_room_config_register_class (	void tp_base_room_config_register_class (
	TpBaseChannelClass *base_channel_class);	TpBaseChannelClass *base_channel_class);

		_TP_AVAILABLE_IN_0_16
	void tp_base_room_config_iface_init (	void tp_base_room_config_iface_init (
	gpointer g_iface,	gpointer g_iface,
	gpointer iface_data);	gpointer iface_data);


		_TP_AVAILABLE_IN_0_16
	TpBaseChannel *tp_base_room_config_dup_channel (	TpBaseChannel *tp_base_room_config_dup_channel (
	TpBaseRoomConfig *self);	TpBaseRoomConfig *self);


		_TP_AVAILABLE_IN_0_16
	void tp_base_room_config_set_can_update_configuration (	void tp_base_room_config_set_can_update_configuration (
	TpBaseRoomConfig *self,	TpBaseRoomConfig *self,
	gboolean can_update_configuration);	gboolean can_update_configuration);


		_TP_AVAILABLE_IN_0_16
	void tp_base_room_config_set_property_mutable (	void tp_base_room_config_set_property_mutable (
	TpBaseRoomConfig *self,	TpBaseRoomConfig *self,
	TpBaseRoomConfigProperty property_id,	TpBaseRoomConfigProperty property_id,
	gboolean is_mutable);	gboolean is_mutable);


		_TP_AVAILABLE_IN_0_16
	void tp_base_room_config_emit_properties_changed (	void tp_base_room_config_emit_properties_changed (
	TpBaseRoomConfig *self);	TpBaseRoomConfig *self);


		_TP_AVAILABLE_IN_0_16
	void tp_base_room_config_set_retrieved (	void tp_base_room_config_set_retrieved (
	TpBaseRoomConfig *self);	TpBaseRoomConfig *self);

	/* TYPE MACROS */	/* TYPE MACROS */

	#endif /* TP_BASE_ROOM_CONFIG_H */	#endif /* TP_BASE_ROOM_CONFIG_H */

End of changes. 9 change blocks.
	0 lines changed or deleted	9 lines changed or added

	basic-proxy-factory.h	basic-proxy-factory.h

	skipping to change at line 61	skipping to change at line 61
	(G_TYPE_CHECK_CLASS_CAST ((klass), TP_TYPE_BASIC_PROXY_FACTORY, \	(G_TYPE_CHECK_CLASS_CAST ((klass), TP_TYPE_BASIC_PROXY_FACTORY, \
	TpBasicProxyFactoryClass))	TpBasicProxyFactoryClass))
	#define TP_IS_BASIC_PROXY_FACTORY(obj) \	#define TP_IS_BASIC_PROXY_FACTORY(obj) \
	(G_TYPE_CHECK_INSTANCE_TYPE ((obj), TP_TYPE_BASIC_PROXY_FACTORY))	(G_TYPE_CHECK_INSTANCE_TYPE ((obj), TP_TYPE_BASIC_PROXY_FACTORY))
	#define TP_IS_BASIC_PROXY_FACTORY_CLASS(klass) \	#define TP_IS_BASIC_PROXY_FACTORY_CLASS(klass) \
	(G_TYPE_CHECK_CLASS_TYPE ((klass), TP_TYPE_BASIC_PROXY_FACTORY))	(G_TYPE_CHECK_CLASS_TYPE ((klass), TP_TYPE_BASIC_PROXY_FACTORY))
	#define TP_BASIC_PROXY_FACTORY_GET_CLASS(obj) \	#define TP_BASIC_PROXY_FACTORY_GET_CLASS(obj) \
	(G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_BASIC_PROXY_FACTORY, \	(G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_BASIC_PROXY_FACTORY, \
	TpBasicProxyFactoryClass))	TpBasicProxyFactoryClass))


	TpBasicProxyFactory * tp_basic_proxy_factory_new (void)	#ifndef TP_DISABLE_DEPRECATED
	_TP_GNUC_DEPRECATED_FOR (tp_simple_client_factory_new);	_TP_DEPRECATED_IN_0_16_FOR (tp_simple_client_factory_new)
		TpBasicProxyFactory * tp_basic_proxy_factory_new (void);


	TpBasicProxyFactory * tp_basic_proxy_factory_dup (void)	_TP_DEPRECATED_IN_0_16_FOR (tp_simple_client_factory_new)
	_TP_GNUC_DEPRECATED_FOR (tp_simple_client_factory_new);	TpBasicProxyFactory * tp_basic_proxy_factory_dup (void);
		#endif

	G_END_DECLS	G_END_DECLS

	#endif	#endif

End of changes. 2 change blocks.
	4 lines changed or deleted	6 lines changed or added

	call-channel.h	call-channel.h

	skipping to change at line 25	skipping to change at line 25
	*	*
	* 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_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>

	G_BEGIN_DECLS	G_BEGIN_DECLS

	#define TP_TYPE_CALL_CHANNEL (tp_call_channel_get_type ())	#define TP_TYPE_CALL_CHANNEL (tp_call_channel_get_type ())
	#define TP_CALL_CHANNEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TP_TYPE_CA LL_CHANNEL, TpCallChannel))	#define TP_CALL_CHANNEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TP_TYPE_CA LL_CHANNEL, TpCallChannel))
	#define TP_CALL_CHANNEL_CLASS(obj) (G_TYPE_CHECK_CLASS_CAST ((obj), TP_TYPE _CALL_CHANNEL, TpCallChannelClass))	#define TP_CALL_CHANNEL_CLASS(obj) (G_TYPE_CHECK_CLASS_CAST ((obj), TP_TYPE _CALL_CHANNEL, TpCallChannelClass))
	#define TP_IS_CALL_CHANNEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TP_TYPE _CALL_CHANNEL))	#define TP_IS_CALL_CHANNEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TP_TYPE _CALL_CHANNEL))
	#define TP_IS_CALL_CHANNEL_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE ((obj), TP_T YPE_CALL_CHANNEL))	#define TP_IS_CALL_CHANNEL_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE ((obj), TP_T YPE_CALL_CHANNEL))
	#define TP_CALL_CHANNEL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), T P_TYPE_CALL_CHANNEL, TpCallChannelClass))	#define TP_CALL_CHANNEL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), T P_TYPE_CALL_CHANNEL, TpCallChannelClass))


	skipping to change at line 56	skipping to change at line 57
	TpCallChannelPrivate *priv;	TpCallChannelPrivate *priv;
	};	};

	struct _TpCallChannelClass	struct _TpCallChannelClass
	{	{
	/<private>/	/<private>/
	TpChannelClass parent_class;	TpChannelClass parent_class;
	GCallback _padding[7];	GCallback _padding[7];
	};	};


		_TP_AVAILABLE_IN_0_18
	GType tp_call_channel_get_type (void);	GType tp_call_channel_get_type (void);

	typedef struct _TpCallStateReason TpCallStateReason;	typedef struct _TpCallStateReason TpCallStateReason;
	struct _TpCallStateReason	struct _TpCallStateReason
	{	{
	TpHandle actor;	TpHandle actor;
	TpCallStateChangeReason reason;	TpCallStateChangeReason reason;
	gchar *dbus_reason;	gchar *dbus_reason;
	gchar *message;	gchar *message;

	/<private>/	/<private>/
	guint ref_count;	guint ref_count;
	};	};

	#define TP_TYPE_CALL_STATE_REASON (tp_call_state_reason_get_type ())	#define TP_TYPE_CALL_STATE_REASON (tp_call_state_reason_get_type ())

		_TP_AVAILABLE_IN_0_18
	GType tp_call_state_reason_get_type (void);	GType tp_call_state_reason_get_type (void);

	#define TP_CALL_CHANNEL_FEATURE_CORE \	#define TP_CALL_CHANNEL_FEATURE_CORE \
	tp_call_channel_get_feature_quark_core ()	tp_call_channel_get_feature_quark_core ()

		_TP_AVAILABLE_IN_0_18
	GQuark tp_call_channel_get_feature_quark_core (void) G_GNUC_CONST;	GQuark tp_call_channel_get_feature_quark_core (void) G_GNUC_CONST;


		_TP_AVAILABLE_IN_0_18
	GPtrArray tp_call_channel_get_contents (TpCallChannel self);	GPtrArray tp_call_channel_get_contents (TpCallChannel self);

		_TP_AVAILABLE_IN_0_18
	TpCallState tp_call_channel_get_state (TpCallChannel *self,	TpCallState tp_call_channel_get_state (TpCallChannel *self,
	TpCallFlags *flags,	TpCallFlags *flags,
	GHashTable **details,	GHashTable **details,
	TpCallStateReason **reason);	TpCallStateReason **reason);

		_TP_AVAILABLE_IN_0_18
	gboolean tp_call_channel_has_hardware_streaming (TpCallChannel *self);	gboolean tp_call_channel_has_hardware_streaming (TpCallChannel *self);

		_TP_AVAILABLE_IN_0_18
	gboolean tp_call_channel_has_initial_audio (TpCallChannel *self,	gboolean tp_call_channel_has_initial_audio (TpCallChannel *self,
	const gchar **initial_audio_name);	const gchar **initial_audio_name);

		_TP_AVAILABLE_IN_0_18
	gboolean tp_call_channel_has_initial_video (TpCallChannel *self,	gboolean tp_call_channel_has_initial_video (TpCallChannel *self,
	const gchar **initial_video_name);	const gchar **initial_video_name);

		_TP_AVAILABLE_IN_0_18
	gboolean tp_call_channel_has_mutable_contents (TpCallChannel *self);	gboolean tp_call_channel_has_mutable_contents (TpCallChannel *self);

		_TP_AVAILABLE_IN_0_18
	GHashTable tp_call_channel_get_members (TpCallChannel self);	GHashTable tp_call_channel_get_members (TpCallChannel self);


		_TP_AVAILABLE_IN_0_18
	gboolean tp_call_channel_has_dtmf (TpCallChannel *self);	gboolean tp_call_channel_has_dtmf (TpCallChannel *self);

		_TP_AVAILABLE_IN_0_18
	gboolean tp_call_channel_has_hold (TpCallChannel *self);	gboolean tp_call_channel_has_hold (TpCallChannel *self);


		_TP_AVAILABLE_IN_0_18
	void tp_call_channel_set_ringing_async (TpCallChannel *self,	void tp_call_channel_set_ringing_async (TpCallChannel *self,
	GAsyncReadyCallback callback,	GAsyncReadyCallback callback,
	gpointer user_data);	gpointer user_data);

		_TP_AVAILABLE_IN_0_18
	gboolean tp_call_channel_set_ringing_finish (TpCallChannel *self,	gboolean tp_call_channel_set_ringing_finish (TpCallChannel *self,
	GAsyncResult *result,	GAsyncResult *result,
	GError **error);	GError **error);


		_TP_AVAILABLE_IN_0_18
	void tp_call_channel_set_queued_async (TpCallChannel *self,	void tp_call_channel_set_queued_async (TpCallChannel *self,
	GAsyncReadyCallback callback,	GAsyncReadyCallback callback,
	gpointer user_data);	gpointer user_data);

		_TP_AVAILABLE_IN_0_18
	gboolean tp_call_channel_set_queued_finish (TpCallChannel *self,	gboolean tp_call_channel_set_queued_finish (TpCallChannel *self,
	GAsyncResult *result,	GAsyncResult *result,
	GError **error);	GError **error);


		_TP_AVAILABLE_IN_0_18
	void tp_call_channel_accept_async (TpCallChannel *self,	void tp_call_channel_accept_async (TpCallChannel *self,
	GAsyncReadyCallback callback,	GAsyncReadyCallback callback,
	gpointer user_data);	gpointer user_data);

		_TP_AVAILABLE_IN_0_18
	gboolean tp_call_channel_accept_finish (TpCallChannel *self,	gboolean tp_call_channel_accept_finish (TpCallChannel *self,
	GAsyncResult *result,	GAsyncResult *result,
	GError **error);	GError **error);


		_TP_AVAILABLE_IN_0_18
	void tp_call_channel_hangup_async (TpCallChannel *self,	void tp_call_channel_hangup_async (TpCallChannel *self,
	TpCallStateChangeReason reason,	TpCallStateChangeReason reason,
	const gchar *detailed_reason,	const gchar *detailed_reason,
	const gchar *message,	const gchar *message,
	GAsyncReadyCallback callback,	GAsyncReadyCallback callback,
	gpointer user_data);	gpointer user_data);

		_TP_AVAILABLE_IN_0_18
	gboolean tp_call_channel_hangup_finish (TpCallChannel *self,	gboolean tp_call_channel_hangup_finish (TpCallChannel *self,
	GAsyncResult *result,	GAsyncResult *result,
	GError **error);	GError **error);


		_TP_AVAILABLE_IN_0_18
	void tp_call_channel_add_content_async (TpCallChannel *self,	void tp_call_channel_add_content_async (TpCallChannel *self,
	const gchar *name,	const gchar *name,
	TpMediaStreamType type,	TpMediaStreamType type,
	TpMediaStreamDirection initial_direction,	TpMediaStreamDirection initial_direction,
	GAsyncReadyCallback callback,	GAsyncReadyCallback callback,
	gpointer user_data);	gpointer user_data);

		_TP_AVAILABLE_IN_0_18
	TpCallContent tp_call_channel_add_content_finish (TpCallChannel self,	TpCallContent tp_call_channel_add_content_finish (TpCallChannel self,
	GAsyncResult *result,	GAsyncResult *result,
	GError **error);	GError **error);


		_TP_AVAILABLE_IN_0_18
	void tp_call_channel_send_tones_async (TpCallChannel *self,	void tp_call_channel_send_tones_async (TpCallChannel *self,
	const gchar *tones,	const gchar *tones,
	GCancellable *cancellable,	GCancellable *cancellable,
	GAsyncReadyCallback callback,	GAsyncReadyCallback callback,
	gpointer user_data);	gpointer user_data);

		_TP_AVAILABLE_IN_0_18
	gboolean tp_call_channel_send_tones_finish (TpCallChannel *self,	gboolean tp_call_channel_send_tones_finish (TpCallChannel *self,
	GAsyncResult *result,	GAsyncResult *result,
	GError **error);	GError **error);


		_TP_AVAILABLE_IN_0_18
	void tp_call_channel_request_hold_async (TpCallChannel *self,	void tp_call_channel_request_hold_async (TpCallChannel *self,
	gboolean hold,	gboolean hold,
	GAsyncReadyCallback callback,	GAsyncReadyCallback callback,
	gpointer user_data);	gpointer user_data);

		_TP_AVAILABLE_IN_0_18
	gboolean tp_call_channel_request_hold_finish (TpCallChannel *self,	gboolean tp_call_channel_request_hold_finish (TpCallChannel *self,
	GAsyncResult *result,	GAsyncResult *result,
	GError **error);	GError **error);

	G_END_DECLS	G_END_DECLS

	#endif	#endif

End of changes. 27 change blocks.
	0 lines changed or deleted	27 lines changed or added

	call-content-media-description.h	call-content-media-description.h

	skipping to change at line 31	skipping to change at line 31
	*/	*/

	#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>

		#include <telepathy-glib/defs.h>
	#include <telepathy-glib/handle.h>	#include <telepathy-glib/handle.h>

	G_BEGIN_DECLS	G_BEGIN_DECLS

	typedef struct _TpCallContentMediaDescription TpCallContentMediaDescription ;	typedef struct _TpCallContentMediaDescription TpCallContentMediaDescription ;
	typedef struct _TpCallContentMediaDescriptionPrivate	typedef struct _TpCallContentMediaDescriptionPrivate
	TpCallContentMediaDescriptionPrivate;	TpCallContentMediaDescriptionPrivate;
	typedef struct _TpCallContentMediaDescriptionClass	typedef struct _TpCallContentMediaDescriptionClass
	TpCallContentMediaDescriptionClass;	TpCallContentMediaDescriptionClass;


	skipping to change at line 75	skipping to change at line 76
	(G_TYPE_CHECK_CLASS_CAST((klass), \	(G_TYPE_CHECK_CLASS_CAST((klass), \
	TP_TYPE_CALL_CONTENT_MEDIA_DESCRIPTION, TpCallContentMediaDescriptionClas s))	TP_TYPE_CALL_CONTENT_MEDIA_DESCRIPTION, TpCallContentMediaDescriptionClas s))
	#define TP_IS_CALL_CONTENT_MEDIA_DESCRIPTION(obj) \	#define TP_IS_CALL_CONTENT_MEDIA_DESCRIPTION(obj) \
	(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_CALL_CONTENT_MEDIA_DESCRIPTION ))	(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_CALL_CONTENT_MEDIA_DESCRIPTION ))
	#define TP_IS_CALL_CONTENT_MEDIA_DESCRIPTION_CLASS(klass) \	#define TP_IS_CALL_CONTENT_MEDIA_DESCRIPTION_CLASS(klass) \
	(G_TYPE_CHECK_CLASS_TYPE((klass), TP_TYPE_CALL_CONTENT_MEDIA_DESCRIPTION) )	(G_TYPE_CHECK_CLASS_TYPE((klass), TP_TYPE_CALL_CONTENT_MEDIA_DESCRIPTION) )
	#define TP_CALL_CONTENT_MEDIA_DESCRIPTION_GET_CLASS(obj) \	#define TP_CALL_CONTENT_MEDIA_DESCRIPTION_GET_CLASS(obj) \
	(G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_CALL_CONTENT_MEDIA_DESCRIPTION , \	(G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_CALL_CONTENT_MEDIA_DESCRIPTION , \
	TpCallContentMediaDescriptionClass))	TpCallContentMediaDescriptionClass))


		_TP_AVAILABLE_IN_0_18
	TpCallContentMediaDescription *tp_call_content_media_description_new (	TpCallContentMediaDescription *tp_call_content_media_description_new (
	TpDBusDaemon *dbus_daemon,	TpDBusDaemon *dbus_daemon,
	const gchar *object_path,	const gchar *object_path,
	TpHandle remote_contact,	TpHandle remote_contact,
	gboolean has_remote_information,	gboolean has_remote_information,
	gboolean further_negotiation_required);	gboolean further_negotiation_required);


		_TP_AVAILABLE_IN_0_18
	const gchar *tp_call_content_media_description_get_object_path (	const gchar *tp_call_content_media_description_get_object_path (
	TpCallContentMediaDescription *self);	TpCallContentMediaDescription *self);

		_TP_AVAILABLE_IN_0_18
	TpHandle tp_call_content_media_description_get_remote_contact (	TpHandle tp_call_content_media_description_get_remote_contact (
	TpCallContentMediaDescription *self);	TpCallContentMediaDescription *self);


		_TP_AVAILABLE_IN_0_18
	void tp_call_content_media_description_add_ssrc (	void tp_call_content_media_description_add_ssrc (
	TpCallContentMediaDescription *self,	TpCallContentMediaDescription *self,
	TpHandle contact,	TpHandle contact,
	guint ssrc);	guint ssrc);


		_TP_AVAILABLE_IN_0_18
	void tp_call_content_media_description_append_codec (	void tp_call_content_media_description_append_codec (
	TpCallContentMediaDescription *self,	TpCallContentMediaDescription *self,
	guint identifier,	guint identifier,
	const gchar *name,	const gchar *name,
	guint clock_rate,	guint clock_rate,
	guint channels,	guint channels,
	gboolean updated,	gboolean updated,
	GHashTable *parameters);	GHashTable *parameters);


		_TP_AVAILABLE_IN_0_18
	void tp_call_content_media_description_add_rtp_header_extension (	void tp_call_content_media_description_add_rtp_header_extension (
	TpCallContentMediaDescription *self,	TpCallContentMediaDescription *self,
	guint id,	guint id,
	TpMediaStreamDirection direction,	TpMediaStreamDirection direction,
	const gchar *uri,	const gchar *uri,
	const gchar *parameters);	const gchar *parameters);


		_TP_AVAILABLE_IN_0_18
	void tp_call_content_media_description_add_rtcp_feedback_message (	void tp_call_content_media_description_add_rtcp_feedback_message (
	TpCallContentMediaDescription *self,	TpCallContentMediaDescription *self,
	guint codec_identifier,	guint codec_identifier,
	const gchar *type,	const gchar *type,
	const gchar *subtype,	const gchar *subtype,
	const gchar *parameters);	const gchar *parameters);


		_TP_AVAILABLE_IN_0_18
	void tp_call_content_media_description_set_rtcp_feedback_minimum_interval (	void tp_call_content_media_description_set_rtcp_feedback_minimum_interval (
	TpCallContentMediaDescription *self,	TpCallContentMediaDescription *self,
	guint codec_identifier,	guint codec_identifier,
	guint rtcp_minimum_interval);	guint rtcp_minimum_interval);


		_TP_AVAILABLE_IN_0_18
	void tp_call_content_media_description_set_does_avpf (	void tp_call_content_media_description_set_does_avpf (
	TpCallContentMediaDescription *self,	TpCallContentMediaDescription *self,
	gboolean does_avpf);	gboolean does_avpf);


		_TP_AVAILABLE_IN_0_18
	void tp_call_content_media_description_set_rtcp_extended_reports (	void tp_call_content_media_description_set_rtcp_extended_reports (
	TpCallContentMediaDescription *self,	TpCallContentMediaDescription *self,
	guint loss_rle_max_size,	guint loss_rle_max_size,
	guint duplicate_rle_max_size,	guint duplicate_rle_max_size,
	guint packet_receipt_times_max_size,	guint packet_receipt_times_max_size,
	guint dlrr_max_size,	guint dlrr_max_size,
	TpRCPTXRRTTMode rtt_mode,	TpRCPTXRRTTMode rtt_mode,

	TpRTCPXRStatisticsFlags statistic_flags,	TpRTCPXRStatisticsFlags statistics_flags,
	gboolean enable_metrics);	gboolean enable_metrics);


		_TP_AVAILABLE_IN_0_18
	void tp_call_content_media_description_add_rtp_header_extensions_interface (	void tp_call_content_media_description_add_rtp_header_extensions_interface (
	TpCallContentMediaDescription *self);	TpCallContentMediaDescription *self);


		_TP_AVAILABLE_IN_0_18
	void tp_call_content_media_description_add_rtcp_feedback_interface (	void tp_call_content_media_description_add_rtcp_feedback_interface (
	TpCallContentMediaDescription *self);	TpCallContentMediaDescription *self);


		_TP_AVAILABLE_IN_0_18
	void tp_call_content_media_description_add_rtcp_extended_reports_interface (	void tp_call_content_media_description_add_rtcp_extended_reports_interface (
	TpCallContentMediaDescription *self);	TpCallContentMediaDescription *self);

	G_END_DECLS	G_END_DECLS

	#endif /* #ifndef __TP_CALL_CONTENT_MEDIA_DESCRIPTION_H__*/	#endif /* #ifndef __TP_CALL_CONTENT_MEDIA_DESCRIPTION_H__*/

End of changes. 15 change blocks.
	1 lines changed or deleted	15 lines changed or added

	call-content.h	call-content.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_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>

	G_BEGIN_DECLS	G_BEGIN_DECLS

	#define TP_TYPE_CALL_CONTENT (tp_call_content_get_type ())	#define TP_TYPE_CALL_CONTENT (tp_call_content_get_type ())
	#define TP_CALL_CONTENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TP_TYPE_CA LL_CONTENT, TpCallContent))	#define TP_CALL_CONTENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TP_TYPE_CA LL_CONTENT, TpCallContent))
	#define TP_CALL_CONTENT_CLASS(obj) (G_TYPE_CHECK_CLASS_CAST ((obj), TP_TYPE _CALL_CONTENT, TpCallContentClass))	#define TP_CALL_CONTENT_CLASS(obj) (G_TYPE_CHECK_CLASS_CAST ((obj), TP_TYPE _CALL_CONTENT, TpCallContentClass))
	#define TP_IS_CALL_CONTENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TP_TYPE _CALL_CONTENT))	#define TP_IS_CALL_CONTENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TP_TYPE _CALL_CONTENT))
	#define TP_IS_CALL_CONTENT_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE ((obj), TP_T YPE_CALL_CONTENT))	#define TP_IS_CALL_CONTENT_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE ((obj), TP_T YPE_CALL_CONTENT))
	#define TP_CALL_CONTENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), T P_TYPE_CALL_CONTENT, TpCallContentClass))	#define TP_CALL_CONTENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), T P_TYPE_CALL_CONTENT, TpCallContentClass))


	skipping to change at line 54	skipping to change at line 55
	TpCallContentPrivate *priv;	TpCallContentPrivate *priv;
	};	};

	struct _TpCallContentClass	struct _TpCallContentClass
	{	{
	/<private>/	/<private>/
	TpProxyClass parent_class;	TpProxyClass parent_class;
	GCallback _padding[7];	GCallback _padding[7];
	};	};


		_TP_AVAILABLE_IN_0_18
	GType tp_call_content_get_type (void);	GType tp_call_content_get_type (void);


		_TP_AVAILABLE_IN_0_18
	void tp_call_content_init_known_interfaces (void);	void tp_call_content_init_known_interfaces (void);

	#define TP_CALL_CONTENT_FEATURE_CORE \	#define TP_CALL_CONTENT_FEATURE_CORE \
	tp_call_content_get_feature_quark_core ()	tp_call_content_get_feature_quark_core ()

		_TP_AVAILABLE_IN_0_18
	GQuark tp_call_content_get_feature_quark_core (void) G_GNUC_CONST;	GQuark tp_call_content_get_feature_quark_core (void) G_GNUC_CONST;


		_TP_AVAILABLE_IN_0_18
	const gchar tp_call_content_get_name (TpCallContent self);	const gchar tp_call_content_get_name (TpCallContent self);

		_TP_AVAILABLE_IN_0_18
	TpMediaStreamType tp_call_content_get_media_type (TpCallContent *self);	TpMediaStreamType tp_call_content_get_media_type (TpCallContent *self);

		_TP_AVAILABLE_IN_0_18
	TpCallContentDisposition tp_call_content_get_disposition (TpCallContent *se lf);	TpCallContentDisposition tp_call_content_get_disposition (TpCallContent *se lf);

		_TP_AVAILABLE_IN_0_18
	GPtrArray tp_call_content_get_streams (TpCallContent self);	GPtrArray tp_call_content_get_streams (TpCallContent self);


		_TP_AVAILABLE_IN_0_18
	void tp_call_content_remove_async (TpCallContent *self,	void tp_call_content_remove_async (TpCallContent *self,
	GAsyncReadyCallback callback,	GAsyncReadyCallback callback,
	gpointer user_data);	gpointer user_data);

		_TP_AVAILABLE_IN_0_18
	gboolean tp_call_content_remove_finish (TpCallContent *self,	gboolean tp_call_content_remove_finish (TpCallContent *self,
	GAsyncResult *result,	GAsyncResult *result,
	GError **error);	GError **error);


		_TP_AVAILABLE_IN_0_18
	void tp_call_content_send_tones_async (TpCallContent *self,	void tp_call_content_send_tones_async (TpCallContent *self,
	const gchar *tones,	const gchar *tones,
	GCancellable *cancellable,	GCancellable *cancellable,
	GAsyncReadyCallback callback,	GAsyncReadyCallback callback,
	gpointer user_data);	gpointer user_data);

		_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>	#include <telepathy-glib/_gen/tp-cli-call-content.h>

	#endif	#endif

End of changes. 12 change blocks.
	0 lines changed or deleted	12 lines changed or added

	call-misc.h	call-misc.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_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/proxy.h>	#include <telepathy-glib/proxy.h>

	G_BEGIN_DECLS	G_BEGIN_DECLS


		_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
	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-content-media-description.h>
	#include <telepathy-glib/_gen/tp-cli-call-stream-endpoint.h>	#include <telepathy-glib/_gen/tp-cli-call-stream-endpoint.h>

	#endif	#endif

End of changes. 3 change blocks.
	0 lines changed or deleted	3 lines changed or added

	call-stream-endpoint.h	call-stream-endpoint.h

	skipping to change at line 28	skipping to change at line 28
	* 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_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/enums.h>	#include <telepathy-glib/enums.h>

	G_BEGIN_DECLS	G_BEGIN_DECLS

	typedef struct _TpCallStreamEndpoint TpCallStreamEndpoint;	typedef struct _TpCallStreamEndpoint TpCallStreamEndpoint;
	typedef struct _TpCallStreamEndpointPrivate TpCallStreamEndpointPrivate;	typedef struct _TpCallStreamEndpointPrivate TpCallStreamEndpointPrivate;
	typedef struct _TpCallStreamEndpointClass TpCallStreamEndpointClass;	typedef struct _TpCallStreamEndpointClass TpCallStreamEndpointClass;

	struct _TpCallStreamEndpointClass {	struct _TpCallStreamEndpointClass {

	skipping to change at line 51	skipping to change at line 52
	TpDBusPropertiesMixinClass dbus_props_class;	TpDBusPropertiesMixinClass dbus_props_class;
	};	};

	struct _TpCallStreamEndpoint {	struct _TpCallStreamEndpoint {
	/<private>/	/<private>/
	GObject parent;	GObject parent;

	TpCallStreamEndpointPrivate *priv;	TpCallStreamEndpointPrivate *priv;
	};	};


		_TP_AVAILABLE_IN_0_18
	GType tp_call_stream_endpoint_get_type (void);	GType tp_call_stream_endpoint_get_type (void);

	/* TYPE MACROS */	/* TYPE MACROS */
	#define TP_TYPE_CALL_STREAM_ENDPOINT \	#define TP_TYPE_CALL_STREAM_ENDPOINT \
	(tp_call_stream_endpoint_get_type ())	(tp_call_stream_endpoint_get_type ())
	#define TP_CALL_STREAM_ENDPOINT(obj) \	#define TP_CALL_STREAM_ENDPOINT(obj) \
	(G_TYPE_CHECK_INSTANCE_CAST((obj), \	(G_TYPE_CHECK_INSTANCE_CAST((obj), \
	TP_TYPE_CALL_STREAM_ENDPOINT, TpCallStreamEndpoint))	TP_TYPE_CALL_STREAM_ENDPOINT, TpCallStreamEndpoint))
	#define TP_CALL_STREAM_ENDPOINT_CLASS(klass) \	#define TP_CALL_STREAM_ENDPOINT_CLASS(klass) \
	(G_TYPE_CHECK_CLASS_CAST((klass), \	(G_TYPE_CHECK_CLASS_CAST((klass), \
	TP_TYPE_CALL_STREAM_ENDPOINT, TpCallStreamEndpointClass))	TP_TYPE_CALL_STREAM_ENDPOINT, TpCallStreamEndpointClass))
	#define TP_IS_CALL_STREAM_ENDPOINT(obj) \	#define TP_IS_CALL_STREAM_ENDPOINT(obj) \
	(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_CALL_STREAM_ENDPOINT))	(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_CALL_STREAM_ENDPOINT))
	#define TP_IS_CALL_STREAM_ENDPOINT_CLASS(klass) \	#define TP_IS_CALL_STREAM_ENDPOINT_CLASS(klass) \
	(G_TYPE_CHECK_CLASS_TYPE((klass), TP_TYPE_CALL_STREAM_ENDPOINT))	(G_TYPE_CHECK_CLASS_TYPE((klass), TP_TYPE_CALL_STREAM_ENDPOINT))
	#define TP_CALL_STREAM_ENDPOINT_GET_CLASS(obj) \	#define TP_CALL_STREAM_ENDPOINT_GET_CLASS(obj) \
	(G_TYPE_INSTANCE_GET_CLASS ((obj), \	(G_TYPE_INSTANCE_GET_CLASS ((obj), \
	TP_TYPE_CALL_STREAM_ENDPOINT, TpCallStreamEndpointClass))	TP_TYPE_CALL_STREAM_ENDPOINT, TpCallStreamEndpointClass))


		_TP_AVAILABLE_IN_0_18
	TpCallStreamEndpoint tp_call_stream_endpoint_new (TpDBusDaemon dbus_daemo n,	TpCallStreamEndpoint tp_call_stream_endpoint_new (TpDBusDaemon dbus_daemo n,
	const gchar *object_path,	const gchar *object_path,
	TpStreamTransportType transport,	TpStreamTransportType transport,
	gboolean is_ice_lite);	gboolean is_ice_lite);


		_TP_AVAILABLE_IN_0_18
	const gchar *tp_call_stream_endpoint_get_object_path (	const gchar *tp_call_stream_endpoint_get_object_path (
	TpCallStreamEndpoint *self);	TpCallStreamEndpoint *self);


		_TP_AVAILABLE_IN_0_18
	TpStreamEndpointState tp_call_stream_endpoint_get_state (	TpStreamEndpointState tp_call_stream_endpoint_get_state (
	TpCallStreamEndpoint *self,	TpCallStreamEndpoint *self,
	TpStreamComponent component);	TpStreamComponent component);


		_TP_AVAILABLE_IN_0_18
	void tp_call_stream_endpoint_add_new_candidates (TpCallStreamEndpoint *self ,	void tp_call_stream_endpoint_add_new_candidates (TpCallStreamEndpoint *self ,
	const GPtrArray *candidates);	const GPtrArray *candidates);

		_TP_AVAILABLE_IN_0_18
	void tp_call_stream_endpoint_add_new_candidate (TpCallStreamEndpoint *self,	void tp_call_stream_endpoint_add_new_candidate (TpCallStreamEndpoint *self,
	TpStreamComponent component,	TpStreamComponent component,
	const gchar *address,	const gchar *address,
	guint port,	guint port,
	const GHashTable *info_hash);	const GHashTable *info_hash);


		_TP_AVAILABLE_IN_0_18
	void tp_call_stream_endpoint_set_remote_credentials (	void tp_call_stream_endpoint_set_remote_credentials (
	TpCallStreamEndpoint *self,	TpCallStreamEndpoint *self,
	const gchar *username,	const gchar *username,
	const gchar *password);	const gchar *password);

	G_END_DECLS	G_END_DECLS

	#endif /* #ifndef __TP_CALL_STREAM_ENDPOINT_H__*/	#endif /* #ifndef __TP_CALL_STREAM_ENDPOINT_H__*/

End of changes. 8 change blocks.
	0 lines changed or deleted	8 lines changed or added

	call-stream.h	call-stream.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_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>

	G_BEGIN_DECLS	G_BEGIN_DECLS

	#define TP_TYPE_CALL_STREAM (tp_call_stream_get_type ())	#define TP_TYPE_CALL_STREAM (tp_call_stream_get_type ())
	#define TP_CALL_STREAM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TP_TYPE_CAL L_STREAM, TpCallStream))	#define TP_CALL_STREAM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TP_TYPE_CAL L_STREAM, TpCallStream))
	#define TP_CALL_STREAM_CLASS(obj) (G_TYPE_CHECK_CLASS_CAST ((obj), TP_TYPE_ CALL_STREAM, TpCallStreamClass))	#define TP_CALL_STREAM_CLASS(obj) (G_TYPE_CHECK_CLASS_CAST ((obj), TP_TYPE_ CALL_STREAM, TpCallStreamClass))
	#define TP_IS_CALL_STREAM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TP_TYPE_ CALL_STREAM))	#define TP_IS_CALL_STREAM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TP_TYPE_ CALL_STREAM))
	#define TP_IS_CALL_STREAM_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE ((obj), TP_TY PE_CALL_STREAM))	#define TP_IS_CALL_STREAM_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE ((obj), TP_TY PE_CALL_STREAM))
	#define TP_CALL_STREAM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TP _TYPE_CALL_STREAM, TpCallStreamClass))	#define TP_CALL_STREAM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TP _TYPE_CALL_STREAM, TpCallStreamClass))


	skipping to change at line 54	skipping to change at line 55
	TpCallStreamPrivate *priv;	TpCallStreamPrivate *priv;
	};	};

	struct _TpCallStreamClass	struct _TpCallStreamClass
	{	{
	/<private>/	/<private>/
	TpProxyClass parent_class;	TpProxyClass parent_class;
	GCallback _padding[7];	GCallback _padding[7];
	};	};


		_TP_AVAILABLE_IN_0_18
	GType tp_call_stream_get_type (void);	GType tp_call_stream_get_type (void);


		_TP_AVAILABLE_IN_0_18
	void tp_call_stream_init_known_interfaces (void);	void tp_call_stream_init_known_interfaces (void);

	#define TP_CALL_STREAM_FEATURE_CORE \	#define TP_CALL_STREAM_FEATURE_CORE \
	tp_call_stream_get_feature_quark_core ()	tp_call_stream_get_feature_quark_core ()

		_TP_AVAILABLE_IN_0_18
	GQuark tp_call_stream_get_feature_quark_core (void) G_GNUC_CONST;	GQuark tp_call_stream_get_feature_quark_core (void) G_GNUC_CONST;


		_TP_AVAILABLE_IN_0_18
	TpSendingState tp_call_stream_get_local_sending_state (TpCallStream *self);	TpSendingState tp_call_stream_get_local_sending_state (TpCallStream *self);

		_TP_AVAILABLE_IN_0_18
	gboolean tp_call_stream_can_request_receiving (TpCallStream *self);	gboolean tp_call_stream_can_request_receiving (TpCallStream *self);

		_TP_AVAILABLE_IN_0_18
	GHashTable tp_call_stream_get_remote_members (TpCallStream self);	GHashTable tp_call_stream_get_remote_members (TpCallStream self);


		_TP_AVAILABLE_IN_0_18
	void tp_call_stream_set_sending_async (TpCallStream *self,	void tp_call_stream_set_sending_async (TpCallStream *self,
	gboolean send,	gboolean send,
	GAsyncReadyCallback callback,	GAsyncReadyCallback callback,
	gpointer user_data);	gpointer user_data);

		_TP_AVAILABLE_IN_0_18
	gboolean tp_call_stream_set_sending_finish (TpCallStream *self,	gboolean tp_call_stream_set_sending_finish (TpCallStream *self,
	GAsyncResult *result,	GAsyncResult *result,
	GError **error);	GError **error);


		_TP_AVAILABLE_IN_0_18
	void tp_call_stream_request_receiving_async (TpCallStream *self,	void tp_call_stream_request_receiving_async (TpCallStream *self,
	TpContact *contact,	TpContact *contact,
	gboolean receive,	gboolean receive,
	GAsyncReadyCallback callback,	GAsyncReadyCallback callback,
	gpointer user_data);	gpointer user_data);

		_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>	#include <telepathy-glib/_gen/tp-cli-call-stream.h>

	#endif	#endif

End of changes. 11 change blocks.
	0 lines changed or deleted	11 lines changed or added

	capabilities.h	capabilities.h

	skipping to change at line 25	skipping to change at line 25
	* 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_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/enums.h>	#include <telepathy-glib/enums.h>

	G_BEGIN_DECLS	G_BEGIN_DECLS

	typedef struct _TpCapabilities TpCapabilities;	typedef struct _TpCapabilities TpCapabilities;
	typedef struct _TpCapabilitiesClass TpCapabilitiesClass;	typedef struct _TpCapabilitiesClass TpCapabilitiesClass;
	typedef struct _TpCapabilitiesPrivate TpCapabilitiesPrivate;	typedef struct _TpCapabilitiesPrivate TpCapabilitiesPrivate;


		_TP_AVAILABLE_IN_0_18
	GType tp_capabilities_get_type (void) G_GNUC_CONST;	GType tp_capabilities_get_type (void) G_GNUC_CONST;

	#define TP_TYPE_CAPABILITIES \	#define TP_TYPE_CAPABILITIES \
	(tp_capabilities_get_type ())	(tp_capabilities_get_type ())
	#define TP_CAPABILITIES(obj) \	#define TP_CAPABILITIES(obj) \
	(G_TYPE_CHECK_INSTANCE_CAST ((obj), TP_TYPE_CAPABILITIES, \	(G_TYPE_CHECK_INSTANCE_CAST ((obj), TP_TYPE_CAPABILITIES, \
	TpCapabilities))	TpCapabilities))
	#define TP_CAPABILITIES_CLASS(klass) \	#define TP_CAPABILITIES_CLASS(klass) \
	(G_TYPE_CHECK_CLASS_CAST ((klass), TP_TYPE_CAPABILITIES, \	(G_TYPE_CHECK_CLASS_CAST ((klass), TP_TYPE_CAPABILITIES, \
	TpCapabilitiesClass))	TpCapabilitiesClass))
	#define TP_IS_CAPABILITIES(obj) \	#define TP_IS_CAPABILITIES(obj) \
	(G_TYPE_CHECK_INSTANCE_TYPE ((obj), TP_TYPE_CAPABILITIES))	(G_TYPE_CHECK_INSTANCE_TYPE ((obj), TP_TYPE_CAPABILITIES))
	#define TP_IS_CAPABILITIES_CLASS(klass) \	#define TP_IS_CAPABILITIES_CLASS(klass) \
	(G_TYPE_CHECK_CLASS_TYPE ((klass), TP_TYPE_CAPABILITIES))	(G_TYPE_CHECK_CLASS_TYPE ((klass), TP_TYPE_CAPABILITIES))
	#define TP_CAPABILITIES_GET_CLASS(obj) \	#define TP_CAPABILITIES_GET_CLASS(obj) \
	(G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_CAPABILITIES, \	(G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_CAPABILITIES, \
	TpCapabilitiesClass))	TpCapabilitiesClass))

	GPtrArray * tp_capabilities_get_channel_classes (TpCapabilities *self);	GPtrArray * tp_capabilities_get_channel_classes (TpCapabilities *self);


		_TP_AVAILABLE_IN_0_20
		GVariant * tp_capabilities_dup_channel_classes_variant (TpCapabilities *sel
		f);

	gboolean tp_capabilities_is_specific_to_contact (TpCapabilities *self);	gboolean tp_capabilities_is_specific_to_contact (TpCapabilities *self);

	gboolean tp_capabilities_supports_text_chats (TpCapabilities *self);	gboolean tp_capabilities_supports_text_chats (TpCapabilities *self);
	gboolean tp_capabilities_supports_text_chatrooms (TpCapabilities *self);	gboolean tp_capabilities_supports_text_chatrooms (TpCapabilities *self);

		_TP_AVAILABLE_IN_0_20
		gboolean tp_capabilities_supports_sms (TpCapabilities *self);

		_TP_AVAILABLE_IN_0_18
	gboolean tp_capabilities_supports_audio_call (TpCapabilities *self,	gboolean tp_capabilities_supports_audio_call (TpCapabilities *self,
	TpHandleType handle_type);	TpHandleType handle_type);

		_TP_AVAILABLE_IN_0_18
	gboolean tp_capabilities_supports_audio_video_call (TpCapabilities *self,	gboolean tp_capabilities_supports_audio_video_call (TpCapabilities *self,
	TpHandleType handle_type);	TpHandleType handle_type);

		_TP_AVAILABLE_IN_0_18
	gboolean tp_capabilities_supports_file_transfer (TpCapabilities *self);	gboolean tp_capabilities_supports_file_transfer (TpCapabilities *self);

		_TP_AVAILABLE_IN_0_20
		gboolean tp_capabilities_supports_file_transfer_uri (TpCapabilities *self);
		_TP_AVAILABLE_IN_0_20
		gboolean tp_capabilities_supports_file_transfer_description (
		TpCapabilities *self);
		_TP_AVAILABLE_IN_0_20
		gboolean tp_capabilities_supports_file_transfer_timestamp (
		TpCapabilities *self);
		_TP_AVAILABLE_IN_0_20
		gboolean tp_capabilities_supports_file_transfer_initial_offset (
		TpCapabilities *self);

	gboolean tp_capabilities_supports_stream_tubes (TpCapabilities *self,	gboolean tp_capabilities_supports_stream_tubes (TpCapabilities *self,
	TpHandleType handle_type,	TpHandleType handle_type,
	const gchar *service);	const gchar *service);

	gboolean tp_capabilities_supports_dbus_tubes (TpCapabilities *self,	gboolean tp_capabilities_supports_dbus_tubes (TpCapabilities *self,
	TpHandleType handle_type,	TpHandleType handle_type,
	const gchar *service_name);	const gchar *service_name);

	gboolean tp_capabilities_supports_contact_search (TpCapabilities *self,	gboolean tp_capabilities_supports_contact_search (TpCapabilities *self,

End of changes. 7 change blocks.
	0 lines changed or deleted	23 lines changed or added

	channel-dispatch-operation.h	channel-dispatch-operation.h

	skipping to change at line 133	skipping to change at line 133
	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,
	GError **error);	GError **error);


		_TP_AVAILABLE_IN_0_16
	void tp_channel_dispatch_operation_claim_with_async (	void tp_channel_dispatch_operation_claim_with_async (
	TpChannelDispatchOperation *self,	TpChannelDispatchOperation *self,
	TpBaseClient *client,	TpBaseClient *client,
	GAsyncReadyCallback callback,	GAsyncReadyCallback callback,
	gpointer user_data);	gpointer user_data);


		_TP_AVAILABLE_IN_0_16
	gboolean tp_channel_dispatch_operation_claim_with_finish (	gboolean tp_channel_dispatch_operation_claim_with_finish (
	TpChannelDispatchOperation *self,	TpChannelDispatchOperation *self,
	GAsyncResult *result,	GAsyncResult *result,
	GError **error);	GError **error);

	/* Reject API */	/* Reject API */


		_TP_AVAILABLE_IN_0_16
	void tp_channel_dispatch_operation_close_channels_async (	void tp_channel_dispatch_operation_close_channels_async (
	TpChannelDispatchOperation *self,	TpChannelDispatchOperation *self,
	GAsyncReadyCallback callback,	GAsyncReadyCallback callback,
	gpointer user_data);	gpointer user_data);


		_TP_AVAILABLE_IN_0_16
	gboolean tp_channel_dispatch_operation_close_channels_finish (	gboolean tp_channel_dispatch_operation_close_channels_finish (
	TpChannelDispatchOperation *self,	TpChannelDispatchOperation *self,
	GAsyncResult *result,	GAsyncResult *result,
	GError **error);	GError **error);


		_TP_AVAILABLE_IN_0_16
	void tp_channel_dispatch_operation_leave_channels_async (	void tp_channel_dispatch_operation_leave_channels_async (
	TpChannelDispatchOperation *self,	TpChannelDispatchOperation *self,
	TpChannelGroupChangeReason reason,	TpChannelGroupChangeReason reason,
	const gchar *message,	const gchar *message,
	GAsyncReadyCallback callback,	GAsyncReadyCallback callback,
	gpointer user_data);	gpointer user_data);


		_TP_AVAILABLE_IN_0_16
	gboolean tp_channel_dispatch_operation_leave_channels_finish (	gboolean tp_channel_dispatch_operation_leave_channels_finish (
	TpChannelDispatchOperation *self,	TpChannelDispatchOperation *self,
	GAsyncResult *result,	GAsyncResult *result,
	GError **error);	GError **error);


		_TP_AVAILABLE_IN_0_16
	void tp_channel_dispatch_operation_destroy_channels_async (	void tp_channel_dispatch_operation_destroy_channels_async (
	TpChannelDispatchOperation *self,	TpChannelDispatchOperation *self,
	GAsyncReadyCallback callback,	GAsyncReadyCallback callback,
	gpointer user_data);	gpointer user_data);


		_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>	#include <telepathy-glib/_gen/tp-cli-channel-dispatch-operation.h>

	#endif	#endif

End of changes. 8 change blocks.
	0 lines changed or deleted	8 lines changed or added

	channel-dispatcher.h	channel-dispatcher.h

	skipping to change at line 73	skipping to change at line 73
	(G_TYPE_CHECK_CLASS_TYPE ((klass), TP_TYPE_CHANNEL_DISPATCHER))	(G_TYPE_CHECK_CLASS_TYPE ((klass), TP_TYPE_CHANNEL_DISPATCHER))
	#define TP_CHANNEL_DISPATCHER_GET_CLASS(obj) \	#define TP_CHANNEL_DISPATCHER_GET_CLASS(obj) \
	(G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_CHANNEL_DISPATCHER, \	(G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_CHANNEL_DISPATCHER, \
	TpChannelDispatcherClass))	TpChannelDispatcherClass))

	TpChannelDispatcher tp_channel_dispatcher_new (TpDBusDaemon bus_daemon)	TpChannelDispatcher tp_channel_dispatcher_new (TpDBusDaemon bus_daemon)
	G_GNUC_WARN_UNUSED_RESULT;	G_GNUC_WARN_UNUSED_RESULT;

	void tp_channel_dispatcher_init_known_interfaces (void);	void tp_channel_dispatcher_init_known_interfaces (void);


		_TP_AVAILABLE_IN_0_16
	void tp_channel_dispatcher_present_channel_async (TpChannelDispatcher *self ,	void tp_channel_dispatcher_present_channel_async (TpChannelDispatcher *self ,
	TpChannel *channel,	TpChannel *channel,
	gint64 user_action_time,	gint64 user_action_time,
	GAsyncReadyCallback callback,	GAsyncReadyCallback callback,
	gpointer user_data);	gpointer user_data);


		_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>	#include <telepathy-glib/_gen/tp-cli-channel-dispatcher.h>

	#endif	#endif

End of changes. 2 change blocks.
	0 lines changed or deleted	2 lines changed or added

	channel-request.h	channel-request.h

	skipping to change at line 75	skipping to change at line 75
	#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))

	TpChannelRequest tp_channel_request_new (TpDBusDaemon bus_daemon,	TpChannelRequest tp_channel_request_new (TpDBusDaemon bus_daemon,
	const gchar object_path, GHashTable immutable_properties,	const gchar object_path, GHashTable immutable_properties,
	GError **error) G_GNUC_WARN_UNUSED_RESULT;	GError **error) G_GNUC_WARN_UNUSED_RESULT;

	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,	void tp_channel_request_set_channel_factory (TpChannelRequest *self,

	TpClientChannelFactory *factory) _TP_GNUC_DEPRECATED;	TpClientChannelFactory *factory);
		#endif

	const GHashTable * tp_channel_request_get_immutable_properties (	const GHashTable * tp_channel_request_get_immutable_properties (
	TpChannelRequest *self);	TpChannelRequest *self);

	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);


End of changes. 2 change blocks.
	1 lines changed or deleted	4 lines changed or added

	channel.h	channel.h

	skipping to change at line 86	skipping to change at line 86
	TpChannel tp_channel_new (TpConnection conn,	TpChannel tp_channel_new (TpConnection conn,
	const gchar object_path, const gchar optional_channel_type,	const gchar object_path, const gchar optional_channel_type,
	TpHandleType optional_handle_type, TpHandle optional_handle,	TpHandleType optional_handle_type, TpHandle optional_handle,
	GError **error) G_GNUC_WARN_UNUSED_RESULT;	GError **error) G_GNUC_WARN_UNUSED_RESULT;

	TpChannel tp_channel_new_from_properties (TpConnection conn,	TpChannel tp_channel_new_from_properties (TpConnection conn,
	const gchar object_path, const GHashTable immutable_properties,	const gchar object_path, const GHashTable immutable_properties,
	GError **error) G_GNUC_WARN_UNUSED_RESULT;	GError **error) G_GNUC_WARN_UNUSED_RESULT;

	#ifndef TP_DISABLE_DEPRECATED	#ifndef TP_DISABLE_DEPRECATED

		_TP_DEPRECATED_IN_0_18
	gboolean tp_channel_run_until_ready (TpChannel self, GError *error,	gboolean tp_channel_run_until_ready (TpChannel self, GError *error,

	GMainLoop **loop) _TP_GNUC_DEPRECATED;	GMainLoop **loop);

	typedef void (TpChannelWhenReadyCb) (TpChannel channel, const GError *err or,	typedef void (TpChannelWhenReadyCb) (TpChannel channel, const GError *err or,
	gpointer user_data);	gpointer user_data);


		_TP_DEPRECATED_IN_0_18_FOR (tp_proxy_prepare_async)
	void tp_channel_call_when_ready (TpChannel *self,	void tp_channel_call_when_ready (TpChannel *self,
	TpChannelWhenReadyCb callback,	TpChannelWhenReadyCb callback,

	gpointer user_data) _TP_GNUC_DEPRECATED_FOR (tp_proxy_prepare_async);	gpointer user_data);


	gboolean tp_channel_is_ready (TpChannel *self)	_TP_DEPRECATED_IN_0_18_FOR (tp_proxy_is_prepared)
	_TP_GNUC_DEPRECATED_FOR (tp_proxy_is_ready);	gboolean tp_channel_is_ready (TpChannel *self);
	#endif	#endif

	void tp_channel_init_known_interfaces (void);	void tp_channel_init_known_interfaces (void);


		TpConnection tp_channel_borrow_connection (TpChannel self);
		GHashTable tp_channel_borrow_immutable_properties (TpChannel self);

		void tp_channel_leave_async (TpChannel *self,
		TpChannelGroupChangeReason reason,
		const gchar *message,
		GAsyncReadyCallback callback,
		gpointer user_data);

		gboolean tp_channel_leave_finish (TpChannel *self,
		GAsyncResult *result,
		GError **error);

		void tp_channel_close_async (TpChannel *self,
		GAsyncReadyCallback callback,
		gpointer user_data);

		gboolean tp_channel_close_finish (TpChannel *self,
		GAsyncResult *result,
		GError **error);

		_TP_AVAILABLE_IN_0_16
		void tp_channel_destroy_async (TpChannel *self,
		GAsyncReadyCallback callback,
		gpointer user_data);

		_TP_AVAILABLE_IN_0_16
		gboolean tp_channel_destroy_finish (TpChannel *self,
		GAsyncResult *result,
		GError **error);

		gboolean tp_channel_get_requested (TpChannel *self);

		#define TP_CHANNEL_FEATURE_CORE \
		tp_channel_get_feature_quark_core ()

		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);

	TpConnection tp_channel_borrow_connection (TpChannel self);
	GHashTable tp_channel_borrow_immutable_properties (TpChannel self);


	TpHandle tp_channel_group_get_self_handle (TpChannel *self);	#ifndef TP_DISABLE_DEPRECATED
		_TP_DEPRECATED_IN_0_20_FOR (tp_channel_get_initiator_contact)
		TpHandle tp_channel_get_initiator_handle (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 \
		tp_channel_get_feature_quark_group ()
		GQuark tp_channel_get_feature_quark_group (void) G_GNUC_CONST;

	TpChannelGroupFlags tp_channel_group_get_flags (TpChannel *self);	TpChannelGroupFlags tp_channel_group_get_flags (TpChannel *self);


		#ifndef TP_DISABLE_DEPRECATED
		_TP_DEPRECATED_IN_0_20_FOR (tp_channel_group_get_self_contact)
		TpHandle tp_channel_group_get_self_handle (TpChannel *self);

		_TP_DEPRECATED_IN_0_20_FOR (tp_channel_group_dup_members_contacts)
	const TpIntset tp_channel_group_get_members (TpChannel self);	const TpIntset tp_channel_group_get_members (TpChannel self);


		_TP_DEPRECATED_IN_0_20_FOR (tp_channel_group_dup_local_pending_contacts)
	const TpIntset tp_channel_group_get_local_pending (TpChannel self);	const TpIntset tp_channel_group_get_local_pending (TpChannel self);


		_TP_DEPRECATED_IN_0_20_FOR (tp_channel_group_dup_remote_pending_contacts)
	const TpIntset tp_channel_group_get_remote_pending (TpChannel self);	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,	TpHandle local_pending, TpHandle *actor,
	TpChannelGroupChangeReason reason, const gchar *message);	TpChannelGroupChangeReason reason, const gchar *message);


		_TP_DEPRECATED_IN_0_20_FOR (tp_channel_group_get_contact_owner)
	TpHandle tp_channel_group_get_handle_owner (TpChannel *self, TpHandle handl e);	TpHandle tp_channel_group_get_handle_owner (TpChannel *self, TpHandle handl e);

		#endif


	gboolean tp_channel_get_requested (TpChannel *self);	_TP_AVAILABLE_IN_0_16
		void tp_channel_join_async (TpChannel *self,
	TpHandle tp_channel_get_initiator_handle (TpChannel *self);	const gchar *message,
	const gchar * tp_channel_get_initiator_identifier (TpChannel *self);	GAsyncReadyCallback callback,
		gpointer user_data);
	#define TP_CHANNEL_FEATURE_CORE \
	tp_channel_get_feature_quark_core ()

	GQuark tp_channel_get_feature_quark_core (void) G_GNUC_CONST;


	#define TP_CHANNEL_FEATURE_GROUP \	_TP_AVAILABLE_IN_0_16
	tp_channel_get_feature_quark_group ()	gboolean tp_channel_join_finish (TpChannel *self,
	GQuark tp_channel_get_feature_quark_group (void) G_GNUC_CONST;	GAsyncResult *result,
		GError **error);

	#define TP_CHANNEL_FEATURE_CONTACTS \	#define TP_CHANNEL_FEATURE_CONTACTS \
	tp_channel_get_feature_quark_contacts ()	tp_channel_get_feature_quark_contacts ()

		_TP_AVAILABLE_IN_0_16
	GQuark tp_channel_get_feature_quark_contacts (void) G_GNUC_CONST;	GQuark tp_channel_get_feature_quark_contacts (void) G_GNUC_CONST;


		_TP_AVAILABLE_IN_0_16
	TpContact tp_channel_get_target_contact (TpChannel self);	TpContact tp_channel_get_target_contact (TpChannel self);

		_TP_AVAILABLE_IN_0_16
	TpContact tp_channel_get_initiator_contact (TpChannel self);	TpContact tp_channel_get_initiator_contact (TpChannel self);

		_TP_AVAILABLE_IN_0_16
	TpContact tp_channel_group_get_self_contact (TpChannel self);	TpContact tp_channel_group_get_self_contact (TpChannel self);

		_TP_AVAILABLE_IN_0_16
	GPtrArray tp_channel_group_dup_members_contacts (TpChannel self);	GPtrArray tp_channel_group_dup_members_contacts (TpChannel self);

		_TP_AVAILABLE_IN_0_16
	GPtrArray tp_channel_group_dup_local_pending_contacts (TpChannel self);	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);	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,	gboolean tp_channel_group_get_local_pending_contact_info (TpChannel *self,
	TpContact local_pending, TpContact *actor,	TpContact local_pending, TpContact *actor,
	TpChannelGroupChangeReason reason, const gchar *message);	TpChannelGroupChangeReason reason, const gchar *message);

		_TP_AVAILABLE_IN_0_16
	TpContact tp_channel_group_get_contact_owner (TpChannel self,	TpContact tp_channel_group_get_contact_owner (TpChannel self,
	TpContact *contact);	TpContact *contact);

	#define TP_CHANNEL_FEATURE_CHAT_STATES \	#define TP_CHANNEL_FEATURE_CHAT_STATES \
	tp_channel_get_feature_quark_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;	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,	TpChannelChatState tp_channel_get_chat_state (TpChannel *self,
	TpHandle contact);	TpHandle contact);


	void tp_channel_join_async (TpChannel *self,
	const gchar *message,
	GAsyncReadyCallback callback,
	gpointer user_data);

	gboolean tp_channel_join_finish (TpChannel *self,
	GAsyncResult *result,
	GError **error);

	void tp_channel_leave_async (TpChannel *self,
	TpChannelGroupChangeReason reason,
	const gchar *message,
	GAsyncReadyCallback callback,
	gpointer user_data);

	gboolean tp_channel_leave_finish (TpChannel *self,
	GAsyncResult *result,
	GError **error);

	void tp_channel_close_async (TpChannel *self,
	GAsyncReadyCallback callback,
	gpointer user_data);

	gboolean tp_channel_close_finish (TpChannel *self,
	GAsyncResult *result,
	GError **error);

	void tp_channel_destroy_async (TpChannel *self,
	GAsyncReadyCallback callback,
	gpointer user_data);

	gboolean tp_channel_destroy_finish (TpChannel *self,
	GAsyncResult *result,
	GError **error);

	/* 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
	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
	gboolean tp_channel_password_needed (TpChannel *self);	gboolean tp_channel_password_needed (TpChannel *self);


		_TP_AVAILABLE_IN_0_16
	void tp_channel_provide_password_async (TpChannel *self,	void tp_channel_provide_password_async (TpChannel *self,
	const gchar *password,	const gchar *password,
	GAsyncReadyCallback callback,	GAsyncReadyCallback callback,
	gpointer user_data);	gpointer user_data);


		_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>	#include <telepathy-glib/_gen/tp-cli-channel.h>

	#endif	#endif

End of changes. 32 change blocks.
	54 lines changed or deleted	96 lines changed or added

	cm-message.h	cm-message.h

	skipping to change at line 27	skipping to change at line 27
	* 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_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/message.h>	#include <telepathy-glib/message.h>

	G_BEGIN_DECLS	G_BEGIN_DECLS

	#define TP_TYPE_CM_MESSAGE (tp_cm_message_get_type ())	#define TP_TYPE_CM_MESSAGE (tp_cm_message_get_type ())
	#define TP_CM_MESSAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TP_TYPE_CM_M ESSAGE, TpCMMessage))	#define TP_CM_MESSAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TP_TYPE_CM_M ESSAGE, TpCMMessage))
	#define TP_CM_MESSAGE_CLASS(obj) (G_TYPE_CHECK_CLASS_CAST ((obj), TP_TYPE_C M_MESSAGE, TpCMMessageClass))	#define TP_CM_MESSAGE_CLASS(obj) (G_TYPE_CHECK_CLASS_CAST ((obj), TP_TYPE_C M_MESSAGE, TpCMMessageClass))
	#define TP_IS_CM_MESSAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TP_TYPE_C M_MESSAGE))	#define TP_IS_CM_MESSAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TP_TYPE_C M_MESSAGE))
	#define TP_IS_CM_MESSAGE_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE ((obj), TP_TYP E_CM_MESSAGE))	#define TP_IS_CM_MESSAGE_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE ((obj), TP_TYP E_CM_MESSAGE))
	#define TP_CM_MESSAGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TP_ TYPE_CM_MESSAGE, TpCMMessageClass))	#define TP_CM_MESSAGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TP_ TYPE_CM_MESSAGE, TpCMMessageClass))

	skipping to change at line 51	skipping to change at line 52
	GType tp_cm_message_get_type (void);	GType tp_cm_message_get_type (void);

	TpMessage * tp_cm_message_new (TpBaseConnection *connection,	TpMessage * tp_cm_message_new (TpBaseConnection *connection,
	guint initial_parts);	guint initial_parts);

	TpMessage tp_cm_message_new_text (TpBaseConnection conn,	TpMessage tp_cm_message_new_text (TpBaseConnection conn,
	TpHandle sender,	TpHandle sender,
	TpChannelTextMessageType type,	TpChannelTextMessageType type,
	const gchar *text);	const gchar *text);


		_TP_AVAILABLE_IN_0_16
	void tp_cm_message_set_message (TpMessage *self,	void tp_cm_message_set_message (TpMessage *self,
	guint part,	guint part,
	const gchar *key,	const gchar *key,
	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	#ifndef TP_DISABLE_DEPRECATED

		_TP_DEPRECATED
	TpMessage tp_message_new (TpBaseConnection connection,	TpMessage tp_message_new (TpBaseConnection connection,
	guint initial_parts,	guint initial_parts,
	guint size_hint) G_GNUC_WARN_UNUSED_RESULT;	guint size_hint) G_GNUC_WARN_UNUSED_RESULT;
	#endif	#endif

	G_END_DECLS	G_END_DECLS

	#endif /* __TP_CM_MESSAGE_H__ */	#endif /* __TP_CM_MESSAGE_H__ */

End of changes. 3 change blocks.
	0 lines changed or deleted	3 lines changed or added

	connection-contact-list.h	connection-contact-list.h

	skipping to change at line 27	skipping to change at line 27
	* 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_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>

	G_BEGIN_DECLS	G_BEGIN_DECLS

	#define TP_CONNECTION_FEATURE_CONTACT_LIST \	#define TP_CONNECTION_FEATURE_CONTACT_LIST \
	(tp_connection_get_feature_quark_contact_list ())	(tp_connection_get_feature_quark_contact_list ())

		_TP_AVAILABLE_IN_0_16
	GQuark tp_connection_get_feature_quark_contact_list (void) G_GNUC_CONST;	GQuark tp_connection_get_feature_quark_contact_list (void) G_GNUC_CONST;

	#define TP_CONNECTION_FEATURE_CONTACT_LIST_PROPERTIES \	#define TP_CONNECTION_FEATURE_CONTACT_LIST_PROPERTIES \
	(tp_connection_get_feature_quark_contact_list_properties ())	(tp_connection_get_feature_quark_contact_list_properties ())

		_TP_AVAILABLE_IN_0_18
	GQuark tp_connection_get_feature_quark_contact_list_properties (void) G_GNU C_CONST;	GQuark tp_connection_get_feature_quark_contact_list_properties (void) G_GNU C_CONST;


		_TP_AVAILABLE_IN_0_16
	TpContactListState tp_connection_get_contact_list_state (TpConnection *self );	TpContactListState tp_connection_get_contact_list_state (TpConnection *self );

		_TP_AVAILABLE_IN_0_16
	gboolean tp_connection_get_contact_list_persists (TpConnection *self);	gboolean tp_connection_get_contact_list_persists (TpConnection *self);

		_TP_AVAILABLE_IN_0_16
	gboolean tp_connection_get_can_change_contact_list (TpConnection *self);	gboolean tp_connection_get_can_change_contact_list (TpConnection *self);

		_TP_AVAILABLE_IN_0_16
	gboolean tp_connection_get_request_uses_message (TpConnection *self);	gboolean tp_connection_get_request_uses_message (TpConnection *self);

		_TP_AVAILABLE_IN_0_16
	GPtrArray tp_connection_dup_contact_list (TpConnection self);	GPtrArray tp_connection_dup_contact_list (TpConnection self);


		_TP_AVAILABLE_IN_0_16
	void tp_connection_request_subscription_async (TpConnection *self,	void tp_connection_request_subscription_async (TpConnection *self,
	guint n_contacts,	guint n_contacts,
	TpContact * const *contacts,	TpContact * const *contacts,
	const gchar *message,	const gchar *message,
	GAsyncReadyCallback callback,	GAsyncReadyCallback callback,
	gpointer user_data);	gpointer user_data);

		_TP_AVAILABLE_IN_0_16
	gboolean tp_connection_request_subscription_finish (TpConnection *self,	gboolean tp_connection_request_subscription_finish (TpConnection *self,
	GAsyncResult *result,	GAsyncResult *result,
	GError **error);	GError **error);


		_TP_AVAILABLE_IN_0_16
	void tp_connection_authorize_publication_async (TpConnection *self,	void tp_connection_authorize_publication_async (TpConnection *self,
	guint n_contacts,	guint n_contacts,
	TpContact * const *contacts,	TpContact * const *contacts,
	GAsyncReadyCallback callback,	GAsyncReadyCallback callback,
	gpointer user_data);	gpointer user_data);

		_TP_AVAILABLE_IN_0_16
	gboolean tp_connection_authorize_publication_finish (TpConnection *self,	gboolean tp_connection_authorize_publication_finish (TpConnection *self,
	GAsyncResult *result,	GAsyncResult *result,
	GError **error);	GError **error);


		_TP_AVAILABLE_IN_0_16
	void tp_connection_remove_contacts_async (TpConnection *self,	void tp_connection_remove_contacts_async (TpConnection *self,
	guint n_contacts,	guint n_contacts,
	TpContact * const *contacts,	TpContact * const *contacts,
	GAsyncReadyCallback callback,	GAsyncReadyCallback callback,
	gpointer user_data);	gpointer user_data);

		_TP_AVAILABLE_IN_0_16
	gboolean tp_connection_remove_contacts_finish (TpConnection *self,	gboolean tp_connection_remove_contacts_finish (TpConnection *self,
	GAsyncResult *result,	GAsyncResult *result,
	GError **error);	GError **error);


		_TP_AVAILABLE_IN_0_16
	void tp_connection_unsubscribe_async (TpConnection *self,	void tp_connection_unsubscribe_async (TpConnection *self,
	guint n_contacts,	guint n_contacts,
	TpContact * const *contacts,	TpContact * const *contacts,
	GAsyncReadyCallback callback,	GAsyncReadyCallback callback,
	gpointer user_data);	gpointer user_data);

		_TP_AVAILABLE_IN_0_16
	gboolean tp_connection_unsubscribe_finish (TpConnection *self,	gboolean tp_connection_unsubscribe_finish (TpConnection *self,
	GAsyncResult *result,	GAsyncResult *result,
	GError **error);	GError **error);


		_TP_AVAILABLE_IN_0_16
	void tp_connection_unpublish_async (TpConnection *self,	void tp_connection_unpublish_async (TpConnection *self,
	guint n_contacts,	guint n_contacts,
	TpContact * const *contacts,	TpContact * const *contacts,
	GAsyncReadyCallback callback,	GAsyncReadyCallback callback,
	gpointer user_data);	gpointer user_data);

		_TP_AVAILABLE_IN_0_16
	gboolean tp_connection_unpublish_finish (TpConnection *self,	gboolean tp_connection_unpublish_finish (TpConnection *self,
	GAsyncResult *result,	GAsyncResult *result,
	GError **error);	GError **error);

	#define TP_CONNECTION_FEATURE_CONTACT_GROUPS \	#define TP_CONNECTION_FEATURE_CONTACT_GROUPS \
	(tp_connection_get_feature_quark_contact_groups ())	(tp_connection_get_feature_quark_contact_groups ())

		_TP_AVAILABLE_IN_0_16
	GQuark tp_connection_get_feature_quark_contact_groups (void) G_GNUC_CONST;	GQuark tp_connection_get_feature_quark_contact_groups (void) G_GNUC_CONST;


		_TP_AVAILABLE_IN_0_16
	gboolean tp_connection_get_disjoint_groups (TpConnection *self);	gboolean tp_connection_get_disjoint_groups (TpConnection *self);

		_TP_AVAILABLE_IN_0_16
	TpContactMetadataStorageType tp_connection_get_group_storage (TpConnection *self);	TpContactMetadataStorageType tp_connection_get_group_storage (TpConnection *self);

		_TP_AVAILABLE_IN_0_16
	const gchar * const tp_connection_get_contact_groups (TpConnection self);	const gchar * const tp_connection_get_contact_groups (TpConnection self);


		_TP_AVAILABLE_IN_0_16
	void tp_connection_set_group_members_async (TpConnection *self,	void tp_connection_set_group_members_async (TpConnection *self,
	const gchar *group,	const gchar *group,
	guint n_contacts,	guint n_contacts,
	TpContact * const *contacts,	TpContact * const *contacts,
	GAsyncReadyCallback callback,	GAsyncReadyCallback callback,
	gpointer user_data);	gpointer user_data);

		_TP_AVAILABLE_IN_0_16
	gboolean tp_connection_set_group_members_finish (TpConnection *self,	gboolean tp_connection_set_group_members_finish (TpConnection *self,
	GAsyncResult *result,	GAsyncResult *result,
	GError **error);	GError **error);


		_TP_AVAILABLE_IN_0_16
	void tp_connection_add_to_group_async (TpConnection *self,	void tp_connection_add_to_group_async (TpConnection *self,
	const gchar *group,	const gchar *group,
	guint n_contacts,	guint n_contacts,
	TpContact * const *contacts,	TpContact * const *contacts,
	GAsyncReadyCallback callback,	GAsyncReadyCallback callback,
	gpointer user_data);	gpointer user_data);

		_TP_AVAILABLE_IN_0_16
	gboolean tp_connection_add_to_group_finish (TpConnection *self,	gboolean tp_connection_add_to_group_finish (TpConnection *self,
	GAsyncResult *result,	GAsyncResult *result,
	GError **error);	GError **error);


		_TP_AVAILABLE_IN_0_16
	void tp_connection_remove_from_group_async (TpConnection *self,	void tp_connection_remove_from_group_async (TpConnection *self,
	const gchar *group,	const gchar *group,
	guint n_contacts,	guint n_contacts,
	TpContact * const *contacts,	TpContact * const *contacts,
	GAsyncReadyCallback callback,	GAsyncReadyCallback callback,
	gpointer user_data);	gpointer user_data);

		_TP_AVAILABLE_IN_0_16
	gboolean tp_connection_remove_from_group_finish (TpConnection *self,	gboolean tp_connection_remove_from_group_finish (TpConnection *self,
	GAsyncResult *result,	GAsyncResult *result,
	GError **error);	GError **error);


		_TP_AVAILABLE_IN_0_16
	void tp_connection_remove_group_async (TpConnection *self,	void tp_connection_remove_group_async (TpConnection *self,
	const gchar *group,	const gchar *group,
	GAsyncReadyCallback callback,	GAsyncReadyCallback callback,
	gpointer user_data);	gpointer user_data);

		_TP_AVAILABLE_IN_0_16
	gboolean tp_connection_remove_group_finish (TpConnection *self,	gboolean tp_connection_remove_group_finish (TpConnection *self,
	GAsyncResult *result,	GAsyncResult *result,
	GError **error);	GError **error);


		_TP_AVAILABLE_IN_0_16
	void tp_connection_rename_group_async (TpConnection *self,	void tp_connection_rename_group_async (TpConnection *self,
	const gchar *old_name,	const gchar *old_name,
	const gchar *new_name,	const gchar *new_name,
	GAsyncReadyCallback callback,	GAsyncReadyCallback callback,
	gpointer user_data);	gpointer user_data);

		_TP_AVAILABLE_IN_0_16
	gboolean tp_connection_rename_group_finish (TpConnection *self,	gboolean tp_connection_rename_group_finish (TpConnection *self,
	GAsyncResult *result,	GAsyncResult *result,
	GError **error);	GError **error);

	/* ContactBlocking */	/* ContactBlocking */


		_TP_AVAILABLE_IN_0_18
	void tp_connection_block_contacts_async (TpConnection *self,	void tp_connection_block_contacts_async (TpConnection *self,
	guint n_contacts,	guint n_contacts,
	TpContact * const *contacts,	TpContact * const *contacts,
	gboolean report_abusive,	gboolean report_abusive,
	GAsyncReadyCallback callback,	GAsyncReadyCallback callback,
	gpointer user_data);	gpointer user_data);

		_TP_AVAILABLE_IN_0_18
	gboolean tp_connection_block_contacts_finish (TpConnection *self,	gboolean tp_connection_block_contacts_finish (TpConnection *self,
	GAsyncResult *result,	GAsyncResult *result,
	GError **error);	GError **error);


		_TP_AVAILABLE_IN_0_18
	void tp_connection_unblock_contacts_async (TpConnection *self,	void tp_connection_unblock_contacts_async (TpConnection *self,
	guint n_contacts,	guint n_contacts,
	TpContact * const *contacts,	TpContact * const *contacts,
	GAsyncReadyCallback callback,	GAsyncReadyCallback callback,
	gpointer user_data);	gpointer user_data);

		_TP_AVAILABLE_IN_0_18
	gboolean tp_connection_unblock_contacts_finish (TpConnection *self,	gboolean tp_connection_unblock_contacts_finish (TpConnection *self,
	GAsyncResult *result,	GAsyncResult *result,
	GError **error);	GError **error);

	#define TP_CONNECTION_FEATURE_CONTACT_BLOCKING \	#define TP_CONNECTION_FEATURE_CONTACT_BLOCKING \
	(tp_connection_get_feature_quark_contact_blocking ())	(tp_connection_get_feature_quark_contact_blocking ())

		_TP_AVAILABLE_IN_0_18
	GQuark tp_connection_get_feature_quark_contact_blocking (void) G_GNUC_CONST ;	GQuark tp_connection_get_feature_quark_contact_blocking (void) G_GNUC_CONST ;


		_TP_AVAILABLE_IN_0_18
	gboolean tp_connection_can_report_abusive (TpConnection *self);	gboolean tp_connection_can_report_abusive (TpConnection *self);


		_TP_AVAILABLE_IN_0_18
	GPtrArray * tp_connection_get_blocked_contacts (TpConnection *self);	GPtrArray * tp_connection_get_blocked_contacts (TpConnection *self);

	G_END_DECLS	G_END_DECLS

	#endif	#endif

End of changes. 39 change blocks.
	0 lines changed or deleted	39 lines changed or added

	contact-operations.h	contact-operations.h

	skipping to change at line 24	skipping to change at line 24
	*	*
	* 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_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>

	G_BEGIN_DECLS	G_BEGIN_DECLS


		_TP_AVAILABLE_IN_0_16
	void tp_contact_request_subscription_async (TpContact *self,	void tp_contact_request_subscription_async (TpContact *self,
	const gchar *message,	const gchar *message,
	GAsyncReadyCallback callback,	GAsyncReadyCallback callback,
	gpointer user_data);	gpointer user_data);

		_TP_AVAILABLE_IN_0_16
	gboolean tp_contact_request_subscription_finish (TpContact *self,	gboolean tp_contact_request_subscription_finish (TpContact *self,
	GAsyncResult *result,	GAsyncResult *result,
	GError **error);	GError **error);


		_TP_AVAILABLE_IN_0_16
	void tp_contact_authorize_publication_async (TpContact *self,	void tp_contact_authorize_publication_async (TpContact *self,
	GAsyncReadyCallback callback,	GAsyncReadyCallback callback,
	gpointer user_data);	gpointer user_data);

		_TP_AVAILABLE_IN_0_16
	gboolean tp_contact_authorize_publication_finish (TpContact *self,	gboolean tp_contact_authorize_publication_finish (TpContact *self,
	GAsyncResult *result,	GAsyncResult *result,
	GError **error);	GError **error);


		_TP_AVAILABLE_IN_0_16
	void tp_contact_remove_async (TpContact *self,	void tp_contact_remove_async (TpContact *self,
	GAsyncReadyCallback callback,	GAsyncReadyCallback callback,
	gpointer user_data);	gpointer user_data);

		_TP_AVAILABLE_IN_0_16
	gboolean tp_contact_remove_finish (TpContact *self,	gboolean tp_contact_remove_finish (TpContact *self,
	GAsyncResult *result,	GAsyncResult *result,
	GError **error);	GError **error);


		_TP_AVAILABLE_IN_0_16
	void tp_contact_unsubscribe_async (TpContact *self,	void tp_contact_unsubscribe_async (TpContact *self,
	GAsyncReadyCallback callback,	GAsyncReadyCallback callback,
	gpointer user_data);	gpointer user_data);

		_TP_AVAILABLE_IN_0_16
	gboolean tp_contact_unsubscribe_finish (TpContact *self,	gboolean tp_contact_unsubscribe_finish (TpContact *self,
	GAsyncResult *result,	GAsyncResult *result,
	GError **error);	GError **error);


		_TP_AVAILABLE_IN_0_16
	void tp_contact_unpublish_async (TpContact *self,	void tp_contact_unpublish_async (TpContact *self,
	GAsyncReadyCallback callback,	GAsyncReadyCallback callback,
	gpointer user_data);	gpointer user_data);

		_TP_AVAILABLE_IN_0_16
	gboolean tp_contact_unpublish_finish (TpContact *self,	gboolean tp_contact_unpublish_finish (TpContact *self,
	GAsyncResult *result,	GAsyncResult *result,
	GError **error);	GError **error);


		_TP_AVAILABLE_IN_0_16
	void tp_contact_add_to_group_async (TpContact *self,	void tp_contact_add_to_group_async (TpContact *self,
	const gchar *group,	const gchar *group,
	GAsyncReadyCallback callback,	GAsyncReadyCallback callback,
	gpointer user_data);	gpointer user_data);

		_TP_AVAILABLE_IN_0_16
	gboolean tp_contact_add_to_group_finish (TpContact *self,	gboolean tp_contact_add_to_group_finish (TpContact *self,
	GAsyncResult *result,	GAsyncResult *result,
	GError **error);	GError **error);


		_TP_AVAILABLE_IN_0_16
	void tp_contact_remove_from_group_async (TpContact *self,	void tp_contact_remove_from_group_async (TpContact *self,
	const gchar *group,	const gchar *group,
	GAsyncReadyCallback callback,	GAsyncReadyCallback callback,
	gpointer user_data);	gpointer user_data);

		_TP_AVAILABLE_IN_0_16
	gboolean tp_contact_remove_from_group_finish (TpContact *self,	gboolean tp_contact_remove_from_group_finish (TpContact *self,
	GAsyncResult *result,	GAsyncResult *result,
	GError **error);	GError **error);

	/* ContactBlocking */	/* ContactBlocking */


		_TP_AVAILABLE_IN_0_18
	void tp_contact_block_async (TpContact *self,	void tp_contact_block_async (TpContact *self,
	gboolean report_abusive,	gboolean report_abusive,
	GAsyncReadyCallback callback,	GAsyncReadyCallback callback,
	gpointer user_data);	gpointer user_data);

		_TP_AVAILABLE_IN_0_18
	gboolean tp_contact_block_finish (TpContact *self,	gboolean tp_contact_block_finish (TpContact *self,
	GAsyncResult *result,	GAsyncResult *result,
	GError **error);	GError **error);


		_TP_AVAILABLE_IN_0_18
	void tp_contact_unblock_async (TpContact *self,	void tp_contact_unblock_async (TpContact *self,
	GAsyncReadyCallback callback,	GAsyncReadyCallback callback,
	gpointer user_data);	gpointer user_data);

		_TP_AVAILABLE_IN_0_18
	gboolean tp_contact_unblock_finish (TpContact *self,	gboolean tp_contact_unblock_finish (TpContact *self,
	GAsyncResult *result,	GAsyncResult *result,
	GError **error);	GError **error);

	G_END_DECLS	G_END_DECLS

	#endif	#endif

End of changes. 19 change blocks.
	0 lines changed or deleted	19 lines changed or added

	contact.h	contact.h

	skipping to change at line 29	skipping to change at line 29
	*/	*/

	#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>

		#include <telepathy-glib/defs.h>
	#include <telepathy-glib/handle.h>	#include <telepathy-glib/handle.h>

	#include <telepathy-glib/_gen/genums.h>	#include <telepathy-glib/_gen/genums.h>

	G_BEGIN_DECLS	G_BEGIN_DECLS

	/* TpContact is forward-declared in connection.h */	/* TpContact is forward-declared in connection.h */
	typedef struct _TpContactClass TpContactClass;	typedef struct _TpContactClass TpContactClass;
	typedef struct _TpContactPrivate TpContactPrivate;	typedef struct _TpContactPrivate TpContactPrivate;


	skipping to change at line 70	skipping to change at line 71
	TP_CONTACT_FEATURE_PRESENCE,	TP_CONTACT_FEATURE_PRESENCE,
	TP_CONTACT_FEATURE_LOCATION,	TP_CONTACT_FEATURE_LOCATION,
	TP_CONTACT_FEATURE_CAPABILITIES,	TP_CONTACT_FEATURE_CAPABILITIES,
	TP_CONTACT_FEATURE_AVATAR_DATA,	TP_CONTACT_FEATURE_AVATAR_DATA,
	TP_CONTACT_FEATURE_CONTACT_INFO,	TP_CONTACT_FEATURE_CONTACT_INFO,
	TP_CONTACT_FEATURE_CLIENT_TYPES,	TP_CONTACT_FEATURE_CLIENT_TYPES,
	TP_CONTACT_FEATURE_SUBSCRIPTION_STATES,	TP_CONTACT_FEATURE_SUBSCRIPTION_STATES,
	TP_CONTACT_FEATURE_CONTACT_GROUPS,	TP_CONTACT_FEATURE_CONTACT_GROUPS,
	TP_CONTACT_FEATURE_CONTACT_BLOCKING,	TP_CONTACT_FEATURE_CONTACT_BLOCKING,
	} TpContactFeature;	} TpContactFeature;

	#define NUM_TP_CONTACT_FEATURES (TP_CONTACT_FEATURE_CONTACT_BLOCKING + 1)	#define TP_NUM_CONTACT_FEATURES (TP_CONTACT_FEATURE_CONTACT_BLOCKING + 1)
		#define NUM_TP_CONTACT_FEATURES TP_NUM_CONTACT_FEATURES
	#define TP_CONTACT_FEATURE_INVALID ((TpContactFeature) -1)	#define TP_CONTACT_FEATURE_INVALID ((TpContactFeature) -1)

	/* Basic functionality, always available */	/* Basic functionality, always available */

		_TP_AVAILABLE_IN_0_20
		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, TpContactFeature 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);

	skipping to change at line 133	skipping to change at line 137
	/* 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,	typedef void (TpConnectionContactsByHandleCb) (TpConnection connection,
	guint n_contacts, TpContact * const *contacts,	guint n_contacts, TpContact * const *contacts,
	guint n_failed, const TpHandle *failed,	guint n_failed, const TpHandle *failed,
	const GError error, gpointer user_data, GObject weak_object);	const GError error, gpointer user_data, GObject weak_object);


		_TP_DEPRECATED_IN_0_20
	void tp_connection_get_contacts_by_handle (TpConnection *self,	void tp_connection_get_contacts_by_handle (TpConnection *self,
	guint n_handles, const TpHandle *handles,	guint n_handles, const TpHandle *handles,
	guint n_features, const TpContactFeature *features,	guint n_features, const TpContactFeature *features,
	TpConnectionContactsByHandleCb callback,	TpConnectionContactsByHandleCb callback,
	gpointer user_data, GDestroyNotify destroy, GObject *weak_object);	gpointer user_data, GDestroyNotify destroy, GObject *weak_object);

	typedef void (TpConnectionUpgradeContactsCb) (TpConnection connection,	typedef void (TpConnectionUpgradeContactsCb) (TpConnection connection,
	guint n_contacts, TpContact * const *contacts,	guint n_contacts, TpContact * const *contacts,
	const GError error, gpointer user_data, GObject weak_object);	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,	void tp_connection_upgrade_contacts (TpConnection *self,
	guint n_contacts, TpContact * const *contacts,	guint n_contacts, TpContact * const *contacts,
	guint n_features, const TpContactFeature *features,	guint n_features, const TpContactFeature *features,
	TpConnectionUpgradeContactsCb callback,	TpConnectionUpgradeContactsCb callback,
	gpointer user_data, GDestroyNotify destroy, GObject *weak_object);	gpointer user_data, GDestroyNotify destroy, GObject *weak_object);

	typedef void (TpConnectionContactsByIdCb) (TpConnection connection,	typedef void (TpConnectionContactsByIdCb) (TpConnection connection,
	guint n_contacts, TpContact * const *contacts,	guint n_contacts, TpContact * const *contacts,
	const gchar * const requested_ids, GHashTable failed_id_errors,	const gchar * const requested_ids, GHashTable failed_id_errors,
	const GError error, gpointer user_data, GObject weak_object);	const GError error, gpointer user_data, GObject weak_object);


		_TP_DEPRECATED_IN_0_20_FOR(tp_connection_get_contact_by_id_async)
	void tp_connection_get_contacts_by_id (TpConnection *self,	void tp_connection_get_contacts_by_id (TpConnection *self,
	guint n_ids, const gchar * const *ids,	guint n_ids, const gchar * const *ids,
	guint n_features, const TpContactFeature *features,	guint n_features, const TpContactFeature *features,
	TpConnectionContactsByIdCb callback,	TpConnectionContactsByIdCb callback,
	gpointer user_data, GDestroyNotify destroy, GObject *weak_object);	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
		void tp_connection_dup_contact_by_id_async (TpConnection *self,
		const gchar *id,
		guint n_features,
		const TpContactFeature *features,
		GAsyncReadyCallback callback,
		gpointer user_data);
		_TP_AVAILABLE_IN_0_20
		TpContact tp_connection_dup_contact_by_id_finish (TpConnection self,
		GAsyncResult *result,
		GError **error);

		_TP_AVAILABLE_IN_0_20
		void tp_connection_upgrade_contacts_async (TpConnection *self,
		guint n_contacts,
		TpContact * const *contacts,
		guint n_features,
		const TpContactFeature *features,
		GAsyncReadyCallback callback,
		gpointer user_data);
		_TP_AVAILABLE_IN_0_20
		gboolean tp_connection_upgrade_contacts_finish (TpConnection *self,
		GAsyncResult *result,
		GPtrArray **contacts,
		GError **error);

	/* TP_CONTACT_FEATURE_CONTACT_BLOCKING */	/* TP_CONTACT_FEATURE_CONTACT_BLOCKING */


		_TP_AVAILABLE_IN_0_18
	gboolean tp_contact_is_blocked (TpContact *self);	gboolean tp_contact_is_blocked (TpContact *self);

	G_END_DECLS	G_END_DECLS

	#endif	#endif

End of changes. 10 change blocks.
	1 lines changed or deleted	37 lines changed or added

	dbus-properties-mixin.h	dbus-properties-mixin.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_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/_gen/genums.h>	#include <telepathy-glib/_gen/genums.h>

	G_BEGIN_DECLS	G_BEGIN_DECLS

	/* ---- Semi-abstract property definition (used in TpSvc) ---------- /	/* ---- Semi-abstract property definition (used in TpSvc) ---------- /

	typedef enum { /< flags >/	typedef enum { /< flags >/
	TP_DBUS_PROPERTIES_MIXIN_FLAG_READ = 1,	TP_DBUS_PROPERTIES_MIXIN_FLAG_READ = 1,
	TP_DBUS_PROPERTIES_MIXIN_FLAG_WRITE = 2,	TP_DBUS_PROPERTIES_MIXIN_FLAG_WRITE = 2,
	TP_DBUS_PROPERTIES_MIXIN_FLAG_EMITS_CHANGED = 4,	TP_DBUS_PROPERTIES_MIXIN_FLAG_EMITS_CHANGED = 4,

	skipping to change at line 59	skipping to change at line 60
	typedef struct {	typedef struct {
	GQuark dbus_interface;	GQuark dbus_interface;
	TpDBusPropertiesMixinPropInfo *props;	TpDBusPropertiesMixinPropInfo *props;
	/<private>/	/<private>/
	GCallback _1;	GCallback _1;
	GCallback _2;	GCallback _2;
	} TpDBusPropertiesMixinIfaceInfo;	} TpDBusPropertiesMixinIfaceInfo;

	void tp_svc_interface_set_dbus_properties_info (GType g_interface,	void tp_svc_interface_set_dbus_properties_info (GType g_interface,
	TpDBusPropertiesMixinIfaceInfo *info);	TpDBusPropertiesMixinIfaceInfo *info);

		_TP_AVAILABLE_IN_0_16
	TpDBusPropertiesMixinIfaceInfo *tp_svc_interface_get_dbus_properties_info (	TpDBusPropertiesMixinIfaceInfo *tp_svc_interface_get_dbus_properties_info (
	GType g_interface);	GType g_interface);

	/* ---- Concrete implementation (in GObject subclasses) ------------- */	/* ---- Concrete implementation (in GObject subclasses) ------------- */

	typedef void (TpDBusPropertiesMixinGetter) (GObject object,	typedef void (TpDBusPropertiesMixinGetter) (GObject object,
	GQuark iface, GQuark name, GValue *value, gpointer getter_data);	GQuark iface, GQuark name, GValue *value, gpointer getter_data);

	void tp_dbus_properties_mixin_getter_gobject_properties (GObject *object,	void tp_dbus_properties_mixin_getter_gobject_properties (GObject *object,
	GQuark iface, GQuark name, GValue *value, gpointer getter_data);	GQuark iface, GQuark name, GValue *value, gpointer getter_data);

	skipping to change at line 127	skipping to change at line 129
	void tp_dbus_properties_mixin_implement_interface (GObjectClass *cls,	void tp_dbus_properties_mixin_implement_interface (GObjectClass *cls,
	GQuark iface, TpDBusPropertiesMixinGetter getter,	GQuark iface, TpDBusPropertiesMixinGetter getter,
	TpDBusPropertiesMixinSetter setter, TpDBusPropertiesMixinPropImpl *prop s);	TpDBusPropertiesMixinSetter setter, TpDBusPropertiesMixinPropImpl *prop s);

	void tp_dbus_properties_mixin_iface_init (gpointer g_iface,	void tp_dbus_properties_mixin_iface_init (gpointer g_iface,
	gpointer iface_data);	gpointer iface_data);

	gboolean tp_dbus_properties_mixin_get (GObject *self,	gboolean tp_dbus_properties_mixin_get (GObject *self,
	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
	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);

	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,
	const gchar *first_interface,	const gchar *first_interface,
	const gchar *first_property,	const gchar *first_property,
	...)	...)
	G_GNUC_NULL_TERMINATED;	G_GNUC_NULL_TERMINATED;


		_TP_AVAILABLE_IN_0_16
	void tp_dbus_properties_mixin_emit_properties_changed (	void tp_dbus_properties_mixin_emit_properties_changed (
	GObject *object,	GObject *object,
	const gchar *interface_name,	const gchar *interface_name,
	const gchar * const *properties);	const gchar * const *properties);


		_TP_AVAILABLE_IN_0_16
	void tp_dbus_properties_mixin_emit_properties_changed_varargs (	void tp_dbus_properties_mixin_emit_properties_changed_varargs (
	GObject *object,	GObject *object,
	const gchar *interface_name,	const gchar *interface_name,
	...)	...)
	G_GNUC_NULL_TERMINATED;	G_GNUC_NULL_TERMINATED;

	G_END_DECLS	G_END_DECLS

	#endif /* #ifndef __TP_DBUS_PROPERTIES_MIXIN_H__ */	#endif /* #ifndef __TP_DBUS_PROPERTIES_MIXIN_H__ */

End of changes. 5 change blocks.
	0 lines changed or deleted	5 lines changed or added

	dbus-tube-channel.h	dbus-tube-channel.h

	skipping to change at line 25	skipping to change at line 25
	*	*
	* 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_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>

	G_BEGIN_DECLS	G_BEGIN_DECLS

	#define TP_TYPE_DBUS_TUBE_CHANNEL (tp_dbus_tube_channel_get_type ())	#define TP_TYPE_DBUS_TUBE_CHANNEL (tp_dbus_tube_channel_get_type ())
	#define TP_DBUS_TUBE_CHANNEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TP_TY PE_DBUS_TUBE_CHANNEL, TpDBusTubeChannel))	#define TP_DBUS_TUBE_CHANNEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TP_TY PE_DBUS_TUBE_CHANNEL, TpDBusTubeChannel))
	#define TP_DBUS_TUBE_CHANNEL_CLASS(obj) (G_TYPE_CHECK_CLASS_CAST ((obj), TP _TYPE_DBUS_TUBE_CHANNEL, TpDBusTubeChannelClass))	#define TP_DBUS_TUBE_CHANNEL_CLASS(obj) (G_TYPE_CHECK_CLASS_CAST ((obj), TP _TYPE_DBUS_TUBE_CHANNEL, TpDBusTubeChannelClass))
	#define TP_IS_DBUS_TUBE_CHANNEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TP _TYPE_DBUS_TUBE_CHANNEL))	#define TP_IS_DBUS_TUBE_CHANNEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TP _TYPE_DBUS_TUBE_CHANNEL))
	#define TP_IS_DBUS_TUBE_CHANNEL_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE ((obj), TP_TYPE_DBUS_TUBE_CHANNEL))	#define TP_IS_DBUS_TUBE_CHANNEL_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE ((obj), TP_TYPE_DBUS_TUBE_CHANNEL))
	#define TP_DBUS_TUBE_CHANNEL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((ob j), TP_TYPE_DBUS_TUBE_CHANNEL, TpDBusTubeChannelClass))	#define TP_DBUS_TUBE_CHANNEL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((ob j), TP_TYPE_DBUS_TUBE_CHANNEL, TpDBusTubeChannelClass))


	skipping to change at line 55	skipping to change at line 56

	struct _TpDBusTubeChannelClass	struct _TpDBusTubeChannelClass
	{	{
	/<private>/	/<private>/
	TpChannelClass parent_class;	TpChannelClass parent_class;
	GCallback _padding[7];	GCallback _padding[7];
	};	};

	#define TP_DBUS_TUBE_CHANNEL_FEATURE_CORE \	#define TP_DBUS_TUBE_CHANNEL_FEATURE_CORE \
	tp_dbus_tube_channel_feature_quark_core ()	tp_dbus_tube_channel_feature_quark_core ()

		_TP_AVAILABLE_IN_0_18
	GQuark tp_dbus_tube_channel_feature_quark_core (void) G_GNUC_CONST;	GQuark tp_dbus_tube_channel_feature_quark_core (void) G_GNUC_CONST;


		_TP_AVAILABLE_IN_0_18
	GType tp_dbus_tube_channel_get_type (void);	GType tp_dbus_tube_channel_get_type (void);


		_TP_AVAILABLE_IN_0_18
	const gchar * tp_dbus_tube_channel_get_service_name (TpDBusTubeChannel *sel f);	const gchar * tp_dbus_tube_channel_get_service_name (TpDBusTubeChannel *sel f);


		_TP_AVAILABLE_IN_0_18
	GHashTable * tp_dbus_tube_channel_get_parameters (TpDBusTubeChannel *self);	GHashTable * tp_dbus_tube_channel_get_parameters (TpDBusTubeChannel *self);

	/* Outgoing tube methods */	/* Outgoing tube methods */


		_TP_AVAILABLE_IN_0_18
	void tp_dbus_tube_channel_offer_async (TpDBusTubeChannel *self,	void tp_dbus_tube_channel_offer_async (TpDBusTubeChannel *self,
	GHashTable *params,	GHashTable *params,
	GAsyncReadyCallback callback,	GAsyncReadyCallback callback,
	gpointer user_data);	gpointer user_data);


		_TP_AVAILABLE_IN_0_18
	GDBusConnection * tp_dbus_tube_channel_offer_finish (TpDBusTubeChannel *sel f,	GDBusConnection * tp_dbus_tube_channel_offer_finish (TpDBusTubeChannel *sel f,
	GAsyncResult *result,	GAsyncResult *result,
	GError **error) G_GNUC_WARN_UNUSED_RESULT;	GError **error) G_GNUC_WARN_UNUSED_RESULT;

	/* Incoming tube methods */	/* Incoming tube methods */


		_TP_AVAILABLE_IN_0_18
	void tp_dbus_tube_channel_accept_async (TpDBusTubeChannel *self,	void tp_dbus_tube_channel_accept_async (TpDBusTubeChannel *self,
	GAsyncReadyCallback callback,	GAsyncReadyCallback callback,
	gpointer user_data);	gpointer user_data);


		_TP_AVAILABLE_IN_0_18
	GDBusConnection * tp_dbus_tube_channel_accept_finish (TpDBusTubeChannel *se lf,	GDBusConnection * tp_dbus_tube_channel_accept_finish (TpDBusTubeChannel *se lf,
	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. 9 change blocks.
	0 lines changed or deleted	9 lines changed or added

	dbus.h	dbus.h

	skipping to change at line 134	skipping to change at line 134
	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	#ifndef TP_DISABLE_DEPRECATED

	DBusGConnection * tp_get_bus (void) _TP_GNUC_DEPRECATED;	_TP_DEPRECATED
	DBusGProxy * tp_get_bus_proxy (void) _TP_GNUC_DEPRECATED;	DBusGConnection * tp_get_bus (void);

		_TP_DEPRECATED
		DBusGProxy * tp_get_bus_proxy (void);
	#endif	#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. 1 change blocks.
	2 lines changed or deleted	5 lines changed or added

	debug-sender.h	debug-sender.h

	skipping to change at line 26	skipping to change at line 26
	* 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_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/enums.h>	#include <telepathy-glib/enums.h>
	#include <telepathy-glib/svc-debug.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()

	skipping to change at line 91	skipping to change at line 92
	GTimeVal *timestamp,	GTimeVal *timestamp,
	gchar **formatted,	gchar **formatted,
	const gchar *domain,	const gchar *domain,
	GLogLevelFlags level,	GLogLevelFlags level,
	const gchar *format,	const gchar *format,
	...);	...);

	void tp_debug_sender_log_handler (const gchar *log_domain,	void tp_debug_sender_log_handler (const gchar *log_domain,
	GLogLevelFlags log_level, const gchar *message, gpointer exclude);	GLogLevelFlags log_level, const gchar *message, gpointer exclude);


		_TP_AVAILABLE_IN_0_16
	void tp_debug_sender_set_timestamps (TpDebugSender *self, gboolean maybe);	void tp_debug_sender_set_timestamps (TpDebugSender *self, gboolean maybe);

	G_END_DECLS	G_END_DECLS

	#endif /* __TP_DEBUG_SENDER_H__ */	#endif /* __TP_DEBUG_SENDER_H__ */

End of changes. 2 change blocks.
	0 lines changed or deleted	2 lines changed or added

	debug.h	debug.h

	skipping to change at line 19	skipping to change at line 19
	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	#ifndef TP_DISABLE_DEPRECATED

	void tp_debug_set_flags_from_string (const gchar *flags_string)	_TP_DEPRECATED
	_TP_GNUC_DEPRECATED;	void tp_debug_set_flags_from_string (const gchar *flags_string);
	void tp_debug_set_flags_from_env (const gchar *var)
	_TP_GNUC_DEPRECATED;	_TP_DEPRECATED
	void tp_debug_set_all_flags (void) _TP_GNUC_DEPRECATED;	void tp_debug_set_flags_from_env (const gchar *var);

		_TP_DEPRECATED
		void tp_debug_set_all_flags (void);
	#endif	#endif

	G_END_DECLS	G_END_DECLS

	#endif	#endif

End of changes. 1 change blocks.
	5 lines changed or deleted	8 lines changed or added

	defs.h	defs.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_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>

	G_BEGIN_DECLS	G_BEGIN_DECLS

	/**	/**
	* TP_CM_BUS_NAME_BASE:	* TP_CM_BUS_NAME_BASE:
	*	*
	* The prefix for a connection manager's bus name, to which the CM's name	* The prefix for a connection manager's bus name, to which the CM's name
	* (e.g. "gabble") should be appended.	* (e.g. "gabble") should be appended.
	*/	*/
	#define TP_CM_BUS_NAME_BASE "org.freedesktop.Telepathy.ConnectionManager ."	#define TP_CM_BUS_NAME_BASE "org.freedesktop.Telepathy.ConnectionManager ."

	skipping to change at line 113	skipping to change at line 114
	#define TP_CLIENT_BUS_NAME_BASE "org.freedesktop.Telepathy.Client."	#define TP_CLIENT_BUS_NAME_BASE "org.freedesktop.Telepathy.Client."

	/**	/**
	* TP_CLIENT_OBJECT_PATH_BASE:	* TP_CLIENT_OBJECT_PATH_BASE:
	*	*
	* The common prefix of the well-known object path for any Telepathy Client .	* The common prefix of the well-known object path for any Telepathy Client .
	*/	*/
	#define TP_CLIENT_OBJECT_PATH_BASE "/org/freedesktop/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:	* TP_USER_ACTION_TIME_NOT_USER_ACTION:
	*	*
	* The "user action time" used by methods like	* The "user action time" used by methods like
	* tp_account_channel_request_new() to represent channel requests that are	* tp_account_channel_request_new() to represent channel requests that are
	* not a result of user action.	* not a result of user action.
	*	*
	* See also #TpAccountChannelRequest:user-action-time,	* See also #TpAccountChannelRequest:user-action-time,
	* tp_user_action_time_from_x11(), tp_user_action_time_should_present() and	* tp_user_action_time_from_x11(), tp_user_action_time_should_present() and
	* %TP_USER_ACTION_TIME_CURRENT_TIME.	* %TP_USER_ACTION_TIME_CURRENT_TIME.
	*	*
	* Since: 0.11.13	* Since: 0.11.13
	*/	*/
	#define TP_USER_ACTION_TIME_NOT_USER_ACTION (G_GINT64_CONSTANT (0))	#define TP_USER_ACTION_TIME_NOT_USER_ACTION (G_GINT64_CONSTANT (0))

	/**	/**
	* TP_USER_ACTION_TIME_CURRENT_TIME:	* TP_USER_ACTION_TIME_CURRENT_TIME:
	*	*
	* The "user action time" used by methods like	* The "user action time" used by methods like
	* tp_account_channel_request_new() to represent channel requests that shou ld	* 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	* 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	* concept as %GDK_CURRENT_TIME in GDK (but note that the numerical value u sed
	* in Telepathy is not the same).	* in Telepathy is not the same).
	*	*
	* See also #TpAccountChannelRequest:user-action-time,	* See also #TpAccountChannelRequest:user-action-time,
	* tp_user_action_time_from_x11(), tp_user_action_time_should_present() and	* tp_user_action_time_from_x11(), tp_user_action_time_should_present() and
	* %TP_USER_ACTION_TIME_NOT_USER_ACTION.	* %TP_USER_ACTION_TIME_NOT_USER_ACTION.
	*	*
	* Since: 0.11.13	* Since: 0.11.13
	*/	*/
	#define TP_USER_ACTION_TIME_CURRENT_TIME (G_MAXINT64)	#define TP_USER_ACTION_TIME_CURRENT_TIME (G_MAXINT64)


	/* telepathy-glib-specific version of G_GNUC_DEPRECATED so our regression	#define _TP_ENCODE_VERSION(major, minor) (((major) << 16) \| ((minor) << 8))

		#define TP_VERSION_0_16 (_TP_ENCODE_VERSION (0, 16))
		#define TP_VERSION_0_18 (_TP_ENCODE_VERSION (0, 18))
		#define TP_VERSION_0_20 (_TP_ENCODE_VERSION (0, 20))
		#define TP_VERSION_1_0 (_TP_ENCODE_VERSION (1, 0))

		#if (TP_MINOR_VERSION == 99)
		/* special case for telepathy-glib 1.0 prereleases */
		# define _TP_VERSION_CUR_STABLE (_TP_ENCODE_VERSION (TP_MAJOR_VERSION + 1,
		0))
		#elif (TP_MINOR_VERSION == 0)
		/* special case for telepathy-glib 1.0 itself */
		# define _TP_VERSION_CUR_STABLE (_TP_ENCODE_VERSION (TP_MAJOR_VERSION, 0))
		#elif (TP_MICRO_VERSION >= 99 && (TP_MINOR_VERSION % 2) == 0)
		/* development branch about to start (0.18.999.1) */
		# define _TP_VERSION_CUR_STABLE \
		(_TP_ENCODE_VERSION (TP_MAJOR_VERSION, TP_MINOR_VERSION + 2))
		#elif (TP_MINOR_VERSION % 2)
		/* development branch */
		# define _TP_VERSION_CUR_STABLE \
		(_TP_ENCODE_VERSION (TP_MAJOR_VERSION, TP_MINOR_VERSION + 1))
		#else
		/* stable branch */
		# define _TP_VERSION_CUR_STABLE \
		(_TP_ENCODE_VERSION (TP_MAJOR_VERSION, TP_MINOR_VERSION))
		#endif

		#ifndef TP_VERSION_MIN_REQUIRED
		# define TP_VERSION_MIN_REQUIRED (_TP_VERSION_CUR_STABLE)
		#endif

		#ifndef TP_VERSION_MAX_ALLOWED
		# define TP_VERSION_MAX_ALLOWED (_TP_VERSION_CUR_STABLE)
		#endif

		#if TP_VERSION_MAX_ALLOWED < TP_VERSION_MIN_REQUIRED
		# error "TP_VERSION_MAX_ALLOWED must be >= TP_VERSION_MIN_REQUIRED"
		#endif
		#if TP_VERSION_MIN_REQUIRED < TP_VERSION_0_16
		# error "TP_VERSION_MIN_REQUIRED must be >= TP_VERSION_0_16"
		#endif

		#if TP_VERSION_MIN_REQUIRED >= TP_VERSION_0_16
		# define _TP_DEPRECATED_IN_0_16 _TP_DEPRECATED
		# define _TP_DEPRECATED_IN_0_16_FOR(f) _TP_DEPRECATED_FOR(f)
		#else
		# define _TP_DEPRECATED_IN_0_16 /* nothing */
		# define _TP_DEPRECATED_IN_0_16_FOR(f) /* nothing */
		#endif

		#if TP_VERSION_MIN_REQUIRED >= TP_VERSION_0_18
		# define _TP_DEPRECATED_IN_0_18 _TP_DEPRECATED
		# define _TP_DEPRECATED_IN_0_18_FOR(f) _TP_DEPRECATED_FOR(f)
		#else
		# define _TP_DEPRECATED_IN_0_18 /* nothing */
		# define _TP_DEPRECATED_IN_0_18_FOR(f) /* nothing */
		#endif

		#if TP_VERSION_MIN_REQUIRED >= TP_VERSION_0_20
		# define _TP_DEPRECATED_IN_0_20 _TP_DEPRECATED
		# define _TP_DEPRECATED_IN_0_20_FOR(f) _TP_DEPRECATED_FOR(f)
		#else
		# define _TP_DEPRECATED_IN_0_20 /* nothing */
		# define _TP_DEPRECATED_IN_0_20_FOR(f) /* nothing */
		#endif

		#if TP_VERSION_MIN_REQUIRED >= TP_VERSION_1_0
		# define _TP_DEPRECATED_IN_1_0 _TP_DEPRECATED
		# define _TP_DEPRECATED_IN_1_0_FOR(f) _TP_DEPRECATED_FOR(f)
		#else
		# define _TP_DEPRECATED_IN_1_0 /* nothing */
		# define _TP_DEPRECATED_IN_1_0_FOR(f) /* nothing */
		#endif

		#if TP_VERSION_MIN_REQUIRED >= _TP_VERSION_CUR_STABLE
		# define _TP_DEPRECATED_IN_UNRELEASED _TP_DEPRECATED
		# define _TP_DEPRECATED_IN_UNRELEASED_FOR(f) _TP_DEPRECATED_FOR(f)
		#else
		# define _TP_DEPRECATED_IN_UNRELEASED /* nothing */
		# define _TP_DEPRECATED_IN_UNRELEASED_FOR(f) /* nothing */
		#endif

		#if TP_VERSION_MAX_ALLOWED < TP_VERSION_0_16
		# define _TP_AVAILABLE_IN_0_16 _TP_UNAVAILABLE(0, 16)
		#else
		# define _TP_AVAILABLE_IN_0_16 /* nothing */
		#endif

		#if TP_VERSION_MAX_ALLOWED < TP_VERSION_0_18
		# define _TP_AVAILABLE_IN_0_18 _TP_UNAVAILABLE(0, 18)
		#else
		# define _TP_AVAILABLE_IN_0_18 /* nothing */
		#endif

		#if TP_VERSION_MAX_ALLOWED < TP_VERSION_0_20
		# define _TP_AVAILABLE_IN_0_20 _TP_UNAVAILABLE(0, 20)
		#else
		# define _TP_AVAILABLE_IN_0_20 /* nothing */
		#endif

		#if TP_VERSION_MAX_ALLOWED < TP_VERSION_1_0
		# define _TP_AVAILABLE_IN_1_0 _TP_UNAVAILABLE(1, 0)
		#else
		# define _TP_AVAILABLE_IN_1_0 /* nothing */
		#endif

		#if TP_VERSION_MAX_ALLOWED < _TP_VERSION_CUR_STABLE
		# define _TP_AVAILABLE_IN_UNRELEASED \
		_TP_UNAVAILABLE (TP_MAJOR_VERSION, TP_MINOR_VERSION)
		#else
		# define _TP_AVAILABLE_IN_UNRELEASED /* nothing */
		#endif

		/* telepathy-glib-specific macros so our regression
	* tests can continue to test deprecated functionality, while avoiding	* tests can continue to test deprecated functionality, while avoiding
	* deprecated bits of other libraries */	* deprecated bits of other libraries */
	#ifdef _TP_IGNORE_DEPRECATIONS	#ifdef _TP_IGNORE_DEPRECATIONS

		#define _TP_DEPRECATED /* nothing */
		#define _TP_DEPRECATED_FOR(f) /* nothing */
		#define _TP_UNAVAILABLE(major, minor) /* nothing */
	#define _TP_GNUC_DEPRECATED /* nothing */	#define _TP_GNUC_DEPRECATED /* nothing */
	#define _TP_GNUC_DEPRECATED_FOR(f) /* nothing */	#define _TP_GNUC_DEPRECATED_FOR(f) /* nothing */
	#else	#else

		#define _TP_DEPRECATED G_DEPRECATED
		#define _TP_DEPRECATED_FOR(f) G_DEPRECATED_FOR(f)
		#define _TP_UNAVAILABLE(major, minor) G_UNAVAILABLE(major, minor)
		/* Available for typedefs etc., not just functions, but gcc-specific */
	#define _TP_GNUC_DEPRECATED G_GNUC_DEPRECATED	#define _TP_GNUC_DEPRECATED G_GNUC_DEPRECATED
	#define _TP_GNUC_DEPRECATED_FOR(f) G_GNUC_DEPRECATED_FOR(f)	#define _TP_GNUC_DEPRECATED_FOR(f) G_GNUC_DEPRECATED_FOR(f)
	#endif	#endif

	G_END_DECLS	G_END_DECLS
	#endif	#endif

End of changes. 6 change blocks.
	2 lines changed or deleted	132 lines changed or added

	errors.h	errors.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_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/_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


	GQuark tp_errors_quark (void) G_GNUC_DEPRECATED_FOR(tp_error_quark);	#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 "org.freedesktop.Telepathy.Error"


	#define TP_ERRORS TP_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 >/
	TP_ERROR_NOT_AVAILABLE, /< nick=NotAvailable >/	TP_ERROR_NOT_AVAILABLE, /< nick=NotAvailable >/

End of changes. 3 change blocks.
	2 lines changed or deleted	11 lines changed or added

	file-transfer-channel.h	file-transfer-channel.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_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>

	G_BEGIN_DECLS	G_BEGIN_DECLS

	#define TP_TYPE_FILE_TRANSFER_CHANNEL (tp_file_transfer_channel_get_type () )	#define TP_TYPE_FILE_TRANSFER_CHANNEL (tp_file_transfer_channel_get_type () )
	#define TP_FILE_TRANSFER_CHANNEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), T P_TYPE_FILE_TRANSFER_CHANNEL, TpFileTransferChannel))	#define TP_FILE_TRANSFER_CHANNEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), T P_TYPE_FILE_TRANSFER_CHANNEL, TpFileTransferChannel))
	#define TP_FILE_TRANSFER_CHANNEL_CLASS(obj) (G_TYPE_CHECK_CLASS_CAST ((obj) , TP_TYPE_FILE_TRANSFER_CHANNEL, TpFileTransferChannelClass))	#define TP_FILE_TRANSFER_CHANNEL_CLASS(obj) (G_TYPE_CHECK_CLASS_CAST ((obj) , TP_TYPE_FILE_TRANSFER_CHANNEL, TpFileTransferChannelClass))
	#define TP_IS_FILE_TRANSFER_CHANNEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj) , TP_TYPE_FILE_TRANSFER_CHANNEL))	#define TP_IS_FILE_TRANSFER_CHANNEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj) , TP_TYPE_FILE_TRANSFER_CHANNEL))
	#define TP_IS_FILE_TRANSFER_CHANNEL_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE ((o bj), TP_TYPE_FILE_TRANSFER_CHANNEL))	#define TP_IS_FILE_TRANSFER_CHANNEL_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE ((o bj), TP_TYPE_FILE_TRANSFER_CHANNEL))
	#define TP_FILE_TRANSFER_CHANNEL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_FILE_TRANSFER_CHANNEL, TpFileTransferChannelClass))	#define TP_FILE_TRANSFER_CHANNEL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_FILE_TRANSFER_CHANNEL, TpFileTransferChannelClass))


	skipping to change at line 56	skipping to change at line 57

	struct _TpFileTransferChannelClass	struct _TpFileTransferChannelClass
	{	{
	/<private>/	/<private>/
	TpChannelClass parent_class;	TpChannelClass parent_class;
	GCallback _padding[8];	GCallback _padding[8];
	};	};

	#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
	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
	GType tp_file_transfer_channel_get_type (void);	GType tp_file_transfer_channel_get_type (void);

	/* Methods */	/* Methods */


		_TP_AVAILABLE_IN_0_16
	TpFileTransferChannel * tp_file_transfer_channel_new (TpConnection *conn,	TpFileTransferChannel * tp_file_transfer_channel_new (TpConnection *conn,
	const gchar *object_path,	const gchar *object_path,
	const GHashTable *immutable_properties,	const GHashTable *immutable_properties,
	GError **error);	GError **error);


		_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
	gboolean tp_file_transfer_channel_accept_file_finish (	gboolean tp_file_transfer_channel_accept_file_finish (
	TpFileTransferChannel *self,	TpFileTransferChannel *self,
	GAsyncResult *result,	GAsyncResult *result,
	GError **error);	GError **error);


		_TP_AVAILABLE_IN_0_18
	void tp_file_transfer_channel_provide_file_async (TpFileTransferChannel *se lf,	void tp_file_transfer_channel_provide_file_async (TpFileTransferChannel *se lf,
	GFile *file,	GFile *file,
	GAsyncReadyCallback callback,	GAsyncReadyCallback callback,
	gpointer user_data);	gpointer user_data);


		_TP_AVAILABLE_IN_0_18
	gboolean tp_file_transfer_channel_provide_file_finish (	gboolean tp_file_transfer_channel_provide_file_finish (
	TpFileTransferChannel *self,	TpFileTransferChannel *self,
	GAsyncResult *result,	GAsyncResult *result,
	GError **error);	GError **error);

	/* Property accessors */	/* Property accessors */


		_TP_AVAILABLE_IN_0_16
	const char * tp_file_transfer_channel_get_mime_type (	const char * tp_file_transfer_channel_get_mime_type (
	TpFileTransferChannel *self);	TpFileTransferChannel *self);


		_TP_AVAILABLE_IN_0_16
	GDateTime * tp_file_transfer_channel_get_date (TpFileTransferChannel *self) ;	GDateTime * tp_file_transfer_channel_get_date (TpFileTransferChannel *self) ;


		_TP_AVAILABLE_IN_0_18
	TpFileTransferState tp_file_transfer_channel_get_state (	TpFileTransferState tp_file_transfer_channel_get_state (
	TpFileTransferChannel *self,	TpFileTransferChannel *self,
	TpFileTransferStateChangeReason *reason);	TpFileTransferStateChangeReason *reason);


		_TP_AVAILABLE_IN_0_16
	const gchar * tp_file_transfer_channel_get_description (	const gchar * tp_file_transfer_channel_get_description (
	TpFileTransferChannel *self);	TpFileTransferChannel *self);


		_TP_AVAILABLE_IN_0_16
	const gchar * tp_file_transfer_channel_get_filename (	const gchar * tp_file_transfer_channel_get_filename (
	TpFileTransferChannel *self);	TpFileTransferChannel *self);


		_TP_AVAILABLE_IN_0_16
	guint64 tp_file_transfer_channel_get_size (TpFileTransferChannel *self);	guint64 tp_file_transfer_channel_get_size (TpFileTransferChannel *self);


		_TP_AVAILABLE_IN_0_16
	guint64 tp_file_transfer_channel_get_transferred_bytes (	guint64 tp_file_transfer_channel_get_transferred_bytes (
	TpFileTransferChannel *self);	TpFileTransferChannel *self);

	/* Metadata */	/* Metadata */


		_TP_AVAILABLE_IN_0_18
	const gchar * tp_file_transfer_channel_get_service_name (	const gchar * tp_file_transfer_channel_get_service_name (
	TpFileTransferChannel *self);	TpFileTransferChannel *self);


		_TP_AVAILABLE_IN_0_18
	const GHashTable * tp_file_transfer_channel_get_metadata (	const GHashTable * tp_file_transfer_channel_get_metadata (
	TpFileTransferChannel *self);	TpFileTransferChannel *self);

	G_END_DECLS	G_END_DECLS

	#endif	#endif

End of changes. 17 change blocks.
	0 lines changed or deleted	17 lines changed or added

	gnio-util.h	gnio-util.h

	skipping to change at line 25	skipping to change at line 25
	* 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
	*/	*/

	#include <glib-object.h>	#include <glib-object.h>
	#include <gio/gio.h>	#include <gio/gio.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__

	G_BEGIN_DECLS	G_BEGIN_DECLS

	GSocketAddress *tp_g_socket_address_from_variant (TpSocketAddressType type,	GSocketAddress *tp_g_socket_address_from_variant (TpSocketAddressType type,
	const GValue *variant,	const GValue *variant,
	GError **error) G_GNUC_WARN_UNUSED_RESULT;	GError **error) G_GNUC_WARN_UNUSED_RESULT;
	GValue tp_address_variant_from_g_socket_address (GSocketAddress address,	GValue tp_address_variant_from_g_socket_address (GSocketAddress address,
	TpSocketAddressType *type,	TpSocketAddressType *type,
	GError **error) G_GNUC_WARN_UNUSED_RESULT;	GError **error) G_GNUC_WARN_UNUSED_RESULT;

	gboolean tp_unix_connection_send_credentials_with_byte (	gboolean tp_unix_connection_send_credentials_with_byte (
	GSocketConnection *connection,	GSocketConnection *connection,
	guchar byte,	guchar byte,
	GCancellable *cancellable,	GCancellable *cancellable,
	GError **error);	GError **error);

		_TP_AVAILABLE_IN_0_18
	void tp_unix_connection_send_credentials_with_byte_async (	void tp_unix_connection_send_credentials_with_byte_async (
	GSocketConnection *connection,	GSocketConnection *connection,
	guchar byte,	guchar byte,
	GCancellable *cancellable,	GCancellable *cancellable,
	GAsyncReadyCallback callback,	GAsyncReadyCallback callback,
	gpointer user_data);	gpointer user_data);

		_TP_AVAILABLE_IN_0_18
	gboolean tp_unix_connection_send_credentials_with_byte_finish (	gboolean tp_unix_connection_send_credentials_with_byte_finish (
	GSocketConnection *connection,	GSocketConnection *connection,
	GAsyncResult *result,	GAsyncResult *result,
	GError **error);	GError **error);


		_TP_AVAILABLE_IN_0_18
	GCredentials * tp_unix_connection_receive_credentials_with_byte (	GCredentials * tp_unix_connection_receive_credentials_with_byte (
	GSocketConnection *connection,	GSocketConnection *connection,
	guchar *byte,	guchar *byte,
	GCancellable *cancellable,	GCancellable *cancellable,
	GError **error);	GError **error);

		_TP_AVAILABLE_IN_0_18
	void tp_unix_connection_receive_credentials_with_byte_async (	void tp_unix_connection_receive_credentials_with_byte_async (
	GSocketConnection *connection,	GSocketConnection *connection,
	GCancellable *cancellable,	GCancellable *cancellable,
	GAsyncReadyCallback callback,	GAsyncReadyCallback callback,
	gpointer user_data);	gpointer user_data);
	GCredentials *tp_unix_connection_receive_credentials_with_byte_finish (	GCredentials *tp_unix_connection_receive_credentials_with_byte_finish (
	GSocketConnection *connection,	GSocketConnection *connection,
	GAsyncResult *result,	GAsyncResult *result,
	guchar *byte,	guchar *byte,
	GError **error);	GError **error);

End of changes. 5 change blocks.
	0 lines changed or deleted	5 lines changed or added

	handle-repo.h	handle-repo.h

	skipping to change at line 151	skipping to change at line 151
	TpHandleSet tp_handle_set_new_from_array (TpHandleRepoIface repo,	TpHandleSet tp_handle_set_new_from_array (TpHandleRepoIface repo,
	const GArray *array) G_GNUC_WARN_UNUSED_RESULT;	const GArray *array) G_GNUC_WARN_UNUSED_RESULT;

	TpIntset tp_handle_set_update (TpHandleSet set, const TpIntset *add)	TpIntset tp_handle_set_update (TpHandleSet set, const TpIntset *add)
	G_GNUC_WARN_UNUSED_RESULT;	G_GNUC_WARN_UNUSED_RESULT;
	TpIntset tp_handle_set_difference_update (TpHandleSet set,	TpIntset tp_handle_set_difference_update (TpHandleSet set,
	const TpIntset *remove) G_GNUC_WARN_UNUSED_RESULT;	const TpIntset *remove) G_GNUC_WARN_UNUSED_RESULT;

	gchar tp_handle_set_dump (const TpHandleSet self) G_GNUC_WARN_UNUSED_RESU LT;	gchar tp_handle_set_dump (const TpHandleSet self) G_GNUC_WARN_UNUSED_RESU LT;


	/* static inline because it relies on NUM_TP_HANDLE_TYPES */	/* static inline because it relies on TP_NUM_HANDLE_TYPES */
	/**	/**
	* tp_handles_supported_and_valid: (skip)	* tp_handles_supported_and_valid: (skip)
	* @repos: An array of possibly null pointers to handle repositories, index ed	* @repos: An array of possibly null pointers to handle repositories, index ed
	* by handle type, where a null pointer means an unsupported handle	* by handle type, where a null pointer means an unsupported handle
	* type	* type
	* @handle_type: The handle type	* @handle_type: The handle type
	* @handles: A GArray of guint representing handles of the given type	* @handles: A GArray of guint representing handles of the given type
	* @allow_zero: If %TRUE, zero is treated like a valid handle	* @allow_zero: If %TRUE, zero is treated like a valid handle
	* @error: Used to return an error if %FALSE is returned	* @error: Used to return an error if %FALSE is returned
	*	*

	skipping to change at line 173	skipping to change at line 173
	* is not %NULL) and the given handles are all valid in that repository.	* is not %NULL) and the given handles are all valid in that repository.
	* If not, set @error and return %FALSE.	* If not, set @error and return %FALSE.
	*	*
	* Returns: %TRUE if the handle type is supported and the handles are all	* Returns: %TRUE if the handle type is supported and the handles are all
	* valid.	* valid.
	*/	*/

	static inline	static inline
	/* spacer so gtkdoc documents this function as though not static */	/* spacer so gtkdoc documents this function as though not static */
	gboolean tp_handles_supported_and_valid (	gboolean tp_handles_supported_and_valid (

	TpHandleRepoIface *repos[NUM_TP_HANDLE_TYPES],	TpHandleRepoIface *repos[TP_NUM_HANDLE_TYPES],
	TpHandleType handle_type, const GArray *handles, gboolean allow_zero,	TpHandleType handle_type, const GArray *handles, gboolean allow_zero,
	GError **error);	GError **error);

	static inline gboolean	static inline gboolean

	tp_handles_supported_and_valid (TpHandleRepoIface *repos[NUM_TP_HANDLE_TYPE S],	tp_handles_supported_and_valid (TpHandleRepoIface *repos[TP_NUM_HANDLE_TYPE S],
	TpHandleType handle_type,	TpHandleType handle_type,
	const GArray *handles,	const GArray *handles,
	gboolean allow_zero,	gboolean allow_zero,
	GError **error)	GError **error)
	{	{
	if (!tp_handle_type_is_valid (handle_type, error))	if (!tp_handle_type_is_valid (handle_type, error))
	return FALSE;	return FALSE;

	if (!repos[handle_type])	if (!repos[handle_type])
	{	{

End of changes. 3 change blocks.
	3 lines changed or deleted	3 lines changed or added

	handle.h	handle.h

	skipping to change at line 75	skipping to change at line 75
	*	*
	* If the given handle type is valid, return %TRUE. If not, set @error	* If the given handle type is valid, return %TRUE. If not, set @error
	* and return %FALSE.	* and return %FALSE.
	*	*
	* Returns: %TRUE if the handle type is valid.	* Returns: %TRUE if the handle type is valid.
	*/	*/
	static inline	static inline
	/* spacer so gtkdoc documents this function as though not static */	/* spacer so gtkdoc documents this function as though not static */
	gboolean tp_handle_type_is_valid (TpHandleType type, GError **error);	gboolean tp_handle_type_is_valid (TpHandleType type, GError **error);


	/* Must be static inline because it references NUM_TP_HANDLE_TYPES -	/* Must be static inline because it references TP_NUM_HANDLE_TYPES -
	* if it wasn't inlined, a newer libtelepathy-glib with a larger number	* if it wasn't inlined, a newer libtelepathy-glib with a larger number
	* of handle types might accept handle types that won't fit in the	* of handle types might accept handle types that won't fit in the

	* connection manager's array of length NUM_TP_HANDLE_TYPES	* connection manager's array of length TP_NUM_HANDLE_TYPES
	*/	*/

	static inline gboolean	static inline gboolean
	tp_handle_type_is_valid (TpHandleType type, GError **error)	tp_handle_type_is_valid (TpHandleType type, GError **error)
	{	{

	if (type > TP_HANDLE_TYPE_NONE && type < NUM_TP_HANDLE_TYPES)	if (type > TP_HANDLE_TYPE_NONE && type < TP_NUM_HANDLE_TYPES)
	return TRUE;	return TRUE;

	tp_g_set_error_invalid_handle_type (type, error);	tp_g_set_error_invalid_handle_type (type, error);
	return FALSE;	return FALSE;
	}	}

	const gchar *tp_handle_type_to_string (TpHandleType type);	const gchar *tp_handle_type_to_string (TpHandleType type);

	G_END_DECLS	G_END_DECLS


End of changes. 3 change blocks.
	3 lines changed or deleted	3 lines changed or added

	intset.h	intset.h

	skipping to change at line 28	skipping to change at line 28
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
	* 02110-1301 USA	* 02110-1301 USA
	*	*
	*/	*/

	#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>

	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 */	/* See fdo#30134 for the reasoning behind the rename of TpIntSet to TpIntse t */

	/**	/**
	* TpIntSet: (skip)	* TpIntSet: (skip)
	*	*
	* Before 0.11.16, this was the name for <type>TpIntset</type>, but it's	* Before 0.11.16, this was the name for <type>TpIntset</type>, but it's
	* now just a backwards compatibility typedef.	* now just a backwards compatibility typedef.
	*/	*/
	typedef TpIntset TpIntSet;	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);

	skipping to change at line 81	skipping to change at line 85
	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 {	typedef struct {
	const TpIntset *set;	const TpIntset *set;
	guint element;	guint element;
	} TpIntsetIter;	} TpIntsetIter;


	/**
	* TpIntSetIter: (skip)
	*
	* Before 0.11.16, this was the name for <type>TpIntsetIter</type>, but
	* it's now just a backwards compatibility typedef.
	*/
	typedef TpIntsetIter TpIntSetIter;	typedef TpIntsetIter TpIntSetIter;

	#define TP_INTSET_ITER_INIT(set) { (set), (guint)(-1) }	#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);	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);	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);	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
	* TpIntSetFastIter: (skip)
	*
	* Before 0.11.16, this was the name for <type>TpIntsetFastIter</type>,
	* but it's now just a backwards compatibility typedef.
	*/
	typedef TpIntsetFastIter TpIntSetFastIter;	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);


End of changes. 11 change blocks.
	12 lines changed or deleted	14 lines changed or added

	message-mixin.h	message-mixin.h

	skipping to change at line 71	skipping to change at line 71
	TpMessage *message, TpMessageSendingFlags flags,	TpMessage *message, TpMessageSendingFlags flags,
	const gchar token, const GError error);	const gchar token, const GError error);

	void tp_message_mixin_implement_sending (GObject *object,	void tp_message_mixin_implement_sending (GObject *object,
	TpMessageMixinSendImpl send, guint n_types,	TpMessageMixinSendImpl send, guint n_types,
	const TpChannelTextMessageType *types,	const TpChannelTextMessageType *types,
	TpMessagePartSupportFlags message_part_support_flags,	TpMessagePartSupportFlags message_part_support_flags,
	TpDeliveryReportingSupportFlags delivery_reporting_support_flags,	TpDeliveryReportingSupportFlags delivery_reporting_support_flags,
	const gchar * const * supported_content_types);	const gchar * const * supported_content_types);


		/* ChatState */

		typedef gboolean (TpMessageMixinSendChatStateImpl) (GObject object,
		TpChannelChatState state,
		GError **error);

		_TP_AVAILABLE_IN_0_20
		void tp_message_mixin_change_chat_state (GObject *object,
		TpHandle member,
		TpChannelChatState state);

		_TP_AVAILABLE_IN_0_20
		void tp_message_mixin_implement_send_chat_state (GObject *object,
		TpMessageMixinSendChatStateImpl send_chat_state);

		_TP_AVAILABLE_IN_0_20
		void tp_message_mixin_maybe_send_gone (GObject *object);

	/* Initialization */	/* Initialization */
	void tp_message_mixin_text_iface_init (gpointer g_iface, gpointer iface_dat a);	void tp_message_mixin_text_iface_init (gpointer g_iface, gpointer iface_dat a);
	void tp_message_mixin_messages_iface_init (gpointer g_iface,	void tp_message_mixin_messages_iface_init (gpointer g_iface,
	gpointer iface_data);	gpointer iface_data);

		void tp_message_mixin_chat_state_iface_init (gpointer g_iface,
		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

	#endif	#endif

End of changes. 2 change blocks.
	0 lines changed or deleted	20 lines changed or added

	message.h	message.h

	skipping to change at line 77	skipping to change at line 77
	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);

	gchar * tp_message_to_text (TpMessage *message,	gchar * tp_message_to_text (TpMessage *message,
	TpChannelTextMessageFlags *out_flags) G_GNUC_WARN_UNUSED_RESULT;	TpChannelTextMessageFlags *out_flags) G_GNUC_WARN_UNUSED_RESULT;

	#ifndef TP_DISABLE_DEPRECATED	#ifndef TP_DISABLE_DEPRECATED
	/* Takes a TpCMMessage */	/* Takes a TpCMMessage */

		_TP_DEPRECATED_FOR (tp_cm_message_set_sender)
	void tp_message_set_handle (TpMessage self, guint part, const gchar key,	void tp_message_set_handle (TpMessage self, guint part, const gchar key,
	TpHandleType handle_type, TpHandle handle_or_0);	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 ,	void tp_message_take_message (TpMessage self, guint part, const gchar key ,
	TpMessage *message);	TpMessage *message);


		_TP_DEPRECATED_FOR (tp_cm_message_set_sender)
	void tp_message_ref_handle (TpMessage *self, TpHandleType handle_type,	void tp_message_ref_handle (TpMessage *self, TpHandleType handle_type,
	TpHandle handle);	TpHandle handle);
	#endif	#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);
	const gchar tp_message_get_specific_to_interface (TpMessage self);	const gchar tp_message_get_specific_to_interface (TpMessage self);
	gboolean tp_message_is_delivery_report (TpMessage *self);	gboolean tp_message_is_delivery_report (TpMessage *self);

		_TP_AVAILABLE_IN_0_16
	guint32 tp_message_get_pending_message_id (TpMessage *self,	guint32 tp_message_get_pending_message_id (TpMessage *self,
	gboolean *valid);	gboolean *valid);

	G_END_DECLS	G_END_DECLS

	#endif /* __TP_MESSAGE_H__ */	#endif /* __TP_MESSAGE_H__ */

End of changes. 4 change blocks.
	0 lines changed or deleted	4 lines changed or added

	protocol.h	protocol.h

	skipping to change at line 27	skipping to change at line 27
	* 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_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/proxy.h>	#include <telepathy-glib/proxy.h>

	G_BEGIN_DECLS	G_BEGIN_DECLS

	typedef struct _TpConnectionManagerParam TpConnectionManagerParam;	typedef struct _TpConnectionManagerParam TpConnectionManagerParam;

	struct _TpConnectionManagerParam	struct _TpConnectionManagerParam
	{	{
	/<public>/	/<public>/
	gchar *name;	gchar *name;

	skipping to change at line 88	skipping to change at line 89
	GError **error);	GError **error);

	const gchar tp_protocol_get_name (TpProtocol self);	const gchar tp_protocol_get_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
	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
	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_0_18
	const TpConnectionManagerParam tp_protocol_borrow_params (TpProtocol self )	const TpConnectionManagerParam tp_protocol_borrow_params (TpProtocol self )
	G_GNUC_WARN_UNUSED_RESULT;	G_GNUC_WARN_UNUSED_RESULT;

	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);

	#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
	TpAvatarRequirements * tp_protocol_get_avatar_requirements (TpProtocol *sel f);	TpAvatarRequirements * tp_protocol_get_avatar_requirements (TpProtocol *sel f);

	G_END_DECLS	G_END_DECLS

	#include <telepathy-glib/_gen/tp-cli-protocol.h>	#include <telepathy-glib/_gen/tp-cli-protocol.h>

	#endif	#endif

End of changes. 5 change blocks.
	0 lines changed or deleted	5 lines changed or added

	proxy.h	proxy.h

	skipping to change at line 58	skipping to change at line 58
	TP_DBUS_ERROR_NO_INTERFACE = 2,	TP_DBUS_ERROR_NO_INTERFACE = 2,
	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 NUM_TP_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 *dbus_daemon;	TpDBusDaemon *dbus_daemon;
	DBusGConnection *dbus_connection;	DBusGConnection *dbus_connection;
	gchar *bus_name;	gchar *bus_name;
	gchar *object_path;	gchar *object_path;


	skipping to change at line 159	skipping to change at line 160
	(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_PROXY))	(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_PROXY))
	#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
	TpSimpleClientFactory *tp_proxy_get_factory (gpointer self);	TpSimpleClientFactory *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);


End of changes. 2 change blocks.
	1 lines changed or deleted	3 lines changed or added

	simple-approver.h	simple-approver.h

	skipping to change at line 75	skipping to change at line 75

	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
		_TP_DEPRECATED_IN_0_16_FOR (tp_simple_approver_new_with_factory)
	TpBaseClient * tp_simple_approver_new (TpDBusDaemon *dbus,	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);
	_TP_GNUC_DEPRECATED_FOR (tp_simple_approver_new_with_factory);	#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 (	TpBaseClient *tp_simple_approver_new_with_factory (
	TpSimpleClientFactory *factory,	TpSimpleClientFactory *factory,
	const gchar *name,	const gchar *name,
	gboolean uniquify,	gboolean uniquify,
	TpSimpleApproverAddDispatchOperationImpl callback,	TpSimpleApproverAddDispatchOperationImpl callback,
	gpointer user_data,	gpointer user_data,
	GDestroyNotify destroy);	GDestroyNotify destroy);

	G_END_DECLS	G_END_DECLS


End of changes. 3 change blocks.
	2 lines changed or deleted	5 lines changed or added

	simple-client-factory.h	simple-client-factory.h

	skipping to change at line 31	skipping to change at line 31
	#ifndef __TP_SIMPLE_CLIENT_FACTORY_H__	#ifndef __TP_SIMPLE_CLIENT_FACTORY_H__
	#define __TP_SIMPLE_CLIENT_FACTORY_H__	#define __TP_SIMPLE_CLIENT_FACTORY_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-dispatch-operation.h>	#include <telepathy-glib/channel-dispatch-operation.h>
	#include <telepathy-glib/channel-request.h>	#include <telepathy-glib/channel-request.h>
	#include <telepathy-glib/connection.h>	#include <telepathy-glib/connection.h>
	#include <telepathy-glib/contact.h>	#include <telepathy-glib/contact.h>
	#include <telepathy-glib/dbus-daemon.h>	#include <telepathy-glib/dbus-daemon.h>

		#include <telepathy-glib/defs.h>

	G_BEGIN_DECLS	G_BEGIN_DECLS

	/* TpSimpleClientFactory is typedef'd in proxy.h */	/* TpSimpleClientFactory is typedef'd in proxy.h */
	typedef struct _TpSimpleClientFactoryPrivate TpSimpleClientFactoryPrivate;	typedef struct _TpSimpleClientFactoryPrivate TpSimpleClientFactoryPrivate;
	typedef struct _TpSimpleClientFactoryClass TpSimpleClientFactoryClass;	typedef struct _TpSimpleClientFactoryClass TpSimpleClientFactoryClass;

	struct _TpSimpleClientFactoryClass {	struct _TpSimpleClientFactoryClass {
	/<public>/	/<public>/
	GObjectClass parent_class;	GObjectClass parent_class;

	skipping to change at line 85	skipping to change at line 86
	/<private>/	/<private>/
	GCallback padding[20];	GCallback padding[20];
	};	};

	struct _TpSimpleClientFactory {	struct _TpSimpleClientFactory {
	/<private>/	/<private>/
	GObject parent;	GObject parent;
	TpSimpleClientFactoryPrivate *priv;	TpSimpleClientFactoryPrivate *priv;
	};	};


		_TP_AVAILABLE_IN_0_16
	GType tp_simple_client_factory_get_type (void);	GType tp_simple_client_factory_get_type (void);

	#define TP_TYPE_SIMPLE_CLIENT_FACTORY \	#define TP_TYPE_SIMPLE_CLIENT_FACTORY \
	(tp_simple_client_factory_get_type ())	(tp_simple_client_factory_get_type ())
	#define TP_SIMPLE_CLIENT_FACTORY(obj) \	#define TP_SIMPLE_CLIENT_FACTORY(obj) \
	(G_TYPE_CHECK_INSTANCE_CAST ((obj), TP_TYPE_SIMPLE_CLIENT_FACTORY, \	(G_TYPE_CHECK_INSTANCE_CAST ((obj), TP_TYPE_SIMPLE_CLIENT_FACTORY, \
	TpSimpleClientFactory))	TpSimpleClientFactory))
	#define TP_SIMPLE_CLIENT_FACTORY_CLASS(klass) \	#define TP_SIMPLE_CLIENT_FACTORY_CLASS(klass) \
	(G_TYPE_CHECK_CLASS_CAST ((klass), TP_TYPE_SIMPLE_CLIENT_FACTORY, \	(G_TYPE_CHECK_CLASS_CAST ((klass), TP_TYPE_SIMPLE_CLIENT_FACTORY, \
	TpSimpleClientFactoryClass))	TpSimpleClientFactoryClass))
	#define TP_IS_SIMPLE_CLIENT_FACTORY(obj) \	#define TP_IS_SIMPLE_CLIENT_FACTORY(obj) \
	(G_TYPE_CHECK_INSTANCE_TYPE ((obj), TP_TYPE_SIMPLE_CLIENT_FACTORY))	(G_TYPE_CHECK_INSTANCE_TYPE ((obj), TP_TYPE_SIMPLE_CLIENT_FACTORY))
	#define TP_IS_SIMPLE_CLIENT_FACTORY_CLASS(klass) \	#define TP_IS_SIMPLE_CLIENT_FACTORY_CLASS(klass) \
	(G_TYPE_CHECK_CLASS_TYPE ((klass), TP_TYPE_SIMPLE_CLIENT_FACTORY))	(G_TYPE_CHECK_CLASS_TYPE ((klass), TP_TYPE_SIMPLE_CLIENT_FACTORY))
	#define TP_SIMPLE_CLIENT_FACTORY_GET_CLASS(obj) \	#define TP_SIMPLE_CLIENT_FACTORY_GET_CLASS(obj) \
	(G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_SIMPLE_CLIENT_FACTORY, \	(G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_SIMPLE_CLIENT_FACTORY, \
	TpSimpleClientFactoryClass))	TpSimpleClientFactoryClass))


		_TP_AVAILABLE_IN_0_16
	TpSimpleClientFactory * tp_simple_client_factory_new (TpDBusDaemon *dbus);	TpSimpleClientFactory * tp_simple_client_factory_new (TpDBusDaemon *dbus);


		_TP_AVAILABLE_IN_0_16
	TpDBusDaemon *tp_simple_client_factory_get_dbus_daemon (	TpDBusDaemon *tp_simple_client_factory_get_dbus_daemon (
	TpSimpleClientFactory *self);	TpSimpleClientFactory *self);

	/* TpAccount */	/* TpAccount */

		_TP_AVAILABLE_IN_0_16
	TpAccount tp_simple_client_factory_ensure_account (TpSimpleClientFactory self,	TpAccount tp_simple_client_factory_ensure_account (TpSimpleClientFactory self,
	const gchar *object_path,	const gchar *object_path,
	const GHashTable *immutable_properties,	const GHashTable *immutable_properties,
	GError **error);	GError **error);

		_TP_AVAILABLE_IN_0_16
	GArray *tp_simple_client_factory_dup_account_features (	GArray *tp_simple_client_factory_dup_account_features (
	TpSimpleClientFactory *self,	TpSimpleClientFactory *self,
	TpAccount *account);	TpAccount *account);

		_TP_AVAILABLE_IN_0_16
	void tp_simple_client_factory_add_account_features (TpSimpleClientFactory * self,	void tp_simple_client_factory_add_account_features (TpSimpleClientFactory * self,
	const GQuark *features);	const GQuark *features);

		_TP_AVAILABLE_IN_0_16
	void tp_simple_client_factory_add_account_features_varargs (	void tp_simple_client_factory_add_account_features_varargs (
	TpSimpleClientFactory *self,	TpSimpleClientFactory *self,
	GQuark feature,	GQuark feature,
	...);	...);

	/* TpConnection */	/* TpConnection */

		_TP_AVAILABLE_IN_0_16
	TpConnection *tp_simple_client_factory_ensure_connection (	TpConnection *tp_simple_client_factory_ensure_connection (
	TpSimpleClientFactory *self,	TpSimpleClientFactory *self,
	const gchar *object_path,	const gchar *object_path,
	const GHashTable *immutable_properties,	const GHashTable *immutable_properties,
	GError **error);	GError **error);

		_TP_AVAILABLE_IN_0_16
	GArray *tp_simple_client_factory_dup_connection_features (	GArray *tp_simple_client_factory_dup_connection_features (
	TpSimpleClientFactory *self,	TpSimpleClientFactory *self,
	TpConnection *connection);	TpConnection *connection);

		_TP_AVAILABLE_IN_0_16
	void tp_simple_client_factory_add_connection_features (	void tp_simple_client_factory_add_connection_features (
	TpSimpleClientFactory *self,	TpSimpleClientFactory *self,
	const GQuark *features);	const GQuark *features);

		_TP_AVAILABLE_IN_0_16
	void tp_simple_client_factory_add_connection_features_varargs (	void tp_simple_client_factory_add_connection_features_varargs (
	TpSimpleClientFactory *self,	TpSimpleClientFactory *self,
	GQuark feature,	GQuark feature,
	...);	...);

	/* TpChannel */	/* TpChannel */

		_TP_AVAILABLE_IN_0_16
	TpChannel tp_simple_client_factory_ensure_channel (TpSimpleClientFactory self,	TpChannel tp_simple_client_factory_ensure_channel (TpSimpleClientFactory self,
	TpConnection *connection,	TpConnection *connection,
	const gchar *object_path,	const gchar *object_path,
	const GHashTable *immutable_properties,	const GHashTable *immutable_properties,
	GError **error);	GError **error);

		_TP_AVAILABLE_IN_0_16
	GArray *tp_simple_client_factory_dup_channel_features (	GArray *tp_simple_client_factory_dup_channel_features (
	TpSimpleClientFactory *self,	TpSimpleClientFactory *self,
	TpChannel *channel);	TpChannel *channel);

		_TP_AVAILABLE_IN_0_16
	void tp_simple_client_factory_add_channel_features (TpSimpleClientFactory * self,	void tp_simple_client_factory_add_channel_features (TpSimpleClientFactory * self,
	const GQuark *features);	const GQuark *features);

		_TP_AVAILABLE_IN_0_16
	void tp_simple_client_factory_add_channel_features_varargs (	void tp_simple_client_factory_add_channel_features_varargs (
	TpSimpleClientFactory *self,	TpSimpleClientFactory *self,
	GQuark feature,	GQuark feature,
	...);	...);

	/* TpContact */	/* TpContact */

		_TP_AVAILABLE_IN_0_16
	TpContact tp_simple_client_factory_ensure_contact (TpSimpleClientFactory self,	TpContact tp_simple_client_factory_ensure_contact (TpSimpleClientFactory self,
	TpConnection *connection,	TpConnection *connection,
	TpHandle handle,	TpHandle handle,
	const gchar *identifier);	const gchar *identifier);

		_TP_AVAILABLE_IN_0_16
	GArray *tp_simple_client_factory_dup_contact_features (	GArray *tp_simple_client_factory_dup_contact_features (
	TpSimpleClientFactory *self,	TpSimpleClientFactory *self,
	TpConnection *connection);	TpConnection *connection);

		_TP_AVAILABLE_IN_0_16
	void tp_simple_client_factory_add_contact_features (TpSimpleClientFactory * self,	void tp_simple_client_factory_add_contact_features (TpSimpleClientFactory * self,
	guint n_features,	guint n_features,
	const TpContactFeature *features);	const TpContactFeature *features);

		_TP_AVAILABLE_IN_0_16
	void tp_simple_client_factory_add_contact_features_varargs (	void tp_simple_client_factory_add_contact_features_varargs (
	TpSimpleClientFactory *self,	TpSimpleClientFactory *self,
	TpContactFeature feature,	TpContactFeature feature,
	...);	...);

	G_END_DECLS	G_END_DECLS

	#endif	#endif

End of changes. 20 change blocks.
	0 lines changed or deleted	20 lines changed or added

	simple-handler.h	simple-handler.h

	skipping to change at line 76	skipping to change at line 76
	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
		_TP_DEPRECATED_IN_0_16_FOR (tp_simple_handler_new_with_factory)
	TpBaseClient * tp_simple_handler_new (TpDBusDaemon *dbus,	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);
	_TP_GNUC_DEPRECATED_FOR (tp_simple_handler_new_with_factory);	#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 (	TpBaseClient *tp_simple_handler_new_with_factory (
	TpSimpleClientFactory *factory,	TpSimpleClientFactory *factory,
	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);


End of changes. 3 change blocks.
	2 lines changed or deleted	5 lines changed or added

	simple-observer.h	simple-observer.h

	skipping to change at line 76	skipping to change at line 76
	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
		_TP_DEPRECATED_IN_0_16_FOR (tp_simple_observer_new_with_factory)
	TpBaseClient * tp_simple_observer_new (TpDBusDaemon *dbus,	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);
	_TP_GNUC_DEPRECATED_FOR (tp_simple_observer_new_with_factory);	#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 (	TpBaseClient *tp_simple_observer_new_with_factory (
	TpSimpleClientFactory *factory,	TpSimpleClientFactory *factory,
	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);

	G_END_DECLS	G_END_DECLS

End of changes. 3 change blocks.
	2 lines changed or deleted	5 lines changed or added

	telepathy-enums.h	telepathy-enums.h

	skipping to change at line 24	skipping to change at line 24
	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_LIST = 3,
	TP_HANDLE_TYPE_GROUP = 4,	TP_HANDLE_TYPE_GROUP = 4,
	} TpHandleType;	} TpHandleType;

	#define NUM_TP_HANDLE_TYPES (4+1)	#define TP_NUM_HANDLE_TYPES (4+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 NUM_TP_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,
	TP_CONNECTION_STATUS_REASON_CERT_EXPIRED = 8,	TP_CONNECTION_STATUS_REASON_CERT_EXPIRED = 8,
	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 NUM_TP_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;

	skipping to change at line 89	skipping to change at line 92
	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 NUM_TP_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 NUM_TP_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 NUM_TP_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 NUM_TP_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 NUM_TP_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 {	typedef enum {
	TP_RICH_PRESENCE_ACCESS_CONTROL_TYPE_WHITELIST = 0,	TP_RICH_PRESENCE_ACCESS_CONTROL_TYPE_WHITELIST = 0,
	TP_RICH_PRESENCE_ACCESS_CONTROL_TYPE_PUBLISH_LIST = 1,	TP_RICH_PRESENCE_ACCESS_CONTROL_TYPE_PUBLISH_LIST = 1,
	TP_RICH_PRESENCE_ACCESS_CONTROL_TYPE_GROUP = 2,	TP_RICH_PRESENCE_ACCESS_CONTROL_TYPE_GROUP = 2,
	TP_RICH_PRESENCE_ACCESS_CONTROL_TYPE_OPEN = 3,	TP_RICH_PRESENCE_ACCESS_CONTROL_TYPE_OPEN = 3,
	} TpRichPresenceAccessControlType;	} TpRichPresenceAccessControlType;

	#define NUM_TP_RICH_PRESENCE_ACCESS_CONTROL_TYPES (3+1)	#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 NUM_TP_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 NUM_TP_HTTP_METHODS (1+1)	#define TP_NUM_HTTP_METHODS (1+1)
		#define NUM_TP_HTTP_METHODS TP_NUM_HTTP_METHODS

	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 NUM_TP_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 201	skipping to change at line 213
	TP_CALL_STATE_CHANGE_REASON_NO_ANSWER = 5,	TP_CALL_STATE_CHANGE_REASON_NO_ANSWER = 5,
	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 NUM_TP_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 NUM_TP_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 NUM_TP_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 NUM_TP_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 NUM_TP_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 {	typedef enum {
	TP_MEDIA_STREAM_TYPE_AUDIO = 0,	TP_MEDIA_STREAM_TYPE_AUDIO = 0,
	TP_MEDIA_STREAM_TYPE_VIDEO = 1,	TP_MEDIA_STREAM_TYPE_VIDEO = 1,
	} TpMediaStreamType;	} TpMediaStreamType;

	#define NUM_TP_MEDIA_STREAM_TYPES (1+1)	#define TP_NUM_MEDIA_STREAM_TYPES (1+1)
		#define NUM_TP_MEDIA_STREAM_TYPES TP_NUM_MEDIA_STREAM_TYPES

	typedef enum {	typedef enum {
	TP_MEDIA_STREAM_STATE_DISCONNECTED = 0,	TP_MEDIA_STREAM_STATE_DISCONNECTED = 0,
	TP_MEDIA_STREAM_STATE_CONNECTING = 1,	TP_MEDIA_STREAM_STATE_CONNECTING = 1,
	TP_MEDIA_STREAM_STATE_CONNECTED = 2,	TP_MEDIA_STREAM_STATE_CONNECTED = 2,
	} TpMediaStreamState;	} TpMediaStreamState;

	#define NUM_TP_MEDIA_STREAM_STATES (2+1)	#define TP_NUM_MEDIA_STREAM_STATES (2+1)
		#define NUM_TP_MEDIA_STREAM_STATES TP_NUM_MEDIA_STREAM_STATES

	typedef enum {	typedef enum {
	TP_MEDIA_STREAM_DIRECTION_NONE = 0,	TP_MEDIA_STREAM_DIRECTION_NONE = 0,
	TP_MEDIA_STREAM_DIRECTION_SEND = 1,	TP_MEDIA_STREAM_DIRECTION_SEND = 1,
	TP_MEDIA_STREAM_DIRECTION_RECEIVE = 2,	TP_MEDIA_STREAM_DIRECTION_RECEIVE = 2,
	TP_MEDIA_STREAM_DIRECTION_BIDIRECTIONAL = 3,	TP_MEDIA_STREAM_DIRECTION_BIDIRECTIONAL = 3,
	} TpMediaStreamDirection;	} TpMediaStreamDirection;

	#define NUM_TP_MEDIA_STREAM_DIRECTIONS (3+1)	#define TP_NUM_MEDIA_STREAM_DIRECTIONS (3+1)
		#define NUM_TP_MEDIA_STREAM_DIRECTIONS TP_NUM_MEDIA_STREAM_DIRECTIONS

	typedef enum /< flags >/ {	typedef enum /< flags >/ {
	TP_MEDIA_STREAM_PENDING_LOCAL_SEND = 1,	TP_MEDIA_STREAM_PENDING_LOCAL_SEND = 1,
	TP_MEDIA_STREAM_PENDING_REMOTE_SEND = 2,	TP_MEDIA_STREAM_PENDING_REMOTE_SEND = 2,
	} TpMediaStreamPendingSend;	} TpMediaStreamPendingSend;

	typedef enum /< flags >/ {	typedef enum /< flags >/ {
	TP_CHANNEL_MEDIA_CAPABILITY_AUDIO = 1,	TP_CHANNEL_MEDIA_CAPABILITY_AUDIO = 1,
	TP_CHANNEL_MEDIA_CAPABILITY_VIDEO = 2,	TP_CHANNEL_MEDIA_CAPABILITY_VIDEO = 2,
	TP_CHANNEL_MEDIA_CAPABILITY_NAT_TRAVERSAL_STUN = 4,	TP_CHANNEL_MEDIA_CAPABILITY_NAT_TRAVERSAL_STUN = 4,

	skipping to change at line 289	skipping to change at line 309
	} TpChannelMediaCapabilities;	} TpChannelMediaCapabilities;

	typedef enum {	typedef enum {
	TP_CHANNEL_TEXT_SEND_ERROR_UNKNOWN = 0,	TP_CHANNEL_TEXT_SEND_ERROR_UNKNOWN = 0,
	TP_CHANNEL_TEXT_SEND_ERROR_OFFLINE = 1,	TP_CHANNEL_TEXT_SEND_ERROR_OFFLINE = 1,
	TP_CHANNEL_TEXT_SEND_ERROR_INVALID_CONTACT = 2,	TP_CHANNEL_TEXT_SEND_ERROR_INVALID_CONTACT = 2,
	TP_CHANNEL_TEXT_SEND_ERROR_PERMISSION_DENIED = 3,	TP_CHANNEL_TEXT_SEND_ERROR_PERMISSION_DENIED = 3,
	TP_CHANNEL_TEXT_SEND_ERROR_TOO_LONG = 4,	TP_CHANNEL_TEXT_SEND_ERROR_TOO_LONG = 4,
	TP_CHANNEL_TEXT_SEND_ERROR_NOT_IMPLEMENTED = 5,	TP_CHANNEL_TEXT_SEND_ERROR_NOT_IMPLEMENTED = 5,
	} TpChannelTextSendError;	} TpChannelTextSendError;

	#define NUM_TP_CHANNEL_TEXT_SEND_ERRORS (5+1)	#define TP_NUM_CHANNEL_TEXT_SEND_ERRORS (5+1)
		#define NUM_TP_CHANNEL_TEXT_SEND_ERRORS TP_NUM_CHANNEL_TEXT_SEND_ERRORS

	typedef enum {	typedef enum {
	TP_CHANNEL_TEXT_MESSAGE_TYPE_NORMAL = 0,	TP_CHANNEL_TEXT_MESSAGE_TYPE_NORMAL = 0,
	TP_CHANNEL_TEXT_MESSAGE_TYPE_ACTION = 1,	TP_CHANNEL_TEXT_MESSAGE_TYPE_ACTION = 1,
	TP_CHANNEL_TEXT_MESSAGE_TYPE_NOTICE = 2,	TP_CHANNEL_TEXT_MESSAGE_TYPE_NOTICE = 2,
	TP_CHANNEL_TEXT_MESSAGE_TYPE_AUTO_REPLY = 3,	TP_CHANNEL_TEXT_MESSAGE_TYPE_AUTO_REPLY = 3,
	TP_CHANNEL_TEXT_MESSAGE_TYPE_DELIVERY_REPORT = 4,	TP_CHANNEL_TEXT_MESSAGE_TYPE_DELIVERY_REPORT = 4,
	} TpChannelTextMessageType;	} TpChannelTextMessageType;

	#define NUM_TP_CHANNEL_TEXT_MESSAGE_TYPES (4+1)	#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 >/ {	typedef enum /< flags >/ {
	TP_CHANNEL_TEXT_MESSAGE_FLAG_TRUNCATED = 1,	TP_CHANNEL_TEXT_MESSAGE_FLAG_TRUNCATED = 1,
	TP_CHANNEL_TEXT_MESSAGE_FLAG_NON_TEXT_CONTENT = 2,	TP_CHANNEL_TEXT_MESSAGE_FLAG_NON_TEXT_CONTENT = 2,
	TP_CHANNEL_TEXT_MESSAGE_FLAG_SCROLLBACK = 4,	TP_CHANNEL_TEXT_MESSAGE_FLAG_SCROLLBACK = 4,
	TP_CHANNEL_TEXT_MESSAGE_FLAG_RESCUED = 8,	TP_CHANNEL_TEXT_MESSAGE_FLAG_RESCUED = 8,
	} TpChannelTextMessageFlags;	} TpChannelTextMessageFlags;

	typedef enum {	typedef enum {
	TP_TUBE_TYPE_DBUS = 0,	TP_TUBE_TYPE_DBUS = 0,
	TP_TUBE_TYPE_STREAM = 1,	TP_TUBE_TYPE_STREAM = 1,
	} TpTubeType;	} TpTubeType;

	#define NUM_TP_TUBE_TYPES (1+1)	#define TP_NUM_TUBE_TYPES (1+1)
		#define NUM_TP_TUBE_TYPES TP_NUM_TUBE_TYPES

	typedef enum {	typedef enum {
	TP_TUBE_STATE_LOCAL_PENDING = 0,	TP_TUBE_STATE_LOCAL_PENDING = 0,
	TP_TUBE_STATE_REMOTE_PENDING = 1,	TP_TUBE_STATE_REMOTE_PENDING = 1,
	TP_TUBE_STATE_OPEN = 2,	TP_TUBE_STATE_OPEN = 2,
	} TpTubeState;	} TpTubeState;

	#define NUM_TP_TUBE_STATES (2+1)	#define TP_NUM_TUBE_STATES (2+1)
		#define NUM_TP_TUBE_STATES TP_NUM_TUBE_STATES

	typedef enum /< flags >/ {	typedef enum /< flags >/ {
	TP_CHANNEL_CALL_STATE_RINGING = 1,	TP_CHANNEL_CALL_STATE_RINGING = 1,
	TP_CHANNEL_CALL_STATE_QUEUED = 2,	TP_CHANNEL_CALL_STATE_QUEUED = 2,
	TP_CHANNEL_CALL_STATE_HELD = 4,	TP_CHANNEL_CALL_STATE_HELD = 4,
	TP_CHANNEL_CALL_STATE_FORWARDED = 8,	TP_CHANNEL_CALL_STATE_FORWARDED = 8,
	TP_CHANNEL_CALL_STATE_IN_PROGRESS = 16,	TP_CHANNEL_CALL_STATE_IN_PROGRESS = 16,
	TP_CHANNEL_CALL_STATE_CONFERENCE_HOST = 32,	TP_CHANNEL_CALL_STATE_CONFERENCE_HOST = 32,
	} TpChannelCallStateFlags;	} 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 NUM_TP_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 NUM_TP_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 NUM_TP_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 NUM_TP_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,

	skipping to change at line 409	skipping to change at line 437
	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 NUM_TP_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 NUM_TP_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 NUM_TP_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 >/ {	typedef enum /< flags >/ {
	TP_MESSAGE_PART_SUPPORT_FLAG_ONE_ATTACHMENT = 1,	TP_MESSAGE_PART_SUPPORT_FLAG_ONE_ATTACHMENT = 1,
	TP_MESSAGE_PART_SUPPORT_FLAG_MULTIPLE_ATTACHMENTS = 2,	TP_MESSAGE_PART_SUPPORT_FLAG_MULTIPLE_ATTACHMENTS = 2,
	} TpMessagePartSupportFlags;	} TpMessagePartSupportFlags;

	typedef enum /< flags >/ {	typedef enum /< flags >/ {
	TP_MESSAGE_SENDING_FLAG_REPORT_DELIVERY = 1,	TP_MESSAGE_SENDING_FLAG_REPORT_DELIVERY = 1,
	TP_MESSAGE_SENDING_FLAG_REPORT_READ = 2,	TP_MESSAGE_SENDING_FLAG_REPORT_READ = 2,
	TP_MESSAGE_SENDING_FLAG_REPORT_DELETED = 4,	TP_MESSAGE_SENDING_FLAG_REPORT_DELETED = 4,

	skipping to change at line 446	skipping to change at line 477

	typedef enum {	typedef enum {
	TP_DELIVERY_STATUS_UNKNOWN = 0,	TP_DELIVERY_STATUS_UNKNOWN = 0,
	TP_DELIVERY_STATUS_DELIVERED = 1,	TP_DELIVERY_STATUS_DELIVERED = 1,
	TP_DELIVERY_STATUS_TEMPORARILY_FAILED = 2,	TP_DELIVERY_STATUS_TEMPORARILY_FAILED = 2,
	TP_DELIVERY_STATUS_PERMANENTLY_FAILED = 3,	TP_DELIVERY_STATUS_PERMANENTLY_FAILED = 3,
	TP_DELIVERY_STATUS_ACCEPTED = 4,	TP_DELIVERY_STATUS_ACCEPTED = 4,
	TP_DELIVERY_STATUS_READ = 5,	TP_DELIVERY_STATUS_READ = 5,
	TP_DELIVERY_STATUS_DELETED = 6,	TP_DELIVERY_STATUS_DELETED = 6,
	} TpDeliveryStatus;	} TpDeliveryStatus;

	#define NUM_TP_DELIVERY_STATUSES (6+1)	#define TP_NUM_DELIVERY_STATUSES (6+1)
		#define NUM_TP_DELIVERY_STATUSES TP_NUM_DELIVERY_STATUSES

	typedef enum /< flags >/ {	typedef enum /< flags >/ {
	TP_DELIVERY_REPORTING_SUPPORT_FLAG_RECEIVE_FAILURES = 1,	TP_DELIVERY_REPORTING_SUPPORT_FLAG_RECEIVE_FAILURES = 1,
	TP_DELIVERY_REPORTING_SUPPORT_FLAG_RECEIVE_SUCCESSES = 2,	TP_DELIVERY_REPORTING_SUPPORT_FLAG_RECEIVE_SUCCESSES = 2,
	TP_DELIVERY_REPORTING_SUPPORT_FLAG_RECEIVE_READ = 4,	TP_DELIVERY_REPORTING_SUPPORT_FLAG_RECEIVE_READ = 4,
	TP_DELIVERY_REPORTING_SUPPORT_FLAG_RECEIVE_DELETED = 8,	TP_DELIVERY_REPORTING_SUPPORT_FLAG_RECEIVE_DELETED = 8,
	} TpDeliveryReportingSupportFlags;	} 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 NUM_TP_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 NUM_TP_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 NUM_TP_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 NUM_TP_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_NETMASK = 2,
	TP_SOCKET_ACCESS_CONTROL_CREDENTIALS = 3,	TP_SOCKET_ACCESS_CONTROL_CREDENTIALS = 3,
	} TpSocketAccessControl;	} TpSocketAccessControl;

	#define NUM_TP_SOCKET_ACCESS_CONTROLS (3+1)	#define TP_NUM_SOCKET_ACCESS_CONTROLS (3+1)
		#define NUM_TP_SOCKET_ACCESS_CONTROLS TP_NUM_SOCKET_ACCESS_CONTROLS

	typedef enum {	typedef enum {
	TP_MEDIA_STREAM_ERROR_UNKNOWN = 0,	TP_MEDIA_STREAM_ERROR_UNKNOWN = 0,
	TP_MEDIA_STREAM_ERROR_EOS = 1,	TP_MEDIA_STREAM_ERROR_EOS = 1,
	TP_MEDIA_STREAM_ERROR_CODEC_NEGOTIATION_FAILED = 2,	TP_MEDIA_STREAM_ERROR_CODEC_NEGOTIATION_FAILED = 2,
	TP_MEDIA_STREAM_ERROR_CONNECTION_FAILED = 3,	TP_MEDIA_STREAM_ERROR_CONNECTION_FAILED = 3,
	TP_MEDIA_STREAM_ERROR_NETWORK_ERROR = 4,	TP_MEDIA_STREAM_ERROR_NETWORK_ERROR = 4,
	TP_MEDIA_STREAM_ERROR_NO_CODECS = 5,	TP_MEDIA_STREAM_ERROR_NO_CODECS = 5,
	TP_MEDIA_STREAM_ERROR_INVALID_CM_BEHAVIOR = 6,	TP_MEDIA_STREAM_ERROR_INVALID_CM_BEHAVIOR = 6,
	TP_MEDIA_STREAM_ERROR_MEDIA_ERROR = 7,	TP_MEDIA_STREAM_ERROR_MEDIA_ERROR = 7,
	} TpMediaStreamError;	} TpMediaStreamError;

	#define NUM_TP_MEDIA_STREAM_ERRORS (7+1)	#define TP_NUM_MEDIA_STREAM_ERRORS (7+1)
		#define NUM_TP_MEDIA_STREAM_ERRORS TP_NUM_MEDIA_STREAM_ERRORS

	typedef enum {	typedef enum {
	TP_MEDIA_STREAM_BASE_PROTO_UDP = 0,	TP_MEDIA_STREAM_BASE_PROTO_UDP = 0,
	TP_MEDIA_STREAM_BASE_PROTO_TCP = 1,	TP_MEDIA_STREAM_BASE_PROTO_TCP = 1,
	} TpMediaStreamBaseProto;	} TpMediaStreamBaseProto;

	#define NUM_TP_MEDIA_STREAM_BASE_PROTOS (1+1)	#define TP_NUM_MEDIA_STREAM_BASE_PROTOS (1+1)
		#define NUM_TP_MEDIA_STREAM_BASE_PROTOS TP_NUM_MEDIA_STREAM_BASE_PROTOS

	typedef enum {	typedef enum {
	TP_MEDIA_STREAM_TRANSPORT_TYPE_LOCAL = 0,	TP_MEDIA_STREAM_TRANSPORT_TYPE_LOCAL = 0,
	TP_MEDIA_STREAM_TRANSPORT_TYPE_DERIVED = 1,	TP_MEDIA_STREAM_TRANSPORT_TYPE_DERIVED = 1,
	TP_MEDIA_STREAM_TRANSPORT_TYPE_RELAY = 2,	TP_MEDIA_STREAM_TRANSPORT_TYPE_RELAY = 2,
	} TpMediaStreamTransportType;	} TpMediaStreamTransportType;

	#define NUM_TP_MEDIA_STREAM_TRANSPORT_TYPES (2+1)	#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 >/ {	typedef enum /< flags >/ {
	TP_PROPERTY_FLAG_READ = 1,	TP_PROPERTY_FLAG_READ = 1,
	TP_PROPERTY_FLAG_WRITE = 2,	TP_PROPERTY_FLAG_WRITE = 2,
	} TpPropertyFlags;	} 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,

	skipping to change at line 546	skipping to change at line 586
	} 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 NUM_TP_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 NUM_TP_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 NUM_TP_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 NUM_TP_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 NUM_TP_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 NUM_TP_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 {	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 NUM_TP_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 NUM_TP_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 {	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 NUM_TP_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 NUM_TP_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 NUM_TP_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 NUM_TP_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. 52 change blocks.
	52 lines changed or deleted	113 lines changed or added

	telepathy-glib.h	telepathy-glib.h

	skipping to change at line 25	skipping to change at line 25
	*	*
	* 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_GLIB_H__	#define __TP_IN_GLIB_H__


	#include <telepathy-glib/interfaces.h>
	#include <telepathy-glib/gtypes.h>
	#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>
	#include <telepathy-glib/account-manager.h>	#include <telepathy-glib/account-manager.h>
	#include <telepathy-glib/account.h>	#include <telepathy-glib/account.h>

	#include <telepathy-glib/automatic-proxy-factory.h>	#include <telepathy-glib/add-dispatch-operation-context.h>
	#include <telepathy-glib/automatic-client-factory.h>	#include <telepathy-glib/automatic-client-factory.h>

		#include <telepathy-glib/base-call-channel.h>
		#include <telepathy-glib/base-call-content.h>
		#include <telepathy-glib/base-call-stream.h>
		#include <telepathy-glib/base-channel.h>
	#include <telepathy-glib/base-client.h>	#include <telepathy-glib/base-client.h>

	#include <telepathy-glib/basic-proxy-factory.h>	#include <telepathy-glib/base-connection-manager.h>
		#include <telepathy-glib/base-connection.h>
		#include <telepathy-glib/base-contact-list.h>
		#include <telepathy-glib/base-media-call-channel.h>
		#include <telepathy-glib/base-media-call-content.h>
		#include <telepathy-glib/base-media-call-stream.h>
		#include <telepathy-glib/base-password-channel.h>
		#include <telepathy-glib/base-protocol.h>
		#include <telepathy-glib/base-room-config.h>
	#include <telepathy-glib/call-channel.h>	#include <telepathy-glib/call-channel.h>

		#include <telepathy-glib/call-content-media-description.h>
	#include <telepathy-glib/call-content.h>	#include <telepathy-glib/call-content.h>
	#include <telepathy-glib/call-misc.h>	#include <telepathy-glib/call-misc.h>

		#include <telepathy-glib/call-stream-endpoint.h>
	#include <telepathy-glib/call-stream.h>	#include <telepathy-glib/call-stream.h>

		#include <telepathy-glib/capabilities.h>
	#include <telepathy-glib/channel-dispatch-operation.h>	#include <telepathy-glib/channel-dispatch-operation.h>
	#include <telepathy-glib/channel-dispatcher.h>	#include <telepathy-glib/channel-dispatcher.h>

		#include <telepathy-glib/channel-iface.h>
		#include <telepathy-glib/channel-manager.h>
	#include <telepathy-glib/channel-request.h>	#include <telepathy-glib/channel-request.h>
	#include <telepathy-glib/channel.h>	#include <telepathy-glib/channel.h>

	#include <telepathy-glib/client-channel-factory.h>	#include <telepathy-glib/client.h>
		#include <telepathy-glib/client-message.h>
		#include <telepathy-glib/cm-message.h>
	#include <telepathy-glib/connection-contact-list.h>	#include <telepathy-glib/connection-contact-list.h>
	#include <telepathy-glib/connection-manager.h>	#include <telepathy-glib/connection-manager.h>
	#include <telepathy-glib/connection.h>	#include <telepathy-glib/connection.h>

	#include <telepathy-glib/contact.h>
	#include <telepathy-glib/contact-operations.h>	#include <telepathy-glib/contact-operations.h>

	#include <telepathy-glib/contact-search.h>
	#include <telepathy-glib/contact-search-result.h>	#include <telepathy-glib/contact-search-result.h>

		#include <telepathy-glib/contact-search.h>
		#include <telepathy-glib/contact.h>
		#include <telepathy-glib/contacts-mixin.h>
	#include <telepathy-glib/dbus.h>	#include <telepathy-glib/dbus.h>

	#include <telepathy-glib/dtmf.h>	#include <telepathy-glib/dbus-properties-mixin.h>
		#include <telepathy-glib/dbus-tube-channel.h>
		#include <telepathy-glib/debug-client.h>
		#include <telepathy-glib/debug-message.h>
		#include <telepathy-glib/debug-sender.h>
	#include <telepathy-glib/debug.h>	#include <telepathy-glib/debug.h>

		#include <telepathy-glib/dtmf.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/handle-channels-context.h>
		#include <telepathy-glib/handle-repo.h>
		#include <telepathy-glib/handle-repo-dynamic.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-mixin.h>
		#include <telepathy-glib/observe-channels-context.h>
		#include <telepathy-glib/presence-mixin.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-list.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/simple-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-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/tls-certificate.h>

		/* deprecated, gone in 1.0 */
		#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-generic.h>
	#include <telepathy-glib/svc-client.h>	#include <telepathy-glib/svc-client.h>


	#include <telepathy-glib/base-call-channel.h>
	#include <telepathy-glib/base-call-content.h>
	#include <telepathy-glib/base-call-stream.h>
	#include <telepathy-glib/base-channel.h>
	#include <telepathy-glib/base-media-call-channel.h>
	#include <telepathy-glib/base-media-call-content.h>
	#include <telepathy-glib/base-media-call-stream.h>
	#include <telepathy-glib/base-connection.h>
	#include <telepathy-glib/base-connection-manager.h>
	#include <telepathy-glib/base-contact-list.h>
	#include <telepathy-glib/base-protocol.h>
	#include <telepathy-glib/call-content-media-description.h>
	#include <telepathy-glib/call-stream-endpoint.h>

	#undef __TP_IN_GLIB_H__	#undef __TP_IN_GLIB_H__
	#endif /* __TP_GLIB_H__ */	#endif /* __TP_GLIB_H__ */

End of changes. 21 change blocks.
	22 lines changed or deleted	57 lines changed or added

	text-channel.h	text-channel.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_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/signalled-message.h>	#include <telepathy-glib/signalled-message.h>

	G_BEGIN_DECLS	G_BEGIN_DECLS

	#define TP_TYPE_TEXT_CHANNEL (tp_text_channel_get_type ())	#define TP_TYPE_TEXT_CHANNEL (tp_text_channel_get_type ())
	#define TP_TEXT_CHANNEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TP_TYPE_TE XT_CHANNEL, TpTextChannel))	#define TP_TEXT_CHANNEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TP_TYPE_TE XT_CHANNEL, TpTextChannel))
	#define TP_TEXT_CHANNEL_CLASS(obj) (G_TYPE_CHECK_CLASS_CAST ((obj), TP_TYPE _TEXT_CHANNEL, TpTextChannelClass))	#define TP_TEXT_CHANNEL_CLASS(obj) (G_TYPE_CHECK_CLASS_CAST ((obj), TP_TYPE _TEXT_CHANNEL, TpTextChannelClass))
	#define TP_IS_TEXT_CHANNEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TP_TYPE _TEXT_CHANNEL))	#define TP_IS_TEXT_CHANNEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TP_TYPE _TEXT_CHANNEL))
	#define TP_IS_TEXT_CHANNEL_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE ((obj), TP_T YPE_TEXT_CHANNEL))	#define TP_IS_TEXT_CHANNEL_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE ((obj), TP_T YPE_TEXT_CHANNEL))
	#define TP_TEXT_CHANNEL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), T P_TYPE_TEXT_CHANNEL, TpTextChannelClass))	#define TP_TEXT_CHANNEL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), T P_TYPE_TEXT_CHANNEL, TpTextChannelClass))

	skipping to change at line 112	skipping to change at line 113

	void tp_text_channel_ack_message_async (TpTextChannel *self,	void tp_text_channel_ack_message_async (TpTextChannel *self,
	TpMessage *message,	TpMessage *message,
	GAsyncReadyCallback callback,	GAsyncReadyCallback callback,
	gpointer user_data);	gpointer user_data);

	gboolean tp_text_channel_ack_message_finish (TpTextChannel *self,	gboolean tp_text_channel_ack_message_finish (TpTextChannel *self,
	GAsyncResult *result,	GAsyncResult *result,
	GError **error);	GError **error);


		_TP_AVAILABLE_IN_0_16
	void tp_text_channel_ack_all_pending_messages_async (TpTextChannel *self,	void tp_text_channel_ack_all_pending_messages_async (TpTextChannel *self,
	GAsyncReadyCallback callback,	GAsyncReadyCallback callback,
	gpointer user_data);	gpointer user_data);


		_TP_AVAILABLE_IN_0_16
	gboolean tp_text_channel_ack_all_pending_messages_finish (TpTextChannel *se lf,	gboolean tp_text_channel_ack_all_pending_messages_finish (TpTextChannel *se lf,
	GAsyncResult *result,	GAsyncResult *result,
	GError **error);	GError **error);


		#define TP_TEXT_CHANNEL_FEATURE_CHAT_STATES \
		tp_text_channel_get_feature_quark_chat_states ()
		_TP_AVAILABLE_IN_0_20
		GQuark tp_text_channel_get_feature_quark_chat_states (void) G_GNUC_CONST;

		_TP_AVAILABLE_IN_0_20
		TpChannelChatState tp_text_channel_get_chat_state (TpTextChannel *self,
		TpContact *contact);

	void tp_text_channel_set_chat_state_async (TpTextChannel *self,	void tp_text_channel_set_chat_state_async (TpTextChannel *self,
	TpChannelChatState state,	TpChannelChatState state,
	GAsyncReadyCallback callback,	GAsyncReadyCallback callback,
	gpointer user_data);	gpointer user_data);

	gboolean tp_text_channel_set_chat_state_finish (TpTextChannel *self,	gboolean tp_text_channel_set_chat_state_finish (TpTextChannel *self,
	GAsyncResult *result,	GAsyncResult *result,
	GError **error);	GError **error);

	#define TP_TEXT_CHANNEL_FEATURE_SMS \	#define TP_TEXT_CHANNEL_FEATURE_SMS \
	tp_text_channel_get_feature_quark_sms ()	tp_text_channel_get_feature_quark_sms ()

		_TP_AVAILABLE_IN_0_16
	GQuark tp_text_channel_get_feature_quark_sms (void) G_GNUC_CONST;	GQuark tp_text_channel_get_feature_quark_sms (void) G_GNUC_CONST;


		_TP_AVAILABLE_IN_0_16
	gboolean tp_text_channel_is_sms_channel (TpTextChannel *self);	gboolean tp_text_channel_is_sms_channel (TpTextChannel *self);


		_TP_AVAILABLE_IN_0_16
	gboolean tp_text_channel_get_sms_flash (TpTextChannel *self);	gboolean tp_text_channel_get_sms_flash (TpTextChannel *self);


		_TP_AVAILABLE_IN_0_16
	void tp_text_channel_get_sms_length_async (TpTextChannel *self,	void tp_text_channel_get_sms_length_async (TpTextChannel *self,
	TpMessage *message,	TpMessage *message,
	GAsyncReadyCallback callback,	GAsyncReadyCallback callback,
	gpointer user_data);	gpointer user_data);


		_TP_AVAILABLE_IN_0_16
	gboolean tp_text_channel_get_sms_length_finish (TpTextChannel *self,	gboolean tp_text_channel_get_sms_length_finish (TpTextChannel *self,
	GAsyncResult *result,	GAsyncResult *result,
	guint *chunks_required,	guint *chunks_required,
	gint *remaining_characters,	gint *remaining_characters,
	gint *estimated_cost,	gint *estimated_cost,
	GError **error);	GError **error);

	G_END_DECLS	G_END_DECLS

	#endif	#endif

End of changes. 9 change blocks.
	0 lines changed or deleted	17 lines changed or added

	text-mixin.h	text-mixin.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_TEXT_MIXIN_H__	#ifndef __TP_TEXT_MIXIN_H__
	#define __TP_TEXT_MIXIN_H__	#define __TP_TEXT_MIXIN_H__

	#include <time.h>	#include <time.h>


		#include <telepathy-glib/defs.h>
	#include <telepathy-glib/handle-repo.h>	#include <telepathy-glib/handle-repo.h>
	#include <telepathy-glib/svc-channel.h>	#include <telepathy-glib/svc-channel.h>
	#include "util.h"	#include "util.h"

	G_BEGIN_DECLS	G_BEGIN_DECLS


		#ifndef TP_DISABLE_DEPRECATED

	typedef struct _TpTextMixinClass TpTextMixinClass;	typedef struct _TpTextMixinClass TpTextMixinClass;
	typedef struct _TpTextMixinClassPrivate TpTextMixinClassPrivate;	typedef struct _TpTextMixinClassPrivate TpTextMixinClassPrivate;
	typedef struct _TpTextMixin TpTextMixin;	typedef struct _TpTextMixin TpTextMixin;
	typedef struct _TpTextMixinPrivate TpTextMixinPrivate;	typedef struct _TpTextMixinPrivate TpTextMixinPrivate;

	/**	/**
	* TpTextMixinClass:	* TpTextMixinClass:
	*	*
	* Structure to be included in the class structure of objects that	* Structure to be included in the class structure of objects that
	* use this mixin. Initialize it with tp_text_mixin_class_init().	* use this mixin. Initialize it with tp_text_mixin_class_init().

	skipping to change at line 78	skipping to change at line 81
	#define TP_TEXT_MIXIN_CLASS(o) \	#define TP_TEXT_MIXIN_CLASS(o) \
	((TpTextMixinClass *) tp_mixin_offset_cast (o, \	((TpTextMixinClass *) tp_mixin_offset_cast (o, \
	TP_TEXT_MIXIN_CLASS_OFFSET (o)))	TP_TEXT_MIXIN_CLASS_OFFSET (o)))

	#define TP_TEXT_MIXIN_OFFSET_QUARK (tp_text_mixin_get_offset_quark ())	#define TP_TEXT_MIXIN_OFFSET_QUARK (tp_text_mixin_get_offset_quark ())
	#define TP_TEXT_MIXIN_OFFSET(o) \	#define TP_TEXT_MIXIN_OFFSET(o) \
	tp_mixin_instance_get_offset (o, TP_TEXT_MIXIN_OFFSET_QUARK)	tp_mixin_instance_get_offset (o, TP_TEXT_MIXIN_OFFSET_QUARK)
	#define TP_TEXT_MIXIN(o) \	#define TP_TEXT_MIXIN(o) \
	((TpTextMixin *) tp_mixin_offset_cast (o, TP_TEXT_MIXIN_OFFSET (o)))	((TpTextMixin *) tp_mixin_offset_cast (o, TP_TEXT_MIXIN_OFFSET (o)))


	GQuark tp_text_mixin_class_get_offset_quark (void);	GQuark tp_text_mixin_class_get_offset_quark (void) _TP_GNUC_DEPRECATED;
	GQuark tp_text_mixin_get_offset_quark (void);	GQuark tp_text_mixin_get_offset_quark (void) _TP_GNUC_DEPRECATED;


	void tp_text_mixin_class_init (GObjectClass *obj_cls, glong offset);	void tp_text_mixin_class_init (GObjectClass *obj_cls, glong offset)
		_TP_GNUC_DEPRECATED;

	void tp_text_mixin_init (GObject *obj, glong offset,	void tp_text_mixin_init (GObject *obj, glong offset,

	TpHandleRepoIface *contacts_repo);	TpHandleRepoIface *contacts_repo)
	void tp_text_mixin_set_message_types (GObject *obj, ...);	_TP_GNUC_DEPRECATED_FOR (tp_message_mixin_init);
	void tp_text_mixin_finalize (GObject *obj);	void tp_text_mixin_set_message_types (GObject *obj, ...) _TP_GNUC_DEPRECATE
		D;
		void tp_text_mixin_finalize (GObject *obj)
		_TP_GNUC_DEPRECATED_FOR (tp_message_mixin_finalize);

	gboolean tp_text_mixin_receive_with_flags (GObject *obj,	gboolean tp_text_mixin_receive_with_flags (GObject *obj,
	TpChannelTextMessageType type, TpHandle sender, time_t timestamp,	TpChannelTextMessageType type, TpHandle sender, time_t timestamp,

	const char *text, TpChannelTextMessageFlags flags);	const char *text, TpChannelTextMessageFlags flags)
		_TP_GNUC_DEPRECATED_FOR (tp_message_mixin_take_received);
	gboolean tp_text_mixin_receive (GObject *obj, TpChannelTextMessageType type ,	gboolean tp_text_mixin_receive (GObject *obj, TpChannelTextMessageType type ,

	TpHandle sender, time_t timestamp, const char *text);	TpHandle sender, time_t timestamp, const char *text)
		_TP_GNUC_DEPRECATED_FOR (tp_message_mixin_take_received);
	gboolean tp_text_mixin_acknowledge_pending_messages (GObject *obj,	gboolean tp_text_mixin_acknowledge_pending_messages (GObject *obj,

	const GArray * ids, GError **error);	const GArray * ids, GError **error) _TP_GNUC_DEPRECATED;
	gboolean tp_text_mixin_list_pending_messages (GObject *obj, gboolean clear,	gboolean tp_text_mixin_list_pending_messages (GObject *obj, gboolean clear,

	GPtrArray ret, GError error);	GPtrArray ret, GError error) _TP_GNUC_DEPRECATED;
	gboolean tp_text_mixin_get_message_types (GObject obj, GArray *ret,	gboolean tp_text_mixin_get_message_types (GObject obj, GArray *ret,

	GError **error);	GError **error) _TP_GNUC_DEPRECATED;
	void tp_text_mixin_clear (GObject *obj);	void tp_text_mixin_clear (GObject *obj)
		_TP_GNUC_DEPRECATED_FOR (tp_message_mixin_clear);

	gboolean tp_text_mixin_has_pending_messages (GObject *obj,	gboolean tp_text_mixin_has_pending_messages (GObject *obj,

	TpHandle *first_sender);	TpHandle *first_sender)
	void tp_text_mixin_set_rescued (GObject *obj);	_TP_GNUC_DEPRECATED_FOR (tp_message_mixin_has_pending_messages);
		void tp_text_mixin_set_rescued (GObject *obj)
		_TP_GNUC_DEPRECATED_FOR (tp_message_mixin_set_rescued);

		void tp_text_mixin_iface_init (gpointer g_iface, gpointer iface_data)
		_TP_GNUC_DEPRECATED_FOR (tp_message_mixin_text_iface_init);


	void tp_text_mixin_iface_init (gpointer g_iface, gpointer iface_data);	#endif

	G_END_DECLS	G_END_DECLS

	#endif /* #ifndef __TP_TEXT_MIXIN_H__ */	#endif /* #ifndef __TP_TEXT_MIXIN_H__ */

End of changes. 12 change blocks.
	15 lines changed or deleted	30 lines changed or added

	tp-cli-account-manager.h	tp-cli-account-manager.h

		#ifndef TP_GEN_TP_CLI_ACCOUNT_MANAGER_H_INCLUDED
		#define TP_GEN_TP_CLI_ACCOUNT_MANAGER_H_INCLUDED

	G_BEGIN_DECLS	G_BEGIN_DECLS

	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,

	skipping to change at line 42	skipping to change at line 45
	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);

	G_END_DECLS	G_END_DECLS


		#endif /* defined (TP_GEN_TP_CLI_ACCOUNT_MANAGER_H_INCLUDED) */

End of changes. 2 change blocks.
	0 lines changed or deleted	3 lines changed or added

	tp-cli-account.h	tp-cli-account.h

		#ifndef TP_GEN_TP_CLI_ACCOUNT_H_INCLUDED
		#define TP_GEN_TP_CLI_ACCOUNT_H_INCLUDED

	G_BEGIN_DECLS	G_BEGIN_DECLS

	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);

	skipping to change at line 81	skipping to change at line 84
	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);

	G_END_DECLS	G_END_DECLS


		#endif /* defined (TP_GEN_TP_CLI_ACCOUNT_H_INCLUDED) */

End of changes. 2 change blocks.
	0 lines changed or deleted	3 lines changed or added

	tp-cli-call-content-media-description.h	tp-cli-call-content-media-description.h

		#ifndef TP_GEN_TP_CLI_CALL_CONTENT_MEDIA_DESCRIPTION_H_INCLUDED
		#define TP_GEN_TP_CLI_CALL_CONTENT_MEDIA_DESCRIPTION_H_INCLUDED

	G_BEGIN_DECLS	G_BEGIN_DECLS

	typedef void (tp_cli_call_content_media_description_callback_for_accept) ( TpProxy proxy,	typedef void (tp_cli_call_content_media_description_callback_for_accept) ( 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_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,

	skipping to change at line 28	skipping to change at line 31

	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);

	G_END_DECLS	G_END_DECLS


		#endif /* defined (TP_GEN_TP_CLI_CALL_CONTENT_MEDIA_DESCRIPTION_H_INCLUDED)
		*/

End of changes. 2 change blocks.
	0 lines changed or deleted	3 lines changed or added

	tp-cli-call-content.h	tp-cli-call-content.h

		#ifndef TP_GEN_TP_CLI_CALL_CONTENT_H_INCLUDED
		#define TP_GEN_TP_CLI_CALL_CONTENT_H_INCLUDED

	G_BEGIN_DECLS	G_BEGIN_DECLS

	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,

	skipping to change at line 272	skipping to change at line 275
	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);

	G_END_DECLS	G_END_DECLS


		#endif /* defined (TP_GEN_TP_CLI_CALL_CONTENT_H_INCLUDED) */

End of changes. 2 change blocks.
	0 lines changed or deleted	3 lines changed or added

	tp-cli-call-stream-endpoint.h	tp-cli-call-stream-endpoint.h

		#ifndef TP_GEN_TP_CLI_CALL_STREAM_ENDPOINT_H_INCLUDED
		#define TP_GEN_TP_CLI_CALL_STREAM_ENDPOINT_H_INCLUDED

	G_BEGIN_DECLS	G_BEGIN_DECLS

	typedef void (tp_cli_call_stream_endpoint_signal_callback_remote_credentia ls_set) (TpProxy proxy,	typedef void (tp_cli_call_stream_endpoint_signal_callback_remote_credentia ls_set) (TpProxy 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_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,

	skipping to change at line 121	skipping to change at line 124

	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);

	G_END_DECLS	G_END_DECLS


		#endif /* defined (TP_GEN_TP_CLI_CALL_STREAM_ENDPOINT_H_INCLUDED) */

End of changes. 2 change blocks.
	0 lines changed or deleted	3 lines changed or added

	tp-cli-call-stream.h	tp-cli-call-stream.h

		#ifndef TP_GEN_TP_CLI_CALL_STREAM_H_INCLUDED
		#define TP_GEN_TP_CLI_CALL_STREAM_H_INCLUDED

	G_BEGIN_DECLS	G_BEGIN_DECLS

	typedef void (tp_cli_call_stream_signal_callback_remote_members_changed) ( TpCallStream proxy,	typedef void (tp_cli_call_stream_signal_callback_remote_members_changed) ( TpCallStream proxy,
	GHashTable *arg_Updates,	GHashTable *arg_Updates,
	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_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,

	skipping to change at line 243	skipping to change at line 246

	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);

	G_END_DECLS	G_END_DECLS


		#endif /* defined (TP_GEN_TP_CLI_CALL_STREAM_H_INCLUDED) */

End of changes. 2 change blocks.
	0 lines changed or deleted	3 lines changed or added

	tp-cli-channel-dispatch-operation.h	tp-cli-channel-dispatch-operation.h

		#ifndef TP_GEN_TP_CLI_CHANNEL_DISPATCH_OPERATION_H_INCLUDED
		#define TP_GEN_TP_CLI_CHANNEL_DISPATCH_OPERATION_H_INCLUDED

	G_BEGIN_DECLS	G_BEGIN_DECLS

	typedef void (tp_cli_channel_dispatch_operation_signal_callback_channel_lo st) (TpChannelDispatchOperation proxy,	typedef void (tp_cli_channel_dispatch_operation_signal_callback_channel_lo st) (TpChannelDispatchOperation proxy,
	const gchar *arg_Channel,	const gchar *arg_Channel,
	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,

	skipping to change at line 61	skipping to change at line 64
	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);

	G_END_DECLS	G_END_DECLS


		#endif /* defined (TP_GEN_TP_CLI_CHANNEL_DISPATCH_OPERATION_H_INCLUDED) */

End of changes. 2 change blocks.
	0 lines changed or deleted	3 lines changed or added

	tp-cli-channel-dispatcher.h	tp-cli-channel-dispatcher.h

		#ifndef 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,
	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,

	skipping to change at line 120	skipping to change at line 123
	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);

	G_END_DECLS	G_END_DECLS


		#endif /* defined (TP_GEN_TP_CLI_CHANNEL_DISPATCHER_H_INCLUDED) */

End of changes. 2 change blocks.
	0 lines changed or deleted	3 lines changed or added

	tp-cli-channel-request.h	tp-cli-channel-request.h

		#ifndef TP_GEN_TP_CLI_CHANNEL_REQUEST_H_INCLUDED
		#define TP_GEN_TP_CLI_CHANNEL_REQUEST_H_INCLUDED

	G_BEGIN_DECLS	G_BEGIN_DECLS

	typedef void (tp_cli_channel_request_signal_callback_failed) (TpChannelReq uest proxy,	typedef void (tp_cli_channel_request_signal_callback_failed) (TpChannelReq uest proxy,
	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,

	skipping to change at line 59	skipping to change at line 62
	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);

	G_END_DECLS	G_END_DECLS


		#endif /* defined (TP_GEN_TP_CLI_CHANNEL_REQUEST_H_INCLUDED) */

End of changes. 2 change blocks.
	0 lines changed or deleted	3 lines changed or added

	tp-cli-channel.h	tp-cli-channel.h

		#ifndef TP_GEN_TP_CLI_CHANNEL_H_INCLUDED
		#define TP_GEN_TP_CLI_CHANNEL_H_INCLUDED

	G_BEGIN_DECLS	G_BEGIN_DECLS

	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);

	skipping to change at line 2171	skipping to change at line 2174
	gboolean tp_cli_channel_type_tubes_run_get_stream_tube_socket_address (TpCh annel *proxy,	gboolean tp_cli_channel_type_tubes_run_get_stream_tube_socket_address (TpCh annel *proxy,
	gint timeout_ms,	gint timeout_ms,
	guint in_ID,	guint in_ID,
	guint *out_Address_Type,	guint *out_Address_Type,
	GValue **out_Address,	GValue **out_Address,
	GError **error,	GError **error,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;	GMainLoop **loop) _TP_GNUC_DEPRECATED;
	#endif /* not TP_DISABLE_DEPRECATED */	#endif /* not TP_DISABLE_DEPRECATED */

	G_END_DECLS	G_END_DECLS


		#endif /* defined (TP_GEN_TP_CLI_CHANNEL_H_INCLUDED) */

End of changes. 2 change blocks.
	0 lines changed or deleted	3 lines changed or added

	tp-cli-client.h	tp-cli-client.h

		#ifndef TP_GEN_TP_CLI_CLIENT_H_INCLUDED
		#define TP_GEN_TP_CLI_CLIENT_H_INCLUDED

	G_BEGIN_DECLS	G_BEGIN_DECLS

	typedef void (tp_cli_client_approver_callback_for_add_dispatch_operation) (TpClient proxy,	typedef void (tp_cli_client_approver_callback_for_add_dispatch_operation) (TpClient proxy,
	const GError *error, gpointer user_data,	const GError *error, gpointer user_data,
	GObject *weak_object);	GObject *weak_object);

	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,

	skipping to change at line 79	skipping to change at line 82
	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);

	G_END_DECLS	G_END_DECLS


		#endif /* defined (TP_GEN_TP_CLI_CLIENT_H_INCLUDED) */

End of changes. 2 change blocks.
	0 lines changed or deleted	3 lines changed or added

	tp-cli-connection-manager.h	tp-cli-connection-manager.h

		#ifndef TP_GEN_TP_CLI_CONNECTION_MANAGER_H_INCLUDED
		#define TP_GEN_TP_CLI_CONNECTION_MANAGER_H_INCLUDED

	G_BEGIN_DECLS	G_BEGIN_DECLS

	typedef void (tp_cli_connection_manager_signal_callback_new_connection) (T pConnectionManager proxy,	typedef void (tp_cli_connection_manager_signal_callback_new_connection) (T pConnectionManager proxy,
	const gchar *arg_Bus_Name,	const gchar *arg_Bus_Name,
	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,

	skipping to change at line 84	skipping to change at line 87
	gint timeout_ms,	gint timeout_ms,
	const gchar *in_Protocol,	const gchar *in_Protocol,
	GHashTable *in_Parameters,	GHashTable *in_Parameters,
	gchar **out_Bus_Name,	gchar **out_Bus_Name,
	gchar **out_Object_Path,	gchar **out_Object_Path,
	GError **error,	GError **error,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;	GMainLoop **loop) _TP_GNUC_DEPRECATED;
	#endif /* not TP_DISABLE_DEPRECATED */	#endif /* not TP_DISABLE_DEPRECATED */

	G_END_DECLS	G_END_DECLS


		#endif /* defined (TP_GEN_TP_CLI_CONNECTION_MANAGER_H_INCLUDED) */

End of changes. 2 change blocks.
	0 lines changed or deleted	3 lines changed or added

	tp-cli-connection.h	tp-cli-connection.h

		#ifndef 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,	typedef void (tp_cli_connection_signal_callback_self_handle_changed) (TpCo nnection proxy,
	guint arg_Self_Handle,	guint arg_Self_Handle,
	gpointer user_data, GObject *weak_object);	gpointer user_data, GObject *weak_object);
	TpProxySignalConnection tp_cli_connection_connect_to_self_handle_changed ( TpConnection proxy,	TpProxySignalConnection tp_cli_connection_connect_to_self_handle_changed ( TpConnection proxy,
	tp_cli_connection_signal_callback_self_handle_changed callback,	tp_cli_connection_signal_callback_self_handle_changed callback,
	gpointer user_data,	gpointer user_data,
	GDestroyNotify destroy,	GDestroyNotify destroy,
	GObject *weak_object,	GObject *weak_object,

	skipping to change at line 1384	skipping to change at line 1387
	gboolean tp_cli_connection_interface_contacts_run_get_contact_attributes (T pConnection *proxy,	gboolean tp_cli_connection_interface_contacts_run_get_contact_attributes (T pConnection *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,	gboolean in_Hold,
	GHashTable **out_Attributes,	GHashTable **out_Attributes,
	GError **error,	GError **error,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;	GMainLoop **loop) _TP_GNUC_DEPRECATED;
	#endif /* not TP_DISABLE_DEPRECATED */	#endif /* not TP_DISABLE_DEPRECATED */


		typedef void (*tp_cli_connection_interface_contacts_callback_for_get_contac
		t_by_id) (TpConnection *proxy,
		guint out_Handle,
		GHashTable *out_Attributes,
		const GError *error, gpointer user_data,
		GObject *weak_object);

		TpProxyPendingCall *tp_cli_connection_interface_contacts_call_get_contact_b
		y_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);

	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);

	skipping to change at line 1862	skipping to change at line 1880
	#ifndef TP_DISABLE_DEPRECATED	#ifndef TP_DISABLE_DEPRECATED
	gboolean tp_cli_connection_interface_simple_presence_run_get_presences (TpC onnection *proxy,	gboolean tp_cli_connection_interface_simple_presence_run_get_presences (TpC onnection *proxy,
	gint timeout_ms,	gint timeout_ms,
	const GArray *in_Contacts,	const GArray *in_Contacts,
	GHashTable **out_Presence,	GHashTable **out_Presence,
	GError **error,	GError **error,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;	GMainLoop **loop) _TP_GNUC_DEPRECATED;
	#endif /* not TP_DISABLE_DEPRECATED */	#endif /* not TP_DISABLE_DEPRECATED */

	G_END_DECLS	G_END_DECLS


		#endif /* defined (TP_GEN_TP_CLI_CONNECTION_H_INCLUDED) */

End of changes. 3 change blocks.
	0 lines changed or deleted	21 lines changed or added

	tp-cli-dbus-daemon.h	tp-cli-dbus-daemon.h

		#ifndef TP_GEN_TP_CLI_DBUS_DAEMON_H_INCLUDED
		#define TP_GEN_TP_CLI_DBUS_DAEMON_H_INCLUDED

	G_BEGIN_DECLS	G_BEGIN_DECLS

	typedef void (tp_cli_dbus_daemon_signal_callback_name_owner_changed) (TpDB usDaemon proxy,	typedef void (tp_cli_dbus_daemon_signal_callback_name_owner_changed) (TpDB usDaemon proxy,
	const gchar *arg0,	const gchar *arg0,
	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,

	skipping to change at line 376	skipping to change at line 379

	#ifndef TP_DISABLE_DEPRECATED	#ifndef TP_DISABLE_DEPRECATED
	gboolean tp_cli_dbus_daemon_run_get_id (TpDBusDaemon *proxy,	gboolean tp_cli_dbus_daemon_run_get_id (TpDBusDaemon *proxy,
	gint timeout_ms,	gint timeout_ms,
	gchar **out0,	gchar **out0,
	GError **error,	GError **error,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;	GMainLoop **loop) _TP_GNUC_DEPRECATED;
	#endif /* not TP_DISABLE_DEPRECATED */	#endif /* not TP_DISABLE_DEPRECATED */

	G_END_DECLS	G_END_DECLS


		#endif /* defined (TP_GEN_TP_CLI_DBUS_DAEMON_H_INCLUDED) */

End of changes. 2 change blocks.
	0 lines changed or deleted	3 lines changed or added

	tp-cli-generic.h	tp-cli-generic.h

		#ifndef TP_GEN_TP_CLI_GENERIC_H_INCLUDED
		#define TP_GEN_TP_CLI_GENERIC_H_INCLUDED

	G_BEGIN_DECLS	G_BEGIN_DECLS

	typedef void (tp_cli_dbus_introspectable_callback_for_introspect) (TpProxy proxy,	typedef void (tp_cli_dbus_introspectable_callback_for_introspect) (TpProxy proxy,
	const gchar *out_XML_Data,	const gchar *out_XML_Data,
	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,

	skipping to change at line 226	skipping to change at line 229

	#ifndef TP_DISABLE_DEPRECATED	#ifndef TP_DISABLE_DEPRECATED
	gboolean tp_cli_properties_interface_run_set_properties (gpointer proxy,	gboolean tp_cli_properties_interface_run_set_properties (gpointer proxy,
	gint timeout_ms,	gint timeout_ms,
	const GPtrArray *in_Properties,	const GPtrArray *in_Properties,
	GError **error,	GError **error,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;	GMainLoop **loop) _TP_GNUC_DEPRECATED;
	#endif /* not TP_DISABLE_DEPRECATED */	#endif /* not TP_DISABLE_DEPRECATED */

	G_END_DECLS	G_END_DECLS


		#endif /* defined (TP_GEN_TP_CLI_GENERIC_H_INCLUDED) */

End of changes. 2 change blocks.
	0 lines changed or deleted	3 lines changed or added

	tp-cli-media-session-handler.h	tp-cli-media-session-handler.h

		#ifndef TP_GEN_TP_CLI_MEDIA_SESSION_HANDLER_H_INCLUDED
		#define TP_GEN_TP_CLI_MEDIA_SESSION_HANDLER_H_INCLUDED

	G_BEGIN_DECLS	G_BEGIN_DECLS

	typedef void (tp_cli_media_session_handler_signal_callback_new_stream_hand ler) (TpMediaSessionHandler proxy,	typedef void (tp_cli_media_session_handler_signal_callback_new_stream_hand ler) (TpMediaSessionHandler proxy,
	const gchar *arg_Stream_Handler,	const gchar *arg_Stream_Handler,
	guint arg_ID,	guint arg_ID,
	guint arg_Media_Type,	guint arg_Media_Type,
	guint arg_Direction,	guint arg_Direction,
	gpointer user_data, GObject *weak_object);	gpointer user_data, GObject *weak_object);
	TpProxySignalConnection tp_cli_media_session_handler_connect_to_new_stream _handler (TpMediaSessionHandler proxy,	TpProxySignalConnection tp_cli_media_session_handler_connect_to_new_stream _handler (TpMediaSessionHandler proxy,
	tp_cli_media_session_handler_signal_callback_new_stream_handler callbac k,	tp_cli_media_session_handler_signal_callback_new_stream_handler callbac k,

	skipping to change at line 57	skipping to change at line 60
	GObject *weak_object);	GObject *weak_object);

	#ifndef TP_DISABLE_DEPRECATED	#ifndef TP_DISABLE_DEPRECATED
	gboolean tp_cli_media_session_handler_run_ready (TpMediaSessionHandler *pro xy,	gboolean tp_cli_media_session_handler_run_ready (TpMediaSessionHandler *pro xy,
	gint timeout_ms,	gint timeout_ms,
	GError **error,	GError **error,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;	GMainLoop **loop) _TP_GNUC_DEPRECATED;
	#endif /* not TP_DISABLE_DEPRECATED */	#endif /* not TP_DISABLE_DEPRECATED */

	G_END_DECLS	G_END_DECLS


		#endif /* defined (TP_GEN_TP_CLI_MEDIA_SESSION_HANDLER_H_INCLUDED) */

End of changes. 2 change blocks.
	0 lines changed or deleted	3 lines changed or added

	tp-cli-media-stream-handler.h	tp-cli-media-stream-handler.h

		#ifndef TP_GEN_TP_CLI_MEDIA_STREAM_HANDLER_H_INCLUDED
		#define TP_GEN_TP_CLI_MEDIA_STREAM_HANDLER_H_INCLUDED

	G_BEGIN_DECLS	G_BEGIN_DECLS

	typedef void (tp_cli_media_stream_handler_signal_callback_add_remote_candi date) (TpMediaStreamHandler proxy,	typedef void (tp_cli_media_stream_handler_signal_callback_add_remote_candi date) (TpMediaStreamHandler proxy,
	const gchar *arg_Candidate_ID,	const gchar *arg_Candidate_ID,
	const GPtrArray *arg_Transports,	const GPtrArray *arg_Transports,
	gpointer user_data, GObject *weak_object);	gpointer user_data, GObject *weak_object);
	TpProxySignalConnection tp_cli_media_stream_handler_connect_to_add_remote_ candidate (TpMediaStreamHandler proxy,	TpProxySignalConnection tp_cli_media_stream_handler_connect_to_add_remote_ candidate (TpMediaStreamHandler proxy,
	tp_cli_media_stream_handler_signal_callback_add_remote_candidate callba ck,	tp_cli_media_stream_handler_signal_callback_add_remote_candidate callba ck,
	gpointer user_data,	gpointer user_data,
	GDestroyNotify destroy,	GDestroyNotify destroy,

	skipping to change at line 463	skipping to change at line 466

	#ifndef TP_DISABLE_DEPRECATED	#ifndef TP_DISABLE_DEPRECATED
	gboolean tp_cli_media_stream_handler_run_supported_header_extensions (TpMed iaStreamHandler *proxy,	gboolean tp_cli_media_stream_handler_run_supported_header_extensions (TpMed iaStreamHandler *proxy,
	gint timeout_ms,	gint timeout_ms,
	const GPtrArray *in_Header_Extensions,	const GPtrArray *in_Header_Extensions,
	GError **error,	GError **error,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;	GMainLoop **loop) _TP_GNUC_DEPRECATED;
	#endif /* not TP_DISABLE_DEPRECATED */	#endif /* not TP_DISABLE_DEPRECATED */

	G_END_DECLS	G_END_DECLS


		#endif /* defined (TP_GEN_TP_CLI_MEDIA_STREAM_HANDLER_H_INCLUDED) */

End of changes. 2 change blocks.
	0 lines changed or deleted	3 lines changed or added

	tp-cli-protocol.h	tp-cli-protocol.h

		#ifndef TP_GEN_TP_CLI_PROTOCOL_H_INCLUDED
		#define TP_GEN_TP_CLI_PROTOCOL_H_INCLUDED

	G_BEGIN_DECLS	G_BEGIN_DECLS

	typedef void (tp_cli_protocol_callback_for_identify_account) (TpProxy pro xy,	typedef void (tp_cli_protocol_callback_for_identify_account) (TpProxy pro xy,
	const gchar *out_Account_ID,	const gchar *out_Account_ID,
	const GError *error, gpointer user_data,	const GError *error, gpointer user_data,
	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,

	skipping to change at line 57	skipping to change at line 60

	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);

	G_END_DECLS	G_END_DECLS


		#endif /* defined (TP_GEN_TP_CLI_PROTOCOL_H_INCLUDED) */

End of changes. 2 change blocks.
	0 lines changed or deleted	3 lines changed or added

	tp-svc-connection.h	tp-svc-connection.h

	skipping to change at line 1113	skipping to change at line 1113
	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)
	{	{
	dbus_g_method_return (context,	dbus_g_method_return (context,
	out_Attributes);	out_Attributes);
	}	}


		typedef void (*tp_svc_connection_interface_contacts_get_contact_by_id_impl)
		(TpSvcConnectionInterfaceContacts *self,
		const gchar *in_Identifier,
		const gchar **in_Interfaces,
		DBusGMethodInvocation *context);
		void tp_svc_connection_interface_contacts_implement_get_contact_by_id (TpSv
		cConnectionInterfaceContactsClass *klass, tp_svc_connection_interface_conta
		cts_get_contact_by_id_impl impl);
		static inline
		/* this comment is to stop gtkdoc realising this is static */
		void tp_svc_connection_interface_contacts_return_from_get_contact_by_id (DB
		usGMethodInvocation *context,
		guint out_Handle,
		GHashTable *out_Attributes);
		static inline void
		tp_svc_connection_interface_contacts_return_from_get_contact_by_id (DBusGMe
		thodInvocation *context,
		guint out_Handle,
		GHashTable *out_Attributes)
		{
		dbus_g_method_return (context,
		out_Handle,
		out_Attributes);
		}

	typedef struct _TpSvcConnectionInterfaceLocation TpSvcConnectionInterfaceLo cation;	typedef struct _TpSvcConnectionInterfaceLocation TpSvcConnectionInterfaceLo cation;

	typedef struct _TpSvcConnectionInterfaceLocationClass TpSvcConnectionInterf aceLocationClass;	typedef struct _TpSvcConnectionInterfaceLocationClass TpSvcConnectionInterf aceLocationClass;

	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) \

End of changes. 1 change blocks.
	0 lines changed or deleted	25 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/

	account.h	account.h

	skipping to change at line 80	skipping to change at line 80
	#define TP_ACCOUNT_FEATURE_CORE \	#define TP_ACCOUNT_FEATURE_CORE \
	tp_account_get_feature_quark_core ()	tp_account_get_feature_quark_core ()
	#define TP_ACCOUNT_FEATURE_CONNECTION \	#define TP_ACCOUNT_FEATURE_CONNECTION \
	tp_account_get_feature_quark_connection ()	tp_account_get_feature_quark_connection ()
	#define TP_ACCOUNT_FEATURE_STORAGE \	#define TP_ACCOUNT_FEATURE_STORAGE \
	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
	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;

	TpAccount tp_account_new (TpDBusDaemon bus_daemon, const gchar *object_pa th,	TpAccount tp_account_new (TpDBusDaemon bus_daemon, const gchar *object_pa th,
	GError **error) G_GNUC_WARN_UNUSED_RESULT;	GError **error) G_GNUC_WARN_UNUSED_RESULT;

	gboolean tp_account_parse_object_path (const gchar *object_path,	gboolean tp_account_parse_object_path (const gchar *object_path,
	gchar cm, gchar protocol, gchar account_id, GError error);	gchar cm, gchar protocol, gchar account_id, GError error);
	const gchar tp_account_get_path_suffix (TpAccount account);	const gchar tp_account_get_path_suffix (TpAccount account);

	skipping to change at line 130	skipping to change at line 131

	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_valid (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
	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);

		_TP_AVAILABLE_IN_0_18
	gboolean tp_account_update_parameters_vardict_finish (TpAccount *account,	gboolean tp_account_update_parameters_vardict_finish (TpAccount *account,
	GAsyncResult result, gchar reconnect_required, GError error);	GAsyncResult result, gchar reconnect_required, GError error);

	void tp_account_remove_async (TpAccount *account,	void tp_account_remove_async (TpAccount *account,
	GAsyncReadyCallback callback, gpointer user_data);	GAsyncReadyCallback callback, gpointer user_data);

	gboolean tp_account_remove_finish (TpAccount *account,	gboolean tp_account_remove_finish (TpAccount *account,
	GAsyncResult result, GError *error);	GAsyncResult result, GError *error);

	void tp_account_set_display_name_async (TpAccount *account,	void tp_account_set_display_name_async (TpAccount *account,

	skipping to change at line 193	skipping to change at line 196
	gboolean tp_account_set_connect_automatically_finish (TpAccount *account,	gboolean tp_account_set_connect_automatically_finish (TpAccount *account,
	GAsyncResult result, GError *error);	GAsyncResult result, GError *error);

	gboolean tp_account_get_has_been_online (TpAccount *account);	gboolean tp_account_get_has_been_online (TpAccount *account);

	TpConnectionStatus tp_account_get_connection_status (TpAccount *account,	TpConnectionStatus tp_account_get_connection_status (TpAccount *account,
	TpConnectionStatusReason *reason);	TpConnectionStatusReason *reason);

	const gchar tp_account_get_detailed_error (TpAccount self,	const gchar tp_account_get_detailed_error (TpAccount self,
	const GHashTable **details);	const GHashTable **details);

		_TP_AVAILABLE_IN_0_18
	gchar tp_account_dup_detailed_error_vardict (TpAccount self,	gchar tp_account_dup_detailed_error_vardict (TpAccount self,
	GVariant **details);	GVariant **details);

	TpConnectionPresenceType tp_account_get_current_presence (TpAccount *accoun t,	TpConnectionPresenceType tp_account_get_current_presence (TpAccount *accoun t,
	gchar status, gchar status_message);	gchar status, gchar status_message);

	TpConnectionPresenceType tp_account_get_requested_presence (	TpConnectionPresenceType tp_account_get_requested_presence (
	TpAccount account, gchar status, gchar *status_message);	TpAccount account, gchar status, gchar *status_message);

	TpConnectionPresenceType tp_account_get_automatic_presence (	TpConnectionPresenceType tp_account_get_automatic_presence (
	TpAccount self, gchar status, gchar *status_message);	TpAccount self, gchar status, gchar *status_message);

	const GHashTable tp_account_get_parameters (TpAccount account);	const GHashTable tp_account_get_parameters (TpAccount account);

		_TP_AVAILABLE_IN_0_18
	GVariant tp_account_dup_parameters_vardict (TpAccount account);	GVariant tp_account_dup_parameters_vardict (TpAccount account);

	const gchar tp_account_get_nickname (TpAccount account);	const gchar tp_account_get_nickname (TpAccount account);

	void tp_account_set_nickname_async (TpAccount *account,	void tp_account_set_nickname_async (TpAccount *account,
	const gchar *nickname, GAsyncReadyCallback callback, gpointer user_data );	const gchar *nickname, GAsyncReadyCallback callback, gpointer user_data );

	gboolean tp_account_set_nickname_finish (TpAccount *account,	gboolean tp_account_set_nickname_finish (TpAccount *account,
	GAsyncResult result, GError *error);	GAsyncResult result, GError *error);


		_TP_AVAILABLE_IN_0_18
	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);

	gboolean tp_account_is_prepared (TpAccount *account, GQuark feature);	gboolean tp_account_is_prepared (TpAccount *account, GQuark feature);


		#ifndef TP_DISABLE_DEPRECATED
		_TP_DEPRECATED_IN_0_16_FOR (tp_proxy_prepare_async)
	void tp_account_prepare_async (TpAccount *account,	void tp_account_prepare_async (TpAccount *account,
	const GQuark *features,	const GQuark *features,
	GAsyncReadyCallback callback,	GAsyncReadyCallback callback,

	gpointer user_data) _TP_GNUC_DEPRECATED_FOR (tp_proxy_prepare_async);	gpointer user_data);


		_TP_DEPRECATED_IN_0_16_FOR (tp_proxy_prepare_finish)
	gboolean tp_account_prepare_finish (TpAccount *account,	gboolean tp_account_prepare_finish (TpAccount *account,
	GAsyncResult *result,	GAsyncResult *result,

	GError **error) _TP_GNUC_DEPRECATED_FOR (tp_proxy_prepare_finish);	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,

	skipping to change at line 258	skipping to change at line 268
	gboolean tp_account_get_changing_presence (TpAccount *self);	gboolean tp_account_get_changing_presence (TpAccount *self);

	const gchar tp_account_get_storage_provider (TpAccount self);	const gchar tp_account_get_storage_provider (TpAccount self);
	const GValue tp_account_get_storage_identifier (TpAccount self);	const GValue tp_account_get_storage_identifier (TpAccount self);
	GVariant tp_account_dup_storage_identifier_variant (TpAccount self);	GVariant tp_account_dup_storage_identifier_variant (TpAccount self);
	TpStorageRestrictionFlags tp_account_get_storage_restrictions (TpAccount *s elf);	TpStorageRestrictionFlags tp_account_get_storage_restrictions (TpAccount *s elf);
	void tp_account_get_storage_specific_information_async (TpAccount *self,	void tp_account_get_storage_specific_information_async (TpAccount *self,
	GAsyncReadyCallback callback, gpointer user_data);	GAsyncReadyCallback callback, gpointer user_data);
	GHashTable tp_account_get_storage_specific_information_finish (TpAccount self,	GHashTable tp_account_get_storage_specific_information_finish (TpAccount self,
	GAsyncResult result, GError *error);	GAsyncResult result, GError *error);

		_TP_AVAILABLE_IN_0_18
	void tp_account_dup_storage_specific_information_vardict_async (	void tp_account_dup_storage_specific_information_vardict_async (
	TpAccount *self,	TpAccount *self,
	GAsyncReadyCallback callback,	GAsyncReadyCallback callback,
	gpointer user_data);	gpointer user_data);

		_TP_AVAILABLE_IN_0_18
	GVariant *tp_account_dup_storage_specific_information_vardict_finish (	GVariant *tp_account_dup_storage_specific_information_vardict_finish (
	TpAccount *self,	TpAccount *self,
	GAsyncResult *result,	GAsyncResult *result,
	GError **error);	GError **error);

	const gchar * const *	const gchar * const *
	/* ugh, gtk-doc */	/* ugh, gtk-doc */
	tp_account_get_uri_schemes (TpAccount *self);	tp_account_get_uri_schemes (TpAccount *self);
	gboolean tp_account_associated_with_uri_scheme (TpAccount *self,	gboolean tp_account_associated_with_uri_scheme (TpAccount *self,
	const gchar *scheme);	const gchar *scheme);

End of changes. 12 change blocks.
	2 lines changed or deleted	14 lines changed or added

	connection-manager.h	connection-manager.h

	skipping to change at line 120	skipping to change at line 120

	typedef void (TpConnectionManagerListCb) (TpConnectionManager const *cms ,	typedef void (TpConnectionManagerListCb) (TpConnectionManager const *cms ,
	gsize n_cms, const GError *error, gpointer user_data,	gsize n_cms, const GError *error, gpointer user_data,
	GObject *weak_object);	GObject *weak_object);

	void tp_list_connection_managers (TpDBusDaemon *bus_daemon,	void tp_list_connection_managers (TpDBusDaemon *bus_daemon,
	TpConnectionManagerListCb callback,	TpConnectionManagerListCb callback,
	gpointer user_data, GDestroyNotify destroy,	gpointer user_data, GDestroyNotify destroy,
	GObject *weak_object);	GObject *weak_object);


		_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
	GList tp_list_connection_managers_finish (GAsyncResult result,	GList tp_list_connection_managers_finish (GAsyncResult result,
	GError **error);	GError **error);

	#ifndef TP_DISABLE_DEPRECATED	#ifndef TP_DISABLE_DEPRECATED
	typedef void (TpConnectionManagerWhenReadyCb) (TpConnectionManager cm,	typedef void (TpConnectionManagerWhenReadyCb) (TpConnectionManager cm,
	const GError error, gpointer user_data, GObject weak_object);	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,	void tp_connection_manager_call_when_ready (TpConnectionManager *self,
	TpConnectionManagerWhenReadyCb callback,	TpConnectionManagerWhenReadyCb callback,

	gpointer user_data, GDestroyNotify destroy, GObject *weak_object)	gpointer user_data, GDestroyNotify destroy, GObject *weak_object);
	_TP_GNUC_DEPRECATED_FOR (tp_proxy_prepare_async);


	gboolean tp_connection_manager_is_ready (TpConnectionManager *self)	_TP_DEPRECATED_IN_0_18_FOR (tp_proxy_is_prepared)
	_TP_GNUC_DEPRECATED_FOR (tp_proxy_is_prepared);	gboolean tp_connection_manager_is_ready (TpConnectionManager *self);
	#endif	#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);


	skipping to change at line 158	skipping to change at line 160
	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);
	const TpConnectionManagerProtocol *tp_connection_manager_get_protocol (	const TpConnectionManagerProtocol *tp_connection_manager_get_protocol (
	TpConnectionManager self, const gchar protocol);	TpConnectionManager self, const gchar protocol);
	TpProtocol *tp_connection_manager_get_protocol_object (	TpProtocol *tp_connection_manager_get_protocol_object (
	TpConnectionManager self, const gchar protocol);	TpConnectionManager self, const gchar protocol);

		_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;

	gchar **tp_connection_manager_protocol_dup_param_names (	gchar **tp_connection_manager_protocol_dup_param_names (
	const TpConnectionManagerProtocol *protocol)	const TpConnectionManagerProtocol *protocol)
	G_GNUC_WARN_UNUSED_RESULT;	G_GNUC_WARN_UNUSED_RESULT;
	gboolean tp_connection_manager_protocol_has_param (	gboolean tp_connection_manager_protocol_has_param (
	const TpConnectionManagerProtocol *protocol,	const TpConnectionManagerProtocol *protocol,
	const gchar *param);	const gchar *param);
	const TpConnectionManagerParam *tp_connection_manager_protocol_get_param (	const TpConnectionManagerParam *tp_connection_manager_protocol_get_param (

	skipping to change at line 186	skipping to change at line 189
	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
		GVariant *tp_connection_manager_param_dup_default_variant (
		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);

End of changes. 7 change blocks.
	4 lines changed or deleted	10 lines changed or added