contact.h   contact.h 
skipping to change at line 65 skipping to change at line 65
TpContactClass)) TpContactClass))
typedef enum { typedef enum {
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,
} TpContactFeature; } TpContactFeature;
#define NUM_TP_CONTACT_FEATURES (TP_CONTACT_FEATURE_CONTACT_INFO + 1) #define NUM_TP_CONTACT_FEATURES (TP_CONTACT_FEATURE_CLIENT_TYPES + 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 108 skipping to change at line 109
void tp_contact_request_contact_info_async (TpContact *self, void tp_contact_request_contact_info_async (TpContact *self,
GCancellable *cancellable, GAsyncReadyCallback callback, GCancellable *cancellable, GAsyncReadyCallback callback,
gpointer user_data); gpointer user_data);
gboolean tp_contact_request_contact_info_finish (TpContact *self, gboolean tp_contact_request_contact_info_finish (TpContact *self,
GAsyncResult *result, GError **error); GAsyncResult *result, GError **error);
void tp_connection_refresh_contact_info (TpConnection *self, void tp_connection_refresh_contact_info (TpConnection *self,
guint n_contacts, TpContact * const *contacts); guint n_contacts, TpContact * const *contacts);
/* TP_CONTACT_FEATURE_CLIENT_TYPES */
const gchar * const *
/* this comment stops gtkdoc denying that this function exists */
tp_contact_get_client_types (TpContact *self);
typedef void (*TpConnectionContactsByHandleCb) (TpConnection *connection, typedef void (*TpConnectionContactsByHandleCb) (TpConnection *connection,
guint n_contacts, TpContact * const *contacts, guint n_contacts, TpContact * const *contacts,
guint n_failed, const TpHandle *failed, guint n_failed, const TpHandle *failed,
const GError *error, gpointer user_data, GObject *weak_object); const GError *error, gpointer user_data, GObject *weak_object);
void tp_connection_get_contacts_by_handle (TpConnection *self, void tp_connection_get_contacts_by_handle (TpConnection *self,
guint n_handles, const TpHandle *handles, guint n_handles, const TpHandle *handles,
guint n_features, const TpContactFeature *features, guint n_features, const TpContactFeature *features,
TpConnectionContactsByHandleCb callback, TpConnectionContactsByHandleCb callback,
gpointer user_data, GDestroyNotify destroy, GObject *weak_object); gpointer user_data, GDestroyNotify destroy, GObject *weak_object);
 End of changes. 3 change blocks. 
1 lines changed or deleted 7 lines changed or added


 telepathy-enums.h   telepathy-enums.h 
skipping to change at line 117 skipping to change at line 117
TP_CONNECTION_PRESENCE_TYPE_AWAY = 3, TP_CONNECTION_PRESENCE_TYPE_AWAY = 3,
TP_CONNECTION_PRESENCE_TYPE_EXTENDED_AWAY = 4, TP_CONNECTION_PRESENCE_TYPE_EXTENDED_AWAY = 4,
TP_CONNECTION_PRESENCE_TYPE_HIDDEN = 5, TP_CONNECTION_PRESENCE_TYPE_HIDDEN = 5,
TP_CONNECTION_PRESENCE_TYPE_BUSY = 6, TP_CONNECTION_PRESENCE_TYPE_BUSY = 6,
TP_CONNECTION_PRESENCE_TYPE_UNKNOWN = 7, TP_CONNECTION_PRESENCE_TYPE_UNKNOWN = 7,
TP_CONNECTION_PRESENCE_TYPE_ERROR = 8, TP_CONNECTION_PRESENCE_TYPE_ERROR = 8,
} TpConnectionPresenceType; } TpConnectionPresenceType;
#define NUM_TP_CONNECTION_PRESENCE_TYPES (8+1) #define NUM_TP_CONNECTION_PRESENCE_TYPES (8+1)
typedef enum { typedef enum {
TP_ACCESS_CONTROL_TYPE_WHITELIST = 0,
TP_ACCESS_CONTROL_TYPE_PUBLISH_LIST = 1,
TP_ACCESS_CONTROL_TYPE_GROUP = 2,
TP_ACCESS_CONTROL_TYPE_OPEN = 3,
TP_ACCESS_CONTROL_TYPE_SUBSCRIBE_OR_PUBLISH_LIST = 4,
TP_ACCESS_CONTROL_TYPE_CLOSED = 5,
TP_ACCESS_CONTROL_TYPE_NOT_UNDERSTOOD = 6,
} TpAccessControlType;
#define NUM_TP_ACCESS_CONTROL_TYPES (6+1)
typedef enum {
TP_RICH_PRESENCE_ACCESS_CONTROL_TYPE_WHITELIST = 0, TP_RICH_PRESENCE_ACCESS_CONTROL_TYPE_WHITELIST = 0,
TP_RICH_PRESENCE_ACCESS_CONTROL_TYPE_PUBLISH_LIST = 1, TP_RICH_PRESENCE_ACCESS_CONTROL_TYPE_PUBLISH_LIST = 1,
TP_RICH_PRESENCE_ACCESS_CONTROL_TYPE_GROUP = 2, TP_RICH_PRESENCE_ACCESS_CONTROL_TYPE_GROUP = 2,
TP_RICH_PRESENCE_ACCESS_CONTROL_TYPE_OPEN = 3, TP_RICH_PRESENCE_ACCESS_CONTROL_TYPE_OPEN = 3,
} TpRichPresenceAccessControlType; } TpRichPresenceAccessControlType;
#define NUM_TP_RICH_PRESENCE_ACCESS_CONTROL_TYPES (3+1) #define NUM_TP_RICH_PRESENCE_ACCESS_CONTROL_TYPES (3+1)
typedef enum { typedef enum {
TP_LOCATION_FEATURE_CAN_SET = 1, TP_LOCATION_FEATURE_CAN_SET = 1,
} TpLocationFeatures; } TpLocationFeatures;
 End of changes. 1 change blocks. 
0 lines changed or deleted 11 lines changed or added


 telepathy-interfaces.h   telepathy-interfaces.h 
skipping to change at line 176 skipping to change at line 176
#define TP_PROP_CONNECTION_INTERFACE_CELLULAR_MESSAGE_SERVICE_CENTRE \ #define TP_PROP_CONNECTION_INTERFACE_CELLULAR_MESSAGE_SERVICE_CENTRE \
"org.freedesktop.Telepathy.Connection.Interface.Cellular.MessageServiceCent re" "org.freedesktop.Telepathy.Connection.Interface.Cellular.MessageServiceCent re"
#define TP_PROP_CONNECTION_INTERFACE_CELLULAR_IMSI \ #define TP_PROP_CONNECTION_INTERFACE_CELLULAR_IMSI \
"org.freedesktop.Telepathy.Connection.Interface.Cellular.IMSI" "org.freedesktop.Telepathy.Connection.Interface.Cellular.IMSI"
#define TP_PROP_CONNECTION_INTERFACE_CELLULAR_MESSAGE_REDUCED_CHARACTER_SET \ #define TP_PROP_CONNECTION_INTERFACE_CELLULAR_MESSAGE_REDUCED_CHARACTER_SET \
"org.freedesktop.Telepathy.Connection.Interface.Cellular.MessageReducedChar acterSet" "org.freedesktop.Telepathy.Connection.Interface.Cellular.MessageReducedChar acterSet"
#define TP_IFACE_CONNECTION_INTERFACE_CLIENT_TYPES \
"org.freedesktop.Telepathy.Connection.Interface.ClientTypes"
#define TP_IFACE_QUARK_CONNECTION_INTERFACE_CLIENT_TYPES \
(tp_iface_quark_connection_interface_client_types ())
GQuark tp_iface_quark_connection_interface_client_types (void);
#define TP_TOKEN_CONNECTION_INTERFACE_CLIENT_TYPES_CLIENT_TYPES \
"org.freedesktop.Telepathy.Connection.Interface.ClientTypes/client-types"
#define TP_IFACE_CONNECTION_INTERFACE_CONTACT_CAPABILITIES \ #define TP_IFACE_CONNECTION_INTERFACE_CONTACT_CAPABILITIES \
"org.freedesktop.Telepathy.Connection.Interface.ContactCapabilities" "org.freedesktop.Telepathy.Connection.Interface.ContactCapabilities"
#define TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_CAPABILITIES \ #define TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_CAPABILITIES \
(tp_iface_quark_connection_interface_contact_capabilities ()) (tp_iface_quark_connection_interface_contact_capabilities ())
GQuark tp_iface_quark_connection_interface_contact_capabilities (void); GQuark tp_iface_quark_connection_interface_contact_capabilities (void);
#define TP_TOKEN_CONNECTION_INTERFACE_CONTACT_CAPABILITIES_CAPABILITIES \ #define TP_TOKEN_CONNECTION_INTERFACE_CONTACT_CAPABILITIES_CAPABILITIES \
"org.freedesktop.Telepathy.Connection.Interface.ContactCapabilities/capabil ities" "org.freedesktop.Telepathy.Connection.Interface.ContactCapabilities/capabil ities"
 End of changes. 1 change blocks. 
0 lines changed or deleted 11 lines changed or added


 tp-cli-connection.h   tp-cli-connection.h 
skipping to change at line 669 skipping to change at line 669
typedef void (*tp_cli_connection_interface_cellular_signal_callback_imsi_ch anged) (TpConnection *proxy, typedef void (*tp_cli_connection_interface_cellular_signal_callback_imsi_ch anged) (TpConnection *proxy,
const gchar *arg_IMSI, const gchar *arg_IMSI,
gpointer user_data, GObject *weak_object); gpointer user_data, GObject *weak_object);
TpProxySignalConnection *tp_cli_connection_interface_cellular_connect_to_im si_changed (TpConnection *proxy, TpProxySignalConnection *tp_cli_connection_interface_cellular_connect_to_im si_changed (TpConnection *proxy,
tp_cli_connection_interface_cellular_signal_callback_imsi_changed callb ack, tp_cli_connection_interface_cellular_signal_callback_imsi_changed callb ack,
gpointer user_data, gpointer user_data,
GDestroyNotify destroy, GDestroyNotify destroy,
GObject *weak_object, GObject *weak_object,
GError **error); GError **error);
typedef void (*tp_cli_connection_interface_client_types_signal_callback_cli
ent_types_updated) (TpConnection *proxy,
guint arg_Contact,
const gchar **arg_Client_Types,
gpointer user_data, GObject *weak_object);
TpProxySignalConnection *tp_cli_connection_interface_client_types_connect_t
o_client_types_updated (TpConnection *proxy,
tp_cli_connection_interface_client_types_signal_callback_client_types_u
pdated callback,
gpointer user_data,
GDestroyNotify destroy,
GObject *weak_object,
GError **error);
typedef void (*tp_cli_connection_interface_client_types_callback_for_get_cl
ient_types) (TpConnection *proxy,
GHashTable *out_Client_Types,
const GError *error, gpointer user_data,
GObject *weak_object);
TpProxyPendingCall *tp_cli_connection_interface_client_types_call_get_clien
t_types (TpConnection *proxy,
gint timeout_ms,
const GArray *in_Contacts,
tp_cli_connection_interface_client_types_callback_for_get_client_types
callback,
gpointer user_data,
GDestroyNotify destroy,
GObject *weak_object);
#ifndef TP_DISABLE_DEPRECATED
gboolean tp_cli_connection_interface_client_types_run_get_client_types (TpC
onnection *proxy,
gint timeout_ms,
const GArray *in_Contacts,
GHashTable **out_Client_Types,
GError **error,
GMainLoop **loop) _TP_GNUC_DEPRECATED;
#endif /* not TP_DISABLE_DEPRECATED */
typedef void (*tp_cli_connection_interface_client_types_callback_for_reques
t_client_types) (TpConnection *proxy,
const gchar **out_Client_Types,
const GError *error, gpointer user_data,
GObject *weak_object);
TpProxyPendingCall *tp_cli_connection_interface_client_types_call_request_c
lient_types (TpConnection *proxy,
gint timeout_ms,
guint in_Contact,
tp_cli_connection_interface_client_types_callback_for_request_client_ty
pes callback,
gpointer user_data,
GDestroyNotify destroy,
GObject *weak_object);
#ifndef TP_DISABLE_DEPRECATED
gboolean tp_cli_connection_interface_client_types_run_request_client_types
(TpConnection *proxy,
gint timeout_ms,
guint in_Contact,
gchar ***out_Client_Types,
GError **error,
GMainLoop **loop) _TP_GNUC_DEPRECATED;
#endif /* not TP_DISABLE_DEPRECATED */
typedef void (*tp_cli_connection_interface_contact_capabilities_signal_call back_contact_capabilities_changed) (TpConnection *proxy, typedef void (*tp_cli_connection_interface_contact_capabilities_signal_call back_contact_capabilities_changed) (TpConnection *proxy,
GHashTable *arg_caps, GHashTable *arg_caps,
gpointer user_data, GObject *weak_object); gpointer user_data, GObject *weak_object);
TpProxySignalConnection *tp_cli_connection_interface_contact_capabilities_c onnect_to_contact_capabilities_changed (TpConnection *proxy, TpProxySignalConnection *tp_cli_connection_interface_contact_capabilities_c onnect_to_contact_capabilities_changed (TpConnection *proxy,
tp_cli_connection_interface_contact_capabilities_signal_callback_contac t_capabilities_changed callback, tp_cli_connection_interface_contact_capabilities_signal_callback_contac t_capabilities_changed callback,
gpointer user_data, gpointer user_data,
GDestroyNotify destroy, GDestroyNotify destroy,
GObject *weak_object, GObject *weak_object,
GError **error); GError **error);
 End of changes. 1 change blocks. 
0 lines changed or deleted 66 lines changed or added


 tp-svc-connection.h   tp-svc-connection.h 
skipping to change at line 540 skipping to change at line 540
#define TP_SVC_CONNECTION_INTERFACE_CELLULAR(obj) \ #define TP_SVC_CONNECTION_INTERFACE_CELLULAR(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_CELLU LAR, TpSvcConnectionInterfaceCellular)) (G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_CELLU LAR, TpSvcConnectionInterfaceCellular))
#define TP_IS_SVC_CONNECTION_INTERFACE_CELLULAR(obj) \ #define TP_IS_SVC_CONNECTION_INTERFACE_CELLULAR(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_CELLU LAR)) (G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_CELLU LAR))
#define TP_SVC_CONNECTION_INTERFACE_CELLULAR_GET_CLASS(obj) \ #define TP_SVC_CONNECTION_INTERFACE_CELLULAR_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_CE LLULAR, TpSvcConnectionInterfaceCellularClass)) (G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_CE LLULAR, TpSvcConnectionInterfaceCellularClass))
void tp_svc_connection_interface_cellular_emit_imsi_changed (gpointer insta nce, void tp_svc_connection_interface_cellular_emit_imsi_changed (gpointer insta nce,
const gchar *arg_IMSI); const gchar *arg_IMSI);
typedef struct _TpSvcConnectionInterfaceClientTypes TpSvcConnectionInterfac
eClientTypes;
typedef struct _TpSvcConnectionInterfaceClientTypesClass TpSvcConnectionInt
erfaceClientTypesClass;
GType tp_svc_connection_interface_client_types_get_type (void);
#define TP_TYPE_SVC_CONNECTION_INTERFACE_CLIENT_TYPES \
(tp_svc_connection_interface_client_types_get_type ())
#define TP_SVC_CONNECTION_INTERFACE_CLIENT_TYPES(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_CLIEN
T_TYPES, TpSvcConnectionInterfaceClientTypes))
#define TP_IS_SVC_CONNECTION_INTERFACE_CLIENT_TYPES(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_CLIEN
T_TYPES))
#define TP_SVC_CONNECTION_INTERFACE_CLIENT_TYPES_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_CL
IENT_TYPES, TpSvcConnectionInterfaceClientTypesClass))
typedef void (*tp_svc_connection_interface_client_types_get_client_types_im
pl) (TpSvcConnectionInterfaceClientTypes *self,
const GArray *in_Contacts,
DBusGMethodInvocation *context);
void tp_svc_connection_interface_client_types_implement_get_client_types (T
pSvcConnectionInterfaceClientTypesClass *klass, tp_svc_connection_interface
_client_types_get_client_types_impl impl);
static inline
/* this comment is to stop gtkdoc realising this is static */
void tp_svc_connection_interface_client_types_return_from_get_client_types
(DBusGMethodInvocation *context,
GHashTable *out_Client_Types);
static inline void
tp_svc_connection_interface_client_types_return_from_get_client_types (DBus
GMethodInvocation *context,
GHashTable *out_Client_Types)
{
dbus_g_method_return (context,
out_Client_Types);
}
typedef void (*tp_svc_connection_interface_client_types_request_client_type
s_impl) (TpSvcConnectionInterfaceClientTypes *self,
guint in_Contact,
DBusGMethodInvocation *context);
void tp_svc_connection_interface_client_types_implement_request_client_type
s (TpSvcConnectionInterfaceClientTypesClass *klass, tp_svc_connection_inter
face_client_types_request_client_types_impl impl);
static inline
/* this comment is to stop gtkdoc realising this is static */
void tp_svc_connection_interface_client_types_return_from_request_client_ty
pes (DBusGMethodInvocation *context,
const gchar **out_Client_Types);
static inline void
tp_svc_connection_interface_client_types_return_from_request_client_types (
DBusGMethodInvocation *context,
const gchar **out_Client_Types)
{
dbus_g_method_return (context,
out_Client_Types);
}
void tp_svc_connection_interface_client_types_emit_client_types_updated (gp
ointer instance,
guint arg_Contact,
const gchar **arg_Client_Types);
typedef struct _TpSvcConnectionInterfaceContactCapabilities TpSvcConnection InterfaceContactCapabilities; typedef struct _TpSvcConnectionInterfaceContactCapabilities TpSvcConnection InterfaceContactCapabilities;
typedef struct _TpSvcConnectionInterfaceContactCapabilitiesClass TpSvcConne ctionInterfaceContactCapabilitiesClass; typedef struct _TpSvcConnectionInterfaceContactCapabilitiesClass TpSvcConne ctionInterfaceContactCapabilitiesClass;
GType tp_svc_connection_interface_contact_capabilities_get_type (void); GType tp_svc_connection_interface_contact_capabilities_get_type (void);
#define TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_CAPABILITIES \ #define TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_CAPABILITIES \
(tp_svc_connection_interface_contact_capabilities_get_type ()) (tp_svc_connection_interface_contact_capabilities_get_type ())
#define TP_SVC_CONNECTION_INTERFACE_CONTACT_CAPABILITIES(obj) \ #define TP_SVC_CONNECTION_INTERFACE_CONTACT_CAPABILITIES(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_CONTA CT_CAPABILITIES, TpSvcConnectionInterfaceContactCapabilities)) (G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_CONTA CT_CAPABILITIES, TpSvcConnectionInterfaceContactCapabilities))
#define TP_IS_SVC_CONNECTION_INTERFACE_CONTACT_CAPABILITIES(obj) \ #define TP_IS_SVC_CONNECTION_INTERFACE_CONTACT_CAPABILITIES(obj) \
 End of changes. 1 change blocks. 
0 lines changed or deleted 66 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/