error-str.h   error-str.h 
skipping to change at line 23 skipping to change at line 23
#define TP_ERROR_STR_AUTHENTICATION_FAILED "org.freedesktop.Telepathy.Error .AuthenticationFailed" #define TP_ERROR_STR_AUTHENTICATION_FAILED "org.freedesktop.Telepathy.Error .AuthenticationFailed"
#define TP_ERROR_STR_ENCRYPTION_NOT_AVAILABLE "org.freedesktop.Telepathy.Er ror.EncryptionNotAvailable" #define TP_ERROR_STR_ENCRYPTION_NOT_AVAILABLE "org.freedesktop.Telepathy.Er ror.EncryptionNotAvailable"
#define TP_ERROR_STR_ENCRYPTION_ERROR "org.freedesktop.Telepathy.Error.Encr yptionError" #define TP_ERROR_STR_ENCRYPTION_ERROR "org.freedesktop.Telepathy.Error.Encr yptionError"
#define TP_ERROR_STR_CERT_NOT_PROVIDED "org.freedesktop.Telepathy.Error.Cer t.NotProvided" #define TP_ERROR_STR_CERT_NOT_PROVIDED "org.freedesktop.Telepathy.Error.Cer t.NotProvided"
#define TP_ERROR_STR_CERT_UNTRUSTED "org.freedesktop.Telepathy.Error.Cert.U ntrusted" #define TP_ERROR_STR_CERT_UNTRUSTED "org.freedesktop.Telepathy.Error.Cert.U ntrusted"
#define TP_ERROR_STR_CERT_EXPIRED "org.freedesktop.Telepathy.Error.Cert.Exp ired" #define TP_ERROR_STR_CERT_EXPIRED "org.freedesktop.Telepathy.Error.Cert.Exp ired"
#define TP_ERROR_STR_CERT_NOT_ACTIVATED "org.freedesktop.Telepathy.Error.Ce rt.NotActivated" #define TP_ERROR_STR_CERT_NOT_ACTIVATED "org.freedesktop.Telepathy.Error.Ce rt.NotActivated"
#define TP_ERROR_STR_CERT_FINGERPRINT_MISMATCH "org.freedesktop.Telepathy.E rror.Cert.FingerprintMismatch" #define TP_ERROR_STR_CERT_FINGERPRINT_MISMATCH "org.freedesktop.Telepathy.E rror.Cert.FingerprintMismatch"
#define TP_ERROR_STR_CERT_HOSTNAME_MISMATCH "org.freedesktop.Telepathy.Erro r.Cert.HostnameMismatch" #define TP_ERROR_STR_CERT_HOSTNAME_MISMATCH "org.freedesktop.Telepathy.Erro r.Cert.HostnameMismatch"
#define TP_ERROR_STR_CERT_SELF_SIGNED "org.freedesktop.Telepathy.Error.Cert .SelfSigned" #define TP_ERROR_STR_CERT_SELF_SIGNED "org.freedesktop.Telepathy.Error.Cert .SelfSigned"
#define TP_ERROR_STR_CERT_REVOKED "org.freedesktop.Telepathy.Error.Cert.Rev
oked"
#define TP_ERROR_STR_CERT_INSECURE "org.freedesktop.Telepathy.Error.Cert.In
secure"
#define TP_ERROR_STR_CERT_INVALID "org.freedesktop.Telepathy.Error.Cert.Inv alid" #define TP_ERROR_STR_CERT_INVALID "org.freedesktop.Telepathy.Error.Cert.Inv alid"
#define TP_ERROR_STR_CERT_LIMIT_EXCEEDED "org.freedesktop.Telepathy.Error.C ert.LimitExceeded"
#define TP_ERROR_STR_NOT_CAPABLE "org.freedesktop.Telepathy.Error.NotCapabl e" #define TP_ERROR_STR_NOT_CAPABLE "org.freedesktop.Telepathy.Error.NotCapabl e"
#define TP_ERROR_STR_OFFLINE "org.freedesktop.Telepathy.Error.Offline" #define TP_ERROR_STR_OFFLINE "org.freedesktop.Telepathy.Error.Offline"
#define TP_ERROR_STR_CHANNEL_KICKED "org.freedesktop.Telepathy.Error.Channe l.Kicked" #define TP_ERROR_STR_CHANNEL_KICKED "org.freedesktop.Telepathy.Error.Channe l.Kicked"
#define TP_ERROR_STR_BUSY "org.freedesktop.Telepathy.Error.Busy" #define TP_ERROR_STR_BUSY "org.freedesktop.Telepathy.Error.Busy"
#define TP_ERROR_STR_NO_ANSWER "org.freedesktop.Telepathy.Error.NoAnswer" #define TP_ERROR_STR_NO_ANSWER "org.freedesktop.Telepathy.Error.NoAnswer"
#define TP_ERROR_STR_DOES_NOT_EXIST "org.freedesktop.Telepathy.Error.DoesNo tExist" #define TP_ERROR_STR_DOES_NOT_EXIST "org.freedesktop.Telepathy.Error.DoesNo tExist"
#define TP_ERROR_STR_TERMINATED "org.freedesktop.Telepathy.Error.Terminated " #define TP_ERROR_STR_TERMINATED "org.freedesktop.Telepathy.Error.Terminated "
#define TP_ERROR_STR_CONNECTION_REFUSED "org.freedesktop.Telepathy.Error.Co nnectionRefused" #define TP_ERROR_STR_CONNECTION_REFUSED "org.freedesktop.Telepathy.Error.Co nnectionRefused"
#define TP_ERROR_STR_CONNECTION_FAILED "org.freedesktop.Telepathy.Error.Con nectionFailed" #define TP_ERROR_STR_CONNECTION_FAILED "org.freedesktop.Telepathy.Error.Con nectionFailed"
#define TP_ERROR_STR_CONNECTION_LOST "org.freedesktop.Telepathy.Error.Conne ctionLost" #define TP_ERROR_STR_CONNECTION_LOST "org.freedesktop.Telepathy.Error.Conne ctionLost"
 End of changes. 2 change blocks. 
0 lines changed or deleted 5 lines changed or added


 errors.h   errors.h 
skipping to change at line 81 skipping to change at line 81
TP_ERROR_TERMINATED, /*< nick=Terminated >*/ TP_ERROR_TERMINATED, /*< nick=Terminated >*/
TP_ERROR_CONNECTION_REFUSED, /*< nick=ConnectionRefused >*/ TP_ERROR_CONNECTION_REFUSED, /*< nick=ConnectionRefused >*/
TP_ERROR_CONNECTION_FAILED, /*< nick=ConnectionFailed >*/ TP_ERROR_CONNECTION_FAILED, /*< nick=ConnectionFailed >*/
TP_ERROR_CONNECTION_LOST, /*< nick=ConnectionLost >*/ TP_ERROR_CONNECTION_LOST, /*< nick=ConnectionLost >*/
TP_ERROR_ALREADY_CONNECTED, /*< nick=AlreadyConnected >*/ TP_ERROR_ALREADY_CONNECTED, /*< nick=AlreadyConnected >*/
TP_ERROR_CONNECTION_REPLACED, /*< nick=ConnectionReplaced >*/ TP_ERROR_CONNECTION_REPLACED, /*< nick=ConnectionReplaced >*/
TP_ERROR_REGISTRATION_EXISTS, /*< nick=RegistrationExists >*/ TP_ERROR_REGISTRATION_EXISTS, /*< nick=RegistrationExists >*/
TP_ERROR_SERVICE_BUSY, /*< nick=ServiceBusy >*/ TP_ERROR_SERVICE_BUSY, /*< nick=ServiceBusy >*/
TP_ERROR_RESOURCE_UNAVAILABLE, /*< nick=ResourceUnavailable >*/ TP_ERROR_RESOURCE_UNAVAILABLE, /*< nick=ResourceUnavailable >*/
TP_ERROR_WOULD_BREAK_ANONYMITY, /*< nick=WouldBreakAnonymity >*/ TP_ERROR_WOULD_BREAK_ANONYMITY, /*< nick=WouldBreakAnonymity >*/
TP_ERROR_CERT_REVOKED, /*< nick=Cert.Revoked >*/
TP_ERROR_CERT_INSECURE, /*< nick=Cert.Insecure >*/
TP_ERROR_CERT_LIMIT_EXCEEDED, /*< nick=Cert.LimitExceeded >*/
} TpError; } TpError;
const gchar *tp_error_get_dbus_name (TpError error); const gchar *tp_error_get_dbus_name (TpError error);
G_END_DECLS G_END_DECLS
#endif #endif
 End of changes. 1 change blocks. 
0 lines changed or deleted 3 lines changed or added


 telepathy-enums.h   telepathy-enums.h 
skipping to change at line 48 skipping to change at line 48
TP_CONNECTION_STATUS_REASON_ENCRYPTION_ERROR = 4, TP_CONNECTION_STATUS_REASON_ENCRYPTION_ERROR = 4,
TP_CONNECTION_STATUS_REASON_NAME_IN_USE = 5, TP_CONNECTION_STATUS_REASON_NAME_IN_USE = 5,
TP_CONNECTION_STATUS_REASON_CERT_NOT_PROVIDED = 6, TP_CONNECTION_STATUS_REASON_CERT_NOT_PROVIDED = 6,
TP_CONNECTION_STATUS_REASON_CERT_UNTRUSTED = 7, TP_CONNECTION_STATUS_REASON_CERT_UNTRUSTED = 7,
TP_CONNECTION_STATUS_REASON_CERT_EXPIRED = 8, TP_CONNECTION_STATUS_REASON_CERT_EXPIRED = 8,
TP_CONNECTION_STATUS_REASON_CERT_NOT_ACTIVATED = 9, TP_CONNECTION_STATUS_REASON_CERT_NOT_ACTIVATED = 9,
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_INSECURE = 15,
TP_CONNECTION_STATUS_REASON_CERT_LIMIT_EXCEEDED = 16,
} TpConnectionStatusReason; } TpConnectionStatusReason;
#define NUM_TP_CONNECTION_STATUS_REASONS (13+1) #define NUM_TP_CONNECTION_STATUS_REASONS (16+1)
typedef enum { typedef enum {
TP_CONNECTION_ALIAS_FLAG_USER_SET = 1, TP_CONNECTION_ALIAS_FLAG_USER_SET = 1,
} TpConnectionAliasFlags; } TpConnectionAliasFlags;
typedef enum { typedef enum {
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;
skipping to change at line 224 skipping to change at line 227
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 {
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,
} TpChannelCallStateFlags; } TpChannelCallStateFlags;
typedef enum { typedef enum {
TP_CHANNEL_CHAT_STATE_GONE = 0, TP_CHANNEL_CHAT_STATE_GONE = 0,
TP_CHANNEL_CHAT_STATE_INACTIVE = 1, TP_CHANNEL_CHAT_STATE_INACTIVE = 1,
TP_CHANNEL_CHAT_STATE_ACTIVE = 2, TP_CHANNEL_CHAT_STATE_ACTIVE = 2,
TP_CHANNEL_CHAT_STATE_PAUSED = 3, TP_CHANNEL_CHAT_STATE_PAUSED = 3,
TP_CHANNEL_CHAT_STATE_COMPOSING = 4, TP_CHANNEL_CHAT_STATE_COMPOSING = 4,
} TpChannelChatState; } TpChannelChatState;
#define NUM_TP_CHANNEL_CHAT_STATES (4+1) #define NUM_TP_CHANNEL_CHAT_STATES (4+1)
 End of changes. 3 change blocks. 
1 lines changed or deleted 5 lines changed or added


 telepathy-glib.h   telepathy-glib.h 
skipping to change at line 42 skipping to change at line 42
#include <telepathy-glib/intset.h> #include <telepathy-glib/intset.h>
#include <telepathy-glib/heap.h> #include <telepathy-glib/heap.h>
#include <telepathy-glib/base-client.h> #include <telepathy-glib/base-client.h>
#include <telepathy-glib/proxy.h> #include <telepathy-glib/proxy.h>
#include <telepathy-glib/dbus.h> #include <telepathy-glib/dbus.h>
#include <telepathy-glib/channel.h> #include <telepathy-glib/channel.h>
#include <telepathy-glib/connection.h> #include <telepathy-glib/connection.h>
#include <telepathy-glib/connection-manager.h> #include <telepathy-glib/connection-manager.h>
#include <telepathy-glib/account.h> #include <telepathy-glib/account.h>
#include <telepathy-glib/account-channel-request.h>
#include <telepathy-glib/account-manager.h> #include <telepathy-glib/account-manager.h>
#include <telepathy-glib/channel-dispatcher.h> #include <telepathy-glib/channel-dispatcher.h>
#include <telepathy-glib/channel-dispatch-operation.h> #include <telepathy-glib/channel-dispatch-operation.h>
#include <telepathy-glib/channel-request.h> #include <telepathy-glib/channel-request.h>
#include <telepathy-glib/handle.h> #include <telepathy-glib/handle.h>
#include <telepathy-glib/contact.h> #include <telepathy-glib/contact.h>
#include <telepathy-glib/debug.h> #include <telepathy-glib/debug.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>
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 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/