base-connection-manager.h   base-connection-manager.h 
skipping to change at line 60 skipping to change at line 60
} TpCMProtocolSpec; } TpCMProtocolSpec;
typedef struct _TpBaseConnectionManager TpBaseConnectionManager; typedef struct _TpBaseConnectionManager TpBaseConnectionManager;
typedef struct _TpBaseConnectionManagerPrivate TpBaseConnectionManagerPriva te; typedef struct _TpBaseConnectionManagerPrivate TpBaseConnectionManagerPriva te;
typedef struct _TpBaseConnectionManagerClass TpBaseConnectionManagerClass; typedef struct _TpBaseConnectionManagerClass TpBaseConnectionManagerClass;
typedef struct _TpBaseConnectionManagerClassPrivate typedef struct _TpBaseConnectionManagerClassPrivate
TpBaseConnectionManagerClassPrivate; TpBaseConnectionManagerClassPrivate;
typedef TpBaseConnection *(*TpBaseConnectionManagerNewConnFunc)( typedef TpBaseConnection *(*TpBaseConnectionManagerNewConnFunc)(
TpBaseConnectionManager *self, const gchar *proto, TpBaseConnectionManager *self, const gchar *proto,
TpIntSet *params_present, void *parsed_params, GError **error); TpIntset *params_present, void *parsed_params, GError **error);
struct _TpBaseConnectionManagerClass { struct _TpBaseConnectionManagerClass {
GObjectClass parent_class; GObjectClass parent_class;
const char *cm_dbus_name; const char *cm_dbus_name;
const TpCMProtocolSpec *protocol_params; const TpCMProtocolSpec *protocol_params;
TpBaseConnectionManagerNewConnFunc new_connection; TpBaseConnectionManagerNewConnFunc new_connection;
const gchar * const *interfaces; const gchar * const *interfaces;
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 channel.h   channel.h 
skipping to change at line 108 skipping to change at line 108
gboolean tp_channel_is_ready (TpChannel *self); gboolean tp_channel_is_ready (TpChannel *self);
const gchar *tp_channel_get_channel_type (TpChannel *self); const gchar *tp_channel_get_channel_type (TpChannel *self);
GQuark tp_channel_get_channel_type_id (TpChannel *self); GQuark tp_channel_get_channel_type_id (TpChannel *self);
TpHandle tp_channel_get_handle (TpChannel *self, TpHandleType *handle_type) ; TpHandle tp_channel_get_handle (TpChannel *self, TpHandleType *handle_type) ;
const gchar *tp_channel_get_identifier (TpChannel *self); const gchar *tp_channel_get_identifier (TpChannel *self);
TpConnection *tp_channel_borrow_connection (TpChannel *self); TpConnection *tp_channel_borrow_connection (TpChannel *self);
GHashTable *tp_channel_borrow_immutable_properties (TpChannel *self); GHashTable *tp_channel_borrow_immutable_properties (TpChannel *self);
TpHandle tp_channel_group_get_self_handle (TpChannel *self); TpHandle tp_channel_group_get_self_handle (TpChannel *self);
TpChannelGroupFlags tp_channel_group_get_flags (TpChannel *self); TpChannelGroupFlags tp_channel_group_get_flags (TpChannel *self);
const TpIntSet *tp_channel_group_get_members (TpChannel *self); const TpIntset *tp_channel_group_get_members (TpChannel *self);
const TpIntSet *tp_channel_group_get_local_pending (TpChannel *self); const TpIntset *tp_channel_group_get_local_pending (TpChannel *self);
const TpIntSet *tp_channel_group_get_remote_pending (TpChannel *self); const TpIntset *tp_channel_group_get_remote_pending (TpChannel *self);
gboolean tp_channel_group_get_local_pending_info (TpChannel *self, gboolean tp_channel_group_get_local_pending_info (TpChannel *self,
TpHandle local_pending, TpHandle *actor, TpHandle local_pending, TpHandle *actor,
TpChannelGroupChangeReason *reason, const gchar **message); TpChannelGroupChangeReason *reason, const gchar **message);
TpHandle tp_channel_group_get_handle_owner (TpChannel *self, TpHandle handl e); TpHandle tp_channel_group_get_handle_owner (TpChannel *self, TpHandle handl e);
gboolean tp_channel_get_requested (TpChannel *self); gboolean tp_channel_get_requested (TpChannel *self);
TpHandle tp_channel_get_initiator_handle (TpChannel *self); TpHandle tp_channel_get_initiator_handle (TpChannel *self);
const gchar * tp_channel_get_initiator_identifier (TpChannel *self); const gchar * tp_channel_get_initiator_identifier (TpChannel *self);
 End of changes. 1 change blocks. 
3 lines changed or deleted 3 lines changed or added


 group-mixin.h   group-mixin.h 
skipping to change at line 205 skipping to change at line 205
gboolean tp_group_mixin_get_all_members (GObject *obj, gboolean tp_group_mixin_get_all_members (GObject *obj,
GArray **members, GArray **local_pending, GArray **remote_pending, GArray **members, GArray **local_pending, GArray **remote_pending,
GError **error); GError **error);
gboolean tp_group_mixin_get_handle_owners (GObject *obj, gboolean tp_group_mixin_get_handle_owners (GObject *obj,
const GArray *handles, GArray **ret, GError **error); const GArray *handles, GArray **ret, GError **error);
void tp_group_mixin_change_flags (GObject *obj, void tp_group_mixin_change_flags (GObject *obj,
TpChannelGroupFlags add, TpChannelGroupFlags del); TpChannelGroupFlags add, TpChannelGroupFlags del);
gboolean tp_group_mixin_change_members (GObject *obj, gboolean tp_group_mixin_change_members (GObject *obj,
const gchar *message, const TpIntSet *add, const TpIntSet *del, const gchar *message, const TpIntset *add, const TpIntset *del,
const TpIntSet *add_local_pending, const TpIntSet *add_remote_pending, const TpIntset *add_local_pending, const TpIntset *add_remote_pending,
TpHandle actor, TpChannelGroupChangeReason reason); TpHandle actor, TpChannelGroupChangeReason reason);
gboolean tp_group_mixin_change_members_detailed (GObject *obj, gboolean tp_group_mixin_change_members_detailed (GObject *obj,
const TpIntSet *add, const TpIntSet *del, const TpIntset *add, const TpIntset *del,
const TpIntSet *add_local_pending, const TpIntSet *add_remote_pending, const TpIntset *add_local_pending, const TpIntset *add_remote_pending,
const GHashTable *details); const GHashTable *details);
void tp_group_mixin_change_self_handle (GObject *obj, void tp_group_mixin_change_self_handle (GObject *obj,
TpHandle new_self_handle); TpHandle new_self_handle);
void tp_group_mixin_add_handle_owner (GObject *obj, void tp_group_mixin_add_handle_owner (GObject *obj,
TpHandle local_handle, TpHandle owner_handle); TpHandle local_handle, TpHandle owner_handle);
void tp_group_mixin_add_handle_owners (GObject *obj, void tp_group_mixin_add_handle_owners (GObject *obj,
GHashTable *local_to_owner_handle); GHashTable *local_to_owner_handle);
void tp_group_mixin_get_dbus_property (GObject *object, void tp_group_mixin_get_dbus_property (GObject *object,
 End of changes. 2 change blocks. 
4 lines changed or deleted 4 lines changed or added


 handle-repo.h   handle-repo.h 
skipping to change at line 121 skipping to change at line 121
typedef void (*TpHandleSetMemberFunc)(TpHandleSet *set, TpHandle handle, typedef void (*TpHandleSetMemberFunc)(TpHandleSet *set, TpHandle handle,
gpointer userdata); gpointer userdata);
TpHandleSet * tp_handle_set_new (TpHandleRepoIface *repo) TpHandleSet * tp_handle_set_new (TpHandleRepoIface *repo)
G_GNUC_WARN_UNUSED_RESULT; G_GNUC_WARN_UNUSED_RESULT;
TpHandleSet *tp_handle_set_copy (const TpHandleSet *other) TpHandleSet *tp_handle_set_copy (const TpHandleSet *other)
G_GNUC_WARN_UNUSED_RESULT; G_GNUC_WARN_UNUSED_RESULT;
void tp_handle_set_clear (TpHandleSet *set); void tp_handle_set_clear (TpHandleSet *set);
void tp_handle_set_destroy (TpHandleSet *set); void tp_handle_set_destroy (TpHandleSet *set);
TpIntSet *tp_handle_set_peek (TpHandleSet *set) G_GNUC_WARN_UNUSED_RESULT; TpIntset *tp_handle_set_peek (TpHandleSet *set) G_GNUC_WARN_UNUSED_RESULT;
void tp_handle_set_add (TpHandleSet *set, TpHandle handle); void tp_handle_set_add (TpHandleSet *set, TpHandle handle);
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, TpHandleSet *tp_handle_set_new_from_array (TpHandleRepoIface *repo,
const GArray *array) G_GNUC_WARN_UNUSED_RESULT; 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: (skip) * tp_handles_supported_and_valid: (skip)
* @repos: An array of possibly null pointers to handle repositories, index ed * @repos: An array of possibly null pointers to handle repositories, index ed
* by handle type, where a null pointer means an unsupported handle * by handle type, where a null pointer means an unsupported handle
* type * type
* @handle_type: The handle type * @handle_type: The handle type
* @handles: A GArray of guint representing handles of the given type * @handles: A GArray of guint representing handles of the given type
* @allow_zero: If %TRUE, zero is treated like a valid handle * @allow_zero: If %TRUE, zero is treated like a valid handle
 End of changes. 3 change blocks. 
4 lines changed or deleted 4 lines changed or added


 intset.h   intset.h 
skipping to change at line 33 skipping to change at line 33
#ifndef __TP_INTSET_H__ #ifndef __TP_INTSET_H__
#define __TP_INTSET_H__ #define __TP_INTSET_H__
#include <glib-object.h> #include <glib-object.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define TP_TYPE_INTSET (tp_intset_get_type ()) #define TP_TYPE_INTSET (tp_intset_get_type ())
GType tp_intset_get_type (void); GType tp_intset_get_type (void);
typedef struct _TpIntSet TpIntSet; typedef struct _TpIntset TpIntset;
/* See fdo#30134 for the reasoning behind the rename of TpIntSet to TpIntse
t */
/**
* TpIntSet: (skip)
*
* Before 0.11.16, this was the name for <type>TpIntset</type>, but it's
* now just a backwards compatibility typedef.
*/
typedef TpIntset TpIntSet;
typedef void (*TpIntFunc) (guint i, gpointer userdata); typedef void (*TpIntFunc) (guint i, gpointer userdata);
TpIntSet *tp_intset_new (void) G_GNUC_WARN_UNUSED_RESULT; TpIntset *tp_intset_new (void) G_GNUC_WARN_UNUSED_RESULT;
TpIntSet *tp_intset_sized_new (guint size) G_GNUC_WARN_UNUSED_RESULT; TpIntset *tp_intset_sized_new (guint size) G_GNUC_WARN_UNUSED_RESULT;
TpIntSet *tp_intset_new_containing (guint element) G_GNUC_WARN_UNUSED_RESUL TpIntset *tp_intset_new_containing (guint element) G_GNUC_WARN_UNUSED_RESUL
T; T;
void tp_intset_destroy (TpIntSet *set); void tp_intset_destroy (TpIntset *set);
void tp_intset_clear (TpIntSet *set); void tp_intset_clear (TpIntset *set);
void tp_intset_add (TpIntSet *set, guint element); void tp_intset_add (TpIntset *set, guint element);
gboolean tp_intset_remove (TpIntSet *set, guint element); gboolean tp_intset_remove (TpIntset *set, guint element);
gboolean tp_intset_is_member (const TpIntSet *set, guint element) gboolean tp_intset_is_member (const TpIntset *set, guint element)
G_GNUC_WARN_UNUSED_RESULT; G_GNUC_WARN_UNUSED_RESULT;
void tp_intset_foreach (const TpIntSet *set, TpIntFunc func, void tp_intset_foreach (const TpIntset *set, TpIntFunc func,
gpointer userdata); gpointer userdata);
GArray *tp_intset_to_array (const TpIntSet *set) G_GNUC_WARN_UNUSED_RESULT; GArray *tp_intset_to_array (const TpIntset *set) G_GNUC_WARN_UNUSED_RESULT;
TpIntSet *tp_intset_from_array (const GArray *array) G_GNUC_WARN_UNUSED_RES TpIntset *tp_intset_from_array (const GArray *array) G_GNUC_WARN_UNUSED_RES
ULT; ULT;
gboolean tp_intset_is_empty (const TpIntSet *set) G_GNUC_WARN_UNUSED_RESULT gboolean tp_intset_is_empty (const TpIntset *set) G_GNUC_WARN_UNUSED_RESULT
; ;
guint tp_intset_size (const TpIntSet *set) G_GNUC_WARN_UNUSED_RESULT; guint tp_intset_size (const TpIntset *set) G_GNUC_WARN_UNUSED_RESULT;
gboolean tp_intset_is_equal (const TpIntSet *left, const TpIntSet *right) gboolean tp_intset_is_equal (const TpIntset *left, const TpIntset *right)
G_GNUC_WARN_UNUSED_RESULT; G_GNUC_WARN_UNUSED_RESULT;
TpIntSet *tp_intset_copy (const TpIntSet *orig) G_GNUC_WARN_UNUSED_RESULT; TpIntset *tp_intset_copy (const TpIntset *orig) G_GNUC_WARN_UNUSED_RESULT;
TpIntSet *tp_intset_intersection (const TpIntSet *left, const TpIntSet *rig TpIntset *tp_intset_intersection (const TpIntset *left, const TpIntset *rig
ht) ht)
G_GNUC_WARN_UNUSED_RESULT; G_GNUC_WARN_UNUSED_RESULT;
TpIntSet *tp_intset_union (const TpIntSet *left, const TpIntSet *right) TpIntset *tp_intset_union (const TpIntset *left, const TpIntset *right)
G_GNUC_WARN_UNUSED_RESULT; G_GNUC_WARN_UNUSED_RESULT;
TpIntSet *tp_intset_difference (const TpIntSet *left, const TpIntSet *right ) TpIntset *tp_intset_difference (const TpIntset *left, const TpIntset *right )
G_GNUC_WARN_UNUSED_RESULT; G_GNUC_WARN_UNUSED_RESULT;
TpIntSet *tp_intset_symmetric_difference (const TpIntSet *left, TpIntset *tp_intset_symmetric_difference (const TpIntset *left,
const TpIntSet *right) G_GNUC_WARN_UNUSED_RESULT; const TpIntset *right) G_GNUC_WARN_UNUSED_RESULT;
gchar *tp_intset_dump (const TpIntSet *set) G_GNUC_WARN_UNUSED_RESULT; gchar *tp_intset_dump (const TpIntset *set) G_GNUC_WARN_UNUSED_RESULT;
typedef struct _TpIntSetIter TpIntSetIter; typedef struct {
const TpIntset *set;
struct _TpIntSetIter
{
const TpIntSet *set;
guint element; guint element;
}; } TpIntsetIter;
/**
* TpIntSetIter: (skip)
*
* Before 0.11.16, this was the name for <type>TpIntsetIter</type>, but
* it's now just a backwards compatibility typedef.
*/
typedef TpIntsetIter TpIntSetIter;
#define TP_INTSET_ITER_INIT(set) { (set), (guint)(-1) } #define TP_INTSET_ITER_INIT(set) { (set), (guint)(-1) }
#define tp_intset_iter_init(iter, set) tp_intset_iter_init_inline (iter, se t) #define tp_intset_iter_init(iter, set) tp_intset_iter_init_inline (iter, se t)
static inline void static inline void
tp_intset_iter_init_inline (TpIntSetIter *iter, const TpIntSet *set) tp_intset_iter_init_inline (TpIntsetIter *iter, const TpIntset *set)
{ {
g_return_if_fail (iter != NULL); g_return_if_fail (iter != NULL);
iter->set = set; iter->set = set;
iter->element = (guint)(-1); iter->element = (guint)(-1);
} }
#define tp_intset_iter_reset(iter) tp_intset_iter_reset_inline (iter) #define tp_intset_iter_reset(iter) tp_intset_iter_reset_inline (iter)
static inline void static inline void
tp_intset_iter_reset_inline (TpIntSetIter *iter) tp_intset_iter_reset_inline (TpIntsetIter *iter)
{ {
g_return_if_fail (iter != NULL); g_return_if_fail (iter != NULL);
g_return_if_fail (iter->set != NULL); g_return_if_fail (iter->set != NULL);
iter->element = (guint)(-1); iter->element = (guint)(-1);
} }
gboolean tp_intset_iter_next (TpIntSetIter *iter); gboolean tp_intset_iter_next (TpIntsetIter *iter);
typedef struct { typedef struct {
/*<private>*/ /*<private>*/
gpointer _dummy[16]; gpointer _dummy[16];
} TpIntSetFastIter; } TpIntsetFastIter;
/**
* TpIntSetFastIter: (skip)
*
* Before 0.11.16, this was the name for <type>TpIntsetFastIter</type>,
* but it's now just a backwards compatibility typedef.
*/
typedef TpIntsetFastIter TpIntSetFastIter;
void tp_intset_fast_iter_init (TpIntSetFastIter *iter, void tp_intset_fast_iter_init (TpIntsetFastIter *iter,
const TpIntSet *set); const TpIntset *set);
gboolean tp_intset_fast_iter_next (TpIntSetFastIter *iter, gboolean tp_intset_fast_iter_next (TpIntsetFastIter *iter,
guint *output); guint *output);
G_END_DECLS G_END_DECLS
#endif /*__TP_INTSET_H__*/ #endif /*__TP_INTSET_H__*/
 End of changes. 19 change blocks. 
40 lines changed or deleted 64 lines changed or added


 presence-mixin.h   presence-mixin.h 
skipping to change at line 144 skipping to change at line 144
* @error: Used to return a Telepathy D-Bus error if %NULL is returned * @error: Used to return a Telepathy D-Bus error if %NULL is returned
* *
* Signature of the callback used to get the stored presence status of * Signature of the callback used to get the stored presence status of
* contacts. The returned hash table should have contact handles mapped to * contacts. The returned hash table should have contact handles mapped to
* their respective presence statuses in #TpPresenceStatus structs. * their respective presence statuses in #TpPresenceStatus structs.
* *
* The returned hash table will be freed with g_hash_table_destroy. The * The returned hash table will be freed with g_hash_table_destroy. The
* callback is responsible for ensuring that this does any cleanup that * callback is responsible for ensuring that this does any cleanup that
* may be necessary. * may be necessary.
* *
* Returns: The contact presence on success, %NULL with error set on error * Returns: (transfer full): The contact presence on success, %NULL with
* error set on error
*/ */
typedef GHashTable *(*TpPresenceMixinGetContactStatusesFunc) (GObject *obj, typedef GHashTable *(*TpPresenceMixinGetContactStatusesFunc) (GObject *obj,
const GArray *contacts, GError **error); const GArray *contacts, GError **error);
/** /**
* TpPresenceMixinSetOwnStatusFunc: * TpPresenceMixinSetOwnStatusFunc:
* @obj: An object with this mixin. * @obj: An object with this mixin.
* @status: The status to set, or NULL for whatever the protocol defines as a * @status: The status to set, or NULL for whatever the protocol defines as a
* "default" status * "default" status
* @error: Used to return a Telepathy D-Bus error if %FALSE is returned * @error: Used to return a Telepathy D-Bus error if %FALSE is returned
 End of changes. 1 change blocks. 
1 lines changed or deleted 2 lines changed or added


 properties-mixin.h   properties-mixin.h 
skipping to change at line 260 skipping to change at line 260
gboolean tp_properties_context_has_other_than (TpPropertiesContext *ctx, gboolean tp_properties_context_has_other_than (TpPropertiesContext *ctx,
guint property); guint property);
const GValue *tp_properties_context_get (TpPropertiesContext *ctx, const GValue *tp_properties_context_get (TpPropertiesContext *ctx,
guint property); guint property);
guint tp_properties_context_get_value_count (TpPropertiesContext *ctx); guint tp_properties_context_get_value_count (TpPropertiesContext *ctx);
void tp_properties_context_remove (TpPropertiesContext *ctx, guint property ); void tp_properties_context_remove (TpPropertiesContext *ctx, guint property );
void tp_properties_context_return (TpPropertiesContext *ctx, GError *error) ; void tp_properties_context_return (TpPropertiesContext *ctx, GError *error) ;
gboolean tp_properties_context_return_if_done (TpPropertiesContext *ctx); gboolean tp_properties_context_return_if_done (TpPropertiesContext *ctx);
void tp_properties_mixin_change_value (GObject *obj, guint prop_id, void tp_properties_mixin_change_value (GObject *obj, guint prop_id,
const GValue *new_value, TpIntSet *props); const GValue *new_value, TpIntset *props);
void tp_properties_mixin_change_flags (GObject *obj, guint prop_id, void tp_properties_mixin_change_flags (GObject *obj, guint prop_id,
TpPropertyFlags add, TpPropertyFlags del, TpIntSet *props); TpPropertyFlags add, TpPropertyFlags del, TpIntset *props);
void tp_properties_mixin_emit_changed (GObject *obj, const TpIntSet *props) void tp_properties_mixin_emit_changed (GObject *obj, const TpIntset *props)
; ;
void tp_properties_mixin_emit_flags (GObject *obj, const TpIntSet *props); void tp_properties_mixin_emit_flags (GObject *obj, const TpIntset *props);
gboolean tp_properties_mixin_is_readable (GObject *obj, guint prop_id); gboolean tp_properties_mixin_is_readable (GObject *obj, guint prop_id);
gboolean tp_properties_mixin_is_writable (GObject *obj, guint prop_id); gboolean tp_properties_mixin_is_writable (GObject *obj, guint prop_id);
void tp_properties_mixin_iface_init (gpointer g_iface, gpointer iface_data) ; void tp_properties_mixin_iface_init (gpointer g_iface, gpointer iface_data) ;
G_END_DECLS G_END_DECLS
#endif /* #ifndef __TP_PROPERTIES_MIXIN_H__ */ #endif /* #ifndef __TP_PROPERTIES_MIXIN_H__ */
 End of changes. 2 change blocks. 
5 lines changed or deleted 5 lines changed or added


 telepathy-enums.h   telepathy-enums.h 
skipping to change at line 411 skipping to change at line 411
typedef enum { typedef enum {
TP_DEBUG_LEVEL_ERROR = 0, TP_DEBUG_LEVEL_ERROR = 0,
TP_DEBUG_LEVEL_CRITICAL = 1, TP_DEBUG_LEVEL_CRITICAL = 1,
TP_DEBUG_LEVEL_WARNING = 2, TP_DEBUG_LEVEL_WARNING = 2,
TP_DEBUG_LEVEL_MESSAGE = 3, TP_DEBUG_LEVEL_MESSAGE = 3,
TP_DEBUG_LEVEL_INFO = 4, TP_DEBUG_LEVEL_INFO = 4,
TP_DEBUG_LEVEL_DEBUG = 5, TP_DEBUG_LEVEL_DEBUG = 5,
} TpDebugLevel; } TpDebugLevel;
#define NUM_TP_DEBUG_LEVELS (5+1) #define NUM_TP_DEBUG_LEVELS (5+1)
typedef enum {
TP_TLS_CERTIFICATE_STATE_PENDING = 0,
TP_TLS_CERTIFICATE_STATE_ACCEPTED = 1,
TP_TLS_CERTIFICATE_STATE_REJECTED = 2,
} TpTLSCertificateState;
#define NUM_TP_TLS_CERTIFICATE_STATES (2+1)
typedef enum {
TP_TLS_CERTIFICATE_REJECT_REASON_UNKNOWN = 0,
TP_TLS_CERTIFICATE_REJECT_REASON_UNTRUSTED = 1,
TP_TLS_CERTIFICATE_REJECT_REASON_EXPIRED = 2,
TP_TLS_CERTIFICATE_REJECT_REASON_NOT_ACTIVATED = 3,
TP_TLS_CERTIFICATE_REJECT_REASON_FINGERPRINT_MISMATCH = 4,
TP_TLS_CERTIFICATE_REJECT_REASON_HOSTNAME_MISMATCH = 5,
TP_TLS_CERTIFICATE_REJECT_REASON_SELF_SIGNED = 6,
TP_TLS_CERTIFICATE_REJECT_REASON_REVOKED = 7,
TP_TLS_CERTIFICATE_REJECT_REASON_INSECURE = 8,
TP_TLS_CERTIFICATE_REJECT_REASON_LIMIT_EXCEEDED = 9,
} TpTLSCertificateRejectReason;
#define NUM_TP_TLS_CERTIFICATE_REJECT_REASONS (9+1)
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
 End of changes. 1 change blocks. 
0 lines changed or deleted 21 lines changed or added


 telepathy-interfaces.h   telepathy-interfaces.h 
skipping to change at line 458 skipping to change at line 458
#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_TYPE_SERVER_TLS_CONNECTION \
"org.freedesktop.Telepathy.Channel.Type.ServerTLSConnection"
#define TP_IFACE_QUARK_CHANNEL_TYPE_SERVER_TLS_CONNECTION \
(tp_iface_quark_channel_type_server_tls_connection ())
GQuark tp_iface_quark_channel_type_server_tls_connection (void);
#define TP_PROP_CHANNEL_TYPE_SERVER_TLS_CONNECTION_SERVER_CERTIFICATE \
"org.freedesktop.Telepathy.Channel.Type.ServerTLSConnection.ServerCertifica
te"
#define TP_PROP_CHANNEL_TYPE_SERVER_TLS_CONNECTION_HOSTNAME \
"org.freedesktop.Telepathy.Channel.Type.ServerTLSConnection.Hostname"
#define TP_IFACE_CHANNEL_INTERFACE_ANONYMITY \ #define TP_IFACE_CHANNEL_INTERFACE_ANONYMITY \
"org.freedesktop.Telepathy.Channel.Interface.Anonymity" "org.freedesktop.Telepathy.Channel.Interface.Anonymity"
#define TP_IFACE_QUARK_CHANNEL_INTERFACE_ANONYMITY \ #define TP_IFACE_QUARK_CHANNEL_INTERFACE_ANONYMITY \
(tp_iface_quark_channel_interface_anonymity ()) (tp_iface_quark_channel_interface_anonymity ())
GQuark tp_iface_quark_channel_interface_anonymity (void); GQuark tp_iface_quark_channel_interface_anonymity (void);
#define TP_PROP_CHANNEL_INTERFACE_ANONYMITY_ANONYMITY_MODES \ #define TP_PROP_CHANNEL_INTERFACE_ANONYMITY_ANONYMITY_MODES \
"org.freedesktop.Telepathy.Channel.Interface.Anonymity.AnonymityModes" "org.freedesktop.Telepathy.Channel.Interface.Anonymity.AnonymityModes"
skipping to change at line 494 skipping to change at line 508
"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 \ #define TP_PROP_CHANNEL_INTERFACE_CHAT_STATE_CHAT_STATES \
"org.freedesktop.Telepathy.Channel.Interface.ChatState.ChatStates" "org.freedesktop.Telepathy.Channel.Interface.ChatState.ChatStates"
#define TP_IFACE_CHANNEL_INTERFACE_CONFERENCE \
"org.freedesktop.Telepathy.Channel.Interface.Conference"
#define TP_IFACE_QUARK_CHANNEL_INTERFACE_CONFERENCE \
(tp_iface_quark_channel_interface_conference ())
GQuark tp_iface_quark_channel_interface_conference (void);
#define TP_PROP_CHANNEL_INTERFACE_CONFERENCE_CHANNELS \
"org.freedesktop.Telepathy.Channel.Interface.Conference.Channels"
#define TP_PROP_CHANNEL_INTERFACE_CONFERENCE_INITIAL_CHANNELS \
"org.freedesktop.Telepathy.Channel.Interface.Conference.InitialChannels"
#define TP_PROP_CHANNEL_INTERFACE_CONFERENCE_INITIAL_INVITEE_HANDLES \
"org.freedesktop.Telepathy.Channel.Interface.Conference.InitialInviteeHandl
es"
#define TP_PROP_CHANNEL_INTERFACE_CONFERENCE_INITIAL_INVITEE_IDS \
"org.freedesktop.Telepathy.Channel.Interface.Conference.InitialInviteeIDs"
#define TP_PROP_CHANNEL_INTERFACE_CONFERENCE_INVITATION_MESSAGE \
"org.freedesktop.Telepathy.Channel.Interface.Conference.InvitationMessage"
#define TP_PROP_CHANNEL_INTERFACE_CONFERENCE_ORIGINAL_CHANNELS \
"org.freedesktop.Telepathy.Channel.Interface.Conference.OriginalChannels"
#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 966 skipping to change at line 1006
#define TP_IFACE_DEBUG \ #define TP_IFACE_DEBUG \
"org.freedesktop.Telepathy.Debug" "org.freedesktop.Telepathy.Debug"
#define TP_IFACE_QUARK_DEBUG \ #define TP_IFACE_QUARK_DEBUG \
(tp_iface_quark_debug ()) (tp_iface_quark_debug ())
GQuark tp_iface_quark_debug (void); GQuark tp_iface_quark_debug (void);
#define TP_PROP_DEBUG_ENABLED \ #define TP_PROP_DEBUG_ENABLED \
"org.freedesktop.Telepathy.Debug.Enabled" "org.freedesktop.Telepathy.Debug.Enabled"
#define TP_IFACE_AUTHENTICATION_TLS_CERTIFICATE \
"org.freedesktop.Telepathy.Authentication.TLSCertificate"
#define TP_IFACE_QUARK_AUTHENTICATION_TLS_CERTIFICATE \
(tp_iface_quark_authentication_tls_certificate ())
GQuark tp_iface_quark_authentication_tls_certificate (void);
#define TP_PROP_AUTHENTICATION_TLS_CERTIFICATE_STATE \
"org.freedesktop.Telepathy.Authentication.TLSCertificate.State"
#define TP_PROP_AUTHENTICATION_TLS_CERTIFICATE_REJECTIONS \
"org.freedesktop.Telepathy.Authentication.TLSCertificate.Rejections"
#define TP_PROP_AUTHENTICATION_TLS_CERTIFICATE_CERTIFICATE_TYPE \
"org.freedesktop.Telepathy.Authentication.TLSCertificate.CertificateType"
#define TP_PROP_AUTHENTICATION_TLS_CERTIFICATE_CERTIFICATE_CHAIN_DATA \
"org.freedesktop.Telepathy.Authentication.TLSCertificate.CertificateChainDa
ta"
 End of changes. 3 change blocks. 
0 lines changed or deleted 42 lines changed or added


 tp-cli-channel.h   tp-cli-channel.h 
skipping to change at line 154 skipping to change at line 154
GObject *weak_object); GObject *weak_object);
#ifndef TP_DISABLE_DEPRECATED #ifndef TP_DISABLE_DEPRECATED
gboolean tp_cli_channel_interface_chat_state_run_set_chat_state (TpChannel *proxy, gboolean tp_cli_channel_interface_chat_state_run_set_chat_state (TpChannel *proxy,
gint timeout_ms, gint timeout_ms,
guint in_State, guint in_State,
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_conference_signal_callback_channel_
merged) (TpChannel *proxy,
const gchar *arg_Channel,
guint arg_Channel_Specific_Handle,
GHashTable *arg_Properties,
gpointer user_data, GObject *weak_object);
TpProxySignalConnection *tp_cli_channel_interface_conference_connect_to_cha
nnel_merged (TpChannel *proxy,
tp_cli_channel_interface_conference_signal_callback_channel_merged call
back,
gpointer user_data,
GDestroyNotify destroy,
GObject *weak_object,
GError **error);
typedef void (*tp_cli_channel_interface_conference_signal_callback_channel_
removed) (TpChannel *proxy,
const gchar *arg_Channel,
GHashTable *arg_Details,
gpointer user_data, GObject *weak_object);
TpProxySignalConnection *tp_cli_channel_interface_conference_connect_to_cha
nnel_removed (TpChannel *proxy,
tp_cli_channel_interface_conference_signal_callback_channel_removed cal
lback,
gpointer user_data,
GDestroyNotify destroy,
GObject *weak_object,
GError **error);
typedef void (*tp_cli_channel_interface_dtmf_signal_callback_sending_tones) (TpChannel *proxy, typedef void (*tp_cli_channel_interface_dtmf_signal_callback_sending_tones) (TpChannel *proxy,
const gchar *arg_Tones, const gchar *arg_Tones,
gpointer user_data, GObject *weak_object); gpointer user_data, GObject *weak_object);
TpProxySignalConnection *tp_cli_channel_interface_dtmf_connect_to_sending_t ones (TpChannel *proxy, TpProxySignalConnection *tp_cli_channel_interface_dtmf_connect_to_sending_t ones (TpChannel *proxy,
tp_cli_channel_interface_dtmf_signal_callback_sending_tones callback, tp_cli_channel_interface_dtmf_signal_callback_sending_tones 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 29 lines changed or added


 tp-svc-channel.h   tp-svc-channel.h 
skipping to change at line 161 skipping to change at line 161
static inline void static inline void
tp_svc_channel_interface_chat_state_return_from_set_chat_state (DBusGMethod Invocation *context) tp_svc_channel_interface_chat_state_return_from_set_chat_state (DBusGMethod Invocation *context)
{ {
dbus_g_method_return (context); dbus_g_method_return (context);
} }
void tp_svc_channel_interface_chat_state_emit_chat_state_changed (gpointer instance, void tp_svc_channel_interface_chat_state_emit_chat_state_changed (gpointer instance,
guint arg_Contact, guint arg_Contact,
guint arg_State); guint arg_State);
typedef struct _TpSvcChannelInterfaceConference TpSvcChannelInterfaceConfer
ence;
typedef struct _TpSvcChannelInterfaceConferenceClass TpSvcChannelInterfaceC
onferenceClass;
GType tp_svc_channel_interface_conference_get_type (void);
#define TP_TYPE_SVC_CHANNEL_INTERFACE_CONFERENCE \
(tp_svc_channel_interface_conference_get_type ())
#define TP_SVC_CHANNEL_INTERFACE_CONFERENCE(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CHANNEL_INTERFACE_CONFEREN
CE, TpSvcChannelInterfaceConference))
#define TP_IS_SVC_CHANNEL_INTERFACE_CONFERENCE(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CHANNEL_INTERFACE_CONFEREN
CE))
#define TP_SVC_CHANNEL_INTERFACE_CONFERENCE_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CHANNEL_INTERFACE_CONFE
RENCE, TpSvcChannelInterfaceConferenceClass))
void tp_svc_channel_interface_conference_emit_channel_merged (gpointer inst
ance,
const gchar *arg_Channel,
guint arg_Channel_Specific_Handle,
GHashTable *arg_Properties);
void tp_svc_channel_interface_conference_emit_channel_removed (gpointer ins
tance,
const gchar *arg_Channel,
GHashTable *arg_Details);
typedef struct _TpSvcChannelInterfaceDTMF TpSvcChannelInterfaceDTMF; typedef struct _TpSvcChannelInterfaceDTMF TpSvcChannelInterfaceDTMF;
typedef struct _TpSvcChannelInterfaceDTMFClass TpSvcChannelInterfaceDTMFCla ss; typedef struct _TpSvcChannelInterfaceDTMFClass TpSvcChannelInterfaceDTMFCla ss;
GType tp_svc_channel_interface_dtmf_get_type (void); GType tp_svc_channel_interface_dtmf_get_type (void);
#define TP_TYPE_SVC_CHANNEL_INTERFACE_DTMF \ #define TP_TYPE_SVC_CHANNEL_INTERFACE_DTMF \
(tp_svc_channel_interface_dtmf_get_type ()) (tp_svc_channel_interface_dtmf_get_type ())
#define TP_SVC_CHANNEL_INTERFACE_DTMF(obj) \ #define TP_SVC_CHANNEL_INTERFACE_DTMF(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CHANNEL_INTERFACE_DTMF, Tp SvcChannelInterfaceDTMF)) (G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CHANNEL_INTERFACE_DTMF, Tp SvcChannelInterfaceDTMF))
#define TP_IS_SVC_CHANNEL_INTERFACE_DTMF(obj) \ #define TP_IS_SVC_CHANNEL_INTERFACE_DTMF(obj) \
skipping to change at line 929 skipping to change at line 951
tp_svc_channel_type_room_list_return_from_stop_listing (DBusGMethodInvocati on *context) tp_svc_channel_type_room_list_return_from_stop_listing (DBusGMethodInvocati on *context)
{ {
dbus_g_method_return (context); dbus_g_method_return (context);
} }
void tp_svc_channel_type_room_list_emit_got_rooms (gpointer instance, void tp_svc_channel_type_room_list_emit_got_rooms (gpointer instance,
const GPtrArray *arg_Rooms); const GPtrArray *arg_Rooms);
void tp_svc_channel_type_room_list_emit_listing_rooms (gpointer instance, void tp_svc_channel_type_room_list_emit_listing_rooms (gpointer instance,
gboolean arg_Listing); gboolean arg_Listing);
typedef struct _TpSvcChannelTypeServerTLSConnection TpSvcChannelTypeServerT
LSConnection;
typedef struct _TpSvcChannelTypeServerTLSConnectionClass TpSvcChannelTypeSe
rverTLSConnectionClass;
GType tp_svc_channel_type_server_tls_connection_get_type (void);
#define TP_TYPE_SVC_CHANNEL_TYPE_SERVER_TLS_CONNECTION \
(tp_svc_channel_type_server_tls_connection_get_type ())
#define TP_SVC_CHANNEL_TYPE_SERVER_TLS_CONNECTION(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CHANNEL_TYPE_SERVER_TLS_CO
NNECTION, TpSvcChannelTypeServerTLSConnection))
#define TP_IS_SVC_CHANNEL_TYPE_SERVER_TLS_CONNECTION(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CHANNEL_TYPE_SERVER_TLS_CO
NNECTION))
#define TP_SVC_CHANNEL_TYPE_SERVER_TLS_CONNECTION_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CHANNEL_TYPE_SERVER_TLS
_CONNECTION, TpSvcChannelTypeServerTLSConnectionClass))
typedef struct _TpSvcChannelTypeStreamTube TpSvcChannelTypeStreamTube; typedef struct _TpSvcChannelTypeStreamTube TpSvcChannelTypeStreamTube;
typedef struct _TpSvcChannelTypeStreamTubeClass TpSvcChannelTypeStreamTubeC lass; typedef struct _TpSvcChannelTypeStreamTubeClass TpSvcChannelTypeStreamTubeC lass;
GType tp_svc_channel_type_stream_tube_get_type (void); GType tp_svc_channel_type_stream_tube_get_type (void);
#define TP_TYPE_SVC_CHANNEL_TYPE_STREAM_TUBE \ #define TP_TYPE_SVC_CHANNEL_TYPE_STREAM_TUBE \
(tp_svc_channel_type_stream_tube_get_type ()) (tp_svc_channel_type_stream_tube_get_type ())
#define TP_SVC_CHANNEL_TYPE_STREAM_TUBE(obj) \ #define TP_SVC_CHANNEL_TYPE_STREAM_TUBE(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CHANNEL_TYPE_STREAM_TUBE, TpSvcChannelTypeStreamTube)) (G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CHANNEL_TYPE_STREAM_TUBE, TpSvcChannelTypeStreamTube))
#define TP_IS_SVC_CHANNEL_TYPE_STREAM_TUBE(obj) \ #define TP_IS_SVC_CHANNEL_TYPE_STREAM_TUBE(obj) \
 End of changes. 2 change blocks. 
0 lines changed or deleted 48 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/