base-connection.h   base-connection.h 
skipping to change at line 44 skipping to change at line 44
#include <telepathy-glib/enums.h> #include <telepathy-glib/enums.h>
#include <telepathy-glib/handle-repo.h> #include <telepathy-glib/handle-repo.h>
#include <telepathy-glib/proxy.h> #include <telepathy-glib/proxy.h>
G_BEGIN_DECLS G_BEGIN_DECLS
/* The TpBaseConnection typedef is forward-declared in handle-repo.h */ /* The TpBaseConnection typedef is forward-declared in handle-repo.h */
typedef struct _TpBaseConnectionClass TpBaseConnectionClass; typedef struct _TpBaseConnectionClass TpBaseConnectionClass;
typedef struct _TpBaseConnectionPrivate TpBaseConnectionPrivate; typedef struct _TpBaseConnectionPrivate TpBaseConnectionPrivate;
typedef struct _TpContactAttributeMap TpContactAttributeMap;
typedef void (*TpBaseConnectionProc) (TpBaseConnection *self); typedef void (*TpBaseConnectionProc) (TpBaseConnection *self);
typedef gboolean (*TpBaseConnectionStartConnectingImpl) ( typedef gboolean (*TpBaseConnectionStartConnectingImpl) (
TpBaseConnection *self, GError **error); TpBaseConnection *self, GError **error);
typedef void (*TpBaseConnectionCreateHandleReposImpl) (TpBaseConnection *se lf, typedef void (*TpBaseConnectionCreateHandleReposImpl) (TpBaseConnection *se lf,
TpHandleRepoIface *repos[TP_NUM_HANDLE_TYPES]); TpHandleRepoIface *repos[TP_NUM_HANDLE_TYPES]);
typedef GPtrArray *(*TpBaseConnectionCreateChannelManagersImpl) ( typedef GPtrArray *(*TpBaseConnectionCreateChannelManagersImpl) (
TpBaseConnection *self); TpBaseConnection *self);
skipping to change at line 96 skipping to change at line 98
TpBaseConnectionStartConnectingImpl start_connecting; TpBaseConnectionStartConnectingImpl start_connecting;
/*<private>*/ /*<private>*/
const gchar **_TP_SEAL (interfaces_always_present); const gchar **_TP_SEAL (interfaces_always_present);
/*<public>*/ /*<public>*/
TpBaseConnectionCreateChannelManagersImpl create_channel_managers; TpBaseConnectionCreateChannelManagersImpl create_channel_managers;
TpBaseConnectionGetInterfacesImpl get_interfaces_always_present; TpBaseConnectionGetInterfacesImpl get_interfaces_always_present;
void (*fill_contact_attributes) (TpBaseConnection *self,
const gchar *dbus_interface,
TpHandle contact,
TpContactAttributeMap *attributes);
/*<private>*/ /*<private>*/
gpointer _future3; GCallback _future[16];
gpointer _future4;
gpointer priv; gpointer priv;
}; };
# define TP_INTERNAL_CONNECTION_STATUS_NEW ((TpConnectionStatus)(-1)) # define TP_INTERNAL_CONNECTION_STATUS_NEW ((TpConnectionStatus)(-1))
GType tp_base_connection_get_type (void); GType tp_base_connection_get_type (void);
_TP_AVAILABLE_IN_0_20 _TP_AVAILABLE_IN_0_20
const gchar *tp_base_connection_get_bus_name (TpBaseConnection *self); const gchar *tp_base_connection_get_bus_name (TpBaseConnection *self);
skipping to change at line 158 skipping to change at line 164
TpHandle tp_base_connection_get_self_handle (TpBaseConnection *self); TpHandle tp_base_connection_get_self_handle (TpBaseConnection *self);
void tp_base_connection_set_self_handle (TpBaseConnection *self, void tp_base_connection_set_self_handle (TpBaseConnection *self,
TpHandle self_handle); TpHandle self_handle);
void tp_base_connection_finish_shutdown (TpBaseConnection *self); void tp_base_connection_finish_shutdown (TpBaseConnection *self);
void tp_base_connection_add_interfaces (TpBaseConnection *self, void tp_base_connection_add_interfaces (TpBaseConnection *self,
const gchar **interfaces); const gchar **interfaces);
void tp_base_connection_register_with_contacts_mixin (TpBaseConnection *sel
f);
typedef struct _TpChannelManagerIter TpChannelManagerIter; typedef struct _TpChannelManagerIter TpChannelManagerIter;
struct _TpChannelManagerIter { struct _TpChannelManagerIter {
/*<private>*/ /*<private>*/
TpBaseConnection *self; TpBaseConnection *self;
guint index; guint index;
gpointer _future[2]; gpointer _future[2];
}; };
void tp_base_connection_channel_manager_iter_init (TpChannelManagerIter *it er, void tp_base_connection_channel_manager_iter_init (TpChannelManagerIter *it er,
skipping to change at line 214 skipping to change at line 218
TpDBusDaemon *tp_base_connection_get_dbus_daemon (TpBaseConnection *self); TpDBusDaemon *tp_base_connection_get_dbus_daemon (TpBaseConnection *self);
void tp_base_connection_add_client_interest (TpBaseConnection *self, void tp_base_connection_add_client_interest (TpBaseConnection *self,
const gchar *unique_name, const gchar *token, const gchar *unique_name, const gchar *token,
gboolean only_if_uninterested); gboolean only_if_uninterested);
void tp_base_connection_add_possible_client_interest (TpBaseConnection *sel f, void tp_base_connection_add_possible_client_interest (TpBaseConnection *sel f,
GQuark token); GQuark token);
_TP_AVAILABLE_IN_1_0
GHashTable *tp_base_connection_dup_contact_attributes_hash (
TpBaseConnection *self,
const GArray *handles,
const gchar * const *interfaces,
const gchar * const *assumed_interfaces);
_TP_AVAILABLE_IN_1_0
void tp_contact_attribute_map_set (TpContactAttributeMap *map,
TpHandle contact,
const gchar *token,
GVariant *value);
_TP_AVAILABLE_IN_1_0
void tp_contact_attribute_map_take_sliced_gvalue (TpContactAttributeMap *ma
p,
TpHandle contact,
const gchar *token,
GValue *value);
G_END_DECLS G_END_DECLS
#endif /* #ifndef __TP_BASE_CONNECTION_H__*/ #endif /* #ifndef __TP_BASE_CONNECTION_H__*/
 End of changes. 5 change blocks. 
5 lines changed or deleted 28 lines changed or added


 base-contact-list.h   base-contact-list.h 
skipping to change at line 302 skipping to change at line 302
typedef struct _TpBlockableContactListInterface typedef struct _TpBlockableContactListInterface
TpBlockableContactListInterface; TpBlockableContactListInterface;
void tp_base_contact_list_contact_blocking_changed ( void tp_base_contact_list_contact_blocking_changed (
TpBaseContactList *self, TpBaseContactList *self,
TpHandleSet *changed); TpHandleSet *changed);
gboolean tp_base_contact_list_can_block (TpBaseContactList *self); gboolean tp_base_contact_list_can_block (TpBaseContactList *self);
_TP_AVAILABLE_IN_1_0
gboolean tp_base_contact_list_is_blocked (TpBaseContactList *self,
TpHandle contact);
TpHandleSet *tp_base_contact_list_dup_blocked_contacts ( TpHandleSet *tp_base_contact_list_dup_blocked_contacts (
TpBaseContactList *self); TpBaseContactList *self);
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,
skipping to change at line 348 skipping to change at line 351
TpHandleSet *contacts, TpHandleSet *contacts,
gboolean report_abusive, gboolean report_abusive,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data); gpointer user_data);
struct _TpBlockableContactListInterface { struct _TpBlockableContactListInterface {
GTypeInterface parent; GTypeInterface parent;
/* mandatory to implement */ /* mandatory to implement */
gboolean (*is_blocked) (TpBaseContactList *self,
TpHandle contact);
TpBaseContactListDupContactsFunc dup_blocked_contacts; TpBaseContactListDupContactsFunc dup_blocked_contacts;
/* unblock_contacts_async is mandatory to implement; either /* unblock_contacts_async is mandatory to implement; either
* block_contacts_async or block_contacts_with_abuse_async (but not bot h!) * block_contacts_async or block_contacts_with_abuse_async (but not bot h!)
* must also be implemented. _finish have default implementations * 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;
skipping to change at line 589 skipping to change at line 594
/* optional to implement */ /* optional to implement */
TpBaseContactListRenameGroupFunc rename_group_async; TpBaseContactListRenameGroupFunc rename_group_async;
TpBaseContactListAsyncFinishFunc rename_group_finish; TpBaseContactListAsyncFinishFunc rename_group_finish;
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 (
TpBaseContactList *self, TpBaseConnection *conn);
void tp_base_contact_list_mixin_list_iface_init (gpointer klass); void tp_base_contact_list_mixin_list_iface_init (gpointer klass);
void tp_base_contact_list_mixin_groups_iface_init (gpointer klass); void tp_base_contact_list_mixin_groups_iface_init (gpointer klass);
_TP_AVAILABLE_IN_0_16 _TP_AVAILABLE_IN_0_16
void tp_base_contact_list_mixin_blocking_iface_init (gpointer klass); void tp_base_contact_list_mixin_blocking_iface_init (gpointer klass);
_TP_AVAILABLE_IN_1_0
gboolean tp_base_contact_list_fill_contact_attributes (TpBaseContactList *s
elf,
const gchar *dbus_interface,
TpHandle contact,
TpContactAttributeMap *attributes);
G_END_DECLS G_END_DECLS
#endif #endif
 End of changes. 4 change blocks. 
2 lines changed or deleted 12 lines changed or added


 presence-mixin.h   presence-mixin.h 
skipping to change at line 30 skipping to change at line 30
#if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION) #if !defined (_TP_GLIB_H_INSIDE) && !defined (_TP_COMPILATION)
#error "Only <telepathy-glib/telepathy-glib.h> can be included directly." #error "Only <telepathy-glib/telepathy-glib.h> can be included directly."
#endif #endif
#ifndef __TP_PRESENCE_MIXIN_H__ #ifndef __TP_PRESENCE_MIXIN_H__
#define __TP_PRESENCE_MIXIN_H__ #define __TP_PRESENCE_MIXIN_H__
#include <telepathy-glib/enums.h> #include <telepathy-glib/enums.h>
#include <telepathy-glib/handle.h> #include <telepathy-glib/handle.h>
#include <telepathy-glib/base-connection.h>
#include "util.h" #include "util.h"
G_BEGIN_DECLS G_BEGIN_DECLS
typedef struct _TpPresenceStatusOptionalArgumentSpec typedef struct _TpPresenceStatusOptionalArgumentSpec
TpPresenceStatusOptionalArgumentSpec; TpPresenceStatusOptionalArgumentSpec;
typedef struct _TpPresenceStatusSpec TpPresenceStatusSpec; typedef struct _TpPresenceStatusSpec TpPresenceStatusSpec;
typedef struct _TpPresenceStatusSpecPrivate TpPresenceStatusSpecPrivate; typedef struct _TpPresenceStatusSpecPrivate TpPresenceStatusSpecPrivate;
struct _TpPresenceStatusOptionalArgumentSpec { struct _TpPresenceStatusOptionalArgumentSpec {
skipping to change at line 109 skipping to change at line 110
gpointer _future2; gpointer _future2;
}; };
TpPresenceStatus *tp_presence_status_new (guint which, TpPresenceStatus *tp_presence_status_new (guint which,
GHashTable *optional_arguments) G_GNUC_WARN_UNUSED_RESULT; GHashTable *optional_arguments) G_GNUC_WARN_UNUSED_RESULT;
void tp_presence_status_free (TpPresenceStatus *status); void tp_presence_status_free (TpPresenceStatus *status);
typedef gboolean (*TpPresenceMixinStatusAvailableFunc) (GObject *obj, typedef gboolean (*TpPresenceMixinStatusAvailableFunc) (GObject *obj,
guint which); guint which);
typedef GHashTable *(*TpPresenceMixinGetContactStatusesFunc) (GObject *obj, typedef TpPresenceStatus *(*TpPresenceMixinGetContactStatusFunc) (GObject *
const GArray *contacts); obj,
TpHandle contact);
typedef gboolean (*TpPresenceMixinSetOwnStatusFunc) (GObject *obj, typedef gboolean (*TpPresenceMixinSetOwnStatusFunc) (GObject *obj,
const TpPresenceStatus *status, GError **error); const TpPresenceStatus *status, GError **error);
typedef guint (*TpPresenceMixinGetMaximumStatusMessageLengthFunc) ( typedef guint (*TpPresenceMixinGetMaximumStatusMessageLengthFunc) (
GObject *obj); GObject *obj);
typedef struct _TpPresenceMixinClass TpPresenceMixinClass; typedef struct _TpPresenceMixinClass TpPresenceMixinClass;
typedef struct _TpPresenceMixinClassPrivate TpPresenceMixinClassPrivate; typedef struct _TpPresenceMixinClassPrivate TpPresenceMixinClassPrivate;
typedef struct _TpPresenceMixin TpPresenceMixin; typedef struct _TpPresenceMixin TpPresenceMixin;
typedef struct _TpPresenceMixinPrivate TpPresenceMixinPrivate; typedef struct _TpPresenceMixinPrivate TpPresenceMixinPrivate;
struct _TpPresenceMixinClass { struct _TpPresenceMixinClass {
TpPresenceMixinStatusAvailableFunc status_available; TpPresenceMixinStatusAvailableFunc status_available;
TpPresenceMixinGetContactStatusesFunc get_contact_statuses; TpPresenceMixinGetContactStatusFunc get_contact_status;
TpPresenceMixinSetOwnStatusFunc set_own_status; TpPresenceMixinSetOwnStatusFunc set_own_status;
const TpPresenceStatusSpec *statuses; const TpPresenceStatusSpec *statuses;
/*<private>*/ /*<private>*/
TpPresenceMixinClassPrivate *priv; TpPresenceMixinClassPrivate *priv;
/*<public>*/ /*<public>*/
TpPresenceMixinGetMaximumStatusMessageLengthFunc get_maximum_status_mes sage_length; TpPresenceMixinGetMaximumStatusMessageLengthFunc get_maximum_status_mes sage_length;
skipping to change at line 167 skipping to change at line 168
#define TP_PRESENCE_MIXIN_OFFSET(o) \ #define TP_PRESENCE_MIXIN_OFFSET(o) \
tp_mixin_instance_get_offset (o, TP_PRESENCE_MIXIN_OFFSET_QUARK) tp_mixin_instance_get_offset (o, TP_PRESENCE_MIXIN_OFFSET_QUARK)
#define TP_PRESENCE_MIXIN(o) \ #define TP_PRESENCE_MIXIN(o) \
((TpPresenceMixin *) tp_mixin_offset_cast (o, TP_PRESENCE_MIXIN_OFFSET (o ))) ((TpPresenceMixin *) tp_mixin_offset_cast (o, TP_PRESENCE_MIXIN_OFFSET (o )))
GQuark tp_presence_mixin_class_get_offset_quark (void); GQuark tp_presence_mixin_class_get_offset_quark (void);
GQuark tp_presence_mixin_get_offset_quark (void); GQuark tp_presence_mixin_get_offset_quark (void);
void tp_presence_mixin_class_init (GObjectClass *obj_cls, glong offset, void tp_presence_mixin_class_init (GObjectClass *obj_cls, glong offset,
TpPresenceMixinStatusAvailableFunc status_available, TpPresenceMixinStatusAvailableFunc status_available,
TpPresenceMixinGetContactStatusesFunc get_contact_statuses, TpPresenceMixinGetContactStatusFunc get_contact_status,
TpPresenceMixinSetOwnStatusFunc set_own_status, TpPresenceMixinSetOwnStatusFunc set_own_status,
const TpPresenceStatusSpec *statuses); const TpPresenceStatusSpec *statuses);
void tp_presence_mixin_init (GObject *obj, glong offset); void tp_presence_mixin_init (GObject *obj, glong offset);
void tp_presence_mixin_finalize (GObject *obj); void tp_presence_mixin_finalize (GObject *obj);
void tp_presence_mixin_emit_presence_update (GObject *obj, void tp_presence_mixin_emit_presence_update (GObject *obj,
GHashTable *contact_presences); GHashTable *contact_presences);
void tp_presence_mixin_emit_one_presence_update (GObject *obj, void tp_presence_mixin_emit_one_presence_update (GObject *obj,
TpHandle handle, const TpPresenceStatus *status); TpHandle handle, const TpPresenceStatus *status);
void tp_presence_mixin_iface_init (gpointer g_iface, gpointer iface_data); void tp_presence_mixin_iface_init (gpointer g_iface, gpointer iface_data);
void tp_presence_mixin_init_dbus_properties (GObjectClass *cls); void tp_presence_mixin_init_dbus_properties (GObjectClass *cls);
void tp_presence_mixin_register_with_contacts_mixin ( _TP_AVAILABLE_IN_1_0
GObject *obj); gboolean tp_presence_mixin_fill_contact_attributes (GObject *obj,
const gchar *dbus_interface,
TpHandle contact,
TpContactAttributeMap *attributes);
G_END_DECLS G_END_DECLS
#endif /* #ifndef __TP_PRESENCE_MIXIN_H__ */ #endif /* #ifndef __TP_PRESENCE_MIXIN_H__ */
 End of changes. 5 change blocks. 
6 lines changed or deleted 11 lines changed or added


 telepathy-glib.h   telepathy-glib.h 
skipping to change at line 77 skipping to change at line 77
#include <telepathy-glib/client.h> #include <telepathy-glib/client.h>
#include <telepathy-glib/client-message.h> #include <telepathy-glib/client-message.h>
#include <telepathy-glib/cm-message.h> #include <telepathy-glib/cm-message.h>
#include <telepathy-glib/connection-contact-list.h> #include <telepathy-glib/connection-contact-list.h>
#include <telepathy-glib/connection-manager.h> #include <telepathy-glib/connection-manager.h>
#include <telepathy-glib/connection.h> #include <telepathy-glib/connection.h>
#include <telepathy-glib/contact-operations.h> #include <telepathy-glib/contact-operations.h>
#include <telepathy-glib/contact-search-result.h> #include <telepathy-glib/contact-search-result.h>
#include <telepathy-glib/contact-search.h> #include <telepathy-glib/contact-search.h>
#include <telepathy-glib/contact.h> #include <telepathy-glib/contact.h>
#include <telepathy-glib/contacts-mixin.h>
#include <telepathy-glib/dbus.h> #include <telepathy-glib/dbus.h>
#include <telepathy-glib/dbus-properties-mixin.h> #include <telepathy-glib/dbus-properties-mixin.h>
#include <telepathy-glib/dbus-tube-channel.h> #include <telepathy-glib/dbus-tube-channel.h>
#include <telepathy-glib/debug-client.h> #include <telepathy-glib/debug-client.h>
#include <telepathy-glib/debug-message.h> #include <telepathy-glib/debug-message.h>
#include <telepathy-glib/debug-sender.h> #include <telepathy-glib/debug-sender.h>
#include <telepathy-glib/debug.h> #include <telepathy-glib/debug.h>
#include <telepathy-glib/dtmf.h> #include <telepathy-glib/dtmf.h>
#include <telepathy-glib/exportable-channel.h> #include <telepathy-glib/exportable-channel.h>
#include <telepathy-glib/file-transfer-channel.h> #include <telepathy-glib/file-transfer-channel.h>
 End of changes. 1 change blocks. 
1 lines changed or deleted 0 lines changed or added


 telepathy-interfaces.h   telepathy-interfaces.h 
skipping to change at line 133 skipping to change at line 133
#define TP_PROP_CONNECTION_SELF_ID \ #define TP_PROP_CONNECTION_SELF_ID \
"im.telepathy.v1.Connection.SelfID" "im.telepathy.v1.Connection.SelfID"
#define TP_PROP_CONNECTION_STATUS \ #define TP_PROP_CONNECTION_STATUS \
"im.telepathy.v1.Connection.Status" "im.telepathy.v1.Connection.Status"
#define TP_TOKEN_CONNECTION_CONTACT_ID \ #define TP_TOKEN_CONNECTION_CONTACT_ID \
"im.telepathy.v1.Connection/contact-id" "im.telepathy.v1.Connection/contact-id"
#define TP_IFACE_CONNECTION_INTERFACE_CONTACTS \
"im.telepathy.v1.Connection.Interface.Contacts"
#define TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACTS \
(tp_iface_quark_connection_interface_contacts ())
GQuark tp_iface_quark_connection_interface_contacts (void);
#define TP_IFACE_CONNECTION_INTERFACE_REQUESTS \ #define TP_IFACE_CONNECTION_INTERFACE_REQUESTS \
"im.telepathy.v1.Connection.Interface.Requests" "im.telepathy.v1.Connection.Interface.Requests"
#define TP_IFACE_QUARK_CONNECTION_INTERFACE_REQUESTS \ #define TP_IFACE_QUARK_CONNECTION_INTERFACE_REQUESTS \
(tp_iface_quark_connection_interface_requests ()) (tp_iface_quark_connection_interface_requests ())
GQuark tp_iface_quark_connection_interface_requests (void); GQuark tp_iface_quark_connection_interface_requests (void);
#define TP_PROP_CONNECTION_INTERFACE_REQUESTS_CHANNELS \ #define TP_PROP_CONNECTION_INTERFACE_REQUESTS_CHANNELS \
"im.telepathy.v1.Connection.Interface.Requests.Channels" "im.telepathy.v1.Connection.Interface.Requests.Channels"
 End of changes. 1 change blocks. 
8 lines changed or deleted 0 lines changed or added


 tp-cli-connection.h   tp-cli-connection.h 
skipping to change at line 198 skipping to change at line 198
GObject *weak_object) GObject *weak_object)
{ {
g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL); g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
return tp_cli_connection_call_remove_client_interest (proxy, timeout_ms, return tp_cli_connection_call_remove_client_interest (proxy, timeout_ms,
in_Tokens, in_Tokens,
callback, user_data, destroy, weak_object); callback, user_data, destroy, weak_object);
} }
#define tp_cli_connection_call_remove_client_interest(...) _tp_cli_connecti on_call_remove_client_interest (__VA_ARGS__) #define tp_cli_connection_call_remove_client_interest(...) _tp_cli_connecti on_call_remove_client_interest (__VA_ARGS__)
#endif /* __GTK_DOC_IGNORE__ */ #endif /* __GTK_DOC_IGNORE__ */
typedef void (*tp_cli_connection_callback_for_get_contact_attributes) (TpCo
nnection *proxy,
GHashTable *out_Attributes,
const GError *error, gpointer user_data,
GObject *weak_object);
TpProxyPendingCall *tp_cli_connection_call_get_contact_attributes (TpConnec
tion *proxy,
gint timeout_ms,
const GArray *in_Handles,
const gchar **in_Interfaces,
tp_cli_connection_callback_for_get_contact_attributes callback,
gpointer user_data,
GDestroyNotify destroy,
GObject *weak_object);
#ifndef __GTK_DOC_IGNORE__
static inline TpProxyPendingCall *
_tp_cli_connection_call_get_contact_attributes (TpConnection *proxy,
gint timeout_ms,
const GArray *in_Handles,
const gchar **in_Interfaces,
tp_cli_connection_callback_for_get_contact_attributes callback,
gpointer user_data,
GDestroyNotify destroy,
GObject *weak_object)
{
g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
return tp_cli_connection_call_get_contact_attributes (proxy, timeout_ms,
in_Handles,
in_Interfaces,
callback, user_data, destroy, weak_object);
}
#define tp_cli_connection_call_get_contact_attributes(...) _tp_cli_connecti
on_call_get_contact_attributes (__VA_ARGS__)
#endif /* __GTK_DOC_IGNORE__ */
typedef void (*tp_cli_connection_callback_for_get_contact_by_id) (TpConnect
ion *proxy,
guint out_Handle,
GHashTable *out_Attributes,
const GError *error, gpointer user_data,
GObject *weak_object);
TpProxyPendingCall *tp_cli_connection_call_get_contact_by_id (TpConnection
*proxy,
gint timeout_ms,
const gchar *in_Identifier,
const gchar **in_Interfaces,
tp_cli_connection_callback_for_get_contact_by_id callback,
gpointer user_data,
GDestroyNotify destroy,
GObject *weak_object);
#ifndef __GTK_DOC_IGNORE__
static inline TpProxyPendingCall *
_tp_cli_connection_call_get_contact_by_id (TpConnection *proxy,
gint timeout_ms,
const gchar *in_Identifier,
const gchar **in_Interfaces,
tp_cli_connection_callback_for_get_contact_by_id callback,
gpointer user_data,
GDestroyNotify destroy,
GObject *weak_object)
{
g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
return tp_cli_connection_call_get_contact_by_id (proxy, timeout_ms,
in_Identifier,
in_Interfaces,
callback, user_data, destroy, weak_object);
}
#define tp_cli_connection_call_get_contact_by_id(...) _tp_cli_connection_ca
ll_get_contact_by_id (__VA_ARGS__)
#endif /* __GTK_DOC_IGNORE__ */
typedef void (*tp_cli_connection_interface_addressing1_callback_for_get_con tacts_by_vcard_field) (TpConnection *proxy, typedef void (*tp_cli_connection_interface_addressing1_callback_for_get_con tacts_by_vcard_field) (TpConnection *proxy,
GHashTable *out_Requested, GHashTable *out_Requested,
GHashTable *out_Attributes, GHashTable *out_Attributes,
const GError *error, gpointer user_data, const GError *error, gpointer user_data,
GObject *weak_object); GObject *weak_object);
TpProxyPendingCall *tp_cli_connection_interface_addressing1_call_get_contac ts_by_vcard_field (TpConnection *proxy, TpProxyPendingCall *tp_cli_connection_interface_addressing1_call_get_contac ts_by_vcard_field (TpConnection *proxy,
gint timeout_ms, gint timeout_ms,
const gchar *in_Field, const gchar *in_Field,
const gchar **in_Addresses, const gchar **in_Addresses,
skipping to change at line 1515 skipping to change at line 1584
GDestroyNotify destroy, GDestroyNotify destroy,
GObject *weak_object) GObject *weak_object)
{ {
g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL); g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
return tp_cli_connection_interface_contact_list1_call_download (proxy, ti meout_ms, return tp_cli_connection_interface_contact_list1_call_download (proxy, ti meout_ms,
callback, user_data, destroy, weak_object); callback, user_data, destroy, weak_object);
} }
#define tp_cli_connection_interface_contact_list1_call_download(...) _tp_cl i_connection_interface_contact_list1_call_download (__VA_ARGS__) #define tp_cli_connection_interface_contact_list1_call_download(...) _tp_cl i_connection_interface_contact_list1_call_download (__VA_ARGS__)
#endif /* __GTK_DOC_IGNORE__ */ #endif /* __GTK_DOC_IGNORE__ */
typedef void (*tp_cli_connection_interface_contacts_callback_for_get_contac
t_attributes) (TpConnection *proxy,
GHashTable *out_Attributes,
const GError *error, gpointer user_data,
GObject *weak_object);
TpProxyPendingCall *tp_cli_connection_interface_contacts_call_get_contact_a
ttributes (TpConnection *proxy,
gint timeout_ms,
const GArray *in_Handles,
const gchar **in_Interfaces,
tp_cli_connection_interface_contacts_callback_for_get_contact_attribute
s callback,
gpointer user_data,
GDestroyNotify destroy,
GObject *weak_object);
#ifndef __GTK_DOC_IGNORE__
static inline TpProxyPendingCall *
_tp_cli_connection_interface_contacts_call_get_contact_attributes (TpConnec
tion *proxy,
gint timeout_ms,
const GArray *in_Handles,
const gchar **in_Interfaces,
tp_cli_connection_interface_contacts_callback_for_get_contact_attribute
s callback,
gpointer user_data,
GDestroyNotify destroy,
GObject *weak_object)
{
g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
return tp_cli_connection_interface_contacts_call_get_contact_attributes (
proxy, timeout_ms,
in_Handles,
in_Interfaces,
callback, user_data, destroy, weak_object);
}
#define tp_cli_connection_interface_contacts_call_get_contact_attributes(..
.) _tp_cli_connection_interface_contacts_call_get_contact_attributes (__VA_
ARGS__)
#endif /* __GTK_DOC_IGNORE__ */
typedef void (*tp_cli_connection_interface_contacts_callback_for_get_contac
t_by_id) (TpConnection *proxy,
guint out_Handle,
GHashTable *out_Attributes,
const GError *error, gpointer user_data,
GObject *weak_object);
TpProxyPendingCall *tp_cli_connection_interface_contacts_call_get_contact_b
y_id (TpConnection *proxy,
gint timeout_ms,
const gchar *in_Identifier,
const gchar **in_Interfaces,
tp_cli_connection_interface_contacts_callback_for_get_contact_by_id cal
lback,
gpointer user_data,
GDestroyNotify destroy,
GObject *weak_object);
#ifndef __GTK_DOC_IGNORE__
static inline TpProxyPendingCall *
_tp_cli_connection_interface_contacts_call_get_contact_by_id (TpConnection
*proxy,
gint timeout_ms,
const gchar *in_Identifier,
const gchar **in_Interfaces,
tp_cli_connection_interface_contacts_callback_for_get_contact_by_id cal
lback,
gpointer user_data,
GDestroyNotify destroy,
GObject *weak_object)
{
g_return_val_if_fail (TP_IS_CONNECTION (proxy), NULL);
return tp_cli_connection_interface_contacts_call_get_contact_by_id (proxy
, timeout_ms,
in_Identifier,
in_Interfaces,
callback, user_data, destroy, weak_object);
}
#define tp_cli_connection_interface_contacts_call_get_contact_by_id(...) _t
p_cli_connection_interface_contacts_call_get_contact_by_id (__VA_ARGS__)
#endif /* __GTK_DOC_IGNORE__ */
typedef void (*tp_cli_connection_interface_irc_command1_callback_for_send) (TpConnection *proxy, typedef void (*tp_cli_connection_interface_irc_command1_callback_for_send) (TpConnection *proxy,
const GError *error, gpointer user_data, const GError *error, gpointer user_data,
GObject *weak_object); GObject *weak_object);
TpProxyPendingCall *tp_cli_connection_interface_irc_command1_call_send (TpC onnection *proxy, TpProxyPendingCall *tp_cli_connection_interface_irc_command1_call_send (TpC onnection *proxy,
gint timeout_ms, gint timeout_ms,
const gchar *in_Command, const gchar *in_Command,
tp_cli_connection_interface_irc_command1_callback_for_send callback, tp_cli_connection_interface_irc_command1_callback_for_send callback,
gpointer user_data, gpointer user_data,
GDestroyNotify destroy, GDestroyNotify destroy,
 End of changes. 2 change blocks. 
84 lines changed or deleted 75 lines changed or added


 tp-svc-connection.h   tp-svc-connection.h 
skipping to change at line 70 skipping to change at line 70
void tp_svc_connection_implement_remove_client_interest (TpSvcConnectionCla ss *klass, tp_svc_connection_remove_client_interest_impl impl); void tp_svc_connection_implement_remove_client_interest (TpSvcConnectionCla ss *klass, tp_svc_connection_remove_client_interest_impl impl);
static inline static inline
/* this comment is to stop gtkdoc realising this is static */ /* this comment is to stop gtkdoc realising this is static */
void tp_svc_connection_return_from_remove_client_interest (DBusGMethodInvoc ation *context); void tp_svc_connection_return_from_remove_client_interest (DBusGMethodInvoc ation *context);
static inline void static inline void
tp_svc_connection_return_from_remove_client_interest (DBusGMethodInvocation *context) tp_svc_connection_return_from_remove_client_interest (DBusGMethodInvocation *context)
{ {
dbus_g_method_return (context); dbus_g_method_return (context);
} }
typedef void (*tp_svc_connection_get_contact_attributes_impl) (TpSvcConnect
ion *self,
const GArray *in_Handles,
const gchar **in_Interfaces,
DBusGMethodInvocation *context);
void tp_svc_connection_implement_get_contact_attributes (TpSvcConnectionCla
ss *klass, tp_svc_connection_get_contact_attributes_impl impl);
static inline
/* this comment is to stop gtkdoc realising this is static */
void tp_svc_connection_return_from_get_contact_attributes (DBusGMethodInvoc
ation *context,
GHashTable *out_Attributes);
static inline void
tp_svc_connection_return_from_get_contact_attributes (DBusGMethodInvocation
*context,
GHashTable *out_Attributes)
{
dbus_g_method_return (context,
out_Attributes);
}
typedef void (*tp_svc_connection_get_contact_by_id_impl) (TpSvcConnection *
self,
const gchar *in_Identifier,
const gchar **in_Interfaces,
DBusGMethodInvocation *context);
void tp_svc_connection_implement_get_contact_by_id (TpSvcConnectionClass *k
lass, tp_svc_connection_get_contact_by_id_impl impl);
static inline
/* this comment is to stop gtkdoc realising this is static */
void tp_svc_connection_return_from_get_contact_by_id (DBusGMethodInvocation
*context,
guint out_Handle,
GHashTable *out_Attributes);
static inline void
tp_svc_connection_return_from_get_contact_by_id (DBusGMethodInvocation *con
text,
guint out_Handle,
GHashTable *out_Attributes)
{
dbus_g_method_return (context,
out_Handle,
out_Attributes);
}
void tp_svc_connection_emit_self_contact_changed (gpointer instance, void tp_svc_connection_emit_self_contact_changed (gpointer instance,
guint arg_Self_Handle, guint arg_Self_Handle,
const gchar *arg_Self_ID); const gchar *arg_Self_ID);
void tp_svc_connection_emit_connection_error (gpointer instance, void tp_svc_connection_emit_connection_error (gpointer instance,
const gchar *arg_Error, const gchar *arg_Error,
GHashTable *arg_Details); GHashTable *arg_Details);
void tp_svc_connection_emit_status_changed (gpointer instance, void tp_svc_connection_emit_status_changed (gpointer instance,
guint arg_Status, guint arg_Status,
guint arg_Reason); guint arg_Reason);
skipping to change at line 721 skipping to change at line 758
dbus_g_method_return (context); dbus_g_method_return (context);
} }
void tp_svc_connection_interface_contact_list1_emit_contact_list_state_chan ged (gpointer instance, void tp_svc_connection_interface_contact_list1_emit_contact_list_state_chan ged (gpointer instance,
guint arg_Contact_List_State); guint arg_Contact_List_State);
void tp_svc_connection_interface_contact_list1_emit_contacts_changed (gpoin ter instance, void tp_svc_connection_interface_contact_list1_emit_contacts_changed (gpoin ter instance,
GHashTable *arg_Changes, GHashTable *arg_Changes,
GHashTable *arg_Identifiers, GHashTable *arg_Identifiers,
GHashTable *arg_Removals); GHashTable *arg_Removals);
typedef struct _TpSvcConnectionInterfaceContacts TpSvcConnectionInterfaceCo
ntacts;
typedef struct _TpSvcConnectionInterfaceContactsClass TpSvcConnectionInterf
aceContactsClass;
GType tp_svc_connection_interface_contacts_get_type (void);
#define TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACTS \
(tp_svc_connection_interface_contacts_get_type ())
#define TP_SVC_CONNECTION_INTERFACE_CONTACTS(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_CONTA
CTS, TpSvcConnectionInterfaceContacts))
#define TP_IS_SVC_CONNECTION_INTERFACE_CONTACTS(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_CONTA
CTS))
#define TP_SVC_CONNECTION_INTERFACE_CONTACTS_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_CO
NTACTS, TpSvcConnectionInterfaceContactsClass))
typedef void (*tp_svc_connection_interface_contacts_get_contact_attributes_
impl) (TpSvcConnectionInterfaceContacts *self,
const GArray *in_Handles,
const gchar **in_Interfaces,
DBusGMethodInvocation *context);
void tp_svc_connection_interface_contacts_implement_get_contact_attributes
(TpSvcConnectionInterfaceContactsClass *klass, tp_svc_connection_interface_
contacts_get_contact_attributes_impl impl);
static inline
/* this comment is to stop gtkdoc realising this is static */
void tp_svc_connection_interface_contacts_return_from_get_contact_attribute
s (DBusGMethodInvocation *context,
GHashTable *out_Attributes);
static inline void
tp_svc_connection_interface_contacts_return_from_get_contact_attributes (DB
usGMethodInvocation *context,
GHashTable *out_Attributes)
{
dbus_g_method_return (context,
out_Attributes);
}
typedef void (*tp_svc_connection_interface_contacts_get_contact_by_id_impl)
(TpSvcConnectionInterfaceContacts *self,
const gchar *in_Identifier,
const gchar **in_Interfaces,
DBusGMethodInvocation *context);
void tp_svc_connection_interface_contacts_implement_get_contact_by_id (TpSv
cConnectionInterfaceContactsClass *klass, tp_svc_connection_interface_conta
cts_get_contact_by_id_impl impl);
static inline
/* this comment is to stop gtkdoc realising this is static */
void tp_svc_connection_interface_contacts_return_from_get_contact_by_id (DB
usGMethodInvocation *context,
guint out_Handle,
GHashTable *out_Attributes);
static inline void
tp_svc_connection_interface_contacts_return_from_get_contact_by_id (DBusGMe
thodInvocation *context,
guint out_Handle,
GHashTable *out_Attributes)
{
dbus_g_method_return (context,
out_Handle,
out_Attributes);
}
typedef struct _TpSvcConnectionInterfaceIRCCommand1 TpSvcConnectionInterfac eIRCCommand1; typedef struct _TpSvcConnectionInterfaceIRCCommand1 TpSvcConnectionInterfac eIRCCommand1;
typedef struct _TpSvcConnectionInterfaceIRCCommand1Class TpSvcConnectionInt erfaceIRCCommand1Class; typedef struct _TpSvcConnectionInterfaceIRCCommand1Class TpSvcConnectionInt erfaceIRCCommand1Class;
GType tp_svc_connection_interface_irc_command1_get_type (void); GType tp_svc_connection_interface_irc_command1_get_type (void);
#define TP_TYPE_SVC_CONNECTION_INTERFACE_IRC_COMMAND1 \ #define TP_TYPE_SVC_CONNECTION_INTERFACE_IRC_COMMAND1 \
(tp_svc_connection_interface_irc_command1_get_type ()) (tp_svc_connection_interface_irc_command1_get_type ())
#define TP_SVC_CONNECTION_INTERFACE_IRC_COMMAND1(obj) \ #define TP_SVC_CONNECTION_INTERFACE_IRC_COMMAND1(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_IRC_C OMMAND1, TpSvcConnectionInterfaceIRCCommand1)) (G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_IRC_C OMMAND1, TpSvcConnectionInterfaceIRCCommand1))
#define TP_IS_SVC_CONNECTION_INTERFACE_IRC_COMMAND1(obj) \ #define TP_IS_SVC_CONNECTION_INTERFACE_IRC_COMMAND1(obj) \
 End of changes. 2 change blocks. 
66 lines changed or deleted 45 lines changed or added


 version.h   version.h 
/* telepathy-glib/version.h. Generated from version.h.in by configure. */ /* telepathy-glib/version.h. Generated from version.h.in by configure. */
#define TP_MAJOR_VERSION 0 #define TP_MAJOR_VERSION 0
#define TP_MINOR_VERSION 99 #define TP_MINOR_VERSION 99
#define TP_MICRO_VERSION 5 #define TP_MICRO_VERSION 6
 End of changes. 1 change blocks. 
0 lines changed or deleted 0 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/