account.h   account.h 
skipping to change at line 160 skipping to change at line 160
gpointer user_data); gpointer user_data);
gboolean tp_account_set_connect_automatically_finish (TpAccount *account, gboolean tp_account_set_connect_automatically_finish (TpAccount *account,
GAsyncResult *result, GError **error); GAsyncResult *result, GError **error);
gboolean tp_account_get_has_been_online (TpAccount *account); gboolean tp_account_get_has_been_online (TpAccount *account);
TpConnectionStatus tp_account_get_connection_status (TpAccount *account, TpConnectionStatus tp_account_get_connection_status (TpAccount *account,
TpConnectionStatusReason *reason); TpConnectionStatusReason *reason);
const gchar *tp_account_get_detailed_error (TpAccount *self,
const GHashTable **details);
TpConnectionPresenceType tp_account_get_current_presence (TpAccount *accoun t, TpConnectionPresenceType tp_account_get_current_presence (TpAccount *accoun t,
gchar **status, gchar **status_message); gchar **status, gchar **status_message);
TpConnectionPresenceType tp_account_get_requested_presence ( TpConnectionPresenceType tp_account_get_requested_presence (
TpAccount *account, gchar **status, gchar **status_message); TpAccount *account, gchar **status, gchar **status_message);
const GHashTable *tp_account_get_parameters (TpAccount *account); const GHashTable *tp_account_get_parameters (TpAccount *account);
const gchar *tp_account_get_nickname (TpAccount *account); const gchar *tp_account_get_nickname (TpAccount *account);
 End of changes. 1 change blocks. 
0 lines changed or deleted 3 lines changed or added


 channel-dispatch-operation.h   channel-dispatch-operation.h 
skipping to change at line 121 skipping to change at line 121
void tp_channel_dispatch_operation_claim_async ( void tp_channel_dispatch_operation_claim_async (
TpChannelDispatchOperation *self, TpChannelDispatchOperation *self,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data); gpointer user_data);
gboolean tp_channel_dispatch_operation_claim_finish ( gboolean tp_channel_dispatch_operation_claim_finish (
TpChannelDispatchOperation *self, TpChannelDispatchOperation *self,
GAsyncResult *result, GAsyncResult *result,
GError **error); GError **error);
void tp_channel_dispatch_operation_handle_with_time_async (
TpChannelDispatchOperation *self,
const gchar *handler,
gint64 user_action_timestamp,
GAsyncReadyCallback callback,
gpointer user_data);
gboolean tp_channel_dispatch_operation_handle_with_time_finish (
TpChannelDispatchOperation *self,
GAsyncResult *result,
GError **error);
G_END_DECLS G_END_DECLS
#include <telepathy-glib/_gen/tp-cli-channel-dispatch-operation.h> #include <telepathy-glib/_gen/tp-cli-channel-dispatch-operation.h>
#endif #endif
 End of changes. 1 change blocks. 
0 lines changed or deleted 12 lines changed or added


 channel-factory-iface.h   channel-factory-iface.h 
skipping to change at line 33 skipping to change at line 33
#define __TP_CHANNEL_FACTORY_IFACE_H__ #define __TP_CHANNEL_FACTORY_IFACE_H__
#include <glib-object.h> #include <glib-object.h>
#include <telepathy-glib/channel-iface.h> #include <telepathy-glib/channel-iface.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
#ifndef TP_DISABLE_DEPRECATED
#define TP_TYPE_CHANNEL_FACTORY_IFACE (tp_channel_factory_iface_get_type () ) #define TP_TYPE_CHANNEL_FACTORY_IFACE (tp_channel_factory_iface_get_type () )
#define TP_CHANNEL_FACTORY_IFACE(obj) \ #define TP_CHANNEL_FACTORY_IFACE(obj) \
(G_TYPE_CHECK_INSTANCE_CAST ((obj), \ (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
TP_TYPE_CHANNEL_FACTORY_IFACE, TpChannelFactoryIface)) TP_TYPE_CHANNEL_FACTORY_IFACE, TpChannelFactoryIface))
#define TP_IS_CHANNEL_FACTORY_IFACE(obj) \ #define TP_IS_CHANNEL_FACTORY_IFACE(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), \ (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
TP_TYPE_CHANNEL_FACTORY_IFACE)) TP_TYPE_CHANNEL_FACTORY_IFACE))
#define TP_CHANNEL_FACTORY_IFACE_GET_CLASS(obj) \ #define TP_CHANNEL_FACTORY_IFACE_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_INTERFACE ((obj), \ (G_TYPE_INSTANCE_GET_INTERFACE ((obj), \
TP_TYPE_CHANNEL_FACTORY_IFACE, TpChannelFactoryIfaceClass)) TP_TYPE_CHANNEL_FACTORY_IFACE, TpChannelFactoryIfaceClass))
/** /**
* TpChannelFactoryIface: * TpChannelFactoryIface:
* *
* Opaque typedef representing any channel factory implementation. * Opaque typedef representing any channel factory implementation.
*
* Deprecated since version 0.11.7. Use #TpChannelManager instead.
*
* Deprecated: 0.11.7
*/ */
typedef struct _TpChannelFactoryIface TpChannelFactoryIface; typedef struct _TpChannelFactoryIface TpChannelFactoryIface;
/* documented below */ /* documented below */
typedef struct _TpChannelFactoryIfaceClass TpChannelFactoryIfaceClass; typedef struct _TpChannelFactoryIfaceClass TpChannelFactoryIfaceClass;
/** /**
* TpChannelFactoryRequestStatus: * TpChannelFactoryRequestStatus:
* @TP_CHANNEL_FACTORY_REQUEST_STATUS_NOT_IMPLEMENTED: Same as the Telepath y * @TP_CHANNEL_FACTORY_REQUEST_STATUS_NOT_IMPLEMENTED: Same as the Telepath y
* error NotImplemented. The connection will try the next factory in its * error NotImplemented. The connection will try the next factory in its
skipping to change at line 80 skipping to change at line 86
* (possibly in response to more than one request). new-channel has alread y * (possibly in response to more than one request). new-channel has alread y
* been emitted and *@ret is set to the new channel. * been emitted and *@ret is set to the new channel.
* @TP_CHANNEL_FACTORY_REQUEST_STATUS_QUEUED: A new channel will be created , * @TP_CHANNEL_FACTORY_REQUEST_STATUS_QUEUED: A new channel will be created ,
* or was created but is not ready yet. Either new-channel or channel-erro r * or was created but is not ready yet. Either new-channel or channel-erro r
* will be emitted later. *@ret and *@error are not set. * will be emitted later. *@ret and *@error are not set.
* @TP_CHANNEL_FACTORY_REQUEST_STATUS_EXISTING: An existing channel * @TP_CHANNEL_FACTORY_REQUEST_STATUS_EXISTING: An existing channel
* satisfies the request: new-channel was not emitted. *@ret is set to the * satisfies the request: new-channel was not emitted. *@ret is set to the
* existing channel. * existing channel.
* *
* Indicates the result of a channel request. * Indicates the result of a channel request.
*
* Deprecated since version 0.11.7. Use #TpChannelManager instead.
*
* Deprecated: 0.11.7
*/ */
typedef enum { /*< skip >*/ typedef enum { /*< skip >*/
TP_CHANNEL_FACTORY_REQUEST_STATUS_NOT_IMPLEMENTED = 0, TP_CHANNEL_FACTORY_REQUEST_STATUS_NOT_IMPLEMENTED = 0,
TP_CHANNEL_FACTORY_REQUEST_STATUS_NOT_AVAILABLE, TP_CHANNEL_FACTORY_REQUEST_STATUS_NOT_AVAILABLE,
TP_CHANNEL_FACTORY_REQUEST_STATUS_INVALID_HANDLE, TP_CHANNEL_FACTORY_REQUEST_STATUS_INVALID_HANDLE,
TP_CHANNEL_FACTORY_REQUEST_STATUS_ERROR, TP_CHANNEL_FACTORY_REQUEST_STATUS_ERROR,
TP_CHANNEL_FACTORY_REQUEST_STATUS_CREATED, TP_CHANNEL_FACTORY_REQUEST_STATUS_CREATED,
TP_CHANNEL_FACTORY_REQUEST_STATUS_QUEUED, TP_CHANNEL_FACTORY_REQUEST_STATUS_QUEUED,
TP_CHANNEL_FACTORY_REQUEST_STATUS_EXISTING TP_CHANNEL_FACTORY_REQUEST_STATUS_EXISTING
} TpChannelFactoryRequestStatus; } TpChannelFactoryRequestStatus;
/** /**
* TpChannelFactoryIfaceProc: * TpChannelFactoryIfaceProc:
* @self: An object implementing #TpChannelFactoryIface * @self: An object implementing #TpChannelFactoryIface
* *
* A virtual method on a channel factory that takes no extra parameters * A virtual method on a channel factory that takes no extra parameters
* and returns nothing. * and returns nothing.
*
* Deprecated since version 0.11.7. Use #TpChannelManager instead.
*
* Deprecated: 0.11.7
*/ */
typedef void (*TpChannelFactoryIfaceProc) (TpChannelFactoryIface *self); typedef void (*TpChannelFactoryIfaceProc) (TpChannelFactoryIface *self);
/** /**
* TpChannelFactoryIfaceRequestImpl: * TpChannelFactoryIfaceRequestImpl:
* @self: An object implementing #TpChannelFactoryIface * @self: An object implementing #TpChannelFactoryIface
* @chan_type: The channel type, e.g. %TP_IFACE_CHANNEL_TYPE_TEXT * @chan_type: The channel type, e.g. %TP_IFACE_CHANNEL_TYPE_TEXT
* @handle_type: The handle type of the channel's associated handle, * @handle_type: The handle type of the channel's associated handle,
* or 0 if the channel has no associated handle * or 0 if the channel has no associated handle
* @handle: The channel's associated handle, of type @handle_type, * @handle: The channel's associated handle, of type @handle_type,
skipping to change at line 121 skipping to change at line 135
* if the newly created channel has handle 0, and MAY be * if the newly created channel has handle 0, and MAY be
* included in the signal if the newly created channel has * included in the signal if the newly created channel has
* nonzero handle. * nonzero handle.
* @ret: Set to the new channel if it is available immediately, as * @ret: Set to the new channel if it is available immediately, as
* documented in the description of #TpChannelFactoryRequestStatus * documented in the description of #TpChannelFactoryRequestStatus
* @error: Set to the error if the return is * @error: Set to the error if the return is
* %TP_CHANNEL_FACTORY_REQUEST_STATUS_ERROR, unset otherwise * %TP_CHANNEL_FACTORY_REQUEST_STATUS_ERROR, unset otherwise
* *
* Signature of an implementation of RequestChannel. * Signature of an implementation of RequestChannel.
* *
* Deprecated since version 0.11.7. Use #TpChannelManager instead.
*
* Deprecated: 0.11.7
*
* Returns: one of the values of #TpChannelFactoryRequestStatus, and * Returns: one of the values of #TpChannelFactoryRequestStatus, and
* behaves as documented for that return value * behaves as documented for that return value
*/ */
typedef TpChannelFactoryRequestStatus (*TpChannelFactoryIfaceRequestImpl) ( typedef TpChannelFactoryRequestStatus (*TpChannelFactoryIfaceRequestImpl) (
TpChannelFactoryIface *self, const gchar *chan_type, TpChannelFactoryIface *self, const gchar *chan_type,
TpHandleType handle_type, guint handle, gpointer request, TpHandleType handle_type, guint handle, gpointer request,
TpChannelIface **ret, GError **error); TpChannelIface **ret, GError **error);
/** /**
* TpChannelFactoryIfaceForeachImpl: * TpChannelFactoryIfaceForeachImpl:
* @self: An object implementing #TpChannelFactoryIface * @self: An object implementing #TpChannelFactoryIface
* @func: A function * @func: A function
* @data: Arbitrary data to pass to @func as the second argument * @data: Arbitrary data to pass to @func as the second argument
* *
* Signature of an implementation of foreach, which must call * Signature of an implementation of foreach, which must call
* func(channel, data) for each channel managed by this factory. * func(channel, data) for each channel managed by this factory.
*
* Deprecated since version 0.11.7. Use #TpChannelManager instead.
*
* Deprecated: 0.11.7
*/ */
typedef void (*TpChannelFactoryIfaceForeachImpl) (TpChannelFactoryIface *se lf, typedef void (*TpChannelFactoryIfaceForeachImpl) (TpChannelFactoryIface *se lf,
TpChannelFunc func, gpointer data); TpChannelFunc func, gpointer data);
/** /**
* TpChannelFactoryIfaceClass: * TpChannelFactoryIfaceClass:
* @parent_class: Fields shared with GTypeInterface * @parent_class: Fields shared with GTypeInterface
* @close_all: Close all channels and shut down the channel factory. It is not * @close_all: Close all channels and shut down the channel factory. It is not
* expected to be usable afterwards. This is called when the connection go es * expected to be usable afterwards. This is called when the connection go es
* to disconnected state, before emitting the StatusChanged signal or call ing * to disconnected state, before emitting the StatusChanged signal or call ing
skipping to change at line 161 skipping to change at line 183
* connected state. May be NULL if nothing special needs to happen. * connected state. May be NULL if nothing special needs to happen.
* @disconnected: Called just after the connection goes to disconnected sta te. * @disconnected: Called just after the connection goes to disconnected sta te.
* This is always called after close_all(). May be NULL if nothing special * This is always called after close_all(). May be NULL if nothing special
* needs to happen. * needs to happen.
* @foreach: Call func(channel, data) for each channel managed by this * @foreach: Call func(channel, data) for each channel managed by this
* factory. Must be filled in by implementations. * factory. Must be filled in by implementations.
* @request: Respond to a request for a channel. Must be filled in by * @request: Respond to a request for a channel. Must be filled in by
* implementations. See #TpChannelFactoryIfaceRequestImpl for details. * implementations. See #TpChannelFactoryIfaceRequestImpl for details.
* *
* The class structure and vtable for a channel factory implementation. * The class structure and vtable for a channel factory implementation.
*
* Deprecated since version 0.11.7. Use #TpChannelManager instead.
*
* Deprecated: 0.11.7
*/ */
struct _TpChannelFactoryIfaceClass { struct _TpChannelFactoryIfaceClass {
GTypeInterface parent_class; GTypeInterface parent_class;
TpChannelFactoryIfaceProc close_all; TpChannelFactoryIfaceProc close_all;
TpChannelFactoryIfaceProc connecting; TpChannelFactoryIfaceProc connecting;
TpChannelFactoryIfaceProc connected; TpChannelFactoryIfaceProc connected;
TpChannelFactoryIfaceProc disconnected; TpChannelFactoryIfaceProc disconnected;
TpChannelFactoryIfaceForeachImpl foreach; TpChannelFactoryIfaceForeachImpl foreach;
TpChannelFactoryIfaceRequestImpl request; TpChannelFactoryIfaceRequestImpl request;
}; } _TP_GNUC_DEPRECATED;
GType tp_channel_factory_iface_get_type (void); GType tp_channel_factory_iface_get_type (void);
void tp_channel_factory_iface_close_all (TpChannelFactoryIface *self); void tp_channel_factory_iface_close_all (TpChannelFactoryIface *self);
void tp_channel_factory_iface_connecting (TpChannelFactoryIface *self); void tp_channel_factory_iface_connecting (TpChannelFactoryIface *self);
void tp_channel_factory_iface_connected (TpChannelFactoryIface *self); void tp_channel_factory_iface_connected (TpChannelFactoryIface *self);
void tp_channel_factory_iface_disconnected (TpChannelFactoryIface *self); void tp_channel_factory_iface_disconnected (TpChannelFactoryIface *self);
skipping to change at line 197 skipping to change at line 223
TpChannelFactoryIface *self, const gchar *chan_type, TpChannelFactoryIface *self, const gchar *chan_type,
TpHandleType handle_type, guint handle, gpointer request, TpHandleType handle_type, guint handle, gpointer request,
TpChannelIface **ret, GError **error); TpChannelIface **ret, GError **error);
void tp_channel_factory_iface_emit_new_channel (gpointer instance, void tp_channel_factory_iface_emit_new_channel (gpointer instance,
TpChannelIface *channel, gpointer request); TpChannelIface *channel, gpointer request);
void tp_channel_factory_iface_emit_channel_error (gpointer instance, void tp_channel_factory_iface_emit_channel_error (gpointer instance,
TpChannelIface *channel, GError *error, gpointer request); TpChannelIface *channel, GError *error, gpointer request);
#endif /* not TP_DISABLE_DEPRECATED */
G_END_DECLS G_END_DECLS
#endif /* __TP_CHANNEL_FACTORY_IFACE_H__ */ #endif /* __TP_CHANNEL_FACTORY_IFACE_H__ */
 End of changes. 9 change blocks. 
1 lines changed or deleted 29 lines changed or added


 connection.h   connection.h 
skipping to change at line 33 skipping to change at line 33
#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
typedef struct _TpConnection TpConnection;
typedef struct _TpConnectionPrivate TpConnectionPrivate;
typedef struct _TpConnectionClass TpConnectionClass;
struct _TpConnectionClass {
TpProxyClass parent_class;
/*<private>*/
GCallback _1;
GCallback _2;
GCallback _3;
GCallback _4;
};
struct _TpConnection {
/*<private>*/
TpProxy parent;
TpConnectionPrivate *priv;
};
typedef struct _TpAvatarRequirements TpAvatarRequirements; typedef struct _TpAvatarRequirements TpAvatarRequirements;
struct _TpAvatarRequirements struct _TpAvatarRequirements
{ {
gchar **supported_mime_types; GStrv supported_mime_types;
guint minimum_width; guint minimum_width;
guint minimum_height; guint minimum_height;
guint recommended_width; guint recommended_width;
guint recommended_height; guint recommended_height;
guint maximum_width; guint maximum_width;
guint maximum_height; guint maximum_height;
guint maximum_bytes; guint maximum_bytes;
/*<private>*/ /*<private>*/
gpointer _1; gpointer _1;
gpointer _2; gpointer _2;
gpointer _3; gpointer _3;
gpointer _4; gpointer _4;
}; };
#define TP_TYPE_AVATAR_REQUIREMENTS (tp_avatar_requirements_get_type ()) #define TP_TYPE_AVATAR_REQUIREMENTS (tp_avatar_requirements_get_type ())
GType tp_avatar_requirements_get_type (void); GType tp_avatar_requirements_get_type (void);
TpAvatarRequirements * tp_avatar_requirements_new (GStrv supported_mime_typ
TpAvatarRequirements * tp_avatar_requirements_new ( es,
GStrv supported_mime_types,
guint minimum_width, guint minimum_width,
guint minimum_height, guint minimum_height,
guint recommended_width, guint recommended_width,
guint recommended_height, guint recommended_height,
guint maximum_width, guint maximum_width,
guint maximum_height, guint maximum_height,
guint maximum_bytes); guint maximum_bytes);
TpAvatarRequirements * tp_avatar_requirements_copy ( TpAvatarRequirements * tp_avatar_requirements_copy (
TpAvatarRequirements *self); const TpAvatarRequirements *self);
void tp_avatar_requirements_destroy (TpAvatarRequirements *self); void tp_avatar_requirements_destroy (TpAvatarRequirements *self);
typedef struct _TpContactInfoFieldSpec TpContactInfoFieldSpec;
struct _TpContactInfoFieldSpec
{
gchar *name;
GStrv parameters;
TpContactInfoFieldFlags flags;
guint max;
/*<private>*/
gpointer priv;
};
#define TP_TYPE_CONTACT_INFO_FIELD_SPEC (tp_contact_info_field_spec_get_typ
e ())
GType tp_contact_info_field_spec_get_type (void);
TpContactInfoFieldSpec *tp_contact_info_field_spec_copy (
const TpContactInfoFieldSpec *self);
void tp_contact_info_field_spec_free (TpContactInfoFieldSpec *self);
#define TP_TYPE_CONTACT_INFO_SPEC_LIST (tp_contact_info_spec_list_get_type
())
GType tp_contact_info_spec_list_get_type (void);
GList *tp_contact_info_spec_list_copy (GList *list);
void tp_contact_info_spec_list_free (GList *list);
typedef struct _TpContactInfoField TpContactInfoField;
struct _TpContactInfoField
{
gchar *field_name;
GStrv parameters;
GStrv field_value;
/*<private>*/
gpointer priv;
};
#define TP_TYPE_CONTACT_INFO_FIELD (tp_contact_info_field_get_type ())
GType tp_contact_info_field_get_type (void);
TpContactInfoField *tp_contact_info_field_new (const gchar *field_name,
GStrv parameters, GStrv field_value);
TpContactInfoField *tp_contact_info_field_copy (const TpContactInfoField *s
elf);
void tp_contact_info_field_free (TpContactInfoField *self);
#define TP_TYPE_CONTACT_INFO_LIST (tp_contact_info_list_get_type ())
GType tp_contact_info_list_get_type (void);
GList *tp_contact_info_list_copy (GList *list);
void tp_contact_info_list_free (GList *list);
typedef struct _TpConnection TpConnection;
typedef struct _TpConnectionPrivate TpConnectionPrivate;
typedef struct _TpConnectionClass TpConnectionClass;
struct _TpConnectionClass {
TpProxyClass parent_class;
/*<private>*/
GCallback _1;
GCallback _2;
GCallback _3;
GCallback _4;
};
struct _TpConnection {
/*<private>*/
TpProxy parent;
TpConnectionPrivate *priv;
};
GType tp_connection_get_type (void); GType tp_connection_get_type (void);
#define TP_ERRORS_DISCONNECTED (tp_errors_disconnected_quark ()) #define TP_ERRORS_DISCONNECTED (tp_errors_disconnected_quark ())
GQuark tp_errors_disconnected_quark (void); GQuark tp_errors_disconnected_quark (void);
#define TP_UNKNOWN_CONNECTION_STATUS ((TpConnectionStatus) -1) #define TP_UNKNOWN_CONNECTION_STATUS ((TpConnectionStatus) -1)
/* TYPE MACROS */ /* TYPE MACROS */
#define TP_TYPE_CONNECTION \ #define TP_TYPE_CONNECTION \
(tp_connection_get_type ()) (tp_connection_get_type ())
skipping to change at line 126 skipping to change at line 166
TpConnectionStatus tp_connection_get_status (TpConnection *self, TpConnectionStatus tp_connection_get_status (TpConnection *self,
TpConnectionStatusReason *reason); TpConnectionStatusReason *reason);
TpHandle tp_connection_get_self_handle (TpConnection *self); TpHandle tp_connection_get_self_handle (TpConnection *self);
TpCapabilities * tp_connection_get_capabilities (TpConnection *self); TpCapabilities * tp_connection_get_capabilities (TpConnection *self);
TpAvatarRequirements * tp_connection_get_avatar_requirements ( TpAvatarRequirements * tp_connection_get_avatar_requirements (
TpConnection *self); TpConnection *self);
TpContactInfoFlags tp_connection_get_contact_info_flags (TpConnection *self
);
GList *tp_connection_get_contact_info_supported_fields (TpConnection *self)
;
void tp_connection_set_contact_info_async (TpConnection *self,
GList *info, GAsyncReadyCallback callback,
gpointer user_data);
gboolean tp_connection_set_contact_info_finish (TpConnection *self,
GAsyncResult *result, GError **error);
gboolean tp_connection_is_ready (TpConnection *self); gboolean tp_connection_is_ready (TpConnection *self);
#ifndef TP_DISABLE_DEPRECATED #ifndef TP_DISABLE_DEPRECATED
gboolean tp_connection_run_until_ready (TpConnection *self, gboolean tp_connection_run_until_ready (TpConnection *self,
gboolean connect, GError **error, gboolean connect, GError **error,
GMainLoop **loop) _TP_GNUC_DEPRECATED; GMainLoop **loop) _TP_GNUC_DEPRECATED;
#endif #endif
typedef void (*TpConnectionWhenReadyCb) (TpConnection *connection, typedef void (*TpConnectionWhenReadyCb) (TpConnection *connection,
const GError *error, gpointer user_data); const GError *error, gpointer user_data);
skipping to change at line 177 skipping to change at line 228
GQuark tp_connection_get_feature_quark_connected (void) G_GNUC_CONST; GQuark tp_connection_get_feature_quark_connected (void) G_GNUC_CONST;
#define TP_CONNECTION_FEATURE_CAPABILITIES \ #define TP_CONNECTION_FEATURE_CAPABILITIES \
(tp_connection_get_feature_quark_capabilities ()) (tp_connection_get_feature_quark_capabilities ())
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_AVATAR_REQUIREMENTS \ #define TP_CONNECTION_FEATURE_AVATAR_REQUIREMENTS \
(tp_connection_get_feature_quark_avatar_requirements ()) (tp_connection_get_feature_quark_avatar_requirements ())
GQuark tp_connection_get_feature_quark_avatar_requirements (void) G_GNUC_CO NST; GQuark tp_connection_get_feature_quark_avatar_requirements (void) G_GNUC_CO NST;
#define TP_CONNECTION_FEATURE_CONTACT_INFO \
(tp_connection_get_feature_quark_contact_info ())
GQuark tp_connection_get_feature_quark_contact_info (void) G_GNUC_CONST;
/* connection-handles.c */ /* connection-handles.c */
typedef void (*TpConnectionHoldHandlesCb) (TpConnection *connection, typedef void (*TpConnectionHoldHandlesCb) (TpConnection *connection,
TpHandleType handle_type, guint n_handles, const TpHandle *handles, TpHandleType handle_type, guint n_handles, const TpHandle *handles,
const GError *error, gpointer user_data, GObject *weak_object); const GError *error, gpointer user_data, GObject *weak_object);
void tp_connection_hold_handles (TpConnection *self, gint timeout_ms, void tp_connection_hold_handles (TpConnection *self, gint timeout_ms,
TpHandleType handle_type, guint n_handles, const TpHandle *handles, TpHandleType handle_type, guint n_handles, const TpHandle *handles,
TpConnectionHoldHandlesCb callback, TpConnectionHoldHandlesCb callback,
gpointer user_data, GDestroyNotify destroy, GObject *weak_object); gpointer user_data, GDestroyNotify destroy, GObject *weak_object);
 End of changes. 8 change blocks. 
26 lines changed or deleted 87 lines changed or added


 contact.h   contact.h 
skipping to change at line 64 skipping to change at line 64
(G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_CONTACT, \ (G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_CONTACT, \
TpContactClass)) TpContactClass))
typedef enum { typedef enum {
TP_CONTACT_FEATURE_ALIAS, TP_CONTACT_FEATURE_ALIAS,
TP_CONTACT_FEATURE_AVATAR_TOKEN, TP_CONTACT_FEATURE_AVATAR_TOKEN,
TP_CONTACT_FEATURE_PRESENCE, TP_CONTACT_FEATURE_PRESENCE,
TP_CONTACT_FEATURE_LOCATION, TP_CONTACT_FEATURE_LOCATION,
TP_CONTACT_FEATURE_CAPABILITIES, TP_CONTACT_FEATURE_CAPABILITIES,
TP_CONTACT_FEATURE_AVATAR_DATA, TP_CONTACT_FEATURE_AVATAR_DATA,
#define NUM_TP_CONTACT_FEATURES (TP_CONTACT_FEATURE_AVATAR_DATA + 1) TP_CONTACT_FEATURE_CONTACT_INFO,
#define NUM_TP_CONTACT_FEATURES (TP_CONTACT_FEATURE_CONTACT_INFO + 1)
} TpContactFeature; } TpContactFeature;
/* Basic functionality, always available */ /* Basic functionality, always available */
TpConnection *tp_contact_get_connection (TpContact *self); TpConnection *tp_contact_get_connection (TpContact *self);
TpHandle tp_contact_get_handle (TpContact *self); TpHandle tp_contact_get_handle (TpContact *self);
const gchar *tp_contact_get_identifier (TpContact *self); const gchar *tp_contact_get_identifier (TpContact *self);
gboolean tp_contact_has_feature (TpContact *self, TpContactFeature feature) ; gboolean tp_contact_has_feature (TpContact *self, TpContactFeature feature) ;
/* TP_CONTACT_FEATURE_ALIAS */ /* TP_CONTACT_FEATURE_ALIAS */
const gchar *tp_contact_get_alias (TpContact *self); const gchar *tp_contact_get_alias (TpContact *self);
skipping to change at line 94 skipping to change at line 95
/* TP_CONTACT_FEATURE_LOCATION */ /* TP_CONTACT_FEATURE_LOCATION */
GHashTable *tp_contact_get_location (TpContact *self); GHashTable *tp_contact_get_location (TpContact *self);
/* TP_CONTACT_FEATURE_CAPABILITIES */ /* TP_CONTACT_FEATURE_CAPABILITIES */
TpCapabilities *tp_contact_get_capabilities (TpContact *self); TpCapabilities *tp_contact_get_capabilities (TpContact *self);
/* TP_CONTACT_FEATURE_AVATAR_DATA */ /* TP_CONTACT_FEATURE_AVATAR_DATA */
GFile *tp_contact_get_avatar_file (TpContact *self); GFile *tp_contact_get_avatar_file (TpContact *self);
const gchar *tp_contact_get_avatar_mime_type (TpContact *self); const gchar *tp_contact_get_avatar_mime_type (TpContact *self);
/* TP_CONTACT_FEATURE_INFO */
GList *tp_contact_get_contact_info (TpContact *self);
void tp_contact_request_contact_info_async (TpContact *self,
GCancellable *cancellable, GAsyncReadyCallback callback,
gpointer user_data);
gboolean tp_contact_request_contact_info_finish (TpContact *self,
GAsyncResult *result, GError **error);
void tp_connection_refresh_contact_info (TpConnection *self,
guint n_contacts, TpContact * const *contacts);
typedef void (*TpConnectionContactsByHandleCb) (TpConnection *connection, typedef void (*TpConnectionContactsByHandleCb) (TpConnection *connection,
guint n_contacts, TpContact * const *contacts, guint n_contacts, TpContact * const *contacts,
guint n_failed, const TpHandle *failed, guint n_failed, const TpHandle *failed,
const GError *error, gpointer user_data, GObject *weak_object); const GError *error, gpointer user_data, GObject *weak_object);
void tp_connection_get_contacts_by_handle (TpConnection *self, void tp_connection_get_contacts_by_handle (TpConnection *self,
guint n_handles, const TpHandle *handles, guint n_handles, const TpHandle *handles,
guint n_features, const TpContactFeature *features, guint n_features, const TpContactFeature *features,
TpConnectionContactsByHandleCb callback, TpConnectionContactsByHandleCb callback,
gpointer user_data, GDestroyNotify destroy, GObject *weak_object); gpointer user_data, GDestroyNotify destroy, GObject *weak_object);
 End of changes. 2 change blocks. 
1 lines changed or deleted 15 lines changed or added


 error-str.h   error-str.h 
skipping to change at line 39 skipping to change at line 39
#define TP_ERROR_STR_DOES_NOT_EXIST "org.freedesktop.Telepathy.Error.DoesNo tExist" #define TP_ERROR_STR_DOES_NOT_EXIST "org.freedesktop.Telepathy.Error.DoesNo tExist"
#define TP_ERROR_STR_TERMINATED "org.freedesktop.Telepathy.Error.Terminated " #define TP_ERROR_STR_TERMINATED "org.freedesktop.Telepathy.Error.Terminated "
#define TP_ERROR_STR_CONNECTION_REFUSED "org.freedesktop.Telepathy.Error.Co nnectionRefused" #define TP_ERROR_STR_CONNECTION_REFUSED "org.freedesktop.Telepathy.Error.Co nnectionRefused"
#define TP_ERROR_STR_CONNECTION_FAILED "org.freedesktop.Telepathy.Error.Con nectionFailed" #define TP_ERROR_STR_CONNECTION_FAILED "org.freedesktop.Telepathy.Error.Con nectionFailed"
#define TP_ERROR_STR_CONNECTION_LOST "org.freedesktop.Telepathy.Error.Conne ctionLost" #define TP_ERROR_STR_CONNECTION_LOST "org.freedesktop.Telepathy.Error.Conne ctionLost"
#define TP_ERROR_STR_ALREADY_CONNECTED "org.freedesktop.Telepathy.Error.Alr eadyConnected" #define TP_ERROR_STR_ALREADY_CONNECTED "org.freedesktop.Telepathy.Error.Alr eadyConnected"
#define TP_ERROR_STR_CONNECTION_REPLACED "org.freedesktop.Telepathy.Error.C onnectionReplaced" #define TP_ERROR_STR_CONNECTION_REPLACED "org.freedesktop.Telepathy.Error.C onnectionReplaced"
#define TP_ERROR_STR_REGISTRATION_EXISTS "org.freedesktop.Telepathy.Error.R egistrationExists" #define TP_ERROR_STR_REGISTRATION_EXISTS "org.freedesktop.Telepathy.Error.R egistrationExists"
#define TP_ERROR_STR_SERVICE_BUSY "org.freedesktop.Telepathy.Error.ServiceB usy" #define TP_ERROR_STR_SERVICE_BUSY "org.freedesktop.Telepathy.Error.ServiceB usy"
#define TP_ERROR_STR_RESOURCE_UNAVAILABLE "org.freedesktop.Telepathy.Error. ResourceUnavailable" #define TP_ERROR_STR_RESOURCE_UNAVAILABLE "org.freedesktop.Telepathy.Error. ResourceUnavailable"
#define TP_ERROR_STR_WOULD_BREAK_ANONYMITY "org.freedesktop.Telepathy.Error .WouldBreakAnonymity"
 End of changes. 1 change blocks. 
0 lines changed or deleted 0 lines changed or added


 errors.h   errors.h 
skipping to change at line 36 skipping to change at line 36
#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>
G_BEGIN_DECLS G_BEGIN_DECLS
GQuark tp_errors_quark (void); GQuark tp_errors_quark (void);
#define TP_ERROR_PREFIX "org.freedesktop.Telepathy.Error" #define TP_ERROR_PREFIX "org.freedesktop.Telepathy.Error"
#define TP_ERRORS (tp_errors_quark ()) #define TP_ERRORS (tp_errors_quark ())
#define TP_ERROR TP_ERRORS
void tp_g_set_error_invalid_handle_type (guint type, GError **error); void tp_g_set_error_invalid_handle_type (guint type, GError **error);
void tp_g_set_error_unsupported_handle_type (guint type, GError **error); void tp_g_set_error_unsupported_handle_type (guint type, GError **error);
typedef enum { typedef enum {
TP_ERROR_NETWORK_ERROR, /*< nick=NetworkError >*/ TP_ERROR_NETWORK_ERROR, /*< nick=NetworkError >*/
TP_ERROR_NOT_IMPLEMENTED, /*< nick=NotImplemented >*/ TP_ERROR_NOT_IMPLEMENTED, /*< nick=NotImplemented >*/
TP_ERROR_INVALID_ARGUMENT, /*< nick=InvalidArgument >*/ TP_ERROR_INVALID_ARGUMENT, /*< nick=InvalidArgument >*/
TP_ERROR_NOT_AVAILABLE, /*< nick=NotAvailable >*/ TP_ERROR_NOT_AVAILABLE, /*< nick=NotAvailable >*/
TP_ERROR_PERMISSION_DENIED, /*< nick=PermissionDenied >*/ TP_ERROR_PERMISSION_DENIED, /*< nick=PermissionDenied >*/
skipping to change at line 79 skipping to change at line 80
TP_ERROR_DOES_NOT_EXIST, /*< nick=DoesNotExist >*/ TP_ERROR_DOES_NOT_EXIST, /*< nick=DoesNotExist >*/
TP_ERROR_TERMINATED, /*< nick=Terminated >*/ TP_ERROR_TERMINATED, /*< nick=Terminated >*/
TP_ERROR_CONNECTION_REFUSED, /*< nick=ConnectionRefused >*/ TP_ERROR_CONNECTION_REFUSED, /*< nick=ConnectionRefused >*/
TP_ERROR_CONNECTION_FAILED, /*< nick=ConnectionFailed >*/ TP_ERROR_CONNECTION_FAILED, /*< nick=ConnectionFailed >*/
TP_ERROR_CONNECTION_LOST, /*< nick=ConnectionLost >*/ TP_ERROR_CONNECTION_LOST, /*< nick=ConnectionLost >*/
TP_ERROR_ALREADY_CONNECTED, /*< nick=AlreadyConnected >*/ TP_ERROR_ALREADY_CONNECTED, /*< nick=AlreadyConnected >*/
TP_ERROR_CONNECTION_REPLACED, /*< nick=ConnectionReplaced >*/ TP_ERROR_CONNECTION_REPLACED, /*< nick=ConnectionReplaced >*/
TP_ERROR_REGISTRATION_EXISTS, /*< nick=RegistrationExists >*/ TP_ERROR_REGISTRATION_EXISTS, /*< nick=RegistrationExists >*/
TP_ERROR_SERVICE_BUSY, /*< nick=ServiceBusy >*/ TP_ERROR_SERVICE_BUSY, /*< nick=ServiceBusy >*/
TP_ERROR_RESOURCE_UNAVAILABLE, /*< nick=ResourceUnavailable >*/ TP_ERROR_RESOURCE_UNAVAILABLE, /*< nick=ResourceUnavailable >*/
TP_ERROR_WOULD_BREAK_ANONYMITY, /*< nick=WouldBreakAnonymity >*/
} TpError; } TpError;
const gchar *tp_error_get_dbus_name (TpError error); const gchar *tp_error_get_dbus_name (TpError error);
G_END_DECLS G_END_DECLS
#endif #endif
 End of changes. 2 change blocks. 
0 lines changed or deleted 2 lines changed or added


 handle-repo.h   handle-repo.h 
skipping to change at line 143 skipping to change at line 143
gboolean tp_handle_set_remove (TpHandleSet *set, TpHandle handle); gboolean tp_handle_set_remove (TpHandleSet *set, TpHandle handle);
gboolean tp_handle_set_is_member (const TpHandleSet *set, TpHandle handle); gboolean tp_handle_set_is_member (const TpHandleSet *set, TpHandle handle);
void tp_handle_set_foreach (TpHandleSet *set, TpHandleSetMemberFunc func, void tp_handle_set_foreach (TpHandleSet *set, TpHandleSetMemberFunc func,
gpointer userdata); gpointer userdata);
gboolean tp_handle_set_is_empty (const TpHandleSet *set); gboolean tp_handle_set_is_empty (const TpHandleSet *set);
int tp_handle_set_size (const TpHandleSet *set); int tp_handle_set_size (const TpHandleSet *set);
GArray *tp_handle_set_to_array (const TpHandleSet *set) GArray *tp_handle_set_to_array (const TpHandleSet *set)
G_GNUC_WARN_UNUSED_RESULT; G_GNUC_WARN_UNUSED_RESULT;
TpHandleSet *tp_handle_set_new_from_array (TpHandleRepoIface *repo,
const GArray *array) G_GNUC_WARN_UNUSED_RESULT;
TpIntSet *tp_handle_set_update (TpHandleSet *set, const TpIntSet *add) TpIntSet *tp_handle_set_update (TpHandleSet *set, const TpIntSet *add)
G_GNUC_WARN_UNUSED_RESULT; G_GNUC_WARN_UNUSED_RESULT;
TpIntSet *tp_handle_set_difference_update (TpHandleSet *set, TpIntSet *tp_handle_set_difference_update (TpHandleSet *set,
const TpIntSet *remove) G_GNUC_WARN_UNUSED_RESULT; const TpIntSet *remove) G_GNUC_WARN_UNUSED_RESULT;
/* static inline because it relies on NUM_TP_HANDLE_TYPES */ /* static inline because it relies on NUM_TP_HANDLE_TYPES */
/** /**
* tp_handles_supported_and_valid: * tp_handles_supported_and_valid:
* @repos: An array of possibly null pointers to handle repositories, index ed * @repos: An array of possibly null pointers to handle repositories, index ed
 End of changes. 1 change blocks. 
0 lines changed or deleted 2 lines changed or added


 telepathy-enums.h   telepathy-enums.h 
skipping to change at line 56 skipping to change at line 56
TP_CONNECTION_STATUS_REASON_CERT_SELF_SIGNED = 12, TP_CONNECTION_STATUS_REASON_CERT_SELF_SIGNED = 12,
TP_CONNECTION_STATUS_REASON_CERT_OTHER_ERROR = 13, TP_CONNECTION_STATUS_REASON_CERT_OTHER_ERROR = 13,
} TpConnectionStatusReason; } TpConnectionStatusReason;
#define NUM_TP_CONNECTION_STATUS_REASONS (13+1) #define NUM_TP_CONNECTION_STATUS_REASONS (13+1)
typedef enum { typedef enum {
TP_CONNECTION_ALIAS_FLAG_USER_SET = 1, TP_CONNECTION_ALIAS_FLAG_USER_SET = 1,
} TpConnectionAliasFlags; } TpConnectionAliasFlags;
typedef enum { typedef enum {
TP_ANONYMITY_MODE_CLIENT_INFO = 1,
TP_ANONYMITY_MODE_SHOW_CLIENT_INFO = 2,
TP_ANONYMITY_MODE_NETWORK_INFO = 4,
} TpAnonymityModeFlags;
typedef enum {
TP_CONNECTION_CAPABILITY_FLAG_CREATE = 1, TP_CONNECTION_CAPABILITY_FLAG_CREATE = 1,
TP_CONNECTION_CAPABILITY_FLAG_INVITE = 2, TP_CONNECTION_CAPABILITY_FLAG_INVITE = 2,
} TpConnectionCapabilityFlags; } TpConnectionCapabilityFlags;
typedef enum { typedef enum {
TP_CONTACT_INFO_FLAG_CAN_SET = 1, TP_CONTACT_INFO_FLAG_CAN_SET = 1,
TP_CONTACT_INFO_FLAG_PUSH = 2, TP_CONTACT_INFO_FLAG_PUSH = 2,
} TpContactInfoFlags; } TpContactInfoFlags;
typedef enum { typedef enum {
skipping to change at line 95 skipping to change at line 101
TP_RICH_PRESENCE_ACCESS_CONTROL_TYPE_GROUP = 2, TP_RICH_PRESENCE_ACCESS_CONTROL_TYPE_GROUP = 2,
TP_RICH_PRESENCE_ACCESS_CONTROL_TYPE_OPEN = 3, TP_RICH_PRESENCE_ACCESS_CONTROL_TYPE_OPEN = 3,
} TpRichPresenceAccessControlType; } TpRichPresenceAccessControlType;
#define NUM_TP_RICH_PRESENCE_ACCESS_CONTROL_TYPES (3+1) #define NUM_TP_RICH_PRESENCE_ACCESS_CONTROL_TYPES (3+1)
typedef enum { typedef enum {
TP_LOCATION_FEATURE_CAN_SET = 1, TP_LOCATION_FEATURE_CAN_SET = 1,
} TpLocationFeatures; } TpLocationFeatures;
typedef enum { typedef enum {
TP_SERVICE_POINT_TYPE_NONE = 0,
TP_SERVICE_POINT_TYPE_EMERGENCY = 1,
TP_SERVICE_POINT_TYPE_COUNSELING = 2,
} TpServicePointType;
#define NUM_TP_SERVICE_POINT_TYPES (2+1)
typedef enum {
TP_FILE_TRANSFER_STATE_NONE = 0, TP_FILE_TRANSFER_STATE_NONE = 0,
TP_FILE_TRANSFER_STATE_PENDING = 1, TP_FILE_TRANSFER_STATE_PENDING = 1,
TP_FILE_TRANSFER_STATE_ACCEPTED = 2, TP_FILE_TRANSFER_STATE_ACCEPTED = 2,
TP_FILE_TRANSFER_STATE_OPEN = 3, TP_FILE_TRANSFER_STATE_OPEN = 3,
TP_FILE_TRANSFER_STATE_COMPLETED = 4, TP_FILE_TRANSFER_STATE_COMPLETED = 4,
TP_FILE_TRANSFER_STATE_CANCELLED = 5, TP_FILE_TRANSFER_STATE_CANCELLED = 5,
} TpFileTransferState; } TpFileTransferState;
#define NUM_TP_FILE_TRANSFER_STATES (5+1) #define NUM_TP_FILE_TRANSFER_STATES (5+1)
typedef enum { typedef enum {
 End of changes. 2 change blocks. 
0 lines changed or deleted 13 lines changed or added


 telepathy-interfaces.h   telepathy-interfaces.h 
skipping to change at line 47 skipping to change at line 47
"org.freedesktop.Telepathy.Connection.Interface.Aliasing" "org.freedesktop.Telepathy.Connection.Interface.Aliasing"
#define TP_IFACE_QUARK_CONNECTION_INTERFACE_ALIASING \ #define TP_IFACE_QUARK_CONNECTION_INTERFACE_ALIASING \
(tp_iface_quark_connection_interface_aliasing ()) (tp_iface_quark_connection_interface_aliasing ())
GQuark tp_iface_quark_connection_interface_aliasing (void); GQuark tp_iface_quark_connection_interface_aliasing (void);
#define TP_TOKEN_CONNECTION_INTERFACE_ALIASING_ALIAS \ #define TP_TOKEN_CONNECTION_INTERFACE_ALIASING_ALIAS \
"org.freedesktop.Telepathy.Connection.Interface.Aliasing/alias" "org.freedesktop.Telepathy.Connection.Interface.Aliasing/alias"
#define TP_IFACE_CONNECTION_INTERFACE_ANONYMITY \
"org.freedesktop.Telepathy.Connection.Interface.Anonymity"
#define TP_IFACE_QUARK_CONNECTION_INTERFACE_ANONYMITY \
(tp_iface_quark_connection_interface_anonymity ())
GQuark tp_iface_quark_connection_interface_anonymity (void);
#define TP_PROP_CONNECTION_INTERFACE_ANONYMITY_SUPPORTED_ANONYMITY_MODES \
"org.freedesktop.Telepathy.Connection.Interface.Anonymity.SupportedAnonymit
yModes"
#define TP_PROP_CONNECTION_INTERFACE_ANONYMITY_ANONYMITY_MANDATORY \
"org.freedesktop.Telepathy.Connection.Interface.Anonymity.AnonymityMandator
y"
#define TP_PROP_CONNECTION_INTERFACE_ANONYMITY_ANONYMITY_MODES \
"org.freedesktop.Telepathy.Connection.Interface.Anonymity.AnonymityModes"
#define TP_IFACE_CONNECTION_INTERFACE_AVATARS \ #define TP_IFACE_CONNECTION_INTERFACE_AVATARS \
"org.freedesktop.Telepathy.Connection.Interface.Avatars" "org.freedesktop.Telepathy.Connection.Interface.Avatars"
#define TP_IFACE_QUARK_CONNECTION_INTERFACE_AVATARS \ #define TP_IFACE_QUARK_CONNECTION_INTERFACE_AVATARS \
(tp_iface_quark_connection_interface_avatars ()) (tp_iface_quark_connection_interface_avatars ())
GQuark tp_iface_quark_connection_interface_avatars (void); GQuark tp_iface_quark_connection_interface_avatars (void);
#define TP_PROP_CONNECTION_INTERFACE_AVATARS_SUPPORTED_AVATAR_MIME_TYPES \ #define TP_PROP_CONNECTION_INTERFACE_AVATARS_SUPPORTED_AVATAR_MIME_TYPES \
"org.freedesktop.Telepathy.Connection.Interface.Avatars.SupportedAvatarMIME Types" "org.freedesktop.Telepathy.Connection.Interface.Avatars.SupportedAvatarMIME Types"
skipping to change at line 199 skipping to change at line 216
#define TP_PROP_CONNECTION_INTERFACE_LOCATION_LOCATION_ACCESS_CONTROL \ #define TP_PROP_CONNECTION_INTERFACE_LOCATION_LOCATION_ACCESS_CONTROL \
"org.freedesktop.Telepathy.Connection.Interface.Location.LocationAccessCont rol" "org.freedesktop.Telepathy.Connection.Interface.Location.LocationAccessCont rol"
#define TP_PROP_CONNECTION_INTERFACE_LOCATION_SUPPORTED_LOCATION_FEATURES \ #define TP_PROP_CONNECTION_INTERFACE_LOCATION_SUPPORTED_LOCATION_FEATURES \
"org.freedesktop.Telepathy.Connection.Interface.Location.SupportedLocationF eatures" "org.freedesktop.Telepathy.Connection.Interface.Location.SupportedLocationF eatures"
#define TP_TOKEN_CONNECTION_INTERFACE_LOCATION_LOCATION \ #define TP_TOKEN_CONNECTION_INTERFACE_LOCATION_LOCATION \
"org.freedesktop.Telepathy.Connection.Interface.Location/location" "org.freedesktop.Telepathy.Connection.Interface.Location/location"
#define TP_IFACE_CONNECTION_INTERFACE_SERVICE_POINT \
"org.freedesktop.Telepathy.Connection.Interface.ServicePoint"
#define TP_IFACE_QUARK_CONNECTION_INTERFACE_SERVICE_POINT \
(tp_iface_quark_connection_interface_service_point ())
GQuark tp_iface_quark_connection_interface_service_point (void);
#define TP_PROP_CONNECTION_INTERFACE_SERVICE_POINT_KNOWN_SERVICE_POINTS \
"org.freedesktop.Telepathy.Connection.Interface.ServicePoint.KnownServicePo
ints"
#define TP_IFACE_CHANNEL \ #define TP_IFACE_CHANNEL \
"org.freedesktop.Telepathy.Channel" "org.freedesktop.Telepathy.Channel"
#define TP_IFACE_QUARK_CHANNEL \ #define TP_IFACE_QUARK_CHANNEL \
(tp_iface_quark_channel ()) (tp_iface_quark_channel ())
GQuark tp_iface_quark_channel (void); GQuark tp_iface_quark_channel (void);
#define TP_PROP_CHANNEL_CHANNEL_TYPE \ #define TP_PROP_CHANNEL_CHANNEL_TYPE \
"org.freedesktop.Telepathy.Channel.ChannelType" "org.freedesktop.Telepathy.Channel.ChannelType"
skipping to change at line 355 skipping to change at line 383
#define TP_PROP_CHANNEL_TYPE_DBUS_TUBE_SERVICE_NAME \ #define TP_PROP_CHANNEL_TYPE_DBUS_TUBE_SERVICE_NAME \
"org.freedesktop.Telepathy.Channel.Type.DBusTube.ServiceName" "org.freedesktop.Telepathy.Channel.Type.DBusTube.ServiceName"
#define TP_PROP_CHANNEL_TYPE_DBUS_TUBE_DBUS_NAMES \ #define TP_PROP_CHANNEL_TYPE_DBUS_TUBE_DBUS_NAMES \
"org.freedesktop.Telepathy.Channel.Type.DBusTube.DBusNames" "org.freedesktop.Telepathy.Channel.Type.DBusTube.DBusNames"
#define TP_PROP_CHANNEL_TYPE_DBUS_TUBE_SUPPORTED_ACCESS_CONTROLS \ #define TP_PROP_CHANNEL_TYPE_DBUS_TUBE_SUPPORTED_ACCESS_CONTROLS \
"org.freedesktop.Telepathy.Channel.Type.DBusTube.SupportedAccessControls" "org.freedesktop.Telepathy.Channel.Type.DBusTube.SupportedAccessControls"
#define TP_IFACE_CHANNEL_INTERFACE_ANONYMITY \
"org.freedesktop.Telepathy.Channel.Interface.Anonymity"
#define TP_IFACE_QUARK_CHANNEL_INTERFACE_ANONYMITY \
(tp_iface_quark_channel_interface_anonymity ())
GQuark tp_iface_quark_channel_interface_anonymity (void);
#define TP_PROP_CHANNEL_INTERFACE_ANONYMITY_ANONYMITY_MODES \
"org.freedesktop.Telepathy.Channel.Interface.Anonymity.AnonymityModes"
#define TP_PROP_CHANNEL_INTERFACE_ANONYMITY_ANONYMITY_MANDATORY \
"org.freedesktop.Telepathy.Channel.Interface.Anonymity.AnonymityMandatory"
#define TP_PROP_CHANNEL_INTERFACE_ANONYMITY_ANONYMOUS_ID \
"org.freedesktop.Telepathy.Channel.Interface.Anonymity.AnonymousID"
#define TP_IFACE_CHANNEL_INTERFACE_CALL_STATE \ #define TP_IFACE_CHANNEL_INTERFACE_CALL_STATE \
"org.freedesktop.Telepathy.Channel.Interface.CallState" "org.freedesktop.Telepathy.Channel.Interface.CallState"
#define TP_IFACE_QUARK_CHANNEL_INTERFACE_CALL_STATE \ #define TP_IFACE_QUARK_CHANNEL_INTERFACE_CALL_STATE \
(tp_iface_quark_channel_interface_call_state ()) (tp_iface_quark_channel_interface_call_state ())
GQuark tp_iface_quark_channel_interface_call_state (void); GQuark tp_iface_quark_channel_interface_call_state (void);
#define TP_IFACE_CHANNEL_INTERFACE_CHAT_STATE \ #define TP_IFACE_CHANNEL_INTERFACE_CHAT_STATE \
"org.freedesktop.Telepathy.Channel.Interface.ChatState" "org.freedesktop.Telepathy.Channel.Interface.ChatState"
#define TP_IFACE_QUARK_CHANNEL_INTERFACE_CHAT_STATE \ #define TP_IFACE_QUARK_CHANNEL_INTERFACE_CHAT_STATE \
(tp_iface_quark_channel_interface_chat_state ()) (tp_iface_quark_channel_interface_chat_state ())
GQuark tp_iface_quark_channel_interface_chat_state (void); GQuark tp_iface_quark_channel_interface_chat_state (void);
#define TP_PROP_CHANNEL_INTERFACE_CHAT_STATE_CHAT_STATES \
"org.freedesktop.Telepathy.Channel.Interface.ChatState.ChatStates"
#define TP_IFACE_CHANNEL_INTERFACE_DESTROYABLE \ #define TP_IFACE_CHANNEL_INTERFACE_DESTROYABLE \
"org.freedesktop.Telepathy.Channel.Interface.Destroyable" "org.freedesktop.Telepathy.Channel.Interface.Destroyable"
#define TP_IFACE_QUARK_CHANNEL_INTERFACE_DESTROYABLE \ #define TP_IFACE_QUARK_CHANNEL_INTERFACE_DESTROYABLE \
(tp_iface_quark_channel_interface_destroyable ()) (tp_iface_quark_channel_interface_destroyable ())
GQuark tp_iface_quark_channel_interface_destroyable (void); GQuark tp_iface_quark_channel_interface_destroyable (void);
#define TP_IFACE_CHANNEL_INTERFACE_DTMF \ #define TP_IFACE_CHANNEL_INTERFACE_DTMF \
"org.freedesktop.Telepathy.Channel.Interface.DTMF" "org.freedesktop.Telepathy.Channel.Interface.DTMF"
skipping to change at line 475 skipping to change at line 523
"org.freedesktop.Telepathy.Channel.Interface.Messages.DeliveryReportingSupp ort" "org.freedesktop.Telepathy.Channel.Interface.Messages.DeliveryReportingSupp ort"
#define TP_IFACE_CHANNEL_INTERFACE_PASSWORD \ #define TP_IFACE_CHANNEL_INTERFACE_PASSWORD \
"org.freedesktop.Telepathy.Channel.Interface.Password" "org.freedesktop.Telepathy.Channel.Interface.Password"
#define TP_IFACE_QUARK_CHANNEL_INTERFACE_PASSWORD \ #define TP_IFACE_QUARK_CHANNEL_INTERFACE_PASSWORD \
(tp_iface_quark_channel_interface_password ()) (tp_iface_quark_channel_interface_password ())
GQuark tp_iface_quark_channel_interface_password (void); GQuark tp_iface_quark_channel_interface_password (void);
#define TP_IFACE_CHANNEL_INTERFACE_SERVICE_POINT \
"org.freedesktop.Telepathy.Channel.Interface.ServicePoint"
#define TP_IFACE_QUARK_CHANNEL_INTERFACE_SERVICE_POINT \
(tp_iface_quark_channel_interface_service_point ())
GQuark tp_iface_quark_channel_interface_service_point (void);
#define TP_PROP_CHANNEL_INTERFACE_SERVICE_POINT_INITIAL_SERVICE_POINT \
"org.freedesktop.Telepathy.Channel.Interface.ServicePoint.InitialServicePoi
nt"
#define TP_PROP_CHANNEL_INTERFACE_SERVICE_POINT_CURRENT_SERVICE_POINT \
"org.freedesktop.Telepathy.Channel.Interface.ServicePoint.CurrentServicePoi
nt"
#define TP_IFACE_CHANNEL_INTERFACE_TUBE \ #define TP_IFACE_CHANNEL_INTERFACE_TUBE \
"org.freedesktop.Telepathy.Channel.Interface.Tube" "org.freedesktop.Telepathy.Channel.Interface.Tube"
#define TP_IFACE_QUARK_CHANNEL_INTERFACE_TUBE \ #define TP_IFACE_QUARK_CHANNEL_INTERFACE_TUBE \
(tp_iface_quark_channel_interface_tube ()) (tp_iface_quark_channel_interface_tube ())
GQuark tp_iface_quark_channel_interface_tube (void); GQuark tp_iface_quark_channel_interface_tube (void);
#define TP_PROP_CHANNEL_INTERFACE_TUBE_PARAMETERS \ #define TP_PROP_CHANNEL_INTERFACE_TUBE_PARAMETERS \
"org.freedesktop.Telepathy.Channel.Interface.Tube.Parameters" "org.freedesktop.Telepathy.Channel.Interface.Tube.Parameters"
skipping to change at line 621 skipping to change at line 683
#define TP_PROP_ACCOUNT_CONNECTION \ #define TP_PROP_ACCOUNT_CONNECTION \
"org.freedesktop.Telepathy.Account.Connection" "org.freedesktop.Telepathy.Account.Connection"
#define TP_PROP_ACCOUNT_CONNECTION_STATUS \ #define TP_PROP_ACCOUNT_CONNECTION_STATUS \
"org.freedesktop.Telepathy.Account.ConnectionStatus" "org.freedesktop.Telepathy.Account.ConnectionStatus"
#define TP_PROP_ACCOUNT_CONNECTION_STATUS_REASON \ #define TP_PROP_ACCOUNT_CONNECTION_STATUS_REASON \
"org.freedesktop.Telepathy.Account.ConnectionStatusReason" "org.freedesktop.Telepathy.Account.ConnectionStatusReason"
#define TP_PROP_ACCOUNT_CONNECTION_ERROR \
"org.freedesktop.Telepathy.Account.ConnectionError"
#define TP_PROP_ACCOUNT_CONNECTION_ERROR_DETAILS \
"org.freedesktop.Telepathy.Account.ConnectionErrorDetails"
#define TP_PROP_ACCOUNT_CURRENT_PRESENCE \ #define TP_PROP_ACCOUNT_CURRENT_PRESENCE \
"org.freedesktop.Telepathy.Account.CurrentPresence" "org.freedesktop.Telepathy.Account.CurrentPresence"
#define TP_PROP_ACCOUNT_REQUESTED_PRESENCE \ #define TP_PROP_ACCOUNT_REQUESTED_PRESENCE \
"org.freedesktop.Telepathy.Account.RequestedPresence" "org.freedesktop.Telepathy.Account.RequestedPresence"
#define TP_PROP_ACCOUNT_CHANGING_PRESENCE \ #define TP_PROP_ACCOUNT_CHANGING_PRESENCE \
"org.freedesktop.Telepathy.Account.ChangingPresence" "org.freedesktop.Telepathy.Account.ChangingPresence"
#define TP_PROP_ACCOUNT_NORMALIZED_NAME \ #define TP_PROP_ACCOUNT_NORMALIZED_NAME \
 End of changes. 6 change blocks. 
0 lines changed or deleted 73 lines changed or added


 tp-cli-channel.h   tp-cli-channel.h 
skipping to change at line 767 skipping to change at line 767
#ifndef TP_DISABLE_DEPRECATED #ifndef TP_DISABLE_DEPRECATED
gboolean tp_cli_channel_interface_password_run_provide_password (TpChannel *proxy, gboolean tp_cli_channel_interface_password_run_provide_password (TpChannel *proxy,
gint timeout_ms, gint timeout_ms,
const gchar *in_Password, const gchar *in_Password,
gboolean *out_Correct, gboolean *out_Correct,
GError **error, GError **error,
GMainLoop **loop) _TP_GNUC_DEPRECATED; GMainLoop **loop) _TP_GNUC_DEPRECATED;
#endif /* not TP_DISABLE_DEPRECATED */ #endif /* not TP_DISABLE_DEPRECATED */
typedef void (*tp_cli_channel_interface_service_point_signal_callback_servi
ce_point_changed) (TpChannel *proxy,
const GValueArray *arg_Service_Point,
gpointer user_data, GObject *weak_object);
TpProxySignalConnection *tp_cli_channel_interface_service_point_connect_to_
service_point_changed (TpChannel *proxy,
tp_cli_channel_interface_service_point_signal_callback_service_point_ch
anged callback,
gpointer user_data,
GDestroyNotify destroy,
GObject *weak_object,
GError **error);
typedef void (*tp_cli_channel_interface_tube_signal_callback_tube_channel_s tate_changed) (TpChannel *proxy, typedef void (*tp_cli_channel_interface_tube_signal_callback_tube_channel_s tate_changed) (TpChannel *proxy,
guint arg_State, guint arg_State,
gpointer user_data, GObject *weak_object); gpointer user_data, GObject *weak_object);
TpProxySignalConnection *tp_cli_channel_interface_tube_connect_to_tube_chan nel_state_changed (TpChannel *proxy, TpProxySignalConnection *tp_cli_channel_interface_tube_connect_to_tube_chan nel_state_changed (TpChannel *proxy,
tp_cli_channel_interface_tube_signal_callback_tube_channel_state_change d callback, tp_cli_channel_interface_tube_signal_callback_tube_channel_state_change d callback,
gpointer user_data, gpointer user_data,
GDestroyNotify destroy, GDestroyNotify destroy,
GObject *weak_object, GObject *weak_object,
GError **error); GError **error);
 End of changes. 1 change blocks. 
0 lines changed or deleted 13 lines changed or added


 tp-cli-connection.h   tp-cli-connection.h 
skipping to change at line 399 skipping to change at line 399
GObject *weak_object); GObject *weak_object);
#ifndef TP_DISABLE_DEPRECATED #ifndef TP_DISABLE_DEPRECATED
gboolean tp_cli_connection_interface_aliasing_run_set_aliases (TpConnection *proxy, gboolean tp_cli_connection_interface_aliasing_run_set_aliases (TpConnection *proxy,
gint timeout_ms, gint timeout_ms,
GHashTable *in_Aliases, GHashTable *in_Aliases,
GError **error, GError **error,
GMainLoop **loop) _TP_GNUC_DEPRECATED; GMainLoop **loop) _TP_GNUC_DEPRECATED;
#endif /* not TP_DISABLE_DEPRECATED */ #endif /* not TP_DISABLE_DEPRECATED */
typedef void (*tp_cli_connection_interface_anonymity_signal_callback_anonym
ity_modes_changed) (TpConnection *proxy,
guint arg_Modes,
gpointer user_data, GObject *weak_object);
TpProxySignalConnection *tp_cli_connection_interface_anonymity_connect_to_a
nonymity_modes_changed (TpConnection *proxy,
tp_cli_connection_interface_anonymity_signal_callback_anonymity_modes_c
hanged callback,
gpointer user_data,
GDestroyNotify destroy,
GObject *weak_object,
GError **error);
typedef void (*tp_cli_connection_interface_avatars_signal_callback_avatar_u pdated) (TpConnection *proxy, typedef void (*tp_cli_connection_interface_avatars_signal_callback_avatar_u pdated) (TpConnection *proxy,
guint arg_Contact, guint arg_Contact,
const gchar *arg_New_Avatar_Token, const gchar *arg_New_Avatar_Token,
gpointer user_data, GObject *weak_object); gpointer user_data, GObject *weak_object);
TpProxySignalConnection *tp_cli_connection_interface_avatars_connect_to_ava tar_updated (TpConnection *proxy, TpProxySignalConnection *tp_cli_connection_interface_avatars_connect_to_ava tar_updated (TpConnection *proxy,
tp_cli_connection_interface_avatars_signal_callback_avatar_updated call back, tp_cli_connection_interface_avatars_signal_callback_avatar_updated call back,
gpointer user_data, gpointer user_data,
GDestroyNotify destroy, GDestroyNotify destroy,
GObject *weak_object, GObject *weak_object,
GError **error); GError **error);
skipping to change at line 1139 skipping to change at line 1149
gboolean tp_cli_connection_interface_requests_run_ensure_channel (TpConnect ion *proxy, gboolean tp_cli_connection_interface_requests_run_ensure_channel (TpConnect ion *proxy,
gint timeout_ms, gint timeout_ms,
GHashTable *in_Request, GHashTable *in_Request,
gboolean *out_Yours, gboolean *out_Yours,
gchar **out_Channel, gchar **out_Channel,
GHashTable **out_Properties, GHashTable **out_Properties,
GError **error, GError **error,
GMainLoop **loop) _TP_GNUC_DEPRECATED; GMainLoop **loop) _TP_GNUC_DEPRECATED;
#endif /* not TP_DISABLE_DEPRECATED */ #endif /* not TP_DISABLE_DEPRECATED */
typedef void (*tp_cli_connection_interface_service_point_signal_callback_se
rvice_points_changed) (TpConnection *proxy,
const GPtrArray *arg_Service_Points,
gpointer user_data, GObject *weak_object);
TpProxySignalConnection *tp_cli_connection_interface_service_point_connect_
to_service_points_changed (TpConnection *proxy,
tp_cli_connection_interface_service_point_signal_callback_service_point
s_changed callback,
gpointer user_data,
GDestroyNotify destroy,
GObject *weak_object,
GError **error);
typedef void (*tp_cli_connection_interface_simple_presence_signal_callback_ presences_changed) (TpConnection *proxy, typedef void (*tp_cli_connection_interface_simple_presence_signal_callback_ presences_changed) (TpConnection *proxy,
GHashTable *arg_Presence, GHashTable *arg_Presence,
gpointer user_data, GObject *weak_object); gpointer user_data, GObject *weak_object);
TpProxySignalConnection *tp_cli_connection_interface_simple_presence_connec t_to_presences_changed (TpConnection *proxy, TpProxySignalConnection *tp_cli_connection_interface_simple_presence_connec t_to_presences_changed (TpConnection *proxy,
tp_cli_connection_interface_simple_presence_signal_callback_presences_c hanged callback, tp_cli_connection_interface_simple_presence_signal_callback_presences_c hanged callback,
gpointer user_data, gpointer user_data,
GDestroyNotify destroy, GDestroyNotify destroy,
GObject *weak_object, GObject *weak_object,
GError **error); GError **error);
 End of changes. 2 change blocks. 
0 lines changed or deleted 26 lines changed or added


 tp-svc-channel.h   tp-svc-channel.h 
skipping to change at line 83 skipping to change at line 83
static inline void static inline void
tp_svc_channel_return_from_get_interfaces (DBusGMethodInvocation *context, tp_svc_channel_return_from_get_interfaces (DBusGMethodInvocation *context,
const gchar **out_Interfaces) const gchar **out_Interfaces)
{ {
dbus_g_method_return (context, dbus_g_method_return (context,
out_Interfaces); out_Interfaces);
} }
void tp_svc_channel_emit_closed (gpointer instance); void tp_svc_channel_emit_closed (gpointer instance);
typedef struct _TpSvcChannelInterfaceAnonymity TpSvcChannelInterfaceAnonymi
ty;
typedef struct _TpSvcChannelInterfaceAnonymityClass TpSvcChannelInterfaceAn
onymityClass;
GType tp_svc_channel_interface_anonymity_get_type (void);
#define TP_TYPE_SVC_CHANNEL_INTERFACE_ANONYMITY \
(tp_svc_channel_interface_anonymity_get_type ())
#define TP_SVC_CHANNEL_INTERFACE_ANONYMITY(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CHANNEL_INTERFACE_ANONYMIT
Y, TpSvcChannelInterfaceAnonymity))
#define TP_IS_SVC_CHANNEL_INTERFACE_ANONYMITY(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CHANNEL_INTERFACE_ANONYMIT
Y))
#define TP_SVC_CHANNEL_INTERFACE_ANONYMITY_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CHANNEL_INTERFACE_ANONY
MITY, TpSvcChannelInterfaceAnonymityClass))
typedef struct _TpSvcChannelInterfaceCallState TpSvcChannelInterfaceCallSta te; typedef struct _TpSvcChannelInterfaceCallState TpSvcChannelInterfaceCallSta te;
typedef struct _TpSvcChannelInterfaceCallStateClass TpSvcChannelInterfaceCa llStateClass; typedef struct _TpSvcChannelInterfaceCallStateClass TpSvcChannelInterfaceCa llStateClass;
GType tp_svc_channel_interface_call_state_get_type (void); GType tp_svc_channel_interface_call_state_get_type (void);
#define TP_TYPE_SVC_CHANNEL_INTERFACE_CALL_STATE \ #define TP_TYPE_SVC_CHANNEL_INTERFACE_CALL_STATE \
(tp_svc_channel_interface_call_state_get_type ()) (tp_svc_channel_interface_call_state_get_type ())
#define TP_SVC_CHANNEL_INTERFACE_CALL_STATE(obj) \ #define TP_SVC_CHANNEL_INTERFACE_CALL_STATE(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CHANNEL_INTERFACE_CALL_STA TE, TpSvcChannelInterfaceCallState)) (G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CHANNEL_INTERFACE_CALL_STA TE, TpSvcChannelInterfaceCallState))
#define TP_IS_SVC_CHANNEL_INTERFACE_CALL_STATE(obj) \ #define TP_IS_SVC_CHANNEL_INTERFACE_CALL_STATE(obj) \
skipping to change at line 627 skipping to change at line 641
gboolean out_Correct) gboolean out_Correct)
{ {
dbus_g_method_return (context, dbus_g_method_return (context,
out_Correct); out_Correct);
} }
void tp_svc_channel_interface_password_emit_password_flags_changed (gpointe r instance, void tp_svc_channel_interface_password_emit_password_flags_changed (gpointe r instance,
guint arg_Added, guint arg_Added,
guint arg_Removed); guint arg_Removed);
typedef struct _TpSvcChannelInterfaceServicePoint TpSvcChannelInterfaceServ
icePoint;
typedef struct _TpSvcChannelInterfaceServicePointClass TpSvcChannelInterfac
eServicePointClass;
GType tp_svc_channel_interface_service_point_get_type (void);
#define TP_TYPE_SVC_CHANNEL_INTERFACE_SERVICE_POINT \
(tp_svc_channel_interface_service_point_get_type ())
#define TP_SVC_CHANNEL_INTERFACE_SERVICE_POINT(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CHANNEL_INTERFACE_SERVICE_
POINT, TpSvcChannelInterfaceServicePoint))
#define TP_IS_SVC_CHANNEL_INTERFACE_SERVICE_POINT(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CHANNEL_INTERFACE_SERVICE_
POINT))
#define TP_SVC_CHANNEL_INTERFACE_SERVICE_POINT_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CHANNEL_INTERFACE_SERVI
CE_POINT, TpSvcChannelInterfaceServicePointClass))
void tp_svc_channel_interface_service_point_emit_service_point_changed (gpo
inter instance,
const GValueArray *arg_Service_Point);
typedef struct _TpSvcChannelInterfaceTube TpSvcChannelInterfaceTube; typedef struct _TpSvcChannelInterfaceTube TpSvcChannelInterfaceTube;
typedef struct _TpSvcChannelInterfaceTubeClass TpSvcChannelInterfaceTubeCla ss; typedef struct _TpSvcChannelInterfaceTubeClass TpSvcChannelInterfaceTubeCla ss;
GType tp_svc_channel_interface_tube_get_type (void); GType tp_svc_channel_interface_tube_get_type (void);
#define TP_TYPE_SVC_CHANNEL_INTERFACE_TUBE \ #define TP_TYPE_SVC_CHANNEL_INTERFACE_TUBE \
(tp_svc_channel_interface_tube_get_type ()) (tp_svc_channel_interface_tube_get_type ())
#define TP_SVC_CHANNEL_INTERFACE_TUBE(obj) \ #define TP_SVC_CHANNEL_INTERFACE_TUBE(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CHANNEL_INTERFACE_TUBE, Tp SvcChannelInterfaceTube)) (G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CHANNEL_INTERFACE_TUBE, Tp SvcChannelInterfaceTube))
#define TP_IS_SVC_CHANNEL_INTERFACE_TUBE(obj) \ #define TP_IS_SVC_CHANNEL_INTERFACE_TUBE(obj) \
 End of changes. 2 change blocks. 
0 lines changed or deleted 42 lines changed or added


 tp-svc-connection.h   tp-svc-connection.h 
skipping to change at line 293 skipping to change at line 293
void tp_svc_connection_interface_aliasing_return_from_set_aliases (DBusGMet hodInvocation *context); void tp_svc_connection_interface_aliasing_return_from_set_aliases (DBusGMet hodInvocation *context);
static inline void static inline void
tp_svc_connection_interface_aliasing_return_from_set_aliases (DBusGMethodIn vocation *context) tp_svc_connection_interface_aliasing_return_from_set_aliases (DBusGMethodIn vocation *context)
{ {
dbus_g_method_return (context); dbus_g_method_return (context);
} }
void tp_svc_connection_interface_aliasing_emit_aliases_changed (gpointer in stance, void tp_svc_connection_interface_aliasing_emit_aliases_changed (gpointer in stance,
const GPtrArray *arg_Aliases); const GPtrArray *arg_Aliases);
typedef struct _TpSvcConnectionInterfaceAnonymity TpSvcConnectionInterfaceA
nonymity;
typedef struct _TpSvcConnectionInterfaceAnonymityClass TpSvcConnectionInter
faceAnonymityClass;
GType tp_svc_connection_interface_anonymity_get_type (void);
#define TP_TYPE_SVC_CONNECTION_INTERFACE_ANONYMITY \
(tp_svc_connection_interface_anonymity_get_type ())
#define TP_SVC_CONNECTION_INTERFACE_ANONYMITY(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_ANONY
MITY, TpSvcConnectionInterfaceAnonymity))
#define TP_IS_SVC_CONNECTION_INTERFACE_ANONYMITY(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_ANONY
MITY))
#define TP_SVC_CONNECTION_INTERFACE_ANONYMITY_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_AN
ONYMITY, TpSvcConnectionInterfaceAnonymityClass))
void tp_svc_connection_interface_anonymity_emit_anonymity_modes_changed (gp
ointer instance,
guint arg_Modes);
typedef struct _TpSvcConnectionInterfaceAvatars TpSvcConnectionInterfaceAva tars; typedef struct _TpSvcConnectionInterfaceAvatars TpSvcConnectionInterfaceAva tars;
typedef struct _TpSvcConnectionInterfaceAvatarsClass TpSvcConnectionInterfa ceAvatarsClass; typedef struct _TpSvcConnectionInterfaceAvatarsClass TpSvcConnectionInterfa ceAvatarsClass;
GType tp_svc_connection_interface_avatars_get_type (void); GType tp_svc_connection_interface_avatars_get_type (void);
#define TP_TYPE_SVC_CONNECTION_INTERFACE_AVATARS \ #define TP_TYPE_SVC_CONNECTION_INTERFACE_AVATARS \
(tp_svc_connection_interface_avatars_get_type ()) (tp_svc_connection_interface_avatars_get_type ())
#define TP_SVC_CONNECTION_INTERFACE_AVATARS(obj) \ #define TP_SVC_CONNECTION_INTERFACE_AVATARS(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_AVATA RS, TpSvcConnectionInterfaceAvatars)) (G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_AVATA RS, TpSvcConnectionInterfaceAvatars))
#define TP_IS_SVC_CONNECTION_INTERFACE_AVATARS(obj) \ #define TP_IS_SVC_CONNECTION_INTERFACE_AVATARS(obj) \
skipping to change at line 909 skipping to change at line 926
out_Yours, out_Yours,
out_Channel, out_Channel,
out_Properties); out_Properties);
} }
void tp_svc_connection_interface_requests_emit_new_channels (gpointer insta nce, void tp_svc_connection_interface_requests_emit_new_channels (gpointer insta nce,
const GPtrArray *arg_Channels); const GPtrArray *arg_Channels);
void tp_svc_connection_interface_requests_emit_channel_closed (gpointer ins tance, void tp_svc_connection_interface_requests_emit_channel_closed (gpointer ins tance,
const gchar *arg_Removed); const gchar *arg_Removed);
typedef struct _TpSvcConnectionInterfaceServicePoint TpSvcConnectionInterfa
ceServicePoint;
typedef struct _TpSvcConnectionInterfaceServicePointClass TpSvcConnectionIn
terfaceServicePointClass;
GType tp_svc_connection_interface_service_point_get_type (void);
#define TP_TYPE_SVC_CONNECTION_INTERFACE_SERVICE_POINT \
(tp_svc_connection_interface_service_point_get_type ())
#define TP_SVC_CONNECTION_INTERFACE_SERVICE_POINT(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_SERVI
CE_POINT, TpSvcConnectionInterfaceServicePoint))
#define TP_IS_SVC_CONNECTION_INTERFACE_SERVICE_POINT(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_SERVI
CE_POINT))
#define TP_SVC_CONNECTION_INTERFACE_SERVICE_POINT_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_SE
RVICE_POINT, TpSvcConnectionInterfaceServicePointClass))
void tp_svc_connection_interface_service_point_emit_service_points_changed
(gpointer instance,
const GPtrArray *arg_Service_Points);
typedef struct _TpSvcConnectionInterfaceSimplePresence TpSvcConnectionInter faceSimplePresence; typedef struct _TpSvcConnectionInterfaceSimplePresence TpSvcConnectionInter faceSimplePresence;
typedef struct _TpSvcConnectionInterfaceSimplePresenceClass TpSvcConnection InterfaceSimplePresenceClass; typedef struct _TpSvcConnectionInterfaceSimplePresenceClass TpSvcConnection InterfaceSimplePresenceClass;
GType tp_svc_connection_interface_simple_presence_get_type (void); GType tp_svc_connection_interface_simple_presence_get_type (void);
#define TP_TYPE_SVC_CONNECTION_INTERFACE_SIMPLE_PRESENCE \ #define TP_TYPE_SVC_CONNECTION_INTERFACE_SIMPLE_PRESENCE \
(tp_svc_connection_interface_simple_presence_get_type ()) (tp_svc_connection_interface_simple_presence_get_type ())
#define TP_SVC_CONNECTION_INTERFACE_SIMPLE_PRESENCE(obj) \ #define TP_SVC_CONNECTION_INTERFACE_SIMPLE_PRESENCE(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_SIMPL E_PRESENCE, TpSvcConnectionInterfaceSimplePresence)) (G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_SIMPL E_PRESENCE, TpSvcConnectionInterfaceSimplePresence))
#define TP_IS_SVC_CONNECTION_INTERFACE_SIMPLE_PRESENCE(obj) \ #define TP_IS_SVC_CONNECTION_INTERFACE_SIMPLE_PRESENCE(obj) \
 End of changes. 2 change blocks. 
0 lines changed or deleted 46 lines changed or added


 util.h   util.h 
/* /*
* util.h - Headers for telepathy-glib utility functions * util.h - Headers for telepathy-glib utility functions
* *
* Copyright (C) 2006-2007 Collabora Ltd. <http://www.collabora.co.uk/> * Copyright © 2006-2010 Collabora Ltd. <http://www.collabora.co.uk/>
* Copyright (C) 2006-2007 Nokia Corporation * Copyright © 2006-2008 Nokia Corporation
* @author Robert McQueen <robert.mcqueen@collabora.co.uk>
* *
* 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
* Lesser General Public License for more details. * Lesser General Public License for more details.
skipping to change at line 110 skipping to change at line 109
...); ...);
typedef struct _TpWeakRef TpWeakRef; typedef struct _TpWeakRef TpWeakRef;
TpWeakRef *tp_weak_ref_new (gpointer object, TpWeakRef *tp_weak_ref_new (gpointer object,
gpointer user_data, gpointer user_data,
GDestroyNotify destroy) G_GNUC_WARN_UNUSED_RESULT; GDestroyNotify destroy) G_GNUC_WARN_UNUSED_RESULT;
gpointer tp_weak_ref_get_user_data (TpWeakRef *self) G_GNUC_WARN_UNUSED_RES ULT; gpointer tp_weak_ref_get_user_data (TpWeakRef *self) G_GNUC_WARN_UNUSED_RES ULT;
gpointer tp_weak_ref_dup_object (TpWeakRef *self) G_GNUC_WARN_UNUSED_RESULT ; gpointer tp_weak_ref_dup_object (TpWeakRef *self) G_GNUC_WARN_UNUSED_RESULT ;
void tp_weak_ref_destroy (TpWeakRef *self); void tp_weak_ref_destroy (TpWeakRef *self);
#define tp_clear_pointer(pp, destroy) \
G_STMT_START \
{ \
if (pp != NULL) \
{ \
gpointer _tp_clear_pointer_tmp = *(pp); \
\
*(pp) = NULL; \
\
if (_tp_clear_pointer_tmp != NULL) \
(destroy) (_tp_clear_pointer_tmp); \
} \
} \
G_STMT_END
#define tp_clear_object(op) tp_clear_pointer ((op), g_object_unref)
#define tp_clear_boxed(gtype, pp) \
G_STMT_START \
{ \
if (pp != NULL) \
{ \
gpointer _tp_clear_boxed_tmp = *(pp); \
\
*(pp) = NULL; \
\
if (_tp_clear_boxed_tmp != NULL) \
g_boxed_free (gtype, _tp_clear_boxed_tmp); \
} \
} \
G_STMT_END
G_END_DECLS G_END_DECLS
#undef __TP_IN_UTIL_H__ #undef __TP_IN_UTIL_H__
#endif /* __TP_UTIL_H__ */ #endif /* __TP_UTIL_H__ */
 End of changes. 2 change blocks. 
3 lines changed or deleted 34 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/