libtelepathy-glib: headers diff between 0.11.10 and 0.11.11 versions

	base-client.h	base-client.h

	skipping to change at line 139	skipping to change at line 139
	const gchar *first_token, ...) G_GNUC_NULL_TERMINATED;	const gchar *first_token, ...) G_GNUC_NULL_TERMINATED;

	/* future, potentially (currently in spec as a draft):	/* future, potentially (currently in spec as a draft):
	void tp_base_client_set_handler_related_conferences_bypass_approval (	void tp_base_client_set_handler_related_conferences_bypass_approval (
	TpBaseClient *self, gboolean bypass_approval);	TpBaseClient *self, gboolean bypass_approval);
	*/	*/

	gboolean tp_base_client_register (TpBaseClient *self,	gboolean tp_base_client_register (TpBaseClient *self,
	GError **error);	GError **error);


	const gchar tp_base_client_get_bus_name (TpBaseClient self);

	const gchar tp_base_client_get_object_path (TpBaseClient self);

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

	GList tp_base_client_get_pending_requests (TpBaseClient self);	GList tp_base_client_get_pending_requests (TpBaseClient self);
	GList tp_base_client_get_handled_channels (TpBaseClient self);	GList tp_base_client_get_handled_channels (TpBaseClient self);


		const gchar tp_base_client_get_name (TpBaseClient self);
		gboolean tp_base_client_get_uniquify_name (TpBaseClient *self);
		const gchar tp_base_client_get_bus_name (TpBaseClient self);
		const gchar tp_base_client_get_object_path (TpBaseClient self);
		TpDBusDaemon tp_base_client_get_dbus_daemon (TpBaseClient self);

	void tp_base_client_unregister (TpBaseClient *self);	void tp_base_client_unregister (TpBaseClient *self);

	#define TP_TYPE_BASE_CLIENT \	#define TP_TYPE_BASE_CLIENT \
	(tp_base_client_get_type ())	(tp_base_client_get_type ())
	#define TP_BASE_CLIENT(obj) \	#define TP_BASE_CLIENT(obj) \
	(G_TYPE_CHECK_INSTANCE_CAST ((obj), TP_TYPE_BASE_CLIENT, \	(G_TYPE_CHECK_INSTANCE_CAST ((obj), TP_TYPE_BASE_CLIENT, \
	TpBaseClient))	TpBaseClient))
	#define TP_BASE_CLIENT_CLASS(klass) \	#define TP_BASE_CLIENT_CLASS(klass) \
	(G_TYPE_CHECK_CLASS_CAST ((klass), TP_TYPE_BASE_CLIENT, \	(G_TYPE_CHECK_CLASS_CAST ((klass), TP_TYPE_BASE_CLIENT, \
	TpBaseClientClass))	TpBaseClientClass))

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

	base-connection-manager.h	base-connection-manager.h

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

	#ifndef __TP_BASE_CONNECTION_MANAGER_H__	#ifndef __TP_BASE_CONNECTION_MANAGER_H__
	#define __TP_BASE_CONNECTION_MANAGER_H__	#define __TP_BASE_CONNECTION_MANAGER_H__

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

	#include <telepathy-glib/base-connection.h>	#include <telepathy-glib/base-connection.h>

		#include <telepathy-glib/base-protocol.h>
	#include <telepathy-glib/defs.h>	#include <telepathy-glib/defs.h>
	#include <telepathy-glib/proxy.h>	#include <telepathy-glib/proxy.h>
	#include <telepathy-glib/svc-connection-manager.h>	#include <telepathy-glib/svc-connection-manager.h>

	G_BEGIN_DECLS	G_BEGIN_DECLS


	typedef struct _TpCMParamSpec TpCMParamSpec;

	typedef gboolean (TpCMParamFilter) (const TpCMParamSpec paramspec,
	GValue value, GError *error);

	gboolean tp_cm_param_filter_string_nonempty (const TpCMParamSpec *paramspec
	,
	GValue value, GError *error);

	gboolean tp_cm_param_filter_uint_nonzero (const TpCMParamSpec *paramspec,
	GValue value, GError *error);

	/* XXX: This should be driven by GTypes, but the GType is insufficiently
	* descriptive: if it's UINT we can't tell whether the D-Bus type is
	* UInt32, UInt16 or possibly even Byte. So we have the D-Bus type too.
	*
	* As it stands at the moment it could be driven by the D-Bus type, but
	* in future we may want to have more than one possible GType for a D-Bus
	* type, e.g. converting arrays of string into either a strv or a GPtrArray
	.
	* So, we keep the redundancy for future expansion.
	*/

	struct _TpCMParamSpec {
	const gchar *name;
	const gchar *dtype;
	GType gtype;
	guint flags;
	gconstpointer def;
	gsize offset;

	TpCMParamFilter filter;
	gconstpointer filter_data;

	gconstpointer setter_data;

	/<private>/
	gpointer _future1;
	};

	typedef void (TpCMParamSetter) (const TpCMParamSpec paramspec,
	const GValue *value, gpointer params);

	void tp_cm_param_setter_offset (const TpCMParamSpec *paramspec,	void tp_cm_param_setter_offset (const TpCMParamSpec *paramspec,
	const GValue *value, gpointer params);	const GValue *value, gpointer params);

	typedef struct {	typedef struct {
	const gchar *name;	const gchar *name;
	const TpCMParamSpec *parameters;	const TpCMParamSpec *parameters;
	gpointer (*params_new) (void);	gpointer (*params_new) (void);
	void (*params_free) (gpointer);	void (*params_free) (gpointer);
	TpCMParamSetter set_param;	TpCMParamSetter set_param;


	skipping to change at line 109	skipping to change at line 69
	TpBaseConnectionManager self, const gchar proto,	TpBaseConnectionManager self, const gchar proto,
	TpIntSet params_present, void parsed_params, GError **error);	TpIntSet params_present, void parsed_params, GError **error);

	struct _TpBaseConnectionManagerClass {	struct _TpBaseConnectionManagerClass {
	GObjectClass parent_class;	GObjectClass parent_class;

	const char *cm_dbus_name;	const char *cm_dbus_name;
	const TpCMProtocolSpec *protocol_params;	const TpCMProtocolSpec *protocol_params;
	TpBaseConnectionManagerNewConnFunc new_connection;	TpBaseConnectionManagerNewConnFunc new_connection;


		const gchar * const *interfaces;

	/<private>/	/<private>/

	gpointer _future1;
	gpointer _future2;	gpointer _future2;
	gpointer _future3;	gpointer _future3;
	gpointer _future4;	gpointer _future4;

	TpBaseConnectionManagerClassPrivate *priv;	TpBaseConnectionManagerClassPrivate *priv;
	};	};

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

	skipping to change at line 132	skipping to change at line 93
	TpBaseConnectionManagerPrivate *priv;	TpBaseConnectionManagerPrivate *priv;
	};	};

	GType tp_base_connection_manager_get_type (void);	GType tp_base_connection_manager_get_type (void);

	gboolean tp_base_connection_manager_register (TpBaseConnectionManager *self );	gboolean tp_base_connection_manager_register (TpBaseConnectionManager *self );

	TpDBusDaemon *tp_base_connection_manager_get_dbus_daemon (	TpDBusDaemon *tp_base_connection_manager_get_dbus_daemon (
	TpBaseConnectionManager *self);	TpBaseConnectionManager *self);


		void tp_base_connection_manager_add_protocol (TpBaseConnectionManager *self
		,
		TpBaseProtocol *protocol);

	/* TYPE MACROS */	/* TYPE MACROS */
	#define TP_TYPE_BASE_CONNECTION_MANAGER \	#define TP_TYPE_BASE_CONNECTION_MANAGER \
	(tp_base_connection_manager_get_type ())	(tp_base_connection_manager_get_type ())
	#define TP_BASE_CONNECTION_MANAGER(obj) \	#define TP_BASE_CONNECTION_MANAGER(obj) \
	(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_BASE_CONNECTION_MANAGER, \	(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_BASE_CONNECTION_MANAGER, \
	TpBaseConnectionManager))	TpBaseConnectionManager))
	#define TP_BASE_CONNECTION_MANAGER_CLASS(klass) \	#define TP_BASE_CONNECTION_MANAGER_CLASS(klass) \
	(G_TYPE_CHECK_CLASS_CAST((klass), TP_TYPE_BASE_CONNECTION_MANAGER, \	(G_TYPE_CHECK_CLASS_CAST((klass), TP_TYPE_BASE_CONNECTION_MANAGER, \
	TpBaseConnectionManagerClass))	TpBaseConnectionManagerClass))
	#define TP_IS_BASE_CONNECTION_MANAGER(obj) \	#define TP_IS_BASE_CONNECTION_MANAGER(obj) \

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

	base-connection.h	base-connection.h

	skipping to change at line 61	skipping to change at line 61

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

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

	struct _TpBaseConnectionClass {	struct _TpBaseConnectionClass {
	GObjectClass parent_class;	GObjectClass parent_class;


		#ifdef __GI_SCANNER__
		/<private>/
		GCallback _internal_create_handle_repos;
		/<public>/
		#else
	TpBaseConnectionCreateHandleReposImpl create_handle_repos;	TpBaseConnectionCreateHandleReposImpl create_handle_repos;

		#endif

	TpBaseConnectionCreateChannelFactoriesImpl create_channel_factories;	TpBaseConnectionCreateChannelFactoriesImpl create_channel_factories;

	TpBaseConnectionGetUniqueConnectionNameImpl get_unique_connection_name;	TpBaseConnectionGetUniqueConnectionNameImpl get_unique_connection_name;

	TpBaseConnectionProc connecting;	TpBaseConnectionProc connecting;
	TpBaseConnectionProc connected;	TpBaseConnectionProc connected;
	TpBaseConnectionProc disconnected;	TpBaseConnectionProc disconnected;

	TpBaseConnectionProc shut_down;	TpBaseConnectionProc shut_down;

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

	channel-manager.h	channel-manager.h

	skipping to change at line 72	skipping to change at line 72
	gpointer user_data);	gpointer user_data);

	typedef void (*TpChannelManagerForeachChannelClassFunc) (	typedef void (*TpChannelManagerForeachChannelClassFunc) (
	TpChannelManager *manager, TpChannelManagerChannelClassFunc func,	TpChannelManager *manager, TpChannelManagerChannelClassFunc func,
	gpointer user_data);	gpointer user_data);

	void tp_channel_manager_foreach_channel_class (	void tp_channel_manager_foreach_channel_class (
	TpChannelManager *manager,	TpChannelManager *manager,
	TpChannelManagerChannelClassFunc func, gpointer user_data);	TpChannelManagerChannelClassFunc func, gpointer user_data);


		typedef void (*TpChannelManagerTypeChannelClassFunc) (GType type,
		GHashTable *fixed_properties,
		const gchar * const *allowed_properties,
		gpointer user_data);

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

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

	typedef gboolean (*TpChannelManagerRequestFunc) (	typedef gboolean (*TpChannelManagerRequestFunc) (
	TpChannelManager *manager, gpointer request_token,	TpChannelManager *manager, gpointer request_token,
	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);	gpointer request_token, GHashTable *request_properties);

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


	skipping to change at line 96	skipping to change at line 108
	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 request_channel;
	TpChannelManagerRequestFunc ensure_channel;	TpChannelManagerRequestFunc ensure_channel;


		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[8];	GCallback _future[7];
	};	};

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

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

	void tp_channel_manager_emit_new_channel (gpointer instance,	void tp_channel_manager_emit_new_channel (gpointer instance,
	TpExportableChannel channel, GSList request_tokens);	TpExportableChannel channel, GSList request_tokens);
	void tp_channel_manager_emit_new_channels (gpointer instance,	void tp_channel_manager_emit_new_channels (gpointer instance,
	GHashTable *channels);	GHashTable *channels);

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

	connection-manager.h	connection-manager.h

	skipping to change at line 27	skipping to change at line 27
	* You should have received a copy of the GNU Lesser General Public	* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/	*/

	#ifndef __TP_CONNECTION_MANAGER_H__	#ifndef __TP_CONNECTION_MANAGER_H__
	#define __TP_CONNECTION_MANAGER_H__	#define __TP_CONNECTION_MANAGER_H__

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

		#include <telepathy-glib/protocol.h>
	#include <telepathy-glib/proxy.h>	#include <telepathy-glib/proxy.h>

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

	G_BEGIN_DECLS	G_BEGIN_DECLS

	typedef struct _TpConnectionManager TpConnectionManager;	typedef struct _TpConnectionManager TpConnectionManager;
	typedef struct _TpConnectionManagerClass TpConnectionManagerClass;	typedef struct _TpConnectionManagerClass TpConnectionManagerClass;
	typedef struct _TpConnectionManagerPrivate TpConnectionManagerPrivate;	typedef struct _TpConnectionManagerPrivate TpConnectionManagerPrivate;


	skipping to change at line 63	skipping to change at line 64
	(G_TYPE_CHECK_CLASS_TYPE((klass), TP_TYPE_CONNECTION_MANAGER))	(G_TYPE_CHECK_CLASS_TYPE((klass), TP_TYPE_CONNECTION_MANAGER))
	#define TP_CONNECTION_MANAGER_GET_CLASS(obj) \	#define TP_CONNECTION_MANAGER_GET_CLASS(obj) \
	(G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_CONNECTION_MANAGER, \	(G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_CONNECTION_MANAGER, \
	TpConnectionManagerClass))	TpConnectionManagerClass))

	#define TP_TYPE_CONNECTION_MANAGER_PARAM \	#define TP_TYPE_CONNECTION_MANAGER_PARAM \
	(tp_connection_manager_param_get_type ())	(tp_connection_manager_param_get_type ())
	#define TP_TYPE_CONNECTION_MANAGER_PROTOCOL \	#define TP_TYPE_CONNECTION_MANAGER_PROTOCOL \
	(tp_connection_manager_protocol_get_type ())	(tp_connection_manager_protocol_get_type ())


	typedef struct _TpConnectionManagerParam TpConnectionManagerParam;
	struct _TpConnectionManagerParam
	{
	/<public>/
	gchar *name;
	gchar *dbus_signature;
	GValue default_value;
	guint flags;

	gpointer priv;
	};

	typedef struct _TpConnectionManagerProtocol TpConnectionManagerProtocol;	typedef struct _TpConnectionManagerProtocol TpConnectionManagerProtocol;
	struct _TpConnectionManagerProtocol	struct _TpConnectionManagerProtocol
	{	{
	/<public>/	/<public>/
	gchar *name;	gchar *name;
	TpConnectionManagerParam *params;	TpConnectionManagerParam *params;

	/<private>/	/<private>/
	gpointer priv;	gpointer priv;
	};	};

	skipping to change at line 156	skipping to change at line 145

	gboolean tp_connection_manager_check_valid_protocol_name (const gchar *name ,	gboolean tp_connection_manager_check_valid_protocol_name (const gchar *name ,
	GError **error);	GError **error);

	gchar *tp_connection_manager_dup_protocol_names (TpConnectionManager self )	gchar *tp_connection_manager_dup_protocol_names (TpConnectionManager self )
	G_GNUC_WARN_UNUSED_RESULT;	G_GNUC_WARN_UNUSED_RESULT;
	gboolean tp_connection_manager_has_protocol (TpConnectionManager *self,	gboolean tp_connection_manager_has_protocol (TpConnectionManager *self,
	const gchar *protocol);	const gchar *protocol);
	const TpConnectionManagerProtocol *tp_connection_manager_get_protocol (	const TpConnectionManagerProtocol *tp_connection_manager_get_protocol (
	TpConnectionManager self, const gchar protocol);	TpConnectionManager self, const gchar protocol);

		TpProtocol *tp_connection_manager_get_protocol_object (
		TpConnectionManager self, const gchar protocol);

	gchar **tp_connection_manager_protocol_dup_param_names (	gchar **tp_connection_manager_protocol_dup_param_names (
	const TpConnectionManagerProtocol *protocol)	const TpConnectionManagerProtocol *protocol)
	G_GNUC_WARN_UNUSED_RESULT;	G_GNUC_WARN_UNUSED_RESULT;
	gboolean tp_connection_manager_protocol_has_param (	gboolean tp_connection_manager_protocol_has_param (
	const TpConnectionManagerProtocol *protocol,	const TpConnectionManagerProtocol *protocol,
	const gchar *param);	const gchar *param);
	const TpConnectionManagerParam *tp_connection_manager_protocol_get_param (	const TpConnectionManagerParam *tp_connection_manager_protocol_get_param (
	const TpConnectionManagerProtocol protocol, const gchar param);	const TpConnectionManagerProtocol protocol, const gchar param);
	gboolean tp_connection_manager_protocol_can_register (	gboolean tp_connection_manager_protocol_can_register (

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

	connection.h	connection.h

	skipping to change at line 33	skipping to change at line 33
	#define __TP_CONNECTION_H__	#define __TP_CONNECTION_H__

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

	G_BEGIN_DECLS	G_BEGIN_DECLS


	typedef struct _TpAvatarRequirements TpAvatarRequirements;
	struct _TpAvatarRequirements
	{
	GStrv supported_mime_types;
	guint minimum_width;
	guint minimum_height;
	guint recommended_width;
	guint recommended_height;
	guint maximum_width;
	guint maximum_height;
	guint maximum_bytes;

	/<private>/
	gpointer _1;
	gpointer _2;
	gpointer _3;
	gpointer _4;
	};

	#define TP_TYPE_AVATAR_REQUIREMENTS (tp_avatar_requirements_get_type ())
	GType tp_avatar_requirements_get_type (void);
	TpAvatarRequirements * tp_avatar_requirements_new (GStrv supported_mime_typ
	es,
	guint minimum_width,
	guint minimum_height,
	guint recommended_width,
	guint recommended_height,
	guint maximum_width,
	guint maximum_height,
	guint maximum_bytes);
	TpAvatarRequirements * tp_avatar_requirements_copy (
	const TpAvatarRequirements *self);
	void tp_avatar_requirements_destroy (TpAvatarRequirements *self);

	typedef struct _TpContactInfoFieldSpec TpContactInfoFieldSpec;	typedef struct _TpContactInfoFieldSpec TpContactInfoFieldSpec;
	struct _TpContactInfoFieldSpec	struct _TpContactInfoFieldSpec
	{	{
	gchar *name;	gchar *name;
	GStrv parameters;	GStrv parameters;
	TpContactInfoFieldFlags flags;	TpContactInfoFieldFlags flags;
	guint max;	guint max;
	/<private>/	/<private>/
	gpointer priv;	gpointer priv;
	};	};

	skipping to change at line 163	skipping to change at line 130
	TpConnection tp_connection_new (TpDBusDaemon dbus, const gchar *bus_name,	TpConnection tp_connection_new (TpDBusDaemon dbus, const gchar *bus_name,
	const gchar object_path, GError *error) G_GNUC_WARN_UNUSED_RESULT;	const gchar object_path, GError *error) G_GNUC_WARN_UNUSED_RESULT;

	TpConnectionStatus tp_connection_get_status (TpConnection *self,	TpConnectionStatus tp_connection_get_status (TpConnection *self,
	TpConnectionStatusReason *reason);	TpConnectionStatusReason *reason);

	TpHandle tp_connection_get_self_handle (TpConnection *self);	TpHandle tp_connection_get_self_handle (TpConnection *self);

	TpCapabilities * tp_connection_get_capabilities (TpConnection *self);	TpCapabilities * tp_connection_get_capabilities (TpConnection *self);


	TpAvatarRequirements * tp_connection_get_avatar_requirements (
	TpConnection *self);

	TpContactInfoFlags tp_connection_get_contact_info_flags (TpConnection *self );	TpContactInfoFlags tp_connection_get_contact_info_flags (TpConnection *self );

	GList tp_connection_get_contact_info_supported_fields (TpConnection self) ;	GList tp_connection_get_contact_info_supported_fields (TpConnection self) ;

	void tp_connection_set_contact_info_async (TpConnection *self,	void tp_connection_set_contact_info_async (TpConnection *self,
	GList *info, GAsyncReadyCallback callback,	GList *info, GAsyncReadyCallback callback,
	gpointer user_data);	gpointer user_data);

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

	skipping to change at line 224	skipping to change at line 188
	GQuark tp_connection_get_feature_quark_core (void) G_GNUC_CONST;	GQuark tp_connection_get_feature_quark_core (void) G_GNUC_CONST;

	#define TP_CONNECTION_FEATURE_CONNECTED \	#define TP_CONNECTION_FEATURE_CONNECTED \
	(tp_connection_get_feature_quark_connected ())	(tp_connection_get_feature_quark_connected ())
	GQuark tp_connection_get_feature_quark_connected (void) G_GNUC_CONST;	GQuark tp_connection_get_feature_quark_connected (void) G_GNUC_CONST;

	#define TP_CONNECTION_FEATURE_CAPABILITIES \	#define TP_CONNECTION_FEATURE_CAPABILITIES \
	(tp_connection_get_feature_quark_capabilities ())	(tp_connection_get_feature_quark_capabilities ())
	GQuark tp_connection_get_feature_quark_capabilities (void) G_GNUC_CONST;	GQuark tp_connection_get_feature_quark_capabilities (void) G_GNUC_CONST;


	#define TP_CONNECTION_FEATURE_AVATAR_REQUIREMENTS \
	(tp_connection_get_feature_quark_avatar_requirements ())
	GQuark tp_connection_get_feature_quark_avatar_requirements (void) G_GNUC_CO
	NST;

	#define TP_CONNECTION_FEATURE_CONTACT_INFO \	#define TP_CONNECTION_FEATURE_CONTACT_INFO \
	(tp_connection_get_feature_quark_contact_info ())	(tp_connection_get_feature_quark_contact_info ())
	GQuark tp_connection_get_feature_quark_contact_info (void) G_GNUC_CONST;	GQuark tp_connection_get_feature_quark_contact_info (void) G_GNUC_CONST;

	/* connection-handles.c */	/* connection-handles.c */

	typedef void (TpConnectionHoldHandlesCb) (TpConnection connection,	typedef void (TpConnectionHoldHandlesCb) (TpConnection connection,
	TpHandleType handle_type, guint n_handles, const TpHandle *handles,	TpHandleType handle_type, guint n_handles, const TpHandle *handles,
	const GError error, gpointer user_data, GObject weak_object);	const GError error, gpointer user_data, GObject weak_object);


	skipping to change at line 256	skipping to change at line 216
	const GError error, gpointer user_data, GObject weak_object);	const GError error, gpointer user_data, GObject weak_object);

	void tp_connection_request_handles (TpConnection *self, gint timeout_ms,	void tp_connection_request_handles (TpConnection *self, gint timeout_ms,
	TpHandleType handle_type, const gchar * const *ids,	TpHandleType handle_type, const gchar * const *ids,
	TpConnectionRequestHandlesCb callback,	TpConnectionRequestHandlesCb callback,
	gpointer user_data, GDestroyNotify destroy, GObject *weak_object);	gpointer user_data, GDestroyNotify destroy, GObject *weak_object);

	void tp_connection_unref_handles (TpConnection *self,	void tp_connection_unref_handles (TpConnection *self,
	TpHandleType handle_type, guint n_handles, const TpHandle *handles);	TpHandleType handle_type, guint n_handles, const TpHandle *handles);


		/* connection-avatars.c */

		typedef struct _TpAvatarRequirements TpAvatarRequirements;
		struct _TpAvatarRequirements
		{
		GStrv supported_mime_types;
		guint minimum_width;
		guint minimum_height;
		guint recommended_width;
		guint recommended_height;
		guint maximum_width;
		guint maximum_height;
		guint maximum_bytes;

		/<private>/
		gpointer _1;
		gpointer _2;
		gpointer _3;
		gpointer _4;
		};

		#define TP_TYPE_AVATAR_REQUIREMENTS (tp_avatar_requirements_get_type ())
		GType tp_avatar_requirements_get_type (void);
		TpAvatarRequirements * tp_avatar_requirements_new (GStrv supported_mime_typ
		es,
		guint minimum_width,
		guint minimum_height,
		guint recommended_width,
		guint recommended_height,
		guint maximum_width,
		guint maximum_height,
		guint maximum_bytes);
		TpAvatarRequirements * tp_avatar_requirements_copy (
		const TpAvatarRequirements *self);
		void tp_avatar_requirements_destroy (TpAvatarRequirements *self);

		#define TP_CONNECTION_FEATURE_AVATAR_REQUIREMENTS \
		(tp_connection_get_feature_quark_avatar_requirements ())
		GQuark tp_connection_get_feature_quark_avatar_requirements (void) G_GNUC_CO
		NST;

		TpAvatarRequirements * tp_connection_get_avatar_requirements (
		TpConnection *self);

	G_END_DECLS	G_END_DECLS

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

	G_BEGIN_DECLS	G_BEGIN_DECLS

	/* connection-handles.c again - this has to come after the auto-generated	/* connection-handles.c again - this has to come after the auto-generated
	* stuff because it uses an auto-generated typedef */	* stuff because it uses an auto-generated typedef */

	void tp_connection_get_contact_attributes (TpConnection *self,	void tp_connection_get_contact_attributes (TpConnection *self,

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

	dbus-properties-mixin.h	dbus-properties-mixin.h

	skipping to change at line 129	skipping to change at line 129

	gboolean tp_dbus_properties_mixin_get (GObject *self,	gboolean tp_dbus_properties_mixin_get (GObject *self,
	const gchar interface_name, const gchar property_name,	const gchar interface_name, const gchar property_name,
	GValue value, GError *error);	GValue value, GError *error);

	GHashTable *tp_dbus_properties_mixin_make_properties_hash (	GHashTable *tp_dbus_properties_mixin_make_properties_hash (
	GObject object, const gchar first_interface,	GObject object, const gchar first_interface,
	const gchar *first_property, ...)	const gchar *first_property, ...)
	G_GNUC_NULL_TERMINATED G_GNUC_WARN_UNUSED_RESULT;	G_GNUC_NULL_TERMINATED G_GNUC_WARN_UNUSED_RESULT;


		void tp_dbus_properties_mixin_fill_properties_hash (GObject *object,
		GHashTable *table,
		const gchar *first_interface,
		const gchar *first_property,
		...)
		G_GNUC_NULL_TERMINATED;

	G_END_DECLS	G_END_DECLS

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

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

	handle-repo.h	handle-repo.h

	skipping to change at line 111	skipping to change at line 111
	const gchar id, gpointer context, GError *error)	const gchar id, gpointer context, GError *error)
	G_GNUC_WARN_UNUSED_RESULT;	G_GNUC_WARN_UNUSED_RESULT;

	void tp_handle_set_qdata (TpHandleRepoIface *repo, TpHandle handle,	void tp_handle_set_qdata (TpHandleRepoIface *repo, TpHandle handle,
	GQuark key_id, gpointer data, GDestroyNotify destroy);	GQuark key_id, gpointer data, GDestroyNotify destroy);
	gpointer tp_handle_get_qdata (TpHandleRepoIface *repo, TpHandle handle,	gpointer tp_handle_get_qdata (TpHandleRepoIface *repo, TpHandle handle,
	GQuark key_id);	GQuark key_id);

	/* Handle set helper class */	/* Handle set helper class */


	/**
	* TpHandleSetMemberFunc:
	* @set: The set of handles on which tp_handle_set_foreach() was called
	* @handle: A handle in the set
	* @userdata: Arbitrary user data as supplied to tp_handle_set_foreach()
	*
	* Signature of the callback used to iterate over the handle set in
	* tp_handle_set_foreach().
	*/
	typedef void (TpHandleSetMemberFunc)(TpHandleSet set, TpHandle handle,	typedef void (TpHandleSetMemberFunc)(TpHandleSet set, TpHandle handle,
	gpointer userdata);	gpointer userdata);

	TpHandleSet * tp_handle_set_new (TpHandleRepoIface *repo)	TpHandleSet * tp_handle_set_new (TpHandleRepoIface *repo)
	G_GNUC_WARN_UNUSED_RESULT;	G_GNUC_WARN_UNUSED_RESULT;
	TpHandleSet tp_handle_set_copy (const TpHandleSet other)	TpHandleSet tp_handle_set_copy (const TpHandleSet other)
	G_GNUC_WARN_UNUSED_RESULT;	G_GNUC_WARN_UNUSED_RESULT;
	void tp_handle_set_clear (TpHandleSet *set);	void tp_handle_set_clear (TpHandleSet *set);
	void tp_handle_set_destroy (TpHandleSet *set);	void tp_handle_set_destroy (TpHandleSet *set);


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

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

	/* static inline because it relies on NUM_TP_HANDLE_TYPES */	/* static inline because it relies on NUM_TP_HANDLE_TYPES */
	/**	/**

	* tp_handles_supported_and_valid:	* tp_handles_supported_and_valid: (skip)
	* @repos: An array of possibly null pointers to handle repositories, index ed	* @repos: An array of possibly null pointers to handle repositories, index ed
	* by handle type, where a null pointer means an unsupported handle	* by handle type, where a null pointer means an unsupported handle
	* type	* type
	* @handle_type: The handle type	* @handle_type: The handle type
	* @handles: A GArray of guint representing handles of the given type	* @handles: A GArray of guint representing handles of the given type
	* @allow_zero: If %TRUE, zero is treated like a valid handle	* @allow_zero: If %TRUE, zero is treated like a valid handle
	* @error: Used to return an error if %FALSE is returned	* @error: Used to return an error if %FALSE is returned
	*	*
	* Return %TRUE if the given handle type is supported (i.e. repos[handle_ty pe]	* Return %TRUE if the given handle type is supported (i.e. repos[handle_ty pe]
	* is not %NULL) and the given handles are all valid in that repository.	* is not %NULL) and the given handles are all valid in that repository.

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

	proxy.h	proxy.h

	skipping to change at line 131	skipping to change at line 131
	TpProxyClass))	TpProxyClass))
	#define TP_IS_PROXY(obj) \	#define TP_IS_PROXY(obj) \
	(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_PROXY))	(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_PROXY))
	#define TP_IS_PROXY_CLASS(klass) \	#define TP_IS_PROXY_CLASS(klass) \
	(G_TYPE_CHECK_CLASS_TYPE((klass), TP_TYPE_PROXY))	(G_TYPE_CHECK_CLASS_TYPE((klass), TP_TYPE_PROXY))
	#define TP_PROXY_GET_CLASS(obj) \	#define TP_PROXY_GET_CLASS(obj) \
	(G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_PROXY, \	(G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_PROXY, \
	TpProxyClass))	TpProxyClass))

	gboolean tp_proxy_has_interface_by_id (gpointer self, GQuark iface);	gboolean tp_proxy_has_interface_by_id (gpointer self, GQuark iface);

		gboolean tp_proxy_has_interface (gpointer self, const gchar *iface);
	static inline gboolean
	_tp_proxy_inline_has_interface (gpointer self, const gchar *iface)
	{
	GQuark q = g_quark_try_string (iface);

	return q != 0 && tp_proxy_has_interface_by_id (self, q);
	}

	#define tp_proxy_has_interface(self, iface) \
	(_tp_proxy_inline_has_interface (self, iface))

	TpDBusDaemon *tp_proxy_get_dbus_daemon (gpointer self);	TpDBusDaemon *tp_proxy_get_dbus_daemon (gpointer self);

	DBusGConnection *tp_proxy_get_dbus_connection (gpointer self);	DBusGConnection *tp_proxy_get_dbus_connection (gpointer self);

	const gchar *tp_proxy_get_bus_name (gpointer self);	const gchar *tp_proxy_get_bus_name (gpointer self);

	const gchar *tp_proxy_get_object_path (gpointer self);	const gchar *tp_proxy_get_object_path (gpointer self);

	const GError *tp_proxy_get_invalidated (gpointer self);	const GError *tp_proxy_get_invalidated (gpointer self);

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

	telepathy-enums.h	telepathy-enums.h

	skipping to change at line 108	skipping to change at line 108
	} TpLocationFeatures;	} TpLocationFeatures;

	typedef enum {	typedef enum {
	TP_SERVICE_POINT_TYPE_NONE = 0,	TP_SERVICE_POINT_TYPE_NONE = 0,
	TP_SERVICE_POINT_TYPE_EMERGENCY = 1,	TP_SERVICE_POINT_TYPE_EMERGENCY = 1,
	TP_SERVICE_POINT_TYPE_COUNSELING = 2,	TP_SERVICE_POINT_TYPE_COUNSELING = 2,
	} TpServicePointType;	} TpServicePointType;
	#define NUM_TP_SERVICE_POINT_TYPES (2+1)	#define NUM_TP_SERVICE_POINT_TYPES (2+1)

	typedef enum {	typedef enum {

		TP_CHANNEL_CONTACT_SEARCH_STATE_NOT_STARTED = 0,
		TP_CHANNEL_CONTACT_SEARCH_STATE_IN_PROGRESS = 1,
		TP_CHANNEL_CONTACT_SEARCH_STATE_MORE_AVAILABLE = 2,
		TP_CHANNEL_CONTACT_SEARCH_STATE_COMPLETED = 3,
		TP_CHANNEL_CONTACT_SEARCH_STATE_FAILED = 4,
		} TpChannelContactSearchState;
		#define NUM_TP_CHANNEL_CONTACT_SEARCH_STATES (4+1)

		typedef enum {
	TP_FILE_TRANSFER_STATE_NONE = 0,	TP_FILE_TRANSFER_STATE_NONE = 0,
	TP_FILE_TRANSFER_STATE_PENDING = 1,	TP_FILE_TRANSFER_STATE_PENDING = 1,
	TP_FILE_TRANSFER_STATE_ACCEPTED = 2,	TP_FILE_TRANSFER_STATE_ACCEPTED = 2,
	TP_FILE_TRANSFER_STATE_OPEN = 3,	TP_FILE_TRANSFER_STATE_OPEN = 3,
	TP_FILE_TRANSFER_STATE_COMPLETED = 4,	TP_FILE_TRANSFER_STATE_COMPLETED = 4,
	TP_FILE_TRANSFER_STATE_CANCELLED = 5,	TP_FILE_TRANSFER_STATE_CANCELLED = 5,
	} TpFileTransferState;	} TpFileTransferState;
	#define NUM_TP_FILE_TRANSFER_STATES (5+1)	#define NUM_TP_FILE_TRANSFER_STATES (5+1)

	typedef enum {	typedef enum {

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

	telepathy-interfaces.h	telepathy-interfaces.h

	skipping to change at line 19	skipping to change at line 19
	(tp_iface_quark_connection_manager ())	(tp_iface_quark_connection_manager ())

	GQuark tp_iface_quark_connection_manager (void);	GQuark tp_iface_quark_connection_manager (void);

	#define TP_PROP_CONNECTION_MANAGER_PROTOCOLS \	#define TP_PROP_CONNECTION_MANAGER_PROTOCOLS \
	"org.freedesktop.Telepathy.ConnectionManager.Protocols"	"org.freedesktop.Telepathy.ConnectionManager.Protocols"

	#define TP_PROP_CONNECTION_MANAGER_INTERFACES \	#define TP_PROP_CONNECTION_MANAGER_INTERFACES \
	"org.freedesktop.Telepathy.ConnectionManager.Interfaces"	"org.freedesktop.Telepathy.ConnectionManager.Interfaces"


		#define TP_IFACE_PROTOCOL \
		"org.freedesktop.Telepathy.Protocol"

		#define TP_IFACE_QUARK_PROTOCOL \
		(tp_iface_quark_protocol ())

		GQuark tp_iface_quark_protocol (void);

		#define TP_PROP_PROTOCOL_INTERFACES \
		"org.freedesktop.Telepathy.Protocol.Interfaces"

		#define TP_PROP_PROTOCOL_PARAMETERS \
		"org.freedesktop.Telepathy.Protocol.Parameters"

		#define TP_PROP_PROTOCOL_CONNECTION_INTERFACES \
		"org.freedesktop.Telepathy.Protocol.ConnectionInterfaces"

		#define TP_PROP_PROTOCOL_REQUESTABLE_CHANNEL_CLASSES \
		"org.freedesktop.Telepathy.Protocol.RequestableChannelClasses"

		#define TP_PROP_PROTOCOL_VCARD_FIELD \
		"org.freedesktop.Telepathy.Protocol.VCardField"

		#define TP_PROP_PROTOCOL_ENGLISH_NAME \
		"org.freedesktop.Telepathy.Protocol.EnglishName"

		#define TP_PROP_PROTOCOL_ICON \
		"org.freedesktop.Telepathy.Protocol.Icon"

	#define TP_IFACE_CONNECTION \	#define TP_IFACE_CONNECTION \
	"org.freedesktop.Telepathy.Connection"	"org.freedesktop.Telepathy.Connection"

	#define TP_IFACE_QUARK_CONNECTION \	#define TP_IFACE_QUARK_CONNECTION \
	(tp_iface_quark_connection ())	(tp_iface_quark_connection ())

	GQuark tp_iface_quark_connection (void);	GQuark tp_iface_quark_connection (void);

	#define TP_PROP_CONNECTION_INTERFACES \	#define TP_PROP_CONNECTION_INTERFACES \
	"org.freedesktop.Telepathy.Connection.Interfaces"	"org.freedesktop.Telepathy.Connection.Interfaces"

	skipping to change at line 290	skipping to change at line 319
	"org.freedesktop.Telepathy.Channel.InitiatorID"	"org.freedesktop.Telepathy.Channel.InitiatorID"

	#define TP_IFACE_CHANNEL_TYPE_CONTACT_LIST \	#define TP_IFACE_CHANNEL_TYPE_CONTACT_LIST \
	"org.freedesktop.Telepathy.Channel.Type.ContactList"	"org.freedesktop.Telepathy.Channel.Type.ContactList"

	#define TP_IFACE_QUARK_CHANNEL_TYPE_CONTACT_LIST \	#define TP_IFACE_QUARK_CHANNEL_TYPE_CONTACT_LIST \
	(tp_iface_quark_channel_type_contact_list ())	(tp_iface_quark_channel_type_contact_list ())

	GQuark tp_iface_quark_channel_type_contact_list (void);	GQuark tp_iface_quark_channel_type_contact_list (void);


		#define TP_IFACE_CHANNEL_TYPE_CONTACT_SEARCH \
		"org.freedesktop.Telepathy.Channel.Type.ContactSearch"

		#define TP_IFACE_QUARK_CHANNEL_TYPE_CONTACT_SEARCH \
		(tp_iface_quark_channel_type_contact_search ())

		GQuark tp_iface_quark_channel_type_contact_search (void);

		#define TP_PROP_CHANNEL_TYPE_CONTACT_SEARCH_SEARCH_STATE \
		"org.freedesktop.Telepathy.Channel.Type.ContactSearch.SearchState"

		#define TP_PROP_CHANNEL_TYPE_CONTACT_SEARCH_LIMIT \
		"org.freedesktop.Telepathy.Channel.Type.ContactSearch.Limit"

		#define TP_PROP_CHANNEL_TYPE_CONTACT_SEARCH_AVAILABLE_SEARCH_KEYS \
		"org.freedesktop.Telepathy.Channel.Type.ContactSearch.AvailableSearchKeys"

		#define TP_PROP_CHANNEL_TYPE_CONTACT_SEARCH_SERVER \
		"org.freedesktop.Telepathy.Channel.Type.ContactSearch.Server"

	#define TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER \	#define TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER \
	"org.freedesktop.Telepathy.Channel.Type.FileTransfer"	"org.freedesktop.Telepathy.Channel.Type.FileTransfer"

	#define TP_IFACE_QUARK_CHANNEL_TYPE_FILE_TRANSFER \	#define TP_IFACE_QUARK_CHANNEL_TYPE_FILE_TRANSFER \
	(tp_iface_quark_channel_type_file_transfer ())	(tp_iface_quark_channel_type_file_transfer ())

	GQuark tp_iface_quark_channel_type_file_transfer (void);	GQuark tp_iface_quark_channel_type_file_transfer (void);

	#define TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_STATE \	#define TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_STATE \
	"org.freedesktop.Telepathy.Channel.Type.FileTransfer.State"	"org.freedesktop.Telepathy.Channel.Type.FileTransfer.State"

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

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

	skipping to change at line 787	skipping to change at line 787
	typedef void (tp_cli_channel_interface_tube_signal_callback_tube_channel_s tate_changed) (TpChannel proxy,	typedef void (tp_cli_channel_interface_tube_signal_callback_tube_channel_s tate_changed) (TpChannel proxy,
	guint arg_State,	guint arg_State,
	gpointer user_data, GObject *weak_object);	gpointer user_data, GObject *weak_object);
	TpProxySignalConnection tp_cli_channel_interface_tube_connect_to_tube_chan nel_state_changed (TpChannel proxy,	TpProxySignalConnection tp_cli_channel_interface_tube_connect_to_tube_chan nel_state_changed (TpChannel proxy,
	tp_cli_channel_interface_tube_signal_callback_tube_channel_state_change d callback,	tp_cli_channel_interface_tube_signal_callback_tube_channel_state_change d callback,
	gpointer user_data,	gpointer user_data,
	GDestroyNotify destroy,	GDestroyNotify destroy,
	GObject *weak_object,	GObject *weak_object,
	GError **error);	GError **error);


		typedef void (*tp_cli_channel_type_contact_search_signal_callback_search_st
		ate_changed) (TpChannel *proxy,
		guint arg_State,
		const gchar *arg_Error,
		GHashTable *arg_Details,
		gpointer user_data, GObject *weak_object);
		TpProxySignalConnection *tp_cli_channel_type_contact_search_connect_to_sear
		ch_state_changed (TpChannel *proxy,
		tp_cli_channel_type_contact_search_signal_callback_search_state_changed
		callback,
		gpointer user_data,
		GDestroyNotify destroy,
		GObject *weak_object,
		GError **error);

		typedef void (*tp_cli_channel_type_contact_search_signal_callback_search_re
		sult_received) (TpChannel *proxy,
		GHashTable *arg_Result,
		gpointer user_data, GObject *weak_object);
		TpProxySignalConnection *tp_cli_channel_type_contact_search_connect_to_sear
		ch_result_received (TpChannel *proxy,
		tp_cli_channel_type_contact_search_signal_callback_search_result_receiv
		ed callback,
		gpointer user_data,
		GDestroyNotify destroy,
		GObject *weak_object,
		GError **error);

		typedef void (*tp_cli_channel_type_contact_search_callback_for_search) (TpC
		hannel *proxy,
		const GError *error, gpointer user_data,
		GObject *weak_object);

		TpProxyPendingCall *tp_cli_channel_type_contact_search_call_search (TpChann
		el *proxy,
		gint timeout_ms,
		GHashTable *in_Terms,
		tp_cli_channel_type_contact_search_callback_for_search callback,
		gpointer user_data,
		GDestroyNotify destroy,
		GObject *weak_object);

		#ifndef TP_DISABLE_DEPRECATED
		gboolean tp_cli_channel_type_contact_search_run_search (TpChannel *proxy,
		gint timeout_ms,
		GHashTable *in_Terms,
		GError **error,
		GMainLoop **loop) _TP_GNUC_DEPRECATED;
		#endif /* not TP_DISABLE_DEPRECATED */

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

		TpProxyPendingCall *tp_cli_channel_type_contact_search_call_more (TpChannel
		*proxy,
		gint timeout_ms,
		tp_cli_channel_type_contact_search_callback_for_more callback,
		gpointer user_data,
		GDestroyNotify destroy,
		GObject *weak_object);

		#ifndef TP_DISABLE_DEPRECATED
		gboolean tp_cli_channel_type_contact_search_run_more (TpChannel *proxy,
		gint timeout_ms,
		GError **error,
		GMainLoop **loop) _TP_GNUC_DEPRECATED;
		#endif /* not TP_DISABLE_DEPRECATED */

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

		TpProxyPendingCall *tp_cli_channel_type_contact_search_call_stop (TpChannel
		*proxy,
		gint timeout_ms,
		tp_cli_channel_type_contact_search_callback_for_stop callback,
		gpointer user_data,
		GDestroyNotify destroy,
		GObject *weak_object);

		#ifndef TP_DISABLE_DEPRECATED
		gboolean tp_cli_channel_type_contact_search_run_stop (TpChannel *proxy,
		gint timeout_ms,
		GError **error,
		GMainLoop **loop) _TP_GNUC_DEPRECATED;
		#endif /* not TP_DISABLE_DEPRECATED */

	typedef void (tp_cli_channel_type_dbus_tube_signal_callback_dbus_names_cha nged) (TpChannel proxy,	typedef void (tp_cli_channel_type_dbus_tube_signal_callback_dbus_names_cha nged) (TpChannel proxy,
	GHashTable *arg_Added,	GHashTable *arg_Added,
	const GArray *arg_Removed,	const GArray *arg_Removed,
	gpointer user_data, GObject *weak_object);	gpointer user_data, GObject *weak_object);
	TpProxySignalConnection tp_cli_channel_type_dbus_tube_connect_to_dbus_name s_changed (TpChannel proxy,	TpProxySignalConnection tp_cli_channel_type_dbus_tube_connect_to_dbus_name s_changed (TpChannel proxy,
	tp_cli_channel_type_dbus_tube_signal_callback_dbus_names_changed callba ck,	tp_cli_channel_type_dbus_tube_signal_callback_dbus_names_changed callba ck,
	gpointer user_data,	gpointer user_data,
	GDestroyNotify destroy,	GDestroyNotify destroy,
	GObject *weak_object,	GObject *weak_object,
	GError **error);	GError **error);

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

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

	skipping to change at line 689	skipping to change at line 689
	GType tp_svc_channel_type_contact_list_get_type (void);	GType tp_svc_channel_type_contact_list_get_type (void);
	#define TP_TYPE_SVC_CHANNEL_TYPE_CONTACT_LIST \	#define TP_TYPE_SVC_CHANNEL_TYPE_CONTACT_LIST \
	(tp_svc_channel_type_contact_list_get_type ())	(tp_svc_channel_type_contact_list_get_type ())
	#define TP_SVC_CHANNEL_TYPE_CONTACT_LIST(obj) \	#define TP_SVC_CHANNEL_TYPE_CONTACT_LIST(obj) \
	(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CHANNEL_TYPE_CONTACT_LIST, TpSvcChannelTypeContactList))	(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CHANNEL_TYPE_CONTACT_LIST, TpSvcChannelTypeContactList))
	#define TP_IS_SVC_CHANNEL_TYPE_CONTACT_LIST(obj) \	#define TP_IS_SVC_CHANNEL_TYPE_CONTACT_LIST(obj) \
	(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CHANNEL_TYPE_CONTACT_LIST) )	(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CHANNEL_TYPE_CONTACT_LIST) )
	#define TP_SVC_CHANNEL_TYPE_CONTACT_LIST_GET_CLASS(obj) \	#define TP_SVC_CHANNEL_TYPE_CONTACT_LIST_GET_CLASS(obj) \
	(G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CHANNEL_TYPE_CONTACT_LI ST, TpSvcChannelTypeContactListClass))	(G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CHANNEL_TYPE_CONTACT_LI ST, TpSvcChannelTypeContactListClass))


		typedef struct _TpSvcChannelTypeContactSearch TpSvcChannelTypeContactSearch
		;

		typedef struct _TpSvcChannelTypeContactSearchClass TpSvcChannelTypeContactS
		earchClass;

		GType tp_svc_channel_type_contact_search_get_type (void);
		#define TP_TYPE_SVC_CHANNEL_TYPE_CONTACT_SEARCH \
		(tp_svc_channel_type_contact_search_get_type ())
		#define TP_SVC_CHANNEL_TYPE_CONTACT_SEARCH(obj) \
		(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CHANNEL_TYPE_CONTACT_SEARC
		H, TpSvcChannelTypeContactSearch))
		#define TP_IS_SVC_CHANNEL_TYPE_CONTACT_SEARCH(obj) \
		(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CHANNEL_TYPE_CONTACT_SEARC
		H))
		#define TP_SVC_CHANNEL_TYPE_CONTACT_SEARCH_GET_CLASS(obj) \
		(G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CHANNEL_TYPE_CONTACT_SE
		ARCH, TpSvcChannelTypeContactSearchClass))

		typedef void (*tp_svc_channel_type_contact_search_search_impl) (TpSvcChanne
		lTypeContactSearch *self,
		GHashTable *in_Terms,
		DBusGMethodInvocation *context);
		void tp_svc_channel_type_contact_search_implement_search (TpSvcChannelTypeC
		ontactSearchClass *klass, tp_svc_channel_type_contact_search_search_impl im
		pl);
		static inline
		/* this comment is to stop gtkdoc realising this is static */
		void tp_svc_channel_type_contact_search_return_from_search (DBusGMethodInvo
		cation *context);
		static inline void
		tp_svc_channel_type_contact_search_return_from_search (DBusGMethodInvocatio
		n *context)
		{
		dbus_g_method_return (context);
		}

		typedef void (*tp_svc_channel_type_contact_search_more_impl) (TpSvcChannelT
		ypeContactSearch *self,
		DBusGMethodInvocation *context);
		void tp_svc_channel_type_contact_search_implement_more (TpSvcChannelTypeCon
		tactSearchClass *klass, tp_svc_channel_type_contact_search_more_impl impl);
		static inline
		/* this comment is to stop gtkdoc realising this is static */
		void tp_svc_channel_type_contact_search_return_from_more (DBusGMethodInvoca
		tion *context);
		static inline void
		tp_svc_channel_type_contact_search_return_from_more (DBusGMethodInvocation
		*context)
		{
		dbus_g_method_return (context);
		}

		typedef void (*tp_svc_channel_type_contact_search_stop_impl) (TpSvcChannelT
		ypeContactSearch *self,
		DBusGMethodInvocation *context);
		void tp_svc_channel_type_contact_search_implement_stop (TpSvcChannelTypeCon
		tactSearchClass *klass, tp_svc_channel_type_contact_search_stop_impl impl);
		static inline
		/* this comment is to stop gtkdoc realising this is static */
		void tp_svc_channel_type_contact_search_return_from_stop (DBusGMethodInvoca
		tion *context);
		static inline void
		tp_svc_channel_type_contact_search_return_from_stop (DBusGMethodInvocation
		*context)
		{
		dbus_g_method_return (context);
		}

		void tp_svc_channel_type_contact_search_emit_search_state_changed (gpointer
		instance,
		guint arg_State,
		const gchar *arg_Error,
		GHashTable *arg_Details);
		void tp_svc_channel_type_contact_search_emit_search_result_received (gpoint
		er instance,
		GHashTable *arg_Result);

	typedef struct _TpSvcChannelTypeDBusTube TpSvcChannelTypeDBusTube;	typedef struct _TpSvcChannelTypeDBusTube TpSvcChannelTypeDBusTube;

	typedef struct _TpSvcChannelTypeDBusTubeClass TpSvcChannelTypeDBusTubeClass ;	typedef struct _TpSvcChannelTypeDBusTubeClass TpSvcChannelTypeDBusTubeClass ;

	GType tp_svc_channel_type_dbus_tube_get_type (void);	GType tp_svc_channel_type_dbus_tube_get_type (void);
	#define TP_TYPE_SVC_CHANNEL_TYPE_DBUS_TUBE \	#define TP_TYPE_SVC_CHANNEL_TYPE_DBUS_TUBE \
	(tp_svc_channel_type_dbus_tube_get_type ())	(tp_svc_channel_type_dbus_tube_get_type ())
	#define TP_SVC_CHANNEL_TYPE_DBUS_TUBE(obj) \	#define TP_SVC_CHANNEL_TYPE_DBUS_TUBE(obj) \
	(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CHANNEL_TYPE_DBUS_TUBE, Tp SvcChannelTypeDBusTube))	(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CHANNEL_TYPE_DBUS_TUBE, Tp SvcChannelTypeDBusTube))
	#define TP_IS_SVC_CHANNEL_TYPE_DBUS_TUBE(obj) \	#define TP_IS_SVC_CHANNEL_TYPE_DBUS_TUBE(obj) \

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