libtelepathy-glib: headers diff between 0.11.2 and 0.11.3 versions

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

	skipping to change at line 30	skipping to change at line 30
	*/	*/

	#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/defs.h>	#include <telepathy-glib/defs.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 struct _TpCMParamSpec TpCMParamSpec;

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

	gboolean tp_cm_param_filter_string_nonempty (const TpCMParamSpec *paramspec ,	gboolean tp_cm_param_filter_string_nonempty (const TpCMParamSpec *paramspec ,

	skipping to change at line 128	skipping to change at line 129
	/<private>/	/<private>/
	GObject parent;	GObject parent;

	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 (
		TpBaseConnectionManager *self);

	/* 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. 2 change blocks.
	0 lines changed or deleted	4 lines changed or added

	base-connection.h	base-connection.h

	skipping to change at line 32	skipping to change at line 32
	#ifndef __TP_BASE_CONNECTION_H__	#ifndef __TP_BASE_CONNECTION_H__
	#define __TP_BASE_CONNECTION_H__	#define __TP_BASE_CONNECTION_H__

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

	#include <telepathy-glib/channel-manager.h>	#include <telepathy-glib/channel-manager.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-repo.h>	#include <telepathy-glib/handle-repo.h>

		#include <telepathy-glib/proxy.h>
	#include <telepathy-glib/svc-connection.h>	#include <telepathy-glib/svc-connection.h>

	G_BEGIN_DECLS	G_BEGIN_DECLS

	typedef struct _TpBaseConnection TpBaseConnection;	typedef struct _TpBaseConnection TpBaseConnection;
	typedef struct _TpBaseConnectionClass TpBaseConnectionClass;	typedef struct _TpBaseConnectionClass TpBaseConnectionClass;
	typedef struct _TpBaseConnectionPrivate TpBaseConnectionPrivate;	typedef struct _TpBaseConnectionPrivate TpBaseConnectionPrivate;

	typedef void (TpBaseConnectionProc) (TpBaseConnection self);	typedef void (TpBaseConnectionProc) (TpBaseConnection self);


	skipping to change at line 192	skipping to change at line 193
	if (c->status != TP_CONNECTION_STATUS_CONNECTED) \	if (c->status != TP_CONNECTION_STATUS_CONNECTED) \
	{ \	{ \
	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);

	G_END_DECLS	G_END_DECLS

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

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

	channel.h	channel.h

	skipping to change at line 117	skipping to change at line 117
	TpChannelGroupFlags tp_channel_group_get_flags (TpChannel *self);	TpChannelGroupFlags tp_channel_group_get_flags (TpChannel *self);
	const TpIntSet tp_channel_group_get_members (TpChannel self);	const TpIntSet tp_channel_group_get_members (TpChannel self);
	const TpIntSet tp_channel_group_get_local_pending (TpChannel self);	const TpIntSet tp_channel_group_get_local_pending (TpChannel self);
	const TpIntSet tp_channel_group_get_remote_pending (TpChannel self);	const TpIntSet tp_channel_group_get_remote_pending (TpChannel self);
	gboolean tp_channel_group_get_local_pending_info (TpChannel *self,	gboolean tp_channel_group_get_local_pending_info (TpChannel *self,
	TpHandle local_pending, TpHandle *actor,	TpHandle local_pending, TpHandle *actor,
	TpChannelGroupChangeReason reason, const gchar *message);	TpChannelGroupChangeReason reason, const gchar *message);

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


		#define TP_CHANNEL_FEATURE_CORE \
		tp_channel_get_feature_quark_core ()

		GQuark tp_channel_get_feature_quark_core (void) G_GNUC_CONST;

		#define TP_CHANNEL_FEATURE_GROUP \
		tp_channel_get_feature_quark_group ()
		GQuark tp_channel_get_feature_quark_group (void) G_GNUC_CONST;

		#define TP_CHANNEL_FEATURE_CHAT_STATES \
		tp_channel_get_feature_quark_chat_states ()
		GQuark tp_channel_get_feature_quark_chat_states (void) G_GNUC_CONST;
		TpChannelChatState tp_channel_get_chat_state (TpChannel *self,
		TpHandle contact);

	G_END_DECLS	G_END_DECLS

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

	#endif	#endif

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

	connection-manager.h	connection-manager.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/proxy.h>	#include <telepathy-glib/proxy.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;

	GType tp_connection_manager_get_type (void);	GType tp_connection_manager_get_type (void);

		GType tp_connection_manager_param_get_type (void);
		GType tp_connection_manager_protocol_get_type (void);

	/* TYPE MACROS */	/* TYPE MACROS */
	#define TP_TYPE_CONNECTION_MANAGER \	#define TP_TYPE_CONNECTION_MANAGER \
	(tp_connection_manager_get_type ())	(tp_connection_manager_get_type ())
	#define TP_CONNECTION_MANAGER(obj) \	#define TP_CONNECTION_MANAGER(obj) \
	(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_CONNECTION_MANAGER, \	(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_CONNECTION_MANAGER, \
	TpConnectionManager))	TpConnectionManager))
	#define TP_CONNECTION_MANAGER_CLASS(klass) \	#define TP_CONNECTION_MANAGER_CLASS(klass) \
	(G_TYPE_CHECK_CLASS_CAST((klass), TP_TYPE_CONNECTION_MANAGER, \	(G_TYPE_CHECK_CLASS_CAST((klass), TP_TYPE_CONNECTION_MANAGER, \
	TpConnectionManagerClass))	TpConnectionManagerClass))
	#define TP_IS_CONNECTION_MANAGER(obj) \	#define TP_IS_CONNECTION_MANAGER(obj) \
	(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_CONNECTION_MANAGER))	(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_CONNECTION_MANAGER))
	#define TP_IS_CONNECTION_MANAGER_CLASS(klass) \	#define TP_IS_CONNECTION_MANAGER_CLASS(klass) \
	(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 \
		(tp_connection_manager_param_get_type ())
		#define TP_TYPE_CONNECTION_MANAGER_PROTOCOL \
		(tp_connection_manager_protocol_get_type ())

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

	gpointer priv;	gpointer priv;

	skipping to change at line 176	skipping to change at line 183
	const TpConnectionManagerParam *param);	const TpConnectionManagerParam *param);
	gboolean tp_connection_manager_param_is_secret (	gboolean tp_connection_manager_param_is_secret (
	const TpConnectionManagerParam *param);	const TpConnectionManagerParam *param);
	gboolean tp_connection_manager_param_is_dbus_property (	gboolean tp_connection_manager_param_is_dbus_property (
	const TpConnectionManagerParam *param);	const TpConnectionManagerParam *param);
	gboolean tp_connection_manager_param_get_default (	gboolean tp_connection_manager_param_get_default (
	const TpConnectionManagerParam param, GValue value);	const TpConnectionManagerParam param, GValue value);

	void tp_connection_manager_init_known_interfaces (void);	void tp_connection_manager_init_known_interfaces (void);


		#define TP_CONNECTION_MANAGER_FEATURE_CORE \
		(tp_connection_manager_get_feature_quark_core ())

		GQuark tp_connection_manager_get_feature_quark_core (void) G_GNUC_CONST;

		TpConnectionManagerParam *tp_connection_manager_param_copy (
		const TpConnectionManagerParam *in);
		void tp_connection_manager_param_free (TpConnectionManagerParam *param);
		TpConnectionManagerProtocol *tp_connection_manager_protocol_copy (
		const TpConnectionManagerProtocol *in);
		void tp_connection_manager_protocol_free (TpConnectionManagerProtocol *prot
		o);

	G_END_DECLS	G_END_DECLS

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

	#endif	#endif

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

	connection.h	connection.h

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

	#ifndef __TP_CONNECTION_H__	#ifndef __TP_CONNECTION_H__
	#define __TP_CONNECTION_H__	#define __TP_CONNECTION_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 _TpConnection TpConnection;	typedef struct _TpConnection TpConnection;
	typedef struct _TpConnectionPrivate TpConnectionPrivate;	typedef struct _TpConnectionPrivate TpConnectionPrivate;
	typedef struct _TpConnectionClass TpConnectionClass;	typedef struct _TpConnectionClass TpConnectionClass;

	skipping to change at line 83	skipping to change at line 84
	TpConnectionClass))	TpConnectionClass))

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

	gboolean tp_connection_is_ready (TpConnection *self);	gboolean tp_connection_is_ready (TpConnection *self);

	#ifndef TP_DISABLE_DEPRECATED	#ifndef TP_DISABLE_DEPRECATED
	gboolean tp_connection_run_until_ready (TpConnection *self,	gboolean tp_connection_run_until_ready (TpConnection *self,
	gboolean connect, GError **error,	gboolean connect, GError **error,
	GMainLoop **loop) _TP_GNUC_DEPRECATED;	GMainLoop **loop) _TP_GNUC_DEPRECATED;
	#endif	#endif

	typedef void (TpConnectionWhenReadyCb) (TpConnection connection,	typedef void (TpConnectionWhenReadyCb) (TpConnection connection,
	const GError *error, gpointer user_data);	const GError *error, gpointer user_data);

	skipping to change at line 115	skipping to change at line 118
	GObject *weak_object);	GObject *weak_object);

	void tp_connection_init_known_interfaces (void);	void tp_connection_init_known_interfaces (void);

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


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

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

		#define TP_CONNECTION_FEATURE_CAPABILITIES \
		(tp_connection_get_feature_quark_capabilities ())
		GQuark tp_connection_get_feature_quark_capabilities (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);

	void tp_connection_hold_handles (TpConnection *self, gint timeout_ms,	void tp_connection_hold_handles (TpConnection *self, gint timeout_ms,
	TpHandleType handle_type, guint n_handles, const TpHandle *handles,	TpHandleType handle_type, guint n_handles, const TpHandle *handles,
	TpConnectionHoldHandlesCb callback,	TpConnectionHoldHandlesCb callback,
	gpointer user_data, GDestroyNotify destroy, GObject *weak_object);	gpointer user_data, GDestroyNotify destroy, GObject *weak_object);

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

	dbus-daemon.h	dbus-daemon.h

	skipping to change at line 90	skipping to change at line 90
	typedef void (TpDBusDaemonListNamesCb) (TpDBusDaemon bus_daemon,	typedef void (TpDBusDaemonListNamesCb) (TpDBusDaemon bus_daemon,
	const gchar * const names, const GError error, gpointer user_data,	const gchar * const names, const GError error, gpointer user_data,
	GObject *weak_object);	GObject *weak_object);
	void tp_dbus_daemon_list_names (TpDBusDaemon *self,	void tp_dbus_daemon_list_names (TpDBusDaemon *self,
	gint timeout_ms, TpDBusDaemonListNamesCb callback,	gint timeout_ms, TpDBusDaemonListNamesCb callback,
	gpointer user_data, GDestroyNotify destroy, GObject *weak_object);	gpointer user_data, GDestroyNotify destroy, GObject *weak_object);
	void tp_dbus_daemon_list_activatable_names (TpDBusDaemon *self,	void tp_dbus_daemon_list_activatable_names (TpDBusDaemon *self,
	gint timeout_ms, TpDBusDaemonListNamesCb callback,	gint timeout_ms, TpDBusDaemonListNamesCb callback,
	gpointer user_data, GDestroyNotify destroy, GObject *weak_object);	gpointer user_data, GDestroyNotify destroy, GObject *weak_object);


		void tp_dbus_daemon_register_object (TpDBusDaemon *self,
		const gchar *object_path, gpointer object);
		void tp_dbus_daemon_unregister_object (TpDBusDaemon *self, gpointer object)
		;

	G_END_DECLS	G_END_DECLS

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

	#endif	#endif

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

	intset.h	intset.h
	/* tp-intset.h - Headers for a Glib-link set of integers	/* tp-intset.h - Headers for a Glib-link set of integers
	*	*

	* Copyright (C) 2005, 2006 Collabora Ltd. <http://www.collabora.co.uk/>	* Copyright © 2005-2010 Collabora Ltd. <http://www.collabora.co.uk/>
	* Copyright (C) 2005, 2006 Nokia Corporation	* Copyright © 2005-2006 Nokia Corporation
	*	*
	* This library is free software; you can redistribute it and/or	* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU Lesser General Public License	* modify it under the terms of the GNU Lesser General Public License
	* as published by the Free Software Foundation; either version 2.1 of	* as published by the Free Software Foundation; either version 2.1 of
	* the License, or (at your option) any later version.	* the License, or (at your option) any later version.
	*	*
	* This library is distributed in the hope that it will be useful, but	* This library is distributed in the hope that it will be useful, but
	* WITHOUT ANY WARRANTY; without even the implied warranty of	* WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.	* Lesser General Public License for more details.

	skipping to change at line 30	skipping to change at line 30
	*	*
	*/	*/

	#ifndef __TP_INTSET_H__	#ifndef __TP_INTSET_H__
	#define __TP_INTSET_H__	#define __TP_INTSET_H__

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

	G_BEGIN_DECLS	G_BEGIN_DECLS


	/**	#define TP_TYPE_INTSET (tp_intset_get_type ())
	* TpIntSet:	GType tp_intset_get_type (void);
	*
	* Opaque type representing a set of unsigned integers.
	*/
	typedef struct _TpIntSet TpIntSet;	typedef struct _TpIntSet TpIntSet;


	/**
	* TpIntFunc:
	* @i: The relevant integer
	* @userdata: Opaque user data
	*
	* A callback function acting on unsigned integers.
	*/
	typedef void (*TpIntFunc) (guint i, gpointer userdata);	typedef void (*TpIntFunc) (guint i, gpointer userdata);

	TpIntSet *tp_intset_new (void) G_GNUC_WARN_UNUSED_RESULT;	TpIntSet *tp_intset_new (void) G_GNUC_WARN_UNUSED_RESULT;
	TpIntSet *tp_intset_sized_new (guint size) G_GNUC_WARN_UNUSED_RESULT;	TpIntSet *tp_intset_sized_new (guint size) G_GNUC_WARN_UNUSED_RESULT;
	TpIntSet *tp_intset_new_containing (guint element) G_GNUC_WARN_UNUSED_RESUL T;	TpIntSet *tp_intset_new_containing (guint element) G_GNUC_WARN_UNUSED_RESUL T;
	void tp_intset_destroy (TpIntSet *set);	void tp_intset_destroy (TpIntSet *set);
	void tp_intset_clear (TpIntSet *set);	void tp_intset_clear (TpIntSet *set);

	void tp_intset_add (TpIntSet *set, guint element);	void tp_intset_add (TpIntSet *set, guint element);
	gboolean tp_intset_remove (TpIntSet *set, guint element);	gboolean tp_intset_remove (TpIntSet *set, guint element);

	skipping to change at line 81	skipping to change at line 72
	G_GNUC_WARN_UNUSED_RESULT;	G_GNUC_WARN_UNUSED_RESULT;
	TpIntSet tp_intset_difference (const TpIntSet left, const TpIntSet *right )	TpIntSet tp_intset_difference (const TpIntSet left, const TpIntSet *right )
	G_GNUC_WARN_UNUSED_RESULT;	G_GNUC_WARN_UNUSED_RESULT;
	TpIntSet tp_intset_symmetric_difference (const TpIntSet left,	TpIntSet tp_intset_symmetric_difference (const TpIntSet left,
	const TpIntSet *right) G_GNUC_WARN_UNUSED_RESULT;	const TpIntSet *right) G_GNUC_WARN_UNUSED_RESULT;

	gchar tp_intset_dump (const TpIntSet set) G_GNUC_WARN_UNUSED_RESULT;	gchar tp_intset_dump (const TpIntSet set) G_GNUC_WARN_UNUSED_RESULT;

	typedef struct _TpIntSetIter TpIntSetIter;	typedef struct _TpIntSetIter TpIntSetIter;


	/**
	* TpIntSetIter:
	* @set: The set iterated over.
	* @element: Must be (guint)(-1) before iteration starts. Set to the next
	* element in the set by tp_intset_iter_next(); undefined after
	* tp_intset_iter_next() returns %FALSE.
	*
	* A structure representing iteration over a set of integers. Must be
	* initialized with either TP_INTSET_ITER_INIT() or tp_intset_iter_init().
	*/
	struct _TpIntSetIter	struct _TpIntSetIter
	{	{
	const TpIntSet *set;	const TpIntSet *set;
	guint element;	guint element;
	};	};


	/**
	* TP_INTSET_ITER_INIT:
	* @set: A set of integers
	*
	* A suitable static initializer for a #TpIntSetIter, to be used as follows
	:
	*
	* <informalexample><programlisting>
	* void
	* do_something (const TpIntSet *intset)
	* {
	* TpIntSetIter iter = TP_INTSET_ITER_INIT (intset);
	* /<!-- -->* ... do something with iter ... *<!-- -->/
	* }
	* </programlisting></informalexample>
	*/
	#define TP_INTSET_ITER_INIT(set) { (set), (guint)(-1) }	#define TP_INTSET_ITER_INIT(set) { (set), (guint)(-1) }


	/**
	* tp_intset_iter_init:
	* @iter: An integer set iterator to be initialized.
	* @set: An integer set to be used by that iterator
	*
	* Reset the iterator @iter to the beginning and make it iterate over @set.
	*/
	#define tp_intset_iter_init(iter, set) tp_intset_iter_init_inline (iter, se t)	#define tp_intset_iter_init(iter, set) tp_intset_iter_init_inline (iter, se t)
	static inline void	static inline void
	tp_intset_iter_init_inline (TpIntSetIter iter, const TpIntSet set)	tp_intset_iter_init_inline (TpIntSetIter iter, const TpIntSet set)
	{	{
	g_return_if_fail (iter != NULL);	g_return_if_fail (iter != NULL);
	iter->set = set;	iter->set = set;
	iter->element = (guint)(-1);	iter->element = (guint)(-1);
	}	}


	/**
	* tp_intset_iter_reset:
	* @iter: An integer set iterator to be reset.
	*
	* Reset the iterator @iter to the beginning. It must already be associated
	* with a set.
	*/
	#define tp_intset_iter_reset(iter) tp_intset_iter_reset_inline (iter)	#define tp_intset_iter_reset(iter) tp_intset_iter_reset_inline (iter)
	static inline void	static inline void
	tp_intset_iter_reset_inline (TpIntSetIter *iter)	tp_intset_iter_reset_inline (TpIntSetIter *iter)
	{	{
	g_return_if_fail (iter != NULL);	g_return_if_fail (iter != NULL);
	g_return_if_fail (iter->set != NULL);	g_return_if_fail (iter->set != NULL);
	iter->element = (guint)(-1);	iter->element = (guint)(-1);
	}	}

	gboolean tp_intset_iter_next (TpIntSetIter *iter);	gboolean tp_intset_iter_next (TpIntSetIter *iter);

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

	proxy.h	proxy.h

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

	#ifndef __TP_PROXY_H__	#ifndef __TP_PROXY_H__
	#define __TP_PROXY_H__	#define __TP_PROXY_H__

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

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

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

	G_BEGIN_DECLS	G_BEGIN_DECLS

	/* Forward declaration of a subclass - from dbus.h */	/* Forward declaration of a subclass - from dbus.h */
	typedef struct _TpDBusDaemon TpDBusDaemon;	typedef struct _TpDBusDaemon TpDBusDaemon;

	typedef struct _TpProxyPrivate TpProxyPrivate;	typedef struct _TpProxyPrivate TpProxyPrivate;


	skipping to change at line 73	skipping to change at line 73
	gchar *bus_name;	gchar *bus_name;
	gchar *object_path;	gchar *object_path;

	GError invalidated / initialized to NULL by g_object_new */;	GError invalidated / initialized to NULL by g_object_new */;

	TpProxyPrivate *priv;	TpProxyPrivate *priv;
	};	};

	typedef struct _TpProxyClass TpProxyClass;	typedef struct _TpProxyClass TpProxyClass;


		/* defined in proxy-internal.h for now */
		typedef struct _TpProxyFeature TpProxyFeature;

		typedef const TpProxyFeature (TpProxyClassFeatureListFunc) (
		TpProxyClass *cls);

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

	GQuark interface;	GQuark interface;

	unsigned int must_have_unique_name:1;	unsigned int must_have_unique_name:1;
	guint _reserved_flags:31;	guint _reserved_flags:31;


	GCallback _reserved[4];	TpProxyClassFeatureListFunc list_features;
		GCallback _reserved[3];
	gpointer priv;	gpointer priv;
	};	};

	typedef struct _TpProxyPendingCall TpProxyPendingCall;	typedef struct _TpProxyPendingCall TpProxyPendingCall;

	void tp_proxy_pending_call_cancel (TpProxyPendingCall *pc);	void tp_proxy_pending_call_cancel (TpProxyPendingCall *pc);

	typedef struct _TpProxySignalConnection TpProxySignalConnection;	typedef struct _TpProxySignalConnection TpProxySignalConnection;

	void tp_proxy_signal_connection_disconnect (TpProxySignalConnection *sc);	void tp_proxy_signal_connection_disconnect (TpProxySignalConnection *sc);

	skipping to change at line 139	skipping to change at line 146

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

	void tp_proxy_dbus_error_to_gerror (gpointer self,	void tp_proxy_dbus_error_to_gerror (gpointer self,
	const char dbus_error, const char debug_message, GError **error);	const char dbus_error, const char debug_message, GError **error);


		gboolean tp_proxy_is_prepared (gpointer self, GQuark feature);
		void tp_proxy_prepare_async (gpointer self,
		const GQuark *features,
		GAsyncReadyCallback callback,
		gpointer user_data);
		gboolean tp_proxy_prepare_finish (gpointer self,
		GAsyncResult *result,
		GError **error);
		void _tp_proxy_set_features_failed (TpProxy *self,
		const GError *error);

	G_END_DECLS	G_END_DECLS

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

	#endif /* #ifndef __TP_PROXY_H__*/	#endif /* #ifndef __TP_PROXY_H__*/

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

	telepathy-enums.h	telepathy-enums.h

	skipping to change at line 57	skipping to change at line 57
	/**	/**
	* NUM_TP_HANDLE_TYPES:	* NUM_TP_HANDLE_TYPES:
	*	*
	* 1 higher than the highest valid value of #TpHandleType.	* 1 higher than the highest valid value of #TpHandleType.
	*/	*/
	#define NUM_TP_HANDLE_TYPES (4+1)	#define NUM_TP_HANDLE_TYPES (4+1)

	/**	/**
	*	*
	TpConnectionStatus:	TpConnectionStatus:

	* @TP_CONNECTION_STATUS_CONNECTED: <![CDATA[ The connection is	* @TP_CONNECTION_STATUS_CONNECTED: <![CDATA[ The connection is f
	alive and all methods are available. ]]>	ully connected and all methods are available. ]]>
	* @TP_CONNECTION_STATUS_CONNECTING: <![CDATA[ The connection h	* @TP_CONNECTION_STATUS_CONNECTING: <![CDATA[ Connect has been c
	as not yet been established, or has been severed and reconnecti	alled but the connection has not yet been established. Some metho
	on is being attempted. Some methods may fail until the connecti	ds may fail until the connection has been established. ]]
	on has been established. ]]>	>
	* @TP_CONNECTION_STATUS_DISCONNECTED: <![CDATA[ The connection	* @TP_CONNECTION_STATUS_DISCONNECTED: <![CDATA[ If this is retri
	has been severed and no method calls are valid. The object may	eved from GetStatus or Status, it indicates that connection
	be removed from the bus at any time. ]]>	has not yet been attempted. If seen in a StatusChanged signa
		l, it indicates that the connection has failed; the Connection ob
		ject SHOULD be removed from D-Bus immediately, and all subsequent
		method calls SHOULD fail. ]]>
	*	*
	* Bitfield/set of flags generated from the Telepathy specification.	* Bitfield/set of flags generated from the Telepathy specification.
	*/	*/
	typedef enum {	typedef enum {
	TP_CONNECTION_STATUS_CONNECTED = 0,	TP_CONNECTION_STATUS_CONNECTED = 0,
	TP_CONNECTION_STATUS_CONNECTING = 1,	TP_CONNECTION_STATUS_CONNECTING = 1,
	TP_CONNECTION_STATUS_DISCONNECTED = 2,	TP_CONNECTION_STATUS_DISCONNECTED = 2,
	} TpConnectionStatus;	} TpConnectionStatus;

	/**	/**

	skipping to change at line 148	skipping to change at line 148
	*	*
	* Bitfield/set of flags generated from the Telepathy specification.	* Bitfield/set of flags generated from the Telepathy specification.
	*/	*/
	typedef enum {	typedef enum {
	TP_CONNECTION_CAPABILITY_FLAG_CREATE = 1,	TP_CONNECTION_CAPABILITY_FLAG_CREATE = 1,
	TP_CONNECTION_CAPABILITY_FLAG_INVITE = 2,	TP_CONNECTION_CAPABILITY_FLAG_INVITE = 2,
	} TpConnectionCapabilityFlags;	} TpConnectionCapabilityFlags;

	/**	/**
	*	*

		TpContactInfoFlags:
		* @TP_CONTACT_INFO_FLAG_CAN_SET: <![CDATA[ Indicates that SetCon
		tactInfo is supported on this connection. ]]>
		* @TP_CONTACT_INFO_FLAG_PUSH: <![CDATA[ Indicates that the proto
		col pushes all contacts' information to the connection manager wi
		thout prompting. If set, ContactInfoChanged will be emitted
		whenever contacts' information changes. ]]>
		*
		* <![CDATA[ Flags defining the behaviour of contact information on
		this protocol. Some protocols provide no information on contacts w
		ithout an explicit request; others always push information to the c
		onnection manager as and when it changes. ]]>
		*
		* Bitfield/set of flags generated from the Telepathy specification.
		*/
		typedef enum {
		TP_CONTACT_INFO_FLAG_CAN_SET = 1,
		TP_CONTACT_INFO_FLAG_PUSH = 2,
		} TpContactInfoFlags;

		/**
		*
		TpContactInfoFieldFlags:
		* @TP_CONTACT_INFO_FIELD_FLAG_PARAMETERS_EXACT: <![CDATA[ If pre
		sent, exactly the parameters indicated must be set on this fiel
		d; in the case of an empty list of parameters, this implies that
		parameters may not be used. If absent, and the list of allowed
		parameters is non-empty, any (possibly empty) subset of that l
		ist may be used. If absent, and the list of allowed
		parameters is empty, any parameters may be used. ]]>
		*
		* <![CDATA[ Flags describing the behaviour of a vCard field.
		]]>
		*
		* Bitfield/set of flags generated from the Telepathy specification.
		*/
		typedef enum {
		TP_CONTACT_INFO_FIELD_FLAG_PARAMETERS_EXACT = 1,
		} TpContactInfoFieldFlags;

		/**
		*
	TpConnectionPresenceType:	TpConnectionPresenceType:
	* @TP_CONNECTION_PRESENCE_TYPE_UNSET: <![CDATA[ An invalid prese nce type used as a null value. This value MUST NOT appear in the Statuses property, or in the result of GetStatuses on t he deprecated Presence interface. ]]>	* @TP_CONNECTION_PRESENCE_TYPE_UNSET: <![CDATA[ An invalid prese nce type used as a null value. This value MUST NOT appear in the Statuses property, or in the result of GetStatuses on t he deprecated Presence interface. ]]>
	* @TP_CONNECTION_PRESENCE_TYPE_OFFLINE: <![CDATA[ Offline ]]>	* @TP_CONNECTION_PRESENCE_TYPE_OFFLINE: <![CDATA[ Offline ]]>
	* @TP_CONNECTION_PRESENCE_TYPE_AVAILABLE: <![CDATA[ Available ]]>	* @TP_CONNECTION_PRESENCE_TYPE_AVAILABLE: <![CDATA[ Available ]]>
	* @TP_CONNECTION_PRESENCE_TYPE_AWAY: <![CDATA[ Away ]]>	* @TP_CONNECTION_PRESENCE_TYPE_AWAY: <![CDATA[ Away ]]>
	* @TP_CONNECTION_PRESENCE_TYPE_EXTENDED_AWAY: <![CDATA[ Away for an extended time ]]>	* @TP_CONNECTION_PRESENCE_TYPE_EXTENDED_AWAY: <![CDATA[ Away for an extended time ]]>
	* @TP_CONNECTION_PRESENCE_TYPE_HIDDEN: <![CDATA[ Hidden (invisib le) ]]>	* @TP_CONNECTION_PRESENCE_TYPE_HIDDEN: <![CDATA[ Hidden (invisib le) ]]>
	* @TP_CONNECTION_PRESENCE_TYPE_BUSY: <![CDATA[ Busy, Do Not Dist urb. ]]>	* @TP_CONNECTION_PRESENCE_TYPE_BUSY: <![CDATA[ Busy, Do Not Dist urb. ]]>
	* @TP_CONNECTION_PRESENCE_TYPE_UNKNOWN: <![CDATA[ Unknown, unabl e to determine presence for this contact, for example if the prot ocol only allows presence of subscribed contacts. ]]>	* @TP_CONNECTION_PRESENCE_TYPE_UNKNOWN: <![CDATA[ Unknown, unabl e to determine presence for this contact, for example if the prot ocol only allows presence of subscribed contacts. ]]>
	* @TP_CONNECTION_PRESENCE_TYPE_ERROR: <![CDATA[ Error, an error occurred while trying to determine presence. The message, if set , is an error from the server. ]]>	* @TP_CONNECTION_PRESENCE_TYPE_ERROR: <![CDATA[ Error, an error occurred while trying to determine presence. The message, if set , is an error from the server. ]]>

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

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

	skipping to change at line 686	skipping to change at line 686
	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_contact_capabilities_callback_fo r_get_contact_capabilities) (TpConnection proxy,	typedef void (tp_cli_connection_interface_contact_capabilities_callback_fo r_get_contact_capabilities) (TpConnection proxy,
	GHashTable *out_Contact_Capabilities,	GHashTable *out_Contact_Capabilities,
	const GError *error, gpointer user_data,	const GError *error, gpointer user_data,
	GObject *weak_object);	GObject *weak_object);

	TpProxyPendingCall tp_cli_connection_interface_contact_capabilities_call_g et_contact_capabilities (TpConnection proxy,	TpProxyPendingCall tp_cli_connection_interface_contact_capabilities_call_g et_contact_capabilities (TpConnection proxy,
	gint timeout_ms,	gint timeout_ms,

	const GArray *in_handles,	const GArray *in_Handles,
	tp_cli_connection_interface_contact_capabilities_callback_for_get_conta ct_capabilities callback,	tp_cli_connection_interface_contact_capabilities_callback_for_get_conta ct_capabilities callback,
	gpointer user_data,	gpointer user_data,
	GDestroyNotify destroy,	GDestroyNotify destroy,
	GObject *weak_object);	GObject *weak_object);

	#ifndef TP_DISABLE_DEPRECATED	#ifndef TP_DISABLE_DEPRECATED
	gboolean tp_cli_connection_interface_contact_capabilities_run_get_contact_c apabilities (TpConnection *proxy,	gboolean tp_cli_connection_interface_contact_capabilities_run_get_contact_c apabilities (TpConnection *proxy,
	gint timeout_ms,	gint timeout_ms,

	const GArray *in_handles,	const GArray *in_Handles,
	GHashTable **out_Contact_Capabilities,	GHashTable **out_Contact_Capabilities,
	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_contact_info_signal_callback_con
		tact_info_changed) (TpConnection *proxy,
		guint arg_Contact,
		const GPtrArray *arg_ContactInfo,
		gpointer user_data, GObject *weak_object);
		TpProxySignalConnection *tp_cli_connection_interface_contact_info_connect_t
		o_contact_info_changed (TpConnection *proxy,
		tp_cli_connection_interface_contact_info_signal_callback_contact_info_c
		hanged callback,
		gpointer user_data,
		GDestroyNotify destroy,
		GObject *weak_object,
		GError **error);

		typedef void (*tp_cli_connection_interface_contact_info_callback_for_get_co
		ntact_info) (TpConnection *proxy,
		GHashTable *out_ContactInfo,
		const GError *error, gpointer user_data,
		GObject *weak_object);

		TpProxyPendingCall *tp_cli_connection_interface_contact_info_call_get_conta
		ct_info (TpConnection *proxy,
		gint timeout_ms,
		const GArray *in_Contacts,
		tp_cli_connection_interface_contact_info_callback_for_get_contact_info
		callback,
		gpointer user_data,
		GDestroyNotify destroy,
		GObject *weak_object);

		#ifndef TP_DISABLE_DEPRECATED
		gboolean tp_cli_connection_interface_contact_info_run_get_contact_info (TpC
		onnection *proxy,
		gint timeout_ms,
		const GArray *in_Contacts,
		GHashTable **out_ContactInfo,
		GError **error,
		GMainLoop **loop) _TP_GNUC_DEPRECATED;
		#endif /* not TP_DISABLE_DEPRECATED */

		typedef void (*tp_cli_connection_interface_contact_info_callback_for_refres
		h_contact_info) (TpConnection *proxy,
		const GError *error, gpointer user_data,
		GObject *weak_object);

		TpProxyPendingCall *tp_cli_connection_interface_contact_info_call_refresh_c
		ontact_info (TpConnection *proxy,
		gint timeout_ms,
		const GArray *in_Contacts,
		tp_cli_connection_interface_contact_info_callback_for_refresh_contact_i
		nfo callback,
		gpointer user_data,
		GDestroyNotify destroy,
		GObject *weak_object);

		#ifndef TP_DISABLE_DEPRECATED
		gboolean tp_cli_connection_interface_contact_info_run_refresh_contact_info
		(TpConnection *proxy,
		gint timeout_ms,
		const GArray *in_Contacts,
		GError **error,
		GMainLoop **loop) _TP_GNUC_DEPRECATED;
		#endif /* not TP_DISABLE_DEPRECATED */

		typedef void (*tp_cli_connection_interface_contact_info_callback_for_reques
		t_contact_info) (TpConnection *proxy,
		const GPtrArray *out_Contact_Info,
		const GError *error, gpointer user_data,
		GObject *weak_object);

		TpProxyPendingCall *tp_cli_connection_interface_contact_info_call_request_c
		ontact_info (TpConnection *proxy,
		gint timeout_ms,
		guint in_Contact,
		tp_cli_connection_interface_contact_info_callback_for_request_contact_i
		nfo callback,
		gpointer user_data,
		GDestroyNotify destroy,
		GObject *weak_object);

		#ifndef TP_DISABLE_DEPRECATED
		gboolean tp_cli_connection_interface_contact_info_run_request_contact_info
		(TpConnection *proxy,
		gint timeout_ms,
		guint in_Contact,
		GPtrArray **out_Contact_Info,
		GError **error,
		GMainLoop **loop) _TP_GNUC_DEPRECATED;
		#endif /* not TP_DISABLE_DEPRECATED */

		typedef void (*tp_cli_connection_interface_contact_info_callback_for_set_co
		ntact_info) (TpConnection *proxy,
		const GError *error, gpointer user_data,
		GObject *weak_object);

		TpProxyPendingCall *tp_cli_connection_interface_contact_info_call_set_conta
		ct_info (TpConnection *proxy,
		gint timeout_ms,
		const GPtrArray *in_ContactInfo,
		tp_cli_connection_interface_contact_info_callback_for_set_contact_info
		callback,
		gpointer user_data,
		GDestroyNotify destroy,
		GObject *weak_object);

		#ifndef TP_DISABLE_DEPRECATED
		gboolean tp_cli_connection_interface_contact_info_run_set_contact_info (TpC
		onnection *proxy,
		gint timeout_ms,
		const GPtrArray *in_ContactInfo,
		GError **error,
		GMainLoop **loop) _TP_GNUC_DEPRECATED;
		#endif /* not TP_DISABLE_DEPRECATED */

	typedef void (tp_cli_connection_interface_contacts_callback_for_get_contac t_attributes) (TpConnection proxy,	typedef void (tp_cli_connection_interface_contacts_callback_for_get_contac t_attributes) (TpConnection proxy,
	GHashTable *out_Attributes,	GHashTable *out_Attributes,
	const GError *error, gpointer user_data,	const GError *error, gpointer user_data,
	GObject *weak_object);	GObject *weak_object);

	TpProxyPendingCall tp_cli_connection_interface_contacts_call_get_contact_a ttributes (TpConnection proxy,	TpProxyPendingCall tp_cli_connection_interface_contacts_call_get_contact_a ttributes (TpConnection proxy,
	gint timeout_ms,	gint timeout_ms,
	const GArray *in_Handles,	const GArray *in_Handles,
	const gchar **in_Interfaces,	const gchar **in_Interfaces,
	gboolean in_Hold,	gboolean in_Hold,

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

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

	skipping to change at line 911	skipping to change at line 911
	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_connection_interface_contact_capabilities_return_from_update_ca pabilities (DBusGMethodInvocation *context);	void tp_svc_connection_interface_contact_capabilities_return_from_update_ca pabilities (DBusGMethodInvocation *context);
	static inline void	static inline void
	tp_svc_connection_interface_contact_capabilities_return_from_update_capabil ities (DBusGMethodInvocation *context)	tp_svc_connection_interface_contact_capabilities_return_from_update_capabil ities (DBusGMethodInvocation *context)
	{	{
	dbus_g_method_return (context);	dbus_g_method_return (context);
	}	}

	typedef void (tp_svc_connection_interface_contact_capabilities_get_contact _capabilities_impl) (TpSvcConnectionInterfaceContactCapabilities self,	typedef void (tp_svc_connection_interface_contact_capabilities_get_contact _capabilities_impl) (TpSvcConnectionInterfaceContactCapabilities self,

	const GArray *in_handles,	const GArray *in_Handles,
	DBusGMethodInvocation *context);	DBusGMethodInvocation *context);
	void tp_svc_connection_interface_contact_capabilities_implement_get_contact _capabilities (TpSvcConnectionInterfaceContactCapabilitiesClass *klass, tp_ svc_connection_interface_contact_capabilities_get_contact_capabilities_impl impl);	void tp_svc_connection_interface_contact_capabilities_implement_get_contact _capabilities (TpSvcConnectionInterfaceContactCapabilitiesClass *klass, tp_ svc_connection_interface_contact_capabilities_get_contact_capabilities_impl impl);
	/**	/**
	* tp_svc_connection_interface_contact_capabilities_return_from_get_contact _capabilities:	* tp_svc_connection_interface_contact_capabilities_return_from_get_contact _capabilities:
	* @context: The D-Bus method invocation context	* @context: The D-Bus method invocation context
	* @out_Contact_Capabilities: GHashTable * (FIXME, generate documentation)	* @out_Contact_Capabilities: GHashTable * (FIXME, generate documentation)
	*	*
	* Return successfully by calling dbus_g_method_return().	* Return successfully by calling dbus_g_method_return().
	* This inline function exists only to provide type-safety.	* This inline function exists only to provide type-safety.
	*/	*/

	skipping to change at line 938	skipping to change at line 938
	GHashTable *out_Contact_Capabilities)	GHashTable *out_Contact_Capabilities)
	{	{
	dbus_g_method_return (context,	dbus_g_method_return (context,
	out_Contact_Capabilities);	out_Contact_Capabilities);
	}	}

	void tp_svc_connection_interface_contact_capabilities_emit_contact_capabili ties_changed (gpointer instance,	void tp_svc_connection_interface_contact_capabilities_emit_contact_capabili ties_changed (gpointer instance,
	GHashTable *arg_caps);	GHashTable *arg_caps);

	/**	/**

		* TpSvcConnectionInterfaceContactInfo:
		*
		* Dummy typedef representing any implementation of this interface.
		*/
		typedef struct _TpSvcConnectionInterfaceContactInfo TpSvcConnectionInterfac
		eContactInfo;

		/**
		* TpSvcConnectionInterfaceContactInfoClass:
		*
		* The class of TpSvcConnectionInterfaceContactInfo.
		*
		* In a full implementation of this interface (i.e. all
		* methods implemented), the interface initialization
		* function used in G_IMPLEMENT_INTERFACE() would
		* typically look like this:
		*
		* <programlisting>
		* static void
		* implement_connection_interface_contact_info (gpointer klass,
		* gpointer unused G_GNUC_UNUSED)
		* {
		* #define IMPLEMENT(x) tp_svc_connection_interface_contact_info_implement_
		&num;&num;x (\
		* klass, my_object_&num;&num;x)
		* IMPLEMENT (get_contact_info);
		* IMPLEMENT (refresh_contact_info);
		* IMPLEMENT (request_contact_info);
		* IMPLEMENT (set_contact_info);
		* #undef IMPLEMENT
		* }
		* </programlisting>
		*/
		typedef struct _TpSvcConnectionInterfaceContactInfoClass TpSvcConnectionInt
		erfaceContactInfoClass;

		GType tp_svc_connection_interface_contact_info_get_type (void);
		#define TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_INFO \
		(tp_svc_connection_interface_contact_info_get_type ())
		#define TP_SVC_CONNECTION_INTERFACE_CONTACT_INFO(obj) \
		(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_CONTA
		CT_INFO, TpSvcConnectionInterfaceContactInfo))
		#define TP_IS_SVC_CONNECTION_INTERFACE_CONTACT_INFO(obj) \
		(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_CONTA
		CT_INFO))
		#define TP_SVC_CONNECTION_INTERFACE_CONTACT_INFO_GET_CLASS(obj) \
		(G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_CO
		NTACT_INFO, TpSvcConnectionInterfaceContactInfoClass))

		typedef void (*tp_svc_connection_interface_contact_info_get_contact_info_im
		pl) (TpSvcConnectionInterfaceContactInfo *self,
		const GArray *in_Contacts,
		DBusGMethodInvocation *context);
		void tp_svc_connection_interface_contact_info_implement_get_contact_info (T
		pSvcConnectionInterfaceContactInfoClass *klass, tp_svc_connection_interface
		_contact_info_get_contact_info_impl impl);
		/**
		* tp_svc_connection_interface_contact_info_return_from_get_contact_info:
		* @context: The D-Bus method invocation context
		* @out_ContactInfo: GHashTable * (FIXME, generate documentation)
		*
		* Return successfully by calling dbus_g_method_return().
		* This inline function exists only to provide type-safety.
		*/
		static inline
		/* this comment is to stop gtkdoc realising this is static */
		void tp_svc_connection_interface_contact_info_return_from_get_contact_info
		(DBusGMethodInvocation *context,
		GHashTable *out_ContactInfo);
		static inline void
		tp_svc_connection_interface_contact_info_return_from_get_contact_info (DBus
		GMethodInvocation *context,
		GHashTable *out_ContactInfo)
		{
		dbus_g_method_return (context,
		out_ContactInfo);
		}

		typedef void (*tp_svc_connection_interface_contact_info_refresh_contact_inf
		o_impl) (TpSvcConnectionInterfaceContactInfo *self,
		const GArray *in_Contacts,
		DBusGMethodInvocation *context);
		void tp_svc_connection_interface_contact_info_implement_refresh_contact_inf
		o (TpSvcConnectionInterfaceContactInfoClass *klass, tp_svc_connection_inter
		face_contact_info_refresh_contact_info_impl impl);
		/**
		* tp_svc_connection_interface_contact_info_return_from_refresh_contact_inf
		o:
		* @context: The D-Bus method invocation context
		*
		* Return successfully by calling dbus_g_method_return().
		* This inline function exists only to provide type-safety.
		*/
		static inline
		/* this comment is to stop gtkdoc realising this is static */
		void tp_svc_connection_interface_contact_info_return_from_refresh_contact_i
		nfo (DBusGMethodInvocation *context);
		static inline void
		tp_svc_connection_interface_contact_info_return_from_refresh_contact_info (
		DBusGMethodInvocation *context)
		{
		dbus_g_method_return (context);
		}

		typedef void (*tp_svc_connection_interface_contact_info_request_contact_inf
		o_impl) (TpSvcConnectionInterfaceContactInfo *self,
		guint in_Contact,
		DBusGMethodInvocation *context);
		void tp_svc_connection_interface_contact_info_implement_request_contact_inf
		o (TpSvcConnectionInterfaceContactInfoClass *klass, tp_svc_connection_inter
		face_contact_info_request_contact_info_impl impl);
		/**
		* tp_svc_connection_interface_contact_info_return_from_request_contact_inf
		o:
		* @context: The D-Bus method invocation context
		* @out_Contact_Info: const GPtrArray * (FIXME, generate documentation)
		*
		* Return successfully by calling dbus_g_method_return().
		* This inline function exists only to provide type-safety.
		*/
		static inline
		/* this comment is to stop gtkdoc realising this is static */
		void tp_svc_connection_interface_contact_info_return_from_request_contact_i
		nfo (DBusGMethodInvocation *context,
		const GPtrArray *out_Contact_Info);
		static inline void
		tp_svc_connection_interface_contact_info_return_from_request_contact_info (
		DBusGMethodInvocation *context,
		const GPtrArray *out_Contact_Info)
		{
		dbus_g_method_return (context,
		out_Contact_Info);
		}

		typedef void (*tp_svc_connection_interface_contact_info_set_contact_info_im
		pl) (TpSvcConnectionInterfaceContactInfo *self,
		const GPtrArray *in_ContactInfo,
		DBusGMethodInvocation *context);
		void tp_svc_connection_interface_contact_info_implement_set_contact_info (T
		pSvcConnectionInterfaceContactInfoClass *klass, tp_svc_connection_interface
		_contact_info_set_contact_info_impl impl);
		/**
		* tp_svc_connection_interface_contact_info_return_from_set_contact_info:
		* @context: The D-Bus method invocation context
		*
		* Return successfully by calling dbus_g_method_return().
		* This inline function exists only to provide type-safety.
		*/
		static inline
		/* this comment is to stop gtkdoc realising this is static */
		void tp_svc_connection_interface_contact_info_return_from_set_contact_info
		(DBusGMethodInvocation *context);
		static inline void
		tp_svc_connection_interface_contact_info_return_from_set_contact_info (DBus
		GMethodInvocation *context)
		{
		dbus_g_method_return (context);
		}

		void tp_svc_connection_interface_contact_info_emit_contact_info_changed (gp
		ointer instance,
		guint arg_Contact,
		const GPtrArray *arg_ContactInfo);

		/**
	* TpSvcConnectionInterfaceContacts:	* TpSvcConnectionInterfaceContacts:
	*	*
	* Dummy typedef representing any implementation of this interface.	* Dummy typedef representing any implementation of this interface.
	*/	*/
	typedef struct _TpSvcConnectionInterfaceContacts TpSvcConnectionInterfaceCo ntacts;	typedef struct _TpSvcConnectionInterfaceContacts TpSvcConnectionInterfaceCo ntacts;

	/**	/**
	* TpSvcConnectionInterfaceContactsClass:	* TpSvcConnectionInterfaceContactsClass:
	*	*
	* The class of TpSvcConnectionInterfaceContacts.	* The class of TpSvcConnectionInterfaceContacts.

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

	util.h	util.h

	skipping to change at line 102	skipping to change at line 102
	const gchar *detailed_signal, GCallback c_handler, gpointer gobject,	const gchar *detailed_signal, GCallback c_handler, gpointer gobject,
	GConnectFlags connect_flags);	GConnectFlags connect_flags);

	GValueArray *tp_value_array_build (gsize length,	GValueArray *tp_value_array_build (gsize length,
	GType type,	GType type,
	...) G_GNUC_WARN_UNUSED_RESULT;	...) G_GNUC_WARN_UNUSED_RESULT;
	void tp_value_array_unpack (GValueArray *array,	void tp_value_array_unpack (GValueArray *array,
	gsize len,	gsize len,
	...);	...);


		typedef struct _TpWeakRef TpWeakRef;
		TpWeakRef *tp_weak_ref_new (gpointer object,
		gpointer user_data,
		GDestroyNotify destroy) G_GNUC_WARN_UNUSED_RESULT;
		gpointer tp_weak_ref_get_user_data (TpWeakRef *self) G_GNUC_WARN_UNUSED_RES
		ULT;
		gpointer tp_weak_ref_dup_object (TpWeakRef *self) G_GNUC_WARN_UNUSED_RESULT
		;
		void tp_weak_ref_destroy (TpWeakRef *self);

	G_END_DECLS	G_END_DECLS

	#undef __TP_IN_UTIL_H__	#undef __TP_IN_UTIL_H__
	#endif /* __TP_UTIL_H__ */	#endif /* __TP_UTIL_H__ */

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

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

	telepathy-interfaces.h		telepathy-interfaces.h

	skipping to change at line 30		skipping to change at line 30

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

	/**		/**
	* TP_PROP_CONNECTION_MANAGER_INTERFACES:		* TP_PROP_CONNECTION_MANAGER_INTERFACES:
	*		*
	* The fully-qualified property name "org.freedesktop.Telepathy.ConnectionM anager.Interfaces"		* The fully-qualified property name "org.freedesktop.Telepathy.ConnectionM anager.Interfaces"
	*/		*/
	#define TP_PROP_CONNECTION_MANAGER_INTERFACES \		#define TP_PROP_CONNECTION_MANAGER_INTERFACES \
	"org.freedesktop.Telepathy.ConnectionManager.Interfaces"		"org.freedesktop.Telepathy.ConnectionManager.Interfaces"


	/**		/**
	* TP_IFACE_CONNECTION:		* TP_IFACE_CONNECTION:
	*		*
	* The interface name "org.freedesktop.Telepathy.Connection"		* The interface name "org.freedesktop.Telepathy.Connection"
	*/		*/
	#define TP_IFACE_CONNECTION \		#define TP_IFACE_CONNECTION \
	"org.freedesktop.Telepathy.Connection"		"org.freedesktop.Telepathy.Connection"

	/**		/**
	* TP_IFACE_QUARK_CONNECTION:		* TP_IFACE_QUARK_CONNECTION:
	*		*
	* Expands to a call to a function that returns a quark for the interface n ame "org.freedesktop.Telepathy.Connection"		* Expands to a call to a function that returns a quark for the interface n ame "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);

	/**		/**

			* TP_PROP_CONNECTION_INTERFACES:
			*
			* The fully-qualified property name "org.freedesktop.Telepathy.Connection.
			Interfaces"
			*/
			#define TP_PROP_CONNECTION_INTERFACES \