base-room-config.h   base-room-config.h 
skipping to change at line 70 skipping to change at line 70
TP_BASE_ROOM_CONFIG_ANONYMOUS = 0, /*< nick=Anonymous >*/ TP_BASE_ROOM_CONFIG_ANONYMOUS = 0, /*< nick=Anonymous >*/
TP_BASE_ROOM_CONFIG_INVITE_ONLY, /*< nick=InviteOnly >*/ TP_BASE_ROOM_CONFIG_INVITE_ONLY, /*< nick=InviteOnly >*/
TP_BASE_ROOM_CONFIG_LIMIT, /*< nick=Limit >*/ TP_BASE_ROOM_CONFIG_LIMIT, /*< nick=Limit >*/
TP_BASE_ROOM_CONFIG_MODERATED, /*< nick=Moderated >*/ TP_BASE_ROOM_CONFIG_MODERATED, /*< nick=Moderated >*/
TP_BASE_ROOM_CONFIG_TITLE, /*< nick=Title >*/ TP_BASE_ROOM_CONFIG_TITLE, /*< nick=Title >*/
TP_BASE_ROOM_CONFIG_DESCRIPTION, /*< nick=Description >*/ TP_BASE_ROOM_CONFIG_DESCRIPTION, /*< nick=Description >*/
TP_BASE_ROOM_CONFIG_PERSISTENT, /*< nick=Persistent >*/ TP_BASE_ROOM_CONFIG_PERSISTENT, /*< nick=Persistent >*/
TP_BASE_ROOM_CONFIG_PRIVATE, /*< nick=Private >*/ TP_BASE_ROOM_CONFIG_PRIVATE, /*< nick=Private >*/
TP_BASE_ROOM_CONFIG_PASSWORD_PROTECTED, /*< nick=PasswordProtected >*/ TP_BASE_ROOM_CONFIG_PASSWORD_PROTECTED, /*< nick=PasswordProtected >*/
TP_BASE_ROOM_CONFIG_PASSWORD, /*< nick=Password >*/ TP_BASE_ROOM_CONFIG_PASSWORD, /*< nick=Password >*/
TP_BASE_ROOM_CONFIG_PASSWORD_HINT, /*< nick=PasswordHint >*/
TP_NUM_BASE_ROOM_CONFIG_PROPERTIES /*< skip >*/ TP_NUM_BASE_ROOM_CONFIG_PROPERTIES /*< skip >*/
} TpBaseRoomConfigProperty; } TpBaseRoomConfigProperty;
GType tp_base_room_config_get_type (void); GType tp_base_room_config_get_type (void);
#define TP_TYPE_BASE_ROOM_CONFIG \ #define TP_TYPE_BASE_ROOM_CONFIG \
(tp_base_room_config_get_type ()) (tp_base_room_config_get_type ())
#define TP_BASE_ROOM_CONFIG(obj) \ #define TP_BASE_ROOM_CONFIG(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_BASE_ROOM_CONFIG, TpBaseRoomCo nfig)) (G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_BASE_ROOM_CONFIG, TpBaseRoomCo nfig))
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 file-transfer-channel.h   file-transfer-channel.h 
skipping to change at line 67 skipping to change at line 67
GType tp_file_transfer_channel_get_type (void); GType tp_file_transfer_channel_get_type (void);
/* Methods */ /* Methods */
TpFileTransferChannel * tp_file_transfer_channel_new (TpConnection *conn, TpFileTransferChannel * tp_file_transfer_channel_new (TpConnection *conn,
const gchar *object_path, const gchar *object_path,
const GHashTable *immutable_properties, const GHashTable *immutable_properties,
GError **error); GError **error);
void tp_file_transfer_channel_accept_file_async (TpFileTransferChannel *sel
f,
GFile *file,
guint64 offset,
GAsyncReadyCallback callback,
gpointer user_data);
gboolean tp_file_transfer_channel_accept_file_finish (
TpFileTransferChannel *self,
GAsyncResult *result,
GError **error);
void tp_file_transfer_channel_provide_file_async (TpFileTransferChannel *se
lf,
GFile *file,
GAsyncReadyCallback callback,
gpointer user_data);
gboolean tp_file_transfer_channel_provide_file_finish (
TpFileTransferChannel *self,
GAsyncResult *result,
GError **error);
/* Property accessors */ /* Property accessors */
const char * tp_file_transfer_channel_get_mime_type ( const char * tp_file_transfer_channel_get_mime_type (
TpFileTransferChannel *self); TpFileTransferChannel *self);
GDateTime * tp_file_transfer_channel_get_date (TpFileTransferChannel *self) ; GDateTime * tp_file_transfer_channel_get_date (TpFileTransferChannel *self) ;
TpFileTransferState tp_file_transfer_channel_get_state (
TpFileTransferChannel *self,
TpFileTransferStateChangeReason *reason);
const gchar * tp_file_transfer_channel_get_description ( const gchar * tp_file_transfer_channel_get_description (
TpFileTransferChannel *self); TpFileTransferChannel *self);
const gchar * tp_file_transfer_channel_get_filename ( const gchar * tp_file_transfer_channel_get_filename (
TpFileTransferChannel *self); TpFileTransferChannel *self);
guint64 tp_file_transfer_channel_get_size (TpFileTransferChannel *self); guint64 tp_file_transfer_channel_get_size (TpFileTransferChannel *self);
guint64 tp_file_transfer_channel_get_transferred_bytes ( guint64 tp_file_transfer_channel_get_transferred_bytes (
TpFileTransferChannel *self); TpFileTransferChannel *self);
/* Metadata */
const gchar * tp_file_transfer_channel_get_service_name (
TpFileTransferChannel *self);
const GHashTable * tp_file_transfer_channel_get_metadata (
TpFileTransferChannel *self);
G_END_DECLS G_END_DECLS
#endif #endif
 End of changes. 3 change blocks. 
0 lines changed or deleted 35 lines changed or added


 telepathy-enums.h   telepathy-enums.h 
skipping to change at line 394 skipping to change at line 394
typedef enum /*< flags >*/ { typedef enum /*< flags >*/ {
TP_DELIVERY_REPORTING_SUPPORT_FLAG_RECEIVE_FAILURES = 1, TP_DELIVERY_REPORTING_SUPPORT_FLAG_RECEIVE_FAILURES = 1,
TP_DELIVERY_REPORTING_SUPPORT_FLAG_RECEIVE_SUCCESSES = 2, TP_DELIVERY_REPORTING_SUPPORT_FLAG_RECEIVE_SUCCESSES = 2,
TP_DELIVERY_REPORTING_SUPPORT_FLAG_RECEIVE_READ = 4, TP_DELIVERY_REPORTING_SUPPORT_FLAG_RECEIVE_READ = 4,
TP_DELIVERY_REPORTING_SUPPORT_FLAG_RECEIVE_DELETED = 8, TP_DELIVERY_REPORTING_SUPPORT_FLAG_RECEIVE_DELETED = 8,
} TpDeliveryReportingSupportFlags; } TpDeliveryReportingSupportFlags;
typedef enum /*< flags >*/ { typedef enum /*< flags >*/ {
TP_CHANNEL_PASSWORD_FLAG_PROVIDE = 8, TP_CHANNEL_PASSWORD_FLAG_PROVIDE = 8,
TP_CHANNEL_PASSWORD_FLAG_HINT = 4,
} TpChannelPasswordFlags; } TpChannelPasswordFlags;
typedef enum { typedef enum {
TP_SASL_ABORT_REASON_INVALID_CHALLENGE = 0, TP_SASL_ABORT_REASON_INVALID_CHALLENGE = 0,
TP_SASL_ABORT_REASON_USER_ABORT = 1, TP_SASL_ABORT_REASON_USER_ABORT = 1,
} TpSASLAbortReason; } TpSASLAbortReason;
#define NUM_TP_SASL_ABORT_REASONS (1+1) #define NUM_TP_SASL_ABORT_REASONS (1+1)
typedef enum { typedef enum {
TP_SASL_STATUS_NOT_STARTED = 0, TP_SASL_STATUS_NOT_STARTED = 0,
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 telepathy-interfaces.h   telepathy-interfaces.h 
skipping to change at line 739 skipping to change at line 739
#define TP_PROP_CHANNEL_INTERFACE_DTMF_CURRENTLY_SENDING_TONES \ #define TP_PROP_CHANNEL_INTERFACE_DTMF_CURRENTLY_SENDING_TONES \
"org.freedesktop.Telepathy.Channel.Interface.DTMF.CurrentlySendingTones" "org.freedesktop.Telepathy.Channel.Interface.DTMF.CurrentlySendingTones"
#define TP_PROP_CHANNEL_INTERFACE_DTMF_INITIAL_TONES \ #define TP_PROP_CHANNEL_INTERFACE_DTMF_INITIAL_TONES \
"org.freedesktop.Telepathy.Channel.Interface.DTMF.InitialTones" "org.freedesktop.Telepathy.Channel.Interface.DTMF.InitialTones"
#define TP_PROP_CHANNEL_INTERFACE_DTMF_DEFERRED_TONES \ #define TP_PROP_CHANNEL_INTERFACE_DTMF_DEFERRED_TONES \
"org.freedesktop.Telepathy.Channel.Interface.DTMF.DeferredTones" "org.freedesktop.Telepathy.Channel.Interface.DTMF.DeferredTones"
#define TP_IFACE_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA \
"org.freedesktop.Telepathy.Channel.Interface.FileTransfer.Metadata"
#define TP_IFACE_QUARK_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA \
(tp_iface_quark_channel_interface_file_transfer_metadata ())
GQuark tp_iface_quark_channel_interface_file_transfer_metadata (void);
#define TP_PROP_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA_SERVICE_NAME \
"org.freedesktop.Telepathy.Channel.Interface.FileTransfer.Metadata.ServiceN
ame"
#define TP_PROP_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA_METADATA \
"org.freedesktop.Telepathy.Channel.Interface.FileTransfer.Metadata.Metadata
"
#define TP_IFACE_CHANNEL_INTERFACE_GROUP \ #define TP_IFACE_CHANNEL_INTERFACE_GROUP \
"org.freedesktop.Telepathy.Channel.Interface.Group" "org.freedesktop.Telepathy.Channel.Interface.Group"
#define TP_IFACE_QUARK_CHANNEL_INTERFACE_GROUP \ #define TP_IFACE_QUARK_CHANNEL_INTERFACE_GROUP \
(tp_iface_quark_channel_interface_group ()) (tp_iface_quark_channel_interface_group ())
GQuark tp_iface_quark_channel_interface_group (void); GQuark tp_iface_quark_channel_interface_group (void);
#define TP_PROP_CHANNEL_INTERFACE_GROUP_GROUP_FLAGS \ #define TP_PROP_CHANNEL_INTERFACE_GROUP_GROUP_FLAGS \
"org.freedesktop.Telepathy.Channel.Interface.Group.GroupFlags" "org.freedesktop.Telepathy.Channel.Interface.Group.GroupFlags"
skipping to change at line 841 skipping to change at line 855
(tp_iface_quark_channel_interface_room ()) (tp_iface_quark_channel_interface_room ())
GQuark tp_iface_quark_channel_interface_room (void); GQuark tp_iface_quark_channel_interface_room (void);
#define TP_PROP_CHANNEL_INTERFACE_ROOM_ROOM_NAME \ #define TP_PROP_CHANNEL_INTERFACE_ROOM_ROOM_NAME \
"org.freedesktop.Telepathy.Channel.Interface.Room2.RoomName" "org.freedesktop.Telepathy.Channel.Interface.Room2.RoomName"
#define TP_PROP_CHANNEL_INTERFACE_ROOM_SERVER \ #define TP_PROP_CHANNEL_INTERFACE_ROOM_SERVER \
"org.freedesktop.Telepathy.Channel.Interface.Room2.Server" "org.freedesktop.Telepathy.Channel.Interface.Room2.Server"
#define TP_PROP_CHANNEL_INTERFACE_ROOM_CREATOR \
"org.freedesktop.Telepathy.Channel.Interface.Room2.Creator"
#define TP_PROP_CHANNEL_INTERFACE_ROOM_CREATOR_HANDLE \
"org.freedesktop.Telepathy.Channel.Interface.Room2.CreatorHandle"
#define TP_PROP_CHANNEL_INTERFACE_ROOM_CREATION_TIMESTAMP \
"org.freedesktop.Telepathy.Channel.Interface.Room2.CreationTimestamp"
#define TP_IFACE_CHANNEL_INTERFACE_ROOM_CONFIG \ #define TP_IFACE_CHANNEL_INTERFACE_ROOM_CONFIG \
"org.freedesktop.Telepathy.Channel.Interface.RoomConfig1" "org.freedesktop.Telepathy.Channel.Interface.RoomConfig1"
#define TP_IFACE_QUARK_CHANNEL_INTERFACE_ROOM_CONFIG \ #define TP_IFACE_QUARK_CHANNEL_INTERFACE_ROOM_CONFIG \
(tp_iface_quark_channel_interface_room_config ()) (tp_iface_quark_channel_interface_room_config ())
GQuark tp_iface_quark_channel_interface_room_config (void); GQuark tp_iface_quark_channel_interface_room_config (void);
#define TP_PROP_CHANNEL_INTERFACE_ROOM_CONFIG_ANONYMOUS \ #define TP_PROP_CHANNEL_INTERFACE_ROOM_CONFIG_ANONYMOUS \
"org.freedesktop.Telepathy.Channel.Interface.RoomConfig1.Anonymous" "org.freedesktop.Telepathy.Channel.Interface.RoomConfig1.Anonymous"
skipping to change at line 879 skipping to change at line 902
#define TP_PROP_CHANNEL_INTERFACE_ROOM_CONFIG_PRIVATE \ #define TP_PROP_CHANNEL_INTERFACE_ROOM_CONFIG_PRIVATE \
"org.freedesktop.Telepathy.Channel.Interface.RoomConfig1.Private" "org.freedesktop.Telepathy.Channel.Interface.RoomConfig1.Private"
#define TP_PROP_CHANNEL_INTERFACE_ROOM_CONFIG_PASSWORD_PROTECTED \ #define TP_PROP_CHANNEL_INTERFACE_ROOM_CONFIG_PASSWORD_PROTECTED \
"org.freedesktop.Telepathy.Channel.Interface.RoomConfig1.PasswordProtected" "org.freedesktop.Telepathy.Channel.Interface.RoomConfig1.PasswordProtected"
#define TP_PROP_CHANNEL_INTERFACE_ROOM_CONFIG_PASSWORD \ #define TP_PROP_CHANNEL_INTERFACE_ROOM_CONFIG_PASSWORD \
"org.freedesktop.Telepathy.Channel.Interface.RoomConfig1.Password" "org.freedesktop.Telepathy.Channel.Interface.RoomConfig1.Password"
#define TP_PROP_CHANNEL_INTERFACE_ROOM_CONFIG_PASSWORD_HINT \
"org.freedesktop.Telepathy.Channel.Interface.RoomConfig1.PasswordHint"
#define TP_PROP_CHANNEL_INTERFACE_ROOM_CONFIG_CAN_UPDATE_CONFIGURATION \ #define TP_PROP_CHANNEL_INTERFACE_ROOM_CONFIG_CAN_UPDATE_CONFIGURATION \
"org.freedesktop.Telepathy.Channel.Interface.RoomConfig1.CanUpdateConfigura tion" "org.freedesktop.Telepathy.Channel.Interface.RoomConfig1.CanUpdateConfigura tion"
#define TP_PROP_CHANNEL_INTERFACE_ROOM_CONFIG_MUTABLE_PROPERTIES \ #define TP_PROP_CHANNEL_INTERFACE_ROOM_CONFIG_MUTABLE_PROPERTIES \
"org.freedesktop.Telepathy.Channel.Interface.RoomConfig1.MutableProperties" "org.freedesktop.Telepathy.Channel.Interface.RoomConfig1.MutableProperties"
#define TP_PROP_CHANNEL_INTERFACE_ROOM_CONFIG_CONFIGURATION_RETRIEVED \ #define TP_PROP_CHANNEL_INTERFACE_ROOM_CONFIG_CONFIGURATION_RETRIEVED \
"org.freedesktop.Telepathy.Channel.Interface.RoomConfig1.ConfigurationRetri eved" "org.freedesktop.Telepathy.Channel.Interface.RoomConfig1.ConfigurationRetri eved"
#define TP_IFACE_CHANNEL_INTERFACE_SASL_AUTHENTICATION \ #define TP_IFACE_CHANNEL_INTERFACE_SASL_AUTHENTICATION \
 End of changes. 3 change blocks. 
0 lines changed or deleted 28 lines changed or added


 tp-svc-channel.h   tp-svc-channel.h 
skipping to change at line 270 skipping to change at line 270
void tp_svc_channel_interface_destroyable_implement_destroy (TpSvcChannelIn terfaceDestroyableClass *klass, tp_svc_channel_interface_destroyable_destro y_impl impl); void tp_svc_channel_interface_destroyable_implement_destroy (TpSvcChannelIn terfaceDestroyableClass *klass, tp_svc_channel_interface_destroyable_destro y_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_channel_interface_destroyable_return_from_destroy (DBusGMethodI nvocation *context); void tp_svc_channel_interface_destroyable_return_from_destroy (DBusGMethodI nvocation *context);
static inline void static inline void
tp_svc_channel_interface_destroyable_return_from_destroy (DBusGMethodInvoca tion *context) tp_svc_channel_interface_destroyable_return_from_destroy (DBusGMethodInvoca tion *context)
{ {
dbus_g_method_return (context); dbus_g_method_return (context);
} }
typedef struct _TpSvcChannelInterfaceFileTransferMetadata TpSvcChannelInter
faceFileTransferMetadata;
typedef struct _TpSvcChannelInterfaceFileTransferMetadataClass TpSvcChannel
InterfaceFileTransferMetadataClass;
GType tp_svc_channel_interface_file_transfer_metadata_get_type (void);
#define TP_TYPE_SVC_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA \
(tp_svc_channel_interface_file_transfer_metadata_get_type ())
#define TP_SVC_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CHANNEL_INTERFACE_FILE_TRA
NSFER_METADATA, TpSvcChannelInterfaceFileTransferMetadata))
#define TP_IS_SVC_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CHANNEL_INTERFACE_FILE_TRA
NSFER_METADATA))
#define TP_SVC_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CHANNEL_INTERFACE_FILE_
TRANSFER_METADATA, TpSvcChannelInterfaceFileTransferMetadataClass))
typedef struct _TpSvcChannelInterfaceGroup TpSvcChannelInterfaceGroup; typedef struct _TpSvcChannelInterfaceGroup TpSvcChannelInterfaceGroup;
typedef struct _TpSvcChannelInterfaceGroupClass TpSvcChannelInterfaceGroupC lass; typedef struct _TpSvcChannelInterfaceGroupClass TpSvcChannelInterfaceGroupC lass;
GType tp_svc_channel_interface_group_get_type (void); GType tp_svc_channel_interface_group_get_type (void);
#define TP_TYPE_SVC_CHANNEL_INTERFACE_GROUP \ #define TP_TYPE_SVC_CHANNEL_INTERFACE_GROUP \
(tp_svc_channel_interface_group_get_type ()) (tp_svc_channel_interface_group_get_type ())
#define TP_SVC_CHANNEL_INTERFACE_GROUP(obj) \ #define TP_SVC_CHANNEL_INTERFACE_GROUP(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CHANNEL_INTERFACE_GROUP, T pSvcChannelInterfaceGroup)) (G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CHANNEL_INTERFACE_GROUP, T pSvcChannelInterfaceGroup))
#define TP_IS_SVC_CHANNEL_INTERFACE_GROUP(obj) \ #define TP_IS_SVC_CHANNEL_INTERFACE_GROUP(obj) \
 End of changes. 1 change blocks. 
0 lines changed or deleted 19 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/