libtelepathy-glib: headers diff between 0.99.6 and 0.99.7 versions

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

	skipping to change at line 36	skipping to change at line 36
	#define __TP_ACCOUNT_CHANNEL_REQUEST_H__	#define __TP_ACCOUNT_CHANNEL_REQUEST_H__

	#include <gio/gio.h>	#include <gio/gio.h>
	#include <glib-object.h>	#include <glib-object.h>
	#include <glib.h>	#include <glib.h>

	#include <telepathy-glib/account.h>	#include <telepathy-glib/account.h>
	#include <telepathy-glib/channel.h>	#include <telepathy-glib/channel.h>
	#include <telepathy-glib/channel-request.h>	#include <telepathy-glib/channel-request.h>
	#include <telepathy-glib/defs.h>	#include <telepathy-glib/defs.h>

	#include <telepathy-glib/handle-channels-context.h>	#include <telepathy-glib/handle-channel-context.h>

	G_BEGIN_DECLS	G_BEGIN_DECLS

	typedef struct _TpAccountChannelRequest TpAccountChannelRequest;	typedef struct _TpAccountChannelRequest TpAccountChannelRequest;
	typedef struct _TpAccountChannelRequestClass \	typedef struct _TpAccountChannelRequestClass \
	TpAccountChannelRequestClass;	TpAccountChannelRequestClass;
	typedef struct _TpAccountChannelRequestPrivate \	typedef struct _TpAccountChannelRequestPrivate \
	TpAccountChannelRequestPrivate;	TpAccountChannelRequestPrivate;

	GType tp_account_channel_request_get_type (void);	GType tp_account_channel_request_get_type (void);

	skipping to change at line 177	skipping to change at line 177

	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,
	GAsyncResult *result,	GAsyncResult *result,

	TpHandleChannelsContext **context,	TpHandleChannelContext **context,
	GError **error) G_GNUC_WARN_UNUSED_RESULT;	GError **error) G_GNUC_WARN_UNUSED_RESULT;

	void tp_account_channel_request_ensure_and_handle_channel_async (	void tp_account_channel_request_ensure_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_ensure_and_handle_channel_finish (	TpChannel * tp_account_channel_request_ensure_and_handle_channel_finish (
	TpAccountChannelRequest *self,	TpAccountChannelRequest *self,
	GAsyncResult *result,	GAsyncResult *result,

	TpHandleChannelsContext **context,	TpHandleChannelContext **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	_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,

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

	base-client.h	base-client.h

	skipping to change at line 34	skipping to change at line 34

	#ifndef __TP_BASE_CLIENT_H__	#ifndef __TP_BASE_CLIENT_H__
	#define __TP_BASE_CLIENT_H__	#define __TP_BASE_CLIENT_H__

	#include <dbus/dbus-glib.h>	#include <dbus/dbus-glib.h>
	#include <glib-object.h>	#include <glib-object.h>

	#include <telepathy-glib/account.h>	#include <telepathy-glib/account.h>
	#include <telepathy-glib/add-dispatch-operation-context.h>	#include <telepathy-glib/add-dispatch-operation-context.h>
	#include <telepathy-glib/channel.h>	#include <telepathy-glib/channel.h>

	#include <telepathy-glib/handle-channels-context.h>	#include <telepathy-glib/handle-channel-context.h>
	#include <telepathy-glib/observe-channels-context.h>	#include <telepathy-glib/observe-channel-context.h>
	#include <telepathy-glib/connection.h>	#include <telepathy-glib/connection.h>
	#include <telepathy-glib/dbus.h>	#include <telepathy-glib/dbus.h>
	#include <telepathy-glib/defs.h>	#include <telepathy-glib/defs.h>
	#include <telepathy-glib/dbus-properties-mixin.h>	#include <telepathy-glib/dbus-properties-mixin.h>

	G_BEGIN_DECLS	G_BEGIN_DECLS

	/* forward declaration, see channel-dispatch-operation.h for the rest */	/* forward declaration, see channel-dispatch-operation.h for the rest */
	typedef struct _TpChannelDispatchOperation	typedef struct _TpChannelDispatchOperation
	TpChannelDispatchOperation;	TpChannelDispatchOperation;

	typedef struct _TpBaseClient TpBaseClient;	typedef struct _TpBaseClient TpBaseClient;
	typedef struct _TpBaseClientClass TpBaseClientClass;	typedef struct _TpBaseClientClass TpBaseClientClass;
	typedef struct _TpBaseClientPrivate TpBaseClientPrivate;	typedef struct _TpBaseClientPrivate TpBaseClientPrivate;
	typedef struct _TpBaseClientClassPrivate TpBaseClientClassPrivate;	typedef struct _TpBaseClientClassPrivate TpBaseClientClassPrivate;


	typedef void (*TpBaseClientClassObserveChannelsImpl) (	typedef void (*TpBaseClientClassObserveChannelImpl) (
	TpBaseClient *client,	TpBaseClient *client,
	TpAccount *account,	TpAccount *account,
	TpConnection *connection,	TpConnection *connection,

	GList *channels,	TpChannel *channel,
	TpChannelDispatchOperation *dispatch_operation,	TpChannelDispatchOperation *dispatch_operation,
	GList *requests,	GList *requests,

	TpObserveChannelsContext *context);	TpObserveChannelContext *context);

	typedef void (*TpBaseClientClassAddDispatchOperationImpl) (	typedef void (*TpBaseClientClassAddDispatchOperationImpl) (
	TpBaseClient *client,	TpBaseClient *client,
	TpAccount *account,	TpAccount *account,
	TpConnection *connection,	TpConnection *connection,

	GList *channels,	TpChannel *channel,
	TpChannelDispatchOperation *dispatch_operation,	TpChannelDispatchOperation *dispatch_operation,
	TpAddDispatchOperationContext *context);	TpAddDispatchOperationContext *context);


	typedef void (*TpBaseClientClassHandleChannelsImpl) (	typedef void (*TpBaseClientClassHandleChannelImpl) (
	TpBaseClient *client,	TpBaseClient *client,
	TpAccount *account,	TpAccount *account,
	TpConnection *connection,	TpConnection *connection,

	GList *channels,	TpChannel *channel,
	GList *requests_satisfied,	GList *requests_satisfied,
	gint64 user_action_time,	gint64 user_action_time,

	TpHandleChannelsContext *context);	TpHandleChannelContext *context);

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

	TpBaseClientClassObserveChannelsImpl observe_channels;	TpBaseClientClassObserveChannelImpl observe_channel;
	TpBaseClientClassAddDispatchOperationImpl add_dispatch_operation;	TpBaseClientClassAddDispatchOperationImpl add_dispatch_operation;

	TpBaseClientClassHandleChannelsImpl handle_channels;	TpBaseClientClassHandleChannelImpl handle_channel;
	/<private>/	/<private>/
	GCallback _padding[4];	GCallback _padding[4];
	TpDBusPropertiesMixinClass dbus_properties_class;	TpDBusPropertiesMixinClass dbus_properties_class;
	TpBaseClientClassPrivate *priv;	TpBaseClientClassPrivate *priv;
	};	};

	struct _TpBaseClient {	struct _TpBaseClient {
	/<private>/	/<private>/
	GObject parent;	GObject parent;
	TpBaseClientPrivate *priv;	TpBaseClientPrivate *priv;
	};	};

	GType tp_base_client_get_type (void);	GType tp_base_client_get_type (void);

	/* Protected methods; should be called only by subclasses */	/* Protected methods; should be called only by subclasses */


	void tp_base_client_implement_observe_channels (TpBaseClientClass *klass,	void tp_base_client_implement_observe_channel (TpBaseClientClass *klass,
	TpBaseClientClassObserveChannelsImpl impl);	TpBaseClientClassObserveChannelImpl impl);

	void tp_base_client_implement_add_dispatch_operation (TpBaseClientClass *kl ass,	void tp_base_client_implement_add_dispatch_operation (TpBaseClientClass *kl ass,
	TpBaseClientClassAddDispatchOperationImpl impl);	TpBaseClientClassAddDispatchOperationImpl impl);


	void tp_base_client_implement_handle_channels (TpBaseClientClass *klass,	void tp_base_client_implement_handle_channel (TpBaseClientClass *klass,
	TpBaseClientClassHandleChannelsImpl impl);	TpBaseClientClassHandleChannelImpl impl);

	/* setup functions which can only be called before register() */	/* setup functions which can only be called before register() */

	void tp_base_client_add_observer_filter (TpBaseClient *self,	void tp_base_client_add_observer_filter (TpBaseClient *self,
	GHashTable *filter);	GHashTable *filter);
	_TP_AVAILABLE_IN_0_20	_TP_AVAILABLE_IN_0_20
	void tp_base_client_add_observer_filter_vardict (TpBaseClient *self,	void tp_base_client_add_observer_filter_vardict (TpBaseClient *self,
	GVariant *filter);	GVariant *filter);
	void tp_base_client_take_observer_filter (TpBaseClient *self,	void tp_base_client_take_observer_filter (TpBaseClient *self,
	GHashTable *filter);	GHashTable *filter);

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

	channel-dispatch-operation.h	channel-dispatch-operation.h
	/*	/*

	* channel-dispatch-operation.h - proxy for channels awaiting approval	* channel-dispatch-operation.h - proxy for channel awaiting approval
	*	*
	* Copyright (C) 2009 Collabora Ltd. <http://www.collabora.co.uk/>	* Copyright (C) 2009 Collabora Ltd. <http://www.collabora.co.uk/>
	* Copyright (C) 2009 Nokia Corporation	* Copyright (C) 2009 Nokia Corporation
	*	*
	* This library is free software; you can redistribute it and/or	* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU Lesser General Public	* modify it under the terms of the GNU Lesser General Public
	* License as published by the Free Software Foundation; either	* License as published by the Free Software Foundation; either
	* version 2.1 of the License, or (at your option) any later version.	* version 2.1 of the License, or (at your option) any later version.
	*	*
	* This library is distributed in the hope that it will be useful,	* This library is distributed in the hope that it will be useful,

	skipping to change at line 92	skipping to change at line 92
	GQuark tp_channel_dispatch_operation_get_feature_quark_core (void) G_GNUC_C ONST;	GQuark tp_channel_dispatch_operation_get_feature_quark_core (void) G_GNUC_C ONST;

	_TP_AVAILABLE_IN_0_20	_TP_AVAILABLE_IN_0_20
	TpConnection * tp_channel_dispatch_operation_get_connection (	TpConnection * tp_channel_dispatch_operation_get_connection (
	TpChannelDispatchOperation *self);	TpChannelDispatchOperation *self);

	_TP_AVAILABLE_IN_0_20	_TP_AVAILABLE_IN_0_20
	TpAccount * tp_channel_dispatch_operation_get_account (	TpAccount * tp_channel_dispatch_operation_get_account (
	TpChannelDispatchOperation *self);	TpChannelDispatchOperation *self);


	_TP_AVAILABLE_IN_0_20	TpChannel * tp_channel_dispatch_operation_get_channel (
	GPtrArray * tp_channel_dispatch_operation_get_channels (
	TpChannelDispatchOperation *self);	TpChannelDispatchOperation *self);

	_TP_AVAILABLE_IN_0_20	_TP_AVAILABLE_IN_0_20
	GStrv tp_channel_dispatch_operation_get_possible_handlers (	GStrv tp_channel_dispatch_operation_get_possible_handlers (
	TpChannelDispatchOperation *self);	TpChannelDispatchOperation *self);

	void tp_channel_dispatch_operation_handle_with_async (	void tp_channel_dispatch_operation_handle_with_async (
	TpChannelDispatchOperation *self,	TpChannelDispatchOperation *self,
	const gchar *handler,	const gchar *handler,

	GAsyncReadyCallback callback,
	gpointer user_data);

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

	void tp_channel_dispatch_operation_handle_with_time_async (
	TpChannelDispatchOperation *self,
	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_finish (
	TpChannelDispatchOperation *self,	TpChannelDispatchOperation *self,
	GAsyncResult *result,	GAsyncResult *result,
	GError **error);	GError **error);

	_TP_AVAILABLE_IN_0_16	_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	_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_channel_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_channel_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_channel_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_channel_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_channel_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_channel_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

	#endif	#endif

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

	channel-manager.h	channel-manager.h

	skipping to change at line 34	skipping to change at line 34
	#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."	#error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
	#endif	#endif

	#ifndef TP_CHANNEL_MANAGER_H	#ifndef TP_CHANNEL_MANAGER_H
	#define TP_CHANNEL_MANAGER_H	#define TP_CHANNEL_MANAGER_H

	#include <glib-object.h>	#include <glib-object.h>

	#include <telepathy-glib/defs.h>	#include <telepathy-glib/defs.h>
	#include <telepathy-glib/exportable-channel.h>	#include <telepathy-glib/exportable-channel.h>

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

	G_BEGIN_DECLS	G_BEGIN_DECLS

	#define TP_TYPE_CHANNEL_MANAGER (tp_channel_manager_get_type ())	#define TP_TYPE_CHANNEL_MANAGER (tp_channel_manager_get_type ())

	#define TP_CHANNEL_MANAGER(obj) \	#define TP_CHANNEL_MANAGER(obj) \
	(G_TYPE_CHECK_INSTANCE_CAST ((obj), \	(G_TYPE_CHECK_INSTANCE_CAST ((obj), \
	TP_TYPE_CHANNEL_MANAGER, TpChannelManager))	TP_TYPE_CHANNEL_MANAGER, TpChannelManager))

	#define TP_IS_CHANNEL_MANAGER(obj) \	#define TP_IS_CHANNEL_MANAGER(obj) \

	skipping to change at line 90	skipping to change at line 91
	gpointer user_data);	gpointer user_data);

	typedef void (*TpChannelManagerTypeForeachChannelClassFunc) (	typedef void (*TpChannelManagerTypeForeachChannelClassFunc) (
	GType type, TpChannelManagerTypeChannelClassFunc func,	GType type, TpChannelManagerTypeChannelClassFunc func,
	gpointer user_data);	gpointer user_data);

	void tp_channel_manager_type_foreach_channel_class (GType type,	void tp_channel_manager_type_foreach_channel_class (GType type,
	TpChannelManagerTypeChannelClassFunc func, gpointer user_data);	TpChannelManagerTypeChannelClassFunc func, gpointer user_data);

	typedef gboolean (*TpChannelManagerRequestFunc) (	typedef gboolean (*TpChannelManagerRequestFunc) (

	TpChannelManager *manager, gpointer request_token,	TpChannelManager manager, TpChannelManagerRequest request,
	GHashTable *request_properties);	GHashTable *request_properties);

	gboolean tp_channel_manager_create_channel (TpChannelManager *manager,	gboolean tp_channel_manager_create_channel (TpChannelManager *manager,

	gpointer request_token, GHashTable *request_properties);	TpChannelManagerRequest *request,
		GHashTable *request_properties);
	gboolean tp_channel_manager_request_channel (TpChannelManager *manager,
	gpointer request_token, GHashTable *request_properties);

	gboolean tp_channel_manager_ensure_channel (TpChannelManager *manager,	gboolean tp_channel_manager_ensure_channel (TpChannelManager *manager,

	gpointer request_token, GHashTable *request_properties);	TpChannelManagerRequest *request,
		GHashTable *request_properties);

	struct _TpChannelManagerIface {	struct _TpChannelManagerIface {
	GTypeInterface parent;	GTypeInterface parent;

	TpChannelManagerForeachChannelFunc foreach_channel;	TpChannelManagerForeachChannelFunc foreach_channel;

	TpChannelManagerForeachChannelClassFunc foreach_channel_class;	TpChannelManagerForeachChannelClassFunc foreach_channel_class;

	TpChannelManagerRequestFunc create_channel;	TpChannelManagerRequestFunc create_channel;

	TpChannelManagerRequestFunc request_channel;
	TpChannelManagerRequestFunc ensure_channel;	TpChannelManagerRequestFunc ensure_channel;

	TpChannelManagerTypeForeachChannelClassFunc type_foreach_channel_class;	TpChannelManagerTypeForeachChannelClassFunc type_foreach_channel_class;

	/<private>/	/<private>/
	/* We know that these two methods will be added in the near future, so	/* We know that these two methods will be added in the near future, so
	* reserve extra space for them.	* reserve extra space for them.
	*/	*/
	GCallback _reserved_for_foreach_contact_channel_class;	GCallback _reserved_for_foreach_contact_channel_class;
	GCallback _reserved_for_add_cap;	GCallback _reserved_for_add_cap;

	GCallback _future[7];	GCallback _future[7];
	};	};

	GType tp_channel_manager_get_type (void);	GType tp_channel_manager_get_type (void);

	/* signal emission */	/* signal emission */


	void tp_channel_manager_emit_new_channel (gpointer instance,	void tp_channel_manager_emit_new_channel (TpChannelManager *self,
	TpExportableChannel channel, GSList request_tokens);	TpExportableChannel channel, GSList requests);


	void tp_channel_manager_emit_channel_closed (gpointer instance,	void tp_channel_manager_emit_channel_closed (TpChannelManager *self,
	const gchar *path);	const gchar *path);

	void tp_channel_manager_emit_channel_closed_for_object (gpointer instance,	void tp_channel_manager_emit_channel_closed_for_object (TpChannelManager *s elf,
	TpExportableChannel *channel);	TpExportableChannel *channel);


	void tp_channel_manager_emit_request_already_satisfied (	void tp_channel_manager_emit_request_already_satisfied (TpChannelManager *s
	gpointer instance, gpointer request_token,	elf,
		TpChannelManagerRequest *request,
	TpExportableChannel *channel);	TpExportableChannel *channel);


	void tp_channel_manager_emit_request_failed (gpointer instance,	void tp_channel_manager_emit_request_failed (TpChannelManager *self,
	gpointer request_token, GQuark domain, gint code, const gchar *message)	TpChannelManagerRequest *request,
	;	GQuark domain,
	void tp_channel_manager_emit_request_failed_printf (gpointer instance,	gint code,
	gpointer request_token, GQuark domain, gint code, const gchar *format,	const gchar *message);
		void tp_channel_manager_emit_request_failed_printf (TpChannelManager *self,
		TpChannelManagerRequest *request,
		GQuark domain,
		gint code,
		const gchar *format,
	...) G_GNUC_PRINTF (5, 6);	...) G_GNUC_PRINTF (5, 6);

	/* helper functions */	/* helper functions */

	gboolean tp_channel_manager_asv_has_unknown_properties (GHashTable *propert ies,	gboolean tp_channel_manager_asv_has_unknown_properties (GHashTable *propert ies,
	const gchar * const fixed, const gchar const allowed, GError *erro r);	const gchar * const fixed, const gchar const allowed, GError *erro r);

	G_END_DECLS	G_END_DECLS

	#endif	#endif

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

	simple-approver.h	simple-approver.h

	skipping to change at line 75	skipping to change at line 75
	#define TP_IS_SIMPLE_APPROVER_CLASS(klass) \	#define TP_IS_SIMPLE_APPROVER_CLASS(klass) \
	(G_TYPE_CHECK_CLASS_TYPE ((klass), TP_TYPE_SIMPLE_APPROVER))	(G_TYPE_CHECK_CLASS_TYPE ((klass), TP_TYPE_SIMPLE_APPROVER))
	#define TP_SIMPLE_APPROVER_GET_CLASS(obj) \	#define TP_SIMPLE_APPROVER_GET_CLASS(obj) \
	(G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_SIMPLE_APPROVER, \	(G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_SIMPLE_APPROVER, \
	TpSimpleApproverClass))	TpSimpleApproverClass))

	typedef void (*TpSimpleApproverAddDispatchOperationImpl) (	typedef void (*TpSimpleApproverAddDispatchOperationImpl) (
	TpSimpleApprover *approver,	TpSimpleApprover *approver,
	TpAccount *account,	TpAccount *account,
	TpConnection *connection,	TpConnection *connection,

	GList *channels,	TpChannel *channel,
	TpChannelDispatchOperation *dispatch_operation,	TpChannelDispatchOperation *dispatch_operation,
	TpAddDispatchOperationContext *context,	TpAddDispatchOperationContext *context,
	gpointer user_data);	gpointer user_data);

	TpBaseClient * tp_simple_approver_new (TpClientFactory *factory,	TpBaseClient * tp_simple_approver_new (TpClientFactory *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);

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

	simple-handler.h	simple-handler.h

	skipping to change at line 71	skipping to change at line 71
	(G_TYPE_CHECK_CLASS_CAST ((klass), TP_TYPE_SIMPLE_HANDLER, \	(G_TYPE_CHECK_CLASS_CAST ((klass), TP_TYPE_SIMPLE_HANDLER, \
	TpSimpleHandlerClass))	TpSimpleHandlerClass))
	#define TP_IS_SIMPLE_HANDLER(obj) \	#define TP_IS_SIMPLE_HANDLER(obj) \
	(G_TYPE_CHECK_INSTANCE_TYPE ((obj), TP_TYPE_SIMPLE_HANDLER))	(G_TYPE_CHECK_INSTANCE_TYPE ((obj), TP_TYPE_SIMPLE_HANDLER))
	#define TP_IS_SIMPLE_HANDLER_CLASS(klass) \	#define TP_IS_SIMPLE_HANDLER_CLASS(klass) \
	(G_TYPE_CHECK_CLASS_TYPE ((klass), TP_TYPE_SIMPLE_HANDLER))	(G_TYPE_CHECK_CLASS_TYPE ((klass), TP_TYPE_SIMPLE_HANDLER))
	#define TP_SIMPLE_HANDLER_GET_CLASS(obj) \	#define TP_SIMPLE_HANDLER_GET_CLASS(obj) \
	(G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_SIMPLE_HANDLER, \	(G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_SIMPLE_HANDLER, \
	TpSimpleHandlerClass))	TpSimpleHandlerClass))


	typedef void (*TpSimpleHandlerHandleChannelsImpl) (	typedef void (*TpSimpleHandlerHandleChannelImpl) (
	TpSimpleHandler *handler,	TpSimpleHandler *handler,
	TpAccount *account,	TpAccount *account,
	TpConnection *connection,	TpConnection *connection,

	GList *channels,	TpChannel *channel,
	GList *requests_satisfied,	GList *requests_satisfied,
	gint64 user_action_time,	gint64 user_action_time,

	TpHandleChannelsContext *context,	TpHandleChannelContext *context,
	gpointer user_data);	gpointer user_data);

	TpBaseClient tp_simple_handler_new (TpClientFactory factory,	TpBaseClient tp_simple_handler_new (TpClientFactory factory,
	gboolean bypass_approval,	gboolean bypass_approval,
	gboolean requests,	gboolean requests,
	const gchar *name,	const gchar *name,
	gboolean uniquify,	gboolean uniquify,

	TpSimpleHandlerHandleChannelsImpl callback,	TpSimpleHandlerHandleChannelImpl callback,
	gpointer user_data,	gpointer user_data,
	GDestroyNotify destroy);	GDestroyNotify destroy);

	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,	TpSimpleHandlerHandleChannelImpl callback,
	gpointer user_data,	gpointer user_data,
	GDestroyNotify destroy);	GDestroyNotify destroy);

	G_END_DECLS	G_END_DECLS

	#endif	#endif

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

	simple-observer.h	simple-observer.h

	skipping to change at line 71	skipping to change at line 71
	(G_TYPE_CHECK_CLASS_CAST ((klass), TP_TYPE_SIMPLE_OBSERVER, \	(G_TYPE_CHECK_CLASS_CAST ((klass), TP_TYPE_SIMPLE_OBSERVER, \
	TpSimpleObserverClass))	TpSimpleObserverClass))
	#define TP_IS_SIMPLE_OBSERVER(obj) \	#define TP_IS_SIMPLE_OBSERVER(obj) \
	(G_TYPE_CHECK_INSTANCE_TYPE ((obj), TP_TYPE_SIMPLE_OBSERVER))	(G_TYPE_CHECK_INSTANCE_TYPE ((obj), TP_TYPE_SIMPLE_OBSERVER))
	#define TP_IS_SIMPLE_OBSERVER_CLASS(klass) \	#define TP_IS_SIMPLE_OBSERVER_CLASS(klass) \
	(G_TYPE_CHECK_CLASS_TYPE ((klass), TP_TYPE_SIMPLE_OBSERVER))	(G_TYPE_CHECK_CLASS_TYPE ((klass), TP_TYPE_SIMPLE_OBSERVER))
	#define TP_SIMPLE_OBSERVER_GET_CLASS(obj) \	#define TP_SIMPLE_OBSERVER_GET_CLASS(obj) \
	(G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_SIMPLE_OBSERVER, \	(G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_SIMPLE_OBSERVER, \
	TpSimpleObserverClass))	TpSimpleObserverClass))


	typedef void (*TpSimpleObserverObserveChannelsImpl) (	typedef void (*TpSimpleObserverObserveChannelImpl) (
	TpSimpleObserver *observer,	TpSimpleObserver *observer,
	TpAccount *account,	TpAccount *account,
	TpConnection *connection,	TpConnection *connection,

	GList *channels,	TpChannel *channel,
	TpChannelDispatchOperation *dispatch_operation,	TpChannelDispatchOperation *dispatch_operation,
	GList *requests,	GList *requests,

	TpObserveChannelsContext *context,	TpObserveChannelContext *context,
	gpointer user_data);	gpointer user_data);

	TpBaseClient * tp_simple_observer_new (TpClientFactory *factory,	TpBaseClient * tp_simple_observer_new (TpClientFactory *factory,
	gboolean recover,	gboolean recover,
	const gchar *name,	const gchar *name,
	gboolean uniquify,	gboolean uniquify,

	TpSimpleObserverObserveChannelsImpl callback,	TpSimpleObserverObserveChannelImpl callback,
	gpointer user_data,	gpointer user_data,
	GDestroyNotify destroy);	GDestroyNotify destroy);

	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,	TpSimpleObserverObserveChannelImpl callback,
	gpointer user_data,	gpointer user_data,
	GDestroyNotify destroy);	GDestroyNotify destroy);

	G_END_DECLS	G_END_DECLS

	#endif	#endif

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

	telepathy-enums.h	telepathy-enums.h

	skipping to change at line 314	skipping to change at line 314

	typedef enum {	typedef enum {
	TP_CHANNEL_CHAT_STATE_GONE = 0,	TP_CHANNEL_CHAT_STATE_GONE = 0,
	TP_CHANNEL_CHAT_STATE_INACTIVE = 1,	TP_CHANNEL_CHAT_STATE_INACTIVE = 1,
	TP_CHANNEL_CHAT_STATE_ACTIVE = 2,	TP_CHANNEL_CHAT_STATE_ACTIVE = 2,
	TP_CHANNEL_CHAT_STATE_PAUSED = 3,	TP_CHANNEL_CHAT_STATE_PAUSED = 3,
	TP_CHANNEL_CHAT_STATE_COMPOSING = 4,	TP_CHANNEL_CHAT_STATE_COMPOSING = 4,
	} TpChannelChatState;	} TpChannelChatState;
	#define TP_NUM_CHANNEL_CHAT_STATES (4+1)	#define TP_NUM_CHANNEL_CHAT_STATES (4+1)


	typedef enum {
	TP_DTMF_EVENT_DIGIT_0 = 0,
	TP_DTMF_EVENT_DIGIT_1 = 1,
	TP_DTMF_EVENT_DIGIT_2 = 2,
	TP_DTMF_EVENT_DIGIT_3 = 3,
	TP_DTMF_EVENT_DIGIT_4 = 4,
	TP_DTMF_EVENT_DIGIT_5 = 5,
	TP_DTMF_EVENT_DIGIT_6 = 6,
	TP_DTMF_EVENT_DIGIT_7 = 7,
	TP_DTMF_EVENT_DIGIT_8 = 8,
	TP_DTMF_EVENT_DIGIT_9 = 9,
	TP_DTMF_EVENT_ASTERISK = 10,
	TP_DTMF_EVENT_HASH = 11,
	TP_DTMF_EVENT_LETTER_A = 12,
	TP_DTMF_EVENT_LETTER_B = 13,
	TP_DTMF_EVENT_LETTER_C = 14,
	TP_DTMF_EVENT_LETTER_D = 15,
	} TpDTMFEvent;
	#define TP_NUM_DTMF_EVENTS (15+1)

	typedef enum /< flags >/ {	typedef enum /< flags >/ {
	TP_CHANNEL_GROUP_FLAG_CAN_ADD = 1,	TP_CHANNEL_GROUP_FLAG_CAN_ADD = 1,
	TP_CHANNEL_GROUP_FLAG_CAN_REMOVE = 2,	TP_CHANNEL_GROUP_FLAG_CAN_REMOVE = 2,
	TP_CHANNEL_GROUP_FLAG_CAN_RESCIND = 4,	TP_CHANNEL_GROUP_FLAG_CAN_RESCIND = 4,
	TP_CHANNEL_GROUP_FLAG_MESSAGE_ADD = 8,	TP_CHANNEL_GROUP_FLAG_MESSAGE_ADD = 8,
	TP_CHANNEL_GROUP_FLAG_MESSAGE_REMOVE = 16,	TP_CHANNEL_GROUP_FLAG_MESSAGE_REMOVE = 16,
	TP_CHANNEL_GROUP_FLAG_MESSAGE_ACCEPT = 32,	TP_CHANNEL_GROUP_FLAG_MESSAGE_ACCEPT = 32,
	TP_CHANNEL_GROUP_FLAG_MESSAGE_REJECT = 64,	TP_CHANNEL_GROUP_FLAG_MESSAGE_REJECT = 64,
	TP_CHANNEL_GROUP_FLAG_MESSAGE_RESCIND = 128,	TP_CHANNEL_GROUP_FLAG_MESSAGE_RESCIND = 128,
	TP_CHANNEL_GROUP_FLAG_CHANNEL_SPECIFIC_HANDLES = 256,	TP_CHANNEL_GROUP_FLAG_CHANNEL_SPECIFIC_HANDLES = 256,

	skipping to change at line 471	skipping to change at line 451
	#define TP_NUM_TLS_CERTIFICATE_REJECT_REASONS (9+1)	#define TP_NUM_TLS_CERTIFICATE_REJECT_REASONS (9+1)

	typedef enum {	typedef enum {
	TP_CALL_CONTENT_PACKETIZATION_TYPE_RTP = 0,	TP_CALL_CONTENT_PACKETIZATION_TYPE_RTP = 0,
	TP_CALL_CONTENT_PACKETIZATION_TYPE_RAW = 1,	TP_CALL_CONTENT_PACKETIZATION_TYPE_RAW = 1,
	TP_CALL_CONTENT_PACKETIZATION_TYPE_MSN_WEBCAM = 2,	TP_CALL_CONTENT_PACKETIZATION_TYPE_MSN_WEBCAM = 2,
	} TpCallContentPacketizationType;	} TpCallContentPacketizationType;
	#define TP_NUM_CALL_CONTENT_PACKETIZATION_TYPES (2+1)	#define TP_NUM_CALL_CONTENT_PACKETIZATION_TYPES (2+1)

	typedef enum {	typedef enum {

		TP_DTMF_EVENT_DIGIT_0 = 0,
		TP_DTMF_EVENT_DIGIT_1 = 1,
		TP_DTMF_EVENT_DIGIT_2 = 2,
		TP_DTMF_EVENT_DIGIT_3 = 3,
		TP_DTMF_EVENT_DIGIT_4 = 4,
		TP_DTMF_EVENT_DIGIT_5 = 5,
		TP_DTMF_EVENT_DIGIT_6 = 6,
		TP_DTMF_EVENT_DIGIT_7 = 7,
		TP_DTMF_EVENT_DIGIT_8 = 8,
		TP_DTMF_EVENT_DIGIT_9 = 9,
		TP_DTMF_EVENT_ASTERISK = 10,
		TP_DTMF_EVENT_HASH = 11,
		TP_DTMF_EVENT_LETTER_A = 12,
		TP_DTMF_EVENT_LETTER_B = 13,
		TP_DTMF_EVENT_LETTER_C = 14,
		TP_DTMF_EVENT_LETTER_D = 15,
		} TpDTMFEvent;
		#define TP_NUM_DTMF_EVENTS (15+1)

		typedef enum {
	TP_CALL_CONTENT_DISPOSITION_NONE = 0,	TP_CALL_CONTENT_DISPOSITION_NONE = 0,
	TP_CALL_CONTENT_DISPOSITION_INITIAL = 1,	TP_CALL_CONTENT_DISPOSITION_INITIAL = 1,
	} TpCallContentDisposition;	} TpCallContentDisposition;
	#define TP_NUM_CALL_CONTENT_DISPOSITIONS (1+1)	#define TP_NUM_CALL_CONTENT_DISPOSITIONS (1+1)

	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,

End of changes. 2 change blocks.
	20 lines changed or deleted	20 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	#ifndef TP_GEN_TP_CLI_CHANNEL_DISPATCH_OPERATION_H_INCLUDED
	#define 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	typedef void (*tp_cli_channel_dispatch_operation_signal_callback_finished)
	st) (TpChannelDispatchOperation *proxy,	(TpChannelDispatchOperation *proxy,
	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,
	tp_cli_channel_dispatch_operation_signal_callback_channel_lost callback
	,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object,
	GError **error);

	#ifndef __GTK_DOC_IGNORE__
	static inline TpProxySignalConnection *
	_tp_cli_channel_dispatch_operation_connect_to_channel_lost (TpChannelDispat
	chOperation *proxy,
	tp_cli_channel_dispatch_operation_signal_callback_channel_lost callback
	,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object,
	GError **error)
	{
	g_return_val_if_fail (TP_IS_CHANNEL_DISPATCH_OPERATION (proxy), NULL);
	return tp_cli_channel_dispatch_operation_connect_to_channel_lost (proxy,
	callback, user_data,
	destroy, weak_object, error);
	}
	#define tp_cli_channel_dispatch_operation_connect_to_channel_lost(...) _tp_
	cli_channel_dispatch_operation_connect_to_channel_lost (__VA_ARGS__)
	#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_dispatch_operation_signal_callback_finished)
	(TpChannelDispatchOperation *proxy,
	gpointer user_data, GObject *weak_object);
	TpProxySignalConnection tp_cli_channel_dispatch_operation_connect_to_finis hed (TpChannelDispatchOperation proxy,	TpProxySignalConnection tp_cli_channel_dispatch_operation_connect_to_finis hed (TpChannelDispatchOperation proxy,
	tp_cli_channel_dispatch_operation_signal_callback_finished callback,	tp_cli_channel_dispatch_operation_signal_callback_finished callback,
	gpointer user_data,	gpointer user_data,
	GDestroyNotify destroy,	GDestroyNotify destroy,
	GObject *weak_object,	GObject *weak_object,
	GError **error);	GError **error);

	#ifndef __GTK_DOC_IGNORE__	#ifndef __GTK_DOC_IGNORE__
	static inline TpProxySignalConnection *	static inline TpProxySignalConnection *
	_tp_cli_channel_dispatch_operation_connect_to_finished (TpChannelDispatchOp eration *proxy,	_tp_cli_channel_dispatch_operation_connect_to_finished (TpChannelDispatchOp eration *proxy,

	skipping to change at line 64	skipping to change at line 39
	}	}
	#define tp_cli_channel_dispatch_operation_connect_to_finished(...) _tp_cli_ channel_dispatch_operation_connect_to_finished (__VA_ARGS__)	#define tp_cli_channel_dispatch_operation_connect_to_finished(...) _tp_cli_ channel_dispatch_operation_connect_to_finished (__VA_ARGS__)
	#endif /* __GTK_DOC_IGNORE__ */	#endif /* __GTK_DOC_IGNORE__ */
	typedef void (tp_cli_channel_dispatch_operation_callback_for_handle_with) (TpChannelDispatchOperation proxy,	typedef void (tp_cli_channel_dispatch_operation_callback_for_handle_with) (TpChannelDispatchOperation proxy,
	const GError *error, gpointer user_data,	const GError *error, gpointer user_data,
	GObject *weak_object);	GObject *weak_object);

	TpProxyPendingCall tp_cli_channel_dispatch_operation_call_handle_with (TpC hannelDispatchOperation proxy,	TpProxyPendingCall tp_cli_channel_dispatch_operation_call_handle_with (TpC hannelDispatchOperation proxy,
	gint timeout_ms,	gint timeout_ms,
	const gchar *in_Handler,	const gchar *in_Handler,

		gint64 in_UserActionTime,
	tp_cli_channel_dispatch_operation_callback_for_handle_with callback,	tp_cli_channel_dispatch_operation_callback_for_handle_with callback,
	gpointer user_data,	gpointer user_data,
	GDestroyNotify destroy,	GDestroyNotify destroy,
	GObject *weak_object);	GObject *weak_object);

	#ifndef __GTK_DOC_IGNORE__	#ifndef __GTK_DOC_IGNORE__
	static inline TpProxyPendingCall *	static inline TpProxyPendingCall *
	_tp_cli_channel_dispatch_operation_call_handle_with (TpChannelDispatchOpera tion *proxy,	_tp_cli_channel_dispatch_operation_call_handle_with (TpChannelDispatchOpera tion *proxy,
	gint timeout_ms,	gint timeout_ms,
	const gchar *in_Handler,	const gchar *in_Handler,

		gint64 in_UserActionTime,
	tp_cli_channel_dispatch_operation_callback_for_handle_with callback,	tp_cli_channel_dispatch_operation_callback_for_handle_with callback,
	gpointer user_data,	gpointer user_data,
	GDestroyNotify destroy,	GDestroyNotify destroy,
	GObject *weak_object)	GObject *weak_object)
	{	{
	g_return_val_if_fail (TP_IS_CHANNEL_DISPATCH_OPERATION (proxy), NULL);	g_return_val_if_fail (TP_IS_CHANNEL_DISPATCH_OPERATION (proxy), NULL);
	return tp_cli_channel_dispatch_operation_call_handle_with (proxy, timeout _ms,	return tp_cli_channel_dispatch_operation_call_handle_with (proxy, timeout _ms,
	in_Handler,	in_Handler,

		in_UserActionTime,
	callback, user_data, destroy, weak_object);	callback, user_data, destroy, weak_object);
	}	}
	#define tp_cli_channel_dispatch_operation_call_handle_with(...) _tp_cli_cha nnel_dispatch_operation_call_handle_with (__VA_ARGS__)	#define tp_cli_channel_dispatch_operation_call_handle_with(...) _tp_cli_cha nnel_dispatch_operation_call_handle_with (__VA_ARGS__)
	#endif /* __GTK_DOC_IGNORE__ */	#endif /* __GTK_DOC_IGNORE__ */

	typedef void (tp_cli_channel_dispatch_operation_callback_for_claim) (TpCha nnelDispatchOperation proxy,	typedef void (tp_cli_channel_dispatch_operation_callback_for_claim) (TpCha nnelDispatchOperation proxy,
	const GError *error, gpointer user_data,	const GError *error, gpointer user_data,
	GObject *weak_object);	GObject *weak_object);

	TpProxyPendingCall tp_cli_channel_dispatch_operation_call_claim (TpChannel DispatchOperation proxy,	TpProxyPendingCall tp_cli_channel_dispatch_operation_call_claim (TpChannel DispatchOperation proxy,

	skipping to change at line 114	skipping to change at line 92
	GDestroyNotify destroy,	GDestroyNotify destroy,
	GObject *weak_object)	GObject *weak_object)
	{	{
	g_return_val_if_fail (TP_IS_CHANNEL_DISPATCH_OPERATION (proxy), NULL);	g_return_val_if_fail (TP_IS_CHANNEL_DISPATCH_OPERATION (proxy), NULL);
	return tp_cli_channel_dispatch_operation_call_claim (proxy, timeout_ms,	return tp_cli_channel_dispatch_operation_call_claim (proxy, timeout_ms,
	callback, user_data, destroy, weak_object);	callback, user_data, destroy, weak_object);
	}	}
	#define tp_cli_channel_dispatch_operation_call_claim(...) _tp_cli_channel_d ispatch_operation_call_claim (__VA_ARGS__)	#define tp_cli_channel_dispatch_operation_call_claim(...) _tp_cli_channel_d ispatch_operation_call_claim (__VA_ARGS__)
	#endif /* __GTK_DOC_IGNORE__ */	#endif /* __GTK_DOC_IGNORE__ */


	typedef void (*tp_cli_channel_dispatch_operation_callback_for_handle_with_t
	ime) (TpChannelDispatchOperation *proxy,
	const GError *error, gpointer user_data,
	GObject *weak_object);

	TpProxyPendingCall *tp_cli_channel_dispatch_operation_call_handle_with_time
	(TpChannelDispatchOperation *proxy,
	gint timeout_ms,
	const gchar *in_Handler,
	gint64 in_UserActionTime,
	tp_cli_channel_dispatch_operation_callback_for_handle_with_time callbac
	k,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object);

	#ifndef __GTK_DOC_IGNORE__
	static inline TpProxyPendingCall *
	_tp_cli_channel_dispatch_operation_call_handle_with_time (TpChannelDispatch
	Operation *proxy,
	gint timeout_ms,
	const gchar *in_Handler,
	gint64 in_UserActionTime,
	tp_cli_channel_dispatch_operation_callback_for_handle_with_time callbac
	k,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object)
	{
	g_return_val_if_fail (TP_IS_CHANNEL_DISPATCH_OPERATION (proxy), NULL);
	return tp_cli_channel_dispatch_operation_call_handle_with_time (proxy, ti
	meout_ms,
	in_Handler,
	in_UserActionTime,
	callback, user_data, destroy, weak_object);
	}
	#define tp_cli_channel_dispatch_operation_call_handle_with_time(...) _tp_cl
	i_channel_dispatch_operation_call_handle_with_time (__VA_ARGS__)
	#endif /* __GTK_DOC_IGNORE__ */

	void tp_cli_channel_dispatch_operation_add_signals (TpProxy *self,	void tp_cli_channel_dispatch_operation_add_signals (TpProxy *self,
	guint quark,	guint quark,
	DBusGProxy *proxy,	DBusGProxy *proxy,
	gpointer unused);	gpointer unused);

	G_END_DECLS	G_END_DECLS

	#endif /* defined (TP_GEN_TP_CLI_CHANNEL_DISPATCH_OPERATION_H_INCLUDED) */	#endif /* defined (TP_GEN_TP_CLI_CHANNEL_DISPATCH_OPERATION_H_INCLUDED) */

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

	tp-cli-channel.h	tp-cli-channel.h

	skipping to change at line 293	skipping to change at line 293
	GDestroyNotify destroy,	GDestroyNotify destroy,
	GObject *weak_object,	GObject *weak_object,
	GError **error)	GError **error)
	{	{
	g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);	g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
	return tp_cli_channel_interface_conference1_connect_to_channel_removed (p roxy, callback, user_data,	return tp_cli_channel_interface_conference1_connect_to_channel_removed (p roxy, callback, user_data,
	destroy, weak_object, error);	destroy, weak_object, error);
	}	}
	#define tp_cli_channel_interface_conference1_connect_to_channel_removed(... ) _tp_cli_channel_interface_conference1_connect_to_channel_removed (__VA_AR GS__)	#define tp_cli_channel_interface_conference1_connect_to_channel_removed(... ) _tp_cli_channel_interface_conference1_connect_to_channel_removed (__VA_AR GS__)
	#endif /* __GTK_DOC_IGNORE__ */	#endif /* __GTK_DOC_IGNORE__ */

	typedef void (*tp_cli_channel_interface_dtmf1_signal_callback_tones_deferre
	d) (TpChannel *proxy,
	const gchar *arg_Tones,
	gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_channel_interface_dtmf1_connect_to_tones_de
	ferred (TpChannel *proxy,
	tp_cli_channel_interface_dtmf1_signal_callback_tones_deferred callback,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object,
	GError **error);

	#ifndef __GTK_DOC_IGNORE__
	static inline TpProxySignalConnection *
	_tp_cli_channel_interface_dtmf1_connect_to_tones_deferred (TpChannel *proxy
	,
	tp_cli_channel_interface_dtmf1_signal_callback_tones_deferred callback,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object,
	GError **error)
	{
	g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
	return tp_cli_channel_interface_dtmf1_connect_to_tones_deferred (proxy, c
	allback, user_data,
	destroy, weak_object, error);
	}
	#define tp_cli_channel_interface_dtmf1_connect_to_tones_deferred(...) _tp_c
	li_channel_interface_dtmf1_connect_to_tones_deferred (__VA_ARGS__)
	#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_interface_dtmf1_signal_callback_sending_tones
	) (TpChannel *proxy,
	const gchar *arg_Tones,
	gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_channel_interface_dtmf1_connect_to_sending_
	tones (TpChannel *proxy,
	tp_cli_channel_interface_dtmf1_signal_callback_sending_tones callback,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object,
	GError **error);

	#ifndef __GTK_DOC_IGNORE__
	static inline TpProxySignalConnection *
	_tp_cli_channel_interface_dtmf1_connect_to_sending_tones (TpChannel *proxy,
	tp_cli_channel_interface_dtmf1_signal_callback_sending_tones callback,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object,
	GError **error)
	{
	g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
	return tp_cli_channel_interface_dtmf1_connect_to_sending_tones (proxy, ca
	llback, user_data,
	destroy, weak_object, error);
	}
	#define tp_cli_channel_interface_dtmf1_connect_to_sending_tones(...) _tp_cl
	i_channel_interface_dtmf1_connect_to_sending_tones (__VA_ARGS__)
	#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_interface_dtmf1_signal_callback_stopped_tones
	) (TpChannel *proxy,
	gboolean arg_Cancelled,
	gpointer user_data, GObject *weak_object);
	TpProxySignalConnection *tp_cli_channel_interface_dtmf1_connect_to_stopped_
	tones (TpChannel *proxy,
	tp_cli_channel_interface_dtmf1_signal_callback_stopped_tones callback,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object,
	GError **error);

	#ifndef __GTK_DOC_IGNORE__
	static inline TpProxySignalConnection *
	_tp_cli_channel_interface_dtmf1_connect_to_stopped_tones (TpChannel *proxy,
	tp_cli_channel_interface_dtmf1_signal_callback_stopped_tones callback,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object,
	GError **error)
	{
	g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
	return tp_cli_channel_interface_dtmf1_connect_to_stopped_tones (proxy, ca
	llback, user_data,
	destroy, weak_object, error);
	}
	#define tp_cli_channel_interface_dtmf1_connect_to_stopped_tones(...) _tp_cl
	i_channel_interface_dtmf1_connect_to_stopped_tones (__VA_ARGS__)
	#endif /* __GTK_DOC_IGNORE__ */
	typedef void (*tp_cli_channel_interface_dtmf1_callback_for_start_tone) (TpC
	hannel *proxy,
	const GError *error, gpointer user_data,
	GObject *weak_object);

	TpProxyPendingCall *tp_cli_channel_interface_dtmf1_call_start_tone (TpChann
	el *proxy,
	gint timeout_ms,
	guint in_Stream_ID,
	guchar in_Event,
	tp_cli_channel_interface_dtmf1_callback_for_start_tone callback,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object);

	#ifndef __GTK_DOC_IGNORE__
	static inline TpProxyPendingCall *
	_tp_cli_channel_interface_dtmf1_call_start_tone (TpChannel *proxy,
	gint timeout_ms,
	guint in_Stream_ID,
	guchar in_Event,
	tp_cli_channel_interface_dtmf1_callback_for_start_tone callback,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object)
	{
	g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
	return tp_cli_channel_interface_dtmf1_call_start_tone (proxy, timeout_ms,
	in_Stream_ID,
	in_Event,
	callback, user_data, destroy, weak_object);
	}
	#define tp_cli_channel_interface_dtmf1_call_start_tone(...) _tp_cli_channel
	_interface_dtmf1_call_start_tone (__VA_ARGS__)
	#endif /* __GTK_DOC_IGNORE__ */

	typedef void (*tp_cli_channel_interface_dtmf1_callback_for_stop_tone) (TpCh
	annel *proxy,
	const GError *error, gpointer user_data,
	GObject *weak_object);

	TpProxyPendingCall *tp_cli_channel_interface_dtmf1_call_stop_tone (TpChanne
	l *proxy,
	gint timeout_ms,
	guint in_Stream_ID,
	tp_cli_channel_interface_dtmf1_callback_for_stop_tone callback,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object);

	#ifndef __GTK_DOC_IGNORE__
	static inline TpProxyPendingCall *
	_tp_cli_channel_interface_dtmf1_call_stop_tone (TpChannel *proxy,
	gint timeout_ms,
	guint in_Stream_ID,
	tp_cli_channel_interface_dtmf1_callback_for_stop_tone callback,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object)
	{
	g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
	return tp_cli_channel_interface_dtmf1_call_stop_tone (proxy, timeout_ms,
	in_Stream_ID,
	callback, user_data, destroy, weak_object);
	}
	#define tp_cli_channel_interface_dtmf1_call_stop_tone(...) _tp_cli_channel_
	interface_dtmf1_call_stop_tone (__VA_ARGS__)
	#endif /* __GTK_DOC_IGNORE__ */

	typedef void (*tp_cli_channel_interface_dtmf1_callback_for_multiple_tones)
	(TpChannel *proxy,
	const GError *error, gpointer user_data,
	GObject *weak_object);

	TpProxyPendingCall *tp_cli_channel_interface_dtmf1_call_multiple_tones (TpC
	hannel *proxy,
	gint timeout_ms,
	const gchar *in_Tones,
	tp_cli_channel_interface_dtmf1_callback_for_multiple_tones callback,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object);

	#ifndef __GTK_DOC_IGNORE__
	static inline TpProxyPendingCall *
	_tp_cli_channel_interface_dtmf1_call_multiple_tones (TpChannel *proxy,
	gint timeout_ms,
	const gchar *in_Tones,
	tp_cli_channel_interface_dtmf1_callback_for_multiple_tones callback,
	gpointer user_data,
	GDestroyNotify destroy,
	GObject *weak_object)
	{
	g_return_val_if_fail (TP_IS_CHANNEL (proxy), NULL);
	return tp_cli_channel_interface_dtmf1_call_multiple_tones (proxy, timeout
	_ms,
	in_Tones,
	callback, user_data, destroy, weak_object);
	}
	#define tp_cli_channel_interface_dtmf1_call_multiple_tones(...) _tp_cli_cha
	nnel_interface_dtmf1_call_multiple_tones (__VA_ARGS__)
	#endif /* __GTK_DOC_IGNORE__ */

	typedef void (tp_cli_channel_interface_destroyable1_callback_for_destroy) (TpChannel proxy,	typedef void (tp_cli_channel_interface_destroyable1_callback_for_destroy) (TpChannel proxy,
	const GError *error, gpointer user_data,	const GError *error, gpointer user_data,
	GObject *weak_object);	GObject *weak_object);

	TpProxyPendingCall tp_cli_channel_interface_destroyable1_call_destroy (TpC hannel proxy,	TpProxyPendingCall tp_cli_channel_interface_destroyable1_call_destroy (TpC hannel proxy,
	gint timeout_ms,	gint timeout_ms,
	tp_cli_channel_interface_destroyable1_callback_for_destroy callback,	tp_cli_channel_interface_destroyable1_callback_for_destroy callback,
	gpointer user_data,	gpointer user_data,
	GDestroyNotify destroy,	GDestroyNotify destroy,
	GObject *weak_object);	GObject *weak_object);

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

	tp-cli-client.h	tp-cli-client.h

	skipping to change at line 12	skipping to change at line 12
	#define 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 gchar *in_DispatchOperation,	const gchar *in_DispatchOperation,
	GHashTable *in_Properties,	GHashTable *in_Properties,
	tp_cli_client_approver_callback_for_add_dispatch_operation callback,	tp_cli_client_approver_callback_for_add_dispatch_operation callback,
	gpointer user_data,	gpointer user_data,
	GDestroyNotify destroy,	GDestroyNotify destroy,
	GObject *weak_object);	GObject *weak_object);

	#ifndef __GTK_DOC_IGNORE__	#ifndef __GTK_DOC_IGNORE__
	static inline TpProxyPendingCall *	static inline TpProxyPendingCall *
	_tp_cli_client_approver_call_add_dispatch_operation (TpClient *proxy,	_tp_cli_client_approver_call_add_dispatch_operation (TpClient *proxy,
	gint timeout_ms,	gint timeout_ms,

	const GPtrArray *in_Channels,
	const gchar *in_DispatchOperation,	const gchar *in_DispatchOperation,
	GHashTable *in_Properties,	GHashTable *in_Properties,
	tp_cli_client_approver_callback_for_add_dispatch_operation callback,	tp_cli_client_approver_callback_for_add_dispatch_operation callback,
	gpointer user_data,	gpointer user_data,
	GDestroyNotify destroy,	GDestroyNotify destroy,
	GObject *weak_object)	GObject *weak_object)
	{	{
	g_return_val_if_fail (TP_IS_CLIENT (proxy), NULL);	g_return_val_if_fail (TP_IS_CLIENT (proxy), NULL);
	return tp_cli_client_approver_call_add_dispatch_operation (proxy, timeout _ms,	return tp_cli_client_approver_call_add_dispatch_operation (proxy, timeout _ms,

	in_Channels,
	in_DispatchOperation,	in_DispatchOperation,
	in_Properties,	in_Properties,
	callback, user_data, destroy, weak_object);	callback, user_data, destroy, weak_object);
	}	}
	#define tp_cli_client_approver_call_add_dispatch_operation(...) _tp_cli_cli ent_approver_call_add_dispatch_operation (__VA_ARGS__)	#define tp_cli_client_approver_call_add_dispatch_operation(...) _tp_cli_cli ent_approver_call_add_dispatch_operation (__VA_ARGS__)
	#endif /* __GTK_DOC_IGNORE__ */	#endif /* __GTK_DOC_IGNORE__ */


	typedef void (tp_cli_client_handler_callback_for_handle_channels) (TpClien t proxy,	typedef void (tp_cli_client_handler_callback_for_handle_channel) (TpClient proxy,
	const GError *error, gpointer user_data,	const GError *error, gpointer user_data,
	GObject *weak_object);	GObject *weak_object);


	TpProxyPendingCall tp_cli_client_handler_call_handle_channels (TpClient p roxy,	TpProxyPendingCall tp_cli_client_handler_call_handle_channel (TpClient pr oxy,
	gint timeout_ms,	gint timeout_ms,
	const gchar *in_Account,	const gchar *in_Account,
	const gchar *in_Connection,	const gchar *in_Connection,

	const GPtrArray *in_Channels,	const gchar *in_Channel,
		GHashTable *in_Channel_Properties,
	const GPtrArray *in_Requests_Satisfied,	const GPtrArray *in_Requests_Satisfied,

	guint64 in_User_Action_Time,	gint64 in_User_Action_Time,
	GHashTable *in_Handler_Info,	GHashTable *in_Handler_Info,

	tp_cli_client_handler_callback_for_handle_channels callback,	tp_cli_client_handler_callback_for_handle_channel callback,
	gpointer user_data,	gpointer user_data,
	GDestroyNotify destroy,	GDestroyNotify destroy,
	GObject *weak_object);	GObject *weak_object);

	#ifndef __GTK_DOC_IGNORE__	#ifndef __GTK_DOC_IGNORE__
	static inline TpProxyPendingCall *	static inline TpProxyPendingCall *

	_tp_cli_client_handler_call_handle_channels (TpClient *proxy,	_tp_cli_client_handler_call_handle_channel (TpClient *proxy,
	gint timeout_ms,	gint timeout_ms,
	const gchar *in_Account,	const gchar *in_Account,
	const gchar *in_Connection,	const gchar *in_Connection,

	const GPtrArray *in_Channels,	const gchar *in_Channel,
		GHashTable *in_Channel_Properties,
	const GPtrArray *in_Requests_Satisfied,	const GPtrArray *in_Requests_Satisfied,

	guint64 in_User_Action_Time,	gint64 in_User_Action_Time,
	GHashTable *in_Handler_Info,	GHashTable *in_Handler_Info,

	tp_cli_client_handler_callback_for_handle_channels callback,	tp_cli_client_handler_callback_for_handle_channel callback,
	gpointer user_data,	gpointer user_data,
	GDestroyNotify destroy,	GDestroyNotify destroy,
	GObject *weak_object)	GObject *weak_object)
	{	{
	g_return_val_if_fail (TP_IS_CLIENT (proxy), NULL);	g_return_val_if_fail (TP_IS_CLIENT (proxy), NULL);

	return tp_cli_client_handler_call_handle_channels (proxy, timeout_ms,	return tp_cli_client_handler_call_handle_channel (proxy, timeout_ms,
	in_Account,	in_Account,
	in_Connection,	in_Connection,

	in_Channels,	in_Channel,
		in_Channel_Properties,
	in_Requests_Satisfied,	in_Requests_Satisfied,
	in_User_Action_Time,	in_User_Action_Time,
	in_Handler_Info,	in_Handler_Info,
	callback, user_data, destroy, weak_object);	callback, user_data, destroy, weak_object);
	}	}

	#define tp_cli_client_handler_call_handle_channels(...) _tp_cli_client_hand ler_call_handle_channels (__VA_ARGS__)	#define tp_cli_client_handler_call_handle_channel(...) _tp_cli_client_handl er_call_handle_channel (__VA_ARGS__)
	#endif /* __GTK_DOC_IGNORE__ */	#endif /* __GTK_DOC_IGNORE__ */

	typedef void (tp_cli_client_interface_requests_callback_for_add_request) ( TpClient proxy,	typedef void (tp_cli_client_interface_requests_callback_for_add_request) ( TpClient proxy,
	const GError *error, gpointer user_data,	const GError *error, gpointer user_data,
	GObject *weak_object);	GObject *weak_object);

	TpProxyPendingCall tp_cli_client_interface_requests_call_add_request (TpCl ient proxy,	TpProxyPendingCall tp_cli_client_interface_requests_call_add_request (TpCl ient proxy,
	gint timeout_ms,	gint timeout_ms,
	const gchar *in_Request,	const gchar *in_Request,
	GHashTable *in_Properties,	GHashTable *in_Properties,

	skipping to change at line 156	skipping to change at line 156
	g_return_val_if_fail (TP_IS_CLIENT (proxy), NULL);	g_return_val_if_fail (TP_IS_CLIENT (proxy), NULL);
	return tp_cli_client_interface_requests_call_remove_request (proxy, timeo ut_ms,	return tp_cli_client_interface_requests_call_remove_request (proxy, timeo ut_ms,
	in_Request,	in_Request,
	in_Error,	in_Error,
	in_Message,	in_Message,
	callback, user_data, destroy, weak_object);	callback, user_data, destroy, weak_object);
	}	}
	#define tp_cli_client_interface_requests_call_remove_request(...) _tp_cli_c lient_interface_requests_call_remove_request (__VA_ARGS__)	#define tp_cli_client_interface_requests_call_remove_request(...) _tp_cli_c lient_interface_requests_call_remove_request (__VA_ARGS__)
	#endif /* __GTK_DOC_IGNORE__ */	#endif /* __GTK_DOC_IGNORE__ */


	typedef void (tp_cli_client_observer_callback_for_observe_channels) (TpCli ent proxy,	typedef void (tp_cli_client_observer_callback_for_observe_channel) (TpClie nt proxy,
	const GError *error, gpointer user_data,	const GError *error, gpointer user_data,
	GObject *weak_object);	GObject *weak_object);


	TpProxyPendingCall tp_cli_client_observer_call_observe_channels (TpClient proxy,	TpProxyPendingCall tp_cli_client_observer_call_observe_channel (TpClient proxy,
	gint timeout_ms,	gint timeout_ms,
	const gchar *in_Account,	const gchar *in_Account,
	const gchar *in_Connection,	const gchar *in_Connection,

	const GPtrArray *in_Channels,	const gchar *in_Channel,
		GHashTable *in_Channel_Properties,
	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_channel callback,
	gpointer user_data,	gpointer user_data,
	GDestroyNotify destroy,	GDestroyNotify destroy,
	GObject *weak_object);	GObject *weak_object);

	#ifndef __GTK_DOC_IGNORE__	#ifndef __GTK_DOC_IGNORE__
	static inline TpProxyPendingCall *	static inline TpProxyPendingCall *

	_tp_cli_client_observer_call_observe_channels (TpClient *proxy,	_tp_cli_client_observer_call_observe_channel (TpClient *proxy,
	gint timeout_ms,	gint timeout_ms,
	const gchar *in_Account,	const gchar *in_Account,
	const gchar *in_Connection,	const gchar *in_Connection,

	const GPtrArray *in_Channels,	const gchar *in_Channel,
		GHashTable *in_Channel_Properties,
	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_channel callback,
	gpointer user_data,	gpointer user_data,
	GDestroyNotify destroy,	GDestroyNotify destroy,
	GObject *weak_object)	GObject *weak_object)
	{	{
	g_return_val_if_fail (TP_IS_CLIENT (proxy), NULL);	g_return_val_if_fail (TP_IS_CLIENT (proxy), NULL);

	return tp_cli_client_observer_call_observe_channels (proxy, timeout_ms,	return tp_cli_client_observer_call_observe_channel (proxy, timeout_ms,
	in_Account,	in_Account,
	in_Connection,	in_Connection,

	in_Channels,	in_Channel,
		in_Channel_Properties,
	in_Dispatch_Operation,	in_Dispatch_Operation,
	in_Requests_Satisfied,	in_Requests_Satisfied,
	in_Observer_Info,	in_Observer_Info,
	callback, user_data, destroy, weak_object);	callback, user_data, destroy, weak_object);
	}	}

	#define tp_cli_client_observer_call_observe_channels(...) _tp_cli_client_ob server_call_observe_channels (__VA_ARGS__)	#define tp_cli_client_observer_call_observe_channel(...) _tp_cli_client_obs erver_call_observe_channel (__VA_ARGS__)
	#endif /* __GTK_DOC_IGNORE__ */	#endif /* __GTK_DOC_IGNORE__ */

	void tp_cli_client_add_signals (TpProxy *self,	void tp_cli_client_add_signals (TpProxy *self,
	guint quark,	guint quark,
	DBusGProxy *proxy,	DBusGProxy *proxy,
	gpointer unused);	gpointer unused);

	G_END_DECLS	G_END_DECLS

	#endif /* defined (TP_GEN_TP_CLI_CLIENT_H_INCLUDED) */	#endif /* defined (TP_GEN_TP_CLI_CLIENT_H_INCLUDED) */

End of changes. 25 change blocks.
	25 lines changed or deleted	28 lines changed or added

	tp-cli-connection.h	tp-cli-connection.h

	skipping to change at line 1985	skipping to change at line 1985
	GObject *weak_object)	GObject *weak_object)
	{	{
	g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);	g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
	return tp_cli_connection_interface_renaming1_call_request_rename (proxy, timeout_ms,	return tp_cli_connection_interface_renaming1_call_request_rename (proxy, timeout_ms,
	in_Identifier,	in_Identifier,
	callback, user_data, destroy, weak_object);	callback, user_data, destroy, weak_object);
	}	}
	#define tp_cli_connection_interface_renaming1_call_request_rename(...) _tp_ cli_connection_interface_renaming1_call_request_rename (__VA_ARGS__)	#define tp_cli_connection_interface_renaming1_call_request_rename(...) _tp_ cli_connection_interface_renaming1_call_request_rename (__VA_ARGS__)
	#endif /* __GTK_DOC_IGNORE__ */	#endif /* __GTK_DOC_IGNORE__ */


	typedef void (*tp_cli_connection_interface_requests_signal_callback_new_cha	typedef void (*tp_cli_connection_interface_requests_signal_callback_new_cha
	nnels) (TpConnection *proxy,	nnel) (TpConnection *proxy,
	const GPtrArray *arg_Channels,	const gchar *arg_Channel,
		GHashTable *arg_Properties,
	gpointer user_data, GObject *weak_object);	gpointer user_data, GObject *weak_object);

	TpProxySignalConnection *tp_cli_connection_interface_requests_connect_to_ne	TpProxySignalConnection *tp_cli_connection_interface_requests_connect_to_ne
	w_channels (TpConnection *proxy,	w_channel (TpConnection *proxy,
	tp_cli_connection_interface_requests_signal_callback_new_channels callb	tp_cli_connection_interface_requests_signal_callback_new_channel callba
	ack,	ck,
	gpointer user_data,	gpointer user_data,
	GDestroyNotify destroy,	GDestroyNotify destroy,
	GObject *weak_object,	GObject *weak_object,
	GError **error);	GError **error);

	#ifndef __GTK_DOC_IGNORE__	#ifndef __GTK_DOC_IGNORE__
	static inline TpProxySignalConnection *	static inline TpProxySignalConnection *

	_tp_cli_connection_interface_requests_connect_to_new_channels (TpConnection	_tp_cli_connection_interface_requests_connect_to_new_channel (TpConnection
	*proxy,	*proxy,
	tp_cli_connection_interface_requests_signal_callback_new_channels callb	tp_cli_connection_interface_requests_signal_callback_new_channel callba
	ack,	ck,
	gpointer user_data,	gpointer user_data,
	GDestroyNotify destroy,	GDestroyNotify destroy,
	GObject *weak_object,	GObject *weak_object,
	GError **error)	GError **error)
	{	{
	g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);	g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);

	return tp_cli_connection_interface_requests_connect_to_new_channels (prox y, callback, user_data,	return tp_cli_connection_interface_requests_connect_to_new_channel (proxy , callback, user_data,
	destroy, weak_object, error);	destroy, weak_object, error);
	}	}

	#define tp_cli_connection_interface_requests_connect_to_new_channels(...) _ tp_cli_connection_interface_requests_connect_to_new_channels (__VA_ARGS__)	#define tp_cli_connection_interface_requests_connect_to_new_channel(...) _t p_cli_connection_interface_requests_connect_to_new_channel (__VA_ARGS__)
	#endif /* __GTK_DOC_IGNORE__ */	#endif /* __GTK_DOC_IGNORE__ */
	typedef void (tp_cli_connection_interface_requests_signal_callback_channel _closed) (TpConnection proxy,	typedef void (tp_cli_connection_interface_requests_signal_callback_channel _closed) (TpConnection proxy,
	const gchar *arg_Removed,	const gchar *arg_Removed,
	gpointer user_data, GObject *weak_object);	gpointer user_data, GObject *weak_object);
	TpProxySignalConnection tp_cli_connection_interface_requests_connect_to_ch annel_closed (TpConnection proxy,	TpProxySignalConnection tp_cli_connection_interface_requests_connect_to_ch annel_closed (TpConnection proxy,
	tp_cli_connection_interface_requests_signal_callback_channel_closed cal lback,	tp_cli_connection_interface_requests_signal_callback_channel_closed cal lback,
	gpointer user_data,	gpointer user_data,
	GDestroyNotify destroy,	GDestroyNotify destroy,
	GObject *weak_object,	GObject *weak_object,
	GError **error);	GError **error);

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

	tp-svc-channel-dispatch-operation.h	tp-svc-channel-dispatch-operation.h

	skipping to change at line 22	skipping to change at line 22
	(tp_svc_channel_dispatch_operation_get_type ())	(tp_svc_channel_dispatch_operation_get_type ())
	#define TP_SVC_CHANNEL_DISPATCH_OPERATION(obj) \	#define TP_SVC_CHANNEL_DISPATCH_OPERATION(obj) \
	(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CHANNEL_DISPATCH_OPERATION , TpSvcChannelDispatchOperation))	(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CHANNEL_DISPATCH_OPERATION , TpSvcChannelDispatchOperation))
	#define TP_IS_SVC_CHANNEL_DISPATCH_OPERATION(obj) \	#define TP_IS_SVC_CHANNEL_DISPATCH_OPERATION(obj) \
	(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CHANNEL_DISPATCH_OPERATION ))	(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CHANNEL_DISPATCH_OPERATION ))
	#define TP_SVC_CHANNEL_DISPATCH_OPERATION_GET_CLASS(obj) \	#define TP_SVC_CHANNEL_DISPATCH_OPERATION_GET_CLASS(obj) \
	(G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CHANNEL_DISPATCH_OPERAT ION, TpSvcChannelDispatchOperationClass))	(G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CHANNEL_DISPATCH_OPERAT ION, TpSvcChannelDispatchOperationClass))

	typedef void (tp_svc_channel_dispatch_operation_handle_with_impl) (TpSvcCh annelDispatchOperation self,	typedef void (tp_svc_channel_dispatch_operation_handle_with_impl) (TpSvcCh annelDispatchOperation self,
	const gchar *in_Handler,	const gchar *in_Handler,

		gint64 in_UserActionTime,
	DBusGMethodInvocation *context);	DBusGMethodInvocation *context);
	void tp_svc_channel_dispatch_operation_implement_handle_with (TpSvcChannelD ispatchOperationClass *klass, tp_svc_channel_dispatch_operation_handle_with _impl impl);	void tp_svc_channel_dispatch_operation_implement_handle_with (TpSvcChannelD ispatchOperationClass *klass, tp_svc_channel_dispatch_operation_handle_with _impl impl);
	static inline	static inline
	/* this comment is to stop gtkdoc realising this is static */	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_channel_dispatch_operation_return_from_handle_with (DBusGMethod Invocation *context);	void tp_svc_channel_dispatch_operation_return_from_handle_with (DBusGMethod Invocation *context);
	static inline void	static inline void
	tp_svc_channel_dispatch_operation_return_from_handle_with (DBusGMethodInvoc ation *context)	tp_svc_channel_dispatch_operation_return_from_handle_with (DBusGMethodInvoc ation *context)
	{	{
	dbus_g_method_return (context);	dbus_g_method_return (context);
	}	}

	skipping to change at line 45	skipping to change at line 46
	void tp_svc_channel_dispatch_operation_implement_claim (TpSvcChannelDispatc hOperationClass *klass, tp_svc_channel_dispatch_operation_claim_impl impl);	void tp_svc_channel_dispatch_operation_implement_claim (TpSvcChannelDispatc hOperationClass *klass, tp_svc_channel_dispatch_operation_claim_impl impl);
	static inline	static inline
	/* this comment is to stop gtkdoc realising this is static */	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_channel_dispatch_operation_return_from_claim (DBusGMethodInvoca tion *context);	void tp_svc_channel_dispatch_operation_return_from_claim (DBusGMethodInvoca tion *context);
	static inline void	static inline void
	tp_svc_channel_dispatch_operation_return_from_claim (DBusGMethodInvocation *context)	tp_svc_channel_dispatch_operation_return_from_claim (DBusGMethodInvocation *context)
	{	{
	dbus_g_method_return (context);	dbus_g_method_return (context);
	}	}


	typedef void (*tp_svc_channel_dispatch_operation_handle_with_time_impl) (Tp	void tp_svc_channel_dispatch_operation_emit_finished (gpointer instance,
	SvcChannelDispatchOperation *self,
	const gchar *in_Handler,
	gint64 in_UserActionTime,
	DBusGMethodInvocation *context);
	void tp_svc_channel_dispatch_operation_implement_handle_with_time (TpSvcCha
	nnelDispatchOperationClass *klass, tp_svc_channel_dispatch_operation_handle
	_with_time_impl impl);
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_channel_dispatch_operation_return_from_handle_with_time (DBusGM
	ethodInvocation *context);
	static inline void
	tp_svc_channel_dispatch_operation_return_from_handle_with_time (DBusGMethod
	Invocation *context)
	{
	dbus_g_method_return (context);
	}

	void tp_svc_channel_dispatch_operation_emit_channel_lost (gpointer instance
	,
	const gchar *arg_Channel,
	const gchar *arg_Error,	const gchar *arg_Error,
	const gchar *arg_Message);	const gchar *arg_Message);

	void tp_svc_channel_dispatch_operation_emit_finished (gpointer instance);

	G_END_DECLS	G_END_DECLS

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

	tp-svc-channel.h	tp-svc-channel.h

	skipping to change at line 180	skipping to change at line 180
	(G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CHANNEL_INTERFACE_CONFE RENCE1, TpSvcChannelInterfaceConference1Class))	(G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CHANNEL_INTERFACE_CONFE RENCE1, TpSvcChannelInterfaceConference1Class))

	void tp_svc_channel_interface_conference1_emit_channel_merged (gpointer ins tance,	void tp_svc_channel_interface_conference1_emit_channel_merged (gpointer ins tance,
	const gchar *arg_Channel,	const gchar *arg_Channel,
	guint arg_Channel_Specific_Handle,	guint arg_Channel_Specific_Handle,
	GHashTable *arg_Properties);	GHashTable *arg_Properties);
	void tp_svc_channel_interface_conference1_emit_channel_removed (gpointer in stance,	void tp_svc_channel_interface_conference1_emit_channel_removed (gpointer in stance,
	const gchar *arg_Channel,	const gchar *arg_Channel,
	GHashTable *arg_Details);	GHashTable *arg_Details);


	typedef struct _TpSvcChannelInterfaceDTMF1 TpSvcChannelInterfaceDTMF1;

	typedef struct _TpSvcChannelInterfaceDTMF1Class TpSvcChannelInterfaceDTMF1C
	lass;

	GType tp_svc_channel_interface_dtmf1_get_type (void);
	#define TP_TYPE_SVC_CHANNEL_INTERFACE_DTMF1 \
	(tp_svc_channel_interface_dtmf1_get_type ())
	#define TP_SVC_CHANNEL_INTERFACE_DTMF1(obj) \
	(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CHANNEL_INTERFACE_DTMF1, T
	pSvcChannelInterfaceDTMF1))
	#define TP_IS_SVC_CHANNEL_INTERFACE_DTMF1(obj) \
	(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CHANNEL_INTERFACE_DTMF1))
	#define TP_SVC_CHANNEL_INTERFACE_DTMF1_GET_CLASS(obj) \
	(G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CHANNEL_INTERFACE_DTMF1
	, TpSvcChannelInterfaceDTMF1Class))

	typedef void (*tp_svc_channel_interface_dtmf1_start_tone_impl) (TpSvcChanne
	lInterfaceDTMF1 *self,
	guint in_Stream_ID,
	guchar in_Event,
	DBusGMethodInvocation *context);
	void tp_svc_channel_interface_dtmf1_implement_start_tone (TpSvcChannelInter
	faceDTMF1Class *klass, tp_svc_channel_interface_dtmf1_start_tone_impl impl)
	;
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_channel_interface_dtmf1_return_from_start_tone (DBusGMethodInvo
	cation *context);
	static inline void
	tp_svc_channel_interface_dtmf1_return_from_start_tone (DBusGMethodInvocatio
	n *context)
	{
	dbus_g_method_return (context);
	}

	typedef void (*tp_svc_channel_interface_dtmf1_stop_tone_impl) (TpSvcChannel
	InterfaceDTMF1 *self,
	guint in_Stream_ID,
	DBusGMethodInvocation *context);
	void tp_svc_channel_interface_dtmf1_implement_stop_tone (TpSvcChannelInterf
	aceDTMF1Class *klass, tp_svc_channel_interface_dtmf1_stop_tone_impl impl);
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_channel_interface_dtmf1_return_from_stop_tone (DBusGMethodInvoc
	ation *context);
	static inline void
	tp_svc_channel_interface_dtmf1_return_from_stop_tone (DBusGMethodInvocation
	*context)
	{
	dbus_g_method_return (context);
	}

	typedef void (*tp_svc_channel_interface_dtmf1_multiple_tones_impl) (TpSvcCh
	annelInterfaceDTMF1 *self,
	const gchar *in_Tones,
	DBusGMethodInvocation *context);
	void tp_svc_channel_interface_dtmf1_implement_multiple_tones (TpSvcChannelI
	nterfaceDTMF1Class *klass, tp_svc_channel_interface_dtmf1_multiple_tones_im
	pl impl);
	static inline
	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_channel_interface_dtmf1_return_from_multiple_tones (DBusGMethod
	Invocation *context);
	static inline void
	tp_svc_channel_interface_dtmf1_return_from_multiple_tones (DBusGMethodInvoc
	ation *context)
	{
	dbus_g_method_return (context);
	}

	void tp_svc_channel_interface_dtmf1_emit_tones_deferred (gpointer instance,
	const gchar *arg_Tones);
	void tp_svc_channel_interface_dtmf1_emit_sending_tones (gpointer instance,
	const gchar *arg_Tones);
	void tp_svc_channel_interface_dtmf1_emit_stopped_tones (gpointer instance,
	gboolean arg_Cancelled);

	typedef struct _TpSvcChannelInterfaceDestroyable1 TpSvcChannelInterfaceDest royable1;	typedef struct _TpSvcChannelInterfaceDestroyable1 TpSvcChannelInterfaceDest royable1;

	typedef struct _TpSvcChannelInterfaceDestroyable1Class TpSvcChannelInterfac eDestroyable1Class;	typedef struct _TpSvcChannelInterfaceDestroyable1Class TpSvcChannelInterfac eDestroyable1Class;

	GType tp_svc_channel_interface_destroyable1_get_type (void);	GType tp_svc_channel_interface_destroyable1_get_type (void);
	#define TP_TYPE_SVC_CHANNEL_INTERFACE_DESTROYABLE1 \	#define TP_TYPE_SVC_CHANNEL_INTERFACE_DESTROYABLE1 \
	(tp_svc_channel_interface_destroyable1_get_type ())	(tp_svc_channel_interface_destroyable1_get_type ())
	#define TP_SVC_CHANNEL_INTERFACE_DESTROYABLE1(obj) \	#define TP_SVC_CHANNEL_INTERFACE_DESTROYABLE1(obj) \
	(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CHANNEL_INTERFACE_DESTROYA BLE1, TpSvcChannelInterfaceDestroyable1))	(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CHANNEL_INTERFACE_DESTROYA BLE1, TpSvcChannelInterfaceDestroyable1))
	#define TP_IS_SVC_CHANNEL_INTERFACE_DESTROYABLE1(obj) \	#define TP_IS_SVC_CHANNEL_INTERFACE_DESTROYABLE1(obj) \

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

	tp-svc-connection.h	tp-svc-connection.h

	skipping to change at line 1033	skipping to change at line 1033
	gboolean out_Yours,	gboolean out_Yours,
	const gchar *out_Channel,	const gchar *out_Channel,
	GHashTable *out_Properties)	GHashTable *out_Properties)
	{	{
	dbus_g_method_return (context,	dbus_g_method_return (context,
	out_Yours,	out_Yours,
	out_Channel,	out_Channel,
	out_Properties);	out_Properties);
	}	}


	void tp_svc_connection_interface_requests_emit_new_channels (gpointer insta	void tp_svc_connection_interface_requests_emit_new_channel (gpointer instan
	nce,	ce,
	const GPtrArray *arg_Channels);	const gchar *arg_Channel,
		GHashTable *arg_Properties);
	void tp_svc_connection_interface_requests_emit_channel_closed (gpointer ins tance,	void tp_svc_connection_interface_requests_emit_channel_closed (gpointer ins tance,
	const gchar *arg_Removed);	const gchar *arg_Removed);

	typedef struct _TpSvcConnectionInterfaceServicePoint1 TpSvcConnectionInterf aceServicePoint1;	typedef struct _TpSvcConnectionInterfaceServicePoint1 TpSvcConnectionInterf aceServicePoint1;

	typedef struct _TpSvcConnectionInterfaceServicePoint1Class TpSvcConnectionI nterfaceServicePoint1Class;	typedef struct _TpSvcConnectionInterfaceServicePoint1Class TpSvcConnectionI nterfaceServicePoint1Class;

	GType tp_svc_connection_interface_service_point1_get_type (void);	GType tp_svc_connection_interface_service_point1_get_type (void);
	#define TP_TYPE_SVC_CONNECTION_INTERFACE_SERVICE_POINT1 \	#define TP_TYPE_SVC_CONNECTION_INTERFACE_SERVICE_POINT1 \
	(tp_svc_connection_interface_service_point1_get_type ())	(tp_svc_connection_interface_service_point1_get_type ())

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

	version.h	version.h
	/* telepathy-glib/version.h. Generated from version.h.in by configure. */	/* telepathy-glib/version.h. Generated from version.h.in by configure. */

	#define TP_MAJOR_VERSION 0	#define TP_MAJOR_VERSION 0
	#define TP_MINOR_VERSION 99	#define TP_MINOR_VERSION 99

	#define TP_MICRO_VERSION 6	#define TP_MICRO_VERSION 7

End of changes. 1 change blocks.
	0 lines changed or deleted	0 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/

	telepathy-glib.h	telepathy-glib.h

	skipping to change at line 88	skipping to change at line 88
	#include <telepathy-glib/dbus-properties-mixin.h>	#include <telepathy-glib/dbus-properties-mixin.h>
	#include <telepathy-glib/dbus-tube-channel.h>	#include <telepathy-glib/dbus-tube-channel.h>
	#include <telepathy-glib/debug-client.h>	#include <telepathy-glib/debug-client.h>
	#include <telepathy-glib/debug-message.h>	#include <telepathy-glib/debug-message.h>
	#include <telepathy-glib/debug-sender.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/dtmf.h>
	#include <telepathy-glib/exportable-channel.h>	#include <telepathy-glib/exportable-channel.h>
	#include <telepathy-glib/file-transfer-channel.h>	#include <telepathy-glib/file-transfer-channel.h>
	#include <telepathy-glib/group-mixin.h>	#include <telepathy-glib/group-mixin.h>

	#include <telepathy-glib/handle-channels-context.h>	#include <telepathy-glib/handle-channel-context.h>
	#include <telepathy-glib/handle-repo.h>	#include <telepathy-glib/handle-repo.h>
	#include <telepathy-glib/handle-repo-dynamic.h>	#include <telepathy-glib/handle-repo-dynamic.h>
	#include <telepathy-glib/handle-repo-static.h>	#include <telepathy-glib/handle-repo-static.h>
	#include <telepathy-glib/handle.h>	#include <telepathy-glib/handle.h>
	#include <telepathy-glib/message.h>	#include <telepathy-glib/message.h>
	#include <telepathy-glib/message-mixin.h>	#include <telepathy-glib/message-mixin.h>

	#include <telepathy-glib/observe-channels-context.h>	#include <telepathy-glib/observe-channel-context.h>
	#include <telepathy-glib/presence-mixin.h>	#include <telepathy-glib/presence-mixin.h>
	#include <telepathy-glib/protocol.h>	#include <telepathy-glib/protocol.h>
	#include <telepathy-glib/proxy.h>	#include <telepathy-glib/proxy.h>
	#include <telepathy-glib/room-info.h>	#include <telepathy-glib/room-info.h>
	#include <telepathy-glib/room-list.h>	#include <telepathy-glib/room-list.h>
	#include <telepathy-glib/run.h>	#include <telepathy-glib/run.h>
	#include <telepathy-glib/signalled-message.h>	#include <telepathy-glib/signalled-message.h>
	#include <telepathy-glib/simple-approver.h>	#include <telepathy-glib/simple-approver.h>
	#include <telepathy-glib/client-factory.h>	#include <telepathy-glib/client-factory.h>
	#include <telepathy-glib/simple-handler.h>	#include <telepathy-glib/simple-handler.h>

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

	telepathy-interfaces.h	telepathy-interfaces.h

	skipping to change at line 130	skipping to change at line 130

	#define TP_PROP_CONNECTION_SELF_HANDLE \	#define TP_PROP_CONNECTION_SELF_HANDLE \
	"im.telepathy.v1.Connection.SelfHandle"	"im.telepathy.v1.Connection.SelfHandle"

	#define TP_PROP_CONNECTION_SELF_ID \	#define TP_PROP_CONNECTION_SELF_ID \
	"im.telepathy.v1.Connection.SelfID"	"im.telepathy.v1.Connection.SelfID"

	#define TP_PROP_CONNECTION_STATUS \	#define TP_PROP_CONNECTION_STATUS \
	"im.telepathy.v1.Connection.Status"	"im.telepathy.v1.Connection.Status"


		#define TP_PROP_CONNECTION_REQUESTABLE_CHANNEL_CLASSES \
		"im.telepathy.v1.Connection.RequestableChannelClasses"

	#define TP_TOKEN_CONNECTION_CONTACT_ID \	#define TP_TOKEN_CONNECTION_CONTACT_ID \
	"im.telepathy.v1.Connection/contact-id"	"im.telepathy.v1.Connection/contact-id"

	#define TP_IFACE_CONNECTION_INTERFACE_REQUESTS \	#define TP_IFACE_CONNECTION_INTERFACE_REQUESTS \
	"im.telepathy.v1.Connection.Interface.Requests"	"im.telepathy.v1.Connection.Interface.Requests"

	#define TP_IFACE_QUARK_CONNECTION_INTERFACE_REQUESTS \	#define TP_IFACE_QUARK_CONNECTION_INTERFACE_REQUESTS \
	(tp_iface_quark_connection_interface_requests ())	(tp_iface_quark_connection_interface_requests ())

	GQuark tp_iface_quark_connection_interface_requests (void);	GQuark tp_iface_quark_connection_interface_requests (void);

	#define TP_PROP_CONNECTION_INTERFACE_REQUESTS_CHANNELS \	#define TP_PROP_CONNECTION_INTERFACE_REQUESTS_CHANNELS \
	"im.telepathy.v1.Connection.Interface.Requests.Channels"	"im.telepathy.v1.Connection.Interface.Requests.Channels"


	#define TP_PROP_CONNECTION_INTERFACE_REQUESTS_REQUESTABLE_CHANNEL_CLASSES \
	"im.telepathy.v1.Connection.Interface.Requests.RequestableChannelClasses"

	#define TP_IFACE_CONNECTION_INTERFACE_ADDRESSING1 \	#define TP_IFACE_CONNECTION_INTERFACE_ADDRESSING1 \
	"im.telepathy.v1.Connection.Interface.Addressing1"	"im.telepathy.v1.Connection.Interface.Addressing1"

	#define TP_IFACE_QUARK_CONNECTION_INTERFACE_ADDRESSING1 \	#define TP_IFACE_QUARK_CONNECTION_INTERFACE_ADDRESSING1 \
	(tp_iface_quark_connection_interface_addressing1 ())	(tp_iface_quark_connection_interface_addressing1 ())

	GQuark tp_iface_quark_connection_interface_addressing1 (void);	GQuark tp_iface_quark_connection_interface_addressing1 (void);

	#define TP_TOKEN_CONNECTION_INTERFACE_ADDRESSING1_ADDRESSES \	#define TP_TOKEN_CONNECTION_INTERFACE_ADDRESSING1_ADDRESSES \
	"im.telepathy.v1.Connection.Interface.Addressing1/addresses"	"im.telepathy.v1.Connection.Interface.Addressing1/addresses"

	skipping to change at line 580	skipping to change at line 580

	#define TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_AUDIO_NAME \	#define TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_AUDIO_NAME \
	"im.telepathy.v1.Channel.Type.Call1.InitialAudioName"	"im.telepathy.v1.Channel.Type.Call1.InitialAudioName"

	#define TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_VIDEO_NAME \	#define TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_VIDEO_NAME \
	"im.telepathy.v1.Channel.Type.Call1.InitialVideoName"	"im.telepathy.v1.Channel.Type.Call1.InitialVideoName"

	#define TP_PROP_CHANNEL_TYPE_CALL1_MUTABLE_CONTENTS \	#define TP_PROP_CHANNEL_TYPE_CALL1_MUTABLE_CONTENTS \
	"im.telepathy.v1.Channel.Type.Call1.MutableContents"	"im.telepathy.v1.Channel.Type.Call1.MutableContents"


		#define TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_TONES \
		"im.telepathy.v1.Channel.Type.Call1.InitialTones"

	#define TP_TOKEN_CHANNEL_TYPE_CALL1_AUDIO \	#define TP_TOKEN_CHANNEL_TYPE_CALL1_AUDIO \
	"im.telepathy.v1.Channel.Type.Call1/audio"	"im.telepathy.v1.Channel.Type.Call1/audio"

	#define TP_TOKEN_CHANNEL_TYPE_CALL1_VIDEO \	#define TP_TOKEN_CHANNEL_TYPE_CALL1_VIDEO \
	"im.telepathy.v1.Channel.Type.Call1/video"	"im.telepathy.v1.Channel.Type.Call1/video"

	#define TP_TOKEN_CHANNEL_TYPE_CALL1_GTALK_P2P \	#define TP_TOKEN_CHANNEL_TYPE_CALL1_GTALK_P2P \
	"im.telepathy.v1.Channel.Type.Call1/gtalk-p2p"	"im.telepathy.v1.Channel.Type.Call1/gtalk-p2p"

	#define TP_TOKEN_CHANNEL_TYPE_CALL1_ICE \	#define TP_TOKEN_CHANNEL_TYPE_CALL1_ICE \

	skipping to change at line 817	skipping to change at line 820
	"im.telepathy.v1.Channel.Interface.Conference1.OriginalChannels"	"im.telepathy.v1.Channel.Interface.Conference1.OriginalChannels"

	#define TP_IFACE_CHANNEL_INTERFACE_DESTROYABLE1 \	#define TP_IFACE_CHANNEL_INTERFACE_DESTROYABLE1 \
	"im.telepathy.v1.Channel.Interface.Destroyable1"	"im.telepathy.v1.Channel.Interface.Destroyable1"

	#define TP_IFACE_QUARK_CHANNEL_INTERFACE_DESTROYABLE1 \	#define TP_IFACE_QUARK_CHANNEL_INTERFACE_DESTROYABLE1 \
	(tp_iface_quark_channel_interface_destroyable1 ())	(tp_iface_quark_channel_interface_destroyable1 ())

	GQuark tp_iface_quark_channel_interface_destroyable1 (void);	GQuark tp_iface_quark_channel_interface_destroyable1 (void);


	#define TP_IFACE_CHANNEL_INTERFACE_DTMF1 \
	"im.telepathy.v1.Channel.Interface.DTMF1"

	#define TP_IFACE_QUARK_CHANNEL_INTERFACE_DTMF1 \
	(tp_iface_quark_channel_interface_dtmf1 ())

	GQuark tp_iface_quark_channel_interface_dtmf1 (void);

	#define TP_PROP_CHANNEL_INTERFACE_DTMF1_CURRENTLY_SENDING_TONES \
	"im.telepathy.v1.Channel.Interface.DTMF1.CurrentlySendingTones"

	#define TP_PROP_CHANNEL_INTERFACE_DTMF1_INITIAL_TONES \
	"im.telepathy.v1.Channel.Interface.DTMF1.InitialTones"

	#define TP_PROP_CHANNEL_INTERFACE_DTMF1_DEFERRED_TONES \
	"im.telepathy.v1.Channel.Interface.DTMF1.DeferredTones"

	#define TP_IFACE_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA1 \	#define TP_IFACE_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA1 \
	"im.telepathy.v1.Channel.Interface.FileTransfer.Metadata1"	"im.telepathy.v1.Channel.Interface.FileTransfer.Metadata1"

	#define TP_IFACE_QUARK_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA1 \	#define TP_IFACE_QUARK_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA1 \
	(tp_iface_quark_channel_interface_file_transfer_metadata1 ())	(tp_iface_quark_channel_interface_file_transfer_metadata1 ())

	GQuark tp_iface_quark_channel_interface_file_transfer_metadata1 (void);	GQuark tp_iface_quark_channel_interface_file_transfer_metadata1 (void);

	#define TP_PROP_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA1_SERVICE_NAME \	#define TP_PROP_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA1_SERVICE_NAME \
	"im.telepathy.v1.Channel.Interface.FileTransfer.Metadata1.ServiceName"	"im.telepathy.v1.Channel.Interface.FileTransfer.Metadata1.ServiceName"

	skipping to change at line 1295	skipping to change at line 1281

	#define TP_PROP_CHANNEL_DISPATCH_OPERATION_INTERFACES \	#define TP_PROP_CHANNEL_DISPATCH_OPERATION_INTERFACES \
	"im.telepathy.v1.ChannelDispatchOperation.Interfaces"	"im.telepathy.v1.ChannelDispatchOperation.Interfaces"

	#define TP_PROP_CHANNEL_DISPATCH_OPERATION_CONNECTION \	#define TP_PROP_CHANNEL_DISPATCH_OPERATION_CONNECTION \
	"im.telepathy.v1.ChannelDispatchOperation.Connection"	"im.telepathy.v1.ChannelDispatchOperation.Connection"

	#define TP_PROP_CHANNEL_DISPATCH_OPERATION_ACCOUNT \	#define TP_PROP_CHANNEL_DISPATCH_OPERATION_ACCOUNT \
	"im.telepathy.v1.ChannelDispatchOperation.Account"	"im.telepathy.v1.ChannelDispatchOperation.Account"


	#define TP_PROP_CHANNEL_DISPATCH_OPERATION_CHANNELS \	#define TP_PROP_CHANNEL_DISPATCH_OPERATION_CHANNEL \
	"im.telepathy.v1.ChannelDispatchOperation.Channels"	"im.telepathy.v1.ChannelDispatchOperation.Channel"

		#define TP_PROP_CHANNEL_DISPATCH_OPERATION_CHANNEL_PROPERTIES \
		"im.telepathy.v1.ChannelDispatchOperation.ChannelProperties"

	#define TP_PROP_CHANNEL_DISPATCH_OPERATION_POSSIBLE_HANDLERS \	#define TP_PROP_CHANNEL_DISPATCH_OPERATION_POSSIBLE_HANDLERS \
	"im.telepathy.v1.ChannelDispatchOperation.PossibleHandlers"	"im.telepathy.v1.ChannelDispatchOperation.PossibleHandlers"

	#define TP_IFACE_CHANNEL_REQUEST \	#define TP_IFACE_CHANNEL_REQUEST \
	"im.telepathy.v1.ChannelRequest"	"im.telepathy.v1.ChannelRequest"

	#define TP_IFACE_QUARK_CHANNEL_REQUEST \	#define TP_IFACE_QUARK_CHANNEL_REQUEST \
	(tp_iface_quark_channel_request ())	(tp_iface_quark_channel_request ())


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

	tp-svc-client.h	tp-svc-client.h

	skipping to change at line 35	skipping to change at line 35
	#define TP_TYPE_SVC_CLIENT_APPROVER \	#define TP_TYPE_SVC_CLIENT_APPROVER \
	(tp_svc_client_approver_get_type ())	(tp_svc_client_approver_get_type ())
	#define TP_SVC_CLIENT_APPROVER(obj) \	#define TP_SVC_CLIENT_APPROVER(obj) \
	(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CLIENT_APPROVER, TpSvcClie ntApprover))	(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CLIENT_APPROVER, TpSvcClie ntApprover))
	#define TP_IS_SVC_CLIENT_APPROVER(obj) \	#define TP_IS_SVC_CLIENT_APPROVER(obj) \
	(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CLIENT_APPROVER))	(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CLIENT_APPROVER))
	#define TP_SVC_CLIENT_APPROVER_GET_CLASS(obj) \	#define TP_SVC_CLIENT_APPROVER_GET_CLASS(obj) \
	(G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CLIENT_APPROVER, TpSvcC lientApproverClass))	(G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CLIENT_APPROVER, TpSvcC lientApproverClass))

	typedef void (tp_svc_client_approver_add_dispatch_operation_impl) (TpSvcCl ientApprover self,	typedef void (tp_svc_client_approver_add_dispatch_operation_impl) (TpSvcCl ientApprover self,

	const GPtrArray *in_Channels,
	const gchar *in_DispatchOperation,	const gchar *in_DispatchOperation,
	GHashTable *in_Properties,	GHashTable *in_Properties,
	DBusGMethodInvocation *context);	DBusGMethodInvocation *context);
	void tp_svc_client_approver_implement_add_dispatch_operation (TpSvcClientAp proverClass *klass, tp_svc_client_approver_add_dispatch_operation_impl impl );	void tp_svc_client_approver_implement_add_dispatch_operation (TpSvcClientAp proverClass *klass, tp_svc_client_approver_add_dispatch_operation_impl impl );
	static inline	static inline
	/* this comment is to stop gtkdoc realising this is static */	/* this comment is to stop gtkdoc realising this is static */
	void tp_svc_client_approver_return_from_add_dispatch_operation (DBusGMethod Invocation *context);	void tp_svc_client_approver_return_from_add_dispatch_operation (DBusGMethod Invocation *context);
	static inline void	static inline void
	tp_svc_client_approver_return_from_add_dispatch_operation (DBusGMethodInvoc ation *context)	tp_svc_client_approver_return_from_add_dispatch_operation (DBusGMethodInvoc ation *context)
	{	{

	skipping to change at line 63	skipping to change at line 62
	GType tp_svc_client_handler_get_type (void);	GType tp_svc_client_handler_get_type (void);
	#define TP_TYPE_SVC_CLIENT_HANDLER \	#define TP_TYPE_SVC_CLIENT_HANDLER \
	(tp_svc_client_handler_get_type ())	(tp_svc_client_handler_get_type ())
	#define TP_SVC_CLIENT_HANDLER(obj) \	#define TP_SVC_CLIENT_HANDLER(obj) \
	(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CLIENT_HANDLER, TpSvcClien tHandler))	(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CLIENT_HANDLER, TpSvcClien tHandler))
	#define TP_IS_SVC_CLIENT_HANDLER(obj) \	#define TP_IS_SVC_CLIENT_HANDLER(obj) \
	(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CLIENT_HANDLER))	(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CLIENT_HANDLER))
	#define TP_SVC_CLIENT_HANDLER_GET_CLASS(obj) \	#define TP_SVC_CLIENT_HANDLER_GET_CLASS(obj) \
	(G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CLIENT_HANDLER, TpSvcCl ientHandlerClass))	(G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CLIENT_HANDLER, TpSvcCl ientHandlerClass))


	typedef void (tp_svc_client_handler_handle_channels_impl) (TpSvcClientHand ler self,	typedef void (tp_svc_client_handler_handle_channel_impl) (TpSvcClientHandl er self,
	const gchar *in_Account,	const gchar *in_Account,
	const gchar *in_Connection,	const gchar *in_Connection,

	const GPtrArray *in_Channels,	const gchar *in_Channel,
		GHashTable *in_Channel_Properties,
	const GPtrArray *in_Requests_Satisfied,	const GPtrArray *in_Requests_Satisfied,

	guint64 in_User_Action_Time,	gint64 in_User_Action_Time,
	GHashTable *in_Handler_Info,	GHashTable *in_Handler_Info,
	DBusGMethodInvocation *context);	DBusGMethodInvocation *context);

	void tp_svc_client_handler_implement_handle_channels (TpSvcClientHandlerCla ss *klass, tp_svc_client_handler_handle_channels_impl impl);	void tp_svc_client_handler_implement_handle_channel (TpSvcClientHandlerClas s *klass, tp_svc_client_handler_handle_channel_impl impl);
	static inline	static inline
	/* this comment is to stop gtkdoc realising this is static */	/* this comment is to stop gtkdoc realising this is static */

	void tp_svc_client_handler_return_from_handle_channels (DBusGMethodInvocati on *context);	void tp_svc_client_handler_return_from_handle_channel (DBusGMethodInvocatio n *context);
	static inline void	static inline void

	tp_svc_client_handler_return_from_handle_channels (DBusGMethodInvocation *c ontext)	tp_svc_client_handler_return_from_handle_channel (DBusGMethodInvocation *co ntext)
	{	{
	dbus_g_method_return (context);	dbus_g_method_return (context);
	}	}

	typedef struct _TpSvcClientInterfaceRequests TpSvcClientInterfaceRequests;	typedef struct _TpSvcClientInterfaceRequests TpSvcClientInterfaceRequests;

	typedef struct _TpSvcClientInterfaceRequestsClass TpSvcClientInterfaceReque stsClass;	typedef struct _TpSvcClientInterfaceRequestsClass TpSvcClientInterfaceReque stsClass;

	GType tp_svc_client_interface_requests_get_type (void);	GType tp_svc_client_interface_requests_get_type (void);
	#define TP_TYPE_SVC_CLIENT_INTERFACE_REQUESTS \	#define TP_TYPE_SVC_CLIENT_INTERFACE_REQUESTS \

	skipping to change at line 138	skipping to change at line 138
	GType tp_svc_client_observer_get_type (void);	GType tp_svc_client_observer_get_type (void);
	#define TP_TYPE_SVC_CLIENT_OBSERVER \	#define TP_TYPE_SVC_CLIENT_OBSERVER \
	(tp_svc_client_observer_get_type ())	(tp_svc_client_observer_get_type ())
	#define TP_SVC_CLIENT_OBSERVER(obj) \	#define TP_SVC_CLIENT_OBSERVER(obj) \
	(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CLIENT_OBSERVER, TpSvcClie ntObserver))	(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CLIENT_OBSERVER, TpSvcClie ntObserver))
	#define TP_IS_SVC_CLIENT_OBSERVER(obj) \	#define TP_IS_SVC_CLIENT_OBSERVER(obj) \
	(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CLIENT_OBSERVER))	(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CLIENT_OBSERVER))
	#define TP_SVC_CLIENT_OBSERVER_GET_CLASS(obj) \	#define TP_SVC_CLIENT_OBSERVER_GET_CLASS(obj) \
	(G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CLIENT_OBSERVER, TpSvcC lientObserverClass))	(G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CLIENT_OBSERVER, TpSvcC lientObserverClass))


	typedef void (tp_svc_client_observer_observe_channels_impl) (TpSvcClientOb server self,	typedef void (tp_svc_client_observer_observe_channel_impl) (TpSvcClientObs erver self,
	const gchar *in_Account,	const gchar *in_Account,
	const gchar *in_Connection,	const gchar *in_Connection,

	const GPtrArray *in_Channels,	const gchar *in_Channel,
		GHashTable *in_Channel_Properties,
	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,
	DBusGMethodInvocation *context);	DBusGMethodInvocation *context);

	void tp_svc_client_observer_implement_observe_channels (TpSvcClientObserver Class *klass, tp_svc_client_observer_observe_channels_impl impl);	void tp_svc_client_observer_implement_observe_channel (TpSvcClientObserverC lass *klass, tp_svc_client_observer_observe_channel_impl impl);
	static inline	static inline
	/* this comment is to stop gtkdoc realising this is static */	/* this comment is to stop gtkdoc realising this is static */

	void tp_svc_client_observer_return_from_observe_channels (DBusGMethodInvoca tion *context);	void tp_svc_client_observer_return_from_observe_channel (DBusGMethodInvocat ion *context);
	static inline void	static inline void

	tp_svc_client_observer_return_from_observe_channels (DBusGMethodInvocation *context)	tp_svc_client_observer_return_from_observe_channel (DBusGMethodInvocation * context)
	{	{
	dbus_g_method_return (context);	dbus_g_method_return (context);
	}	}

	G_END_DECLS	G_END_DECLS

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