account-channel-request.h   account-channel-request.h 
skipping to change at line 75 skipping to change at line 75
TpAccountChannelRequest *self); TpAccountChannelRequest *self);
GHashTable * tp_account_channel_request_get_request ( GHashTable * tp_account_channel_request_get_request (
TpAccountChannelRequest *self); TpAccountChannelRequest *self);
gint64 tp_account_channel_request_get_user_action_time ( gint64 tp_account_channel_request_get_user_action_time (
TpAccountChannelRequest *self); TpAccountChannelRequest *self);
void tp_account_channel_request_set_channel_factory ( void tp_account_channel_request_set_channel_factory (
TpAccountChannelRequest *self, TpAccountChannelRequest *self,
TpClientChannelFactoryInterface *factory); TpClientChannelFactory *factory);
/* Request and handle API */ /* Request and handle API */
void tp_account_channel_request_create_and_handle_channel_async ( void tp_account_channel_request_create_and_handle_channel_async (
TpAccountChannelRequest *self, TpAccountChannelRequest *self,
GCancellable *cancellable, GCancellable *cancellable,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data); gpointer user_data);
TpChannel * tp_account_channel_request_create_and_handle_channel_finish ( TpChannel * tp_account_channel_request_create_and_handle_channel_finish (
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 base-client.h   base-client.h 
skipping to change at line 153 skipping to change at line 153
const GQuark *features, gssize n); const GQuark *features, gssize n);
void tp_base_client_add_channel_features_varargs (TpBaseClient *self, void tp_base_client_add_channel_features_varargs (TpBaseClient *self,
GQuark feature, ...); GQuark feature, ...);
void tp_base_client_add_connection_features (TpBaseClient *self, void tp_base_client_add_connection_features (TpBaseClient *self,
const GQuark *features, gssize n); const GQuark *features, gssize n);
void tp_base_client_add_connection_features_varargs (TpBaseClient *self, void tp_base_client_add_connection_features_varargs (TpBaseClient *self,
GQuark feature, ...); GQuark feature, ...);
void tp_base_client_set_channel_factory (TpBaseClient *self, void tp_base_client_set_channel_factory (TpBaseClient *self,
TpClientChannelFactoryInterface *factory); TpClientChannelFactory *factory);
TpClientChannelFactoryInterface * tp_base_client_get_channel_factory ( TpClientChannelFactory *tp_base_client_get_channel_factory (
TpBaseClient *self); TpBaseClient *self);
/* future, potentially (currently in spec as a draft): /* future, potentially (currently in spec as a draft):
void tp_base_client_set_handler_related_conferences_bypass_approval ( void tp_base_client_set_handler_related_conferences_bypass_approval (
TpBaseClient *self, gboolean bypass_approval); TpBaseClient *self, gboolean bypass_approval);
*/ */
gboolean tp_base_client_register (TpBaseClient *self, gboolean tp_base_client_register (TpBaseClient *self,
GError **error); GError **error);
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 client-channel-factory.h   client-channel-factory.h 
skipping to change at line 30 skipping to change at line 30
#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 _TpClientChannelFactoryInterface TpClientChannelFactoryInter face; typedef struct _TpClientChannelFactoryInterface TpClientChannelFactoryInter face;
struct _TpClientChannelFactoryInterface { struct _TpClientChannelFactoryInterface {
GTypeInterface parent; GTypeInterface parent;
TpChannel * (* create_channel) (TpClientChannelFactoryInterface *self, TpChannel * (* create_channel) (TpClientChannelFactoryInterface *self,
TpConnection *conn, TpConnection *conn,
const gchar *path, const gchar *path,
GHashTable *properties, GHashTable *properties,
GError **error); GError **error);
GArray * (* dup_channel_features) (TpClientChannelFactoryInterface *sel f, GArray * (* dup_channel_features) (TpClientChannelFactoryInterface *sel f,
TpChannel *channel); TpChannel *channel);
TpChannel *(*obj_create_channel) (TpClientChannelFactory *self,
TpConnection *conn,
const gchar *path,
GHashTable *properties,
GError **error);
GArray *(*obj_dup_channel_features) (TpClientChannelFactory *self,
TpChannel *channel);
}; };
GType tp_client_channel_factory_get_type (void); GType tp_client_channel_factory_get_type (void);
#define TP_TYPE_CLIENT_CHANNEL_FACTORY \ #define TP_TYPE_CLIENT_CHANNEL_FACTORY \
(tp_client_channel_factory_get_type ()) (tp_client_channel_factory_get_type ())
#define TP_CLIENT_CHANNEL_FACTORY(obj) \ #define TP_CLIENT_CHANNEL_FACTORY(obj) \
(G_TYPE_CHECK_INSTANCE_CAST ((obj), TP_TYPE_CLIENT_CHANNEL_FACTORY, \ (G_TYPE_CHECK_INSTANCE_CAST ((obj), TP_TYPE_CLIENT_CHANNEL_FACTORY, \
TpClientChannelFactoryInterface)) TpClientChannelFactory))
#define TP_IS_CLIENT_CHANNEL_FACTORY(obj) \ #define TP_IS_CLIENT_CHANNEL_FACTORY(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), TP_TYPE_CLIENT_CHANNEL_FACTORY)) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TP_TYPE_CLIENT_CHANNEL_FACTORY))
#define TP_CLIENT_CHANNEL_FACTORY_GET_IFACE(obj) \ #define TP_CLIENT_CHANNEL_FACTORY_GET_IFACE(obj) \
(G_TYPE_INSTANCE_GET_INTERFACE ((obj), TP_TYPE_CLIENT_CHANNEL_FACTORY, \ (G_TYPE_INSTANCE_GET_INTERFACE ((obj), TP_TYPE_CLIENT_CHANNEL_FACTORY, \
TpClientChannelFactoryInterface)) TpClientChannelFactoryInterface))
TpChannel * tp_client_channel_factory_create_channel ( TpChannel *tp_client_channel_factory_create_channel (
TpClientChannelFactoryInterface *self, TpClientChannelFactory *self,
TpConnection *conn, TpConnection *conn,
const gchar *path, const gchar *path,
GHashTable *properties, GHashTable *properties,
GError **error); GError **error);
GArray * tp_client_channel_factory_dup_channel_features ( GArray *tp_client_channel_factory_dup_channel_features (
TpClientChannelFactoryInterface *self, TpClientChannelFactory *self,
TpChannel *channel); TpChannel *channel);
G_END_DECLS G_END_DECLS
#endif #endif
 End of changes. 5 change blocks. 
5 lines changed or deleted 15 lines changed or added


 handle-repo.h   handle-repo.h 
skipping to change at line 82 skipping to change at line 82
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);
void tp_handle_ref (TpHandleRepoIface *self, TpHandle handle); TpHandle tp_handle_ref (TpHandleRepoIface *self, TpHandle handle);
void tp_handles_ref (TpHandleRepoIface *self, const GArray *handles); void tp_handles_ref (TpHandleRepoIface *self, const GArray *handles);
void tp_handle_unref (TpHandleRepoIface *self, TpHandle handle); void tp_handle_unref (TpHandleRepoIface *self, TpHandle handle);
void tp_handles_unref (TpHandleRepoIface *self, const GArray *handles); void tp_handles_unref (TpHandleRepoIface *self, const GArray *handles);
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);
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);
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);
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added

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