base-contact-list.h   base-contact-list.h 
skipping to change at line 289 skipping to change at line 289
void tp_base_contact_list_block_contacts_async (TpBaseContactList *self, void tp_base_contact_list_block_contacts_async (TpBaseContactList *self,
TpHandleSet *contacts, TpHandleSet *contacts,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data); gpointer user_data);
gboolean tp_base_contact_list_block_contacts_finish (TpBaseContactList *sel f, gboolean tp_base_contact_list_block_contacts_finish (TpBaseContactList *sel f,
GAsyncResult *result, GAsyncResult *result,
GError **error); GError **error);
void tp_base_contact_list_block_contacts_with_abuse_async (
TpBaseContactList *self,
TpHandleSet *contacts,
gboolean report_abusive,
GAsyncReadyCallback callback,
gpointer user_data);
gboolean tp_base_contact_list_block_contacts_with_abuse_finish (
TpBaseContactList *self,
GAsyncResult *result,
GError **error);
void tp_base_contact_list_unblock_contacts_async (TpBaseContactList *self, void tp_base_contact_list_unblock_contacts_async (TpBaseContactList *self,
TpHandleSet *contacts, TpHandleSet *contacts,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data); gpointer user_data);
gboolean tp_base_contact_list_unblock_contacts_finish (TpBaseContactList *s elf, gboolean tp_base_contact_list_unblock_contacts_finish (TpBaseContactList *s elf,
GAsyncResult *result, GAsyncResult *result,
GError **error); GError **error);
typedef void (*TpBaseContactListBlockContactsWithAbuseFunc) (
TpBaseContactList *self,
TpHandleSet *contacts,
gboolean report_abusive,
GAsyncReadyCallback callback,
gpointer user_data);
struct _TpBlockableContactListInterface { struct _TpBlockableContactListInterface {
GTypeInterface parent; GTypeInterface parent;
/* mandatory to implement */ /* mandatory to implement */
TpBaseContactListDupContactsFunc dup_blocked_contacts; TpBaseContactListDupContactsFunc dup_blocked_contacts;
/* _async mandatory-to-implement, _finish has a default implementation /* unblock_contacts_async is mandatory to implement; either
* block_contacts_async or block_contacts_with_abuse_async (but not bot
h!)
* must also be implemented. _finish have default implementations
* suitable for a GSimpleAsyncResult */ * suitable for a GSimpleAsyncResult */
TpBaseContactListActOnContactsFunc block_contacts_async; TpBaseContactListActOnContactsFunc block_contacts_async;
TpBaseContactListAsyncFinishFunc block_contacts_finish; TpBaseContactListAsyncFinishFunc block_contacts_finish;
TpBaseContactListActOnContactsFunc unblock_contacts_async; TpBaseContactListActOnContactsFunc unblock_contacts_async;
TpBaseContactListAsyncFinishFunc unblock_contacts_finish; TpBaseContactListAsyncFinishFunc unblock_contacts_finish;
/* optional to implement */ /* optional to implement */
TpBaseContactListBooleanFunc can_block; TpBaseContactListBooleanFunc can_block;
/* see above. block_contacts_finish is the corresponding _finish functi
on.
*/
TpBaseContactListBlockContactsWithAbuseFunc block_contacts_with_abuse_a
sync;
}; };
/* ---- Called by subclasses for ContactGroups ---- */ /* ---- Called by subclasses for ContactGroups ---- */
void tp_base_contact_list_groups_created (TpBaseContactList *self, void tp_base_contact_list_groups_created (TpBaseContactList *self,
const gchar * const *created, gssize n_created); const gchar * const *created, gssize n_created);
void tp_base_contact_list_groups_removed (TpBaseContactList *self, void tp_base_contact_list_groups_removed (TpBaseContactList *self,
const gchar * const *removed, gssize n_removed); const gchar * const *removed, gssize n_removed);
skipping to change at line 543 skipping to change at line 566
TpBaseContactListUIntFunc get_group_storage; TpBaseContactListUIntFunc get_group_storage;
}; };
/* ---- Mixin-like functionality for our parent TpBaseConnection ---- */ /* ---- Mixin-like functionality for our parent TpBaseConnection ---- */
void tp_base_contact_list_mixin_class_init (TpBaseConnectionClass *cls); void tp_base_contact_list_mixin_class_init (TpBaseConnectionClass *cls);
void tp_base_contact_list_mixin_register_with_contacts_mixin ( void tp_base_contact_list_mixin_register_with_contacts_mixin (
TpBaseConnection *conn); TpBaseConnection *conn);
void tp_base_contact_list_mixin_list_iface_init ( void tp_base_contact_list_mixin_list_iface_init (
TpSvcConnectionInterfaceContactListClass *klass); TpSvcConnectionInterfaceContactListClass *klass);
void tp_base_contact_list_mixin_groups_iface_init ( void tp_base_contact_list_mixin_groups_iface_init (
TpSvcConnectionInterfaceContactGroupsClass *klass); TpSvcConnectionInterfaceContactGroupsClass *klass);
void tp_base_contact_list_mixin_blocking_iface_init (
TpSvcConnectionInterfaceContactBlockingClass *klass);
G_END_DECLS G_END_DECLS
#endif #endif
 End of changes. 7 change blocks. 
3 lines changed or deleted 30 lines changed or added


 channel-dispatch-operation.h   channel-dispatch-operation.h 
skipping to change at line 144 skipping to change at line 144
TpChannelDispatchOperation *self, TpChannelDispatchOperation *self,
TpBaseClient *client, TpBaseClient *client,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data); gpointer user_data);
gboolean tp_channel_dispatch_operation_claim_with_finish ( gboolean tp_channel_dispatch_operation_claim_with_finish (
TpChannelDispatchOperation *self, TpChannelDispatchOperation *self,
GAsyncResult *result, GAsyncResult *result,
GError **error); GError **error);
/* Reject API */
void tp_channel_dispatch_operation_close_channels_async (
TpChannelDispatchOperation *self,
GAsyncReadyCallback callback,
gpointer user_data);
gboolean tp_channel_dispatch_operation_close_channels_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


 connection.h   connection.h 
skipping to change at line 277 skipping to change at line 277
const TpAvatarRequirements *self); const TpAvatarRequirements *self);
void tp_avatar_requirements_destroy (TpAvatarRequirements *self); void tp_avatar_requirements_destroy (TpAvatarRequirements *self);
#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;
TpAvatarRequirements * tp_connection_get_avatar_requirements ( TpAvatarRequirements * tp_connection_get_avatar_requirements (
TpConnection *self); TpConnection *self);
#define TP_CONNECTION_FEATURE_BALANCE \
(tp_connection_get_feature_quark_balance ())
GQuark tp_connection_get_feature_quark_balance (void) G_GNUC_CONST;
gboolean tp_connection_get_balance (TpConnection *self,
gint *balance, guint *scale, const gchar **currency);
const gchar * tp_connection_get_balance_uri (TpConnection *self);
G_END_DECLS G_END_DECLS
#include <telepathy-glib/_gen/tp-cli-connection.h> #include <telepathy-glib/_gen/tp-cli-connection.h>
G_BEGIN_DECLS G_BEGIN_DECLS
/* connection-handles.c again - this has to come after the auto-generated /* connection-handles.c again - this has to come after the auto-generated
* stuff because it uses an auto-generated typedef */ * stuff because it uses an auto-generated typedef */
void tp_connection_get_contact_attributes (TpConnection *self, void tp_connection_get_contact_attributes (TpConnection *self,
 End of changes. 1 change blocks. 
0 lines changed or deleted 8 lines changed or added


 handle-repo.h   handle-repo.h 
skipping to change at line 139 skipping to change at line 139
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 user_data); gpointer user_data);
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;
GHashTable *tp_handle_set_to_identifier_map (TpHandleSet *self)
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;
gchar *tp_handle_set_dump (const TpHandleSet *self) G_GNUC_WARN_UNUSED_RESU LT; gchar *tp_handle_set_dump (const TpHandleSet *self) G_GNUC_WARN_UNUSED_RESU LT;
 End of changes. 1 change blocks. 
0 lines changed or deleted 2 lines changed or added


 text-channel.h   text-channel.h 
skipping to change at line 121 skipping to change at line 121
void tp_text_channel_set_chat_state_async (TpTextChannel *self, void tp_text_channel_set_chat_state_async (TpTextChannel *self,
TpChannelChatState state, TpChannelChatState state,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data); gpointer user_data);
gboolean tp_text_channel_set_chat_state_finish (TpTextChannel *self, gboolean tp_text_channel_set_chat_state_finish (TpTextChannel *self,
GAsyncResult *result, GAsyncResult *result,
GError **error); GError **error);
#define TP_TEXT_CHANNEL_FEATURE_SMS \
tp_text_channel_get_feature_quark_sms ()
GQuark tp_text_channel_get_feature_quark_sms (void) G_GNUC_CONST;
gboolean tp_text_channel_is_sms_channel (TpTextChannel *self);
gboolean tp_text_channel_get_sms_flash (TpTextChannel *self);
void tp_text_channel_get_sms_length_async (TpTextChannel *self,
TpMessage *message,
GAsyncReadyCallback callback,
gpointer user_data);
gboolean tp_text_channel_get_sms_length_finish (TpTextChannel *self,
GAsyncResult *result,
guint *chunks_required,
gint *remaining_characters,
gint *estimated_cost,
GError **error);
G_END_DECLS G_END_DECLS
#endif #endif
 End of changes. 1 change blocks. 
0 lines changed or deleted 20 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/