telepathy-enums.h   telepathy-enums.h 
skipping to change at line 70 skipping to change at line 70
TP_ANONYMITY_MODE_SHOW_CLIENT_INFO = 2, TP_ANONYMITY_MODE_SHOW_CLIENT_INFO = 2,
TP_ANONYMITY_MODE_NETWORK_INFO = 4, TP_ANONYMITY_MODE_NETWORK_INFO = 4,
} TpAnonymityModeFlags; } TpAnonymityModeFlags;
typedef enum /*< flags >*/ { typedef enum /*< flags >*/ {
TP_CONNECTION_CAPABILITY_FLAG_CREATE = 1, TP_CONNECTION_CAPABILITY_FLAG_CREATE = 1,
TP_CONNECTION_CAPABILITY_FLAG_INVITE = 2, TP_CONNECTION_CAPABILITY_FLAG_INVITE = 2,
} TpConnectionCapabilityFlags; } TpConnectionCapabilityFlags;
typedef enum /*< flags >*/ { typedef enum /*< flags >*/ {
TP_CONTACT_BLOCKING_CAPABILITY_CAN_REPORT_ABUSIVE = 1,
} TpContactBlockingCapabilities;
typedef enum /*< flags >*/ {
TP_CONTACT_INFO_FLAG_CAN_SET = 1, TP_CONTACT_INFO_FLAG_CAN_SET = 1,
TP_CONTACT_INFO_FLAG_PUSH = 2, TP_CONTACT_INFO_FLAG_PUSH = 2,
} TpContactInfoFlags; } TpContactInfoFlags;
typedef enum /*< flags >*/ { typedef enum /*< flags >*/ {
TP_CONTACT_INFO_FIELD_FLAG_PARAMETERS_EXACT = 1, TP_CONTACT_INFO_FIELD_FLAG_PARAMETERS_EXACT = 1,
TP_CONTACT_INFO_FIELD_FLAG_OVERWRITTEN_BY_NICKNAME = 2, TP_CONTACT_INFO_FIELD_FLAG_OVERWRITTEN_BY_NICKNAME = 2,
} TpContactInfoFieldFlags; } TpContactInfoFieldFlags;
typedef enum { typedef enum {
 End of changes. 1 change blocks. 
0 lines changed or deleted 4 lines changed or added


 telepathy-interfaces.h   telepathy-interfaces.h 
skipping to change at line 239 skipping to change at line 239
"org.freedesktop.Telepathy.Connection.Interface.ClientTypes" "org.freedesktop.Telepathy.Connection.Interface.ClientTypes"
#define TP_IFACE_QUARK_CONNECTION_INTERFACE_CLIENT_TYPES \ #define TP_IFACE_QUARK_CONNECTION_INTERFACE_CLIENT_TYPES \
(tp_iface_quark_connection_interface_client_types ()) (tp_iface_quark_connection_interface_client_types ())
GQuark tp_iface_quark_connection_interface_client_types (void); GQuark tp_iface_quark_connection_interface_client_types (void);
#define TP_TOKEN_CONNECTION_INTERFACE_CLIENT_TYPES_CLIENT_TYPES \ #define TP_TOKEN_CONNECTION_INTERFACE_CLIENT_TYPES_CLIENT_TYPES \
"org.freedesktop.Telepathy.Connection.Interface.ClientTypes/client-types" "org.freedesktop.Telepathy.Connection.Interface.ClientTypes/client-types"
#define TP_IFACE_CONNECTION_INTERFACE_CONTACT_BLOCKING \
"org.freedesktop.Telepathy.Connection.Interface.ContactBlocking"
#define TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_BLOCKING \
(tp_iface_quark_connection_interface_contact_blocking ())
GQuark tp_iface_quark_connection_interface_contact_blocking (void);
#define TP_PROP_CONNECTION_INTERFACE_CONTACT_BLOCKING_CONTACT_BLOCKING_CAPA
BILITIES \
"org.freedesktop.Telepathy.Connection.Interface.ContactBlocking.ContactBloc
kingCapabilities"
#define TP_TOKEN_CONNECTION_INTERFACE_CONTACT_BLOCKING_BLOCKED \
"org.freedesktop.Telepathy.Connection.Interface.ContactBlocking/blocked"
#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"
skipping to change at line 629 skipping to change at line 643
(tp_iface_quark_channel_type_server_tls_connection ()) (tp_iface_quark_channel_type_server_tls_connection ())
GQuark tp_iface_quark_channel_type_server_tls_connection (void); GQuark tp_iface_quark_channel_type_server_tls_connection (void);
#define TP_PROP_CHANNEL_TYPE_SERVER_TLS_CONNECTION_SERVER_CERTIFICATE \ #define TP_PROP_CHANNEL_TYPE_SERVER_TLS_CONNECTION_SERVER_CERTIFICATE \
"org.freedesktop.Telepathy.Channel.Type.ServerTLSConnection.ServerCertifica te" "org.freedesktop.Telepathy.Channel.Type.ServerTLSConnection.ServerCertifica te"
#define TP_PROP_CHANNEL_TYPE_SERVER_TLS_CONNECTION_HOSTNAME \ #define TP_PROP_CHANNEL_TYPE_SERVER_TLS_CONNECTION_HOSTNAME \
"org.freedesktop.Telepathy.Channel.Type.ServerTLSConnection.Hostname" "org.freedesktop.Telepathy.Channel.Type.ServerTLSConnection.Hostname"
#define TP_PROP_CHANNEL_TYPE_SERVER_TLS_CONNECTION_REFERENCE_IDENTITIES \
"org.freedesktop.Telepathy.Channel.Type.ServerTLSConnection.ReferenceIdenti
ties"
#define TP_IFACE_CHANNEL_INTERFACE_ANONYMITY \ #define TP_IFACE_CHANNEL_INTERFACE_ANONYMITY \
"org.freedesktop.Telepathy.Channel.Interface.Anonymity" "org.freedesktop.Telepathy.Channel.Interface.Anonymity"
#define TP_IFACE_QUARK_CHANNEL_INTERFACE_ANONYMITY \ #define TP_IFACE_QUARK_CHANNEL_INTERFACE_ANONYMITY \
(tp_iface_quark_channel_interface_anonymity ()) (tp_iface_quark_channel_interface_anonymity ())
GQuark tp_iface_quark_channel_interface_anonymity (void); GQuark tp_iface_quark_channel_interface_anonymity (void);
#define TP_PROP_CHANNEL_INTERFACE_ANONYMITY_ANONYMITY_MODES \ #define TP_PROP_CHANNEL_INTERFACE_ANONYMITY_ANONYMITY_MODES \
"org.freedesktop.Telepathy.Channel.Interface.Anonymity.AnonymityModes" "org.freedesktop.Telepathy.Channel.Interface.Anonymity.AnonymityModes"
 End of changes. 2 change blocks. 
0 lines changed or deleted 20 lines changed or added


 tp-cli-connection.h   tp-cli-connection.h 
skipping to change at line 764 skipping to change at line 764
#ifndef TP_DISABLE_DEPRECATED #ifndef TP_DISABLE_DEPRECATED
gboolean tp_cli_connection_interface_client_types_run_request_client_types (TpConnection *proxy, gboolean tp_cli_connection_interface_client_types_run_request_client_types (TpConnection *proxy,
gint timeout_ms, gint timeout_ms,
guint in_Contact, guint in_Contact,
gchar ***out_Client_Types, gchar ***out_Client_Types,
GError **error, GError **error,
GMainLoop **loop) _TP_GNUC_DEPRECATED; GMainLoop **loop) _TP_GNUC_DEPRECATED;
#endif /* not TP_DISABLE_DEPRECATED */ #endif /* not TP_DISABLE_DEPRECATED */
typedef void (*tp_cli_connection_interface_contact_blocking_signal_callback
_blocked_contacts_changed) (TpConnection *proxy,
GHashTable *arg_Blocked_Contacts,
GHashTable *arg_Unblocked_Contacts,
gpointer user_data, GObject *weak_object);
TpProxySignalConnection *tp_cli_connection_interface_contact_blocking_conne
ct_to_blocked_contacts_changed (TpConnection *proxy,
tp_cli_connection_interface_contact_blocking_signal_callback_blocked_co
ntacts_changed callback,
gpointer user_data,
GDestroyNotify destroy,
GObject *weak_object,
GError **error);
typedef void (*tp_cli_connection_interface_contact_blocking_callback_for_bl
ock_contacts) (TpConnection *proxy,
const GError *error, gpointer user_data,
GObject *weak_object);
TpProxyPendingCall *tp_cli_connection_interface_contact_blocking_call_block
_contacts (TpConnection *proxy,
gint timeout_ms,
const GArray *in_Contacts,
gboolean in_Report_Abusive,
tp_cli_connection_interface_contact_blocking_callback_for_block_contact
s callback,
gpointer user_data,
GDestroyNotify destroy,
GObject *weak_object);
#ifndef TP_DISABLE_DEPRECATED
gboolean tp_cli_connection_interface_contact_blocking_run_block_contacts (T
pConnection *proxy,
gint timeout_ms,
const GArray *in_Contacts,
gboolean in_Report_Abusive,
GError **error,
GMainLoop **loop) _TP_GNUC_DEPRECATED;
#endif /* not TP_DISABLE_DEPRECATED */
typedef void (*tp_cli_connection_interface_contact_blocking_callback_for_un
block_contacts) (TpConnection *proxy,
const GError *error, gpointer user_data,
GObject *weak_object);
TpProxyPendingCall *tp_cli_connection_interface_contact_blocking_call_unblo
ck_contacts (TpConnection *proxy,
gint timeout_ms,
const GArray *in_Contacts,
tp_cli_connection_interface_contact_blocking_callback_for_unblock_conta
cts callback,
gpointer user_data,
GDestroyNotify destroy,
GObject *weak_object);
#ifndef TP_DISABLE_DEPRECATED
gboolean tp_cli_connection_interface_contact_blocking_run_unblock_contacts
(TpConnection *proxy,
gint timeout_ms,
const GArray *in_Contacts,
GError **error,
GMainLoop **loop) _TP_GNUC_DEPRECATED;
#endif /* not TP_DISABLE_DEPRECATED */
typedef void (*tp_cli_connection_interface_contact_blocking_callback_for_re
quest_blocked_contacts) (TpConnection *proxy,
GHashTable *out_Contacts,
const GError *error, gpointer user_data,
GObject *weak_object);
TpProxyPendingCall *tp_cli_connection_interface_contact_blocking_call_reque
st_blocked_contacts (TpConnection *proxy,
gint timeout_ms,
tp_cli_connection_interface_contact_blocking_callback_for_request_block
ed_contacts callback,
gpointer user_data,
GDestroyNotify destroy,
GObject *weak_object);
#ifndef TP_DISABLE_DEPRECATED
gboolean tp_cli_connection_interface_contact_blocking_run_request_blocked_c
ontacts (TpConnection *proxy,
gint timeout_ms,
GHashTable **out_Contacts,
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 88 lines changed or added


 tp-svc-connection.h   tp-svc-connection.h 
skipping to change at line 616 skipping to change at line 616
const gchar **out_Client_Types) const gchar **out_Client_Types)
{ {
dbus_g_method_return (context, dbus_g_method_return (context,
out_Client_Types); out_Client_Types);
} }
void tp_svc_connection_interface_client_types_emit_client_types_updated (gp ointer instance, void tp_svc_connection_interface_client_types_emit_client_types_updated (gp ointer instance,
guint arg_Contact, guint arg_Contact,
const gchar **arg_Client_Types); const gchar **arg_Client_Types);
typedef struct _TpSvcConnectionInterfaceContactBlocking TpSvcConnectionInte
rfaceContactBlocking;
typedef struct _TpSvcConnectionInterfaceContactBlockingClass TpSvcConnectio
nInterfaceContactBlockingClass;
GType tp_svc_connection_interface_contact_blocking_get_type (void);
#define TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_BLOCKING \
(tp_svc_connection_interface_contact_blocking_get_type ())
#define TP_SVC_CONNECTION_INTERFACE_CONTACT_BLOCKING(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_CONTA
CT_BLOCKING, TpSvcConnectionInterfaceContactBlocking))
#define TP_IS_SVC_CONNECTION_INTERFACE_CONTACT_BLOCKING(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_CONTA
CT_BLOCKING))
#define TP_SVC_CONNECTION_INTERFACE_CONTACT_BLOCKING_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_CO
NTACT_BLOCKING, TpSvcConnectionInterfaceContactBlockingClass))
typedef void (*tp_svc_connection_interface_contact_blocking_block_contacts_
impl) (TpSvcConnectionInterfaceContactBlocking *self,
const GArray *in_Contacts,
gboolean in_Report_Abusive,
DBusGMethodInvocation *context);
void tp_svc_connection_interface_contact_blocking_implement_block_contacts
(TpSvcConnectionInterfaceContactBlockingClass *klass, tp_svc_connection_int
erface_contact_blocking_block_contacts_impl impl);
static inline
/* this comment is to stop gtkdoc realising this is static */
void tp_svc_connection_interface_contact_blocking_return_from_block_contact
s (DBusGMethodInvocation *context);
static inline void
tp_svc_connection_interface_contact_blocking_return_from_block_contacts (DB
usGMethodInvocation *context)
{
dbus_g_method_return (context);
}
typedef void (*tp_svc_connection_interface_contact_blocking_unblock_contact
s_impl) (TpSvcConnectionInterfaceContactBlocking *self,
const GArray *in_Contacts,
DBusGMethodInvocation *context);
void tp_svc_connection_interface_contact_blocking_implement_unblock_contact
s (TpSvcConnectionInterfaceContactBlockingClass *klass, tp_svc_connection_i
nterface_contact_blocking_unblock_contacts_impl impl);
static inline
/* this comment is to stop gtkdoc realising this is static */
void tp_svc_connection_interface_contact_blocking_return_from_unblock_conta
cts (DBusGMethodInvocation *context);
static inline void
tp_svc_connection_interface_contact_blocking_return_from_unblock_contacts (
DBusGMethodInvocation *context)
{
dbus_g_method_return (context);
}
typedef void (*tp_svc_connection_interface_contact_blocking_request_blocked
_contacts_impl) (TpSvcConnectionInterfaceContactBlocking *self,
DBusGMethodInvocation *context);
void tp_svc_connection_interface_contact_blocking_implement_request_blocked
_contacts (TpSvcConnectionInterfaceContactBlockingClass *klass, tp_svc_conn
ection_interface_contact_blocking_request_blocked_contacts_impl impl);
static inline
/* this comment is to stop gtkdoc realising this is static */
void tp_svc_connection_interface_contact_blocking_return_from_request_block
ed_contacts (DBusGMethodInvocation *context,
GHashTable *out_Contacts);
static inline void
tp_svc_connection_interface_contact_blocking_return_from_request_blocked_co
ntacts (DBusGMethodInvocation *context,
GHashTable *out_Contacts)
{
dbus_g_method_return (context,
out_Contacts);
}
void tp_svc_connection_interface_contact_blocking_emit_blocked_contacts_cha
nged (gpointer instance,
GHashTable *arg_Blocked_Contacts,
GHashTable *arg_Unblocked_Contacts);
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 81 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/