libtelepathy-glib: headers diff between 0.13.2 and 0.13.3 versions

	base-connection.h	base-connection.h

	skipping to change at line 201	skipping to change at line 201
	GError e = { TP_ERRORS, TP_ERROR_DISCONNECTED, \	GError e = { TP_ERRORS, TP_ERROR_DISCONNECTED, \
	(gchar *) "Connection is disconnected" }; \	(gchar *) "Connection is disconnected" }; \
	\	\
	dbus_g_method_return_error ((context), &e); \	dbus_g_method_return_error ((context), &e); \
	return; \	return; \
	} \	} \
	} G_STMT_END	} G_STMT_END

	TpDBusDaemon tp_base_connection_get_dbus_daemon (TpBaseConnection self);	TpDBusDaemon tp_base_connection_get_dbus_daemon (TpBaseConnection self);


		void tp_base_connection_add_client_interest (TpBaseConnection *self,
		const gchar unique_name, const gchar token,
		gboolean only_if_uninterested);

		void tp_base_connection_add_possible_client_interest (TpBaseConnection *sel
		f,
		GQuark token);

	G_END_DECLS	G_END_DECLS

	#endif /* #ifndef __TP_BASE_CONNECTION_H__*/	#endif /* #ifndef __TP_BASE_CONNECTION_H__*/

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

	client-channel-factory.h	client-channel-factory.h

	skipping to change at line 40	skipping to change at line 40
	typedef struct _TpClientChannelFactoryInterface TpClientChannelFactoryInter face;	typedef struct _TpClientChannelFactoryInterface TpClientChannelFactoryInter face;

	struct _TpClientChannelFactoryInterface {	struct _TpClientChannelFactoryInterface {
	GTypeInterface parent;	GTypeInterface parent;

	TpChannel * (* create_channel) (TpClientChannelFactoryInterface *self,	TpChannel * (* create_channel) (TpClientChannelFactoryInterface *self,
	TpConnection *conn,	TpConnection *conn,
	const gchar *path,	const gchar *path,
	GHashTable *properties,	GHashTable *properties,
	GError **error);	GError **error);


		GArray * (* dup_channel_features) (TpClientChannelFactoryInterface *sel
		f,
		TpChannel *channel);
	};	};

	GType tp_client_channel_factory_get_type (void);	GType tp_client_channel_factory_get_type (void);

	#define TP_TYPE_CLIENT_CHANNEL_FACTORY \	#define TP_TYPE_CLIENT_CHANNEL_FACTORY \
	(tp_client_channel_factory_get_type ())	(tp_client_channel_factory_get_type ())
	#define TP_CLIENT_CHANNEL_FACTORY(obj) \	#define TP_CLIENT_CHANNEL_FACTORY(obj) \
	(G_TYPE_CHECK_INSTANCE_CAST ((obj), TP_TYPE_CLIENT_CHANNEL_FACTORY, \	(G_TYPE_CHECK_INSTANCE_CAST ((obj), TP_TYPE_CLIENT_CHANNEL_FACTORY, \
	TpClientChannelFactoryInterface))	TpClientChannelFactoryInterface))
	#define TP_IS_CLIENT_CHANNEL_FACTORY(obj) \	#define TP_IS_CLIENT_CHANNEL_FACTORY(obj) \

	skipping to change at line 62	skipping to change at line 65
	(G_TYPE_INSTANCE_GET_INTERFACE ((obj), TP_TYPE_CLIENT_CHANNEL_FACTORY, \	(G_TYPE_INSTANCE_GET_INTERFACE ((obj), TP_TYPE_CLIENT_CHANNEL_FACTORY, \
	TpClientChannelFactoryInterface))	TpClientChannelFactoryInterface))

	TpChannel * tp_client_channel_factory_create_channel (	TpChannel * tp_client_channel_factory_create_channel (
	TpClientChannelFactoryInterface *self,	TpClientChannelFactoryInterface *self,
	TpConnection *conn,	TpConnection *conn,
	const gchar *path,	const gchar *path,
	GHashTable *properties,	GHashTable *properties,
	GError **error);	GError **error);


		GArray * tp_client_channel_factory_dup_channel_features (
		TpClientChannelFactoryInterface *self,
		TpChannel *channel);

	G_END_DECLS	G_END_DECLS

	#endif	#endif

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

	connection.h	connection.h

	skipping to change at line 176	skipping to change at line 176

	gint tp_connection_presence_type_cmp_availability (TpConnectionPresenceType p1,	gint tp_connection_presence_type_cmp_availability (TpConnectionPresenceType p1,
	TpConnectionPresenceType p2);	TpConnectionPresenceType p2);

	gboolean tp_connection_parse_object_path (TpConnection self, gchar *proto col,	gboolean tp_connection_parse_object_path (TpConnection self, gchar *proto col,
	gchar **cm_name);	gchar **cm_name);

	const gchar tp_connection_get_detailed_error (TpConnection self,	const gchar tp_connection_get_detailed_error (TpConnection self,
	const GHashTable **details);	const GHashTable **details);


		void tp_connection_add_client_interest (TpConnection *self,
		const gchar *interested_in);

		void tp_connection_add_client_interest_by_id (TpConnection *self,
		GQuark interested_in);

	#define TP_CONNECTION_FEATURE_CORE \	#define TP_CONNECTION_FEATURE_CORE \
	(tp_connection_get_feature_quark_core ())	(tp_connection_get_feature_quark_core ())
	GQuark tp_connection_get_feature_quark_core (void) G_GNUC_CONST;	GQuark tp_connection_get_feature_quark_core (void) G_GNUC_CONST;

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

	#define TP_CONNECTION_FEATURE_CAPABILITIES \	#define TP_CONNECTION_FEATURE_CAPABILITIES \
	(tp_connection_get_feature_quark_capabilities ())	(tp_connection_get_feature_quark_capabilities ())

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

	debug-ansi.h	debug-ansi.h
	/**	/**
	* SECTION:debug-ansi	* SECTION:debug-ansi
	* @title: ANSI codes for debug messages	* @title: ANSI codes for debug messages
	* @short_description: used to colorize log messages for clarity	* @short_description: used to colorize log messages for clarity
	*	*
	* This header provides some ANSI escapes you can use to make debug message s	* This header provides some ANSI escapes you can use to make debug message s
	* more colourful. Please use sparingly.	* more colourful. Please use sparingly.

		*
		* Deprecated: 0.13.3
	*/	*/

	#ifndef __TP_DEBUG_ANSI_H__	#ifndef __TP_DEBUG_ANSI_H__
	#define __TP_DEBUG_ANSI_H__	#define __TP_DEBUG_ANSI_H__


		#ifndef TP_DISABLE_DEPRECATED

	/**	/**
	* TP_ANSI_RESET:	* TP_ANSI_RESET:
	*	*
	* Reset all attributes.	* Reset all attributes.

		*
		* Deprecated: 0.13.3
	*/	*/
	#define TP_ANSI_RESET "\x1b[0m"	#define TP_ANSI_RESET "\x1b[0m"
	/**	/**
	* TP_ANSI_BOLD_ON:	* TP_ANSI_BOLD_ON:
	*	*
	* Set the bold attribute.	* Set the bold attribute.

		*
		* Deprecated: 0.13.3
	*/	*/
	#define TP_ANSI_BOLD_ON "\x1b[1m"	#define TP_ANSI_BOLD_ON "\x1b[1m"
	/**	/**
	* TP_ANSI_INVERSE_ON:	* TP_ANSI_INVERSE_ON:
	*	*
	* Set the inverse video attribute.	* Set the inverse video attribute.

		*
		* Deprecated: 0.13.3
	*/	*/
	#define TP_ANSI_INVERSE_ON "\x1b[7m"	#define TP_ANSI_INVERSE_ON "\x1b[7m"
	/**	/**
	* TP_ANSI_BOLD_OFF:	* TP_ANSI_BOLD_OFF:
	*	*
	* Clear the bold attribute.	* Clear the bold attribute.

		*
		* Deprecated: 0.13.3
	*/	*/
	#define TP_ANSI_BOLD_OFF "\x1b[22m"	#define TP_ANSI_BOLD_OFF "\x1b[22m"
	/**	/**
	* TP_ANSI_FG_BLACK:	* TP_ANSI_FG_BLACK:
	*	*
	* <!---->	* <!---->

		*
		* Deprecated: 0.13.3
	*/	*/
	#define TP_ANSI_FG_BLACK "\x1b[30m"	#define TP_ANSI_FG_BLACK "\x1b[30m"
	/**	/**
	* TP_ANSI_FG_RED:	* TP_ANSI_FG_RED:
	*	*
	* <!---->	* <!---->

		*
		* Deprecated: 0.13.3
	*/	*/
	#define TP_ANSI_FG_RED "\x1b[31m"	#define TP_ANSI_FG_RED "\x1b[31m"
	/**	/**
	* TP_ANSI_FG_GREEN:	* TP_ANSI_FG_GREEN:
	*	*
	* <!---->	* <!---->

		*
		* Deprecated: 0.13.3
	*/	*/
	#define TP_ANSI_FG_GREEN "\x1b[32m"	#define TP_ANSI_FG_GREEN "\x1b[32m"
	/**	/**
	* TP_ANSI_FG_YELLOW:	* TP_ANSI_FG_YELLOW:
	*	*
	* <!---->	* <!---->

		*
		* Deprecated: 0.13.3
	*/	*/
	#define TP_ANSI_FG_YELLOW "\x1b[33m"	#define TP_ANSI_FG_YELLOW "\x1b[33m"
	/**	/**
	* TP_ANSI_FG_BLUE:	* TP_ANSI_FG_BLUE:
	*	*
	* <!---->	* <!---->

		*
		* Deprecated: 0.13.3
	*/	*/
	#define TP_ANSI_FG_BLUE "\x1b[34m"	#define TP_ANSI_FG_BLUE "\x1b[34m"
	/**	/**
	* TP_ANSI_FG_MAGENTA:	* TP_ANSI_FG_MAGENTA:
	*	*
	* <!---->	* <!---->

		*
		* Deprecated: 0.13.3
	*/	*/
	#define TP_ANSI_FG_MAGENTA "\x1b[35m"	#define TP_ANSI_FG_MAGENTA "\x1b[35m"
	/**	/**
	* TP_ANSI_FG_CYAN:	* TP_ANSI_FG_CYAN:
	*	*
	* <!---->	* <!---->

		*
		* Deprecated: 0.13.3
	*/	*/
	#define TP_ANSI_FG_CYAN "\x1b[36m"	#define TP_ANSI_FG_CYAN "\x1b[36m"
	/**	/**
	* TP_ANSI_FG_WHITE:	* TP_ANSI_FG_WHITE:
	*	*
	* <!---->	* <!---->

		*
		* Deprecated: 0.13.3
	*/	*/
	#define TP_ANSI_FG_WHITE "\x1b[37m"	#define TP_ANSI_FG_WHITE "\x1b[37m"
	/**	/**
	* TP_ANSI_BG_RED:	* TP_ANSI_BG_RED:
	*	*
	* <!---->	* <!---->

		*
		* Deprecated: 0.13.3
	*/	*/
	#define TP_ANSI_BG_RED "\x1b[41m"	#define TP_ANSI_BG_RED "\x1b[41m"
	/**	/**
	* TP_ANSI_BG_GREEN:	* TP_ANSI_BG_GREEN:
	*	*
	* <!---->	* <!---->

		*
		* Deprecated: 0.13.3
	*/	*/
	#define TP_ANSI_BG_GREEN "\x1b[42m"	#define TP_ANSI_BG_GREEN "\x1b[42m"
	/**	/**
	* TP_ANSI_BG_YELLOW:	* TP_ANSI_BG_YELLOW:
	*	*
	* <!---->	* <!---->

		*
		* Deprecated: 0.13.3
	*/	*/
	#define TP_ANSI_BG_YELLOW "\x1b[43m"	#define TP_ANSI_BG_YELLOW "\x1b[43m"
	/**	/**
	* TP_ANSI_BG_BLUE:	* TP_ANSI_BG_BLUE:
	*	*
	* <!---->	* <!---->

		*
		* Deprecated: 0.13.3
	*/	*/
	#define TP_ANSI_BG_BLUE "\x1b[44m"	#define TP_ANSI_BG_BLUE "\x1b[44m"
	/**	/**
	* TP_ANSI_BG_MAGENTA:	* TP_ANSI_BG_MAGENTA:
	*	*
	* <!---->	* <!---->

		*
		* Deprecated: 0.13.3
	*/	*/
	#define TP_ANSI_BG_MAGENTA "\x1b[45m"	#define TP_ANSI_BG_MAGENTA "\x1b[45m"
	/**	/**
	* TP_ANSI_BG_CYAN:	* TP_ANSI_BG_CYAN:
	*	*
	* <!---->	* <!---->

		*
		* Deprecated: 0.13.3
	*/	*/
	#define TP_ANSI_BG_CYAN "\x1b[46m"	#define TP_ANSI_BG_CYAN "\x1b[46m"
	/**	/**
	* TP_ANSI_BG_WHITE:	* TP_ANSI_BG_WHITE:
	*	*
	* <!---->	* <!---->

		*
		* Deprecated: 0.13.3
	*/	*/
	#define TP_ANSI_BG_WHITE "\x1b[47m"	#define TP_ANSI_BG_WHITE "\x1b[47m"


		#endif

	#endif /* __TP_DEBUG_ANSI_H__ */	#endif /* __TP_DEBUG_ANSI_H__ */

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

	error-str.h	error-str.h

	skipping to change at line 45	skipping to change at line 45
	#define TP_ERROR_STR_CONNECTION_FAILED "org.freedesktop.Telepathy.Error.Con nectionFailed"	#define TP_ERROR_STR_CONNECTION_FAILED "org.freedesktop.Telepathy.Error.Con nectionFailed"
	#define TP_ERROR_STR_CONNECTION_LOST "org.freedesktop.Telepathy.Error.Conne ctionLost"	#define TP_ERROR_STR_CONNECTION_LOST "org.freedesktop.Telepathy.Error.Conne ctionLost"
	#define TP_ERROR_STR_ALREADY_CONNECTED "org.freedesktop.Telepathy.Error.Alr eadyConnected"	#define TP_ERROR_STR_ALREADY_CONNECTED "org.freedesktop.Telepathy.Error.Alr eadyConnected"
	#define TP_ERROR_STR_CONNECTION_REPLACED "org.freedesktop.Telepathy.Error.C onnectionReplaced"	#define TP_ERROR_STR_CONNECTION_REPLACED "org.freedesktop.Telepathy.Error.C onnectionReplaced"
	#define TP_ERROR_STR_REGISTRATION_EXISTS "org.freedesktop.Telepathy.Error.R egistrationExists"	#define TP_ERROR_STR_REGISTRATION_EXISTS "org.freedesktop.Telepathy.Error.R egistrationExists"
	#define TP_ERROR_STR_SERVICE_BUSY "org.freedesktop.Telepathy.Error.ServiceB usy"	#define TP_ERROR_STR_SERVICE_BUSY "org.freedesktop.Telepathy.Error.ServiceB usy"
	#define TP_ERROR_STR_RESOURCE_UNAVAILABLE "org.freedesktop.Telepathy.Error. ResourceUnavailable"	#define TP_ERROR_STR_RESOURCE_UNAVAILABLE "org.freedesktop.Telepathy.Error. ResourceUnavailable"
	#define TP_ERROR_STR_WOULD_BREAK_ANONYMITY "org.freedesktop.Telepathy.Error .WouldBreakAnonymity"	#define TP_ERROR_STR_WOULD_BREAK_ANONYMITY "org.freedesktop.Telepathy.Error .WouldBreakAnonymity"
	#define TP_ERROR_STR_NOT_YET "org.freedesktop.Telepathy.Error.NotYet"	#define TP_ERROR_STR_NOT_YET "org.freedesktop.Telepathy.Error.NotYet"
	#define TP_ERROR_STR_REJECTED "org.freedesktop.Telepathy.Error.Rejected"	#define TP_ERROR_STR_REJECTED "org.freedesktop.Telepathy.Error.Rejected"

		#define TP_ERROR_STR_PICKED_UP_ELSEWHERE "org.freedesktop.Telepathy.Error.P ickedUpElsewhere"

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

	telepathy-enums.h	telepathy-enums.h

	skipping to change at line 147	skipping to change at line 147
	} 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_MAIL_NOTIFICATION_FLAG_SUPPORTS_UNREAD_MAIL_COUNT = 1,
		TP_MAIL_NOTIFICATION_FLAG_SUPPORTS_UNREAD_MAILS = 2,
		TP_MAIL_NOTIFICATION_FLAG_EMITS_MAILS_RECEIVED = 4,
		TP_MAIL_NOTIFICATION_FLAG_SUPPORTS_REQUEST_INBOX_URL = 8,
		TP_MAIL_NOTIFICATION_FLAG_SUPPORTS_REQUEST_MAIL_URL = 16,
		TP_MAIL_NOTIFICATION_FLAG_THREAD_BASED = 32,
		} TpMailNotificationFlags;

		typedef enum {
		TP_HTTP_METHOD_GET = 0,
		TP_HTTP_METHOD_POST = 1,
		} TpHTTPMethod;
		#define NUM_TP_HTTP_METHODS (1+1)

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

	typedef enum {	typedef enum {
	TP_FILE_TRANSFER_STATE_NONE = 0,	TP_FILE_TRANSFER_STATE_NONE = 0,

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

	telepathy-interfaces.h	telepathy-interfaces.h

	skipping to change at line 48	skipping to change at line 48

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

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

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


		#define TP_IFACE_PROTOCOL_INTERFACE_PRESENCE \
		"org.freedesktop.Telepathy.Protocol.Interface.Presence"

		#define TP_IFACE_QUARK_PROTOCOL_INTERFACE_PRESENCE \
		(tp_iface_quark_protocol_interface_presence ())

		GQuark tp_iface_quark_protocol_interface_presence (void);

		#define TP_PROP_PROTOCOL_INTERFACE_PRESENCE_STATUSES \
		"org.freedesktop.Telepathy.Protocol.Interface.Presence.Statuses"

	#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 342	skipping to change at line 353
	"org.freedesktop.Telepathy.Connection.Interface.ServicePoint"	"org.freedesktop.Telepathy.Connection.Interface.ServicePoint"

	#define TP_IFACE_QUARK_CONNECTION_INTERFACE_SERVICE_POINT \	#define TP_IFACE_QUARK_CONNECTION_INTERFACE_SERVICE_POINT \
	(tp_iface_quark_connection_interface_service_point ())	(tp_iface_quark_connection_interface_service_point ())

	GQuark tp_iface_quark_connection_interface_service_point (void);	GQuark tp_iface_quark_connection_interface_service_point (void);

	#define TP_PROP_CONNECTION_INTERFACE_SERVICE_POINT_KNOWN_SERVICE_POINTS \	#define TP_PROP_CONNECTION_INTERFACE_SERVICE_POINT_KNOWN_SERVICE_POINTS \
	"org.freedesktop.Telepathy.Connection.Interface.ServicePoint.KnownServicePo ints"	"org.freedesktop.Telepathy.Connection.Interface.ServicePoint.KnownServicePo ints"


		#define TP_IFACE_CONNECTION_INTERFACE_MAIL_NOTIFICATION \
		"org.freedesktop.Telepathy.Connection.Interface.MailNotification.DRAFT"

		#define TP_IFACE_QUARK_CONNECTION_INTERFACE_MAIL_NOTIFICATION \
		(tp_iface_quark_connection_interface_mail_notification ())

		GQuark tp_iface_quark_connection_interface_mail_notification (void);

		#define TP_PROP_CONNECTION_INTERFACE_MAIL_NOTIFICATION_MAIL_NOTIFICATION_FL
		AGS \
		"org.freedesktop.Telepathy.Connection.Interface.MailNotification.DRAFT.Mail
		NotificationFlags"

		#define TP_PROP_CONNECTION_INTERFACE_MAIL_NOTIFICATION_UNREAD_MAIL_COUNT \
		"org.freedesktop.Telepathy.Connection.Interface.MailNotification.DRAFT.Unre
		adMailCount"

		#define TP_PROP_CONNECTION_INTERFACE_MAIL_NOTIFICATION_UNREAD_MAILS \
		"org.freedesktop.Telepathy.Connection.Interface.MailNotification.DRAFT.Unre
		adMails"

		#define TP_PROP_CONNECTION_INTERFACE_MAIL_NOTIFICATION_MAIL_ADDRESS \
		"org.freedesktop.Telepathy.Connection.Interface.MailNotification.DRAFT.Mail
		Address"

	#define TP_IFACE_CHANNEL \	#define TP_IFACE_CHANNEL \
	"org.freedesktop.Telepathy.Channel"	"org.freedesktop.Telepathy.Channel"

	#define TP_IFACE_QUARK_CHANNEL \	#define TP_IFACE_QUARK_CHANNEL \
	(tp_iface_quark_channel ())	(tp_iface_quark_channel ())

	GQuark tp_iface_quark_channel (void);	GQuark tp_iface_quark_channel (void);

	#define TP_PROP_CHANNEL_CHANNEL_TYPE \	#define TP_PROP_CHANNEL_CHANNEL_TYPE \
	"org.freedesktop.Telepathy.Channel.ChannelType"	"org.freedesktop.Telepathy.Channel.ChannelType"

	skipping to change at line 616	skipping to change at line 647
	(tp_iface_quark_channel_interface_dtmf ())	(tp_iface_quark_channel_interface_dtmf ())

	GQuark tp_iface_quark_channel_interface_dtmf (void);	GQuark tp_iface_quark_channel_interface_dtmf (void);

	#define TP_PROP_CHANNEL_INTERFACE_DTMF_CURRENTLY_SENDING_TONES \	#define TP_PROP_CHANNEL_INTERFACE_DTMF_CURRENTLY_SENDING_TONES \
	"org.freedesktop.Telepathy.Channel.Interface.DTMF.CurrentlySendingTones"	"org.freedesktop.Telepathy.Channel.Interface.DTMF.CurrentlySendingTones"

	#define TP_PROP_CHANNEL_INTERFACE_DTMF_INITIAL_TONES \	#define TP_PROP_CHANNEL_INTERFACE_DTMF_INITIAL_TONES \
	"org.freedesktop.Telepathy.Channel.Interface.DTMF.InitialTones"	"org.freedesktop.Telepathy.Channel.Interface.DTMF.InitialTones"


		#define TP_PROP_CHANNEL_INTERFACE_DTMF_DEFERRED_TONES \
		"org.freedesktop.Telepathy.Channel.Interface.DTMF.DeferredTones"

	#define TP_IFACE_CHANNEL_INTERFACE_GROUP \	#define TP_IFACE_CHANNEL_INTERFACE_GROUP \
	"org.freedesktop.Telepathy.Channel.Interface.Group"	"org.freedesktop.Telepathy.Channel.Interface.Group"

	#define TP_IFACE_QUARK_CHANNEL_INTERFACE_GROUP \	#define TP_IFACE_QUARK_CHANNEL_INTERFACE_GROUP \
	(tp_iface_quark_channel_interface_group ())	(tp_iface_quark_channel_interface_group ())

	GQuark tp_iface_quark_channel_interface_group (void);	GQuark tp_iface_quark_channel_interface_group (void);

	#define TP_PROP_CHANNEL_INTERFACE_GROUP_GROUP_FLAGS \	#define TP_PROP_CHANNEL_INTERFACE_GROUP_GROUP_FLAGS \
	"org.freedesktop.Telepathy.Channel.Interface.Group.GroupFlags"	"org.freedesktop.Telepathy.Channel.Interface.Group.GroupFlags"

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

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

	skipping to change at line 177	skipping to change at line 177
	const gchar *arg_Channel,	const gchar *arg_Channel,
	GHashTable *arg_Details,	GHashTable *arg_Details,
	gpointer user_data, GObject *weak_object);	gpointer user_data, GObject *weak_object);
	TpProxySignalConnection tp_cli_channel_interface_conference_connect_to_cha nnel_removed (TpChannel proxy,	TpProxySignalConnection tp_cli_channel_interface_conference_connect_to_cha nnel_removed (TpChannel proxy,
	tp_cli_channel_interface_conference_signal_callback_channel_removed cal lback,	tp_cli_channel_interface_conference_signal_callback_channel_removed cal lback,
	gpointer user_data,	gpointer user_data,
	GDestroyNotify destroy,	GDestroyNotify destroy,
	GObject *weak_object,	GObject *weak_object,
	GError **error);	GError **error);


		typedef void (*tp_cli_channel_interface_dtmf_signal_callback_tones_deferred
		) (TpChannel *proxy,
		const gchar *arg_Tones,
		gpointer user_data, GObject *weak_object);
		TpProxySignalConnection *tp_cli_channel_interface_dtmf_connect_to_tones_def
		erred (TpChannel *proxy,
		tp_cli_channel_interface_dtmf_signal_callback_tones_deferred callback,
		gpointer user_data,
		GDestroyNotify destroy,
		GObject *weak_object,
		GError **error);

	typedef void (tp_cli_channel_interface_dtmf_signal_callback_sending_tones) (TpChannel proxy,	typedef void (tp_cli_channel_interface_dtmf_signal_callback_sending_tones) (TpChannel proxy,
	const gchar *arg_Tones,	const gchar *arg_Tones,
	gpointer user_data, GObject *weak_object);	gpointer user_data, GObject *weak_object);
	TpProxySignalConnection tp_cli_channel_interface_dtmf_connect_to_sending_t ones (TpChannel proxy,	TpProxySignalConnection tp_cli_channel_interface_dtmf_connect_to_sending_t ones (TpChannel proxy,
	tp_cli_channel_interface_dtmf_signal_callback_sending_tones callback,	tp_cli_channel_interface_dtmf_signal_callback_sending_tones callback,
	gpointer user_data,	gpointer user_data,
	GDestroyNotify destroy,	GDestroyNotify destroy,
	GObject *weak_object,	GObject *weak_object,
	GError **error);	GError **error);


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

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

	skipping to change at line 305	skipping to change at line 305
	#ifndef TP_DISABLE_DEPRECATED	#ifndef TP_DISABLE_DEPRECATED
	gboolean tp_cli_connection_run_request_handles (TpConnection *proxy,	gboolean tp_cli_connection_run_request_handles (TpConnection *proxy,
	gint timeout_ms,	gint timeout_ms,
	guint in_Handle_Type,	guint in_Handle_Type,
	const gchar **in_Identifiers,	const gchar **in_Identifiers,
	GArray **out_Handles,	GArray **out_Handles,
	GError **error,	GError **error,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;	GMainLoop **loop) _TP_GNUC_DEPRECATED;
	#endif /* not TP_DISABLE_DEPRECATED */	#endif /* not TP_DISABLE_DEPRECATED */


		typedef void (*tp_cli_connection_callback_for_add_client_interest) (TpConne
		ction *proxy,
		const GError *error, gpointer user_data,
		GObject *weak_object);

		TpProxyPendingCall *tp_cli_connection_call_add_client_interest (TpConnectio
		n *proxy,
		gint timeout_ms,
		const gchar **in_Tokens,
		tp_cli_connection_callback_for_add_client_interest callback,
		gpointer user_data,
		GDestroyNotify destroy,
		GObject *weak_object);

		#ifndef TP_DISABLE_DEPRECATED
		gboolean tp_cli_connection_run_add_client_interest (TpConnection *proxy,
		gint timeout_ms,
		const gchar **in_Tokens,
		GError **error,
		GMainLoop **loop) _TP_GNUC_DEPRECATED;
		#endif /* not TP_DISABLE_DEPRECATED */

		typedef void (*tp_cli_connection_callback_for_remove_client_interest) (TpCo
		nnection *proxy,
		const GError *error, gpointer user_data,
		GObject *weak_object);

		TpProxyPendingCall *tp_cli_connection_call_remove_client_interest (TpConnec
		tion *proxy,
		gint timeout_ms,
		const gchar **in_Tokens,
		tp_cli_connection_callback_for_remove_client_interest callback,
		gpointer user_data,
		GDestroyNotify destroy,
		GObject *weak_object);

		#ifndef TP_DISABLE_DEPRECATED
		gboolean tp_cli_connection_run_remove_client_interest (TpConnection *proxy,
		gint timeout_ms,
		const gchar **in_Tokens,
		GError **error,
		GMainLoop **loop) _TP_GNUC_DEPRECATED;
		#endif /* not TP_DISABLE_DEPRECATED */

	typedef void (tp_cli_connection_interface_aliasing_signal_callback_aliases _changed) (TpConnection proxy,	typedef void (tp_cli_connection_interface_aliasing_signal_callback_aliases _changed) (TpConnection proxy,
	const GPtrArray *arg_Aliases,	const GPtrArray *arg_Aliases,
	gpointer user_data, GObject *weak_object);	gpointer user_data, GObject *weak_object);
	TpProxySignalConnection tp_cli_connection_interface_aliasing_connect_to_al iases_changed (TpConnection proxy,	TpProxySignalConnection tp_cli_connection_interface_aliasing_connect_to_al iases_changed (TpConnection proxy,
	tp_cli_connection_interface_aliasing_signal_callback_aliases_changed ca llback,	tp_cli_connection_interface_aliasing_signal_callback_aliases_changed ca llback,
	gpointer user_data,	gpointer user_data,
	GDestroyNotify destroy,	GDestroyNotify destroy,
	GObject *weak_object,	GObject *weak_object,
	GError **error);	GError **error);


	skipping to change at line 1292	skipping to change at line 1332
	GObject *weak_object);	GObject *weak_object);

	#ifndef TP_DISABLE_DEPRECATED	#ifndef TP_DISABLE_DEPRECATED
	gboolean tp_cli_connection_interface_location_run_set_location (TpConnectio n *proxy,	gboolean tp_cli_connection_interface_location_run_set_location (TpConnectio n *proxy,
	gint timeout_ms,	gint timeout_ms,
	GHashTable *in_Location,	GHashTable *in_Location,
	GError **error,	GError **error,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;	GMainLoop **loop) _TP_GNUC_DEPRECATED;
	#endif /* not TP_DISABLE_DEPRECATED */	#endif /* not TP_DISABLE_DEPRECATED */


		typedef void (*tp_cli_connection_interface_mail_notification_signal_callbac
		k_mails_received) (TpConnection *proxy,
		const GPtrArray *arg_Mails,
		gpointer user_data, GObject *weak_object);
		TpProxySignalConnection *tp_cli_connection_interface_mail_notification_conn
		ect_to_mails_received (TpConnection *proxy,
		tp_cli_connection_interface_mail_notification_signal_callback_mails_rec
		eived callback,
		gpointer user_data,
		GDestroyNotify destroy,
		GObject *weak_object,
		GError **error);

		typedef void (*tp_cli_connection_interface_mail_notification_signal_callbac
		k_unread_mails_changed) (TpConnection *proxy,
		guint arg_Count,
		const GPtrArray *arg_Mails_Added,
		const gchar **arg_Mails_Removed,
		gpointer user_data, GObject *weak_object);
		TpProxySignalConnection *tp_cli_connection_interface_mail_notification_conn
		ect_to_unread_mails_changed (TpConnection *proxy,
		tp_cli_connection_interface_mail_notification_signal_callback_unread_ma
		ils_changed callback,
		gpointer user_data,
		GDestroyNotify destroy,
		GObject *weak_object,
		GError **error);

		typedef void (*tp_cli_connection_interface_mail_notification_callback_for_r
		equest_inbox_url) (TpConnection *proxy,
		const GValueArray *out_URL,
		const GError *error, gpointer user_data,
		GObject *weak_object);

		TpProxyPendingCall *tp_cli_connection_interface_mail_notification_call_requ
		est_inbox_url (TpConnection *proxy,
		gint timeout_ms,
		tp_cli_connection_interface_mail_notification_callback_for_request_inbo
		x_url callback,
		gpointer user_data,
		GDestroyNotify destroy,
		GObject *weak_object);

		#ifndef TP_DISABLE_DEPRECATED
		gboolean tp_cli_connection_interface_mail_notification_run_request_inbox_ur
		l (TpConnection *proxy,
		gint timeout_ms,
		GValueArray **out_URL,
		GError **error,
		GMainLoop **loop) _TP_GNUC_DEPRECATED;
		#endif /* not TP_DISABLE_DEPRECATED */

		typedef void (*tp_cli_connection_interface_mail_notification_callback_for_r
		equest_mail_url) (TpConnection *proxy,
		const GValueArray *out_URL,
		const GError *error, gpointer user_data,
		GObject *weak_object);

		TpProxyPendingCall *tp_cli_connection_interface_mail_notification_call_requ
		est_mail_url (TpConnection *proxy,
		gint timeout_ms,
		const gchar *in_ID,
		const GValue *in_URL_Data,
		tp_cli_connection_interface_mail_notification_callback_for_request_mail
		_url callback,
		gpointer user_data,
		GDestroyNotify destroy,
		GObject *weak_object);

		#ifndef TP_DISABLE_DEPRECATED
		gboolean tp_cli_connection_interface_mail_notification_run_request_mail_url
		(TpConnection *proxy,
		gint timeout_ms,
		const gchar *in_ID,
		const GValue *in_URL_Data,
		GValueArray **out_URL,
		GError **error,
		GMainLoop **loop) _TP_GNUC_DEPRECATED;
		#endif /* not TP_DISABLE_DEPRECATED */

	typedef void (tp_cli_connection_interface_presence_signal_callback_presenc e_update) (TpConnection proxy,	typedef void (tp_cli_connection_interface_presence_signal_callback_presenc e_update) (TpConnection proxy,
	GHashTable *arg_Presence,	GHashTable *arg_Presence,
	gpointer user_data, GObject *weak_object);	gpointer user_data, GObject *weak_object);
	TpProxySignalConnection tp_cli_connection_interface_presence_connect_to_pr esence_update (TpConnection proxy,	TpProxySignalConnection tp_cli_connection_interface_presence_connect_to_pr esence_update (TpConnection proxy,
	tp_cli_connection_interface_presence_signal_callback_presence_update ca llback,	tp_cli_connection_interface_presence_signal_callback_presence_update ca llback,
	gpointer user_data,	gpointer user_data,
	GDestroyNotify destroy,	GDestroyNotify destroy,
	GObject *weak_object,	GObject *weak_object,
	GError **error);	GError **error);


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

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

	skipping to change at line 237	skipping to change at line 237
	void tp_svc_channel_interface_dtmf_implement_multiple_tones (TpSvcChannelIn terfaceDTMFClass *klass, tp_svc_channel_interface_dtmf_multiple_tones_impl impl);	void tp_svc_channel_interface_dtmf_implement_multiple_tones (TpSvcChannelIn terfaceDTMFClass *klass, tp_svc_channel_interface_dtmf_multiple_tones_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_interface_dtmf_return_from_multiple_tones (DBusGMethodI nvocation *context);	void tp_svc_channel_interface_dtmf_return_from_multiple_tones (DBusGMethodI nvocation *context);
	static inline void	static inline void
	tp_svc_channel_interface_dtmf_return_from_multiple_tones (DBusGMethodInvoca tion *context)	tp_svc_channel_interface_dtmf_return_from_multiple_tones (DBusGMethodInvoca tion *context)
	{	{
	dbus_g_method_return (context);	dbus_g_method_return (context);
	}	}


		void tp_svc_channel_interface_dtmf_emit_tones_deferred (gpointer instance,
		const gchar *arg_Tones);
	void tp_svc_channel_interface_dtmf_emit_sending_tones (gpointer instance,	void tp_svc_channel_interface_dtmf_emit_sending_tones (gpointer instance,
	const gchar *arg_Tones);	const gchar *arg_Tones);
	void tp_svc_channel_interface_dtmf_emit_stopped_tones (gpointer instance,	void tp_svc_channel_interface_dtmf_emit_stopped_tones (gpointer instance,
	gboolean arg_Cancelled);	gboolean arg_Cancelled);

	typedef struct _TpSvcChannelInterfaceDestroyable TpSvcChannelInterfaceDestr oyable;	typedef struct _TpSvcChannelInterfaceDestroyable TpSvcChannelInterfaceDestr oyable;

	typedef struct _TpSvcChannelInterfaceDestroyableClass TpSvcChannelInterface DestroyableClass;	typedef struct _TpSvcChannelInterfaceDestroyableClass TpSvcChannelInterface DestroyableClass;

	GType tp_svc_channel_interface_destroyable_get_type (void);	GType tp_svc_channel_interface_destroyable_get_type (void);

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

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

	skipping to change at line 201	skipping to change at line 201
	void tp_svc_connection_return_from_request_handles (DBusGMethodInvocation * context,	void tp_svc_connection_return_from_request_handles (DBusGMethodInvocation * context,
	const GArray *out_Handles);	const GArray *out_Handles);
	static inline void	static inline void
	tp_svc_connection_return_from_request_handles (DBusGMethodInvocation *conte xt,	tp_svc_connection_return_from_request_handles (DBusGMethodInvocation *conte xt,
	const GArray *out_Handles)	const GArray *out_Handles)
	{	{
	dbus_g_method_return (context,	dbus_g_method_return (context,
	out_Handles);	out_Handles);
	}	}


		typedef void (*tp_svc_connection_add_client_interest_impl) (TpSvcConnection
		*self,
		const gchar **in_Tokens,
		DBusGMethodInvocation *context);
		void tp_svc_connection_implement_add_client_interest (TpSvcConnectionClass
		*klass, tp_svc_connection_add_client_interest_impl impl);
		static inline
		/* this comment is to stop gtkdoc realising this is static */
		void tp_svc_connection_return_from_add_client_interest (DBusGMethodInvocati
		on *context);
		static inline void
		tp_svc_connection_return_from_add_client_interest (DBusGMethodInvocation *c
		ontext)
		{
		dbus_g_method_return (context);
		}

		typedef void (*tp_svc_connection_remove_client_interest_impl) (TpSvcConnect
		ion *self,
		const gchar **in_Tokens,
		DBusGMethodInvocation *context);
		void tp_svc_connection_implement_remove_client_interest (TpSvcConnectionCla
		ss *klass, tp_svc_connection_remove_client_interest_impl impl);
		static inline
		/* this comment is to stop gtkdoc realising this is static */
		void tp_svc_connection_return_from_remove_client_interest (DBusGMethodInvoc
		ation *context);
		static inline void
		tp_svc_connection_return_from_remove_client_interest (DBusGMethodInvocation
		*context)
		{
		dbus_g_method_return (context);
		}

	void tp_svc_connection_emit_self_handle_changed (gpointer instance,	void tp_svc_connection_emit_self_handle_changed (gpointer instance,
	guint arg_Self_Handle);	guint arg_Self_Handle);
	void tp_svc_connection_emit_new_channel (gpointer instance,	void tp_svc_connection_emit_new_channel (gpointer instance,
	const gchar *arg_Object_Path,	const gchar *arg_Object_Path,
	const gchar *arg_Channel_Type,	const gchar *arg_Channel_Type,
	guint arg_Handle_Type,	guint arg_Handle_Type,
	guint arg_Handle,	guint arg_Handle,
	gboolean arg_Suppress_Handler);	gboolean arg_Suppress_Handler);
	void tp_svc_connection_emit_connection_error (gpointer instance,	void tp_svc_connection_emit_connection_error (gpointer instance,
	const gchar *arg_Error,	const gchar *arg_Error,

	skipping to change at line 1019	skipping to change at line 1045
	static inline void	static inline void
	tp_svc_connection_interface_location_return_from_set_location (DBusGMethodI nvocation *context)	tp_svc_connection_interface_location_return_from_set_location (DBusGMethodI nvocation *context)
	{	{
	dbus_g_method_return (context);	dbus_g_method_return (context);
	}	}

	void tp_svc_connection_interface_location_emit_location_updated (gpointer i nstance,	void tp_svc_connection_interface_location_emit_location_updated (gpointer i nstance,
	guint arg_Contact,	guint arg_Contact,
	GHashTable *arg_Location);	GHashTable *arg_Location);


		typedef struct _TpSvcConnectionInterfaceMailNotification TpSvcConnectionInt
		erfaceMailNotification;

		typedef struct _TpSvcConnectionInterfaceMailNotificationClass TpSvcConnecti
		onInterfaceMailNotificationClass;

		GType tp_svc_connection_interface_mail_notification_get_type (void);
		#define TP_TYPE_SVC_CONNECTION_INTERFACE_MAIL_NOTIFICATION \
		(tp_svc_connection_interface_mail_notification_get_type ())
		#define TP_SVC_CONNECTION_INTERFACE_MAIL_NOTIFICATION(obj) \
		(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_MAIL_
		NOTIFICATION, TpSvcConnectionInterfaceMailNotification))
		#define TP_IS_SVC_CONNECTION_INTERFACE_MAIL_NOTIFICATION(obj) \
		(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_MAIL_
		NOTIFICATION))
		#define TP_SVC_CONNECTION_INTERFACE_MAIL_NOTIFICATION_GET_CLASS(obj) \
		(G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_MA
		IL_NOTIFICATION, TpSvcConnectionInterfaceMailNotificationClass))

		typedef void (*tp_svc_connection_interface_mail_notification_request_inbox_
		url_impl) (TpSvcConnectionInterfaceMailNotification *self,
		DBusGMethodInvocation *context);
		void tp_svc_connection_interface_mail_notification_implement_request_inbox_
		url (TpSvcConnectionInterfaceMailNotificationClass *klass, tp_svc_connectio
		n_interface_mail_notification_request_inbox_url_impl impl);
		static inline
		/* this comment is to stop gtkdoc realising this is static */
		void tp_svc_connection_interface_mail_notification_return_from_request_inbo
		x_url (DBusGMethodInvocation *context,
		const GValueArray *out_URL);
		static inline void
		tp_svc_connection_interface_mail_notification_return_from_request_inbox_url
		(DBusGMethodInvocation *context,
		const GValueArray *out_URL)
		{
		dbus_g_method_return (context,
		out_URL);
		}

		typedef void (*tp_svc_connection_interface_mail_notification_request_mail_u
		rl_impl) (TpSvcConnectionInterfaceMailNotification *self,
		const gchar *in_ID,
		const GValue *in_URL_Data,
		DBusGMethodInvocation *context);
		void tp_svc_connection_interface_mail_notification_implement_request_mail_u
		rl (TpSvcConnectionInterfaceMailNotificationClass *klass, tp_svc_connection
		_interface_mail_notification_request_mail_url_impl impl);
		static inline
		/* this comment is to stop gtkdoc realising this is static */
		void tp_svc_connection_interface_mail_notification_return_from_request_mail
		_url (DBusGMethodInvocation *context,
		const GValueArray *out_URL);
		static inline void
		tp_svc_connection_interface_mail_notification_return_from_request_mail_url
		(DBusGMethodInvocation *context,
		const GValueArray *out_URL)
		{
		dbus_g_method_return (context,
		out_URL);
		}

		void tp_svc_connection_interface_mail_notification_emit_mails_received (gpo
		inter instance,
		const GPtrArray *arg_Mails);
		void tp_svc_connection_interface_mail_notification_emit_unread_mails_change
		d (gpointer instance,
		guint arg_Count,
		const GPtrArray *arg_Mails_Added,
		const gchar **arg_Mails_Removed);

	typedef struct _TpSvcConnectionInterfacePresence TpSvcConnectionInterfacePr esence;	typedef struct _TpSvcConnectionInterfacePresence TpSvcConnectionInterfacePr esence;

	typedef struct _TpSvcConnectionInterfacePresenceClass TpSvcConnectionInterf acePresenceClass;	typedef struct _TpSvcConnectionInterfacePresenceClass TpSvcConnectionInterf acePresenceClass;

	GType tp_svc_connection_interface_presence_get_type (void);	GType tp_svc_connection_interface_presence_get_type (void);
	#define TP_TYPE_SVC_CONNECTION_INTERFACE_PRESENCE \	#define TP_TYPE_SVC_CONNECTION_INTERFACE_PRESENCE \
	(tp_svc_connection_interface_presence_get_type ())	(tp_svc_connection_interface_presence_get_type ())
	#define TP_SVC_CONNECTION_INTERFACE_PRESENCE(obj) \	#define TP_SVC_CONNECTION_INTERFACE_PRESENCE(obj) \
	(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_PRESE NCE, TpSvcConnectionInterfacePresence))	(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_PRESE NCE, TpSvcConnectionInterfacePresence))
	#define TP_IS_SVC_CONNECTION_INTERFACE_PRESENCE(obj) \	#define TP_IS_SVC_CONNECTION_INTERFACE_PRESENCE(obj) \

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

	tp-svc-protocol.h	tp-svc-protocol.h

	skipping to change at line 53	skipping to change at line 53
	void tp_svc_protocol_return_from_normalize_contact (DBusGMethodInvocation * context,	void tp_svc_protocol_return_from_normalize_contact (DBusGMethodInvocation * context,
	const gchar *out_Normalized_Contact_ID);	const gchar *out_Normalized_Contact_ID);
	static inline void	static inline void
	tp_svc_protocol_return_from_normalize_contact (DBusGMethodInvocation *conte xt,	tp_svc_protocol_return_from_normalize_contact (DBusGMethodInvocation *conte xt,
	const gchar *out_Normalized_Contact_ID)	const gchar *out_Normalized_Contact_ID)
	{	{
	dbus_g_method_return (context,	dbus_g_method_return (context,
	out_Normalized_Contact_ID);	out_Normalized_Contact_ID);
	}	}


		typedef struct _TpSvcProtocolInterfacePresence TpSvcProtocolInterfacePresen
		ce;

		typedef struct _TpSvcProtocolInterfacePresenceClass TpSvcProtocolInterfaceP
		resenceClass;

		GType tp_svc_protocol_interface_presence_get_type (void);
		#define TP_TYPE_SVC_PROTOCOL_INTERFACE_PRESENCE \
		(tp_svc_protocol_interface_presence_get_type ())
		#define TP_SVC_PROTOCOL_INTERFACE_PRESENCE(obj) \
		(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_PROTOCOL_INTERFACE_PRESENC
		E, TpSvcProtocolInterfacePresence))
		#define TP_IS_SVC_PROTOCOL_INTERFACE_PRESENCE(obj) \
		(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_PROTOCOL_INTERFACE_PRESENC
		E))
		#define TP_SVC_PROTOCOL_INTERFACE_PRESENCE_GET_CLASS(obj) \
		(G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_PROTOCOL_INTERFACE_PRES
		ENCE, TpSvcProtocolInterfacePresenceClass))

	G_END_DECLS	G_END_DECLS

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

	errors.h	errors.h

	skipping to change at line 87	skipping to change at line 87
	TP_ERROR_CONNECTION_REPLACED, /< nick=ConnectionReplaced >/	TP_ERROR_CONNECTION_REPLACED, /< nick=ConnectionReplaced >/
	TP_ERROR_REGISTRATION_EXISTS, /< nick=RegistrationExists >/	TP_ERROR_REGISTRATION_EXISTS, /< nick=RegistrationExists >/
	TP_ERROR_SERVICE_BUSY, /< nick=ServiceBusy >/	TP_ERROR_SERVICE_BUSY, /< nick=ServiceBusy >/
	TP_ERROR_RESOURCE_UNAVAILABLE, /< nick=ResourceUnavailable >/	TP_ERROR_RESOURCE_UNAVAILABLE, /< nick=ResourceUnavailable >/
	TP_ERROR_WOULD_BREAK_ANONYMITY, /< nick=WouldBreakAnonymity >/	TP_ERROR_WOULD_BREAK_ANONYMITY, /< nick=WouldBreakAnonymity >/
	TP_ERROR_CERT_REVOKED, /< nick=Cert.Revoked >/	TP_ERROR_CERT_REVOKED, /< nick=Cert.Revoked >/
	TP_ERROR_CERT_INSECURE, /< nick=Cert.Insecure >/	TP_ERROR_CERT_INSECURE, /< nick=Cert.Insecure >/
	TP_ERROR_CERT_LIMIT_EXCEEDED, /< nick=Cert.LimitExceeded >/	TP_ERROR_CERT_LIMIT_EXCEEDED, /< nick=Cert.LimitExceeded >/
	TP_ERROR_NOT_YET, /< nick=NotYet >/	TP_ERROR_NOT_YET, /< nick=NotYet >/
	TP_ERROR_REJECTED, /< nick=Rejected >/	TP_ERROR_REJECTED, /< nick=Rejected >/

		TP_ERROR_PICKED_UP_ELSEWHERE, /< nick=PickedUpElsewhere >/
	} TpError;	} TpError;

	const gchar *tp_error_get_dbus_name (TpError error);	const gchar *tp_error_get_dbus_name (TpError error);

	G_END_DECLS	G_END_DECLS

	#endif	#endif

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

	telepathy-glib.h	telepathy-glib.h

	skipping to change at line 50	skipping to change at line 50
	#include <telepathy-glib/basic-proxy-factory.h>	#include <telepathy-glib/basic-proxy-factory.h>
	#include <telepathy-glib/channel-dispatch-operation.h>	#include <telepathy-glib/channel-dispatch-operation.h>
	#include <telepathy-glib/channel-dispatcher.h>	#include <telepathy-glib/channel-dispatcher.h>
	#include <telepathy-glib/channel-request.h>	#include <telepathy-glib/channel-request.h>
	#include <telepathy-glib/channel.h>	#include <telepathy-glib/channel.h>
	#include <telepathy-glib/client-channel-factory.h>	#include <telepathy-glib/client-channel-factory.h>
	#include <telepathy-glib/connection-manager.h>	#include <telepathy-glib/connection-manager.h>
	#include <telepathy-glib/connection.h>	#include <telepathy-glib/connection.h>
	#include <telepathy-glib/contact.h>	#include <telepathy-glib/contact.h>
	#include <telepathy-glib/dbus.h>	#include <telepathy-glib/dbus.h>

		#include <telepathy-glib/dtmf.h>
	#include <telepathy-glib/debug.h>	#include <telepathy-glib/debug.h>
	#include <telepathy-glib/handle.h>	#include <telepathy-glib/handle.h>
	#include <telepathy-glib/proxy.h>	#include <telepathy-glib/proxy.h>
	#include <telepathy-glib/simple-approver.h>	#include <telepathy-glib/simple-approver.h>
	#include <telepathy-glib/simple-handler.h>	#include <telepathy-glib/simple-handler.h>
	#include <telepathy-glib/simple-observer.h>	#include <telepathy-glib/simple-observer.h>
	#include <telepathy-glib/stream-tube-channel.h>	#include <telepathy-glib/stream-tube-channel.h>
	#include <telepathy-glib/stream-tube-connection.h>	#include <telepathy-glib/stream-tube-connection.h>

	#include <telepathy-glib/svc-generic.h>	#include <telepathy-glib/svc-generic.h>

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