libtelepathy: headers diff between 0.3.1 and 0.3.2 versions

	tp-chan.h	tp-chan.h

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

	#ifndef TP_CHAN_H	#ifndef TP_CHAN_H
	#define TP_CHAN_H	#define TP_CHAN_H

	#ifndef DBUS_API_SUBJECT_TO_CHANGE	#ifndef DBUS_API_SUBJECT_TO_CHANGE
	#define DBUS_API_SUBJECT_TO_CHANGE	#define DBUS_API_SUBJECT_TO_CHANGE
	#endif	#endif


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

	#include "tp-chan-gen.h"	#include "tp-chan-gen.h"
	#include "tp-interfaces.h"	#include "tp-interfaces.h"
	#include "tp-chan-signals-marshal.h"	#include "tp-chan-signals-marshal.h"
	#include "tp-ifaces-signals-marshal.h"	#include "tp-ifaces-signals-marshal.h"
	#include "tp-chan-ifaces-signal-setters.h"	#include "tp-chan-ifaces-signal-setters.h"


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

	#define TELEPATHY_CHAN_TYPE (tp_chan_get_type ())	#define TELEPATHY_CHAN_TYPE (tp_chan_get_type ())

	#define TELEPATHY_CHAN(obj) (G_TYPE_CHECK_INSTANCE_CAST \	#define TELEPATHY_CHAN(obj) (G_TYPE_CHECK_INSTANCE_CAST \
	((obj), TELEPATHY_CHAN_TYPE, TpChan))	((obj), TELEPATHY_CHAN_TYPE, TpChan))

	#define TELEPATHY_CHAN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST \	#define TELEPATHY_CHAN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST \
	((klass), TELEPATHY_CHAN_TYPE, TpChanClass))	((klass), TELEPATHY_CHAN_TYPE, TpChanClass))

	#define TELEPATHY_IS_CHAN(obj) (G_TYPE_CHECK_INSTANCE_TYPE \	#define TELEPATHY_IS_CHAN(obj) (G_TYPE_CHECK_INSTANCE_TYPE \
	((obj), TELEPATHY_CHAN_TYPE))	((obj), TELEPATHY_CHAN_TYPE))

	skipping to change at line 126	skipping to change at line 127
	* @param type: The type string for this channel.	* @param type: The type string for this channel.
	* @param handle_type: The type of this channel.	* @param handle_type: The type of this channel.
	* @param handle: The handle of this channel, will be filled by this call.	* @param handle: The handle of this channel, will be filled by this call.
	* @return A new TpChan (channel) object, or NULL if unsuccesfull	* @return A new TpChan (channel) object, or NULL if unsuccesfull
	*/	*/

	TpChan tp_chan_new (DBusGConnection connection, const gchar *bus_name,	TpChan tp_chan_new (DBusGConnection connection, const gchar *bus_name,
	const gchar object_path, const gchar type,	const gchar object_path, const gchar type,
	guint handle_type, guint handle);	guint handle_type, guint handle);


		/*
		* Retrieve or create a telepathy-glib TpChannel object for this channel.
		*
		* The returned TpChannel is not guaranteed to be ready (use the
		* channel-ready property, the notify::channel-ready signal, or
		* tp_channel_run_until_ready()).
		*
		* This function exists to aid migration from libtelepathy to telepathy-gli
		b.
		* Available since 0.3.2.
		*
		* @param self: the libtelepathy channel object
		* @param connection: a telepathy-glib connection object, to create the
		* TpChannel if necessary
		* @param error: if not NULL, used to return any error encountered while
		* creating the channel object
		* @return a new reference to a TpChannel, which must be unreffed by the
		* caller, or NULL on error
		*/
		TpChannel tp_chan_dup_channel (TpChan self, TpConnection *connection,
		GError **error);

		/*
		* Create a new channel object from a telepathy-glib TpChannel.
		*
		* The TpChannel must not have already been invalidated.
		*
		* If the TpChannel is not yet "ready" (as indicated by the channel-ready
		* property), the TpChan's type, handle_type and handle members might be
		* wrong. If these are significant to you, wait for the TpChannel to be rea
		dy
		* first, e.g. by calling tp_channel_run_until_ready().
		*
		* This function exists to aid migration from libtelepathy to telepathy-gli
		b.
		* Available since 0.3.2.
		*
		* @param channel: the channel
		* @return A new TpChan object, or NULL if unsuccessful
		*/
		TpChan tp_chan_new_from_channel (TpChannel channel);

	/* Create and store the D-BUS proxy objects for the interfaces provided	/* Create and store the D-BUS proxy objects for the interfaces provided
	* by this channel. Expects data provided by the GetInterfaces method.	* by this channel. Expects data provided by the GetInterfaces method.
	*	*
	* @param self: The channel object whose interfaces will be stored.	* @param self: The channel object whose interfaces will be stored.
	* @param interfaces: The array of strings containing the interface names	* @param interfaces: The array of strings containing the interface names
	*	*
	*/	*/

	void tp_chan_local_set_interfaces (TpChan self, gchar *interfaces);	void tp_chan_local_set_interfaces (TpChan self, gchar *interfaces);


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

	tp-conn.h	tp-conn.h

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

	#ifndef TP_CONN_H	#ifndef TP_CONN_H
	#define TP_CONN_H	#define TP_CONN_H

	#ifndef DBUS_API_SUBJECT_TO_CHANGE	#ifndef DBUS_API_SUBJECT_TO_CHANGE
	#define DBUS_API_SUBJECT_TO_CHANGE	#define DBUS_API_SUBJECT_TO_CHANGE
	#endif	#endif


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

	#include "tp-conn-gen.h"	#include "tp-conn-gen.h"
	#include "tp-conn-iface-forwarding-gen.h"	#include "tp-conn-iface-forwarding-gen.h"
	#include "tp-chan.h"	#include "tp-chan.h"
	#include "tp-conn-signals-marshal.h"	#include "tp-conn-signals-marshal.h"
	#include "tp-ifaces-signals-marshal.h"	#include "tp-ifaces-signals-marshal.h"
	#include "tp-conn-ifaces-signal-setters.h"	#include "tp-conn-ifaces-signal-setters.h"
	#include "tp-interfaces.h"	#include "tp-interfaces.h"
	#include "tp-constants.h"	#include "tp-constants.h"


	#include <dbus/dbus-glib.h>

	#define DBUS_TYPE_G_ARRAY_OF_STRUCTS dbus_g_type_get_collection ("GPtrArray ", G_TYPE_VALUE_ARRAY);	#define DBUS_TYPE_G_ARRAY_OF_STRUCTS dbus_g_type_get_collection ("GPtrArray ", G_TYPE_VALUE_ARRAY);

	#define TELEPATHY_CONN_TYPE (tp_conn_get_type ())	#define TELEPATHY_CONN_TYPE (tp_conn_get_type ())

	#define TELEPATHY_CONN(obj) (G_TYPE_CHECK_INSTANCE_CAST \	#define TELEPATHY_CONN(obj) (G_TYPE_CHECK_INSTANCE_CAST \
	((obj), TELEPATHY_CONN_TYPE, TpConn))	((obj), TELEPATHY_CONN_TYPE, TpConn))

	#define TELEPATHY_CONN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST \	#define TELEPATHY_CONN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST \
	((klass), TELEPATHY_CONN_TYPE, TpConnClass))	((klass), TELEPATHY_CONN_TYPE, TpConnClass))


	skipping to change at line 119	skipping to change at line 120
	* @return A new TpConn connection object, or NULL if unsuccesful.	* @return A new TpConn connection object, or NULL if unsuccesful.
	*	*
	* @deprecated since 0.3.0. Use tp_conn_new_without_connect() instead	* @deprecated since 0.3.0. Use tp_conn_new_without_connect() instead
	*/	*/

	#ifndef LIBTELEPATHY_DISABLE_DEPRECATED	#ifndef LIBTELEPATHY_DISABLE_DEPRECATED
	TpConn tp_conn_new (DBusGConnection connection, const char *bus_name,	TpConn tp_conn_new (DBusGConnection connection, const char *bus_name,
	const char *object_path) G_GNUC_DEPRECATED;	const char *object_path) G_GNUC_DEPRECATED;
	#endif	#endif


		/* Create a new #TpConn from a #TpConnection.
		* It will be ready for use if and only if the #TpConnection is; consider
		* using tp_connection_run_until_ready() first.
		*
		* @param connection: A telepathy-glib #TpConnection
		* @param error: Used to return error if GetStatus() fails
		* @return A new TpConn object, or NULL if GetStatus() fails
		*/
		TpConn tp_conn_new_from_connection (TpConnection connection, GError **err
		or);

		/*
		* Retrieve or create a telepathy-glib TpConnection object for this connect
		ion.
		*
		* The returned TpConnection is not guaranteed to be ready (use the
		* connection-ready property, the notify::connection-ready signal, or
		* tp_connection_run_until_ready()).
		*
		* This function exists to aid migration from libtelepathy to telepathy-gli
		b.
		* Available since 0.3.2.
		*
		* @param self: the libtelepathy connection object
		* @return a new reference to a TpConnection, which must be unreffed by the
		* caller
		*/
		TpConnection tp_conn_dup_connection (TpConn self);

	/* Create a new #TpConn and connect signal handlers, but do not try to conn ect	/* Create a new #TpConn and connect signal handlers, but do not try to conn ect
	* asynchronously.	* asynchronously.
	*	*
	* If TP_CONNECTION_STATUS_CONNECTED is written through @status, the new	* If TP_CONNECTION_STATUS_CONNECTED is written through @status, the new
	* connection is connected, and has its interfaces set up and is ready for use.	* connection is connected, and has its interfaces set up and is ready for use.
	* Otherwise, the caller is responsible for calling Connect and waiting for	* Otherwise, the caller is responsible for calling Connect and waiting for
	* the connection attempt to either succeed or fail.	* the connection attempt to either succeed or fail.
	*	*
	* @param connection: A bus connection	* @param connection: A bus connection
	* @param bus_name: The bus name of the CM	* @param bus_name: The bus name of the CM

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

	tp-helpers.h	tp-helpers.h

	skipping to change at line 75	skipping to change at line 75
	gchar *name;	gchar *name;
	gchar *bus_name;	gchar *bus_name;
	gchar *object_path;	gchar *object_path;

	/* protocol_name<->(param_name<->TpConnMgrProtParam) */	/* protocol_name<->(param_name<->TpConnMgrProtParam) */
	GHashTable *protocols;	GHashTable *protocols;
	};	};

	/*	/*
	* Lists all the connection manager files.	* Lists all the connection manager files.

		*
		* Please use tp_list_connection_managers() from telepathy-glib instead:
		* it uses a more correct procedure.
		*
	* @return A list of connection manager names	* @return A list of connection manager names
	*/	*/
	GSList *tp_connmgr_list_cms (void);	GSList *tp_connmgr_list_cms (void);

	/*	/*
	* Returns the connection manager information for the given connection mana ger	* Returns the connection manager information for the given connection mana ger
	* @param cm: the connection manager name string	* @param cm: the connection manager name string
	* @return A struct containing all the information read from the connection	* @return A struct containing all the information read from the connection
	* manager file.	* manager file.
	*/	*/

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

	_gen-tp-constants-deprecated.h	_gen-tp-constants-deprecated.h

	skipping to change at line 15	skipping to change at line 15
	Copyright (C) 2006 INdT	Copyright (C) 2006 INdT

	This library is free software; you can redistribute it and/or	This library is free software; you can redistribute it and/or
	modify it under the terms of the GNU Lesser General Public	modify it under the terms of the GNU Lesser General Public
	License as published by the Free Software Foundation; either	License as published by the Free Software Foundation; either
	version 2.1 of the License, or (at your option) any later version.	version 2.1 of the License, or (at your option) any later version.

	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

	Library 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 Street, Fifth Floor, Boston, MA 02110-1301, U SA.	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, U SA.

	*/	*/

	#ifdef __cplusplus	#ifdef __cplusplus
	extern "C" {	extern "C" {
	#endif	#endif

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