base-contact-list.h   base-contact-list.h 
skipping to change at line 67 skipping to change at line 67
#define TP_BASE_CONTACT_LIST_GET_CLASS(obj) \ #define TP_BASE_CONTACT_LIST_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_BASE_CONTACT_LIST, \ (G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_BASE_CONTACT_LIST, \
TpBaseContactListClass)) TpBaseContactListClass))
/* ---- Utility stuff which subclasses can use ---- */ /* ---- Utility stuff which subclasses can use ---- */
TpContactListState tp_base_contact_list_get_state (TpBaseContactList *self, TpContactListState tp_base_contact_list_get_state (TpBaseContactList *self,
GError **error); GError **error);
TpBaseConnection *tp_base_contact_list_get_connection ( TpBaseConnection *tp_base_contact_list_get_connection (
TpBaseContactList *self, GError **error); TpBaseContactList *self, GError **error);
gboolean tp_base_contact_list_get_download_at_connection (
TpBaseContactList *self);
/* ---- Called by subclasses for ContactList (or both) ---- */ /* ---- Called by subclasses for ContactList (or both) ---- */
void tp_base_contact_list_set_list_pending (TpBaseContactList *self); void tp_base_contact_list_set_list_pending (TpBaseContactList *self);
void tp_base_contact_list_set_list_failed (TpBaseContactList *self, void tp_base_contact_list_set_list_failed (TpBaseContactList *self,
GQuark domain, GQuark domain,
gint code, gint code,
const gchar *message); const gchar *message);
void tp_base_contact_list_set_list_received (TpBaseContactList *self); void tp_base_contact_list_set_list_received (TpBaseContactList *self);
skipping to change at line 115 skipping to change at line 117
TpSubscriptionState *subscribe, TpSubscriptionState *subscribe,
TpSubscriptionState *publish, TpSubscriptionState *publish,
gchar **publish_request); gchar **publish_request);
void tp_base_contact_list_dup_states (TpBaseContactList *self, void tp_base_contact_list_dup_states (TpBaseContactList *self,
TpHandle contact, TpHandle contact,
TpSubscriptionState *subscribe, TpSubscriptionState *subscribe,
TpSubscriptionState *publish, TpSubscriptionState *publish,
gchar **publish_request); gchar **publish_request);
typedef void (*TpBaseContactListAsyncFunc) (
TpBaseContactList *self,
GAsyncReadyCallback callback,
gpointer user_data);
void tp_base_contact_list_download_async (TpBaseContactList *self,
GAsyncReadyCallback callback,
gpointer user_data);
gboolean tp_base_contact_list_download_finish (TpBaseContactList *self,
GAsyncResult *result,
GError **error);
typedef gboolean (*TpBaseContactListAsyncFinishFunc) (TpBaseContactList *se
lf,
GAsyncResult *result,
GError **error);
struct _TpBaseContactListClass { struct _TpBaseContactListClass {
GObjectClass parent_class; GObjectClass parent_class;
TpBaseContactListDupContactsFunc dup_contacts; TpBaseContactListDupContactsFunc dup_contacts;
TpBaseContactListDupStatesFunc dup_states; TpBaseContactListDupStatesFunc dup_states;
TpBaseContactListBooleanFunc get_contact_list_persists; TpBaseContactListBooleanFunc get_contact_list_persists;
TpBaseContactListAsyncFunc download_async;
TpBaseContactListAsyncFinishFunc download_finish;
/*<private>*/ /*<private>*/
GCallback _padding[7]; GCallback _padding[5];
TpBaseContactListClassPrivate *priv; TpBaseContactListClassPrivate *priv;
}; };
/* ---- Implemented by subclasses for ContactList modification ---- */ /* ---- Implemented by subclasses for ContactList modification ---- */
#define TP_TYPE_MUTABLE_CONTACT_LIST \ #define TP_TYPE_MUTABLE_CONTACT_LIST \
(tp_mutable_contact_list_get_type ()) (tp_mutable_contact_list_get_type ())
#define TP_IS_MUTABLE_CONTACT_LIST(obj) \ #define TP_IS_MUTABLE_CONTACT_LIST(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), \ (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
skipping to change at line 155 skipping to change at line 177
const gchar *message, const gchar *message,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data); gpointer user_data);
typedef void (*TpBaseContactListActOnContactsFunc) ( typedef void (*TpBaseContactListActOnContactsFunc) (
TpBaseContactList *self, TpBaseContactList *self,
TpHandleSet *contacts, TpHandleSet *contacts,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data); gpointer user_data);
typedef gboolean (*TpBaseContactListAsyncFinishFunc) (TpBaseContactList *se
lf,
GAsyncResult *result,
GError **error);
struct _TpMutableContactListInterface { struct _TpMutableContactListInterface {
GTypeInterface parent; GTypeInterface parent;
/* _async mandatory-to-implement, _finish has a default implementation /* _async mandatory-to-implement, _finish has a default implementation
* suitable for a GSimpleAsyncResult */ * suitable for a GSimpleAsyncResult */
TpBaseContactListRequestSubscriptionFunc request_subscription_async; TpBaseContactListRequestSubscriptionFunc request_subscription_async;
TpBaseContactListAsyncFinishFunc request_subscription_finish; TpBaseContactListAsyncFinishFunc request_subscription_finish;
TpBaseContactListActOnContactsFunc authorize_publication_async; TpBaseContactListActOnContactsFunc authorize_publication_async;
 End of changes. 5 change blocks. 
6 lines changed or deleted 24 lines changed or added


 dbus-tube-channel.h   dbus-tube-channel.h 
skipping to change at line 53 skipping to change at line 53
TpDBusTubeChannelPrivate *priv; TpDBusTubeChannelPrivate *priv;
}; };
struct _TpDBusTubeChannelClass struct _TpDBusTubeChannelClass
{ {
/*<private>*/ /*<private>*/
TpChannelClass parent_class; TpChannelClass parent_class;
GCallback _padding[7]; GCallback _padding[7];
}; };
#define TP_DBUS_TUBE_CHANNEL_FEATURE_CORE \
tp_dbus_tube_channel_feature_quark_core ()
GQuark tp_dbus_tube_channel_feature_quark_core (void) G_GNUC_CONST;
GType tp_dbus_tube_channel_get_type (void); GType tp_dbus_tube_channel_get_type (void);
const gchar * tp_dbus_tube_channel_get_service_name (TpDBusTubeChannel *sel f); const gchar * tp_dbus_tube_channel_get_service_name (TpDBusTubeChannel *sel f);
GHashTable * tp_dbus_tube_channel_get_parameters (TpDBusTubeChannel *self); GHashTable * tp_dbus_tube_channel_get_parameters (TpDBusTubeChannel *self);
/* Outgoing tube methods */
void tp_dbus_tube_channel_offer_async (TpDBusTubeChannel *self,
GHashTable *params,
GAsyncReadyCallback callback,
gpointer user_data);
GDBusConnection * tp_dbus_tube_channel_offer_finish (TpDBusTubeChannel *sel
f,
GAsyncResult *result,
GError **error) G_GNUC_WARN_UNUSED_RESULT;
/* Incoming tube methods */
void tp_dbus_tube_channel_accept_async (TpDBusTubeChannel *self,
GAsyncReadyCallback callback,
gpointer user_data);
GDBusConnection * tp_dbus_tube_channel_accept_finish (TpDBusTubeChannel *se
lf,
GAsyncResult *result,
GError **error) G_GNUC_WARN_UNUSED_RESULT;
G_END_DECLS G_END_DECLS
#endif #endif
 End of changes. 2 change blocks. 
0 lines changed or deleted 27 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/