libtelepathy-glib: headers diff between 0.14.4 and 0.14.5 versions

	base-connection.h	base-connection.h

	skipping to change at line 58	skipping to change at line 58

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

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

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


		struct _TpBaseConnection {
		/<public>/
		GObject parent;

		gchar *bus_name;
		gchar *object_path;

		TpConnectionStatus status;

		TpHandle self_handle;

		/<private>/
		gpointer _future1;
		gpointer _future2;
		gpointer _future3;
		gpointer _future4;

		TpBaseConnectionPrivate *priv;
		};

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

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

	skipping to change at line 95	skipping to change at line 115
	/<private>/	/<private>/
	gpointer _future2;	gpointer _future2;
	gpointer _future3;	gpointer _future3;
	gpointer _future4;	gpointer _future4;

	gpointer priv;	gpointer priv;
	};	};

	# define TP_INTERNAL_CONNECTION_STATUS_NEW ((TpConnectionStatus)(-1))	# define TP_INTERNAL_CONNECTION_STATUS_NEW ((TpConnectionStatus)(-1))


	struct _TpBaseConnection {
	/<public>/
	GObject parent;

	gchar *bus_name;
	gchar *object_path;

	TpConnectionStatus status;

	TpHandle self_handle;

	/<private>/
	gpointer _future1;
	gpointer _future2;
	gpointer _future3;
	gpointer _future4;

	TpBaseConnectionPrivate *priv;
	};

	GType tp_base_connection_get_type (void);	GType tp_base_connection_get_type (void);

	TpHandleRepoIface tp_base_connection_get_handles (TpBaseConnection self,	TpHandleRepoIface tp_base_connection_get_handles (TpBaseConnection self,
	TpHandleType handle_type);	TpHandleType handle_type);

	gboolean tp_base_connection_register (TpBaseConnection *self,	gboolean tp_base_connection_register (TpBaseConnection *self,
	const gchar cm_name, gchar bus_name, gchar *object_path,	const gchar cm_name, gchar bus_name, gchar *object_path,
	GError **error);	GError **error);

	/* FIXME: when dbus-glib exposes its GError -> D-Bus error name mapping,	/* FIXME: when dbus-glib exposes its GError -> D-Bus error name mapping,

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

	connection.h	connection.h

	skipping to change at line 36	skipping to change at line 36
	#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 _TpContactInfoFieldSpec TpContactInfoFieldSpec;	typedef struct _TpContactInfoFieldSpec TpContactInfoFieldSpec;
	struct _TpContactInfoFieldSpec	struct _TpContactInfoFieldSpec
	{	{

		/<public>/
	gchar *name;	gchar *name;
	GStrv parameters;	GStrv parameters;
	TpContactInfoFieldFlags flags;	TpContactInfoFieldFlags flags;
	guint max;	guint max;
	/<private>/	/<private>/
	gpointer priv;	gpointer priv;
	};	};

	#define TP_TYPE_CONTACT_INFO_FIELD_SPEC (tp_contact_info_field_spec_get_typ e ())	#define TP_TYPE_CONTACT_INFO_FIELD_SPEC (tp_contact_info_field_spec_get_typ e ())
	GType tp_contact_info_field_spec_get_type (void);	GType tp_contact_info_field_spec_get_type (void);

	skipping to change at line 58	skipping to change at line 59
	void tp_contact_info_field_spec_free (TpContactInfoFieldSpec *self);	void tp_contact_info_field_spec_free (TpContactInfoFieldSpec *self);

	#define TP_TYPE_CONTACT_INFO_SPEC_LIST (tp_contact_info_spec_list_get_type ())	#define TP_TYPE_CONTACT_INFO_SPEC_LIST (tp_contact_info_spec_list_get_type ())
	GType tp_contact_info_spec_list_get_type (void);	GType tp_contact_info_spec_list_get_type (void);
	GList tp_contact_info_spec_list_copy (GList list);	GList tp_contact_info_spec_list_copy (GList list);
	void tp_contact_info_spec_list_free (GList *list);	void tp_contact_info_spec_list_free (GList *list);

	typedef struct _TpContactInfoField TpContactInfoField;	typedef struct _TpContactInfoField TpContactInfoField;
	struct _TpContactInfoField	struct _TpContactInfoField
	{	{

		/<public>/
	gchar *field_name;	gchar *field_name;
	GStrv parameters;	GStrv parameters;
	GStrv field_value;	GStrv field_value;
	/<private>/	/<private>/
	gpointer priv;	gpointer priv;
	};	};

	#define TP_TYPE_CONTACT_INFO_FIELD (tp_contact_info_field_get_type ())	#define TP_TYPE_CONTACT_INFO_FIELD (tp_contact_info_field_get_type ())
	GType tp_contact_info_field_get_type (void);	GType tp_contact_info_field_get_type (void);
	TpContactInfoField tp_contact_info_field_new (const gchar field_name,	TpContactInfoField tp_contact_info_field_new (const gchar field_name,

	skipping to change at line 237	skipping to change at line 239
	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 */	/* connection-avatars.c */

	typedef struct _TpAvatarRequirements TpAvatarRequirements;	typedef struct _TpAvatarRequirements TpAvatarRequirements;
	struct _TpAvatarRequirements	struct _TpAvatarRequirements
	{	{

		/<public>/
	GStrv supported_mime_types;	GStrv supported_mime_types;
	guint minimum_width;	guint minimum_width;
	guint minimum_height;	guint minimum_height;
	guint recommended_width;	guint recommended_width;
	guint recommended_height;	guint recommended_height;
	guint maximum_width;	guint maximum_width;
	guint maximum_height;	guint maximum_height;
	guint maximum_bytes;	guint maximum_bytes;

	/<private>/	/<private>/

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

	errors.h	errors.h

	skipping to change at line 31	skipping to change at line 31
	#ifndef __TP_ERRORS_H__	#ifndef __TP_ERRORS_H__
	#define __TP_ERRORS_H__	#define __TP_ERRORS_H__

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

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

	G_BEGIN_DECLS	G_BEGIN_DECLS


	GQuark tp_errors_quark (void);	GQuark tp_errors_quark (void) G_GNUC_DEPRECATED_FOR(tp_error_quark);
	GQuark tp_error_quark (void);	GQuark tp_error_quark (void);

	#define TP_ERROR_PREFIX "org.freedesktop.Telepathy.Error"	#define TP_ERROR_PREFIX "org.freedesktop.Telepathy.Error"

	#define TP_ERRORS TP_ERROR	#define TP_ERRORS TP_ERROR
	#define TP_ERROR (tp_error_quark ())	#define TP_ERROR (tp_error_quark ())

	void tp_g_set_error_invalid_handle_type (guint type, GError **error);	void tp_g_set_error_invalid_handle_type (guint type, GError **error);
	void tp_g_set_error_unsupported_handle_type (guint type, GError **error);	void tp_g_set_error_unsupported_handle_type (guint type, GError **error);


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

	group-mixin.h	group-mixin.h

	skipping to change at line 94	skipping to change at line 94
	*	*
	* Returns: %TRUE on success, %FALSE with @error set on error	* Returns: %TRUE on success, %FALSE with @error set on error
	*/	*/
	typedef gboolean (TpGroupMixinRemMemberWithReasonFunc) (GObject obj,	typedef gboolean (TpGroupMixinRemMemberWithReasonFunc) (GObject obj,
	TpHandle handle, const gchar message, guint reason, GError *error);	TpHandle handle, const gchar message, guint reason, GError *error);

	void tp_group_mixin_class_set_remove_with_reason_func (GObjectClass *cls,	void tp_group_mixin_class_set_remove_with_reason_func (GObjectClass *cls,
	TpGroupMixinRemMemberWithReasonFunc func);	TpGroupMixinRemMemberWithReasonFunc func);

	/**	/**

	* TpGroupMixinClass:
	* @add_member: The add-member function that was passed to
	* tp_group_mixin_class_init()
	* @remove_member: The remove-member function that was passed to
	* tp_group_mixin_class_init()
	* @priv: Pointer to opaque private data
	*
	* Structure representing the group mixin as used in a particular class.
	* To be placed in the implementation's class structure.
	*
	* Initialize this with tp_group_mixin_class_init().
	*
	* All fields should be considered read-only.
	*/
	struct _TpGroupMixinClass {
	TpGroupMixinAddMemberFunc add_member;
	TpGroupMixinRemMemberFunc remove_member;
	TpGroupMixinClassPrivate *priv;
	};

	/**
	* TpGroupMixin:	* TpGroupMixin:
	* @handle_repo: The connection's contact handle repository	* @handle_repo: The connection's contact handle repository
	* @self_handle: The local user's handle within this group, or 0 if none.	* @self_handle: The local user's handle within this group, or 0 if none.
	* Set using tp_group_mixin_init() and tp_group_mixin_change_self_handle() .	* Set using tp_group_mixin_init() and tp_group_mixin_change_self_handle() .
	* @group_flags: This group's flags. Set using tp_group_mixin_change_flags( );	* @group_flags: This group's flags. Set using tp_group_mixin_change_flags( );
	* defaults to 0.	* defaults to 0.
	* @members: The members of the group. Alter using	* @members: The members of the group. Alter using
	* tp_group_mixin_change_members().	* tp_group_mixin_change_members().
	* @local_pending: Members awaiting the local user's approval to join the	* @local_pending: Members awaiting the local user's approval to join the
	* group. Alter using tp_group_mixin_change_members().	* group. Alter using tp_group_mixin_change_members().

	skipping to change at line 147	skipping to change at line 126

	TpChannelGroupFlags group_flags;	TpChannelGroupFlags group_flags;

	TpHandleSet *members;	TpHandleSet *members;
	TpHandleSet *local_pending;	TpHandleSet *local_pending;
	TpHandleSet *remote_pending;	TpHandleSet *remote_pending;

	TpGroupMixinPrivate *priv;	TpGroupMixinPrivate *priv;
	};	};


		/**
		* TpGroupMixinClass:
		* @add_member: The add-member function that was passed to
		* tp_group_mixin_class_init()
		* @remove_member: The remove-member function that was passed to
		* tp_group_mixin_class_init()
		* @priv: Pointer to opaque private data
		*
		* Structure representing the group mixin as used in a particular class.
		* To be placed in the implementation's class structure.
		*
		* Initialize this with tp_group_mixin_class_init().
		*
		* All fields should be considered read-only.
		*/
		struct _TpGroupMixinClass {
		TpGroupMixinAddMemberFunc add_member;
		TpGroupMixinRemMemberFunc remove_member;
		TpGroupMixinClassPrivate *priv;
		};

	/* TYPE MACROS */	/* TYPE MACROS */
	#define TP_GROUP_MIXIN_CLASS_OFFSET_QUARK \	#define TP_GROUP_MIXIN_CLASS_OFFSET_QUARK \
	(tp_group_mixin_class_get_offset_quark ())	(tp_group_mixin_class_get_offset_quark ())
	#define TP_GROUP_MIXIN_CLASS_OFFSET(o) \	#define TP_GROUP_MIXIN_CLASS_OFFSET(o) \
	tp_mixin_class_get_offset (o, TP_GROUP_MIXIN_CLASS_OFFSET_QUARK)	tp_mixin_class_get_offset (o, TP_GROUP_MIXIN_CLASS_OFFSET_QUARK)
	#define TP_GROUP_MIXIN_CLASS(o) \	#define TP_GROUP_MIXIN_CLASS(o) \
	((TpGroupMixinClass *) tp_mixin_offset_cast (o, \	((TpGroupMixinClass *) tp_mixin_offset_cast (o, \
	TP_GROUP_MIXIN_CLASS_OFFSET (o)))	TP_GROUP_MIXIN_CLASS_OFFSET (o)))
	#define TP_HAS_GROUP_MIXIN_CLASS(cls) (TP_GROUP_MIXIN_CLASS_OFFSET (cls) != 0)	#define TP_HAS_GROUP_MIXIN_CLASS(cls) (TP_GROUP_MIXIN_CLASS_OFFSET (cls) != 0)


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

	intset.h	intset.h

	skipping to change at line 95	skipping to change at line 95

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

	#define TP_INTSET_ITER_INIT(set) { (set), (guint)(-1) }	#define TP_INTSET_ITER_INIT(set) { (set), (guint)(-1) }

		void tp_intset_iter_init (TpIntsetIter iter, const TpIntset set);
	#define tp_intset_iter_init(iter, set) tp_intset_iter_init_inline (iter, se	void tp_intset_iter_reset (TpIntsetIter *iter);
	t)
	static inline void
	tp_intset_iter_init_inline (TpIntsetIter iter, const TpIntset set)
	{
	g_return_if_fail (iter != NULL);
	iter->set = set;
	iter->element = (guint)(-1);
	}

	#define tp_intset_iter_reset(iter) tp_intset_iter_reset_inline (iter)
	static inline void
	tp_intset_iter_reset_inline (TpIntsetIter *iter)
	{
	g_return_if_fail (iter != NULL);
	g_return_if_fail (iter->set != NULL);
	iter->element = (guint)(-1);
	}

	gboolean tp_intset_iter_next (TpIntsetIter *iter);	gboolean tp_intset_iter_next (TpIntsetIter *iter);

	typedef struct {	typedef struct {
	/<private>/	/<private>/
	gpointer _dummy[16];	gpointer _dummy[16];
	} TpIntsetFastIter;	} TpIntsetFastIter;

	/**	/**
	* TpIntSetFastIter: (skip)	* TpIntSetFastIter: (skip)
	*	*

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

	presence-mixin.h	presence-mixin.h

	skipping to change at line 79	skipping to change at line 79

	typedef gboolean (TpPresenceMixinStatusAvailableFunc) (GObject obj,	typedef gboolean (TpPresenceMixinStatusAvailableFunc) (GObject obj,
	guint which);	guint which);

	typedef GHashTable (TpPresenceMixinGetContactStatusesFunc) (GObject *obj,	typedef GHashTable (TpPresenceMixinGetContactStatusesFunc) (GObject *obj,
	const GArray contacts, GError *error);	const GArray contacts, GError *error);

	typedef gboolean (TpPresenceMixinSetOwnStatusFunc) (GObject obj,	typedef gboolean (TpPresenceMixinSetOwnStatusFunc) (GObject obj,
	const TpPresenceStatus status, GError *error);	const TpPresenceStatus status, GError *error);


		typedef guint (*TpPresenceMixinGetMaximumStatusMessageLengthFunc) (
		GObject *obj);

	typedef struct _TpPresenceMixinClass TpPresenceMixinClass;	typedef struct _TpPresenceMixinClass TpPresenceMixinClass;
	typedef struct _TpPresenceMixinClassPrivate TpPresenceMixinClassPrivate;	typedef struct _TpPresenceMixinClassPrivate TpPresenceMixinClassPrivate;
	typedef struct _TpPresenceMixin TpPresenceMixin;	typedef struct _TpPresenceMixin TpPresenceMixin;
	typedef struct _TpPresenceMixinPrivate TpPresenceMixinPrivate;	typedef struct _TpPresenceMixinPrivate TpPresenceMixinPrivate;

	struct _TpPresenceMixinClass {	struct _TpPresenceMixinClass {
	TpPresenceMixinStatusAvailableFunc status_available;	TpPresenceMixinStatusAvailableFunc status_available;
	TpPresenceMixinGetContactStatusesFunc get_contact_statuses;	TpPresenceMixinGetContactStatusesFunc get_contact_statuses;
	TpPresenceMixinSetOwnStatusFunc set_own_status;	TpPresenceMixinSetOwnStatusFunc set_own_status;

	const TpPresenceStatusSpec *statuses;	const TpPresenceStatusSpec *statuses;

	/<private>/	/<private>/
	TpPresenceMixinClassPrivate *priv;	TpPresenceMixinClassPrivate *priv;


		/<public>/
		TpPresenceMixinGetMaximumStatusMessageLengthFunc get_maximum_status_mes
		sage_length;

		/<private>/
	gpointer _future1;	gpointer _future1;
	gpointer _future2;	gpointer _future2;
	gpointer _future3;	gpointer _future3;

	gpointer _future4;
	};	};

	struct _TpPresenceMixin {	struct _TpPresenceMixin {
	/<private>/	/<private>/
	TpPresenceMixinPrivate *priv;	TpPresenceMixinPrivate *priv;
	};	};

	/* TYPE MACROS */	/* TYPE MACROS */
	#define TP_PRESENCE_MIXIN_CLASS_OFFSET_QUARK \	#define TP_PRESENCE_MIXIN_CLASS_OFFSET_QUARK \
	(tp_presence_mixin_class_get_offset_quark ())	(tp_presence_mixin_class_get_offset_quark ())

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

	properties-mixin.h	properties-mixin.h

	skipping to change at line 99	skipping to change at line 99
	* * call tp_properties_context_return() with an error to indicate failure	* * call tp_properties_context_return() with an error to indicate failure
	* * call tp_properties_context_remove() to remove each property from the s et	* * call tp_properties_context_remove() to remove each property from the s et
	* of pending properties, then call tp_properties_context_return_if_done( )	* of pending properties, then call tp_properties_context_return_if_done( )
	* or tp_properties_context_return() when all were set	* or tp_properties_context_return() when all were set
	*	*
	* Returns: %FALSE on immediate failure, %TRUE otherwise	* Returns: %FALSE on immediate failure, %TRUE otherwise
	*/	*/
	typedef gboolean (TpPropertiesSetFunc) (GObject obj,	typedef gboolean (TpPropertiesSetFunc) (GObject obj,
	TpPropertiesContext ctx, GError *error);	TpPropertiesContext ctx, GError *error);


		typedef struct _TpPropertiesMixinClass TpPropertiesMixinClass;
		typedef struct _TpPropertiesMixinPrivate TpPropertiesMixinPrivate;
		typedef struct _TpPropertiesMixin TpPropertiesMixin;
	/* Doesn't yet exist. For future expansion. */	/* Doesn't yet exist. For future expansion. */
	typedef struct _TpPropertiesMixinClassPrivate TpPropertiesMixinClassPrivate ;	typedef struct _TpPropertiesMixinClassPrivate TpPropertiesMixinClassPrivate ;

	/**	/**

		* TpPropertiesMixin:
		* @properties: Array of property values, of length klass->num_props.
		* Should be considered read-only.
		* @priv: Pointer to opaque private data.
		*
		* Structure to be placed in a GObject-derived structure containing
		* instance data for the properties mixin (i.e. the properties). Initialize
		* it using tp_properties_mixin_init().
		*/
		struct _TpPropertiesMixin {
		TpProperty *properties;

		TpPropertiesMixinPrivate *priv;
		};

		/**
	* TpPropertiesMixinClass:	* TpPropertiesMixinClass:
	* @signatures: Array of property signatures, as provided via	* @signatures: Array of property signatures, as provided via
	* tp_properties_mixin_class_init(), of length @num_props.	* tp_properties_mixin_class_init(), of length @num_props.
	* @num_props: Number of properties supported.	* @num_props: Number of properties supported.
	* @set_properties: Properties setting function, as supplied to	* @set_properties: Properties setting function, as supplied to
	* tp_properties_mixin_class_init().	* tp_properties_mixin_class_init().
	* @priv: Pointer to opaque private data.	* @priv: Pointer to opaque private data.
	*	*
	* Structure to be placed in a GObjectClass-derived structure containing	* Structure to be placed in a GObjectClass-derived structure containing
	* settings for the properties mixin. Initialize it using	* settings for the properties mixin. Initialize it using

	skipping to change at line 126	skipping to change at line 145
	*/	*/
	struct _TpPropertiesMixinClass {	struct _TpPropertiesMixinClass {
	const TpPropertySignature *signatures;	const TpPropertySignature *signatures;
	guint num_props;	guint num_props;

	TpPropertiesSetFunc set_properties;	TpPropertiesSetFunc set_properties;

	TpPropertiesMixinClassPrivate *priv;	TpPropertiesMixinClassPrivate *priv;
	};	};


	typedef struct _TpPropertiesMixinClass TpPropertiesMixinClass;

	typedef struct _TpPropertiesMixinPrivate TpPropertiesMixinPrivate;

	/**
	* TpPropertiesMixin:
	* @properties: Array of property values, of length klass->num_props.
	* Should be considered read-only.
	* @priv: Pointer to opaque private data.
	*
	* Structure to be placed in a GObject-derived structure containing
	* instance data for the properties mixin (i.e. the properties). Initialize
	* it using tp_properties_mixin_init().
	*/
	struct _TpPropertiesMixin {
	TpProperty *properties;

	TpPropertiesMixinPrivate *priv;
	};

	typedef struct _TpPropertiesMixin TpPropertiesMixin;

	/* TYPE MACROS */	/* TYPE MACROS */
	#define TP_PROPERTIES_MIXIN_CLASS_OFFSET_QUARK \	#define TP_PROPERTIES_MIXIN_CLASS_OFFSET_QUARK \
	(tp_properties_mixin_class_get_offset_quark ())	(tp_properties_mixin_class_get_offset_quark ())
	#define TP_PROPERTIES_MIXIN_CLASS_OFFSET(o) \	#define TP_PROPERTIES_MIXIN_CLASS_OFFSET(o) \
	tp_mixin_class_get_offset (o, TP_PROPERTIES_MIXIN_CLASS_OFFSET_QUARK)	tp_mixin_class_get_offset (o, TP_PROPERTIES_MIXIN_CLASS_OFFSET_QUARK)
	#define TP_PROPERTIES_MIXIN_CLASS(o) \	#define TP_PROPERTIES_MIXIN_CLASS(o) \
	((TpPropertiesMixinClass *) tp_mixin_offset_cast (o,\	((TpPropertiesMixinClass *) tp_mixin_offset_cast (o,\
	TP_PROPERTIES_MIXIN_CLASS_OFFSET (o)))	TP_PROPERTIES_MIXIN_CLASS_OFFSET (o)))

	#define TP_PROPERTIES_MIXIN_OFFSET_QUARK \	#define TP_PROPERTIES_MIXIN_OFFSET_QUARK \

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

	util.h	util.h

	skipping to change at line 68	skipping to change at line 68
	GValue *tp_g_value_slice_new_take_boxed (GType type, gpointer p)	GValue *tp_g_value_slice_new_take_boxed (GType type, gpointer p)
	G_GNUC_WARN_UNUSED_RESULT;	G_GNUC_WARN_UNUSED_RESULT;

	void tp_g_value_slice_free (GValue *value);	void tp_g_value_slice_free (GValue *value);

	GValue tp_g_value_slice_dup (const GValue value) G_GNUC_WARN_UNUSED_RESUL T;	GValue tp_g_value_slice_dup (const GValue value) G_GNUC_WARN_UNUSED_RESUL T;

	void tp_g_hash_table_update (GHashTable target, GHashTable source,	void tp_g_hash_table_update (GHashTable target, GHashTable source,
	GBoxedCopyFunc key_dup, GBoxedCopyFunc value_dup);	GBoxedCopyFunc key_dup, GBoxedCopyFunc value_dup);


	#define tp_str_empty(s) (tp_str_empty_inline (s))

	static inline gboolean	static inline gboolean

	tp_str_empty_inline (const gchar *s)	tp_str_empty (const gchar *s)
	{	{
	return (s == NULL \|\| s[0] == '\0');	return (s == NULL \|\| s[0] == '\0');
	}	}

	gboolean tp_strdiff (const gchar left, const gchar right);	gboolean tp_strdiff (const gchar left, const gchar right);

	gpointer tp_mixin_offset_cast (gpointer instance, guint offset);	gpointer tp_mixin_offset_cast (gpointer instance, guint offset);
	guint tp_mixin_instance_get_offset (gpointer instance, GQuark quark);	guint tp_mixin_instance_get_offset (gpointer instance, GQuark quark);
	guint tp_mixin_class_get_offset (gpointer klass, GQuark quark);	guint tp_mixin_class_get_offset (gpointer klass, GQuark quark);


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

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

	base-client.h	base-client.h

	skipping to change at line 173	skipping to change at line 173
	*/	*/

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

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

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


		gboolean tp_base_client_is_handling_channel (TpBaseClient *self,
		TpChannel *channel);

	const gchar tp_base_client_get_name (TpBaseClient self);	const gchar tp_base_client_get_name (TpBaseClient self);
	gboolean tp_base_client_get_uniquify_name (TpBaseClient *self);	gboolean tp_base_client_get_uniquify_name (TpBaseClient *self);
	const gchar tp_base_client_get_bus_name (TpBaseClient self);	const gchar tp_base_client_get_bus_name (TpBaseClient self);
	const gchar tp_base_client_get_object_path (TpBaseClient self);	const gchar tp_base_client_get_object_path (TpBaseClient self);
	TpDBusDaemon tp_base_client_get_dbus_daemon (TpBaseClient self);	TpDBusDaemon tp_base_client_get_dbus_daemon (TpBaseClient self);
	TpAccountManager tp_base_client_get_account_manager (TpBaseClient self);	TpAccountManager tp_base_client_get_account_manager (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 \

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

	handle-repo.h	handle-repo.h

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

	TpIntset tp_handle_set_peek (TpHandleSet set) G_GNUC_WARN_UNUSED_RESULT;	TpIntset tp_handle_set_peek (TpHandleSet set) G_GNUC_WARN_UNUSED_RESULT;

	void tp_handle_set_add (TpHandleSet *set, TpHandle handle);	void tp_handle_set_add (TpHandleSet *set, TpHandle handle);
	gboolean tp_handle_set_remove (TpHandleSet *set, TpHandle handle);	gboolean tp_handle_set_remove (TpHandleSet *set, TpHandle handle);
	gboolean tp_handle_set_is_member (const TpHandleSet *set, TpHandle handle);	gboolean tp_handle_set_is_member (const TpHandleSet *set, TpHandle handle);

	void tp_handle_set_foreach (TpHandleSet *set, TpHandleSetMemberFunc func,	void tp_handle_set_foreach (TpHandleSet *set, TpHandleSetMemberFunc func,

	gpointer userdata);	gpointer user_data);

	gboolean tp_handle_set_is_empty (const TpHandleSet *set);	gboolean tp_handle_set_is_empty (const TpHandleSet *set);
	int tp_handle_set_size (const TpHandleSet *set);	int tp_handle_set_size (const TpHandleSet *set);
	GArray tp_handle_set_to_array (const TpHandleSet set)	GArray tp_handle_set_to_array (const TpHandleSet set)
	G_GNUC_WARN_UNUSED_RESULT;	G_GNUC_WARN_UNUSED_RESULT;
	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;

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

	telepathy-interfaces.h	telepathy-interfaces.h

	skipping to change at line 191	skipping to change at line 191
	"org.freedesktop.Telepathy.Connection.Interface.Balance"	"org.freedesktop.Telepathy.Connection.Interface.Balance"

	#define TP_IFACE_QUARK_CONNECTION_INTERFACE_BALANCE \	#define TP_IFACE_QUARK_CONNECTION_INTERFACE_BALANCE \
	(tp_iface_quark_connection_interface_balance ())	(tp_iface_quark_connection_interface_balance ())

	GQuark tp_iface_quark_connection_interface_balance (void);	GQuark tp_iface_quark_connection_interface_balance (void);

	#define TP_PROP_CONNECTION_INTERFACE_BALANCE_ACCOUNT_BALANCE \	#define TP_PROP_CONNECTION_INTERFACE_BALANCE_ACCOUNT_BALANCE \
	"org.freedesktop.Telepathy.Connection.Interface.Balance.AccountBalance"	"org.freedesktop.Telepathy.Connection.Interface.Balance.AccountBalance"


		#define TP_PROP_CONNECTION_INTERFACE_BALANCE_MANAGE_CREDIT_URI \
		"org.freedesktop.Telepathy.Connection.Interface.Balance.ManageCreditURI"

	#define TP_IFACE_CONNECTION_INTERFACE_CAPABILITIES \	#define TP_IFACE_CONNECTION_INTERFACE_CAPABILITIES \
	"org.freedesktop.Telepathy.Connection.Interface.Capabilities"	"org.freedesktop.Telepathy.Connection.Interface.Capabilities"

	#define TP_IFACE_QUARK_CONNECTION_INTERFACE_CAPABILITIES \	#define TP_IFACE_QUARK_CONNECTION_INTERFACE_CAPABILITIES \
	(tp_iface_quark_connection_interface_capabilities ())	(tp_iface_quark_connection_interface_capabilities ())

	GQuark tp_iface_quark_connection_interface_capabilities (void);	GQuark tp_iface_quark_connection_interface_capabilities (void);

	#define TP_TOKEN_CONNECTION_INTERFACE_CAPABILITIES_CAPS \	#define TP_TOKEN_CONNECTION_INTERFACE_CAPABILITIES_CAPS \
	"org.freedesktop.Telepathy.Connection.Interface.Capabilities/caps"	"org.freedesktop.Telepathy.Connection.Interface.Capabilities/caps"

	skipping to change at line 341	skipping to change at line 344
	"org.freedesktop.Telepathy.Connection.Interface.SimplePresence"	"org.freedesktop.Telepathy.Connection.Interface.SimplePresence"

	#define TP_IFACE_QUARK_CONNECTION_INTERFACE_SIMPLE_PRESENCE \	#define TP_IFACE_QUARK_CONNECTION_INTERFACE_SIMPLE_PRESENCE \
	(tp_iface_quark_connection_interface_simple_presence ())	(tp_iface_quark_connection_interface_simple_presence ())

	GQuark tp_iface_quark_connection_interface_simple_presence (void);	GQuark tp_iface_quark_connection_interface_simple_presence (void);

	#define TP_PROP_CONNECTION_INTERFACE_SIMPLE_PRESENCE_STATUSES \	#define TP_PROP_CONNECTION_INTERFACE_SIMPLE_PRESENCE_STATUSES \
	"org.freedesktop.Telepathy.Connection.Interface.SimplePresence.Statuses"	"org.freedesktop.Telepathy.Connection.Interface.SimplePresence.Statuses"


		#define TP_PROP_CONNECTION_INTERFACE_SIMPLE_PRESENCE_MAXIMUM_STATUS_MESSAGE
		_LENGTH \
		"org.freedesktop.Telepathy.Connection.Interface.SimplePresence.MaximumStatu
		sMessageLength"

	#define TP_TOKEN_CONNECTION_INTERFACE_SIMPLE_PRESENCE_PRESENCE \	#define TP_TOKEN_CONNECTION_INTERFACE_SIMPLE_PRESENCE_PRESENCE \
	"org.freedesktop.Telepathy.Connection.Interface.SimplePresence/presence"	"org.freedesktop.Telepathy.Connection.Interface.SimplePresence/presence"

	#define TP_IFACE_CONNECTION_INTERFACE_PRESENCE \	#define TP_IFACE_CONNECTION_INTERFACE_PRESENCE \
	"org.freedesktop.Telepathy.Connection.Interface.Presence"	"org.freedesktop.Telepathy.Connection.Interface.Presence"

	#define TP_IFACE_QUARK_CONNECTION_INTERFACE_PRESENCE \	#define TP_IFACE_QUARK_CONNECTION_INTERFACE_PRESENCE \
	(tp_iface_quark_connection_interface_presence ())	(tp_iface_quark_connection_interface_presence ())

	GQuark tp_iface_quark_connection_interface_presence (void);	GQuark tp_iface_quark_connection_interface_presence (void);

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