base-protocol.h   base-protocol.h 
skipping to change at line 184 skipping to change at line 184
const gchar *tp_base_protocol_get_name (TpBaseProtocol *self); const gchar *tp_base_protocol_get_name (TpBaseProtocol *self);
GHashTable *tp_base_protocol_get_immutable_properties (TpBaseProtocol *self ); GHashTable *tp_base_protocol_get_immutable_properties (TpBaseProtocol *self );
const TpCMParamSpec *tp_base_protocol_get_parameters (TpBaseProtocol *self) ; const TpCMParamSpec *tp_base_protocol_get_parameters (TpBaseProtocol *self) ;
const TpPresenceStatusSpec *tp_base_protocol_get_statuses (TpBaseProtocol * self); const TpPresenceStatusSpec *tp_base_protocol_get_statuses (TpBaseProtocol * self);
TpBaseConnection *tp_base_protocol_new_connection (TpBaseProtocol *self, TpBaseConnection *tp_base_protocol_new_connection (TpBaseProtocol *self,
GHashTable *asv, GError **error); GHashTable *asv, GError **error);
/* ---- Implemented by subclasses for Addressing support ---- */
#define TP_TYPE_PROTOCOL_ADDRESSING \
(tp_protocol_addressing_get_type ())
#define TP_IS_PROTOCOL_ADDRESSING(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
TP_TYPE_PROTOCOL_ADDRESSING))
#define TP_PROTOCOL_ADDRESSING_GET_INTERFACE(obj) \
(G_TYPE_INSTANCE_GET_INTERFACE ((obj), \
TP_TYPE_PROTOCOL_ADDRESSING, TpProtocolAddressingInterface))
typedef struct _TpProtocolAddressingInterface TpProtocolAddressingInterface
;
typedef GStrv (*TpBaseProtocolDupSupportedVCardFieldsFunc) (TpBaseProtocol
*self);
typedef GStrv (*TpBaseProtocolDupSupportedURISchemesFunc) (TpBaseProtocol *
self);
typedef gchar *(*TpBaseProtocolNormalizeVCardAddressFunc) (
TpBaseProtocol *self,
const gchar *vcard_field,
const gchar *vcard_address,
GError **error);
typedef gchar *(*TpBaseProtocolNormalizeURIFunc) (
TpBaseProtocol *self,
const gchar *uri,
GError **error);
struct _TpProtocolAddressingInterface {
GTypeInterface parent;
TpBaseProtocolDupSupportedVCardFieldsFunc dup_supported_vcard_fields;
TpBaseProtocolDupSupportedURISchemesFunc dup_supported_uri_schemes;
TpBaseProtocolNormalizeVCardAddressFunc normalize_vcard_address;
TpBaseProtocolNormalizeURIFunc normalize_contact_uri;
};
GType tp_protocol_addressing_get_type (void) G_GNUC_CONST;
G_END_DECLS G_END_DECLS
#endif #endif
 End of changes. 1 change blocks. 
0 lines changed or deleted 47 lines changed or added


 telepathy-interfaces.h   telepathy-interfaces.h 
skipping to change at line 51 skipping to change at line 51
#define TP_PROP_PROTOCOL_ENGLISH_NAME \ #define TP_PROP_PROTOCOL_ENGLISH_NAME \
"org.freedesktop.Telepathy.Protocol.EnglishName" "org.freedesktop.Telepathy.Protocol.EnglishName"
#define TP_PROP_PROTOCOL_ICON \ #define TP_PROP_PROTOCOL_ICON \
"org.freedesktop.Telepathy.Protocol.Icon" "org.freedesktop.Telepathy.Protocol.Icon"
#define TP_PROP_PROTOCOL_AUTHENTICATION_TYPES \ #define TP_PROP_PROTOCOL_AUTHENTICATION_TYPES \
"org.freedesktop.Telepathy.Protocol.AuthenticationTypes" "org.freedesktop.Telepathy.Protocol.AuthenticationTypes"
#define TP_IFACE_PROTOCOL_INTERFACE_ADDRESSING \
"org.freedesktop.Telepathy.Protocol.Interface.Addressing"
#define TP_IFACE_QUARK_PROTOCOL_INTERFACE_ADDRESSING \
(tp_iface_quark_protocol_interface_addressing ())
GQuark tp_iface_quark_protocol_interface_addressing (void);
#define TP_PROP_PROTOCOL_INTERFACE_ADDRESSING_ADDRESSABLE_VCARD_FIELDS \
"org.freedesktop.Telepathy.Protocol.Interface.Addressing.AddressableVCardFi
elds"
#define TP_PROP_PROTOCOL_INTERFACE_ADDRESSING_ADDRESSABLE_URI_SCHEMES \
"org.freedesktop.Telepathy.Protocol.Interface.Addressing.AddressableURISche
mes"
#define TP_IFACE_PROTOCOL_INTERFACE_AVATARS \ #define TP_IFACE_PROTOCOL_INTERFACE_AVATARS \
"org.freedesktop.Telepathy.Protocol.Interface.Avatars" "org.freedesktop.Telepathy.Protocol.Interface.Avatars"
#define TP_IFACE_QUARK_PROTOCOL_INTERFACE_AVATARS \ #define TP_IFACE_QUARK_PROTOCOL_INTERFACE_AVATARS \
(tp_iface_quark_protocol_interface_avatars ()) (tp_iface_quark_protocol_interface_avatars ())
GQuark tp_iface_quark_protocol_interface_avatars (void); GQuark tp_iface_quark_protocol_interface_avatars (void);
#define TP_PROP_PROTOCOL_INTERFACE_AVATARS_SUPPORTED_AVATAR_MIME_TYPES \ #define TP_PROP_PROTOCOL_INTERFACE_AVATARS_SUPPORTED_AVATAR_MIME_TYPES \
"org.freedesktop.Telepathy.Protocol.Interface.Avatars.SupportedAvatarMIMETy pes" "org.freedesktop.Telepathy.Protocol.Interface.Avatars.SupportedAvatarMIMETy pes"
 End of changes. 1 change blocks. 
0 lines changed or deleted 16 lines changed or added


 tp-cli-protocol.h   tp-cli-protocol.h 
skipping to change at line 29 skipping to change at line 29
GObject *weak_object); GObject *weak_object);
TpProxyPendingCall *tp_cli_protocol_call_normalize_contact (gpointer proxy, TpProxyPendingCall *tp_cli_protocol_call_normalize_contact (gpointer proxy,
gint timeout_ms, gint timeout_ms,
const gchar *in_Contact_ID, const gchar *in_Contact_ID,
tp_cli_protocol_callback_for_normalize_contact callback, tp_cli_protocol_callback_for_normalize_contact callback,
gpointer user_data, gpointer user_data,
GDestroyNotify destroy, GDestroyNotify destroy,
GObject *weak_object); GObject *weak_object);
typedef void (*tp_cli_protocol_interface_addressing_callback_for_normalize_
vcard_address) (TpProxy *proxy,
const gchar *out_Normalized_VCard_Address,
const GError *error, gpointer user_data,
GObject *weak_object);
TpProxyPendingCall *tp_cli_protocol_interface_addressing_call_normalize_vca
rd_address (gpointer proxy,
gint timeout_ms,
const gchar *in_VCard_Field,
const gchar *in_VCard_Address,
tp_cli_protocol_interface_addressing_callback_for_normalize_vcard_addre
ss callback,
gpointer user_data,
GDestroyNotify destroy,
GObject *weak_object);
typedef void (*tp_cli_protocol_interface_addressing_callback_for_normalize_
contact_uri) (TpProxy *proxy,
const gchar *out_Normalized_URI,
const GError *error, gpointer user_data,
GObject *weak_object);
TpProxyPendingCall *tp_cli_protocol_interface_addressing_call_normalize_con
tact_uri (gpointer proxy,
gint timeout_ms,
const gchar *in_URI,
tp_cli_protocol_interface_addressing_callback_for_normalize_contact_uri
callback,
gpointer user_data,
GDestroyNotify destroy,
GObject *weak_object);
G_END_DECLS G_END_DECLS
 End of changes. 1 change blocks. 
0 lines changed or deleted 33 lines changed or added


 tp-svc-protocol.h   tp-svc-protocol.h 
skipping to change at line 53 skipping to change at line 53
void tp_svc_protocol_return_from_normalize_contact (DBusGMethodInvocation * context, void tp_svc_protocol_return_from_normalize_contact (DBusGMethodInvocation * context,
const gchar *out_Normalized_Contact_ID); const gchar *out_Normalized_Contact_ID);
static inline void static inline void
tp_svc_protocol_return_from_normalize_contact (DBusGMethodInvocation *conte xt, tp_svc_protocol_return_from_normalize_contact (DBusGMethodInvocation *conte xt,
const gchar *out_Normalized_Contact_ID) const gchar *out_Normalized_Contact_ID)
{ {
dbus_g_method_return (context, dbus_g_method_return (context,
out_Normalized_Contact_ID); out_Normalized_Contact_ID);
} }
typedef struct _TpSvcProtocolInterfaceAddressing TpSvcProtocolInterfaceAddr
essing;
typedef struct _TpSvcProtocolInterfaceAddressingClass TpSvcProtocolInterfac
eAddressingClass;
GType tp_svc_protocol_interface_addressing_get_type (void);
#define TP_TYPE_SVC_PROTOCOL_INTERFACE_ADDRESSING \
(tp_svc_protocol_interface_addressing_get_type ())
#define TP_SVC_PROTOCOL_INTERFACE_ADDRESSING(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_PROTOCOL_INTERFACE_ADDRESS
ING, TpSvcProtocolInterfaceAddressing))
#define TP_IS_SVC_PROTOCOL_INTERFACE_ADDRESSING(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_PROTOCOL_INTERFACE_ADDRESS
ING))
#define TP_SVC_PROTOCOL_INTERFACE_ADDRESSING_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_PROTOCOL_INTERFACE_ADDR
ESSING, TpSvcProtocolInterfaceAddressingClass))
typedef void (*tp_svc_protocol_interface_addressing_normalize_vcard_address
_impl) (TpSvcProtocolInterfaceAddressing *self,
const gchar *in_VCard_Field,
const gchar *in_VCard_Address,
DBusGMethodInvocation *context);
void tp_svc_protocol_interface_addressing_implement_normalize_vcard_address
(TpSvcProtocolInterfaceAddressingClass *klass, tp_svc_protocol_interface_a
ddressing_normalize_vcard_address_impl impl);
static inline
/* this comment is to stop gtkdoc realising this is static */
void tp_svc_protocol_interface_addressing_return_from_normalize_vcard_addre
ss (DBusGMethodInvocation *context,
const gchar *out_Normalized_VCard_Address);
static inline void
tp_svc_protocol_interface_addressing_return_from_normalize_vcard_address (D
BusGMethodInvocation *context,
const gchar *out_Normalized_VCard_Address)
{
dbus_g_method_return (context,
out_Normalized_VCard_Address);
}
typedef void (*tp_svc_protocol_interface_addressing_normalize_contact_uri_i
mpl) (TpSvcProtocolInterfaceAddressing *self,
const gchar *in_URI,
DBusGMethodInvocation *context);
void tp_svc_protocol_interface_addressing_implement_normalize_contact_uri (
TpSvcProtocolInterfaceAddressingClass *klass, tp_svc_protocol_interface_add
ressing_normalize_contact_uri_impl impl);
static inline
/* this comment is to stop gtkdoc realising this is static */
void tp_svc_protocol_interface_addressing_return_from_normalize_contact_uri
(DBusGMethodInvocation *context,
const gchar *out_Normalized_URI);
static inline void
tp_svc_protocol_interface_addressing_return_from_normalize_contact_uri (DBu
sGMethodInvocation *context,
const gchar *out_Normalized_URI)
{
dbus_g_method_return (context,
out_Normalized_URI);
}
typedef struct _TpSvcProtocolInterfaceAvatars TpSvcProtocolInterfaceAvatars ; typedef struct _TpSvcProtocolInterfaceAvatars TpSvcProtocolInterfaceAvatars ;
typedef struct _TpSvcProtocolInterfaceAvatarsClass TpSvcProtocolInterfaceAv atarsClass; typedef struct _TpSvcProtocolInterfaceAvatarsClass TpSvcProtocolInterfaceAv atarsClass;
GType tp_svc_protocol_interface_avatars_get_type (void); GType tp_svc_protocol_interface_avatars_get_type (void);
#define TP_TYPE_SVC_PROTOCOL_INTERFACE_AVATARS \ #define TP_TYPE_SVC_PROTOCOL_INTERFACE_AVATARS \
(tp_svc_protocol_interface_avatars_get_type ()) (tp_svc_protocol_interface_avatars_get_type ())
#define TP_SVC_PROTOCOL_INTERFACE_AVATARS(obj) \ #define TP_SVC_PROTOCOL_INTERFACE_AVATARS(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_PROTOCOL_INTERFACE_AVATARS , TpSvcProtocolInterfaceAvatars)) (G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_PROTOCOL_INTERFACE_AVATARS , TpSvcProtocolInterfaceAvatars))
#define TP_IS_SVC_PROTOCOL_INTERFACE_AVATARS(obj) \ #define TP_IS_SVC_PROTOCOL_INTERFACE_AVATARS(obj) \
 End of changes. 1 change blocks. 
0 lines changed or deleted 62 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/