account.h   account.h 
/* /*
* account-manager.h - proxy for an account in the Telepathy account manage r * account-manager.h - proxy for an account in the Telepathy account manage r
* *
* Copyright (C) 2009 Collabora Ltd. <http://www.collabora.co.uk/> * Copyright (C) 2009-2012 Collabora Ltd. <http://www.collabora.co.uk/>
* Copyright (C) 2009 Nokia Corporation * Copyright (C) 2009 Nokia Corporation
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either * License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version. * version 2.1 of the License, or (at your option) any later version.
* *
* This library is distributed in the hope that it will be useful, * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
skipping to change at line 209 skipping to change at line 209
const GHashTable *tp_account_get_parameters (TpAccount *account); const GHashTable *tp_account_get_parameters (TpAccount *account);
const gchar *tp_account_get_nickname (TpAccount *account); const gchar *tp_account_get_nickname (TpAccount *account);
void tp_account_set_nickname_async (TpAccount *account, void tp_account_set_nickname_async (TpAccount *account,
const gchar *nickname, GAsyncReadyCallback callback, gpointer user_data ); const gchar *nickname, GAsyncReadyCallback callback, gpointer user_data );
gboolean tp_account_set_nickname_finish (TpAccount *account, gboolean tp_account_set_nickname_finish (TpAccount *account,
GAsyncResult *result, GError **error); GAsyncResult *result, GError **error);
const gchar * const *
/* ugh, gtk-doc */
tp_account_get_supersedes (TpAccount *self);
void tp_account_get_avatar_async (TpAccount *account, void tp_account_get_avatar_async (TpAccount *account,
GAsyncReadyCallback callback, gpointer user_data); GAsyncReadyCallback callback, gpointer user_data);
const GArray *tp_account_get_avatar_finish (TpAccount *account, const GArray *tp_account_get_avatar_finish (TpAccount *account,
GAsyncResult *result, GError **error); GAsyncResult *result, GError **error);
gboolean tp_account_is_prepared (TpAccount *account, GQuark feature); gboolean tp_account_is_prepared (TpAccount *account, GQuark feature);
void tp_account_prepare_async (TpAccount *account, void tp_account_prepare_async (TpAccount *account,
const GQuark *features, const GQuark *features,
 End of changes. 2 change blocks. 
1 lines changed or deleted 5 lines changed or added


 automatic-client-factory.h   automatic-client-factory.h 
skipping to change at line 24 skipping to change at line 24
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* 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_AUTOMATIC_CLIENT_FACTORY_H__ #ifndef __TP_AUTOMATIC_CLIENT_FACTORY_H__
#define __TP_AUTOMATIC_CLIENT_FACTORY_H__ #define __TP_AUTOMATIC_CLIENT_FACTORY_H__
#include <telepathy-glib/call-channel.h>
#include <telepathy-glib/dbus-tube-channel.h> #include <telepathy-glib/dbus-tube-channel.h>
#include <telepathy-glib/file-transfer-channel.h> #include <telepathy-glib/file-transfer-channel.h>
#include <telepathy-glib/simple-client-factory.h> #include <telepathy-glib/simple-client-factory.h>
#include <telepathy-glib/stream-tube-channel.h> #include <telepathy-glib/stream-tube-channel.h>
#include <telepathy-glib/text-channel.h> #include <telepathy-glib/text-channel.h>
G_BEGIN_DECLS G_BEGIN_DECLS
typedef struct _TpAutomaticClientFactory TpAutomaticClientFactory; typedef struct _TpAutomaticClientFactory TpAutomaticClientFactory;
typedef struct _TpAutomaticClientFactoryClass TpAutomaticClientFactoryClass ; typedef struct _TpAutomaticClientFactoryClass TpAutomaticClientFactoryClass ;
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 base-channel.h   base-channel.h 
skipping to change at line 42 skipping to change at line 42
G_BEGIN_DECLS G_BEGIN_DECLS
typedef struct _TpBaseChannel TpBaseChannel; typedef struct _TpBaseChannel TpBaseChannel;
typedef struct _TpBaseChannelClass TpBaseChannelClass; typedef struct _TpBaseChannelClass TpBaseChannelClass;
typedef struct _TpBaseChannelPrivate TpBaseChannelPrivate; typedef struct _TpBaseChannelPrivate TpBaseChannelPrivate;
typedef void (*TpBaseChannelCloseFunc) (TpBaseChannel *chan); typedef void (*TpBaseChannelCloseFunc) (TpBaseChannel *chan);
typedef void (*TpBaseChannelFillPropertiesFunc) (TpBaseChannel *chan, typedef void (*TpBaseChannelFillPropertiesFunc) (TpBaseChannel *chan,
GHashTable *properties); GHashTable *properties);
typedef gchar *(*TpBaseChannelGetPathFunc) (TpBaseChannel *chan); typedef gchar *(*TpBaseChannelGetPathFunc) (TpBaseChannel *chan);
typedef GPtrArray *(*TpBaseChannelGetInterfacesFunc) (TpBaseChannel *chan);
struct _TpBaseChannelClass struct _TpBaseChannelClass
{ {
/*< private >*/ /*< private >*/
GObjectClass parent_class; GObjectClass parent_class;
/*< public >*/ /*< public >*/
TpDBusPropertiesMixinClass dbus_props_class; TpDBusPropertiesMixinClass dbus_props_class;
const gchar *channel_type; const gchar *channel_type;
TpHandleType target_handle_type; TpHandleType target_handle_type;
const gchar **interfaces; const gchar **interfaces;
TpBaseChannelCloseFunc close; TpBaseChannelCloseFunc close;
TpBaseChannelFillPropertiesFunc fill_immutable_properties; TpBaseChannelFillPropertiesFunc fill_immutable_properties;
TpBaseChannelGetPathFunc get_object_path_suffix; TpBaseChannelGetPathFunc get_object_path_suffix;
TpBaseChannelGetInterfacesFunc get_interfaces;
/*< private >*/ /*< private >*/
GCallback _reserved[10]; GCallback _reserved[9];
}; };
struct _TpBaseChannel struct _TpBaseChannel
{ {
/*< private >*/ /*< private >*/
GObject parent; GObject parent;
TpBaseChannelPrivate *priv; TpBaseChannelPrivate *priv;
}; };
void tp_base_channel_register (TpBaseChannel *chan); void tp_base_channel_register (TpBaseChannel *chan);
void tp_base_channel_close (TpBaseChannel *chan); void tp_base_channel_close (TpBaseChannel *chan);
void tp_base_channel_destroyed (TpBaseChannel *chan); void tp_base_channel_destroyed (TpBaseChannel *chan);
void tp_base_channel_reopened (TpBaseChannel *chan, TpHandle initiator); void tp_base_channel_reopened (TpBaseChannel *chan, TpHandle initiator);
const gchar *tp_base_channel_get_object_path (TpBaseChannel *chan); const gchar *tp_base_channel_get_object_path (TpBaseChannel *chan);
TpBaseConnection *tp_base_channel_get_connection (TpBaseChannel *chan); TpBaseConnection *tp_base_channel_get_connection (TpBaseChannel *chan);
TpHandle tp_base_channel_get_self_handle (TpBaseChannel *chan);
TpHandle tp_base_channel_get_target_handle (TpBaseChannel *chan); TpHandle tp_base_channel_get_target_handle (TpBaseChannel *chan);
TpHandle tp_base_channel_get_initiator (TpBaseChannel *chan); TpHandle tp_base_channel_get_initiator (TpBaseChannel *chan);
gboolean tp_base_channel_is_requested (TpBaseChannel *chan); gboolean tp_base_channel_is_requested (TpBaseChannel *chan);
gboolean tp_base_channel_is_registered (TpBaseChannel *chan); gboolean tp_base_channel_is_registered (TpBaseChannel *chan);
gboolean tp_base_channel_is_destroyed (TpBaseChannel *chan); gboolean tp_base_channel_is_destroyed (TpBaseChannel *chan);
GType tp_base_channel_get_type (void); GType tp_base_channel_get_type (void);
/* TYPE MACROS */ /* TYPE MACROS */
#define TP_TYPE_BASE_CHANNEL \ #define TP_TYPE_BASE_CHANNEL \
 End of changes. 4 change blocks. 
1 lines changed or deleted 4 lines changed or added


 connection.h   connection.h 
skipping to change at line 295 skipping to change at line 295
gboolean tp_connection_can_set_contact_alias (TpConnection *self); gboolean tp_connection_can_set_contact_alias (TpConnection *self);
#define TP_CONNECTION_FEATURE_BALANCE \ #define TP_CONNECTION_FEATURE_BALANCE \
(tp_connection_get_feature_quark_balance ()) (tp_connection_get_feature_quark_balance ())
GQuark tp_connection_get_feature_quark_balance (void) G_GNUC_CONST; GQuark tp_connection_get_feature_quark_balance (void) G_GNUC_CONST;
gboolean tp_connection_get_balance (TpConnection *self, gboolean tp_connection_get_balance (TpConnection *self,
gint *balance, guint *scale, const gchar **currency); gint *balance, guint *scale, const gchar **currency);
const gchar * tp_connection_get_balance_uri (TpConnection *self); const gchar * tp_connection_get_balance_uri (TpConnection *self);
void tp_connection_disconnect_async (TpConnection *self,
GAsyncReadyCallback callback,
gpointer user_data);
gboolean tp_connection_disconnect_finish (TpConnection *self,
GAsyncResult *result,
GError **error);
G_END_DECLS G_END_DECLS
#include <telepathy-glib/_gen/tp-cli-connection.h> #include <telepathy-glib/_gen/tp-cli-connection.h>
G_BEGIN_DECLS G_BEGIN_DECLS
/* connection-handles.c again - this has to come after the auto-generated /* connection-handles.c again - this has to come after the auto-generated
* stuff because it uses an auto-generated typedef */ * stuff because it uses an auto-generated typedef */
void tp_connection_get_contact_attributes (TpConnection *self, void tp_connection_get_contact_attributes (TpConnection *self,
 End of changes. 1 change blocks. 
0 lines changed or deleted 7 lines changed or added


 error-str.h   error-str.h 
skipping to change at line 54 skipping to change at line 54
#define TP_ERROR_STR_RESOURCE_UNAVAILABLE "org.freedesktop.Telepathy.Error. ResourceUnavailable" #define TP_ERROR_STR_RESOURCE_UNAVAILABLE "org.freedesktop.Telepathy.Error. ResourceUnavailable"
#define TP_ERROR_STR_WOULD_BREAK_ANONYMITY "org.freedesktop.Telepathy.Error .WouldBreakAnonymity" #define TP_ERROR_STR_WOULD_BREAK_ANONYMITY "org.freedesktop.Telepathy.Error .WouldBreakAnonymity"
#define TP_ERROR_STR_NOT_YET "org.freedesktop.Telepathy.Error.NotYet" #define TP_ERROR_STR_NOT_YET "org.freedesktop.Telepathy.Error.NotYet"
#define TP_ERROR_STR_REJECTED "org.freedesktop.Telepathy.Error.Rejected" #define TP_ERROR_STR_REJECTED "org.freedesktop.Telepathy.Error.Rejected"
#define TP_ERROR_STR_PICKED_UP_ELSEWHERE "org.freedesktop.Telepathy.Error.P ickedUpElsewhere" #define TP_ERROR_STR_PICKED_UP_ELSEWHERE "org.freedesktop.Telepathy.Error.P ickedUpElsewhere"
#define TP_ERROR_STR_SERVICE_CONFUSED "org.freedesktop.Telepathy.Error.Serv iceConfused" #define TP_ERROR_STR_SERVICE_CONFUSED "org.freedesktop.Telepathy.Error.Serv iceConfused"
#define TP_ERROR_STR_CONFUSED "org.freedesktop.Telepathy.Error.Confused" #define TP_ERROR_STR_CONFUSED "org.freedesktop.Telepathy.Error.Confused"
#define TP_ERROR_STR_SOFTWARE_UPGRADE_REQUIRED "org.freedesktop.Telepathy.E rror.SoftwareUpgradeRequired" #define TP_ERROR_STR_SOFTWARE_UPGRADE_REQUIRED "org.freedesktop.Telepathy.E rror.SoftwareUpgradeRequired"
#define TP_ERROR_STR_EMERGENCY_CALLS_NOT_SUPPORTED "org.freedesktop.Telepat hy.Error.EmergencyCallsNotSupported" #define TP_ERROR_STR_EMERGENCY_CALLS_NOT_SUPPORTED "org.freedesktop.Telepat hy.Error.EmergencyCallsNotSupported"
#define TP_ERROR_STR_INSUFFICIENT_BALANCE "org.freedesktop.Telepathy.Error. InsufficientBalance" #define TP_ERROR_STR_INSUFFICIENT_BALANCE "org.freedesktop.Telepathy.Error. InsufficientBalance"
#define TP_ERROR_STR_CAPTCHA_NOT_SUPPORTED "org.freedesktop.Telepathy.Error .CaptchaNotSupported"
 End of changes. 1 change blocks. 
0 lines changed or deleted 0 lines changed or added


 errors.h   errors.h 
skipping to change at line 96 skipping to change at line 96
TP_ERROR_REJECTED, /*< nick=Rejected >*/ TP_ERROR_REJECTED, /*< nick=Rejected >*/
TP_ERROR_PICKED_UP_ELSEWHERE, /*< nick=PickedUpElsewhere >*/ TP_ERROR_PICKED_UP_ELSEWHERE, /*< nick=PickedUpElsewhere >*/
TP_ERROR_CONFUSED, /*< nick=Confused >*/ TP_ERROR_CONFUSED, /*< nick=Confused >*/
TP_ERROR_SERVICE_CONFUSED, /*< nick=ServiceConfused >*/ TP_ERROR_SERVICE_CONFUSED, /*< nick=ServiceConfused >*/
TP_ERROR_EMERGENCY_CALLS_NOT_SUPPORTED, /*< nick=EmergencyCallsNotSuppo rted >*/ TP_ERROR_EMERGENCY_CALLS_NOT_SUPPORTED, /*< nick=EmergencyCallsNotSuppo rted >*/
TP_ERROR_SOFTWARE_UPGRADE_REQUIRED, /*< nick=SoftwareUpgradeRequired >* / TP_ERROR_SOFTWARE_UPGRADE_REQUIRED, /*< nick=SoftwareUpgradeRequired >* /
TP_ERROR_INSUFFICIENT_BALANCE, /*< nick=InsufficientBalance >*/ TP_ERROR_INSUFFICIENT_BALANCE, /*< nick=InsufficientBalance >*/
TP_ERROR_MEDIA_CODECS_INCOMPATIBLE, /*< nick=Media.CodecsIncompatible > */ TP_ERROR_MEDIA_CODECS_INCOMPATIBLE, /*< nick=Media.CodecsIncompatible > */
TP_ERROR_MEDIA_UNSUPPORTED_TYPE, /*< nick=Media.UnsupportedType >*/ TP_ERROR_MEDIA_UNSUPPORTED_TYPE, /*< nick=Media.UnsupportedType >*/
TP_ERROR_MEDIA_STREAMING_ERROR, /*< nick=Media.StreamingError >*/ TP_ERROR_MEDIA_STREAMING_ERROR, /*< nick=Media.StreamingError >*/
TP_ERROR_CAPTCHA_NOT_SUPPORTED, /*< nick=CaptchaNotSupported >*/
} 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 1 lines changed or added


 gnio-util.h   gnio-util.h 
skipping to change at line 44 skipping to change at line 44
GError **error) G_GNUC_WARN_UNUSED_RESULT; GError **error) G_GNUC_WARN_UNUSED_RESULT;
GValue *tp_address_variant_from_g_socket_address (GSocketAddress *address, GValue *tp_address_variant_from_g_socket_address (GSocketAddress *address,
TpSocketAddressType *type, TpSocketAddressType *type,
GError **error) G_GNUC_WARN_UNUSED_RESULT; GError **error) G_GNUC_WARN_UNUSED_RESULT;
gboolean tp_unix_connection_send_credentials_with_byte ( gboolean tp_unix_connection_send_credentials_with_byte (
GSocketConnection *connection, GSocketConnection *connection,
guchar byte, guchar byte,
GCancellable *cancellable, GCancellable *cancellable,
GError **error); GError **error);
void tp_unix_connection_send_credentials_with_byte_async (
GSocketConnection *connection,
guchar byte,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
gboolean tp_unix_connection_send_credentials_with_byte_finish (
GSocketConnection *connection,
GAsyncResult *result,
GError **error);
GCredentials * tp_unix_connection_receive_credentials_with_byte ( GCredentials * tp_unix_connection_receive_credentials_with_byte (
GSocketConnection *connection, GSocketConnection *connection,
guchar *byte, guchar *byte,
GCancellable *cancellable, GCancellable *cancellable,
GError **error); GError **error);
void tp_unix_connection_receive_credentials_with_byte_async (
GSocketConnection *connection,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
GCredentials *tp_unix_connection_receive_credentials_with_byte_finish (
GSocketConnection *connection,
GAsyncResult *result,
guchar *byte,
GError **error);
G_END_DECLS G_END_DECLS
#endif /* __TP_GNIO_UTIL_H__ */ #endif /* __TP_GNIO_UTIL_H__ */
 End of changes. 2 change blocks. 
0 lines changed or deleted 20 lines changed or added


 telepathy-enums.h   telepathy-enums.h 
skipping to change at line 167 skipping to change at line 167
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,
TP_HTTP_METHOD_POST = 1, TP_HTTP_METHOD_POST = 1,
} TpHTTPMethod; } TpHTTPMethod;
#define NUM_TP_HTTP_METHODS (1+1) #define NUM_TP_HTTP_METHODS (1+1)
typedef enum { typedef enum {
TP_CALL_STATE_UNKNOWN = 0,
TP_CALL_STATE_PENDING_INITIATOR = 1,
TP_CALL_STATE_INITIALISING = 2,
TP_CALL_STATE_INITIALISED = 3,
TP_CALL_STATE_ACCEPTED = 4,
TP_CALL_STATE_ACTIVE = 5,
TP_CALL_STATE_ENDED = 6,
} TpCallState;
#define NUM_TP_CALL_STATES (6+1)
typedef enum /*< flags >*/ {
TP_CALL_FLAG_LOCALLY_HELD = 1,
TP_CALL_FLAG_LOCALLY_RINGING = 2,
TP_CALL_FLAG_LOCALLY_QUEUED = 4,
TP_CALL_FLAG_FORWARDED = 8,
TP_CALL_FLAG_CLEARING = 16,
} TpCallFlags;
typedef enum {
TP_CALL_STATE_CHANGE_REASON_UNKNOWN = 0,
TP_CALL_STATE_CHANGE_REASON_PROGRESS_MADE = 1,
TP_CALL_STATE_CHANGE_REASON_USER_REQUESTED = 2,
TP_CALL_STATE_CHANGE_REASON_FORWARDED = 3,
TP_CALL_STATE_CHANGE_REASON_REJECTED = 4,
TP_CALL_STATE_CHANGE_REASON_NO_ANSWER = 5,
TP_CALL_STATE_CHANGE_REASON_INVALID_CONTACT = 6,
TP_CALL_STATE_CHANGE_REASON_PERMISSION_DENIED = 7,
TP_CALL_STATE_CHANGE_REASON_BUSY = 8,
TP_CALL_STATE_CHANGE_REASON_INTERNAL_ERROR = 9,
TP_CALL_STATE_CHANGE_REASON_SERVICE_ERROR = 10,
TP_CALL_STATE_CHANGE_REASON_NETWORK_ERROR = 11,
TP_CALL_STATE_CHANGE_REASON_MEDIA_ERROR = 12,
TP_CALL_STATE_CHANGE_REASON_CONNECTIVITY_ERROR = 13,
} TpCallStateChangeReason;
#define NUM_TP_CALL_STATE_CHANGE_REASONS (13+1)
typedef enum /*< flags >*/ {
TP_CALL_MEMBER_FLAG_RINGING = 1,
TP_CALL_MEMBER_FLAG_HELD = 2,
TP_CALL_MEMBER_FLAG_CONFERENCE_HOST = 4,
} TpCallMemberFlags;
typedef enum {
TP_CHANNEL_CONTACT_SEARCH_STATE_NOT_STARTED = 0, TP_CHANNEL_CONTACT_SEARCH_STATE_NOT_STARTED = 0,
TP_CHANNEL_CONTACT_SEARCH_STATE_IN_PROGRESS = 1, TP_CHANNEL_CONTACT_SEARCH_STATE_IN_PROGRESS = 1,
TP_CHANNEL_CONTACT_SEARCH_STATE_MORE_AVAILABLE = 2, TP_CHANNEL_CONTACT_SEARCH_STATE_MORE_AVAILABLE = 2,
TP_CHANNEL_CONTACT_SEARCH_STATE_COMPLETED = 3, TP_CHANNEL_CONTACT_SEARCH_STATE_COMPLETED = 3,
TP_CHANNEL_CONTACT_SEARCH_STATE_FAILED = 4, TP_CHANNEL_CONTACT_SEARCH_STATE_FAILED = 4,
} TpChannelContactSearchState; } TpChannelContactSearchState;
#define NUM_TP_CHANNEL_CONTACT_SEARCH_STATES (4+1) #define NUM_TP_CHANNEL_CONTACT_SEARCH_STATES (4+1)
typedef enum { typedef enum {
TP_FILE_TRANSFER_STATE_NONE = 0, TP_FILE_TRANSFER_STATE_NONE = 0,
skipping to change at line 286 skipping to change at line 329
typedef enum /*< flags >*/ { 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 /*< flags >*/ {
TP_CAPTCHA_FLAGS_REQUIRED = 1,
} TpCaptchaFlags;
typedef enum {
TP_CAPTCHA_CANCEL_REASON_USER_CANCELLED = 0,
TP_CAPTCHA_CANCEL_REASON_NOT_SUPPORTED = 1,
TP_CAPTCHA_CANCEL_REASON_SERVICE_CONFUSED = 2,
} TpCaptchaCancelReason;
#define NUM_TP_CAPTCHA_CANCEL_REASONS (2+1)
typedef enum {
TP_CAPTCHA_STATUS_LOCAL_PENDING = 0,
TP_CAPTCHA_STATUS_REMOTE_PENDING = 1,
TP_CAPTCHA_STATUS_SUCCEEDED = 2,
TP_CAPTCHA_STATUS_TRY_AGAIN = 3,
TP_CAPTCHA_STATUS_FAILED = 4,
} TpCaptchaStatus;
#define NUM_TP_CAPTCHA_STATUSES (4+1)
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)
typedef enum { typedef enum {
skipping to change at line 506 skipping to change at line 569
TP_TLS_CERTIFICATE_REJECT_REASON_NOT_ACTIVATED = 3, TP_TLS_CERTIFICATE_REJECT_REASON_NOT_ACTIVATED = 3,
TP_TLS_CERTIFICATE_REJECT_REASON_FINGERPRINT_MISMATCH = 4, TP_TLS_CERTIFICATE_REJECT_REASON_FINGERPRINT_MISMATCH = 4,
TP_TLS_CERTIFICATE_REJECT_REASON_HOSTNAME_MISMATCH = 5, TP_TLS_CERTIFICATE_REJECT_REASON_HOSTNAME_MISMATCH = 5,
TP_TLS_CERTIFICATE_REJECT_REASON_SELF_SIGNED = 6, TP_TLS_CERTIFICATE_REJECT_REASON_SELF_SIGNED = 6,
TP_TLS_CERTIFICATE_REJECT_REASON_REVOKED = 7, TP_TLS_CERTIFICATE_REJECT_REASON_REVOKED = 7,
TP_TLS_CERTIFICATE_REJECT_REASON_INSECURE = 8, TP_TLS_CERTIFICATE_REJECT_REASON_INSECURE = 8,
TP_TLS_CERTIFICATE_REJECT_REASON_LIMIT_EXCEEDED = 9, TP_TLS_CERTIFICATE_REJECT_REASON_LIMIT_EXCEEDED = 9,
} TpTLSCertificateRejectReason; } TpTLSCertificateRejectReason;
#define NUM_TP_TLS_CERTIFICATE_REJECT_REASONS (9+1) #define NUM_TP_TLS_CERTIFICATE_REJECT_REASONS (9+1)
typedef enum {
TP_CALL_CONTENT_PACKETIZATION_TYPE_RTP = 0,
TP_CALL_CONTENT_PACKETIZATION_TYPE_RAW = 1,
TP_CALL_CONTENT_PACKETIZATION_TYPE_MSN_WEBCAM = 2,
} TpCallContentPacketizationType;
#define NUM_TP_CALL_CONTENT_PACKETIZATION_TYPES (2+1)
typedef enum {
TP_CALL_CONTENT_DISPOSITION_NONE = 0,
TP_CALL_CONTENT_DISPOSITION_INITIAL = 1,
} TpCallContentDisposition;
#define NUM_TP_CALL_CONTENT_DISPOSITIONS (1+1)
typedef enum /*< flags >*/ {
TP_RTCP_XR_STATISTICS_FLAGS_LOSS = 1,
TP_RTCP_XR_STATISTICS_FLAGS_DUPLICATE = 2,
TP_RTCP_XR_STATISTICS_FLAGS_JITTER = 4,
TP_RTCP_XR_STATISTICS_FLAGS_TTL = 8,
TP_RTCP_XR_STATISTICS_FLAGS_HL = 16,
} TpRTCPXRStatisticsFlags;
typedef enum {
TP_RCPT_XR_RTT_MODE_ALL = 0,
TP_RCPT_XR_RTT_MODE_SENDER = 1,
} TpRCPTXRRTTMode;
#define NUM_TP_RCPT_XR_RTT_MODES (1+1)
typedef enum {
TP_STREAM_FLOW_STATE_STOPPED = 0,
TP_STREAM_FLOW_STATE_PENDING_START = 1,
TP_STREAM_FLOW_STATE_PENDING_STOP = 2,
TP_STREAM_FLOW_STATE_STARTED = 3,
} TpStreamFlowState;
#define NUM_TP_STREAM_FLOW_STATES (3+1)
typedef enum {
TP_CALL_STREAM_CANDIDATE_TYPE_NONE = 0,
TP_CALL_STREAM_CANDIDATE_TYPE_HOST = 1,
TP_CALL_STREAM_CANDIDATE_TYPE_SERVER_REFLEXIVE = 2,
TP_CALL_STREAM_CANDIDATE_TYPE_PEER_REFLEXIVE = 3,
TP_CALL_STREAM_CANDIDATE_TYPE_RELAY = 4,
TP_CALL_STREAM_CANDIDATE_TYPE_MULTICAST = 5,
} TpCallStreamCandidateType;
#define NUM_TP_CALL_STREAM_CANDIDATE_TYPES (5+1)
typedef enum {
TP_STREAM_COMPONENT_UNKNOWN = 0,
TP_STREAM_COMPONENT_DATA = 1,
TP_STREAM_COMPONENT_CONTROL = 2,
} TpStreamComponent;
#define NUM_TP_STREAM_COMPONENTS (2+1)
typedef enum {
TP_STREAM_TRANSPORT_TYPE_UNKNOWN = 0,
TP_STREAM_TRANSPORT_TYPE_RAW_UDP = 1,
TP_STREAM_TRANSPORT_TYPE_ICE = 2,
TP_STREAM_TRANSPORT_TYPE_GTALK_P2P = 3,
TP_STREAM_TRANSPORT_TYPE_WLM_2009 = 4,
TP_STREAM_TRANSPORT_TYPE_SHM = 5,
TP_STREAM_TRANSPORT_TYPE_MULTICAST = 6,
} TpStreamTransportType;
#define NUM_TP_STREAM_TRANSPORT_TYPES (6+1)
typedef enum {
TP_SENDING_STATE_NONE = 0,
TP_SENDING_STATE_PENDING_SEND = 1,
TP_SENDING_STATE_SENDING = 2,
TP_SENDING_STATE_PENDING_STOP_SENDING = 3,
} TpSendingState;
#define NUM_TP_SENDING_STATES (3+1)
typedef enum {
TP_STREAM_ENDPOINT_STATE_CONNECTING = 0,
TP_STREAM_ENDPOINT_STATE_PROVISIONALLY_CONNECTED = 1,
TP_STREAM_ENDPOINT_STATE_FULLY_CONNECTED = 2,
TP_STREAM_ENDPOINT_STATE_EXHAUSTED_CANDIDATES = 3,
TP_STREAM_ENDPOINT_STATE_FAILED = 4,
} TpStreamEndpointState;
#define NUM_TP_STREAM_ENDPOINT_STATES (4+1)
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
 End of changes. 3 change blocks. 
0 lines changed or deleted 143 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/account-channel-request.h> #include <telepathy-glib/account-channel-request.h>
#include <telepathy-glib/account-manager.h> #include <telepathy-glib/account-manager.h>
#include <telepathy-glib/account.h> #include <telepathy-glib/account.h>
#include <telepathy-glib/automatic-proxy-factory.h> #include <telepathy-glib/automatic-proxy-factory.h>
#include <telepathy-glib/automatic-client-factory.h> #include <telepathy-glib/automatic-client-factory.h>
#include <telepathy-glib/base-client.h> #include <telepathy-glib/base-client.h>
#include <telepathy-glib/basic-proxy-factory.h> #include <telepathy-glib/basic-proxy-factory.h>
#include <telepathy-glib/call-channel.h>
#include <telepathy-glib/call-content.h>
#include <telepathy-glib/call-misc.h>
#include <telepathy-glib/call-stream.h>
#include <telepathy-glib/channel-dispatch-operation.h> #include <telepathy-glib/channel-dispatch-operation.h>
#include <telepathy-glib/channel-dispatcher.h> #include <telepathy-glib/channel-dispatcher.h>
#include <telepathy-glib/channel-request.h> #include <telepathy-glib/channel-request.h>
#include <telepathy-glib/channel.h> #include <telepathy-glib/channel.h>
#include <telepathy-glib/client-channel-factory.h> #include <telepathy-glib/client-channel-factory.h>
#include <telepathy-glib/connection-contact-list.h> #include <telepathy-glib/connection-contact-list.h>
#include <telepathy-glib/connection-manager.h> #include <telepathy-glib/connection-manager.h>
#include <telepathy-glib/connection.h> #include <telepathy-glib/connection.h>
#include <telepathy-glib/contact.h> #include <telepathy-glib/contact.h>
#include <telepathy-glib/contact-operations.h> #include <telepathy-glib/contact-operations.h>
skipping to change at line 72 skipping to change at line 76
#include <telepathy-glib/simple-client-factory.h> #include <telepathy-glib/simple-client-factory.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/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-call-channel.h>
#include <telepathy-glib/base-call-content.h>
#include <telepathy-glib/base-call-stream.h>
#include <telepathy-glib/base-channel.h> #include <telepathy-glib/base-channel.h>
#include <telepathy-glib/base-media-call-channel.h>
#include <telepathy-glib/base-media-call-content.h>
#include <telepathy-glib/base-media-call-stream.h>
#include <telepathy-glib/base-connection.h> #include <telepathy-glib/base-connection.h>
#include <telepathy-glib/base-connection-manager.h> #include <telepathy-glib/base-connection-manager.h>
#include <telepathy-glib/base-contact-list.h> #include <telepathy-glib/base-contact-list.h>
#include <telepathy-glib/base-protocol.h> #include <telepathy-glib/base-protocol.h>
#include <telepathy-glib/call-content-media-description.h>
#include <telepathy-glib/call-stream-endpoint.h>
#undef __TP_IN_GLIB_H__ #undef __TP_IN_GLIB_H__
#endif /* __TP_GLIB_H__ */ #endif /* __TP_GLIB_H__ */
 End of changes. 4 change blocks. 
0 lines changed or deleted 12 lines changed or added


 telepathy-interfaces.h   telepathy-interfaces.h 
skipping to change at line 131 skipping to change at line 131
#define TP_PROP_CONNECTION_STATUS \ #define TP_PROP_CONNECTION_STATUS \
"org.freedesktop.Telepathy.Connection.Status" "org.freedesktop.Telepathy.Connection.Status"
#define TP_PROP_CONNECTION_HAS_IMMORTAL_HANDLES \ #define TP_PROP_CONNECTION_HAS_IMMORTAL_HANDLES \
"org.freedesktop.Telepathy.Connection.HasImmortalHandles" "org.freedesktop.Telepathy.Connection.HasImmortalHandles"
#define TP_TOKEN_CONNECTION_CONTACT_ID \ #define TP_TOKEN_CONNECTION_CONTACT_ID \
"org.freedesktop.Telepathy.Connection/contact-id" "org.freedesktop.Telepathy.Connection/contact-id"
#define TP_IFACE_CONNECTION_INTERFACE_ADDRESSING \
"org.freedesktop.Telepathy.Connection.Interface.Addressing1"
#define TP_IFACE_QUARK_CONNECTION_INTERFACE_ADDRESSING \
(tp_iface_quark_connection_interface_addressing ())
GQuark tp_iface_quark_connection_interface_addressing (void);
#define TP_TOKEN_CONNECTION_INTERFACE_ADDRESSING_ADDRESSES \
"org.freedesktop.Telepathy.Connection.Interface.Addressing1/addresses"
#define TP_TOKEN_CONNECTION_INTERFACE_ADDRESSING_URIS \
"org.freedesktop.Telepathy.Connection.Interface.Addressing1/uris"
#define TP_IFACE_CONNECTION_INTERFACE_ALIASING \ #define TP_IFACE_CONNECTION_INTERFACE_ALIASING \
"org.freedesktop.Telepathy.Connection.Interface.Aliasing" "org.freedesktop.Telepathy.Connection.Interface.Aliasing"
#define TP_IFACE_QUARK_CONNECTION_INTERFACE_ALIASING \ #define TP_IFACE_QUARK_CONNECTION_INTERFACE_ALIASING \
(tp_iface_quark_connection_interface_aliasing ()) (tp_iface_quark_connection_interface_aliasing ())
GQuark tp_iface_quark_connection_interface_aliasing (void); GQuark tp_iface_quark_connection_interface_aliasing (void);
#define TP_TOKEN_CONNECTION_INTERFACE_ALIASING_ALIAS \ #define TP_TOKEN_CONNECTION_INTERFACE_ALIASING_ALIAS \
"org.freedesktop.Telepathy.Connection.Interface.Aliasing/alias" "org.freedesktop.Telepathy.Connection.Interface.Aliasing/alias"
skipping to change at line 338 skipping to change at line 352
#define TP_PROP_CONNECTION_INTERFACE_CONTACT_LIST_CONTACT_LIST_PERSISTS \ #define TP_PROP_CONNECTION_INTERFACE_CONTACT_LIST_CONTACT_LIST_PERSISTS \
"org.freedesktop.Telepathy.Connection.Interface.ContactList.ContactListPers ists" "org.freedesktop.Telepathy.Connection.Interface.ContactList.ContactListPers ists"
#define TP_PROP_CONNECTION_INTERFACE_CONTACT_LIST_CAN_CHANGE_CONTACT_LIST \ #define TP_PROP_CONNECTION_INTERFACE_CONTACT_LIST_CAN_CHANGE_CONTACT_LIST \
"org.freedesktop.Telepathy.Connection.Interface.ContactList.CanChangeContac tList" "org.freedesktop.Telepathy.Connection.Interface.ContactList.CanChangeContac tList"
#define TP_PROP_CONNECTION_INTERFACE_CONTACT_LIST_REQUEST_USES_MESSAGE \ #define TP_PROP_CONNECTION_INTERFACE_CONTACT_LIST_REQUEST_USES_MESSAGE \
"org.freedesktop.Telepathy.Connection.Interface.ContactList.RequestUsesMess age" "org.freedesktop.Telepathy.Connection.Interface.ContactList.RequestUsesMess age"
#define TP_PROP_CONNECTION_INTERFACE_CONTACT_LIST_DOWNLOAD_AT_CONNECTION \
"org.freedesktop.Telepathy.Connection.Interface.ContactList.DownloadAtConne
ction"
#define TP_TOKEN_CONNECTION_INTERFACE_CONTACT_LIST_SUBSCRIBE \ #define TP_TOKEN_CONNECTION_INTERFACE_CONTACT_LIST_SUBSCRIBE \
"org.freedesktop.Telepathy.Connection.Interface.ContactList/subscribe" "org.freedesktop.Telepathy.Connection.Interface.ContactList/subscribe"
#define TP_TOKEN_CONNECTION_INTERFACE_CONTACT_LIST_PUBLISH \ #define TP_TOKEN_CONNECTION_INTERFACE_CONTACT_LIST_PUBLISH \
"org.freedesktop.Telepathy.Connection.Interface.ContactList/publish" "org.freedesktop.Telepathy.Connection.Interface.ContactList/publish"
#define TP_TOKEN_CONNECTION_INTERFACE_CONTACT_LIST_PUBLISH_REQUEST \ #define TP_TOKEN_CONNECTION_INTERFACE_CONTACT_LIST_PUBLISH_REQUEST \
"org.freedesktop.Telepathy.Connection.Interface.ContactList/publish-request " "org.freedesktop.Telepathy.Connection.Interface.ContactList/publish-request "
#define TP_IFACE_CONNECTION_INTERFACE_SIMPLE_PRESENCE \ #define TP_IFACE_CONNECTION_INTERFACE_SIMPLE_PRESENCE \
skipping to change at line 491 skipping to change at line 508
#define TP_PROP_CHANNEL_REQUESTED \ #define TP_PROP_CHANNEL_REQUESTED \
"org.freedesktop.Telepathy.Channel.Requested" "org.freedesktop.Telepathy.Channel.Requested"
#define TP_PROP_CHANNEL_INITIATOR_HANDLE \ #define TP_PROP_CHANNEL_INITIATOR_HANDLE \
"org.freedesktop.Telepathy.Channel.InitiatorHandle" "org.freedesktop.Telepathy.Channel.InitiatorHandle"
#define TP_PROP_CHANNEL_INITIATOR_ID \ #define TP_PROP_CHANNEL_INITIATOR_ID \
"org.freedesktop.Telepathy.Channel.InitiatorID" "org.freedesktop.Telepathy.Channel.InitiatorID"
#define TP_IFACE_CHANNEL_TYPE_CALL \
"org.freedesktop.Telepathy.Channel.Type.Call1"
#define TP_IFACE_QUARK_CHANNEL_TYPE_CALL \
(tp_iface_quark_channel_type_call ())
GQuark tp_iface_quark_channel_type_call (void);
#define TP_PROP_CHANNEL_TYPE_CALL_CONTENTS \
"org.freedesktop.Telepathy.Channel.Type.Call1.Contents"
#define TP_PROP_CHANNEL_TYPE_CALL_CALL_STATE_DETAILS \
"org.freedesktop.Telepathy.Channel.Type.Call1.CallStateDetails"
#define TP_PROP_CHANNEL_TYPE_CALL_CALL_STATE \
"org.freedesktop.Telepathy.Channel.Type.Call1.CallState"
#define TP_PROP_CHANNEL_TYPE_CALL_CALL_FLAGS \
"org.freedesktop.Telepathy.Channel.Type.Call1.CallFlags"
#define TP_PROP_CHANNEL_TYPE_CALL_CALL_STATE_REASON \
"org.freedesktop.Telepathy.Channel.Type.Call1.CallStateReason"
#define TP_PROP_CHANNEL_TYPE_CALL_HARDWARE_STREAMING \
"org.freedesktop.Telepathy.Channel.Type.Call1.HardwareStreaming"
#define TP_PROP_CHANNEL_TYPE_CALL_CALL_MEMBERS \
"org.freedesktop.Telepathy.Channel.Type.Call1.CallMembers"
#define TP_PROP_CHANNEL_TYPE_CALL_MEMBER_IDENTIFIERS \
"org.freedesktop.Telepathy.Channel.Type.Call1.MemberIdentifiers"
#define TP_PROP_CHANNEL_TYPE_CALL_INITIAL_TRANSPORT \
"org.freedesktop.Telepathy.Channel.Type.Call1.InitialTransport"
#define TP_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO \
"org.freedesktop.Telepathy.Channel.Type.Call1.InitialAudio"
#define TP_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO \
"org.freedesktop.Telepathy.Channel.Type.Call1.InitialVideo"
#define TP_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO_NAME \
"org.freedesktop.Telepathy.Channel.Type.Call1.InitialAudioName"
#define TP_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO_NAME \
"org.freedesktop.Telepathy.Channel.Type.Call1.InitialVideoName"
#define TP_PROP_CHANNEL_TYPE_CALL_MUTABLE_CONTENTS \
"org.freedesktop.Telepathy.Channel.Type.Call1.MutableContents"
#define TP_TOKEN_CHANNEL_TYPE_CALL_AUDIO \
"org.freedesktop.Telepathy.Channel.Type.Call1/audio"
#define TP_TOKEN_CHANNEL_TYPE_CALL_VIDEO \
"org.freedesktop.Telepathy.Channel.Type.Call1/video"
#define TP_TOKEN_CHANNEL_TYPE_CALL_GTALK_P2P \
"org.freedesktop.Telepathy.Channel.Type.Call1/gtalk-p2p"
#define TP_TOKEN_CHANNEL_TYPE_CALL_ICE \
"org.freedesktop.Telepathy.Channel.Type.Call1/ice"
#define TP_TOKEN_CHANNEL_TYPE_CALL_WLM_2009 \
"org.freedesktop.Telepathy.Channel.Type.Call1/wlm-2009"
#define TP_TOKEN_CHANNEL_TYPE_CALL_SHM \
"org.freedesktop.Telepathy.Channel.Type.Call1/shm"
#define TP_IFACE_CHANNEL_TYPE_CONTACT_LIST \ #define TP_IFACE_CHANNEL_TYPE_CONTACT_LIST \
"org.freedesktop.Telepathy.Channel.Type.ContactList" "org.freedesktop.Telepathy.Channel.Type.ContactList"
#define TP_IFACE_QUARK_CHANNEL_TYPE_CONTACT_LIST \ #define TP_IFACE_QUARK_CHANNEL_TYPE_CONTACT_LIST \
(tp_iface_quark_channel_type_contact_list ()) (tp_iface_quark_channel_type_contact_list ())
GQuark tp_iface_quark_channel_type_contact_list (void); GQuark tp_iface_quark_channel_type_contact_list (void);
#define TP_IFACE_CHANNEL_TYPE_CONTACT_SEARCH \ #define TP_IFACE_CHANNEL_TYPE_CONTACT_SEARCH \
"org.freedesktop.Telepathy.Channel.Type.ContactSearch" "org.freedesktop.Telepathy.Channel.Type.ContactSearch"
skipping to change at line 691 skipping to change at line 776
"org.freedesktop.Telepathy.Channel.Interface.Anonymity.AnonymousID" "org.freedesktop.Telepathy.Channel.Interface.Anonymity.AnonymousID"
#define TP_IFACE_CHANNEL_INTERFACE_CALL_STATE \ #define TP_IFACE_CHANNEL_INTERFACE_CALL_STATE \
"org.freedesktop.Telepathy.Channel.Interface.CallState" "org.freedesktop.Telepathy.Channel.Interface.CallState"
#define TP_IFACE_QUARK_CHANNEL_INTERFACE_CALL_STATE \ #define TP_IFACE_QUARK_CHANNEL_INTERFACE_CALL_STATE \
(tp_iface_quark_channel_interface_call_state ()) (tp_iface_quark_channel_interface_call_state ())
GQuark tp_iface_quark_channel_interface_call_state (void); GQuark tp_iface_quark_channel_interface_call_state (void);
#define TP_IFACE_CHANNEL_INTERFACE_CAPTCHA_AUTHENTICATION \
"org.freedesktop.Telepathy.Channel.Interface.CaptchaAuthentication1"
#define TP_IFACE_QUARK_CHANNEL_INTERFACE_CAPTCHA_AUTHENTICATION \
(tp_iface_quark_channel_interface_captcha_authentication ())
GQuark tp_iface_quark_channel_interface_captcha_authentication (void);
#define TP_PROP_CHANNEL_INTERFACE_CAPTCHA_AUTHENTICATION_CAN_RETRY_CAPTCHA
\
"org.freedesktop.Telepathy.Channel.Interface.CaptchaAuthentication1.CanRetr
yCaptcha"
#define TP_PROP_CHANNEL_INTERFACE_CAPTCHA_AUTHENTICATION_CAPTCHA_STATUS \
"org.freedesktop.Telepathy.Channel.Interface.CaptchaAuthentication1.Captcha
Status"
#define TP_PROP_CHANNEL_INTERFACE_CAPTCHA_AUTHENTICATION_CAPTCHA_ERROR \
"org.freedesktop.Telepathy.Channel.Interface.CaptchaAuthentication1.Captcha
Error"
#define TP_PROP_CHANNEL_INTERFACE_CAPTCHA_AUTHENTICATION_CAPTCHA_ERROR_DETA
ILS \
"org.freedesktop.Telepathy.Channel.Interface.CaptchaAuthentication1.Captcha
ErrorDetails"
#define TP_IFACE_CHANNEL_INTERFACE_CHAT_STATE \ #define TP_IFACE_CHANNEL_INTERFACE_CHAT_STATE \
"org.freedesktop.Telepathy.Channel.Interface.ChatState" "org.freedesktop.Telepathy.Channel.Interface.ChatState"
#define TP_IFACE_QUARK_CHANNEL_INTERFACE_CHAT_STATE \ #define TP_IFACE_QUARK_CHANNEL_INTERFACE_CHAT_STATE \
(tp_iface_quark_channel_interface_chat_state ()) (tp_iface_quark_channel_interface_chat_state ())
GQuark tp_iface_quark_channel_interface_chat_state (void); GQuark tp_iface_quark_channel_interface_chat_state (void);
#define TP_PROP_CHANNEL_INTERFACE_CHAT_STATE_CHAT_STATES \ #define TP_PROP_CHANNEL_INTERFACE_CHAT_STATE_CHAT_STATES \
"org.freedesktop.Telepathy.Channel.Interface.ChatState.ChatStates" "org.freedesktop.Telepathy.Channel.Interface.ChatState.ChatStates"
skipping to change at line 1201 skipping to change at line 1306
#define TP_PROP_ACCOUNT_CHANGING_PRESENCE \ #define TP_PROP_ACCOUNT_CHANGING_PRESENCE \
"org.freedesktop.Telepathy.Account.ChangingPresence" "org.freedesktop.Telepathy.Account.ChangingPresence"
#define TP_PROP_ACCOUNT_NORMALIZED_NAME \ #define TP_PROP_ACCOUNT_NORMALIZED_NAME \
"org.freedesktop.Telepathy.Account.NormalizedName" "org.freedesktop.Telepathy.Account.NormalizedName"
#define TP_PROP_ACCOUNT_HAS_BEEN_ONLINE \ #define TP_PROP_ACCOUNT_HAS_BEEN_ONLINE \
"org.freedesktop.Telepathy.Account.HasBeenOnline" "org.freedesktop.Telepathy.Account.HasBeenOnline"
#define TP_PROP_ACCOUNT_SUPERSEDES \
"org.freedesktop.Telepathy.Account.Supersedes"
#define TP_IFACE_ACCOUNT_INTERFACE_AVATAR \ #define TP_IFACE_ACCOUNT_INTERFACE_AVATAR \
"org.freedesktop.Telepathy.Account.Interface.Avatar" "org.freedesktop.Telepathy.Account.Interface.Avatar"
#define TP_IFACE_QUARK_ACCOUNT_INTERFACE_AVATAR \ #define TP_IFACE_QUARK_ACCOUNT_INTERFACE_AVATAR \
(tp_iface_quark_account_interface_avatar ()) (tp_iface_quark_account_interface_avatar ())
GQuark tp_iface_quark_account_interface_avatar (void); GQuark tp_iface_quark_account_interface_avatar (void);
#define TP_PROP_ACCOUNT_INTERFACE_AVATAR_AVATAR \ #define TP_PROP_ACCOUNT_INTERFACE_AVATAR_AVATAR \
"org.freedesktop.Telepathy.Account.Interface.Avatar.Avatar" "org.freedesktop.Telepathy.Account.Interface.Avatar.Avatar"
skipping to change at line 1414 skipping to change at line 1522
"org.freedesktop.Telepathy.Authentication.TLSCertificate.State" "org.freedesktop.Telepathy.Authentication.TLSCertificate.State"
#define TP_PROP_AUTHENTICATION_TLS_CERTIFICATE_REJECTIONS \ #define TP_PROP_AUTHENTICATION_TLS_CERTIFICATE_REJECTIONS \
"org.freedesktop.Telepathy.Authentication.TLSCertificate.Rejections" "org.freedesktop.Telepathy.Authentication.TLSCertificate.Rejections"
#define TP_PROP_AUTHENTICATION_TLS_CERTIFICATE_CERTIFICATE_TYPE \ #define TP_PROP_AUTHENTICATION_TLS_CERTIFICATE_CERTIFICATE_TYPE \
"org.freedesktop.Telepathy.Authentication.TLSCertificate.CertificateType" "org.freedesktop.Telepathy.Authentication.TLSCertificate.CertificateType"
#define TP_PROP_AUTHENTICATION_TLS_CERTIFICATE_CERTIFICATE_CHAIN_DATA \ #define TP_PROP_AUTHENTICATION_TLS_CERTIFICATE_CERTIFICATE_CHAIN_DATA \
"org.freedesktop.Telepathy.Authentication.TLSCertificate.CertificateChainDa ta" "org.freedesktop.Telepathy.Authentication.TLSCertificate.CertificateChainDa ta"
#define TP_IFACE_CALL_CONTENT_INTERFACE_MEDIA \
"org.freedesktop.Telepathy.Call1.Content.Interface.Media"
#define TP_IFACE_QUARK_CALL_CONTENT_INTERFACE_MEDIA \
(tp_iface_quark_call_content_interface_media ())
GQuark tp_iface_quark_call_content_interface_media (void);
#define TP_PROP_CALL_CONTENT_INTERFACE_MEDIA_REMOTE_MEDIA_DESCRIPTIONS \
"org.freedesktop.Telepathy.Call1.Content.Interface.Media.RemoteMediaDescrip
tions"
#define TP_PROP_CALL_CONTENT_INTERFACE_MEDIA_LOCAL_MEDIA_DESCRIPTIONS \
"org.freedesktop.Telepathy.Call1.Content.Interface.Media.LocalMediaDescript
ions"
#define TP_PROP_CALL_CONTENT_INTERFACE_MEDIA_MEDIA_DESCRIPTION_OFFER \
"org.freedesktop.Telepathy.Call1.Content.Interface.Media.MediaDescriptionOf
fer"
#define TP_PROP_CALL_CONTENT_INTERFACE_MEDIA_PACKETIZATION \
"org.freedesktop.Telepathy.Call1.Content.Interface.Media.Packetization"
#define TP_PROP_CALL_CONTENT_INTERFACE_MEDIA_CURRENT_DTMF_EVENT \
"org.freedesktop.Telepathy.Call1.Content.Interface.Media.CurrentDTMFEvent"
#define TP_PROP_CALL_CONTENT_INTERFACE_MEDIA_CURRENT_DTMF_STATE \
"org.freedesktop.Telepathy.Call1.Content.Interface.Media.CurrentDTMFState"
#define TP_IFACE_CALL_CONTENT_INTERFACE_DTMF \
"org.freedesktop.Telepathy.Call1.Content.Interface.DTMF"
#define TP_IFACE_QUARK_CALL_CONTENT_INTERFACE_DTMF \
(tp_iface_quark_call_content_interface_dtmf ())
GQuark tp_iface_quark_call_content_interface_dtmf (void);
#define TP_PROP_CALL_CONTENT_INTERFACE_DTMF_CURRENTLY_SENDING_TONES \
"org.freedesktop.Telepathy.Call1.Content.Interface.DTMF.CurrentlySendingTon
es"
#define TP_PROP_CALL_CONTENT_INTERFACE_DTMF_DEFERRED_TONES \
"org.freedesktop.Telepathy.Call1.Content.Interface.DTMF.DeferredTones"
#define TP_IFACE_CALL_CONTENT_INTERFACE_VIDEO_CONTROL \
"org.freedesktop.Telepathy.Call1.Content.Interface.VideoControl"
#define TP_IFACE_QUARK_CALL_CONTENT_INTERFACE_VIDEO_CONTROL \
(tp_iface_quark_call_content_interface_video_control ())
GQuark tp_iface_quark_call_content_interface_video_control (void);
#define TP_PROP_CALL_CONTENT_INTERFACE_VIDEO_CONTROL_VIDEO_RESOLUTION \
"org.freedesktop.Telepathy.Call1.Content.Interface.VideoControl.VideoResolu
tion"
#define TP_PROP_CALL_CONTENT_INTERFACE_VIDEO_CONTROL_BITRATE \
"org.freedesktop.Telepathy.Call1.Content.Interface.VideoControl.Bitrate"
#define TP_PROP_CALL_CONTENT_INTERFACE_VIDEO_CONTROL_FRAMERATE \
"org.freedesktop.Telepathy.Call1.Content.Interface.VideoControl.Framerate"
#define TP_PROP_CALL_CONTENT_INTERFACE_VIDEO_CONTROL_MTU \
"org.freedesktop.Telepathy.Call1.Content.Interface.VideoControl.MTU"
#define TP_PROP_CALL_CONTENT_INTERFACE_VIDEO_CONTROL_MANUAL_KEY_FRAMES \
"org.freedesktop.Telepathy.Call1.Content.Interface.VideoControl.ManualKeyFr
ames"
#define TP_IFACE_CALL_CONTENT_INTERFACE_AUDIO_CONTROL \
"org.freedesktop.Telepathy.Call1.Content.Interface.AudioControl"
#define TP_IFACE_QUARK_CALL_CONTENT_INTERFACE_AUDIO_CONTROL \
(tp_iface_quark_call_content_interface_audio_control ())
GQuark tp_iface_quark_call_content_interface_audio_control (void);
#define TP_PROP_CALL_CONTENT_INTERFACE_AUDIO_CONTROL_REQUESTED_INPUT_VOLUME
\
"org.freedesktop.Telepathy.Call1.Content.Interface.AudioControl.RequestedIn
putVolume"
#define TP_PROP_CALL_CONTENT_INTERFACE_AUDIO_CONTROL_REQUESTED_OUTPUT_VOLUM
E \
"org.freedesktop.Telepathy.Call1.Content.Interface.AudioControl.RequestedOu
tputVolume"
#define TP_IFACE_CALL_CONTENT \
"org.freedesktop.Telepathy.Call1.Content"
#define TP_IFACE_QUARK_CALL_CONTENT \
(tp_iface_quark_call_content ())
GQuark tp_iface_quark_call_content (void);
#define TP_PROP_CALL_CONTENT_INTERFACES \
"org.freedesktop.Telepathy.Call1.Content.Interfaces"
#define TP_PROP_CALL_CONTENT_NAME \
"org.freedesktop.Telepathy.Call1.Content.Name"
#define TP_PROP_CALL_CONTENT_TYPE \
"org.freedesktop.Telepathy.Call1.Content.Type"
#define TP_PROP_CALL_CONTENT_DISPOSITION \
"org.freedesktop.Telepathy.Call1.Content.Disposition"
#define TP_PROP_CALL_CONTENT_STREAMS \
"org.freedesktop.Telepathy.Call1.Content.Streams"
#define TP_IFACE_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_EXTENDED_REP
ORTS \
"org.freedesktop.Telepathy.Call1.Content.MediaDescription.Interface.RTCPExt
endedReports"
#define TP_IFACE_QUARK_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_EXTEND
ED_REPORTS \
(tp_iface_quark_call_content_media_description_interface_rtcp_extended_re
ports ())
GQuark tp_iface_quark_call_content_media_description_interface_rtcp_extende
d_reports (void);
#define TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_EXTENDED_REPO
RTS_LOSS_RLE_MAX_SIZE \
"org.freedesktop.Telepathy.Call1.Content.MediaDescription.Interface.RTCPExt
endedReports.LossRLEMaxSize"
#define TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_EXTENDED_REPO
RTS_DUPLICATE_RLE_MAX_SIZE \
"org.freedesktop.Telepathy.Call1.Content.MediaDescription.Interface.RTCPExt
endedReports.DuplicateRLEMaxSize"
#define TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_EXTENDED_REPO
RTS_PACKET_RECEIPT_TIMES_MAX_SIZE \
"org.freedesktop.Telepathy.Call1.Content.MediaDescription.Interface.RTCPExt
endedReports.PacketReceiptTimesMaxSize"
#define TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_EXTENDED_REPO
RTS_DLRR_MAX_SIZE \
"org.freedesktop.Telepathy.Call1.Content.MediaDescription.Interface.RTCPExt
endedReports.DLRRMaxSize"
#define TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_EXTENDED_REPO
RTS_RTT_MODE \
"org.freedesktop.Telepathy.Call1.Content.MediaDescription.Interface.RTCPExt
endedReports.RTTMode"
#define TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_EXTENDED_REPO
RTS_STATISTICS_FLAGS \
"org.freedesktop.Telepathy.Call1.Content.MediaDescription.Interface.RTCPExt
endedReports.StatisticsFlags"
#define TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_EXTENDED_REPO
RTS_ENABLE_METRICS \
"org.freedesktop.Telepathy.Call1.Content.MediaDescription.Interface.RTCPExt
endedReports.EnableMetrics"
#define TP_IFACE_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_FEEDBACK \
"org.freedesktop.Telepathy.Call1.Content.MediaDescription.Interface.RTCPFee
dback"
#define TP_IFACE_QUARK_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_FEEDBA
CK \
(tp_iface_quark_call_content_media_description_interface_rtcp_feedback ()
)
GQuark tp_iface_quark_call_content_media_description_interface_rtcp_feedbac
k (void);
#define TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_FEEDBACK_FEED
BACK_MESSAGES \
"org.freedesktop.Telepathy.Call1.Content.MediaDescription.Interface.RTCPFee
dback.FeedbackMessages"
#define TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTCP_FEEDBACK_DOES
_AVPF \
"org.freedesktop.Telepathy.Call1.Content.MediaDescription.Interface.RTCPFee
dback.DoesAVPF"
#define TP_IFACE_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTP_HEADER_EXTENS
IONS \
"org.freedesktop.Telepathy.Call1.Content.MediaDescription.Interface.RTPHead
erExtensions"
#define TP_IFACE_QUARK_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTP_HEADER_
EXTENSIONS \
(tp_iface_quark_call_content_media_description_interface_rtp_header_exten
sions ())
GQuark tp_iface_quark_call_content_media_description_interface_rtp_header_e
xtensions (void);
#define TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACE_RTP_HEADER_EXTENSI
ONS_HEADER_EXTENSIONS \
"org.freedesktop.Telepathy.Call1.Content.MediaDescription.Interface.RTPHead
erExtensions.HeaderExtensions"
#define TP_IFACE_CALL_CONTENT_MEDIA_DESCRIPTION \
"org.freedesktop.Telepathy.Call1.Content.MediaDescription"
#define TP_IFACE_QUARK_CALL_CONTENT_MEDIA_DESCRIPTION \
(tp_iface_quark_call_content_media_description ())
GQuark tp_iface_quark_call_content_media_description (void);
#define TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_INTERFACES \
"org.freedesktop.Telepathy.Call1.Content.MediaDescription.Interfaces"
#define TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_FURTHER_NEGOTIATION_REQUIRED
\
"org.freedesktop.Telepathy.Call1.Content.MediaDescription.FurtherNegotiatio
nRequired"
#define TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_HAS_REMOTE_INFORMATION \
"org.freedesktop.Telepathy.Call1.Content.MediaDescription.HasRemoteInformat
ion"
#define TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_CODECS \
"org.freedesktop.Telepathy.Call1.Content.MediaDescription.Codecs"
#define TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_REMOTE_CONTACT \
"org.freedesktop.Telepathy.Call1.Content.MediaDescription.RemoteContact"
#define TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_SSRCS \
"org.freedesktop.Telepathy.Call1.Content.MediaDescription.SSRCs"
#define TP_IFACE_CALL_STREAM_INTERFACE_MEDIA \
"org.freedesktop.Telepathy.Call1.Stream.Interface.Media"
#define TP_IFACE_QUARK_CALL_STREAM_INTERFACE_MEDIA \
(tp_iface_quark_call_stream_interface_media ())
GQuark tp_iface_quark_call_stream_interface_media (void);
#define TP_PROP_CALL_STREAM_INTERFACE_MEDIA_SENDING_STATE \
"org.freedesktop.Telepathy.Call1.Stream.Interface.Media.SendingState"
#define TP_PROP_CALL_STREAM_INTERFACE_MEDIA_RECEIVING_STATE \
"org.freedesktop.Telepathy.Call1.Stream.Interface.Media.ReceivingState"
#define TP_PROP_CALL_STREAM_INTERFACE_MEDIA_TRANSPORT \
"org.freedesktop.Telepathy.Call1.Stream.Interface.Media.Transport"
#define TP_PROP_CALL_STREAM_INTERFACE_MEDIA_LOCAL_CANDIDATES \
"org.freedesktop.Telepathy.Call1.Stream.Interface.Media.LocalCandidates"
#define TP_PROP_CALL_STREAM_INTERFACE_MEDIA_LOCAL_CREDENTIALS \
"org.freedesktop.Telepathy.Call1.Stream.Interface.Media.LocalCredentials"
#define TP_PROP_CALL_STREAM_INTERFACE_MEDIA_STUN_SERVERS \
"org.freedesktop.Telepathy.Call1.Stream.Interface.Media.STUNServers"
#define TP_PROP_CALL_STREAM_INTERFACE_MEDIA_RELAY_INFO \
"org.freedesktop.Telepathy.Call1.Stream.Interface.Media.RelayInfo"
#define TP_PROP_CALL_STREAM_INTERFACE_MEDIA_HAS_SERVER_INFO \
"org.freedesktop.Telepathy.Call1.Stream.Interface.Media.HasServerInfo"
#define TP_PROP_CALL_STREAM_INTERFACE_MEDIA_ENDPOINTS \
"org.freedesktop.Telepathy.Call1.Stream.Interface.Media.Endpoints"
#define TP_PROP_CALL_STREAM_INTERFACE_MEDIA_ICE_RESTART_PENDING \
"org.freedesktop.Telepathy.Call1.Stream.Interface.Media.ICERestartPending"
#define TP_IFACE_CALL_STREAM \
"org.freedesktop.Telepathy.Call1.Stream"
#define TP_IFACE_QUARK_CALL_STREAM \
(tp_iface_quark_call_stream ())
GQuark tp_iface_quark_call_stream (void);
#define TP_PROP_CALL_STREAM_INTERFACES \
"org.freedesktop.Telepathy.Call1.Stream.Interfaces"
#define TP_PROP_CALL_STREAM_REMOTE_MEMBERS \
"org.freedesktop.Telepathy.Call1.Stream.RemoteMembers"
#define TP_PROP_CALL_STREAM_REMOTE_MEMBER_IDENTIFIERS \
"org.freedesktop.Telepathy.Call1.Stream.RemoteMemberIdentifiers"
#define TP_PROP_CALL_STREAM_LOCAL_SENDING_STATE \
"org.freedesktop.Telepathy.Call1.Stream.LocalSendingState"
#define TP_PROP_CALL_STREAM_CAN_REQUEST_RECEIVING \
"org.freedesktop.Telepathy.Call1.Stream.CanRequestReceiving"
#define TP_IFACE_CALL_STREAM_ENDPOINT \
"org.freedesktop.Telepathy.Call1.Stream.Endpoint"
#define TP_IFACE_QUARK_CALL_STREAM_ENDPOINT \
(tp_iface_quark_call_stream_endpoint ())
GQuark tp_iface_quark_call_stream_endpoint (void);
#define TP_PROP_CALL_STREAM_ENDPOINT_REMOTE_CREDENTIALS \
"org.freedesktop.Telepathy.Call1.Stream.Endpoint.RemoteCredentials"
#define TP_PROP_CALL_STREAM_ENDPOINT_REMOTE_CANDIDATES \
"org.freedesktop.Telepathy.Call1.Stream.Endpoint.RemoteCandidates"
#define TP_PROP_CALL_STREAM_ENDPOINT_SELECTED_CANDIDATE_PAIRS \
"org.freedesktop.Telepathy.Call1.Stream.Endpoint.SelectedCandidatePairs"
#define TP_PROP_CALL_STREAM_ENDPOINT_ENDPOINT_STATE \
"org.freedesktop.Telepathy.Call1.Stream.Endpoint.EndpointState"
#define TP_PROP_CALL_STREAM_ENDPOINT_TRANSPORT \
"org.freedesktop.Telepathy.Call1.Stream.Endpoint.Transport"
#define TP_PROP_CALL_STREAM_ENDPOINT_CONTROLLING \
"org.freedesktop.Telepathy.Call1.Stream.Endpoint.Controlling"
#define TP_PROP_CALL_STREAM_ENDPOINT_IS_ICE_LITE \
"org.freedesktop.Telepathy.Call1.Stream.Endpoint.IsICELite"
 End of changes. 6 change blocks. 
0 lines changed or deleted 115 lines changed or added


 tp-cli-channel.h   tp-cli-channel.h 
skipping to change at line 123 skipping to change at line 123
GObject *weak_object); GObject *weak_object);
#ifndef TP_DISABLE_DEPRECATED #ifndef TP_DISABLE_DEPRECATED
gboolean tp_cli_channel_interface_call_state_run_get_call_states (TpChannel *proxy, gboolean tp_cli_channel_interface_call_state_run_get_call_states (TpChannel *proxy,
gint timeout_ms, gint timeout_ms,
GHashTable **out_States, GHashTable **out_States,
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_channel_interface_captcha_authentication_callback_for
_get_captchas) (TpChannel *proxy,
const GPtrArray *out_Captcha_Info,
guint out_Number_Required,
const gchar *out_Language,
const GError *error, gpointer user_data,
GObject *weak_object);
TpProxyPendingCall *tp_cli_channel_interface_captcha_authentication_call_ge
t_captchas (TpChannel *proxy,
gint timeout_ms,
tp_cli_channel_interface_captcha_authentication_callback_for_get_captch
as callback,
gpointer user_data,
GDestroyNotify destroy,
GObject *weak_object);
typedef void (*tp_cli_channel_interface_captcha_authentication_callback_for
_get_captcha_data) (TpChannel *proxy,
const GArray *out_Captcha_Data,
const GError *error, gpointer user_data,
GObject *weak_object);
TpProxyPendingCall *tp_cli_channel_interface_captcha_authentication_call_ge
t_captcha_data (TpChannel *proxy,
gint timeout_ms,
guint in_ID,
const gchar *in_Mime_Type,
tp_cli_channel_interface_captcha_authentication_callback_for_get_captch
a_data callback,
gpointer user_data,
GDestroyNotify destroy,
GObject *weak_object);
typedef void (*tp_cli_channel_interface_captcha_authentication_callback_for
_answer_captchas) (TpChannel *proxy,
const GError *error, gpointer user_data,
GObject *weak_object);
TpProxyPendingCall *tp_cli_channel_interface_captcha_authentication_call_an
swer_captchas (TpChannel *proxy,
gint timeout_ms,
GHashTable *in_Answers,
tp_cli_channel_interface_captcha_authentication_callback_for_answer_cap
tchas callback,
gpointer user_data,
GDestroyNotify destroy,
GObject *weak_object);
typedef void (*tp_cli_channel_interface_captcha_authentication_callback_for
_cancel_captcha) (TpChannel *proxy,
const GError *error, gpointer user_data,
GObject *weak_object);
TpProxyPendingCall *tp_cli_channel_interface_captcha_authentication_call_ca
ncel_captcha (TpChannel *proxy,
gint timeout_ms,
guint in_Reason,
const gchar *in_Debug_Message,
tp_cli_channel_interface_captcha_authentication_callback_for_cancel_cap
tcha callback,
gpointer user_data,
GDestroyNotify destroy,
GObject *weak_object);
typedef void (*tp_cli_channel_interface_chat_state_signal_callback_chat_sta te_changed) (TpChannel *proxy, typedef void (*tp_cli_channel_interface_chat_state_signal_callback_chat_sta te_changed) (TpChannel *proxy,
guint arg_Contact, guint arg_Contact,
guint arg_State, guint arg_State,
gpointer user_data, GObject *weak_object); gpointer user_data, GObject *weak_object);
TpProxySignalConnection *tp_cli_channel_interface_chat_state_connect_to_cha t_state_changed (TpChannel *proxy, TpProxySignalConnection *tp_cli_channel_interface_chat_state_connect_to_cha t_state_changed (TpChannel *proxy,
tp_cli_channel_interface_chat_state_signal_callback_chat_state_changed callback, tp_cli_channel_interface_chat_state_signal_callback_chat_state_changed callback,
gpointer user_data, gpointer user_data,
GDestroyNotify destroy, GDestroyNotify destroy,
GObject *weak_object, GObject *weak_object,
GError **error); GError **error);
skipping to change at line 1027 skipping to change at line 1080
typedef void (*tp_cli_channel_interface_tube_signal_callback_tube_channel_s tate_changed) (TpChannel *proxy, typedef void (*tp_cli_channel_interface_tube_signal_callback_tube_channel_s tate_changed) (TpChannel *proxy,
guint arg_State, guint arg_State,
gpointer user_data, GObject *weak_object); gpointer user_data, GObject *weak_object);
TpProxySignalConnection *tp_cli_channel_interface_tube_connect_to_tube_chan nel_state_changed (TpChannel *proxy, TpProxySignalConnection *tp_cli_channel_interface_tube_connect_to_tube_chan nel_state_changed (TpChannel *proxy,
tp_cli_channel_interface_tube_signal_callback_tube_channel_state_change d callback, tp_cli_channel_interface_tube_signal_callback_tube_channel_state_change d 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_channel_type_call_signal_callback_content_added) (TpC
hannel *proxy,
const gchar *arg_Content,
gpointer user_data, GObject *weak_object);
TpProxySignalConnection *tp_cli_channel_type_call_connect_to_content_added
(TpChannel *proxy,
tp_cli_channel_type_call_signal_callback_content_added callback,
gpointer user_data,
GDestroyNotify destroy,
GObject *weak_object,
GError **error);
typedef void (*tp_cli_channel_type_call_signal_callback_content_removed) (T
pChannel *proxy,
const gchar *arg_Content,
const GValueArray *arg_Reason,
gpointer user_data, GObject *weak_object);
TpProxySignalConnection *tp_cli_channel_type_call_connect_to_content_remove
d (TpChannel *proxy,
tp_cli_channel_type_call_signal_callback_content_removed callback,
gpointer user_data,
GDestroyNotify destroy,
GObject *weak_object,
GError **error);
typedef void (*tp_cli_channel_type_call_signal_callback_call_state_changed)
(TpChannel *proxy,
guint arg_Call_State,
guint arg_Call_Flags,
const GValueArray *arg_Call_State_Reason,
GHashTable *arg_Call_State_Details,
gpointer user_data, GObject *weak_object);
TpProxySignalConnection *tp_cli_channel_type_call_connect_to_call_state_cha
nged (TpChannel *proxy,
tp_cli_channel_type_call_signal_callback_call_state_changed callback,
gpointer user_data,
GDestroyNotify destroy,
GObject *weak_object,
GError **error);
typedef void (*tp_cli_channel_type_call_signal_callback_call_members_change
d) (TpChannel *proxy,
GHashTable *arg_Flags_Changed,
GHashTable *arg_Identifiers,
const GArray *arg_Removed,
const GValueArray *arg_Reason,
gpointer user_data, GObject *weak_object);
TpProxySignalConnection *tp_cli_channel_type_call_connect_to_call_members_c
hanged (TpChannel *proxy,
tp_cli_channel_type_call_signal_callback_call_members_changed callback,
gpointer user_data,
GDestroyNotify destroy,
GObject *weak_object,
GError **error);
typedef void (*tp_cli_channel_type_call_callback_for_set_ringing) (TpChanne
l *proxy,
const GError *error, gpointer user_data,
GObject *weak_object);
TpProxyPendingCall *tp_cli_channel_type_call_call_set_ringing (TpChannel *p
roxy,
gint timeout_ms,
tp_cli_channel_type_call_callback_for_set_ringing callback,
gpointer user_data,
GDestroyNotify destroy,
GObject *weak_object);
typedef void (*tp_cli_channel_type_call_callback_for_set_queued) (TpChannel
*proxy,
const GError *error, gpointer user_data,
GObject *weak_object);
TpProxyPendingCall *tp_cli_channel_type_call_call_set_queued (TpChannel *pr
oxy,
gint timeout_ms,
tp_cli_channel_type_call_callback_for_set_queued callback,
gpointer user_data,
GDestroyNotify destroy,
GObject *weak_object);
typedef void (*tp_cli_channel_type_call_callback_for_accept) (TpChannel *pr
oxy,
const GError *error, gpointer user_data,
GObject *weak_object);
TpProxyPendingCall *tp_cli_channel_type_call_call_accept (TpChannel *proxy,
gint timeout_ms,
tp_cli_channel_type_call_callback_for_accept callback,
gpointer user_data,
GDestroyNotify destroy,
GObject *weak_object);
typedef void (*tp_cli_channel_type_call_callback_for_hangup) (TpChannel *pr
oxy,
const GError *error, gpointer user_data,
GObject *weak_object);
TpProxyPendingCall *tp_cli_channel_type_call_call_hangup (TpChannel *proxy,
gint timeout_ms,
guint in_Reason,
const gchar *in_Detailed_Hangup_Reason,
const gchar *in_Message,
tp_cli_channel_type_call_callback_for_hangup callback,
gpointer user_data,
GDestroyNotify destroy,
GObject *weak_object);
typedef void (*tp_cli_channel_type_call_callback_for_add_content) (TpChanne
l *proxy,
const gchar *out_Content,
const GError *error, gpointer user_data,
GObject *weak_object);
TpProxyPendingCall *tp_cli_channel_type_call_call_add_content (TpChannel *p
roxy,
gint timeout_ms,
const gchar *in_Content_Name,
guint in_Content_Type,
guint in_InitialDirection,
tp_cli_channel_type_call_callback_for_add_content callback,
gpointer user_data,
GDestroyNotify destroy,
GObject *weak_object);
typedef void (*tp_cli_channel_type_contact_search_signal_callback_search_st ate_changed) (TpChannel *proxy, typedef void (*tp_cli_channel_type_contact_search_signal_callback_search_st ate_changed) (TpChannel *proxy,
guint arg_State, guint arg_State,
const gchar *arg_Error, const gchar *arg_Error,
GHashTable *arg_Details, GHashTable *arg_Details,
gpointer user_data, GObject *weak_object); gpointer user_data, GObject *weak_object);
TpProxySignalConnection *tp_cli_channel_type_contact_search_connect_to_sear ch_state_changed (TpChannel *proxy, TpProxySignalConnection *tp_cli_channel_type_contact_search_connect_to_sear ch_state_changed (TpChannel *proxy,
tp_cli_channel_type_contact_search_signal_callback_search_state_changed callback, tp_cli_channel_type_contact_search_signal_callback_search_state_changed callback,
gpointer user_data, gpointer user_data,
GDestroyNotify destroy, GDestroyNotify destroy,
GObject *weak_object, GObject *weak_object,
 End of changes. 2 change blocks. 
0 lines changed or deleted 190 lines changed or added


 tp-cli-connection.h   tp-cli-connection.h 
skipping to change at line 345 skipping to change at line 345
GObject *weak_object); GObject *weak_object);
#ifndef TP_DISABLE_DEPRECATED #ifndef TP_DISABLE_DEPRECATED
gboolean tp_cli_connection_run_remove_client_interest (TpConnection *proxy, gboolean tp_cli_connection_run_remove_client_interest (TpConnection *proxy,
gint timeout_ms, gint timeout_ms,
const gchar **in_Tokens, const gchar **in_Tokens,
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_addressing_callback_for_get_cont
acts_by_vcard_field) (TpConnection *proxy,
GHashTable *out_Requested,
GHashTable *out_Attributes,
const GError *error, gpointer user_data,
GObject *weak_object);
TpProxyPendingCall *tp_cli_connection_interface_addressing_call_get_contact
s_by_vcard_field (TpConnection *proxy,
gint timeout_ms,
const gchar *in_Field,
const gchar **in_Addresses,
const gchar **in_Interfaces,
tp_cli_connection_interface_addressing_callback_for_get_contacts_by_vca
rd_field callback,
gpointer user_data,
GDestroyNotify destroy,
GObject *weak_object);
typedef void (*tp_cli_connection_interface_addressing_callback_for_get_cont
acts_by_uri) (TpConnection *proxy,
GHashTable *out_Requested,
GHashTable *out_Attributes,
const GError *error, gpointer user_data,
GObject *weak_object);
TpProxyPendingCall *tp_cli_connection_interface_addressing_call_get_contact
s_by_uri (TpConnection *proxy,
gint timeout_ms,
const gchar **in_URIs,
const gchar **in_Interfaces,
tp_cli_connection_interface_addressing_callback_for_get_contacts_by_uri
callback,
gpointer user_data,
GDestroyNotify destroy,
GObject *weak_object);
typedef void (*tp_cli_connection_interface_aliasing_signal_callback_aliases _changed) (TpConnection *proxy, typedef void (*tp_cli_connection_interface_aliasing_signal_callback_aliases _changed) (TpConnection *proxy,
const GPtrArray *arg_Aliases, const GPtrArray *arg_Aliases,
gpointer user_data, GObject *weak_object); gpointer user_data, GObject *weak_object);
TpProxySignalConnection *tp_cli_connection_interface_aliasing_connect_to_al iases_changed (TpConnection *proxy, TpProxySignalConnection *tp_cli_connection_interface_aliasing_connect_to_al iases_changed (TpConnection *proxy,
tp_cli_connection_interface_aliasing_signal_callback_aliases_changed ca llback, tp_cli_connection_interface_aliasing_signal_callback_aliases_changed ca llback,
gpointer user_data, gpointer user_data,
GDestroyNotify destroy, GDestroyNotify destroy,
GObject *weak_object, GObject *weak_object,
GError **error); GError **error);
skipping to change at line 1316 skipping to change at line 1347
GObject *weak_object); GObject *weak_object);
#ifndef TP_DISABLE_DEPRECATED #ifndef TP_DISABLE_DEPRECATED
gboolean tp_cli_connection_interface_contact_list_run_unpublish (TpConnecti on *proxy, gboolean tp_cli_connection_interface_contact_list_run_unpublish (TpConnecti on *proxy,
gint timeout_ms, gint timeout_ms,
const GArray *in_Contacts, const GArray *in_Contacts,
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_list_callback_for_downlo
ad) (TpConnection *proxy,
const GError *error, gpointer user_data,
GObject *weak_object);
TpProxyPendingCall *tp_cli_connection_interface_contact_list_call_download
(TpConnection *proxy,
gint timeout_ms,
tp_cli_connection_interface_contact_list_callback_for_download callback
,
gpointer user_data,
GDestroyNotify destroy,
GObject *weak_object);
typedef void (*tp_cli_connection_interface_contacts_callback_for_get_contac t_attributes) (TpConnection *proxy, typedef void (*tp_cli_connection_interface_contacts_callback_for_get_contac t_attributes) (TpConnection *proxy,
GHashTable *out_Attributes, GHashTable *out_Attributes,
const GError *error, gpointer user_data, const GError *error, gpointer user_data,
GObject *weak_object); GObject *weak_object);
TpProxyPendingCall *tp_cli_connection_interface_contacts_call_get_contact_a ttributes (TpConnection *proxy, TpProxyPendingCall *tp_cli_connection_interface_contacts_call_get_contact_a ttributes (TpConnection *proxy,
gint timeout_ms, gint timeout_ms,
const GArray *in_Handles, const GArray *in_Handles,
const gchar **in_Interfaces, const gchar **in_Interfaces,
gboolean in_Hold, gboolean in_Hold,
 End of changes. 2 change blocks. 
0 lines changed or deleted 51 lines changed or added


 tp-svc-channel.h   tp-svc-channel.h 
skipping to change at line 130 skipping to change at line 130
GHashTable *out_States) GHashTable *out_States)
{ {
dbus_g_method_return (context, dbus_g_method_return (context,
out_States); out_States);
} }
void tp_svc_channel_interface_call_state_emit_call_state_changed (gpointer instance, void tp_svc_channel_interface_call_state_emit_call_state_changed (gpointer instance,
guint arg_Contact, guint arg_Contact,
guint arg_State); guint arg_State);
typedef struct _TpSvcChannelInterfaceCaptchaAuthentication TpSvcChannelInte
rfaceCaptchaAuthentication;
typedef struct _TpSvcChannelInterfaceCaptchaAuthenticationClass TpSvcChanne
lInterfaceCaptchaAuthenticationClass;
GType tp_svc_channel_interface_captcha_authentication_get_type (void);
#define TP_TYPE_SVC_CHANNEL_INTERFACE_CAPTCHA_AUTHENTICATION \
(tp_svc_channel_interface_captcha_authentication_get_type ())
#define TP_SVC_CHANNEL_INTERFACE_CAPTCHA_AUTHENTICATION(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CHANNEL_INTERFACE_CAPTCHA_
AUTHENTICATION, TpSvcChannelInterfaceCaptchaAuthentication))
#define TP_IS_SVC_CHANNEL_INTERFACE_CAPTCHA_AUTHENTICATION(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CHANNEL_INTERFACE_CAPTCHA_
AUTHENTICATION))
#define TP_SVC_CHANNEL_INTERFACE_CAPTCHA_AUTHENTICATION_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CHANNEL_INTERFACE_CAPTC
HA_AUTHENTICATION, TpSvcChannelInterfaceCaptchaAuthenticationClass))
typedef void (*tp_svc_channel_interface_captcha_authentication_get_captchas
_impl) (TpSvcChannelInterfaceCaptchaAuthentication *self,
DBusGMethodInvocation *context);
void tp_svc_channel_interface_captcha_authentication_implement_get_captchas
(TpSvcChannelInterfaceCaptchaAuthenticationClass *klass, tp_svc_channel_in
terface_captcha_authentication_get_captchas_impl impl);
static inline
/* this comment is to stop gtkdoc realising this is static */
void tp_svc_channel_interface_captcha_authentication_return_from_get_captch
as (DBusGMethodInvocation *context,
const GPtrArray *out_Captcha_Info,
guint out_Number_Required,
const gchar *out_Language);
static inline void
tp_svc_channel_interface_captcha_authentication_return_from_get_captchas (D
BusGMethodInvocation *context,
const GPtrArray *out_Captcha_Info,
guint out_Number_Required,
const gchar *out_Language)
{
dbus_g_method_return (context,
out_Captcha_Info,
out_Number_Required,
out_Language);
}
typedef void (*tp_svc_channel_interface_captcha_authentication_get_captcha_
data_impl) (TpSvcChannelInterfaceCaptchaAuthentication *self,
guint in_ID,
const gchar *in_Mime_Type,
DBusGMethodInvocation *context);
void tp_svc_channel_interface_captcha_authentication_implement_get_captcha_
data (TpSvcChannelInterfaceCaptchaAuthenticationClass *klass, tp_svc_channe
l_interface_captcha_authentication_get_captcha_data_impl impl);
static inline
/* this comment is to stop gtkdoc realising this is static */
void tp_svc_channel_interface_captcha_authentication_return_from_get_captch
a_data (DBusGMethodInvocation *context,
const GArray *out_Captcha_Data);
static inline void
tp_svc_channel_interface_captcha_authentication_return_from_get_captcha_dat
a (DBusGMethodInvocation *context,
const GArray *out_Captcha_Data)
{
dbus_g_method_return (context,
out_Captcha_Data);
}
typedef void (*tp_svc_channel_interface_captcha_authentication_answer_captc
has_impl) (TpSvcChannelInterfaceCaptchaAuthentication *self,
GHashTable *in_Answers,
DBusGMethodInvocation *context);
void tp_svc_channel_interface_captcha_authentication_implement_answer_captc
has (TpSvcChannelInterfaceCaptchaAuthenticationClass *klass, tp_svc_channel
_interface_captcha_authentication_answer_captchas_impl impl);
static inline
/* this comment is to stop gtkdoc realising this is static */
void tp_svc_channel_interface_captcha_authentication_return_from_answer_cap
tchas (DBusGMethodInvocation *context);
static inline void
tp_svc_channel_interface_captcha_authentication_return_from_answer_captchas
(DBusGMethodInvocation *context)
{
dbus_g_method_return (context);
}
typedef void (*tp_svc_channel_interface_captcha_authentication_cancel_captc
ha_impl) (TpSvcChannelInterfaceCaptchaAuthentication *self,
guint in_Reason,
const gchar *in_Debug_Message,
DBusGMethodInvocation *context);
void tp_svc_channel_interface_captcha_authentication_implement_cancel_captc
ha (TpSvcChannelInterfaceCaptchaAuthenticationClass *klass, tp_svc_channel_
interface_captcha_authentication_cancel_captcha_impl impl);
static inline
/* this comment is to stop gtkdoc realising this is static */
void tp_svc_channel_interface_captcha_authentication_return_from_cancel_cap
tcha (DBusGMethodInvocation *context);
static inline void
tp_svc_channel_interface_captcha_authentication_return_from_cancel_captcha
(DBusGMethodInvocation *context)
{
dbus_g_method_return (context);
}
typedef struct _TpSvcChannelInterfaceChatState TpSvcChannelInterfaceChatSta te; typedef struct _TpSvcChannelInterfaceChatState TpSvcChannelInterfaceChatSta te;
typedef struct _TpSvcChannelInterfaceChatStateClass TpSvcChannelInterfaceCh atStateClass; typedef struct _TpSvcChannelInterfaceChatStateClass TpSvcChannelInterfaceCh atStateClass;
GType tp_svc_channel_interface_chat_state_get_type (void); GType tp_svc_channel_interface_chat_state_get_type (void);
#define TP_TYPE_SVC_CHANNEL_INTERFACE_CHAT_STATE \ #define TP_TYPE_SVC_CHANNEL_INTERFACE_CHAT_STATE \
(tp_svc_channel_interface_chat_state_get_type ()) (tp_svc_channel_interface_chat_state_get_type ())
#define TP_SVC_CHANNEL_INTERFACE_CHAT_STATE(obj) \ #define TP_SVC_CHANNEL_INTERFACE_CHAT_STATE(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CHANNEL_INTERFACE_CHAT_STA TE, TpSvcChannelInterfaceChatState)) (G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CHANNEL_INTERFACE_CHAT_STA TE, TpSvcChannelInterfaceChatState))
#define TP_IS_SVC_CHANNEL_INTERFACE_CHAT_STATE(obj) \ #define TP_IS_SVC_CHANNEL_INTERFACE_CHAT_STATE(obj) \
skipping to change at line 928 skipping to change at line 1007
#define TP_SVC_CHANNEL_INTERFACE_TUBE(obj) \ #define TP_SVC_CHANNEL_INTERFACE_TUBE(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CHANNEL_INTERFACE_TUBE, Tp SvcChannelInterfaceTube)) (G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CHANNEL_INTERFACE_TUBE, Tp SvcChannelInterfaceTube))
#define TP_IS_SVC_CHANNEL_INTERFACE_TUBE(obj) \ #define TP_IS_SVC_CHANNEL_INTERFACE_TUBE(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CHANNEL_INTERFACE_TUBE)) (G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CHANNEL_INTERFACE_TUBE))
#define TP_SVC_CHANNEL_INTERFACE_TUBE_GET_CLASS(obj) \ #define TP_SVC_CHANNEL_INTERFACE_TUBE_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CHANNEL_INTERFACE_TUBE, TpSvcChannelInterfaceTubeClass)) (G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CHANNEL_INTERFACE_TUBE, TpSvcChannelInterfaceTubeClass))
void tp_svc_channel_interface_tube_emit_tube_channel_state_changed (gpointe r instance, void tp_svc_channel_interface_tube_emit_tube_channel_state_changed (gpointe r instance,
guint arg_State); guint arg_State);
typedef struct _TpSvcChannelTypeCall TpSvcChannelTypeCall;
typedef struct _TpSvcChannelTypeCallClass TpSvcChannelTypeCallClass;
GType tp_svc_channel_type_call_get_type (void);
#define TP_TYPE_SVC_CHANNEL_TYPE_CALL \
(tp_svc_channel_type_call_get_type ())
#define TP_SVC_CHANNEL_TYPE_CALL(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CHANNEL_TYPE_CALL, TpSvcCh
annelTypeCall))
#define TP_IS_SVC_CHANNEL_TYPE_CALL(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CHANNEL_TYPE_CALL))
#define TP_SVC_CHANNEL_TYPE_CALL_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CHANNEL_TYPE_CALL, TpSv
cChannelTypeCallClass))
typedef void (*tp_svc_channel_type_call_set_ringing_impl) (TpSvcChannelType
Call *self,
DBusGMethodInvocation *context);
void tp_svc_channel_type_call_implement_set_ringing (TpSvcChannelTypeCallCl
ass *klass, tp_svc_channel_type_call_set_ringing_impl impl);
static inline
/* this comment is to stop gtkdoc realising this is static */
void tp_svc_channel_type_call_return_from_set_ringing (DBusGMethodInvocatio
n *context);
static inline void
tp_svc_channel_type_call_return_from_set_ringing (DBusGMethodInvocation *co
ntext)
{
dbus_g_method_return (context);
}
typedef void (*tp_svc_channel_type_call_set_queued_impl) (TpSvcChannelTypeC
all *self,
DBusGMethodInvocation *context);
void tp_svc_channel_type_call_implement_set_queued (TpSvcChannelTypeCallCla
ss *klass, tp_svc_channel_type_call_set_queued_impl impl);
static inline
/* this comment is to stop gtkdoc realising this is static */
void tp_svc_channel_type_call_return_from_set_queued (DBusGMethodInvocation
*context);
static inline void
tp_svc_channel_type_call_return_from_set_queued (DBusGMethodInvocation *con
text)
{
dbus_g_method_return (context);
}
typedef void (*tp_svc_channel_type_call_accept_impl) (TpSvcChannelTypeCall
*self,
DBusGMethodInvocation *context);
void tp_svc_channel_type_call_implement_accept (TpSvcChannelTypeCallClass *
klass, tp_svc_channel_type_call_accept_impl impl);
static inline
/* this comment is to stop gtkdoc realising this is static */
void tp_svc_channel_type_call_return_from_accept (DBusGMethodInvocation *co
ntext);
static inline void
tp_svc_channel_type_call_return_from_accept (DBusGMethodInvocation *context
)
{
dbus_g_method_return (context);
}
typedef void (*tp_svc_channel_type_call_hangup_impl) (TpSvcChannelTypeCall
*self,
guint in_Reason,
const gchar *in_Detailed_Hangup_Reason,
const gchar *in_Message,
DBusGMethodInvocation *context);
void tp_svc_channel_type_call_implement_hangup (TpSvcChannelTypeCallClass *
klass, tp_svc_channel_type_call_hangup_impl impl);
static inline
/* this comment is to stop gtkdoc realising this is static */
void tp_svc_channel_type_call_return_from_hangup (DBusGMethodInvocation *co
ntext);
static inline void
tp_svc_channel_type_call_return_from_hangup (DBusGMethodInvocation *context
)
{
dbus_g_method_return (context);
}
typedef void (*tp_svc_channel_type_call_add_content_impl) (TpSvcChannelType
Call *self,
const gchar *in_Content_Name,
guint in_Content_Type,
guint in_InitialDirection,
DBusGMethodInvocation *context);
void tp_svc_channel_type_call_implement_add_content (TpSvcChannelTypeCallCl
ass *klass, tp_svc_channel_type_call_add_content_impl impl);
static inline
/* this comment is to stop gtkdoc realising this is static */
void tp_svc_channel_type_call_return_from_add_content (DBusGMethodInvocatio
n *context,
const gchar *out_Content);
static inline void
tp_svc_channel_type_call_return_from_add_content (DBusGMethodInvocation *co
ntext,
const gchar *out_Content)
{
dbus_g_method_return (context,
out_Content);
}
void tp_svc_channel_type_call_emit_content_added (gpointer instance,
const gchar *arg_Content);
void tp_svc_channel_type_call_emit_content_removed (gpointer instance,
const gchar *arg_Content,
const GValueArray *arg_Reason);
void tp_svc_channel_type_call_emit_call_state_changed (gpointer instance,
guint arg_Call_State,
guint arg_Call_Flags,
const GValueArray *arg_Call_State_Reason,
GHashTable *arg_Call_State_Details);
void tp_svc_channel_type_call_emit_call_members_changed (gpointer instance,
GHashTable *arg_Flags_Changed,
GHashTable *arg_Identifiers,
const GArray *arg_Removed,
const GValueArray *arg_Reason);
typedef struct _TpSvcChannelTypeContactList TpSvcChannelTypeContactList; typedef struct _TpSvcChannelTypeContactList TpSvcChannelTypeContactList;
typedef struct _TpSvcChannelTypeContactListClass TpSvcChannelTypeContactLis tClass; typedef struct _TpSvcChannelTypeContactListClass TpSvcChannelTypeContactLis tClass;
GType tp_svc_channel_type_contact_list_get_type (void); GType tp_svc_channel_type_contact_list_get_type (void);
#define TP_TYPE_SVC_CHANNEL_TYPE_CONTACT_LIST \ #define TP_TYPE_SVC_CHANNEL_TYPE_CONTACT_LIST \
(tp_svc_channel_type_contact_list_get_type ()) (tp_svc_channel_type_contact_list_get_type ())
#define TP_SVC_CHANNEL_TYPE_CONTACT_LIST(obj) \ #define TP_SVC_CHANNEL_TYPE_CONTACT_LIST(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CHANNEL_TYPE_CONTACT_LIST, TpSvcChannelTypeContactList)) (G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CHANNEL_TYPE_CONTACT_LIST, TpSvcChannelTypeContactList))
#define TP_IS_SVC_CHANNEL_TYPE_CONTACT_LIST(obj) \ #define TP_IS_SVC_CHANNEL_TYPE_CONTACT_LIST(obj) \
 End of changes. 2 change blocks. 
0 lines changed or deleted 225 lines changed or added


 tp-svc-connection.h   tp-svc-connection.h 
skipping to change at line 242 skipping to change at line 242
guint arg_Handle_Type, guint arg_Handle_Type,
guint arg_Handle, guint arg_Handle,
gboolean arg_Suppress_Handler); gboolean arg_Suppress_Handler);
void tp_svc_connection_emit_connection_error (gpointer instance, void tp_svc_connection_emit_connection_error (gpointer instance,
const gchar *arg_Error, const gchar *arg_Error,
GHashTable *arg_Details); GHashTable *arg_Details);
void tp_svc_connection_emit_status_changed (gpointer instance, void tp_svc_connection_emit_status_changed (gpointer instance,
guint arg_Status, guint arg_Status,
guint arg_Reason); guint arg_Reason);
typedef struct _TpSvcConnectionInterfaceAddressing TpSvcConnectionInterface
Addressing;
typedef struct _TpSvcConnectionInterfaceAddressingClass TpSvcConnectionInte
rfaceAddressingClass;
GType tp_svc_connection_interface_addressing_get_type (void);
#define TP_TYPE_SVC_CONNECTION_INTERFACE_ADDRESSING \
(tp_svc_connection_interface_addressing_get_type ())
#define TP_SVC_CONNECTION_INTERFACE_ADDRESSING(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_ADDRE
SSING, TpSvcConnectionInterfaceAddressing))
#define TP_IS_SVC_CONNECTION_INTERFACE_ADDRESSING(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_ADDRE
SSING))
#define TP_SVC_CONNECTION_INTERFACE_ADDRESSING_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_AD
DRESSING, TpSvcConnectionInterfaceAddressingClass))
typedef void (*tp_svc_connection_interface_addressing_get_contacts_by_vcard
_field_impl) (TpSvcConnectionInterfaceAddressing *self,
const gchar *in_Field,
const gchar **in_Addresses,
const gchar **in_Interfaces,
DBusGMethodInvocation *context);
void tp_svc_connection_interface_addressing_implement_get_contacts_by_vcard
_field (TpSvcConnectionInterfaceAddressingClass *klass, tp_svc_connection_i
nterface_addressing_get_contacts_by_vcard_field_impl impl);
static inline
/* this comment is to stop gtkdoc realising this is static */
void tp_svc_connection_interface_addressing_return_from_get_contacts_by_vca
rd_field (DBusGMethodInvocation *context,
GHashTable *out_Requested,
GHashTable *out_Attributes);
static inline void
tp_svc_connection_interface_addressing_return_from_get_contacts_by_vcard_fi
eld (DBusGMethodInvocation *context,
GHashTable *out_Requested,
GHashTable *out_Attributes)
{
dbus_g_method_return (context,
out_Requested,
out_Attributes);
}
typedef void (*tp_svc_connection_interface_addressing_get_contacts_by_uri_i
mpl) (TpSvcConnectionInterfaceAddressing *self,
const gchar **in_URIs,
const gchar **in_Interfaces,
DBusGMethodInvocation *context);
void tp_svc_connection_interface_addressing_implement_get_contacts_by_uri (
TpSvcConnectionInterfaceAddressingClass *klass, tp_svc_connection_interface
_addressing_get_contacts_by_uri_impl impl);
static inline
/* this comment is to stop gtkdoc realising this is static */
void tp_svc_connection_interface_addressing_return_from_get_contacts_by_uri
(DBusGMethodInvocation *context,
GHashTable *out_Requested,
GHashTable *out_Attributes);
static inline void
tp_svc_connection_interface_addressing_return_from_get_contacts_by_uri (DBu
sGMethodInvocation *context,
GHashTable *out_Requested,
GHashTable *out_Attributes)
{
dbus_g_method_return (context,
out_Requested,
out_Attributes);
}
typedef struct _TpSvcConnectionInterfaceAliasing TpSvcConnectionInterfaceAl iasing; typedef struct _TpSvcConnectionInterfaceAliasing TpSvcConnectionInterfaceAl iasing;
typedef struct _TpSvcConnectionInterfaceAliasingClass TpSvcConnectionInterf aceAliasingClass; typedef struct _TpSvcConnectionInterfaceAliasingClass TpSvcConnectionInterf aceAliasingClass;
GType tp_svc_connection_interface_aliasing_get_type (void); GType tp_svc_connection_interface_aliasing_get_type (void);
#define TP_TYPE_SVC_CONNECTION_INTERFACE_ALIASING \ #define TP_TYPE_SVC_CONNECTION_INTERFACE_ALIASING \
(tp_svc_connection_interface_aliasing_get_type ()) (tp_svc_connection_interface_aliasing_get_type ())
#define TP_SVC_CONNECTION_INTERFACE_ALIASING(obj) \ #define TP_SVC_CONNECTION_INTERFACE_ALIASING(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_ALIAS ING, TpSvcConnectionInterfaceAliasing)) (G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_ALIAS ING, TpSvcConnectionInterfaceAliasing))
#define TP_IS_SVC_CONNECTION_INTERFACE_ALIASING(obj) \ #define TP_IS_SVC_CONNECTION_INTERFACE_ALIASING(obj) \
skipping to change at line 1004 skipping to change at line 1059
void tp_svc_connection_interface_contact_list_implement_unpublish (TpSvcCon nectionInterfaceContactListClass *klass, tp_svc_connection_interface_contac t_list_unpublish_impl impl); void tp_svc_connection_interface_contact_list_implement_unpublish (TpSvcCon nectionInterfaceContactListClass *klass, tp_svc_connection_interface_contac t_list_unpublish_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_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);
} }
typedef void (*tp_svc_connection_interface_contact_list_download_impl) (TpS
vcConnectionInterfaceContactList *self,
DBusGMethodInvocation *context);
void tp_svc_connection_interface_contact_list_implement_download (TpSvcConn
ectionInterfaceContactListClass *klass, tp_svc_connection_interface_contact
_list_download_impl impl);
static inline
/* this comment is to stop gtkdoc realising this is static */
void tp_svc_connection_interface_contact_list_return_from_download (DBusGMe
thodInvocation *context);
static inline void
tp_svc_connection_interface_contact_list_return_from_download (DBusGMethodI
nvocation *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, void tp_svc_connection_interface_contact_list_emit_contacts_changed_with_id (gpointer instance,
GHashTable *arg_Changes, GHashTable *arg_Changes,
GHashTable *arg_Identifiers, GHashTable *arg_Identifiers,
GHashTable *arg_Removals); 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);
 End of changes. 2 change blocks. 
0 lines changed or deleted 87 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/