account-channel-request.h		account-channel-request.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef __TP_ACCOUNT_CHANNEL_REQUEST_H__		#ifndef __TP_ACCOUNT_CHANNEL_REQUEST_H__
	#define __TP_ACCOUNT_CHANNEL_REQUEST_H__		#define __TP_ACCOUNT_CHANNEL_REQUEST_H__
	#include <gio/gio.h>		#include <gio/gio.h>
	#include <glib-object.h>		#include <glib-object.h>
	#include <glib.h>		#include <glib.h>
	#include <telepathy-glib/account.h>		#include <telepathy-glib/account.h>
	#include <telepathy-glib/channel.h>		#include <telepathy-glib/channel.h>
	#include <telepathy-glib/channel-request.h>		#include <telepathy-glib/channel-request.h>
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	account-manager.h		account-manager.h
	skipping to change at line 22		skipping to change at line 22
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef TP_ACCOUNT_MANAGER_H		#ifndef TP_ACCOUNT_MANAGER_H
	#define TP_ACCOUNT_MANAGER_H		#define TP_ACCOUNT_MANAGER_H
	#include <telepathy-glib/account.h>		#include <telepathy-glib/account.h>
	#include <telepathy-glib/dbus.h>		#include <telepathy-glib/dbus.h>
	#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
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	account.h		account.h
	skipping to change at line 22		skipping to change at line 22
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef TP_ACCOUNT_H		#ifndef TP_ACCOUNT_H
	#define TP_ACCOUNT_H		#define TP_ACCOUNT_H
	#include <gio/gio.h>		#include <gio/gio.h>
	#include <telepathy-glib/connection.h>		#include <telepathy-glib/connection.h>
	#include <telepathy-glib/dbus.h>		#include <telepathy-glib/dbus.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	#include <telepathy-glib/proxy.h>		#include <telepathy-glib/proxy.h>
	skipping to change at line 88		skipping to change at line 92
	GQuark tp_account_get_feature_quark_core (void) G_GNUC_CONST;		GQuark tp_account_get_feature_quark_core (void) G_GNUC_CONST;
	_TP_AVAILABLE_IN_0_16		_TP_AVAILABLE_IN_0_16
	GQuark tp_account_get_feature_quark_connection (void) G_GNUC_CONST;		GQuark tp_account_get_feature_quark_connection (void) G_GNUC_CONST;
	GQuark tp_account_get_feature_quark_storage (void) G_GNUC_CONST;		GQuark tp_account_get_feature_quark_storage (void) G_GNUC_CONST;
	GQuark tp_account_get_feature_quark_addressing (void) G_GNUC_CONST;		GQuark tp_account_get_feature_quark_addressing (void) G_GNUC_CONST;
	TpAccount *tp_account_new (TpDBusDaemon *bus_daemon, const gchar *object_pa th,		TpAccount *tp_account_new (TpDBusDaemon *bus_daemon, const gchar *object_pa th,
	GError **error) G_GNUC_WARN_UNUSED_RESULT;		GError **error) G_GNUC_WARN_UNUSED_RESULT;
			#ifndef TP_DISABLE_DEPRECATED
			_TP_DEPRECATED_IN_0_20_FOR(tp_account_get_protocol)
	gboolean tp_account_parse_object_path (const gchar *object_path,		gboolean tp_account_parse_object_path (const gchar *object_path,
	gchar **cm, gchar **protocol, gchar **account_id, GError **error);		gchar **cm, gchar **protocol, gchar **account_id, GError **error);
			#endif
	const gchar *tp_account_get_path_suffix (TpAccount *account);		const gchar *tp_account_get_path_suffix (TpAccount *account);
	void tp_account_init_known_interfaces (void);		void tp_account_init_known_interfaces (void);
	TpConnection *tp_account_get_connection (TpAccount *account);		TpConnection *tp_account_get_connection (TpAccount *account);
			#ifndef TP_DISABLE_DEPRECATED
			_TP_DEPRECATED_IN_0_20_FOR(tp_simple_client_factory_ensure_connection)
	TpConnection *tp_account_ensure_connection (TpAccount *account,		TpConnection *tp_account_ensure_connection (TpAccount *account,
	const gchar *path);		const gchar *path);
			#endif
	const gchar *tp_account_get_display_name (TpAccount *account);		const gchar *tp_account_get_display_name (TpAccount *account);
	const gchar *tp_account_get_connection_manager (TpAccount *account);		const gchar *tp_account_get_connection_manager (TpAccount *account);
	const gchar *tp_account_get_protocol (TpAccount *account);		const gchar *tp_account_get_protocol (TpAccount *account);
	const gchar *tp_account_get_service (TpAccount *self);		const gchar *tp_account_get_service (TpAccount *self);
	const gchar *tp_account_get_icon_name (TpAccount *account);		const gchar *tp_account_get_icon_name (TpAccount *account);
End of changes. 5 change blocks.
	0 lines changed or deleted		12 lines changed or added

	add-dispatch-operation-context.h		add-dispatch-operation-context.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef __TP_ADD_DISPATCH_OPERATION_CONTEXT_H__		#ifndef __TP_ADD_DISPATCH_OPERATION_CONTEXT_H__
	#define __TP_ADD_DISPATCH_OPERATION_CONTEXT_H__		#define __TP_ADD_DISPATCH_OPERATION_CONTEXT_H__
	#include <gio/gio.h>		#include <gio/gio.h>
	#include <glib-object.h>		#include <glib-object.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	typedef struct _TpAddDispatchOperationContext TpAddDispatchOperationContext ;		typedef struct _TpAddDispatchOperationContext TpAddDispatchOperationContext ;
	typedef struct _TpAddDispatchOperationContextClass \		typedef struct _TpAddDispatchOperationContextClass \
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	automatic-client-factory.h		automatic-client-factory.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef __TP_AUTOMATIC_CLIENT_FACTORY_H__		#ifndef __TP_AUTOMATIC_CLIENT_FACTORY_H__
	#define __TP_AUTOMATIC_CLIENT_FACTORY_H__		#define __TP_AUTOMATIC_CLIENT_FACTORY_H__
	#include <telepathy-glib/call-channel.h>		#include <telepathy-glib/call-channel.h>
	#include <telepathy-glib/dbus-tube-channel.h>		#include <telepathy-glib/dbus-tube-channel.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	#include <telepathy-glib/file-transfer-channel.h>		#include <telepathy-glib/file-transfer-channel.h>
	#include <telepathy-glib/simple-client-factory.h>		#include <telepathy-glib/simple-client-factory.h>
	#include <telepathy-glib/stream-tube-channel.h>		#include <telepathy-glib/stream-tube-channel.h>
	#include <telepathy-glib/text-channel.h>		#include <telepathy-glib/text-channel.h>
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	automatic-proxy-factory.h		automatic-proxy-factory.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef __TP_AUTOMATIC_PROXY_FACTORY_H__		#ifndef __TP_AUTOMATIC_PROXY_FACTORY_H__
	#define __TP_AUTOMATIC_PROXY_FACTORY_H__		#define __TP_AUTOMATIC_PROXY_FACTORY_H__
	#include <glib-object.h>		#include <glib-object.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	typedef struct _TpAutomaticProxyFactory TpAutomaticProxyFactory;		typedef struct _TpAutomaticProxyFactory TpAutomaticProxyFactory;
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	base-call-channel.h		base-call-channel.h
	skipping to change at line 22		skipping to change at line 22
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef __TP_BASE_CALL_CHANNEL_H__		#ifndef __TP_BASE_CALL_CHANNEL_H__
	#define __TP_BASE_CALL_CHANNEL_H__		#define __TP_BASE_CALL_CHANNEL_H__
	#include <telepathy-glib/base-channel.h>		#include <telepathy-glib/base-channel.h>
	#include <telepathy-glib/base-call-content.h>		#include <telepathy-glib/base-call-content.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	typedef struct _TpBaseCallChannel TpBaseCallChannel;		typedef struct _TpBaseCallChannel TpBaseCallChannel;
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	base-call-content.h		base-call-content.h
	skipping to change at line 23		skipping to change at line 23
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef TP_BASE_CALL_CONTENT_H		#ifndef TP_BASE_CALL_CONTENT_H
	#define TP_BASE_CALL_CONTENT_H		#define TP_BASE_CALL_CONTENT_H
	#include <glib-object.h>		#include <glib-object.h>
	#include <telepathy-glib/base-call-stream.h>		#include <telepathy-glib/base-call-stream.h>
	#include <telepathy-glib/base-connection.h>		#include <telepathy-glib/base-connection.h>
	#include <telepathy-glib/dbus-properties-mixin.h>		#include <telepathy-glib/dbus-properties-mixin.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	base-call-stream.h		base-call-stream.h
	skipping to change at line 23		skipping to change at line 23
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef TP_BASE_CALL_STREAM_H		#ifndef TP_BASE_CALL_STREAM_H
	#define TP_BASE_CALL_STREAM_H		#define TP_BASE_CALL_STREAM_H
	#include <glib-object.h>		#include <glib-object.h>
	#include <telepathy-glib/base-connection.h>		#include <telepathy-glib/base-connection.h>
	#include <telepathy-glib/dbus-properties-mixin.h>		#include <telepathy-glib/dbus-properties-mixin.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	base-channel.h		base-channel.h
	skipping to change at line 22		skipping to change at line 22
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef __TP_BASE_CHANNEL_H__		#ifndef __TP_BASE_CHANNEL_H__
	#define __TP_BASE_CHANNEL_H__		#define __TP_BASE_CHANNEL_H__
	#include <glib-object.h>		#include <glib-object.h>
	#include <telepathy-glib/dbus-properties-mixin.h>		#include <telepathy-glib/dbus-properties-mixin.h>
	#include <telepathy-glib/base-connection.h>		#include <telepathy-glib/base-connection.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	#include "connection.h"		#include "connection.h"
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	base-client.h		base-client.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef __TP_BASE_CLIENT_H__		#ifndef __TP_BASE_CLIENT_H__
	#define __TP_BASE_CLIENT_H__		#define __TP_BASE_CLIENT_H__
	#include <dbus/dbus-glib.h>		#include <dbus/dbus-glib.h>
	#include <glib-object.h>		#include <glib-object.h>
	#include <telepathy-glib/account.h>		#include <telepathy-glib/account.h>
	#include <telepathy-glib/account-manager.h>		#include <telepathy-glib/account-manager.h>
	#include <telepathy-glib/add-dispatch-operation-context.h>		#include <telepathy-glib/add-dispatch-operation-context.h>
	#include <telepathy-glib/client-channel-factory.h>		#include <telepathy-glib/client-channel-factory.h>
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	base-connection-manager.h		base-connection-manager.h
	skipping to change at line 22		skipping to change at line 22
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef __TP_BASE_CONNECTION_MANAGER_H__		#ifndef __TP_BASE_CONNECTION_MANAGER_H__
	#define __TP_BASE_CONNECTION_MANAGER_H__		#define __TP_BASE_CONNECTION_MANAGER_H__
	#include <dbus/dbus-glib.h>		#include <dbus/dbus-glib.h>
	#include <glib-object.h>		#include <glib-object.h>
	#include <telepathy-glib/base-connection.h>		#include <telepathy-glib/base-connection.h>
	#include <telepathy-glib/base-protocol.h>		#include <telepathy-glib/base-protocol.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	#include <telepathy-glib/proxy.h>		#include <telepathy-glib/proxy.h>
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	base-connection.h		base-connection.h
	skipping to change at line 22		skipping to change at line 22
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#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>
	skipping to change at line 59		skipping to change at line 63
	typedef GPtrArray *(*TpBaseConnectionCreateChannelFactoriesImpl) (		typedef GPtrArray *(*TpBaseConnectionCreateChannelFactoriesImpl) (
	TpBaseConnection *self);		TpBaseConnection *self);
	typedef GPtrArray *(*TpBaseConnectionCreateChannelManagersImpl) (		typedef GPtrArray *(*TpBaseConnectionCreateChannelManagersImpl) (
	TpBaseConnection *self);		TpBaseConnection *self);
	typedef gchar *(*TpBaseConnectionGetUniqueConnectionNameImpl) (		typedef gchar *(*TpBaseConnectionGetUniqueConnectionNameImpl) (
	TpBaseConnection *self);		TpBaseConnection *self);
	struct _TpBaseConnection {		struct _TpBaseConnection {
	/*<public>*/		/*<private>*/
	GObject parent;		GObject parent;
	gchar *bus_name;		gchar *_TP_SEAL (bus_name);
	gchar *object_path;		gchar *_TP_SEAL (object_path);
	TpConnectionStatus status;		TpConnectionStatus _TP_SEAL (status);
	TpHandle self_handle;		TpHandle _TP_SEAL (self_handle);
	/*<private>*/		/*<private>*/
	gpointer _future1;		gpointer _future1;
	gpointer _future2;		gpointer _future2;
	gpointer _future3;		gpointer _future3;
	gpointer _future4;		gpointer _future4;
	TpBaseConnectionPrivate *priv;		TpBaseConnectionPrivate *priv;
	};		};
	skipping to change at line 117		skipping to change at line 121
	gpointer _future3;		gpointer _future3;
	gpointer _future4;		gpointer _future4;
	gpointer priv;		gpointer priv;
	};		};
	# define TP_INTERNAL_CONNECTION_STATUS_NEW ((TpConnectionStatus)(-1))		# define TP_INTERNAL_CONNECTION_STATUS_NEW ((TpConnectionStatus)(-1))
	GType tp_base_connection_get_type (void);		GType tp_base_connection_get_type (void);
			_TP_AVAILABLE_IN_0_20
			const gchar *tp_base_connection_get_bus_name (TpBaseConnection *self);
			_TP_AVAILABLE_IN_0_20
			const gchar *tp_base_connection_get_object_path (TpBaseConnection *self);
			_TP_AVAILABLE_IN_0_20
			TpConnectionStatus tp_base_connection_get_status (TpBaseConnection *self);
			_TP_AVAILABLE_IN_0_20
			gboolean tp_base_connection_is_destroyed (TpBaseConnection *self);
			_TP_AVAILABLE_IN_0_20
			gboolean tp_base_connection_check_connected (TpBaseConnection *self,
			GError **error);
	TpHandleRepoIface *tp_base_connection_get_handles (TpBaseConnection *self,		TpHandleRepoIface *tp_base_connection_get_handles (TpBaseConnection *self,
	TpHandleType handle_type);		TpHandleType handle_type);
	gboolean tp_base_connection_register (TpBaseConnection *self,		gboolean tp_base_connection_register (TpBaseConnection *self,
	const gchar *cm_name, gchar **bus_name, gchar **object_path,		const gchar *cm_name, gchar **bus_name, gchar **object_path,
	GError **error);		GError **error);
	/* FIXME: when dbus-glib exposes its GError -> D-Bus error name mapping,		/* FIXME: when dbus-glib exposes its GError -> D-Bus error name mapping,
	we could also add:		we could also add:
	void tp_base_connection_disconnect_with_error (TpBaseConnection *self,		void tp_base_connection_disconnect_with_error (TpBaseConnection *self,
	skipping to change at line 192		skipping to change at line 212
	(G_TYPE_CHECK_CLASS_CAST((klass), TP_TYPE_BASE_CONNECTION, \		(G_TYPE_CHECK_CLASS_CAST((klass), TP_TYPE_BASE_CONNECTION, \
	TpBaseConnectionClass))		TpBaseConnectionClass))
	#define TP_IS_BASE_CONNECTION(obj) \		#define TP_IS_BASE_CONNECTION(obj) \
	(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_BASE_CONNECTION))		(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_BASE_CONNECTION))
	#define TP_IS_BASE_CONNECTION_CLASS(klass) \		#define TP_IS_BASE_CONNECTION_CLASS(klass) \
	(G_TYPE_CHECK_CLASS_TYPE((klass), TP_TYPE_BASE_CONNECTION))		(G_TYPE_CHECK_CLASS_TYPE((klass), TP_TYPE_BASE_CONNECTION))
	#define TP_BASE_CONNECTION_GET_CLASS(obj) \		#define TP_BASE_CONNECTION_GET_CLASS(obj) \
	(G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_BASE_CONNECTION, \		(G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_BASE_CONNECTION, \
	TpBaseConnectionClass))		TpBaseConnectionClass))
	/* The cast of a string literal to (gchar *) is to keep C++ compilers happy */
	#define TP_BASE_CONNECTION_ERROR_IF_NOT_CONNECTED(conn, context) \		#define TP_BASE_CONNECTION_ERROR_IF_NOT_CONNECTED(conn, context) \
	G_STMT_START { \		G_STMT_START { \
	TpBaseConnection *c = (conn); \		TpBaseConnection *c_ = (conn); \
			GError *e_ = NULL; \
	\		\
	if (c->status != TP_CONNECTION_STATUS_CONNECTED) \		G_GNUC_BEGIN_IGNORE_DEPRECATIONS \
			if (!tp_base_connection_check_connected (c_, &e_)) \
	{ \		{ \
	GError e = { TP_ERROR, TP_ERROR_DISCONNECTED, \		dbus_g_method_return_error ((context), e_); \
	(gchar *) "Connection is disconnected" }; \		g_error_free (e_); \
	\
	dbus_g_method_return_error ((context), &e); \
	return; \		return; \
	} \		} \
			G_GNUC_END_IGNORE_DEPRECATIONS \
	} 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,		void tp_base_connection_add_client_interest (TpBaseConnection *self,
	const gchar *unique_name, const gchar *token,		const gchar *unique_name, const gchar *token,
	gboolean only_if_uninterested);		gboolean only_if_uninterested);
	void tp_base_connection_add_possible_client_interest (TpBaseConnection *sel f,		void tp_base_connection_add_possible_client_interest (TpBaseConnection *sel f,
	GQuark token);		GQuark token);
End of changes. 11 change blocks.
	12 lines changed or deleted		34 lines changed or added

	base-contact-list.h		base-contact-list.h
	skipping to change at line 20		skipping to change at line 20
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef __TP_BASE_CONTACT_LIST_H__		#ifndef __TP_BASE_CONTACT_LIST_H__
	#define __TP_BASE_CONTACT_LIST_H__		#define __TP_BASE_CONTACT_LIST_H__
	#include <glib-object.h>		#include <glib-object.h>
	#include <gio/gio.h>		#include <gio/gio.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/handle-repo.h>		#include <telepathy-glib/handle-repo.h>
	#include <telepathy-glib/svc-connection.h>		#include <telepathy-glib/svc-connection.h>
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	base-media-call-channel.h		base-media-call-channel.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef __TP_BASE_MEDIA_CALL_CHANNEL_H__		#ifndef __TP_BASE_MEDIA_CALL_CHANNEL_H__
	#define __TP_BASE_MEDIA_CALL_CHANNEL_H__		#define __TP_BASE_MEDIA_CALL_CHANNEL_H__
	#include <telepathy-glib/base-call-channel.h>		#include <telepathy-glib/base-call-channel.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	typedef struct _TpBaseMediaCallChannel TpBaseMediaCallChannel;		typedef struct _TpBaseMediaCallChannel TpBaseMediaCallChannel;
	typedef struct _TpBaseMediaCallChannelPrivate TpBaseMediaCallChannelPrivate ;		typedef struct _TpBaseMediaCallChannelPrivate TpBaseMediaCallChannelPrivate ;
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	base-media-call-content.h		base-media-call-content.h
	skipping to change at line 22		skipping to change at line 22
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef __TP_BASE_MEDIA_CALL_CONTENT_H__		#ifndef __TP_BASE_MEDIA_CALL_CONTENT_H__
	#define __TP_BASE_MEDIA_CALL_CONTENT_H__		#define __TP_BASE_MEDIA_CALL_CONTENT_H__
	#include <gio/gio.h>		#include <gio/gio.h>
	#include <telepathy-glib/base-call-content.h>		#include <telepathy-glib/base-call-content.h>
	#include <telepathy-glib/call-content-media-description.h>		#include <telepathy-glib/call-content-media-description.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	base-media-call-stream.h		base-media-call-stream.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef __TP_BASE_MEDIA_CALL_STREAM_H__		#ifndef __TP_BASE_MEDIA_CALL_STREAM_H__
	#define __TP_BASE_MEDIA_CALL_STREAM_H__		#define __TP_BASE_MEDIA_CALL_STREAM_H__
	#include <telepathy-glib/base-call-stream.h>		#include <telepathy-glib/base-call-stream.h>
	#include <telepathy-glib/call-stream-endpoint.h>		#include <telepathy-glib/call-stream-endpoint.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	typedef struct _TpBaseMediaCallStream TpBaseMediaCallStream;		typedef struct _TpBaseMediaCallStream TpBaseMediaCallStream;
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	base-password-channel.h		base-password-channel.h
	skipping to change at line 20		skipping to change at line 20
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef __TP_BASE_PASSWORD_CHANNEL_H__		#ifndef __TP_BASE_PASSWORD_CHANNEL_H__
	#define __TP_BASE_PASSWORD_CHANNEL_H__		#define __TP_BASE_PASSWORD_CHANNEL_H__
	#include <glib-object.h>		#include <glib-object.h>
	#include <telepathy-glib/base-channel.h>		#include <telepathy-glib/base-channel.h>
	#include <telepathy-glib/dbus-properties-mixin.h>		#include <telepathy-glib/dbus-properties-mixin.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	base-protocol.h		base-protocol.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef TP_BASE_PROTOCOL_H		#ifndef TP_BASE_PROTOCOL_H
	#define TP_BASE_PROTOCOL_H		#define TP_BASE_PROTOCOL_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/presence-mixin.h>		#include <telepathy-glib/presence-mixin.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	base-room-config.h		base-room-config.h
	skipping to change at line 20		skipping to change at line 20
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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 USA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef TP_BASE_ROOM_CONFIG_H		#ifndef TP_BASE_ROOM_CONFIG_H
	#define TP_BASE_ROOM_CONFIG_H		#define TP_BASE_ROOM_CONFIG_H
	#include <glib-object.h>		#include <glib-object.h>
	#include <telepathy-glib/base-channel.h>		#include <telepathy-glib/base-channel.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	#include <telepathy-glib/_gen/genums.h>		#include <telepathy-glib/_gen/genums.h>
	typedef struct _TpBaseRoomConfig TpBaseRoomConfig;		typedef struct _TpBaseRoomConfig TpBaseRoomConfig;
	typedef struct _TpBaseRoomConfigClass TpBaseRoomConfigClass;		typedef struct _TpBaseRoomConfigClass TpBaseRoomConfigClass;
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	basic-proxy-factory.h		basic-proxy-factory.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef __TP_BASIC_PROXY_FACTORY_H__		#ifndef __TP_BASIC_PROXY_FACTORY_H__
	#define __TP_BASIC_PROXY_FACTORY_H__		#define __TP_BASIC_PROXY_FACTORY_H__
	#include <glib-object.h>		#include <glib-object.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	typedef struct _TpBasicProxyFactory TpBasicProxyFactory;		typedef struct _TpBasicProxyFactory TpBasicProxyFactory;
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	call-channel.h		call-channel.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef __TP_CALL_CHANNEL_H__		#ifndef __TP_CALL_CHANNEL_H__
	#define __TP_CALL_CHANNEL_H__		#define __TP_CALL_CHANNEL_H__
	#include <telepathy-glib/channel.h>		#include <telepathy-glib/channel.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	#define TP_TYPE_CALL_CHANNEL (tp_call_channel_get_type ())		#define TP_TYPE_CALL_CHANNEL (tp_call_channel_get_type ())
	#define TP_CALL_CHANNEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TP_TYPE_CA LL_CHANNEL, TpCallChannel))		#define TP_CALL_CHANNEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TP_TYPE_CA LL_CHANNEL, TpCallChannel))
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	call-content-media-description.h		call-content-media-description.h
	skipping to change at line 23		skipping to change at line 23
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef __TP_CALL_CONTENT_MEDIA_DESCRIPTION_H__		#ifndef __TP_CALL_CONTENT_MEDIA_DESCRIPTION_H__
	#define __TP_CALL_CONTENT_MEDIA_DESCRIPTION_H__		#define __TP_CALL_CONTENT_MEDIA_DESCRIPTION_H__
	#include <glib-object.h>		#include <glib-object.h>
	#include <gio/gio.h>		#include <gio/gio.h>
	#include <telepathy-glib/dbus.h>		#include <telepathy-glib/dbus.h>
	#include <telepathy-glib/dbus-properties-mixin.h>		#include <telepathy-glib/dbus-properties-mixin.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	#include <telepathy-glib/handle.h>		#include <telepathy-glib/handle.h>
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	call-content.h		call-content.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef __TP_CALL_CONTENT_H__		#ifndef __TP_CALL_CONTENT_H__
	#define __TP_CALL_CONTENT_H__		#define __TP_CALL_CONTENT_H__
	#include <telepathy-glib/proxy.h>		#include <telepathy-glib/proxy.h>
	#include <telepathy-glib/call-channel.h>		#include <telepathy-glib/call-channel.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	#define TP_TYPE_CALL_CONTENT (tp_call_content_get_type ())		#define TP_TYPE_CALL_CONTENT (tp_call_content_get_type ())
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	call-misc.h		call-misc.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef __TP_CALL_MISC_H__		#ifndef __TP_CALL_MISC_H__
	#define __TP_CALL_MISC_H__		#define __TP_CALL_MISC_H__
	#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
	_TP_AVAILABLE_IN_0_18		_TP_AVAILABLE_IN_0_18
	void tp_call_stream_endpoint_init_known_interfaces (void);		void tp_call_stream_endpoint_init_known_interfaces (void);
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	call-stream-endpoint.h		call-stream-endpoint.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef __TP_CALL_STREAM_ENDPOINT_H__		#ifndef __TP_CALL_STREAM_ENDPOINT_H__
	#define __TP_CALL_STREAM_ENDPOINT_H__		#define __TP_CALL_STREAM_ENDPOINT_H__
	#include <glib-object.h>		#include <glib-object.h>
	#include <telepathy-glib/dbus.h>		#include <telepathy-glib/dbus.h>
	#include <telepathy-glib/dbus-properties-mixin.h>		#include <telepathy-glib/dbus-properties-mixin.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	#include <telepathy-glib/enums.h>		#include <telepathy-glib/enums.h>
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	call-stream.h		call-stream.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef __TP_CALL_STREAM_H__		#ifndef __TP_CALL_STREAM_H__
	#define __TP_CALL_STREAM_H__		#define __TP_CALL_STREAM_H__
	#include <telepathy-glib/proxy.h>		#include <telepathy-glib/proxy.h>
	#include <telepathy-glib/call-channel.h>		#include <telepathy-glib/call-channel.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	#define TP_TYPE_CALL_STREAM (tp_call_stream_get_type ())		#define TP_TYPE_CALL_STREAM (tp_call_stream_get_type ())
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	capabilities.h		capabilities.h
	skipping to change at line 20		skipping to change at line 20
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef __TP_CAPABILITIES_H__		#ifndef __TP_CAPABILITIES_H__
	#define __TP_CAPABILITIES_H__		#define __TP_CAPABILITIES_H__
	#include <glib-object.h>		#include <glib-object.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	#include <telepathy-glib/enums.h>		#include <telepathy-glib/enums.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	channel-dispatch-operation.h		channel-dispatch-operation.h
	skipping to change at line 22		skipping to change at line 22
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef TP_CHANNEL_DISPATCH_OPERATION_H		#ifndef TP_CHANNEL_DISPATCH_OPERATION_H
	#define TP_CHANNEL_DISPATCH_OPERATION_H		#define TP_CHANNEL_DISPATCH_OPERATION_H
	#include <telepathy-glib/account.h>		#include <telepathy-glib/account.h>
	#include <telepathy-glib/base-client.h>		#include <telepathy-glib/base-client.h>
	#include <telepathy-glib/connection.h>		#include <telepathy-glib/connection.h>
	#include <telepathy-glib/dbus.h>		#include <telepathy-glib/dbus.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	#include <telepathy-glib/proxy.h>		#include <telepathy-glib/proxy.h>
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	channel-dispatcher.h		channel-dispatcher.h
	skipping to change at line 22		skipping to change at line 22
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef TP_CHANNEL_DISPATCHER_H		#ifndef TP_CHANNEL_DISPATCHER_H
	#define TP_CHANNEL_DISPATCHER_H		#define TP_CHANNEL_DISPATCHER_H
	#include <telepathy-glib/channel.h>		#include <telepathy-glib/channel.h>
	#include <telepathy-glib/dbus.h>		#include <telepathy-glib/dbus.h>
	#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
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	channel-iface.h		channel-iface.h
	skipping to change at line 22		skipping to change at line 22
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef __TP_CHANNEL_IFACE_H__		#ifndef __TP_CHANNEL_IFACE_H__
	#define __TP_CHANNEL_IFACE_H__		#define __TP_CHANNEL_IFACE_H__
	#include <glib-object.h>		#include <glib-object.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	#define TP_TYPE_CHANNEL_IFACE (tp_channel_iface_get_type ())		#define TP_TYPE_CHANNEL_IFACE (tp_channel_iface_get_type ())
	#define TP_CHANNEL_IFACE(obj) \		#define TP_CHANNEL_IFACE(obj) \
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	channel-manager.h		channel-manager.h
	skipping to change at line 23		skipping to change at line 23
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef TP_CHANNEL_MANAGER_H		#ifndef TP_CHANNEL_MANAGER_H
	#define TP_CHANNEL_MANAGER_H		#define TP_CHANNEL_MANAGER_H
	#include <glib-object.h>		#include <glib-object.h>
			#include <telepathy-glib/defs.h>
	#include <telepathy-glib/exportable-channel.h>		#include <telepathy-glib/exportable-channel.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	#define TP_TYPE_CHANNEL_MANAGER (tp_channel_manager_get_type ())		#define TP_TYPE_CHANNEL_MANAGER (tp_channel_manager_get_type ())
	#define TP_CHANNEL_MANAGER(obj) \		#define TP_CHANNEL_MANAGER(obj) \
	(G_TYPE_CHECK_INSTANCE_CAST ((obj), \		(G_TYPE_CHECK_INSTANCE_CAST ((obj), \
	TP_TYPE_CHANNEL_MANAGER, TpChannelManager))		TP_TYPE_CHANNEL_MANAGER, TpChannelManager))
	skipping to change at line 126		skipping to change at line 131
	GCallback _future[7];		GCallback _future[7];
	};		};
	GType tp_channel_manager_get_type (void);		GType tp_channel_manager_get_type (void);
	/* signal emission */		/* signal emission */
	void tp_channel_manager_emit_new_channel (gpointer instance,		void tp_channel_manager_emit_new_channel (gpointer instance,
	TpExportableChannel *channel, GSList *request_tokens);		TpExportableChannel *channel, GSList *request_tokens);
			_TP_DEPRECATED_IN_0_20
	void tp_channel_manager_emit_new_channels (gpointer instance,		void tp_channel_manager_emit_new_channels (gpointer instance,
	GHashTable *channels);		GHashTable *channels);
	void tp_channel_manager_emit_channel_closed (gpointer instance,		void tp_channel_manager_emit_channel_closed (gpointer instance,
	const gchar *path);		const gchar *path);
	void tp_channel_manager_emit_channel_closed_for_object (gpointer instance,		void tp_channel_manager_emit_channel_closed_for_object (gpointer instance,
	TpExportableChannel *channel);		TpExportableChannel *channel);
	void tp_channel_manager_emit_request_already_satisfied (		void tp_channel_manager_emit_request_already_satisfied (
	gpointer instance, gpointer request_token,		gpointer instance, gpointer request_token,
End of changes. 3 change blocks.
	0 lines changed or deleted		9 lines changed or added

	channel-request.h		channel-request.h
	skipping to change at line 22		skipping to change at line 22
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef TP_CHANNEL_REQUEST_H		#ifndef TP_CHANNEL_REQUEST_H
	#define TP_CHANNEL_REQUEST_H		#define TP_CHANNEL_REQUEST_H
	#include <telepathy-glib/account.h>		#include <telepathy-glib/account.h>
	#include <telepathy-glib/client-channel-factory.h>		#include <telepathy-glib/client-channel-factory.h>
	#include <telepathy-glib/dbus.h>		#include <telepathy-glib/dbus.h>
	#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
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	channel.h		channel.h
	skipping to change at line 22		skipping to change at line 22
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef __TP_CHANNEL_H__		#ifndef __TP_CHANNEL_H__
	#define __TP_CHANNEL_H__		#define __TP_CHANNEL_H__
	#include <telepathy-glib/connection.h>		#include <telepathy-glib/connection.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/intset.h>		#include <telepathy-glib/intset.h>
	#include <telepathy-glib/proxy.h>		#include <telepathy-glib/proxy.h>
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	client-channel-factory.h		client-channel-factory.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef __TP_CLIENT_CHANNEL_FACTORY_H__		#ifndef __TP_CLIENT_CHANNEL_FACTORY_H__
	#define __TP_CLIENT_CHANNEL_FACTORY_H__		#define __TP_CLIENT_CHANNEL_FACTORY_H__
	#include <glib-object.h>		#include <glib-object.h>
	#include <telepathy-glib/channel.h>		#include <telepathy-glib/channel.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	typedef struct _TpClientChannelFactory TpClientChannelFactory;		typedef struct _TpClientChannelFactory TpClientChannelFactory;
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	client-message.h		client-message.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef __TP_CLIENT_MESSAGE_H__		#ifndef __TP_CLIENT_MESSAGE_H__
	#define __TP_CLIENT_MESSAGE_H__		#define __TP_CLIENT_MESSAGE_H__
	#include <glib-object.h>		#include <glib-object.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	#include <telepathy-glib/message.h>		#include <telepathy-glib/message.h>
	#define TP_TYPE_CLIENT_MESSAGE (tp_client_message_get_type ())		#define TP_TYPE_CLIENT_MESSAGE (tp_client_message_get_type ())
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	client.h		client.h
	skipping to change at line 22		skipping to change at line 22
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef TP_CLIENT_H		#ifndef TP_CLIENT_H
	#define TP_CLIENT_H		#define TP_CLIENT_H
	#include <telepathy-glib/dbus.h>		#include <telepathy-glib/dbus.h>
	#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 _TpClient TpClient;		typedef struct _TpClient TpClient;
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	cm-message.h		cm-message.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef __TP_CM_MESSAGE_H__		#ifndef __TP_CM_MESSAGE_H__
	#define __TP_CM_MESSAGE_H__		#define __TP_CM_MESSAGE_H__
	#include <glib.h>		#include <glib.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/message.h>		#include <telepathy-glib/message.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	connection-contact-list.h		connection-contact-list.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef __TP_CONNECTION_CONTACT_LIST_H__		#ifndef __TP_CONNECTION_CONTACT_LIST_H__
	#define __TP_CONNECTION_CONTACT_LIST_H__		#define __TP_CONNECTION_CONTACT_LIST_H__
	#include <telepathy-glib/enums.h>		#include <telepathy-glib/enums.h>
	#include <telepathy-glib/connection.h>		#include <telepathy-glib/connection.h>
	#include <telepathy-glib/contact.h>		#include <telepathy-glib/contact.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	connection-manager.h		connection-manager.h
	skipping to change at line 22		skipping to change at line 22
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef __TP_CONNECTION_MANAGER_H__		#ifndef __TP_CONNECTION_MANAGER_H__
	#define __TP_CONNECTION_MANAGER_H__		#define __TP_CONNECTION_MANAGER_H__
	#include <telepathy-glib/dbus.h>		#include <telepathy-glib/dbus.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	#include <telepathy-glib/protocol.h>		#include <telepathy-glib/protocol.h>
	#include <telepathy-glib/proxy.h>		#include <telepathy-glib/proxy.h>
	#include <telepathy-glib/_gen/genums.h>		#include <telepathy-glib/_gen/genums.h>
	skipping to change at line 83		skipping to change at line 87
	};		};
	typedef enum		typedef enum
	{		{
	TP_CM_INFO_SOURCE_NONE,		TP_CM_INFO_SOURCE_NONE,
	TP_CM_INFO_SOURCE_FILE,		TP_CM_INFO_SOURCE_FILE,
	TP_CM_INFO_SOURCE_LIVE		TP_CM_INFO_SOURCE_LIVE
	} TpCMInfoSource;		} TpCMInfoSource;
	struct _TpConnectionManager {		struct _TpConnectionManager {
	/*<public>*/		/*<private>*/
	TpProxy parent;		TpProxy parent;
	const gchar *name;		const gchar *_TP_SEAL (name);
	const TpConnectionManagerProtocol * const *protocols;		const TpConnectionManagerProtocol * const *_TP_SEAL (protocols);
	/* These are really booleans, but gboolean is signed. Thanks, GLib */		/* These are really booleans, but gboolean is signed. Thanks, GLib */
	unsigned int running:1;		unsigned int _TP_SEAL (running):1;
	unsigned int always_introspect:1;		unsigned int _TP_SEAL (always_introspect):1;
	/* TpCMInfoSource, but can't rely on enums being unsigned */		/* TpCMInfoSource, but can't rely on enums being unsigned */
	unsigned int info_source:2;		unsigned int _TP_SEAL (info_source):2;
	guint reserved_flags:28;		guint _TP_SEAL (reserved_flags):28;
	TpConnectionManagerPrivate *priv;		TpConnectionManagerPrivate *priv;
	};		};
	struct _TpConnectionManagerClass {		struct _TpConnectionManagerClass {
	/*<private>*/		/*<private>*/
	TpProxyClass parent_class;		TpProxyClass parent_class;
	gpointer *priv;		gpointer *priv;
	};		};
	TpConnectionManager *tp_connection_manager_new (TpDBusDaemon *dbus,		TpConnectionManager *tp_connection_manager_new (TpDBusDaemon *dbus,
	const gchar *name, const gchar *manager_filename, GError **error)		const gchar *name, const gchar *manager_filename, GError **error)
	G_GNUC_WARN_UNUSED_RESULT;		G_GNUC_WARN_UNUSED_RESULT;
	gboolean tp_connection_manager_activate (TpConnectionManager *self);		gboolean tp_connection_manager_activate (TpConnectionManager *self);
	typedef void (*TpConnectionManagerListCb) (TpConnectionManager * const *cms ,		typedef void (*TpConnectionManagerListCb) (TpConnectionManager * const *cms ,
	gsize n_cms, const GError *error, gpointer user_data,		gsize n_cms, const GError *error, gpointer user_data,
	GObject *weak_object);		GObject *weak_object);
			#ifndef TP_DISABLE_DEPRECATED
			_TP_DEPRECATED_IN_0_20_FOR (tp_list_connection_managers_async)
	void tp_list_connection_managers (TpDBusDaemon *bus_daemon,		void tp_list_connection_managers (TpDBusDaemon *bus_daemon,
	TpConnectionManagerListCb callback,		TpConnectionManagerListCb callback,
	gpointer user_data, GDestroyNotify destroy,		gpointer user_data, GDestroyNotify destroy,
	GObject *weak_object);		GObject *weak_object);
			#endif
	_TP_AVAILABLE_IN_0_18		_TP_AVAILABLE_IN_0_18
	void tp_list_connection_managers_async (TpDBusDaemon *dbus_daemon,		void tp_list_connection_managers_async (TpDBusDaemon *dbus_daemon,
	GAsyncReadyCallback callback,		GAsyncReadyCallback callback,
	gpointer user_data);		gpointer user_data);
	_TP_AVAILABLE_IN_0_18		_TP_AVAILABLE_IN_0_18
	GList *tp_list_connection_managers_finish (GAsyncResult *result,		GList *tp_list_connection_managers_finish (GAsyncResult *result,
	GError **error);		GError **error);
	#ifndef TP_DISABLE_DEPRECATED		#ifndef TP_DISABLE_DEPRECATED
	skipping to change at line 156		skipping to change at line 163
	gboolean tp_connection_manager_check_valid_name (const gchar *name,		gboolean tp_connection_manager_check_valid_name (const gchar *name,
	GError **error);		GError **error);
	gboolean tp_connection_manager_check_valid_protocol_name (const gchar *name ,		gboolean tp_connection_manager_check_valid_protocol_name (const gchar *name ,
	GError **error);		GError **error);
	gchar **tp_connection_manager_dup_protocol_names (TpConnectionManager *self )		gchar **tp_connection_manager_dup_protocol_names (TpConnectionManager *self )
	G_GNUC_WARN_UNUSED_RESULT;		G_GNUC_WARN_UNUSED_RESULT;
	gboolean tp_connection_manager_has_protocol (TpConnectionManager *self,		gboolean tp_connection_manager_has_protocol (TpConnectionManager *self,
	const gchar *protocol);		const gchar *protocol);
	const TpConnectionManagerProtocol *tp_connection_manager_get_protocol (
	TpConnectionManager *self, const gchar *protocol);
	TpProtocol *tp_connection_manager_get_protocol_object (		TpProtocol *tp_connection_manager_get_protocol_object (
	TpConnectionManager *self, const gchar *protocol);		TpConnectionManager *self, const gchar *protocol);
	_TP_AVAILABLE_IN_0_18		_TP_AVAILABLE_IN_0_18
	GList *tp_connection_manager_dup_protocols (TpConnectionManager *self)		GList *tp_connection_manager_dup_protocols (TpConnectionManager *self)
	G_GNUC_WARN_UNUSED_RESULT;		G_GNUC_WARN_UNUSED_RESULT;
			#ifndef TP_DISABLE_DEPRECATED
			_TP_DEPRECATED_IN_0_20_FOR (tp_connection_manager_get_protocol_object)
			const TpConnectionManagerProtocol *tp_connection_manager_get_protocol (
			TpConnectionManager *self, const gchar *protocol);
			_TP_DEPRECATED_IN_0_20_FOR (tp_protocol_dup_param_names)
	gchar **tp_connection_manager_protocol_dup_param_names (		gchar **tp_connection_manager_protocol_dup_param_names (
	const TpConnectionManagerProtocol *protocol)		const TpConnectionManagerProtocol *protocol)
	G_GNUC_WARN_UNUSED_RESULT;		G_GNUC_WARN_UNUSED_RESULT;
			_TP_DEPRECATED_IN_0_20_FOR (tp_protocol_has_param)
	gboolean tp_connection_manager_protocol_has_param (		gboolean tp_connection_manager_protocol_has_param (
	const TpConnectionManagerProtocol *protocol,		const TpConnectionManagerProtocol *protocol,
	const gchar *param);		const gchar *param);
			_TP_DEPRECATED_IN_0_20_FOR (tp_protocol_dup_param)
	const TpConnectionManagerParam *tp_connection_manager_protocol_get_param (		const TpConnectionManagerParam *tp_connection_manager_protocol_get_param (
	const TpConnectionManagerProtocol *protocol, const gchar *param);		const TpConnectionManagerProtocol *protocol, const gchar *param);
			_TP_DEPRECATED_IN_0_20_FOR (tp_protocol_can_register)
	gboolean tp_connection_manager_protocol_can_register (		gboolean tp_connection_manager_protocol_can_register (
	const TpConnectionManagerProtocol *protocol);		const TpConnectionManagerProtocol *protocol);
			#endif
	const gchar *tp_connection_manager_param_get_name (		const gchar *tp_connection_manager_param_get_name (
	const TpConnectionManagerParam *param);		const TpConnectionManagerParam *param);
	const gchar *tp_connection_manager_param_get_dbus_signature (		const gchar *tp_connection_manager_param_get_dbus_signature (
	const TpConnectionManagerParam *param);		const TpConnectionManagerParam *param);
	gboolean tp_connection_manager_param_is_required (		gboolean tp_connection_manager_param_is_required (
	const TpConnectionManagerParam *param);		const TpConnectionManagerParam *param);
	gboolean tp_connection_manager_param_is_required_for_registration (		gboolean tp_connection_manager_param_is_required_for_registration (
	const TpConnectionManagerParam *param);		const TpConnectionManagerParam *param);
	gboolean tp_connection_manager_param_is_secret (		gboolean tp_connection_manager_param_is_secret (
	skipping to change at line 203		skipping to change at line 218
	void tp_connection_manager_init_known_interfaces (void);		void tp_connection_manager_init_known_interfaces (void);
	#define TP_CONNECTION_MANAGER_FEATURE_CORE \		#define TP_CONNECTION_MANAGER_FEATURE_CORE \
	(tp_connection_manager_get_feature_quark_core ())		(tp_connection_manager_get_feature_quark_core ())
	GQuark tp_connection_manager_get_feature_quark_core (void) G_GNUC_CONST;		GQuark tp_connection_manager_get_feature_quark_core (void) G_GNUC_CONST;
	TpConnectionManagerParam *tp_connection_manager_param_copy (		TpConnectionManagerParam *tp_connection_manager_param_copy (
	const TpConnectionManagerParam *in);		const TpConnectionManagerParam *in);
	void tp_connection_manager_param_free (TpConnectionManagerParam *param);		void tp_connection_manager_param_free (TpConnectionManagerParam *param);
			#ifndef TP_DISABLE_DEPRECATED
			_TP_DEPRECATED_IN_0_20
	TpConnectionManagerProtocol *tp_connection_manager_protocol_copy (		TpConnectionManagerProtocol *tp_connection_manager_protocol_copy (
	const TpConnectionManagerProtocol *in);		const TpConnectionManagerProtocol *in);
			_TP_DEPRECATED_IN_0_20
	void tp_connection_manager_protocol_free (TpConnectionManagerProtocol *prot o);		void tp_connection_manager_protocol_free (TpConnectionManagerProtocol *prot o);
			#endif
	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. 16 change blocks.
	9 lines changed or deleted		31 lines changed or added

	connection.h		connection.h
	skipping to change at line 22		skipping to change at line 22
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef __TP_CONNECTION_H__		#ifndef __TP_CONNECTION_H__
	#define __TP_CONNECTION_H__		#define __TP_CONNECTION_H__
	#include <telepathy-glib/capabilities.h>		#include <telepathy-glib/capabilities.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	#include <telepathy-glib/enums.h>		#include <telepathy-glib/enums.h>
	#include <telepathy-glib/handle.h>		#include <telepathy-glib/handle.h>
	#include <telepathy-glib/proxy.h>		#include <telepathy-glib/proxy.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	skipping to change at line 51		skipping to change at line 55
	/*<private>*/		/*<private>*/
	gpointer priv;		gpointer priv;
	};		};
	#define TP_TYPE_CONTACT_INFO_FIELD_SPEC (tp_contact_info_field_spec_get_typ e ())		#define TP_TYPE_CONTACT_INFO_FIELD_SPEC (tp_contact_info_field_spec_get_typ e ())
	GType tp_contact_info_field_spec_get_type (void);		GType tp_contact_info_field_spec_get_type (void);
	TpContactInfoFieldSpec *tp_contact_info_field_spec_copy (		TpContactInfoFieldSpec *tp_contact_info_field_spec_copy (
	const TpContactInfoFieldSpec *self);		const TpContactInfoFieldSpec *self);
	void tp_contact_info_field_spec_free (TpContactInfoFieldSpec *self);		void tp_contact_info_field_spec_free (TpContactInfoFieldSpec *self);
			#ifndef __GI_SCANNER__
			/* the typedef only exists for G_DEFINE_BOXED_TYPE's benefit, and
			* g-ir-scanner 1.32.1 doesn't parse a skip annotation */
	typedef GList TpContactInfoSpecList;		typedef GList TpContactInfoSpecList;
			#endif
	#define TP_TYPE_CONTACT_INFO_SPEC_LIST (tp_contact_info_spec_list_get_type ())		#define TP_TYPE_CONTACT_INFO_SPEC_LIST (tp_contact_info_spec_list_get_type ())
	GType tp_contact_info_spec_list_get_type (void);		GType tp_contact_info_spec_list_get_type (void);
	GList *tp_contact_info_spec_list_copy (GList *list);		GList *tp_contact_info_spec_list_copy (GList *list);
	void tp_contact_info_spec_list_free (GList *list);		void tp_contact_info_spec_list_free (GList *list);
	typedef struct _TpContactInfoField TpContactInfoField;		typedef struct _TpContactInfoField TpContactInfoField;
	struct _TpContactInfoField		struct _TpContactInfoField
	{		{
	/*<public>*/		/*<public>*/
	skipping to change at line 76		skipping to change at line 84
	gpointer priv;		gpointer priv;
	};		};
	#define TP_TYPE_CONTACT_INFO_FIELD (tp_contact_info_field_get_type ())		#define TP_TYPE_CONTACT_INFO_FIELD (tp_contact_info_field_get_type ())
	GType tp_contact_info_field_get_type (void);		GType tp_contact_info_field_get_type (void);
	TpContactInfoField *tp_contact_info_field_new (const gchar *field_name,		TpContactInfoField *tp_contact_info_field_new (const gchar *field_name,
	GStrv parameters, GStrv field_value);		GStrv parameters, GStrv field_value);
	TpContactInfoField *tp_contact_info_field_copy (const TpContactInfoField *s elf);		TpContactInfoField *tp_contact_info_field_copy (const TpContactInfoField *s elf);
	void tp_contact_info_field_free (TpContactInfoField *self);		void tp_contact_info_field_free (TpContactInfoField *self);
			#ifndef __GI_SCANNER__
			/* the typedef only exists for G_DEFINE_BOXED_TYPE's benefit, and
			* g-ir-scanner 1.32.1 doesn't parse a skip annotation */
	typedef GList TpContactInfoList;		typedef GList TpContactInfoList;
			#endif
	#define TP_TYPE_CONTACT_INFO_LIST (tp_contact_info_list_get_type ())		#define TP_TYPE_CONTACT_INFO_LIST (tp_contact_info_list_get_type ())
	GType tp_contact_info_list_get_type (void);		GType tp_contact_info_list_get_type (void);
	GList *tp_contact_info_list_copy (GList *list);		GList *tp_contact_info_list_copy (GList *list);
	void tp_contact_info_list_free (GList *list);		void tp_contact_info_list_free (GList *list);
	/* forward declaration, see contact.h for the rest */		/* forward declaration, see contact.h for the rest */
	typedef struct _TpContact TpContact;		typedef struct _TpContact TpContact;
	/* forward declaration, see account.h for the rest */		/* forward declaration, see account.h for the rest */
	typedef struct _TpAccount TpAccount;		typedef struct _TpAccount TpAccount;
	skipping to change at line 197		skipping to change at line 209
	void tp_list_connection_names (TpDBusDaemon *bus_daemon,		void tp_list_connection_names (TpDBusDaemon *bus_daemon,
	TpConnectionNameListCb callback,		TpConnectionNameListCb callback,
	gpointer user_data, GDestroyNotify destroy,		gpointer user_data, GDestroyNotify destroy,
	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);
			#ifndef TP_DISABLE_DEPRECATED
			_TP_DEPRECATED_IN_0_20_FOR(tp_connection_get_protocol_name)
	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);
			#endif
	_TP_AVAILABLE_IN_0_20		_TP_AVAILABLE_IN_0_20
	const gchar *tp_connection_get_detailed_error (TpConnection *self,		const gchar *tp_connection_get_detailed_error (TpConnection *self,
	const GHashTable **details);		const GHashTable **details);
	_TP_AVAILABLE_IN_0_20		_TP_AVAILABLE_IN_0_20
	gchar *tp_connection_dup_detailed_error_vardict (TpConnection *self,		gchar *tp_connection_dup_detailed_error_vardict (TpConnection *self,
	GVariant **details) G_GNUC_WARN_UNUSED_RESULT;		GVariant **details) G_GNUC_WARN_UNUSED_RESULT;
	void tp_connection_add_client_interest (TpConnection *self,		void tp_connection_add_client_interest (TpConnection *self,
	const gchar *interested_in);		const gchar *interested_in);
	skipping to change at line 233		skipping to change at line 248
	#define TP_CONNECTION_FEATURE_CAPABILITIES \		#define TP_CONNECTION_FEATURE_CAPABILITIES \
	(tp_connection_get_feature_quark_capabilities ())		(tp_connection_get_feature_quark_capabilities ())
	GQuark tp_connection_get_feature_quark_capabilities (void) G_GNUC_CONST;		GQuark tp_connection_get_feature_quark_capabilities (void) G_GNUC_CONST;
	#define TP_CONNECTION_FEATURE_CONTACT_INFO \		#define TP_CONNECTION_FEATURE_CONTACT_INFO \
	(tp_connection_get_feature_quark_contact_info ())		(tp_connection_get_feature_quark_contact_info ())
	GQuark tp_connection_get_feature_quark_contact_info (void) G_GNUC_CONST;		GQuark tp_connection_get_feature_quark_contact_info (void) G_GNUC_CONST;
	/* connection-handles.c */		/* connection-handles.c */
			#ifndef TP_DISABLE_DEPRECATED
	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);
			_TP_DEPRECATED_IN_0_20
	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);
	typedef void (*TpConnectionRequestHandlesCb) (TpConnection *connection,		typedef void (*TpConnectionRequestHandlesCb) (TpConnection *connection,
	TpHandleType handle_type,		TpHandleType handle_type,
	guint n_handles, const TpHandle *handles, const gchar * const *ids,		guint n_handles, const TpHandle *handles, const gchar * const *ids,
	const GError *error, gpointer user_data, GObject *weak_object);		const GError *error, gpointer user_data, GObject *weak_object);
			_TP_DEPRECATED_IN_0_20
	void tp_connection_request_handles (TpConnection *self, gint timeout_ms,		void tp_connection_request_handles (TpConnection *self, gint timeout_ms,
	TpHandleType handle_type, const gchar * const *ids,		TpHandleType handle_type, const gchar * const *ids,
	TpConnectionRequestHandlesCb callback,		TpConnectionRequestHandlesCb callback,
	gpointer user_data, GDestroyNotify destroy, GObject *weak_object);		gpointer user_data, GDestroyNotify destroy, GObject *weak_object);
			_TP_DEPRECATED_IN_0_20
	void tp_connection_unref_handles (TpConnection *self,		void tp_connection_unref_handles (TpConnection *self,
	TpHandleType handle_type, guint n_handles, const TpHandle *handles);		TpHandleType handle_type, guint n_handles, const TpHandle *handles);
			#endif
	/* connection-avatars.c */		/* connection-avatars.c */
	typedef struct _TpAvatarRequirements TpAvatarRequirements;		typedef struct _TpAvatarRequirements TpAvatarRequirements;
	struct _TpAvatarRequirements		struct _TpAvatarRequirements
	{		{
	/*<public>*/		/*<public>*/
	GStrv supported_mime_types;		GStrv supported_mime_types;
	guint minimum_width;		guint minimum_width;
	guint minimum_height;		guint minimum_height;
	skipping to change at line 335		skipping to change at line 355
	G_END_DECLS		G_END_DECLS
	#include <telepathy-glib/_gen/tp-cli-connection.h>		#include <telepathy-glib/_gen/tp-cli-connection.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	/* connection-handles.c again - this has to come after the auto-generated		/* connection-handles.c again - this has to come after the auto-generated
	* stuff because it uses an auto-generated typedef */		* stuff because it uses an auto-generated typedef */
			#ifndef TP_DISABLE_DEPRECATED
			_TP_DEPRECATED_IN_0_20_FOR(tp_simple_client_factory_ensure_contact)
	void tp_connection_get_contact_attributes (TpConnection *self,		void tp_connection_get_contact_attributes (TpConnection *self,
	gint timeout_ms, guint n_handles, const TpHandle *handles,		gint timeout_ms, guint n_handles, const TpHandle *handles,
	const gchar * const *interfaces, gboolean hold,		const gchar * const *interfaces, gboolean hold,
	tp_cli_connection_interface_contacts_callback_for_get_contact_attribute s callback,		tp_cli_connection_interface_contacts_callback_for_get_contact_attribute s callback,
	gpointer user_data, GDestroyNotify destroy, GObject *weak_object);		gpointer user_data, GDestroyNotify destroy, GObject *weak_object);
			_TP_DEPRECATED_IN_0_20_FOR(tp_connection_dup_contact_list)
	void tp_connection_get_contact_list_attributes (TpConnection *self,		void tp_connection_get_contact_list_attributes (TpConnection *self,
	gint timeout_ms, const gchar * const *interfaces, gboolean hold,		gint timeout_ms, const gchar * const *interfaces, gboolean hold,
	tp_cli_connection_interface_contacts_callback_for_get_contact_attribute s callback,		tp_cli_connection_interface_contacts_callback_for_get_contact_attribute s callback,
	gpointer user_data, GDestroyNotify destroy, GObject *weak_object);		gpointer user_data, GDestroyNotify destroy, GObject *weak_object);
			#endif
	GBinding *tp_connection_bind_connection_status_to_property (TpConnection *s elf,		GBinding *tp_connection_bind_connection_status_to_property (TpConnection *s elf,
	gpointer target, const char *target_property, gboolean invert);		gpointer target, const char *target_property, gboolean invert);
	G_END_DECLS		G_END_DECLS
	#endif		#endif
End of changes. 15 change blocks.
	0 lines changed or deleted		27 lines changed or added

	contact-operations.h		contact-operations.h
	skipping to change at line 20		skipping to change at line 20
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef __TP_CONTACT_OPERATIONS_H__		#ifndef __TP_CONTACT_OPERATIONS_H__
	#define __TP_CONTACT_OPERATIONS_H__		#define __TP_CONTACT_OPERATIONS_H__
	#include <telepathy-glib/contact.h>		#include <telepathy-glib/contact.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	_TP_AVAILABLE_IN_0_16		_TP_AVAILABLE_IN_0_16
	void tp_contact_request_subscription_async (TpContact *self,		void tp_contact_request_subscription_async (TpContact *self,
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	contact-search-result.h		contact-search-result.h
	skipping to change at line 21		skipping to change at line 21
	* This file is distributed in the hope that it will be useful,		* This file is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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 code; if not, write to the Free Software		* License along with this code; 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef __TP_CONTACT_SEARCH_RESULT_H__		#ifndef __TP_CONTACT_SEARCH_RESULT_H__
	#define __TP_CONTACT_SEARCH_RESULT_H__		#define __TP_CONTACT_SEARCH_RESULT_H__
	#include <telepathy-glib/channel.h>		#include <telepathy-glib/channel.h>
	#include <telepathy-glib/dbus.h>		#include <telepathy-glib/dbus.h>
	#include <telepathy-glib/util.h>		#include <telepathy-glib/util.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	#define TP_TYPE_CONTACT_SEARCH_RESULT \		#define TP_TYPE_CONTACT_SEARCH_RESULT \
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	contact-search.h		contact-search.h
	skipping to change at line 21		skipping to change at line 21
	* This file is distributed in the hope that it will be useful,		* This file is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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 code; if not, write to the Free Software		* License along with this code; 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef __TP_CONTACT_SEARCH_H__		#ifndef __TP_CONTACT_SEARCH_H__
	#define __TP_CONTACT_SEARCH_H__		#define __TP_CONTACT_SEARCH_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>
	#include <telepathy-glib/account.h>		#include <telepathy-glib/account.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	contact.h		contact.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef __TP_CONTACT_H__		#ifndef __TP_CONTACT_H__
	#define __TP_CONTACT_H__		#define __TP_CONTACT_H__
	#include <glib-object.h>		#include <glib-object.h>
	#include <gio/gio.h>		#include <gio/gio.h>
	#include <telepathy-glib/capabilities.h>		#include <telepathy-glib/capabilities.h>
	#include <telepathy-glib/connection.h>		#include <telepathy-glib/connection.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	#include <telepathy-glib/handle.h>		#include <telepathy-glib/handle.h>
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	contacts-mixin.h		contacts-mixin.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef __TP_CONTACTS_MIXIN_H__		#ifndef __TP_CONTACTS_MIXIN_H__
	#define __TP_CONTACTS_MIXIN_H__		#define __TP_CONTACTS_MIXIN_H__
	#include <telepathy-glib/svc-connection.h>		#include <telepathy-glib/svc-connection.h>
	#include <telepathy-glib/handle-repo.h>		#include <telepathy-glib/handle-repo.h>
	#include "util.h"		#include "util.h"
	G_BEGIN_DECLS		G_BEGIN_DECLS
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	dbus-properties-mixin.h		dbus-properties-mixin.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef __TP_DBUS_PROPERTIES_MIXIN_H__		#ifndef __TP_DBUS_PROPERTIES_MIXIN_H__
	#define __TP_DBUS_PROPERTIES_MIXIN_H__		#define __TP_DBUS_PROPERTIES_MIXIN_H__
	#include <glib-object.h>		#include <glib-object.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	#include <telepathy-glib/_gen/genums.h>		#include <telepathy-glib/_gen/genums.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	dbus-tube-channel.h		dbus-tube-channel.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef __TP_DBUS_TUBE_CHANNEL_H__		#ifndef __TP_DBUS_TUBE_CHANNEL_H__
	#define __TP_DBUS_TUBE_CHANNEL_H__		#define __TP_DBUS_TUBE_CHANNEL_H__
	#include <telepathy-glib/channel.h>		#include <telepathy-glib/channel.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	#define TP_TYPE_DBUS_TUBE_CHANNEL (tp_dbus_tube_channel_get_type ())		#define TP_TYPE_DBUS_TUBE_CHANNEL (tp_dbus_tube_channel_get_type ())
	#define TP_DBUS_TUBE_CHANNEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TP_TY PE_DBUS_TUBE_CHANNEL, TpDBusTubeChannel))		#define TP_DBUS_TUBE_CHANNEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TP_TY PE_DBUS_TUBE_CHANNEL, TpDBusTubeChannel))
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	dbus.h		dbus.h
	skipping to change at line 22		skipping to change at line 22
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef __TELEPATHY_DBUS_H__		#ifndef __TELEPATHY_DBUS_H__
	#define __TELEPATHY_DBUS_H__		#define __TELEPATHY_DBUS_H__
	#define __TP_IN_DBUS_H__		#define __TP_IN_DBUS_H__
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	#include <telepathy-glib/dbus-daemon.h>		#include <telepathy-glib/dbus-daemon.h>
	#include <telepathy-glib/_gen/genums.h>		#include <telepathy-glib/_gen/genums.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	debug-client.h		debug-client.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef TP_DEBUG_CLIENT_H		#ifndef TP_DEBUG_CLIENT_H
	#define TP_DEBUG_CLIENT_H		#define TP_DEBUG_CLIENT_H
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	#include <telepathy-glib/proxy.h>		#include <telepathy-glib/proxy.h>
	#include <telepathy-glib/debug-message.h>		#include <telepathy-glib/debug-message.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	typedef struct _TpDebugClient TpDebugClient;		typedef struct _TpDebugClient TpDebugClient;
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	debug-message.h		debug-message.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef __TP_DEBUG_MESSAGE_H__		#ifndef __TP_DEBUG_MESSAGE_H__
	#define __TP_DEBUG_MESSAGE_H__		#define __TP_DEBUG_MESSAGE_H__
	#include <glib-object.h>		#include <glib-object.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	typedef struct _TpDebugMessage TpDebugMessage;		typedef struct _TpDebugMessage TpDebugMessage;
	typedef struct _TpDebugMessageClass TpDebugMessageClass;		typedef struct _TpDebugMessageClass TpDebugMessageClass;
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	debug-sender.h		debug-sender.h
	skipping to change at line 20		skipping to change at line 20
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef __TP_DEBUG_SENDER_H__		#ifndef __TP_DEBUG_SENDER_H__
	#define __TP_DEBUG_SENDER_H__		#define __TP_DEBUG_SENDER_H__
	#include <glib-object.h>		#include <glib-object.h>
	#include <telepathy-glib/dbus-properties-mixin.h>		#include <telepathy-glib/dbus-properties-mixin.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	#include <telepathy-glib/enums.h>		#include <telepathy-glib/enums.h>
	#include <telepathy-glib/svc-debug.h>		#include <telepathy-glib/svc-debug.h>
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	debug.h		debug.h
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef __TP_DEBUG_H__		#ifndef __TP_DEBUG_H__
	#define __TP_DEBUG_H__		#define __TP_DEBUG_H__
	#include <glib.h>		#include <glib.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	void tp_debug_set_flags (const gchar *flags_string);		void tp_debug_set_flags (const gchar *flags_string);
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	defs.h		defs.h
	skipping to change at line 22		skipping to change at line 22
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef __TP_DEFS_H__		#ifndef __TP_DEFS_H__
	#define __TP_DEFS_H__		#define __TP_DEFS_H__
	#include <glib.h>		#include <glib.h>
	#include <telepathy-glib/version.h>		#include <telepathy-glib/version.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	/**		/**
	* TP_CM_BUS_NAME_BASE:		* TP_CM_BUS_NAME_BASE:
	skipping to change at line 284		skipping to change at line 288
	#define _TP_GNUC_DEPRECATED_FOR(f) /* nothing */		#define _TP_GNUC_DEPRECATED_FOR(f) /* nothing */
	#else		#else
	#define _TP_DEPRECATED G_DEPRECATED		#define _TP_DEPRECATED G_DEPRECATED
	#define _TP_DEPRECATED_FOR(f) G_DEPRECATED_FOR(f)		#define _TP_DEPRECATED_FOR(f) G_DEPRECATED_FOR(f)
	#define _TP_UNAVAILABLE(major, minor) G_UNAVAILABLE(major, minor)		#define _TP_UNAVAILABLE(major, minor) G_UNAVAILABLE(major, minor)
	/* Available for typedefs etc., not just functions, but gcc-specific */		/* Available for typedefs etc., not just functions, but gcc-specific */
	#define _TP_GNUC_DEPRECATED G_GNUC_DEPRECATED		#define _TP_GNUC_DEPRECATED G_GNUC_DEPRECATED
	#define _TP_GNUC_DEPRECATED_FOR(f) G_GNUC_DEPRECATED_FOR(f)		#define _TP_GNUC_DEPRECATED_FOR(f) G_GNUC_DEPRECATED_FOR(f)
	#endif		#endif
			/* like G_SEAL */
			#if (defined (TP_SEAL_ENABLE) || defined (TP_DISABLE_DEPRECATED)) \
			&& !defined (_TP_COMPILATION)
			# define _TP_SEAL(ident) _tp_sealed__ ## ident
			#else
			# define _TP_SEAL(ident) ident
			#endif
	G_END_DECLS		G_END_DECLS
	#endif		#endif
End of changes. 2 change blocks.
	0 lines changed or deleted		14 lines changed or added

	dtmf.h		dtmf.h
	skipping to change at line 20		skipping to change at line 20
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef __TP_DTMF_H__		#ifndef __TP_DTMF_H__
	#define __TP_DTMF_H__		#define __TP_DTMF_H__
	#include <glib-object.h>		#include <glib-object.h>
	#include <telepathy-glib/enums.h>		#include <telepathy-glib/enums.h>
	gchar tp_dtmf_event_to_char (TpDTMFEvent event);		gchar tp_dtmf_event_to_char (TpDTMFEvent event);
	typedef struct _TpDTMFPlayer TpDTMFPlayer;		typedef struct _TpDTMFPlayer TpDTMFPlayer;
	typedef struct _TpDTMFPlayerClass TpDTMFPlayerClass;		typedef struct _TpDTMFPlayerClass TpDTMFPlayerClass;
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	enums.h		enums.h
	#ifndef __TP_ENUMS_H__		#ifndef __TP_ENUMS_H__
	#define __TP_ENUMS_H__		#define __TP_ENUMS_H__
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#include <telepathy-glib/_gen/telepathy-enums.h>		#include <telepathy-glib/_gen/telepathy-enums.h>
	#include <telepathy-glib/_gen/genums.h>		#include <telepathy-glib/_gen/genums.h>
	#endif		#endif
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	errors.h		errors.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef __TP_ERRORS_H__		#ifndef __TP_ERRORS_H__
	#define __TP_ERRORS_H__		#define __TP_ERRORS_H__
	#include <glib-object.h>		#include <glib-object.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	#include <telepathy-glib/_gen/error-str.h>		#include <telepathy-glib/_gen/error-str.h>
	#include <telepathy-glib/_gen/genums.h>		#include <telepathy-glib/_gen/genums.h>
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	exportable-channel.h		exportable-channel.h
	skipping to change at line 22		skipping to change at line 22
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef TP_EXPORTABLE_CHANNEL_H		#ifndef TP_EXPORTABLE_CHANNEL_H
	#define TP_EXPORTABLE_CHANNEL_H		#define TP_EXPORTABLE_CHANNEL_H
	#include <glib-object.h>		#include <glib-object.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	#define TP_TYPE_EXPORTABLE_CHANNEL (tp_exportable_channel_get_type ())		#define TP_TYPE_EXPORTABLE_CHANNEL (tp_exportable_channel_get_type ())
	#define TP_EXPORTABLE_CHANNEL(obj) \		#define TP_EXPORTABLE_CHANNEL(obj) \
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	file-transfer-channel.h		file-transfer-channel.h
	skipping to change at line 22		skipping to change at line 22
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef __TP_FILE_TRANSFER_CHANNEL_H__		#ifndef __TP_FILE_TRANSFER_CHANNEL_H__
	#define __TP_FILE_TRANSFER_CHANNEL_H__		#define __TP_FILE_TRANSFER_CHANNEL_H__
	#include <telepathy-glib/channel.h>		#include <telepathy-glib/channel.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	#define TP_TYPE_FILE_TRANSFER_CHANNEL (tp_file_transfer_channel_get_type () )		#define TP_TYPE_FILE_TRANSFER_CHANNEL (tp_file_transfer_channel_get_type () )
	#define TP_FILE_TRANSFER_CHANNEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), T P_TYPE_FILE_TRANSFER_CHANNEL, TpFileTransferChannel))		#define TP_FILE_TRANSFER_CHANNEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), T P_TYPE_FILE_TRANSFER_CHANNEL, TpFileTransferChannel))
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	gnio-util.h		gnio-util.h
	skipping to change at line 22		skipping to change at line 22
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#include <glib-object.h>		#include <glib-object.h>
	#include <gio/gio.h>		#include <gio/gio.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	#include <telepathy-glib/enums.h>		#include <telepathy-glib/enums.h>
	#ifndef __TP_GNIO_UTIL_H__		#ifndef __TP_GNIO_UTIL_H__
	#define __TP_GNIO_UTIL_H__		#define __TP_GNIO_UTIL_H__
	G_BEGIN_DECLS		G_BEGIN_DECLS
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	group-mixin.h		group-mixin.h
	skipping to change at line 23		skipping to change at line 23
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef __TP_GROUP_MIXIN_H__		#ifndef __TP_GROUP_MIXIN_H__
	#define __TP_GROUP_MIXIN_H__		#define __TP_GROUP_MIXIN_H__
	#include <telepathy-glib/dbus-properties-mixin.h>		#include <telepathy-glib/dbus-properties-mixin.h>
	#include <telepathy-glib/handle-repo.h>		#include <telepathy-glib/handle-repo.h>
	#include <telepathy-glib/svc-channel.h>		#include <telepathy-glib/svc-channel.h>
	#include <telepathy-glib/util.h>		#include <telepathy-glib/util.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	gtypes.h		gtypes.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef __TP_GTYPES_H__		#ifndef __TP_GTYPES_H__
	#define __TP_GTYPES_H__		#define __TP_GTYPES_H__
	#include <dbus/dbus-glib.h>		#include <dbus/dbus-glib.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	#include <telepathy-glib/_gen/gtypes.h>		#include <telepathy-glib/_gen/gtypes.h>
	#define TP_ARRAY_TYPE_OBJECT_PATH_LIST (tp_type_dbus_array_of_o ())		#define TP_ARRAY_TYPE_OBJECT_PATH_LIST (tp_type_dbus_array_of_o ())
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	handle-channels-context.h		handle-channels-context.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef __TP_HANDLE_CHANNELS_CONTEXT_H__		#ifndef __TP_HANDLE_CHANNELS_CONTEXT_H__
	#define __TP_HANDLE_CHANNELS_CONTEXT_H__		#define __TP_HANDLE_CHANNELS_CONTEXT_H__
	#include <gio/gio.h>		#include <gio/gio.h>
	#include <glib-object.h>		#include <glib-object.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	typedef struct _TpHandleChannelsContext TpHandleChannelsContext;		typedef struct _TpHandleChannelsContext TpHandleChannelsContext;
	typedef struct _TpHandleChannelsContextClass \		typedef struct _TpHandleChannelsContextClass \
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	handle-repo-dynamic.h		handle-repo-dynamic.h
	skipping to change at line 23		skipping to change at line 23
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef __TP_HANDLE_REPO_DYNAMIC_H__		#ifndef __TP_HANDLE_REPO_DYNAMIC_H__
	#define __TP_HANDLE_REPO_DYNAMIC_H__		#define __TP_HANDLE_REPO_DYNAMIC_H__
	#include <telepathy-glib/handle-repo.h>		#include <telepathy-glib/handle-repo.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	typedef struct _TpDynamicHandleRepo TpDynamicHandleRepo;		typedef struct _TpDynamicHandleRepo TpDynamicHandleRepo;
	typedef struct _TpDynamicHandleRepoClass TpDynamicHandleRepoClass;		typedef struct _TpDynamicHandleRepoClass TpDynamicHandleRepoClass;
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	handle-repo-static.h		handle-repo-static.h
	skipping to change at line 24		skipping to change at line 24
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef __TP_HANDLE_REPO_STATIC_H__		#ifndef __TP_HANDLE_REPO_STATIC_H__
	#define __TP_HANDLE_REPO_STATIC_H__		#define __TP_HANDLE_REPO_STATIC_H__
	#include <telepathy-glib/handle-repo.h>		#include <telepathy-glib/handle-repo.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	/**		/**
	* TpStaticHandleRepo:		* TpStaticHandleRepo:
	*		*
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	handle-repo.h		handle-repo.h
	skipping to change at line 24		skipping to change at line 24
	* 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.
	*		*
	* 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		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
	* 02110-1301 USA		* 02110-1301 USA
	*		*
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef __TP_HANDLE_REPO_H__		#ifndef __TP_HANDLE_REPO_H__
	#define __TP_HANDLE_REPO_H__		#define __TP_HANDLE_REPO_H__
	#include <glib-object.h>		#include <glib-object.h>
	#include <telepathy-glib/intset.h>		#include <telepathy-glib/intset.h>
	#include <telepathy-glib/handle.h>		#include <telepathy-glib/handle.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	skipping to change at line 82		skipping to change at line 86
	GType tp_handle_repo_iface_get_type (void);		GType tp_handle_repo_iface_get_type (void);
	/* Public API for handle repositories */		/* Public API for handle repositories */
	gboolean tp_handle_is_valid (TpHandleRepoIface *self,		gboolean tp_handle_is_valid (TpHandleRepoIface *self,
	TpHandle handle, GError **error);		TpHandle handle, GError **error);
	gboolean tp_handles_are_valid (TpHandleRepoIface *self,		gboolean tp_handles_are_valid (TpHandleRepoIface *self,
	const GArray *handles, gboolean allow_zero, GError **error);		const GArray *handles, gboolean allow_zero, GError **error);
			#ifndef TP_DISABLE_DEPRECATED
			_TP_DEPRECATED_IN_0_20
	TpHandle tp_handle_ref (TpHandleRepoIface *self, TpHandle handle);		TpHandle tp_handle_ref (TpHandleRepoIface *self, TpHandle handle);
			_TP_DEPRECATED_IN_0_20
	void tp_handles_ref (TpHandleRepoIface *self, const GArray *handles);		void tp_handles_ref (TpHandleRepoIface *self, const GArray *handles);
			_TP_DEPRECATED_IN_0_20
	void tp_handle_unref (TpHandleRepoIface *self, TpHandle handle);		void tp_handle_unref (TpHandleRepoIface *self, TpHandle handle);
			_TP_DEPRECATED_IN_0_20
	void tp_handles_unref (TpHandleRepoIface *self, const GArray *handles);		void tp_handles_unref (TpHandleRepoIface *self, const GArray *handles);
			_TP_DEPRECATED_IN_0_20
	gboolean tp_handle_client_hold (TpHandleRepoIface *self,		gboolean tp_handle_client_hold (TpHandleRepoIface *self,
	const gchar *client, TpHandle handle, GError **error);		const gchar *client, TpHandle handle, GError **error);
			_TP_DEPRECATED_IN_0_20
	gboolean tp_handles_client_hold (TpHandleRepoIface *self,		gboolean tp_handles_client_hold (TpHandleRepoIface *self,
	const gchar *client, const GArray *handles, GError **error);		const gchar *client, const GArray *handles, GError **error);
			_TP_DEPRECATED_IN_0_20
	gboolean tp_handle_client_release (TpHandleRepoIface *self,		gboolean tp_handle_client_release (TpHandleRepoIface *self,
	const gchar *client, TpHandle handle, GError **error);		const gchar *client, TpHandle handle, GError **error);
			_TP_DEPRECATED_IN_0_20
	gboolean tp_handles_client_release (TpHandleRepoIface *self,		gboolean tp_handles_client_release (TpHandleRepoIface *self,
	const gchar *client, const GArray *handles, GError **error);		const gchar *client, const GArray *handles, GError **error);
			#endif
	const char *tp_handle_inspect (TpHandleRepoIface *self,		const char *tp_handle_inspect (TpHandleRepoIface *self,
	TpHandle handle) G_GNUC_WARN_UNUSED_RESULT;		TpHandle handle) G_GNUC_WARN_UNUSED_RESULT;
	TpHandle tp_handle_lookup (TpHandleRepoIface *self,		TpHandle tp_handle_lookup (TpHandleRepoIface *self,
	const gchar *id, gpointer context, GError **error);		const gchar *id, gpointer context, GError **error);
	TpHandle tp_handle_ensure (TpHandleRepoIface *self,		TpHandle tp_handle_ensure (TpHandleRepoIface *self,
	const gchar *id, gpointer context, GError **error)		const gchar *id, gpointer context, GError **error)
	G_GNUC_WARN_UNUSED_RESULT;		G_GNUC_WARN_UNUSED_RESULT;
	void tp_handle_set_qdata (TpHandleRepoIface *repo, TpHandle handle,		void tp_handle_set_qdata (TpHandleRepoIface *repo, TpHandle handle,
End of changes. 10 change blocks.
	0 lines changed or deleted		16 lines changed or added

	handle.h		handle.h
	skipping to change at line 22		skipping to change at line 22
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef __TP_HANDLE_H__		#ifndef __TP_HANDLE_H__
	#define __TP_HANDLE_H__		#define __TP_HANDLE_H__
	#include <glib.h>		#include <glib.h>
	#include <telepathy-glib/enums.h>		#include <telepathy-glib/enums.h>
	#include <telepathy-glib/errors.h>		#include <telepathy-glib/errors.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	/**		/**
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	heap.h		heap.h
	skipping to change at line 23		skipping to change at line 23
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef __TP_HEAP_H__		#ifndef __TP_HEAP_H__
	#define __TP_HEAP_H__		#define __TP_HEAP_H__
	#include <glib.h>		#include <glib.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	typedef struct _TpHeap TpHeap;		typedef struct _TpHeap TpHeap;
	TpHeap *tp_heap_new (GCompareFunc comparator, GDestroyNotify destructor)		TpHeap *tp_heap_new (GCompareFunc comparator, GDestroyNotify destructor)
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	interfaces.h		interfaces.h
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef __TP_INTERFACES_H__		#ifndef __TP_INTERFACES_H__
	#define __TP_INTERFACES_H__		#define __TP_INTERFACES_H__
	#include <glib.h>		#include <glib.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	#include <telepathy-glib/_gen/telepathy-interfaces.h>		#include <telepathy-glib/_gen/telepathy-interfaces.h>
	G_END_DECLS		G_END_DECLS
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	intset.h		intset.h
	skipping to change at line 23		skipping to change at line 23
	* 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.
	*		*
	* 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		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
	* 02110-1301 USA		* 02110-1301 USA
	*		*
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef __TP_INTSET_H__		#ifndef __TP_INTSET_H__
	#define __TP_INTSET_H__		#define __TP_INTSET_H__
	#include <glib-object.h>		#include <glib-object.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	#define TP_TYPE_INTSET (tp_intset_get_type ())		#define TP_TYPE_INTSET (tp_intset_get_type ())
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	media-interfaces.h		media-interfaces.h
	skipping to change at line 22		skipping to change at line 22
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef __TP_MEDIA_INTERFACES_H__		#ifndef __TP_MEDIA_INTERFACES_H__
	#define __TP_MEDIA_INTERFACES_H__		#define __TP_MEDIA_INTERFACES_H__
	#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 _TpMediaStreamHandler TpMediaStreamHandler;		typedef struct _TpMediaStreamHandler TpMediaStreamHandler;
	typedef struct _TpMediaStreamHandlerPrivate TpMediaStreamHandlerPrivate;		typedef struct _TpMediaStreamHandlerPrivate TpMediaStreamHandlerPrivate;
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	message-mixin.h		message-mixin.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef TP_MESSAGE_MIXIN_H		#ifndef TP_MESSAGE_MIXIN_H
	#define TP_MESSAGE_MIXIN_H		#define TP_MESSAGE_MIXIN_H
	#include <telepathy-glib/base-connection.h>		#include <telepathy-glib/base-connection.h>
	#include <telepathy-glib/cm-message.h>		#include <telepathy-glib/cm-message.h>
	#include <telepathy-glib/handle-repo.h>		#include <telepathy-glib/handle-repo.h>
	#include <telepathy-glib/message.h>		#include <telepathy-glib/message.h>
	#include <telepathy-glib/svc-channel.h>		#include <telepathy-glib/svc-channel.h>
	#include <telepathy-glib/util.h>		#include <telepathy-glib/util.h>
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	message.h		message.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef __TP_MESSAGE_H__		#ifndef __TP_MESSAGE_H__
	#define __TP_MESSAGE_H__		#define __TP_MESSAGE_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>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	#define TP_TYPE_MESSAGE (tp_message_get_type ())		#define TP_TYPE_MESSAGE (tp_message_get_type ())
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	observe-channels-context.h		observe-channels-context.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef __TP_OBSERVE_CHANNELS_CONTEXT_H__		#ifndef __TP_OBSERVE_CHANNELS_CONTEXT_H__
	#define __TP_OBSERVE_CHANNELS_CONTEXT_H__		#define __TP_OBSERVE_CHANNELS_CONTEXT_H__
	#include <gio/gio.h>		#include <gio/gio.h>
	#include <glib-object.h>		#include <glib-object.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	typedef struct _TpObserveChannelsContext TpObserveChannelsContext;		typedef struct _TpObserveChannelsContext TpObserveChannelsContext;
	typedef struct _TpObserveChannelsContextClass TpObserveChannelsContextClass ;		typedef struct _TpObserveChannelsContextClass TpObserveChannelsContextClass ;
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	presence-mixin.h		presence-mixin.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef __TP_PRESENCE_MIXIN_H__		#ifndef __TP_PRESENCE_MIXIN_H__
	#define __TP_PRESENCE_MIXIN_H__		#define __TP_PRESENCE_MIXIN_H__
	#include <telepathy-glib/enums.h>		#include <telepathy-glib/enums.h>
	#include <telepathy-glib/handle.h>		#include <telepathy-glib/handle.h>
	#include <telepathy-glib/svc-connection.h>		#include <telepathy-glib/svc-connection.h>
	#include "util.h"		#include "util.h"
	G_BEGIN_DECLS		G_BEGIN_DECLS
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	protocol.h		protocol.h
	skipping to change at line 20		skipping to change at line 20
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef TP_PROTOCOL_H		#ifndef TP_PROTOCOL_H
	#define TP_PROTOCOL_H		#define TP_PROTOCOL_H
	#include <glib-object.h>		#include <glib-object.h>
	#include <telepathy-glib/capabilities.h>		#include <telepathy-glib/capabilities.h>
	#include <telepathy-glib/connection.h>		#include <telepathy-glib/connection.h>
	#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 _TpConnectionManagerParam TpConnectionManagerParam;		typedef struct _TpConnectionManagerParam TpConnectionManagerParam;
	struct _TpConnectionManagerParam		struct _TpConnectionManagerParam
	{		{
	/*<public>*/		/*<private>*/
	gchar *name;		gchar *_TP_SEAL (name);
	gchar *dbus_signature;		gchar *_TP_SEAL (dbus_signature);
	GValue default_value;		GValue _TP_SEAL (default_value);
	guint flags;		guint _TP_SEAL (flags);
			gpointer _TP_SEAL (priv);
	gpointer priv;
	};		};
	typedef struct _TpProtocol TpProtocol;		typedef struct _TpProtocol TpProtocol;
	typedef struct _TpProtocolClass TpProtocolClass;		typedef struct _TpProtocolClass TpProtocolClass;
	typedef struct _TpProtocolPrivate TpProtocolPrivate;		typedef struct _TpProtocolPrivate TpProtocolPrivate;
	typedef struct _TpProtocolClassPrivate TpProtocolClassPrivate;		typedef struct _TpProtocolClassPrivate TpProtocolClassPrivate;
	GType tp_protocol_get_type (void) G_GNUC_CONST;		GType tp_protocol_get_type (void) G_GNUC_CONST;
	#define TP_TYPE_PROTOCOL \		#define TP_TYPE_PROTOCOL \
	skipping to change at line 83		skipping to change at line 86
	};		};
	void tp_protocol_init_known_interfaces (void);		void tp_protocol_init_known_interfaces (void);
	TpProtocol *tp_protocol_new (TpDBusDaemon *dbus, const gchar *cm_name,		TpProtocol *tp_protocol_new (TpDBusDaemon *dbus, const gchar *cm_name,
	const gchar *protocol_name, const GHashTable *immutable_properties,		const gchar *protocol_name, const GHashTable *immutable_properties,
	GError **error);		GError **error);
	const gchar *tp_protocol_get_name (TpProtocol *self);		const gchar *tp_protocol_get_name (TpProtocol *self);
			_TP_AVAILABLE_IN_0_20
			const gchar *tp_protocol_get_cm_name (TpProtocol *self);
	#define TP_PROTOCOL_FEATURE_PARAMETERS \		#define TP_PROTOCOL_FEATURE_PARAMETERS \
	(tp_protocol_get_feature_quark_parameters ())		(tp_protocol_get_feature_quark_parameters ())
	GQuark tp_protocol_get_feature_quark_parameters (void) G_GNUC_CONST;		GQuark tp_protocol_get_feature_quark_parameters (void) G_GNUC_CONST;
	const TpConnectionManagerParam *tp_protocol_get_param (TpProtocol *self,		const TpConnectionManagerParam *tp_protocol_get_param (TpProtocol *self,
	const gchar *param);		const gchar *param);
	_TP_AVAILABLE_IN_0_18		_TP_AVAILABLE_IN_0_18
	TpConnectionManagerParam *tp_protocol_dup_param (TpProtocol *self,		TpConnectionManagerParam *tp_protocol_dup_param (TpProtocol *self,
	const gchar *param);		const gchar *param);
	gboolean tp_protocol_has_param (TpProtocol *self,		gboolean tp_protocol_has_param (TpProtocol *self,
End of changes. 3 change blocks.
	7 lines changed or deleted		15 lines changed or added

	proxy-subclass.h		proxy-subclass.h
	skipping to change at line 26		skipping to change at line 26
	* 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_PROXY_SUBCLASS_H__		#ifndef __TP_PROXY_SUBCLASS_H__
	#define __TP_PROXY_SUBCLASS_H__		#define __TP_PROXY_SUBCLASS_H__
			#define _TP_IN_META_HEADER
	#include <telepathy-glib/proxy.h>		#include <telepathy-glib/proxy.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	typedef void (*TpProxyInvokeFunc) (TpProxy *self,		typedef void (*TpProxyInvokeFunc) (TpProxy *self,
	GError *error, GValueArray *args, GCallback callback, gpointer user_dat a,		GError *error, GValueArray *args, GCallback callback, gpointer user_dat a,
	GObject *weak_object);		GObject *weak_object);
	TpProxyPendingCall *tp_proxy_pending_call_v0_new (TpProxy *self,		TpProxyPendingCall *tp_proxy_pending_call_v0_new (TpProxy *self,
	GQuark iface, const gchar *member, DBusGProxy *iface_proxy,		GQuark iface, const gchar *member, DBusGProxy *iface_proxy,
	skipping to change at line 81		skipping to change at line 83
	void tp_proxy_subclass_add_error_mapping (GType proxy_subclass,		void tp_proxy_subclass_add_error_mapping (GType proxy_subclass,
	const gchar *static_prefix, GQuark domain, GType code_enum_type);		const gchar *static_prefix, GQuark domain, GType code_enum_type);
	gboolean tp_proxy_dbus_g_proxy_claim_for_signal_adding (DBusGProxy *proxy);		gboolean tp_proxy_dbus_g_proxy_claim_for_signal_adding (DBusGProxy *proxy);
	void tp_proxy_init_known_interfaces (void);		void tp_proxy_init_known_interfaces (void);
	G_END_DECLS		G_END_DECLS
			#undef _TP_IN_META_HEADER
	#endif /* #ifndef __TP_PROXY_SUBCLASS_H__*/		#endif /* #ifndef __TP_PROXY_SUBCLASS_H__*/
End of changes. 2 change blocks.
	0 lines changed or deleted		4 lines changed or added

	proxy.h		proxy.h
	skipping to change at line 22		skipping to change at line 22
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#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 <gio/gio.h>		#include <gio/gio.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	#include <telepathy-glib/_gen/genums.h>		#include <telepathy-glib/_gen/genums.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	skipping to change at line 65		skipping to change at line 69
	TP_DBUS_ERROR_CANCELLED = 9,		TP_DBUS_ERROR_CANCELLED = 9,
	TP_DBUS_ERROR_INCONSISTENT = 10,		TP_DBUS_ERROR_INCONSISTENT = 10,
	} TpDBusError;		} TpDBusError;
	#define TP_NUM_DBUS_ERRORS (TP_DBUS_ERROR_INCONSISTENT + 1)		#define TP_NUM_DBUS_ERRORS (TP_DBUS_ERROR_INCONSISTENT + 1)
	#define NUM_TP_DBUS_ERRORS TP_NUM_DBUS_ERRORS		#define NUM_TP_DBUS_ERRORS TP_NUM_DBUS_ERRORS
	struct _TpProxy {		struct _TpProxy {
	/*<private>*/		/*<private>*/
	GObject parent;		GObject parent;
	TpDBusDaemon *dbus_daemon;		TpDBusDaemon *_TP_SEAL (dbus_daemon);
	DBusGConnection *dbus_connection;		DBusGConnection *_TP_SEAL (dbus_connection);
	gchar *bus_name;		gchar *_TP_SEAL (bus_name);
	gchar *object_path;		gchar *_TP_SEAL (object_path);
	GError *invalidated /* initialized to NULL by g_object_new */;		GError *_TP_SEAL (invalidated);
	TpProxyPrivate *priv;		TpProxyPrivate *priv;
	};		};
	typedef struct _TpProxyClass TpProxyClass;		typedef struct _TpProxyClass TpProxyClass;
	typedef struct _TpProxyFeature TpProxyFeature;		typedef struct _TpProxyFeature TpProxyFeature;
	typedef struct _TpProxyFeaturePrivate TpProxyFeaturePrivate;		typedef struct _TpProxyFeaturePrivate TpProxyFeaturePrivate;
	typedef void (* TpProxyPrepareAsync) (TpProxy *proxy,		typedef void (* TpProxyPrepareAsync) (TpProxy *proxy,
End of changes. 3 change blocks.
	5 lines changed or deleted		11 lines changed or added

	room-info.h		room-info.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef __TP_ROOM_INFO_H__		#ifndef __TP_ROOM_INFO_H__
	#define __TP_ROOM_INFO_H__		#define __TP_ROOM_INFO_H__
	#include <glib-object.h>		#include <glib-object.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	#include <telepathy-glib/handle.h>		#include <telepathy-glib/handle.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	room-list.h		room-list.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef __TP_ROOM_LIST_H__		#ifndef __TP_ROOM_LIST_H__
	#define __TP_ROOM_LIST_H__		#define __TP_ROOM_LIST_H__
	#include <telepathy-glib/channel.h>		#include <telepathy-glib/channel.h>
	#include <telepathy-glib/room-info.h>		#include <telepathy-glib/room-info.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	#define TP_TYPE_ROOM_LIST (tp_room_list_get_type ())		#define TP_TYPE_ROOM_LIST (tp_room_list_get_type ())
	#define TP_ROOM_LIST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TP_TYPE_ROOM_ LIST, TpRoomList))		#define TP_ROOM_LIST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TP_TYPE_ROOM_ LIST, TpRoomList))
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	run.h		run.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef __TP_RUN_H__		#ifndef __TP_RUN_H__
	#define __TP_RUN_H__		#define __TP_RUN_H__
	#include <telepathy-glib/base-connection-manager.h>		#include <telepathy-glib/base-connection-manager.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	int tp_run_connection_manager (const char *prog_name, const char *version,		int tp_run_connection_manager (const char *prog_name, const char *version,
	TpBaseConnectionManager *(*construct_cm) (void), int argc, char **argv) ;		TpBaseConnectionManager *(*construct_cm) (void), int argc, char **argv) ;
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	signalled-message.h		signalled-message.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef __TP_SIGNALLED_MESSAGE_H__		#ifndef __TP_SIGNALLED_MESSAGE_H__
	#define __TP_SIGNALLED_MESSAGE_H__		#define __TP_SIGNALLED_MESSAGE_H__
	#include <glib-object.h>		#include <glib-object.h>
	#include <telepathy-glib/contact.h>		#include <telepathy-glib/contact.h>
	#include <telepathy-glib/message.h>		#include <telepathy-glib/message.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	simple-approver.h		simple-approver.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef __TP_SIMPLE_APPROVER_H__		#ifndef __TP_SIMPLE_APPROVER_H__
	#define __TP_SIMPLE_APPROVER_H__		#define __TP_SIMPLE_APPROVER_H__
	#include <dbus/dbus-glib.h>		#include <dbus/dbus-glib.h>
	#include <glib-object.h>		#include <glib-object.h>
	#include <telepathy-glib/base-client.h>		#include <telepathy-glib/base-client.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	simple-client-factory.h		simple-client-factory.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef __TP_SIMPLE_CLIENT_FACTORY_H__		#ifndef __TP_SIMPLE_CLIENT_FACTORY_H__
	#define __TP_SIMPLE_CLIENT_FACTORY_H__		#define __TP_SIMPLE_CLIENT_FACTORY_H__
	#include <telepathy-glib/account.h>		#include <telepathy-glib/account.h>
	#include <telepathy-glib/channel.h>		#include <telepathy-glib/channel.h>
	#include <telepathy-glib/channel-dispatch-operation.h>		#include <telepathy-glib/channel-dispatch-operation.h>
	#include <telepathy-glib/channel-request.h>		#include <telepathy-glib/channel-request.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-daemon.h>		#include <telepathy-glib/dbus-daemon.h>
	skipping to change at line 178		skipping to change at line 182
	TpSimpleClientFactory *self,		TpSimpleClientFactory *self,
	GQuark feature,		GQuark feature,
	...);		...);
	/* TpContact */		/* TpContact */
	_TP_AVAILABLE_IN_0_16		_TP_AVAILABLE_IN_0_16
	TpContact *tp_simple_client_factory_ensure_contact (TpSimpleClientFactory * self,		TpContact *tp_simple_client_factory_ensure_contact (TpSimpleClientFactory * self,
	TpConnection *connection,		TpConnection *connection,
	TpHandle handle,		TpHandle handle,
	const gchar *identifier);		const gchar *identifier);
			_TP_AVAILABLE_IN_0_20
			void tp_simple_client_factory_upgrade_contacts_async (
			TpSimpleClientFactory *self,
			TpConnection *connection,
			guint n_contacts,
			TpContact * const *contacts,
			GAsyncReadyCallback callback,
			gpointer user_data);
			_TP_AVAILABLE_IN_0_20
			gboolean tp_simple_client_factory_upgrade_contacts_finish (
			TpSimpleClientFactory *self,
			GAsyncResult *result,
			GPtrArray **contacts,
			GError **error);
			_TP_AVAILABLE_IN_0_20
			void tp_simple_client_factory_ensure_contact_by_id_async (
			TpSimpleClientFactory *self,
			TpConnection *connection,
			const gchar *identifier,
			GAsyncReadyCallback callback,
			gpointer user_data);
			_TP_AVAILABLE_IN_0_20
			TpContact *tp_simple_client_factory_ensure_contact_by_id_finish (
			TpSimpleClientFactory *self,
			GAsyncResult *result,
			GError **error);
	_TP_AVAILABLE_IN_0_16		_TP_AVAILABLE_IN_0_16
	GArray *tp_simple_client_factory_dup_contact_features (		GArray *tp_simple_client_factory_dup_contact_features (
	TpSimpleClientFactory *self,		TpSimpleClientFactory *self,
	TpConnection *connection);		TpConnection *connection);
	_TP_AVAILABLE_IN_0_16		_TP_AVAILABLE_IN_0_16
	void tp_simple_client_factory_add_contact_features (TpSimpleClientFactory * self,		void tp_simple_client_factory_add_contact_features (TpSimpleClientFactory * self,
	guint n_features,		guint n_features,
	const TpContactFeature *features);		const TpContactFeature *features);
	_TP_AVAILABLE_IN_0_16		_TP_AVAILABLE_IN_0_16
	void tp_simple_client_factory_add_contact_features_varargs (		void tp_simple_client_factory_add_contact_features_varargs (
End of changes. 2 change blocks.
	0 lines changed or deleted		32 lines changed or added

	simple-handler.h		simple-handler.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef __TP_SIMPLE_HANDLER_H__		#ifndef __TP_SIMPLE_HANDLER_H__
	#define __TP_SIMPLE_HANDLER_H__		#define __TP_SIMPLE_HANDLER_H__
	#include <dbus/dbus-glib.h>		#include <dbus/dbus-glib.h>
	#include <glib-object.h>		#include <glib-object.h>
	#include <telepathy-glib/base-client.h>		#include <telepathy-glib/base-client.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	simple-observer.h		simple-observer.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef __TP_SIMPLE_OBSERVER_H__		#ifndef __TP_SIMPLE_OBSERVER_H__
	#define __TP_SIMPLE_OBSERVER_H__		#define __TP_SIMPLE_OBSERVER_H__
	#include <dbus/dbus-glib.h>		#include <dbus/dbus-glib.h>
	#include <glib-object.h>		#include <glib-object.h>
	#include <telepathy-glib/base-client.h>		#include <telepathy-glib/base-client.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	simple-password-manager.h		simple-password-manager.h
	skipping to change at line 20		skipping to change at line 20
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef __TP_SIMPLE_PASSWORD_MANAGER_H__		#ifndef __TP_SIMPLE_PASSWORD_MANAGER_H__
	#define __TP_SIMPLE_PASSWORD_MANAGER_H__		#define __TP_SIMPLE_PASSWORD_MANAGER_H__
	#include <gio/gio.h>		#include <gio/gio.h>
	#include <telepathy-glib/base-connection.h>		#include <telepathy-glib/base-connection.h>
	#include <telepathy-glib/base-password-channel.h>		#include <telepathy-glib/base-password-channel.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	stream-tube-channel.h		stream-tube-channel.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef __TP_STREAM_TUBE_CHANNEL_H__		#ifndef __TP_STREAM_TUBE_CHANNEL_H__
	#define __TP_STREAM_TUBE_CHANNEL_H__		#define __TP_STREAM_TUBE_CHANNEL_H__
	#include <telepathy-glib/channel.h>		#include <telepathy-glib/channel.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
	/* Forward declaration of a subclass - from stream-tube-connection.h */		/* Forward declaration of a subclass - from stream-tube-connection.h */
	typedef struct _TpStreamTubeConnection TpStreamTubeConnection;		typedef struct _TpStreamTubeConnection TpStreamTubeConnection;
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	stream-tube-connection.h		stream-tube-connection.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef __TP_STREAM_TUBE_CONNECTION_H__		#ifndef __TP_STREAM_TUBE_CONNECTION_H__
	#define __TP_STREAM_TUBE_CONNECTION_H__		#define __TP_STREAM_TUBE_CONNECTION_H__
	#include <glib-object.h>		#include <glib-object.h>
	#include <gio/gio.h>		#include <gio/gio.h>
	#include <telepathy-glib/contact.h>		#include <telepathy-glib/contact.h>
	#include <telepathy-glib/stream-tube-channel.h>		#include <telepathy-glib/stream-tube-channel.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	svc-account-manager.h		svc-account-manager.h
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directl
			y."
			#endif
	#ifndef __TP_META_SVC_ACCOUNT_MANAGER_H__		#ifndef __TP_META_SVC_ACCOUNT_MANAGER_H__
	#define __TP_META_SVC_ACCOUNT_MANAGER_H__		#define __TP_META_SVC_ACCOUNT_MANAGER_H__
	#include <telepathy-glib/_gen/tp-svc-account-manager.h>		#include <telepathy-glib/_gen/tp-svc-account-manager.h>
	#endif		#endif
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	svc-account.h		svc-account.h
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directl
			y."
			#endif
	#ifndef __TP_META_SVC_ACCOUNT_H__		#ifndef __TP_META_SVC_ACCOUNT_H__
	#define __TP_META_SVC_ACCOUNT_H__		#define __TP_META_SVC_ACCOUNT_H__
	#include <telepathy-glib/_gen/tp-svc-account.h>		#include <telepathy-glib/_gen/tp-svc-account.h>
	#endif		#endif
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	svc-call.h		svc-call.h
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directl
			y."
			#endif
	#ifndef __TP_META_SVC_ACCOUNT_H__		#ifndef __TP_META_SVC_ACCOUNT_H__
	#define __TP_META_SVC_ACCOUNT_H__		#define __TP_META_SVC_ACCOUNT_H__
	#include <telepathy-glib/_gen/tp-svc-call-content.h>		#include <telepathy-glib/_gen/tp-svc-call-content.h>
	#include <telepathy-glib/_gen/tp-svc-call-content-media-description.h>		#include <telepathy-glib/_gen/tp-svc-call-content-media-description.h>
	#include <telepathy-glib/_gen/tp-svc-call-stream.h>		#include <telepathy-glib/_gen/tp-svc-call-stream.h>
	#include <telepathy-glib/_gen/tp-svc-call-stream-endpoint.h>		#include <telepathy-glib/_gen/tp-svc-call-stream-endpoint.h>
	#endif		#endif
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	svc-channel-dispatch-operation.h		svc-channel-dispatch-operation.h
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directl
			y."
			#endif
	#ifndef __TP_META_SVC_CHANNEL_DISPATCH_OPERATION_H__		#ifndef __TP_META_SVC_CHANNEL_DISPATCH_OPERATION_H__
	#define __TP_META_SVC_CHANNEL_DISPATCH_OPERATION_H__		#define __TP_META_SVC_CHANNEL_DISPATCH_OPERATION_H__
	#include <telepathy-glib/_gen/tp-svc-channel-dispatch-operation.h>		#include <telepathy-glib/_gen/tp-svc-channel-dispatch-operation.h>
	#endif		#endif
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	svc-channel-dispatcher.h		svc-channel-dispatcher.h
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directl
			y."
			#endif
	#ifndef __TP_META_SVC_CHANNEL_DISPATCHER_H__		#ifndef __TP_META_SVC_CHANNEL_DISPATCHER_H__
	#define __TP_META_SVC_CHANNEL_DISPATCHER_H__		#define __TP_META_SVC_CHANNEL_DISPATCHER_H__
	#include <telepathy-glib/_gen/tp-svc-channel-dispatcher.h>		#include <telepathy-glib/_gen/tp-svc-channel-dispatcher.h>
	#endif		#endif
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	svc-channel-request.h		svc-channel-request.h
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directl
			y."
			#endif
	#ifndef __TP_META_SVC_CHANNEL_REQUEST_H__		#ifndef __TP_META_SVC_CHANNEL_REQUEST_H__
	#define __TP_META_SVC_CHANNEL_REQUEST_H__		#define __TP_META_SVC_CHANNEL_REQUEST_H__
	#include <telepathy-glib/_gen/tp-svc-channel-request.h>		#include <telepathy-glib/_gen/tp-svc-channel-request.h>
	#endif		#endif
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	svc-channel.h		svc-channel.h
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directl
			y."
			#endif
	#ifndef __TP_META_SVC_CHANNEL_H__		#ifndef __TP_META_SVC_CHANNEL_H__
	#define __TP_META_SVC_CHANNEL_H__		#define __TP_META_SVC_CHANNEL_H__
	#include <telepathy-glib/_gen/tp-svc-channel.h>		#include <telepathy-glib/_gen/tp-svc-channel.h>
	#endif		#endif
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	svc-client.h		svc-client.h
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef __TP_META_SVC_CLIENT_H__		#ifndef __TP_META_SVC_CLIENT_H__
	#define __TP_META_SVC_CLIENT_H__		#define __TP_META_SVC_CLIENT_H__
	#include <telepathy-glib/_gen/tp-svc-client.h>		#include <telepathy-glib/_gen/tp-svc-client.h>
	#endif		#endif
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	svc-connection-manager.h		svc-connection-manager.h
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directl
			y."
			#endif
	#ifndef __TP_META_SVC_CONNECTION_MANAGER_H__		#ifndef __TP_META_SVC_CONNECTION_MANAGER_H__
	#define __TP_META_SVC_CONNECTION_MANAGER_H__		#define __TP_META_SVC_CONNECTION_MANAGER_H__
	#include <telepathy-glib/_gen/tp-svc-connection-manager.h>		#include <telepathy-glib/_gen/tp-svc-connection-manager.h>
	#endif		#endif
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	svc-connection.h		svc-connection.h
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directl
			y."
			#endif
	#ifndef __TP_META_SVC_CONNECTION_H__		#ifndef __TP_META_SVC_CONNECTION_H__
	#define __TP_META_SVC_CONNECTION_H__		#define __TP_META_SVC_CONNECTION_H__
	#include <telepathy-glib/_gen/tp-svc-connection.h>		#include <telepathy-glib/_gen/tp-svc-connection.h>
	#endif		#endif
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	svc-debug.h		svc-debug.h
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directl
			y."
			#endif
	#ifndef __TP_SVC_DEBUG_H__		#ifndef __TP_SVC_DEBUG_H__
	#define __TP_SVC_DEBUG_H__		#define __TP_SVC_DEBUG_H__
	#include <telepathy-glib/_gen/tp-svc-debug.h>		#include <telepathy-glib/_gen/tp-svc-debug.h>
	#endif		#endif
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	svc-generic.h		svc-generic.h
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef __TP_SVC_GENERIC_H__		#ifndef __TP_SVC_GENERIC_H__
	#define __TP_SVC_GENERIC_H__		#define __TP_SVC_GENERIC_H__
	#include <telepathy-glib/_gen/tp-svc-generic.h>		#include <telepathy-glib/_gen/tp-svc-generic.h>
	#endif		#endif
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	svc-media-interfaces.h		svc-media-interfaces.h
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directl
			y."
			#endif
	#ifndef __TP_SVC_MEDIA_INTERFACES_H__		#ifndef __TP_SVC_MEDIA_INTERFACES_H__
	#define __TP_SVC_MEDIA_INTERFACES_H__		#define __TP_SVC_MEDIA_INTERFACES_H__
	#include <telepathy-glib/_gen/tp-svc-media-session-handler.h>		#include <telepathy-glib/_gen/tp-svc-media-session-handler.h>
	#include <telepathy-glib/_gen/tp-svc-media-stream-handler.h>		#include <telepathy-glib/_gen/tp-svc-media-stream-handler.h>
	#endif		#endif
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	svc-properties-interface.h		svc-properties-interface.h
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directl
			y."
			#endif
	/* svc-properties-interface is now officially svc-generic */		/* svc-properties-interface is now officially svc-generic */
	#include <telepathy-glib/svc-generic.h>		#include <telepathy-glib/svc-generic.h>
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	svc-protocol.h		svc-protocol.h
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directl
			y."
			#endif
	#ifndef __TP_META_SVC_PROTOCOL_H__		#ifndef __TP_META_SVC_PROTOCOL_H__
	#define __TP_META_SVC_PROTOCOL_H__		#define __TP_META_SVC_PROTOCOL_H__
	#include <telepathy-glib/_gen/tp-svc-protocol.h>		#include <telepathy-glib/_gen/tp-svc-protocol.h>
	#endif		#endif
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	svc-tls.h		svc-tls.h
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directl
			y."
			#endif
	#ifndef __TP_META_SVC_TLS_H__		#ifndef __TP_META_SVC_TLS_H__
	#define __TP_META_SVC_TLS_H__		#define __TP_META_SVC_TLS_H__
	#include <telepathy-glib/_gen/tp-svc-tls-cert.h>		#include <telepathy-glib/_gen/tp-svc-tls-cert.h>
	#endif		#endif
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	telepathy-glib-dbus.h		telepathy-glib-dbus.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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 TELEPATHY_GLIB_DBUS_H_INCLUDED		#ifndef __TP_GLIB_DBUS_H__
	#define TELEPATHY_GLIB_DBUS_H_INCLUDED		#define __TP_GLIB_DBUS_H__
	#define _TP_IN_META_HEADER
	#include <telepathy-glib/telepathy-glib.h>		#include <telepathy-glib/telepathy-glib.h>
			#define _TP_IN_META_HEADER
	/* common */		/* common */
	#include <telepathy-glib/gtypes.h>		#include <telepathy-glib/gtypes.h>
	#include <telepathy-glib/interfaces.h>		#include <telepathy-glib/interfaces.h>
	/* client-side */		/* client-side */
	#include <telepathy-glib/_gen/tp-cli-account.h>		#include <telepathy-glib/_gen/tp-cli-account.h>
	#include <telepathy-glib/_gen/tp-cli-account-manager.h>		#include <telepathy-glib/_gen/tp-cli-account-manager.h>
	#include <telepathy-glib/_gen/tp-cli-call-content.h>		#include <telepathy-glib/_gen/tp-cli-call-content.h>
	#include <telepathy-glib/_gen/tp-cli-call-content-media-description.h>		#include <telepathy-glib/_gen/tp-cli-call-content-media-description.h>
	#include <telepathy-glib/_gen/tp-cli-call-stream-endpoint.h>		#include <telepathy-glib/_gen/tp-cli-call-stream-endpoint.h>
	skipping to change at line 71		skipping to change at line 72
	#include <telepathy-glib/svc-connection.h>		#include <telepathy-glib/svc-connection.h>
	#include <telepathy-glib/svc-connection-manager.h>		#include <telepathy-glib/svc-connection-manager.h>
	#include <telepathy-glib/svc-debug.h>		#include <telepathy-glib/svc-debug.h>
	#include <telepathy-glib/svc-generic.h>		#include <telepathy-glib/svc-generic.h>
	#include <telepathy-glib/svc-media-interfaces.h>		#include <telepathy-glib/svc-media-interfaces.h>
	#include <telepathy-glib/svc-properties-interface.h>		#include <telepathy-glib/svc-properties-interface.h>
	#include <telepathy-glib/svc-protocol.h>		#include <telepathy-glib/svc-protocol.h>
	#include <telepathy-glib/svc-tls.h>		#include <telepathy-glib/svc-tls.h>
	#undef _TP_IN_META_HEADER		#undef _TP_IN_META_HEADER
	#endif
			#endif /* __TP_GLIB_DBUS_H__ */
End of changes. 3 change blocks.
	3 lines changed or deleted		4 lines changed or added

	telepathy-glib.h		telepathy-glib.h
	skipping to change at line 23		skipping to change at line 23
	* 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.
	*		*
	* 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_GLIB_H__		#ifndef __TP_GLIB_H__
	#define __TP_GLIB_H__		#define __TP_GLIB_H__
	#define __TP_IN_GLIB_H__
			#define _TP_IN_META_HEADER
	#include <telepathy-glib/enums.h>		#include <telepathy-glib/enums.h>
	#include <telepathy-glib/errors.h>		#include <telepathy-glib/errors.h>
	#include <telepathy-glib/util.h>		#include <telepathy-glib/util.h>
	#include <telepathy-glib/gnio-util.h>		#include <telepathy-glib/gnio-util.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	#include <telepathy-glib/intset.h>		#include <telepathy-glib/intset.h>
	#include <telepathy-glib/heap.h>		#include <telepathy-glib/heap.h>
	#include <telepathy-glib/account-channel-request.h>		#include <telepathy-glib/account-channel-request.h>
	#include <telepathy-glib/account-manager.h>		#include <telepathy-glib/account-manager.h>
			#include <telepathy-glib/account-request.h>
	#include <telepathy-glib/account.h>		#include <telepathy-glib/account.h>
	#include <telepathy-glib/add-dispatch-operation-context.h>		#include <telepathy-glib/add-dispatch-operation-context.h>
	#include <telepathy-glib/automatic-client-factory.h>		#include <telepathy-glib/automatic-client-factory.h>
	#include <telepathy-glib/base-call-channel.h>		#include <telepathy-glib/base-call-channel.h>
	#include <telepathy-glib/base-call-content.h>		#include <telepathy-glib/base-call-content.h>
	#include <telepathy-glib/base-call-stream.h>		#include <telepathy-glib/base-call-stream.h>
	#include <telepathy-glib/base-channel.h>		#include <telepathy-glib/base-channel.h>
	#include <telepathy-glib/base-client.h>		#include <telepathy-glib/base-client.h>
	#include <telepathy-glib/base-connection-manager.h>		#include <telepathy-glib/base-connection-manager.h>
	#include <telepathy-glib/base-connection.h>		#include <telepathy-glib/base-connection.h>
	skipping to change at line 125		skipping to change at line 127
	#include <telepathy-glib/basic-proxy-factory.h>		#include <telepathy-glib/basic-proxy-factory.h>
	#include <telepathy-glib/channel-iface.h>		#include <telepathy-glib/channel-iface.h>
	#include <telepathy-glib/client-channel-factory.h>		#include <telepathy-glib/client-channel-factory.h>
	/* D-Bus-API-dependent, moved to telepathy-glib-dbus.h in 1.0 */		/* D-Bus-API-dependent, moved to telepathy-glib-dbus.h in 1.0 */
	#include <telepathy-glib/gtypes.h>		#include <telepathy-glib/gtypes.h>
	#include <telepathy-glib/interfaces.h>		#include <telepathy-glib/interfaces.h>
	#include <telepathy-glib/svc-generic.h>		#include <telepathy-glib/svc-generic.h>
	#include <telepathy-glib/svc-client.h>		#include <telepathy-glib/svc-client.h>
	#undef __TP_IN_GLIB_H__		#undef _TP_IN_META_HEADER
	#endif /* __TP_GLIB_H__ */		#endif /* __TP_GLIB_H__ */
End of changes. 3 change blocks.
	2 lines changed or deleted		5 lines changed or added

	text-channel.h		text-channel.h
	skipping to change at line 21		skipping to change at line 21
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef __TP_TEXT_CHANNEL_H__		#ifndef __TP_TEXT_CHANNEL_H__
	#define __TP_TEXT_CHANNEL_H__		#define __TP_TEXT_CHANNEL_H__
	#include <telepathy-glib/channel.h>		#include <telepathy-glib/channel.h>
	#include <telepathy-glib/client-message.h>		#include <telepathy-glib/client-message.h>
	#include <telepathy-glib/defs.h>		#include <telepathy-glib/defs.h>
	#include <telepathy-glib/signalled-message.h>		#include <telepathy-glib/signalled-message.h>
	G_BEGIN_DECLS		G_BEGIN_DECLS
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	text-mixin.h		text-mixin.h
	skipping to change at line 81		skipping to change at line 81
	#define TP_TEXT_MIXIN_CLASS(o) \		#define TP_TEXT_MIXIN_CLASS(o) \
	((TpTextMixinClass *) tp_mixin_offset_cast (o, \		((TpTextMixinClass *) tp_mixin_offset_cast (o, \
	TP_TEXT_MIXIN_CLASS_OFFSET (o)))		TP_TEXT_MIXIN_CLASS_OFFSET (o)))
	#define TP_TEXT_MIXIN_OFFSET_QUARK (tp_text_mixin_get_offset_quark ())		#define TP_TEXT_MIXIN_OFFSET_QUARK (tp_text_mixin_get_offset_quark ())
	#define TP_TEXT_MIXIN_OFFSET(o) \		#define TP_TEXT_MIXIN_OFFSET(o) \
	tp_mixin_instance_get_offset (o, TP_TEXT_MIXIN_OFFSET_QUARK)		tp_mixin_instance_get_offset (o, TP_TEXT_MIXIN_OFFSET_QUARK)
	#define TP_TEXT_MIXIN(o) \		#define TP_TEXT_MIXIN(o) \
	((TpTextMixin *) tp_mixin_offset_cast (o, TP_TEXT_MIXIN_OFFSET (o)))		((TpTextMixin *) tp_mixin_offset_cast (o, TP_TEXT_MIXIN_OFFSET (o)))
	GQuark tp_text_mixin_class_get_offset_quark (void) _TP_GNUC_DEPRECATED;		_TP_DEPRECATED_IN_0_20
	GQuark tp_text_mixin_get_offset_quark (void) _TP_GNUC_DEPRECATED;		GQuark tp_text_mixin_class_get_offset_quark (void);
			_TP_DEPRECATED_IN_0_20
			GQuark tp_text_mixin_get_offset_quark (void);
	void tp_text_mixin_class_init (GObjectClass *obj_cls, glong offset)		_TP_DEPRECATED_IN_0_20
	_TP_GNUC_DEPRECATED;		void tp_text_mixin_class_init (GObjectClass *obj_cls, glong offset);
			_TP_DEPRECATED_IN_0_20_FOR (tp_message_mixin_init)
	void tp_text_mixin_init (GObject *obj, glong offset,		void tp_text_mixin_init (GObject *obj, glong offset,
	TpHandleRepoIface *contacts_repo)		TpHandleRepoIface *contacts_repo);
	_TP_GNUC_DEPRECATED_FOR (tp_message_mixin_init);		_TP_DEPRECATED_IN_0_20
	void tp_text_mixin_set_message_types (GObject *obj, ...) _TP_GNUC_DEPRECATE		void tp_text_mixin_set_message_types (GObject *obj, ...);
	D;		_TP_DEPRECATED_IN_0_20_FOR (tp_message_mixin_finalize)
	void tp_text_mixin_finalize (GObject *obj)		void tp_text_mixin_finalize (GObject *obj);
	_TP_GNUC_DEPRECATED_FOR (tp_message_mixin_finalize);
			_TP_DEPRECATED_IN_0_20_FOR (tp_message_mixin_take_received)
	gboolean tp_text_mixin_receive_with_flags (GObject *obj,		gboolean tp_text_mixin_receive_with_flags (GObject *obj,
	TpChannelTextMessageType type, TpHandle sender, time_t timestamp,		TpChannelTextMessageType type, TpHandle sender, time_t timestamp,
	const char *text, TpChannelTextMessageFlags flags)		const char *text, TpChannelTextMessageFlags flags);
	_TP_GNUC_DEPRECATED_FOR (tp_message_mixin_take_received);		_TP_DEPRECATED_IN_0_20_FOR (tp_message_mixin_take_received)
	gboolean tp_text_mixin_receive (GObject *obj, TpChannelTextMessageType type ,		gboolean tp_text_mixin_receive (GObject *obj, TpChannelTextMessageType type ,
	TpHandle sender, time_t timestamp, const char *text)		TpHandle sender, time_t timestamp, const char *text);
	_TP_GNUC_DEPRECATED_FOR (tp_message_mixin_take_received);		_TP_DEPRECATED_IN_0_20
	gboolean tp_text_mixin_acknowledge_pending_messages (GObject *obj,		gboolean tp_text_mixin_acknowledge_pending_messages (GObject *obj,
	const GArray * ids, GError **error) _TP_GNUC_DEPRECATED;		const GArray * ids, GError **error);
			_TP_DEPRECATED_IN_0_20
	gboolean tp_text_mixin_list_pending_messages (GObject *obj, gboolean clear,		gboolean tp_text_mixin_list_pending_messages (GObject *obj, gboolean clear,
	GPtrArray ** ret, GError **error) _TP_GNUC_DEPRECATED;		GPtrArray ** ret, GError **error);
			_TP_DEPRECATED_IN_0_20
	gboolean tp_text_mixin_get_message_types (GObject *obj, GArray **ret,		gboolean tp_text_mixin_get_message_types (GObject *obj, GArray **ret,
	GError **error) _TP_GNUC_DEPRECATED;		GError **error);
	void tp_text_mixin_clear (GObject *obj)		_TP_DEPRECATED_IN_0_20_FOR (tp_message_mixin_clear)
	_TP_GNUC_DEPRECATED_FOR (tp_message_mixin_clear);		void tp_text_mixin_clear (GObject *obj);
			_TP_DEPRECATED_IN_0_20_FOR (tp_message_mixin_has_pending_messages)
	gboolean tp_text_mixin_has_pending_messages (GObject *obj,		gboolean tp_text_mixin_has_pending_messages (GObject *obj,
	TpHandle *first_sender)		TpHandle *first_sender);
	_TP_GNUC_DEPRECATED_FOR (tp_message_mixin_has_pending_messages);		_TP_DEPRECATED_IN_0_20_FOR (tp_message_mixin_set_rescued)
	void tp_text_mixin_set_rescued (GObject *obj)		void tp_text_mixin_set_rescued (GObject *obj);
	_TP_GNUC_DEPRECATED_FOR (tp_message_mixin_set_rescued);
	void tp_text_mixin_iface_init (gpointer g_iface, gpointer iface_data)		_TP_DEPRECATED_IN_0_20_FOR (tp_message_mixin_text_iface_init)
	_TP_GNUC_DEPRECATED_FOR (tp_message_mixin_text_iface_init);		void tp_text_mixin_iface_init (gpointer g_iface, gpointer iface_data);
	#endif		#endif
	G_END_DECLS		G_END_DECLS
	#endif /* #ifndef __TP_TEXT_MIXIN_H__ */		#endif /* #ifndef __TP_TEXT_MIXIN_H__ */
End of changes. 13 change blocks.
	25 lines changed or deleted		30 lines changed or added

	tls-certificate.h		tls-certificate.h
	skipping to change at line 23		skipping to change at line 23
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef __TP_TLS_CERTIFICATE_H__		#ifndef __TP_TLS_CERTIFICATE_H__
	#define __TP_TLS_CERTIFICATE_H__		#define __TP_TLS_CERTIFICATE_H__
	#include <glib-object.h>		#include <glib-object.h>
	#include <gio/gio.h>		#include <gio/gio.h>
	#include <telepathy-glib/channel.h>		#include <telepathy-glib/channel.h>
	#include <telepathy-glib/enums.h>		#include <telepathy-glib/enums.h>
	#include <telepathy-glib/proxy.h>		#include <telepathy-glib/proxy.h>
	#include <telepathy-glib/tls-certificate-rejection.h>		#include <telepathy-glib/tls-certificate-rejection.h>
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	util.h		util.h
	skipping to change at line 22		skipping to change at line 22
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but 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.
	*		*
	* 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
	*/		*/
			#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
			!defined (_TP_COMPILATION)
			#error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
			y-glib-dbus.h> can be included directly."
			#endif
	#ifndef __TP_UTIL_H__		#ifndef __TP_UTIL_H__
	#define __TP_UTIL_H__		#define __TP_UTIL_H__
	#define __TP_IN_UTIL_H__		#define __TP_IN_UTIL_H__
	#include <gio/gio.h>		#include <gio/gio.h>
	#include <telepathy-glib/verify.h>		#include <telepathy-glib/verify.h>
	#define tp_verify_statement(R) ((void) tp_verify_true (R))		#define tp_verify_statement(R) ((void) tp_verify_true (R))
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	version.h		version.h
	/* telepathy-glib/version.h. Generated from version.h.in by configure. */		/* telepathy-glib/version.h. Generated from version.h.in by configure. */
	#define TP_MAJOR_VERSION 0		#define TP_MAJOR_VERSION 0
	#define TP_MINOR_VERSION 19		#define TP_MINOR_VERSION 19
	#define TP_MICRO_VERSION 0		#define TP_MICRO_VERSION 1
End of changes. 1 change blocks.
	0 lines changed or deleted		0 lines changed or added

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