connection-contact-list.h   connection-contact-list.h 
skipping to change at line 34 skipping to change at line 34
#include <telepathy-glib/enums.h> #include <telepathy-glib/enums.h>
#include <telepathy-glib/connection.h> #include <telepathy-glib/connection.h>
#include <telepathy-glib/contact.h> #include <telepathy-glib/contact.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define TP_CONNECTION_FEATURE_CONTACT_LIST \ #define TP_CONNECTION_FEATURE_CONTACT_LIST \
(tp_connection_get_feature_quark_contact_list ()) (tp_connection_get_feature_quark_contact_list ())
GQuark tp_connection_get_feature_quark_contact_list (void) G_GNUC_CONST; GQuark tp_connection_get_feature_quark_contact_list (void) G_GNUC_CONST;
#define TP_CONNECTION_FEATURE_CONTACT_LIST_PROPERTIES \
(tp_connection_get_feature_quark_contact_list_properties ())
GQuark tp_connection_get_feature_quark_contact_list_properties (void) G_GNU
C_CONST;
TpContactListState tp_connection_get_contact_list_state (TpConnection *self ); TpContactListState tp_connection_get_contact_list_state (TpConnection *self );
gboolean tp_connection_get_contact_list_persists (TpConnection *self); gboolean tp_connection_get_contact_list_persists (TpConnection *self);
gboolean tp_connection_get_can_change_contact_list (TpConnection *self); gboolean tp_connection_get_can_change_contact_list (TpConnection *self);
gboolean tp_connection_get_request_uses_message (TpConnection *self); gboolean tp_connection_get_request_uses_message (TpConnection *self);
GPtrArray *tp_connection_dup_contact_list (TpConnection *self); GPtrArray *tp_connection_dup_contact_list (TpConnection *self);
void tp_connection_request_subscription_async (TpConnection *self, void tp_connection_request_subscription_async (TpConnection *self,
guint n_contacts, guint n_contacts,
TpContact * const *contacts, TpContact * const *contacts,
const gchar *message, const gchar *message,
skipping to change at line 141 skipping to change at line 145
void tp_connection_rename_group_async (TpConnection *self, void tp_connection_rename_group_async (TpConnection *self,
const gchar *old_name, const gchar *old_name,
const gchar *new_name, const gchar *new_name,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data); gpointer user_data);
gboolean tp_connection_rename_group_finish (TpConnection *self, gboolean tp_connection_rename_group_finish (TpConnection *self,
GAsyncResult *result, GAsyncResult *result,
GError **error); GError **error);
/* ContactBlocking */
void tp_connection_block_contacts_async (TpConnection *self,
guint n_contacts,
TpContact * const *contacts,
gboolean report_abusive,
GAsyncReadyCallback callback,
gpointer user_data);
gboolean tp_connection_block_contacts_finish (TpConnection *self,
GAsyncResult *result,
GError **error);
void tp_connection_unblock_contacts_async (TpConnection *self,
guint n_contacts,
TpContact * const *contacts,
GAsyncReadyCallback callback,
gpointer user_data);
gboolean tp_connection_unblock_contacts_finish (TpConnection *self,
GAsyncResult *result,
GError **error);
#define TP_CONNECTION_FEATURE_CONTACT_BLOCKING \
(tp_connection_get_feature_quark_contact_blocking ())
GQuark tp_connection_get_feature_quark_contact_blocking (void) G_GNUC_CONST
;
gboolean tp_connection_can_report_abusive (TpConnection *self);
GPtrArray * tp_connection_get_blocked_contacts (TpConnection *self);
G_END_DECLS G_END_DECLS
#endif #endif
 End of changes. 2 change blocks. 
0 lines changed or deleted 35 lines changed or added


 contact-operations.h   contact-operations.h 
skipping to change at line 79 skipping to change at line 79
GError **error); GError **error);
void tp_contact_remove_from_group_async (TpContact *self, void tp_contact_remove_from_group_async (TpContact *self,
const gchar *group, const gchar *group,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data); gpointer user_data);
gboolean tp_contact_remove_from_group_finish (TpContact *self, gboolean tp_contact_remove_from_group_finish (TpContact *self,
GAsyncResult *result, GAsyncResult *result,
GError **error); GError **error);
/* ContactBlocking */
void tp_contact_block_async (TpContact *self,
gboolean report_abusive,
GAsyncReadyCallback callback,
gpointer user_data);
gboolean tp_contact_block_finish (TpContact *self,
GAsyncResult *result,
GError **error);
void tp_contact_unblock_async (TpContact *self,
GAsyncReadyCallback callback,
gpointer user_data);
gboolean tp_contact_unblock_finish (TpContact *self,
GAsyncResult *result,
GError **error);
G_END_DECLS G_END_DECLS
#endif #endif
 End of changes. 1 change blocks. 
0 lines changed or deleted 17 lines changed or added


 contact.h   contact.h 
skipping to change at line 68 skipping to change at line 68
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,
TP_CONTACT_FEATURE_CONTACT_INFO, TP_CONTACT_FEATURE_CONTACT_INFO,
TP_CONTACT_FEATURE_CLIENT_TYPES, TP_CONTACT_FEATURE_CLIENT_TYPES,
TP_CONTACT_FEATURE_SUBSCRIPTION_STATES, TP_CONTACT_FEATURE_SUBSCRIPTION_STATES,
TP_CONTACT_FEATURE_CONTACT_GROUPS, TP_CONTACT_FEATURE_CONTACT_GROUPS,
TP_CONTACT_FEATURE_CONTACT_BLOCKING,
} TpContactFeature; } TpContactFeature;
#define NUM_TP_CONTACT_FEATURES (TP_CONTACT_FEATURE_CONTACT_GROUPS + 1) #define NUM_TP_CONTACT_FEATURES (TP_CONTACT_FEATURE_CONTACT_BLOCKING + 1)
#define TP_CONTACT_FEATURE_INVALID ((TpContactFeature) -1) #define TP_CONTACT_FEATURE_INVALID ((TpContactFeature) -1)
/* 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 167 skipping to change at line 168
void tp_connection_get_contacts_by_id (TpConnection *self, void tp_connection_get_contacts_by_id (TpConnection *self,
guint n_ids, const gchar * const *ids, guint n_ids, const gchar * const *ids,
guint n_features, const TpContactFeature *features, guint n_features, const TpContactFeature *features,
TpConnectionContactsByIdCb callback, TpConnectionContactsByIdCb callback,
gpointer user_data, GDestroyNotify destroy, GObject *weak_object); gpointer user_data, GDestroyNotify destroy, GObject *weak_object);
TpContact *tp_connection_dup_contact_if_possible (TpConnection *connection, TpContact *tp_connection_dup_contact_if_possible (TpConnection *connection,
TpHandle handle, const gchar *identifier); TpHandle handle, const gchar *identifier);
/* TP_CONTACT_FEATURE_CONTACT_BLOCKING */
gboolean tp_contact_is_blocked (TpContact *self);
G_END_DECLS G_END_DECLS
#endif #endif
 End of changes. 3 change blocks. 
1 lines changed or deleted 6 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/