channel.h   channel.h 
skipping to change at line 137 skipping to change at line 137
#define TP_CHANNEL_FEATURE_GROUP \ #define TP_CHANNEL_FEATURE_GROUP \
tp_channel_get_feature_quark_group () tp_channel_get_feature_quark_group ()
GQuark tp_channel_get_feature_quark_group (void) G_GNUC_CONST; GQuark tp_channel_get_feature_quark_group (void) G_GNUC_CONST;
#define TP_CHANNEL_FEATURE_CHAT_STATES \ #define TP_CHANNEL_FEATURE_CHAT_STATES \
tp_channel_get_feature_quark_chat_states () tp_channel_get_feature_quark_chat_states ()
GQuark tp_channel_get_feature_quark_chat_states (void) G_GNUC_CONST; GQuark tp_channel_get_feature_quark_chat_states (void) G_GNUC_CONST;
TpChannelChatState tp_channel_get_chat_state (TpChannel *self, TpChannelChatState tp_channel_get_chat_state (TpChannel *self,
TpHandle contact); TpHandle contact);
void tp_channel_leave_async (TpChannel *self,
TpChannelGroupChangeReason reason,
const gchar *message,
GAsyncReadyCallback callback,
gpointer user_data);
gboolean tp_channel_leave_finish (TpChannel *self,
GAsyncResult *result,
GError **error);
void tp_channel_close_async (TpChannel *self,
GAsyncReadyCallback callback,
gpointer user_data);
gboolean tp_channel_close_finish (TpChannel *self,
GAsyncResult *result,
GError **error);
G_END_DECLS G_END_DECLS
#include <telepathy-glib/_gen/tp-cli-channel.h> #include <telepathy-glib/_gen/tp-cli-channel.h>
#endif #endif
 End of changes. 1 change blocks. 
0 lines changed or deleted 18 lines changed or added


 cm-message.h   cm-message.h 
skipping to change at line 46 skipping to change at line 46
#define TP_CM_MESSAGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TP_ TYPE_CM_MESSAGE, TpCMMessageClass)) #define TP_CM_MESSAGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TP_ TYPE_CM_MESSAGE, TpCMMessageClass))
typedef struct _TpCMMessage TpCMMessage; typedef struct _TpCMMessage TpCMMessage;
typedef struct _TpCMMessageClass TpCMMessageClass; typedef struct _TpCMMessageClass TpCMMessageClass;
GType tp_cm_message_get_type (void); GType tp_cm_message_get_type (void);
TpMessage * tp_cm_message_new (TpBaseConnection *connection, TpMessage * tp_cm_message_new (TpBaseConnection *connection,
guint initial_parts); guint initial_parts);
TpMessage *tp_cm_message_new_text (TpBaseConnection *conn,
TpHandle sender,
TpChannelTextMessageType type,
const gchar *text);
void tp_cm_message_take_message (TpMessage *self, void tp_cm_message_take_message (TpMessage *self,
guint part, guint part,
const gchar *key, const gchar *key,
TpMessage *message); TpMessage *message);
TpHandle tp_cm_message_get_sender (TpMessage *self); TpHandle tp_cm_message_get_sender (TpMessage *self);
void tp_cm_message_set_sender (TpMessage *self, void tp_cm_message_set_sender (TpMessage *self,
TpHandle handle); TpHandle handle);
#ifndef TP_DISABLE_DEPRECATED #ifndef TP_DISABLE_DEPRECATED
 End of changes. 1 change blocks. 
0 lines changed or deleted 5 lines changed or added


 debug-ansi.h   debug-ansi.h 
/** /**
* SECTION:debug-ansi * SECTION:debug-ansi
* @title: ANSI codes for debug messages * @title: ANSI codes for debug messages
* @short_description: used to colorize log messages for clarity * @short_description: used to colorize log messages for "clarity"
* *
* This header provides some ANSI escapes you can use to make debug message s * This header provides some ANSI escapes you can use to make debug message s
* more colourful. Please use sparingly. * more colourful. Please use sparingly.
* *
* Deprecated: 0.13.3 * Deprecated: 0.13.3
*/ */
#ifndef __TP_DEBUG_ANSI_H__ #ifndef __TP_DEBUG_ANSI_H__
#define __TP_DEBUG_ANSI_H__ #define __TP_DEBUG_ANSI_H__
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 intset.h   intset.h 
skipping to change at line 135 skipping to change at line 135
* but it's now just a backwards compatibility typedef. * but it's now just a backwards compatibility typedef.
*/ */
typedef TpIntsetFastIter TpIntSetFastIter; typedef TpIntsetFastIter TpIntSetFastIter;
void tp_intset_fast_iter_init (TpIntsetFastIter *iter, void tp_intset_fast_iter_init (TpIntsetFastIter *iter,
const TpIntset *set); const TpIntset *set);
gboolean tp_intset_fast_iter_next (TpIntsetFastIter *iter, gboolean tp_intset_fast_iter_next (TpIntsetFastIter *iter,
guint *output); guint *output);
void tp_intset_union_update (TpIntset *self, const TpIntset *other);
void tp_intset_difference_update (TpIntset *self, const TpIntset *other);
G_END_DECLS G_END_DECLS
#endif /*__TP_INTSET_H__*/ #endif /*__TP_INTSET_H__*/
 End of changes. 1 change blocks. 
0 lines changed or deleted 3 lines changed or added


 message.h   message.h 
skipping to change at line 25 skipping to change at line 25
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software * License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
*/ */
#ifndef __TP_MESSAGE_H__ #ifndef __TP_MESSAGE_H__
#define __TP_MESSAGE_H__ #define __TP_MESSAGE_H__
#include <telepathy-glib/defs.h> #include <telepathy-glib/defs.h>
#include <telepathy-glib/enums.h>
#include <telepathy-glib/handle.h> #include <telepathy-glib/handle.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define TP_TYPE_MESSAGE (tp_message_get_type ()) #define TP_TYPE_MESSAGE (tp_message_get_type ())
#define TP_MESSAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TP_TYPE_MESSAGE , TpMessage)) #define TP_MESSAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TP_TYPE_MESSAGE , TpMessage))
#define TP_MESSAGE_CLASS(obj) (G_TYPE_CHECK_CLASS_CAST ((obj), TP_TYPE_MESS AGE, TpMessageClass)) #define TP_MESSAGE_CLASS(obj) (G_TYPE_CHECK_CLASS_CAST ((obj), TP_TYPE_MESS AGE, TpMessageClass))
#define TP_IS_MESSAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TP_TYPE_MESS AGE)) #define TP_IS_MESSAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TP_TYPE_MESS AGE))
#define TP_IS_MESSAGE_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE ((obj), TP_TYPE_M ESSAGE)) #define TP_IS_MESSAGE_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE ((obj), TP_TYPE_M ESSAGE))
#define TP_MESSAGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYP E_MESSAGE, TpMessageClass)) #define TP_MESSAGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYP E_MESSAGE, TpMessageClass))
skipping to change at line 88 skipping to change at line 89
void tp_message_take_message (TpMessage *self, guint part, const gchar *key , void tp_message_take_message (TpMessage *self, guint part, const gchar *key ,
TpMessage *message); TpMessage *message);
void tp_message_ref_handle (TpMessage *self, TpHandleType handle_type, void tp_message_ref_handle (TpMessage *self, TpHandleType handle_type,
TpHandle handle); TpHandle handle);
#endif #endif
gboolean tp_message_is_mutable (TpMessage *self); gboolean tp_message_is_mutable (TpMessage *self);
TpChannelTextMessageType tp_message_get_message_type (TpMessage *self);
const gchar *tp_message_get_token (TpMessage *self); const gchar *tp_message_get_token (TpMessage *self);
gint64 tp_message_get_sent_timestamp (TpMessage *self); gint64 tp_message_get_sent_timestamp (TpMessage *self);
gint64 tp_message_get_received_timestamp (TpMessage *self); gint64 tp_message_get_received_timestamp (TpMessage *self);
gboolean tp_message_is_scrollback (TpMessage *self); gboolean tp_message_is_scrollback (TpMessage *self);
gboolean tp_message_is_rescued (TpMessage *self); gboolean tp_message_is_rescued (TpMessage *self);
const gchar *tp_message_get_supersedes (TpMessage *self); const gchar *tp_message_get_supersedes (TpMessage *self);
const gchar *tp_message_get_specific_to_interface (TpMessage *self); const gchar *tp_message_get_specific_to_interface (TpMessage *self);
gboolean tp_message_is_delivery_report (TpMessage *self); gboolean tp_message_is_delivery_report (TpMessage *self);
G_END_DECLS G_END_DECLS
 End of changes. 2 change blocks. 
0 lines changed or deleted 2 lines changed or added


 telepathy-enums.h   telepathy-enums.h 
/* Generated from telepathy-glib /* Generated from telepathy-glib
*/ */
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
typedef enum { typedef enum /*< flags >*/ {
TP_CONN_MGR_PARAM_FLAG_REQUIRED = 1, TP_CONN_MGR_PARAM_FLAG_REQUIRED = 1,
TP_CONN_MGR_PARAM_FLAG_REGISTER = 2, TP_CONN_MGR_PARAM_FLAG_REGISTER = 2,
TP_CONN_MGR_PARAM_FLAG_HAS_DEFAULT = 4, TP_CONN_MGR_PARAM_FLAG_HAS_DEFAULT = 4,
TP_CONN_MGR_PARAM_FLAG_SECRET = 8, TP_CONN_MGR_PARAM_FLAG_SECRET = 8,
TP_CONN_MGR_PARAM_FLAG_DBUS_PROPERTY = 16, TP_CONN_MGR_PARAM_FLAG_DBUS_PROPERTY = 16,
} TpConnMgrParamFlags; } TpConnMgrParamFlags;
typedef enum { typedef enum {
TP_HANDLE_TYPE_NONE = 0, TP_HANDLE_TYPE_NONE = 0,
TP_HANDLE_TYPE_CONTACT = 1, TP_HANDLE_TYPE_CONTACT = 1,
skipping to change at line 54 skipping to change at line 54
TP_CONNECTION_STATUS_REASON_CERT_HOSTNAME_MISMATCH = 10, TP_CONNECTION_STATUS_REASON_CERT_HOSTNAME_MISMATCH = 10,
TP_CONNECTION_STATUS_REASON_CERT_FINGERPRINT_MISMATCH = 11, TP_CONNECTION_STATUS_REASON_CERT_FINGERPRINT_MISMATCH = 11,
TP_CONNECTION_STATUS_REASON_CERT_SELF_SIGNED = 12, TP_CONNECTION_STATUS_REASON_CERT_SELF_SIGNED = 12,
TP_CONNECTION_STATUS_REASON_CERT_OTHER_ERROR = 13, TP_CONNECTION_STATUS_REASON_CERT_OTHER_ERROR = 13,
TP_CONNECTION_STATUS_REASON_CERT_REVOKED = 14, TP_CONNECTION_STATUS_REASON_CERT_REVOKED = 14,
TP_CONNECTION_STATUS_REASON_CERT_INSECURE = 15, TP_CONNECTION_STATUS_REASON_CERT_INSECURE = 15,
TP_CONNECTION_STATUS_REASON_CERT_LIMIT_EXCEEDED = 16, TP_CONNECTION_STATUS_REASON_CERT_LIMIT_EXCEEDED = 16,
} TpConnectionStatusReason; } TpConnectionStatusReason;
#define NUM_TP_CONNECTION_STATUS_REASONS (16+1) #define NUM_TP_CONNECTION_STATUS_REASONS (16+1)
typedef enum { typedef enum /*< flags >*/ {
TP_CONNECTION_ALIAS_FLAG_USER_SET = 1, TP_CONNECTION_ALIAS_FLAG_USER_SET = 1,
} TpConnectionAliasFlags; } TpConnectionAliasFlags;
typedef enum { typedef enum /*< flags >*/ {
TP_ANONYMITY_MODE_CLIENT_INFO = 1, TP_ANONYMITY_MODE_CLIENT_INFO = 1,
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 { 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 { 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 { 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 {
TP_CONTACT_LIST_STATE_NONE = 0, TP_CONTACT_LIST_STATE_NONE = 0,
TP_CONTACT_LIST_STATE_WAITING = 1, TP_CONTACT_LIST_STATE_WAITING = 1,
TP_CONTACT_LIST_STATE_FAILURE = 2, TP_CONTACT_LIST_STATE_FAILURE = 2,
TP_CONTACT_LIST_STATE_SUCCESS = 3, TP_CONTACT_LIST_STATE_SUCCESS = 3,
} TpContactListState; } TpContactListState;
skipping to change at line 136 skipping to change at line 136
#define NUM_TP_ACCESS_CONTROL_TYPES (6+1) #define NUM_TP_ACCESS_CONTROL_TYPES (6+1)
typedef enum { 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 /*< flags >*/ {
TP_LOCATION_FEATURE_CAN_SET = 1, TP_LOCATION_FEATURE_CAN_SET = 1,
} TpLocationFeatures; } TpLocationFeatures;
typedef enum { typedef enum {
TP_SERVICE_POINT_TYPE_NONE = 0, TP_SERVICE_POINT_TYPE_NONE = 0,
TP_SERVICE_POINT_TYPE_EMERGENCY = 1, TP_SERVICE_POINT_TYPE_EMERGENCY = 1,
TP_SERVICE_POINT_TYPE_COUNSELING = 2, TP_SERVICE_POINT_TYPE_COUNSELING = 2,
} TpServicePointType; } TpServicePointType;
#define NUM_TP_SERVICE_POINT_TYPES (2+1) #define NUM_TP_SERVICE_POINT_TYPES (2+1)
typedef enum { typedef enum /*< flags >*/ {
TP_MAIL_NOTIFICATION_FLAG_SUPPORTS_UNREAD_MAIL_COUNT = 1, TP_MAIL_NOTIFICATION_FLAG_SUPPORTS_UNREAD_MAIL_COUNT = 1,
TP_MAIL_NOTIFICATION_FLAG_SUPPORTS_UNREAD_MAILS = 2, TP_MAIL_NOTIFICATION_FLAG_SUPPORTS_UNREAD_MAILS = 2,
TP_MAIL_NOTIFICATION_FLAG_EMITS_MAILS_RECEIVED = 4, TP_MAIL_NOTIFICATION_FLAG_EMITS_MAILS_RECEIVED = 4,
TP_MAIL_NOTIFICATION_FLAG_SUPPORTS_REQUEST_INBOX_URL = 8, TP_MAIL_NOTIFICATION_FLAG_SUPPORTS_REQUEST_INBOX_URL = 8,
TP_MAIL_NOTIFICATION_FLAG_SUPPORTS_REQUEST_MAIL_URL = 16, TP_MAIL_NOTIFICATION_FLAG_SUPPORTS_REQUEST_MAIL_URL = 16,
TP_MAIL_NOTIFICATION_FLAG_THREAD_BASED = 32, TP_MAIL_NOTIFICATION_FLAG_THREAD_BASED = 32,
} TpMailNotificationFlags; } TpMailNotificationFlags;
typedef enum { typedef enum {
TP_HTTP_METHOD_GET = 0, TP_HTTP_METHOD_GET = 0,
skipping to change at line 220 skipping to change at line 220
#define NUM_TP_MEDIA_STREAM_STATES (2+1) #define NUM_TP_MEDIA_STREAM_STATES (2+1)
typedef enum { typedef enum {
TP_MEDIA_STREAM_DIRECTION_NONE = 0, TP_MEDIA_STREAM_DIRECTION_NONE = 0,
TP_MEDIA_STREAM_DIRECTION_SEND = 1, TP_MEDIA_STREAM_DIRECTION_SEND = 1,
TP_MEDIA_STREAM_DIRECTION_RECEIVE = 2, TP_MEDIA_STREAM_DIRECTION_RECEIVE = 2,
TP_MEDIA_STREAM_DIRECTION_BIDIRECTIONAL = 3, TP_MEDIA_STREAM_DIRECTION_BIDIRECTIONAL = 3,
} TpMediaStreamDirection; } TpMediaStreamDirection;
#define NUM_TP_MEDIA_STREAM_DIRECTIONS (3+1) #define NUM_TP_MEDIA_STREAM_DIRECTIONS (3+1)
typedef enum { typedef enum /*< flags >*/ {
TP_MEDIA_STREAM_PENDING_LOCAL_SEND = 1, TP_MEDIA_STREAM_PENDING_LOCAL_SEND = 1,
TP_MEDIA_STREAM_PENDING_REMOTE_SEND = 2, TP_MEDIA_STREAM_PENDING_REMOTE_SEND = 2,
} TpMediaStreamPendingSend; } TpMediaStreamPendingSend;
typedef enum { typedef enum /*< flags >*/ {
TP_CHANNEL_MEDIA_CAPABILITY_AUDIO = 1, TP_CHANNEL_MEDIA_CAPABILITY_AUDIO = 1,
TP_CHANNEL_MEDIA_CAPABILITY_VIDEO = 2, TP_CHANNEL_MEDIA_CAPABILITY_VIDEO = 2,
TP_CHANNEL_MEDIA_CAPABILITY_NAT_TRAVERSAL_STUN = 4, TP_CHANNEL_MEDIA_CAPABILITY_NAT_TRAVERSAL_STUN = 4,
TP_CHANNEL_MEDIA_CAPABILITY_NAT_TRAVERSAL_GTALK_P2P = 8, TP_CHANNEL_MEDIA_CAPABILITY_NAT_TRAVERSAL_GTALK_P2P = 8,
TP_CHANNEL_MEDIA_CAPABILITY_NAT_TRAVERSAL_ICE_UDP = 16, TP_CHANNEL_MEDIA_CAPABILITY_NAT_TRAVERSAL_ICE_UDP = 16,
TP_CHANNEL_MEDIA_CAPABILITY_IMMUTABLE_STREAMS = 32, TP_CHANNEL_MEDIA_CAPABILITY_IMMUTABLE_STREAMS = 32,
} TpChannelMediaCapabilities; } TpChannelMediaCapabilities;
typedef enum { typedef enum {
TP_CHANNEL_TEXT_SEND_ERROR_UNKNOWN = 0, TP_CHANNEL_TEXT_SEND_ERROR_UNKNOWN = 0,
skipping to change at line 253 skipping to change at line 253
typedef enum { typedef enum {
TP_CHANNEL_TEXT_MESSAGE_TYPE_NORMAL = 0, TP_CHANNEL_TEXT_MESSAGE_TYPE_NORMAL = 0,
TP_CHANNEL_TEXT_MESSAGE_TYPE_ACTION = 1, TP_CHANNEL_TEXT_MESSAGE_TYPE_ACTION = 1,
TP_CHANNEL_TEXT_MESSAGE_TYPE_NOTICE = 2, TP_CHANNEL_TEXT_MESSAGE_TYPE_NOTICE = 2,
TP_CHANNEL_TEXT_MESSAGE_TYPE_AUTO_REPLY = 3, TP_CHANNEL_TEXT_MESSAGE_TYPE_AUTO_REPLY = 3,
TP_CHANNEL_TEXT_MESSAGE_TYPE_DELIVERY_REPORT = 4, TP_CHANNEL_TEXT_MESSAGE_TYPE_DELIVERY_REPORT = 4,
} TpChannelTextMessageType; } TpChannelTextMessageType;
#define NUM_TP_CHANNEL_TEXT_MESSAGE_TYPES (4+1) #define NUM_TP_CHANNEL_TEXT_MESSAGE_TYPES (4+1)
typedef enum { typedef enum /*< flags >*/ {
TP_CHANNEL_TEXT_MESSAGE_FLAG_TRUNCATED = 1, TP_CHANNEL_TEXT_MESSAGE_FLAG_TRUNCATED = 1,
TP_CHANNEL_TEXT_MESSAGE_FLAG_NON_TEXT_CONTENT = 2, TP_CHANNEL_TEXT_MESSAGE_FLAG_NON_TEXT_CONTENT = 2,
TP_CHANNEL_TEXT_MESSAGE_FLAG_SCROLLBACK = 4, TP_CHANNEL_TEXT_MESSAGE_FLAG_SCROLLBACK = 4,
TP_CHANNEL_TEXT_MESSAGE_FLAG_RESCUED = 8, TP_CHANNEL_TEXT_MESSAGE_FLAG_RESCUED = 8,
} TpChannelTextMessageFlags; } TpChannelTextMessageFlags;
typedef enum { typedef enum {
TP_TUBE_TYPE_DBUS = 0, TP_TUBE_TYPE_DBUS = 0,
TP_TUBE_TYPE_STREAM = 1, TP_TUBE_TYPE_STREAM = 1,
} TpTubeType; } TpTubeType;
#define NUM_TP_TUBE_TYPES (1+1) #define NUM_TP_TUBE_TYPES (1+1)
typedef enum { typedef enum {
TP_TUBE_STATE_LOCAL_PENDING = 0, TP_TUBE_STATE_LOCAL_PENDING = 0,
TP_TUBE_STATE_REMOTE_PENDING = 1, TP_TUBE_STATE_REMOTE_PENDING = 1,
TP_TUBE_STATE_OPEN = 2, TP_TUBE_STATE_OPEN = 2,
} TpTubeState; } TpTubeState;
#define NUM_TP_TUBE_STATES (2+1) #define NUM_TP_TUBE_STATES (2+1)
typedef enum { typedef enum /*< flags >*/ {
TP_CHANNEL_CALL_STATE_RINGING = 1, TP_CHANNEL_CALL_STATE_RINGING = 1,
TP_CHANNEL_CALL_STATE_QUEUED = 2, TP_CHANNEL_CALL_STATE_QUEUED = 2,
TP_CHANNEL_CALL_STATE_HELD = 4, TP_CHANNEL_CALL_STATE_HELD = 4,
TP_CHANNEL_CALL_STATE_FORWARDED = 8, TP_CHANNEL_CALL_STATE_FORWARDED = 8,
TP_CHANNEL_CALL_STATE_IN_PROGRESS = 16, TP_CHANNEL_CALL_STATE_IN_PROGRESS = 16,
TP_CHANNEL_CALL_STATE_CONFERENCE_HOST = 32, TP_CHANNEL_CALL_STATE_CONFERENCE_HOST = 32,
} TpChannelCallStateFlags; } TpChannelCallStateFlags;
typedef enum { typedef enum {
TP_CHANNEL_CHAT_STATE_GONE = 0, TP_CHANNEL_CHAT_STATE_GONE = 0,
skipping to change at line 311 skipping to change at line 311
TP_DTMF_EVENT_DIGIT_9 = 9, TP_DTMF_EVENT_DIGIT_9 = 9,
TP_DTMF_EVENT_ASTERISK = 10, TP_DTMF_EVENT_ASTERISK = 10,
TP_DTMF_EVENT_HASH = 11, TP_DTMF_EVENT_HASH = 11,
TP_DTMF_EVENT_LETTER_A = 12, TP_DTMF_EVENT_LETTER_A = 12,
TP_DTMF_EVENT_LETTER_B = 13, TP_DTMF_EVENT_LETTER_B = 13,
TP_DTMF_EVENT_LETTER_C = 14, TP_DTMF_EVENT_LETTER_C = 14,
TP_DTMF_EVENT_LETTER_D = 15, TP_DTMF_EVENT_LETTER_D = 15,
} TpDTMFEvent; } TpDTMFEvent;
#define NUM_TP_DTMF_EVENTS (15+1) #define NUM_TP_DTMF_EVENTS (15+1)
typedef enum { typedef enum /*< flags >*/ {
TP_CHANNEL_GROUP_FLAG_CAN_ADD = 1, TP_CHANNEL_GROUP_FLAG_CAN_ADD = 1,
TP_CHANNEL_GROUP_FLAG_CAN_REMOVE = 2, TP_CHANNEL_GROUP_FLAG_CAN_REMOVE = 2,
TP_CHANNEL_GROUP_FLAG_CAN_RESCIND = 4, TP_CHANNEL_GROUP_FLAG_CAN_RESCIND = 4,
TP_CHANNEL_GROUP_FLAG_MESSAGE_ADD = 8, TP_CHANNEL_GROUP_FLAG_MESSAGE_ADD = 8,
TP_CHANNEL_GROUP_FLAG_MESSAGE_REMOVE = 16, TP_CHANNEL_GROUP_FLAG_MESSAGE_REMOVE = 16,
TP_CHANNEL_GROUP_FLAG_MESSAGE_ACCEPT = 32, TP_CHANNEL_GROUP_FLAG_MESSAGE_ACCEPT = 32,
TP_CHANNEL_GROUP_FLAG_MESSAGE_REJECT = 64, TP_CHANNEL_GROUP_FLAG_MESSAGE_REJECT = 64,
TP_CHANNEL_GROUP_FLAG_MESSAGE_RESCIND = 128, TP_CHANNEL_GROUP_FLAG_MESSAGE_RESCIND = 128,
TP_CHANNEL_GROUP_FLAG_CHANNEL_SPECIFIC_HANDLES = 256, TP_CHANNEL_GROUP_FLAG_CHANNEL_SPECIFIC_HANDLES = 256,
TP_CHANNEL_GROUP_FLAG_ONLY_ONE_GROUP = 512, TP_CHANNEL_GROUP_FLAG_ONLY_ONE_GROUP = 512,
skipping to change at line 359 skipping to change at line 359
} TpLocalHoldState; } TpLocalHoldState;
#define NUM_TP_LOCAL_HOLD_STATES (3+1) #define NUM_TP_LOCAL_HOLD_STATES (3+1)
typedef enum { typedef enum {
TP_LOCAL_HOLD_STATE_REASON_NONE = 0, TP_LOCAL_HOLD_STATE_REASON_NONE = 0,
TP_LOCAL_HOLD_STATE_REASON_REQUESTED = 1, TP_LOCAL_HOLD_STATE_REASON_REQUESTED = 1,
TP_LOCAL_HOLD_STATE_REASON_RESOURCE_NOT_AVAILABLE = 2, TP_LOCAL_HOLD_STATE_REASON_RESOURCE_NOT_AVAILABLE = 2,
} TpLocalHoldStateReason; } TpLocalHoldStateReason;
#define NUM_TP_LOCAL_HOLD_STATE_REASONS (2+1) #define NUM_TP_LOCAL_HOLD_STATE_REASONS (2+1)
typedef enum { typedef enum /*< flags >*/ {
TP_MESSAGE_PART_SUPPORT_FLAG_ONE_ATTACHMENT = 1, TP_MESSAGE_PART_SUPPORT_FLAG_ONE_ATTACHMENT = 1,
TP_MESSAGE_PART_SUPPORT_FLAG_MULTIPLE_ATTACHMENTS = 2, TP_MESSAGE_PART_SUPPORT_FLAG_MULTIPLE_ATTACHMENTS = 2,
} TpMessagePartSupportFlags; } TpMessagePartSupportFlags;
typedef enum { typedef enum /*< flags >*/ {
TP_MESSAGE_SENDING_FLAG_REPORT_DELIVERY = 1, TP_MESSAGE_SENDING_FLAG_REPORT_DELIVERY = 1,
TP_MESSAGE_SENDING_FLAG_REPORT_READ = 2, TP_MESSAGE_SENDING_FLAG_REPORT_READ = 2,
TP_MESSAGE_SENDING_FLAG_REPORT_DELETED = 4, TP_MESSAGE_SENDING_FLAG_REPORT_DELETED = 4,
} TpMessageSendingFlags; } TpMessageSendingFlags;
typedef enum { typedef enum {
TP_DELIVERY_STATUS_UNKNOWN = 0, TP_DELIVERY_STATUS_UNKNOWN = 0,
TP_DELIVERY_STATUS_DELIVERED = 1, TP_DELIVERY_STATUS_DELIVERED = 1,
TP_DELIVERY_STATUS_TEMPORARILY_FAILED = 2, TP_DELIVERY_STATUS_TEMPORARILY_FAILED = 2,
TP_DELIVERY_STATUS_PERMANENTLY_FAILED = 3, TP_DELIVERY_STATUS_PERMANENTLY_FAILED = 3,
TP_DELIVERY_STATUS_ACCEPTED = 4, TP_DELIVERY_STATUS_ACCEPTED = 4,
TP_DELIVERY_STATUS_READ = 5, TP_DELIVERY_STATUS_READ = 5,
TP_DELIVERY_STATUS_DELETED = 6, TP_DELIVERY_STATUS_DELETED = 6,
} TpDeliveryStatus; } TpDeliveryStatus;
#define NUM_TP_DELIVERY_STATUSES (6+1) #define NUM_TP_DELIVERY_STATUSES (6+1)
typedef enum { 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 { typedef enum /*< flags >*/ {
TP_CHANNEL_PASSWORD_FLAG_PROVIDE = 8, TP_CHANNEL_PASSWORD_FLAG_PROVIDE = 8,
} 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 {
skipping to change at line 458 skipping to change at line 458
} TpMediaStreamBaseProto; } TpMediaStreamBaseProto;
#define NUM_TP_MEDIA_STREAM_BASE_PROTOS (1+1) #define NUM_TP_MEDIA_STREAM_BASE_PROTOS (1+1)
typedef enum { typedef enum {
TP_MEDIA_STREAM_TRANSPORT_TYPE_LOCAL = 0, TP_MEDIA_STREAM_TRANSPORT_TYPE_LOCAL = 0,
TP_MEDIA_STREAM_TRANSPORT_TYPE_DERIVED = 1, TP_MEDIA_STREAM_TRANSPORT_TYPE_DERIVED = 1,
TP_MEDIA_STREAM_TRANSPORT_TYPE_RELAY = 2, TP_MEDIA_STREAM_TRANSPORT_TYPE_RELAY = 2,
} TpMediaStreamTransportType; } TpMediaStreamTransportType;
#define NUM_TP_MEDIA_STREAM_TRANSPORT_TYPES (2+1) #define NUM_TP_MEDIA_STREAM_TRANSPORT_TYPES (2+1)
typedef enum { typedef enum /*< flags >*/ {
TP_PROPERTY_FLAG_READ = 1, TP_PROPERTY_FLAG_READ = 1,
TP_PROPERTY_FLAG_WRITE = 2, TP_PROPERTY_FLAG_WRITE = 2,
} TpPropertyFlags; } TpPropertyFlags;
typedef enum { typedef enum /*< flags >*/ {
TP_STORAGE_RESTRICTION_FLAG_CANNOT_SET_PARAMETERS = 1, TP_STORAGE_RESTRICTION_FLAG_CANNOT_SET_PARAMETERS = 1,
TP_STORAGE_RESTRICTION_FLAG_CANNOT_SET_ENABLED = 2, TP_STORAGE_RESTRICTION_FLAG_CANNOT_SET_ENABLED = 2,
TP_STORAGE_RESTRICTION_FLAG_CANNOT_SET_PRESENCE = 4, TP_STORAGE_RESTRICTION_FLAG_CANNOT_SET_PRESENCE = 4,
TP_STORAGE_RESTRICTION_FLAG_CANNOT_SET_SERVICE = 8, TP_STORAGE_RESTRICTION_FLAG_CANNOT_SET_SERVICE = 8,
} TpStorageRestrictionFlags; } TpStorageRestrictionFlags;
typedef enum { typedef enum {
TP_DEBUG_LEVEL_ERROR = 0, TP_DEBUG_LEVEL_ERROR = 0,
TP_DEBUG_LEVEL_CRITICAL = 1, TP_DEBUG_LEVEL_CRITICAL = 1,
TP_DEBUG_LEVEL_WARNING = 2, TP_DEBUG_LEVEL_WARNING = 2,
 End of changes. 19 change blocks. 
19 lines changed or deleted 19 lines changed or added


 telepathy-glib.h   telepathy-glib.h 
skipping to change at line 60 skipping to change at line 60
#include <telepathy-glib/dtmf.h> #include <telepathy-glib/dtmf.h>
#include <telepathy-glib/debug.h> #include <telepathy-glib/debug.h>
#include <telepathy-glib/handle.h> #include <telepathy-glib/handle.h>
#include <telepathy-glib/proxy.h> #include <telepathy-glib/proxy.h>
#include <telepathy-glib/signalled-message.h> #include <telepathy-glib/signalled-message.h>
#include <telepathy-glib/simple-approver.h> #include <telepathy-glib/simple-approver.h>
#include <telepathy-glib/simple-handler.h> #include <telepathy-glib/simple-handler.h>
#include <telepathy-glib/simple-observer.h> #include <telepathy-glib/simple-observer.h>
#include <telepathy-glib/stream-tube-channel.h> #include <telepathy-glib/stream-tube-channel.h>
#include <telepathy-glib/stream-tube-connection.h> #include <telepathy-glib/stream-tube-connection.h>
#include <telepathy-glib/text-channel.h>
#include <telepathy-glib/svc-generic.h> #include <telepathy-glib/svc-generic.h>
#include <telepathy-glib/svc-client.h> #include <telepathy-glib/svc-client.h>
#include <telepathy-glib/base-channel.h>
#include <telepathy-glib/base-connection.h>
#include <telepathy-glib/base-connection-manager.h>
#include <telepathy-glib/base-contact-list.h>
#include <telepathy-glib/base-protocol.h>
#undef __TP_IN_GLIB_H__ #undef __TP_IN_GLIB_H__
#endif /* __TP_GLIB_H__ */ #endif /* __TP_GLIB_H__ */
 End of changes. 2 change blocks. 
0 lines changed or deleted 7 lines changed or added


 tp-cli-connection.h   tp-cli-connection.h 
skipping to change at line 1094 skipping to change at line 1094
typedef void (*tp_cli_connection_interface_contact_list_signal_callback_con tact_list_state_changed) (TpConnection *proxy, typedef void (*tp_cli_connection_interface_contact_list_signal_callback_con tact_list_state_changed) (TpConnection *proxy,
guint arg_Contact_List_State, guint arg_Contact_List_State,
gpointer user_data, GObject *weak_object); gpointer user_data, GObject *weak_object);
TpProxySignalConnection *tp_cli_connection_interface_contact_list_connect_t o_contact_list_state_changed (TpConnection *proxy, TpProxySignalConnection *tp_cli_connection_interface_contact_list_connect_t o_contact_list_state_changed (TpConnection *proxy,
tp_cli_connection_interface_contact_list_signal_callback_contact_list_s tate_changed callback, tp_cli_connection_interface_contact_list_signal_callback_contact_list_s tate_changed callback,
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_contact_list_signal_callback_con
tacts_changed_with_id) (TpConnection *proxy,
GHashTable *arg_Changes,
GHashTable *arg_Identifiers,
GHashTable *arg_Removals,
gpointer user_data, GObject *weak_object);
TpProxySignalConnection *tp_cli_connection_interface_contact_list_connect_t
o_contacts_changed_with_id (TpConnection *proxy,
tp_cli_connection_interface_contact_list_signal_callback_contacts_chang
ed_with_id callback,
gpointer user_data,
GDestroyNotify destroy,
GObject *weak_object,
GError **error);
typedef void (*tp_cli_connection_interface_contact_list_signal_callback_con tacts_changed) (TpConnection *proxy, typedef void (*tp_cli_connection_interface_contact_list_signal_callback_con tacts_changed) (TpConnection *proxy,
GHashTable *arg_Changes, GHashTable *arg_Changes,
const GArray *arg_Removals, const GArray *arg_Removals,
gpointer user_data, GObject *weak_object); gpointer user_data, GObject *weak_object);
TpProxySignalConnection *tp_cli_connection_interface_contact_list_connect_t o_contacts_changed (TpConnection *proxy, TpProxySignalConnection *tp_cli_connection_interface_contact_list_connect_t o_contacts_changed (TpConnection *proxy,
tp_cli_connection_interface_contact_list_signal_callback_contacts_chang ed callback, tp_cli_connection_interface_contact_list_signal_callback_contacts_chang ed 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 15 lines changed or added


 tp-svc-connection.h   tp-svc-connection.h 
skipping to change at line 946 skipping to change at line 946
/* this comment is to stop gtkdoc realising this is static */ /* this comment is to stop gtkdoc realising this is static */
void tp_svc_connection_interface_contact_list_return_from_unpublish (DBusGM ethodInvocation *context); void tp_svc_connection_interface_contact_list_return_from_unpublish (DBusGM ethodInvocation *context);
static inline void static inline void
tp_svc_connection_interface_contact_list_return_from_unpublish (DBusGMethod Invocation *context) tp_svc_connection_interface_contact_list_return_from_unpublish (DBusGMethod Invocation *context)
{ {
dbus_g_method_return (context); dbus_g_method_return (context);
} }
void tp_svc_connection_interface_contact_list_emit_contact_list_state_chang ed (gpointer instance, void tp_svc_connection_interface_contact_list_emit_contact_list_state_chang ed (gpointer instance,
guint arg_Contact_List_State); guint arg_Contact_List_State);
void tp_svc_connection_interface_contact_list_emit_contacts_changed_with_id
(gpointer instance,
GHashTable *arg_Changes,
GHashTable *arg_Identifiers,
GHashTable *arg_Removals);
void tp_svc_connection_interface_contact_list_emit_contacts_changed (gpoint er instance, void tp_svc_connection_interface_contact_list_emit_contacts_changed (gpoint er instance,
GHashTable *arg_Changes, GHashTable *arg_Changes,
const GArray *arg_Removals); const GArray *arg_Removals);
typedef struct _TpSvcConnectionInterfaceContacts TpSvcConnectionInterfaceCo ntacts; typedef struct _TpSvcConnectionInterfaceContacts TpSvcConnectionInterfaceCo ntacts;
typedef struct _TpSvcConnectionInterfaceContactsClass TpSvcConnectionInterf aceContactsClass; typedef struct _TpSvcConnectionInterfaceContactsClass TpSvcConnectionInterf aceContactsClass;
GType tp_svc_connection_interface_contacts_get_type (void); GType tp_svc_connection_interface_contacts_get_type (void);
#define TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACTS \ #define TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACTS \
 End of changes. 1 change blocks. 
0 lines changed or deleted 5 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/