diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-07-19 15:25:56 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-07-19 15:29:30 +0100 |
| commit | 041ff9a99272697a58e7a1e5e07a29e57a4dee90 (patch) | |
| tree | a11ebc8e497073a105aeb79e2adc28d9a41761ac /telepathy-glib/base-contact-list.h | |
| parent | 701f4a7d89ecdcbaf258614ab7f3ba64aa72e0bd (diff) | |
| download | telepathy-glib-041ff9a99272697a58e7a1e5e07a29e57a4dee90.tar.gz | |
Update ContactList spec to draft 3, but for the moment keep draft 2 semantics
Diffstat (limited to 'telepathy-glib/base-contact-list.h')
| -rw-r--r-- | telepathy-glib/base-contact-list.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/telepathy-glib/base-contact-list.h b/telepathy-glib/base-contact-list.h index 02d1e043c..224aa50b0 100644 --- a/telepathy-glib/base-contact-list.h +++ b/telepathy-glib/base-contact-list.h @@ -75,7 +75,7 @@ typedef gboolean (*TpBaseContactListBooleanFunc) ( gboolean tp_base_contact_list_true_func (TpBaseContactList *self); gboolean tp_base_contact_list_false_func (TpBaseContactList *self); -gboolean tp_base_contact_list_get_subscriptions_persist ( +gboolean tp_base_contact_list_get_contact_list_persists ( TpBaseContactList *self); typedef TpHandleSet *(*TpBaseContactListGetContactsFunc) ( @@ -86,14 +86,14 @@ TpHandleSet *tp_base_contact_list_get_contacts (TpBaseContactList *self); typedef void (*TpBaseContactListGetStatesFunc) ( TpBaseContactList *self, TpHandle contact, - TpPresenceState *subscribe, - TpPresenceState *publish, + TpSubscriptionState *subscribe, + TpSubscriptionState *publish, gchar **publish_request); void tp_base_contact_list_get_states (TpBaseContactList *self, TpHandle contact, - TpPresenceState *subscribe, - TpPresenceState *publish, + TpSubscriptionState *subscribe, + TpSubscriptionState *publish, gchar **publish_request); struct _TpBaseContactListClass { @@ -101,7 +101,7 @@ struct _TpBaseContactListClass { TpBaseContactListGetContactsFunc get_contacts; TpBaseContactListGetStatesFunc get_states; - TpBaseContactListBooleanFunc get_subscriptions_persist; + TpBaseContactListBooleanFunc get_contact_list_persists; /*<private>*/ GCallback _padding[7]; @@ -166,13 +166,13 @@ struct _TpMutableContactListInterface { TpBaseContactListActOnContactsFunc store_contacts_async; TpBaseContactListAsyncFinishFunc store_contacts_finish; - TpBaseContactListBooleanFunc can_change_subscriptions; + TpBaseContactListBooleanFunc can_change_contact_list; TpBaseContactListBooleanFunc get_request_uses_message; }; GType tp_mutable_contact_list_get_type (void) G_GNUC_CONST; -gboolean tp_base_contact_list_can_change_subscriptions ( +gboolean tp_base_contact_list_can_change_contact_list ( TpBaseContactList *self); gboolean tp_base_contact_list_get_request_uses_message ( |