channel.h   channel.h 
skipping to change at line 117 skipping to change at line 117
TpChannelGroupFlags tp_channel_group_get_flags (TpChannel *self); TpChannelGroupFlags tp_channel_group_get_flags (TpChannel *self);
const TpIntSet *tp_channel_group_get_members (TpChannel *self); const TpIntSet *tp_channel_group_get_members (TpChannel *self);
const TpIntSet *tp_channel_group_get_local_pending (TpChannel *self); const TpIntSet *tp_channel_group_get_local_pending (TpChannel *self);
const TpIntSet *tp_channel_group_get_remote_pending (TpChannel *self); const TpIntSet *tp_channel_group_get_remote_pending (TpChannel *self);
gboolean tp_channel_group_get_local_pending_info (TpChannel *self, gboolean tp_channel_group_get_local_pending_info (TpChannel *self,
TpHandle local_pending, TpHandle *actor, TpHandle local_pending, TpHandle *actor,
TpChannelGroupChangeReason *reason, const gchar **message); TpChannelGroupChangeReason *reason, const gchar **message);
TpHandle tp_channel_group_get_handle_owner (TpChannel *self, TpHandle handl e); TpHandle tp_channel_group_get_handle_owner (TpChannel *self, TpHandle handl e);
gboolean tp_channel_get_requested (TpChannel *self);
TpHandle tp_channel_get_initiator_handle (TpChannel *self);
const gchar * tp_channel_get_initiator_identifier (TpChannel *self);
#define TP_CHANNEL_FEATURE_CORE \ #define TP_CHANNEL_FEATURE_CORE \
tp_channel_get_feature_quark_core () tp_channel_get_feature_quark_core ()
GQuark tp_channel_get_feature_quark_core (void) G_GNUC_CONST; GQuark tp_channel_get_feature_quark_core (void) G_GNUC_CONST;
#define TP_CHANNEL_FEATURE_GROUP \ #define TP_CHANNEL_FEATURE_GROUP \
tp_channel_get_feature_quark_group () tp_channel_get_feature_quark_group ()
GQuark tp_channel_get_feature_quark_group (void) G_GNUC_CONST; GQuark tp_channel_get_feature_quark_group (void) G_GNUC_CONST;
#define TP_CHANNEL_FEATURE_CHAT_STATES \ #define TP_CHANNEL_FEATURE_CHAT_STATES \
 End of changes. 1 change blocks. 
0 lines changed or deleted 5 lines changed or added


 error-str.h   error-str.h 
skipping to change at line 43 skipping to change at line 43
#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"
#define TP_ERROR_STR_ALREADY_CONNECTED "org.freedesktop.Telepathy.Error.Alr eadyConnected" #define TP_ERROR_STR_ALREADY_CONNECTED "org.freedesktop.Telepathy.Error.Alr eadyConnected"
#define TP_ERROR_STR_CONNECTION_REPLACED "org.freedesktop.Telepathy.Error.C onnectionReplaced" #define TP_ERROR_STR_CONNECTION_REPLACED "org.freedesktop.Telepathy.Error.C onnectionReplaced"
#define TP_ERROR_STR_REGISTRATION_EXISTS "org.freedesktop.Telepathy.Error.R egistrationExists" #define TP_ERROR_STR_REGISTRATION_EXISTS "org.freedesktop.Telepathy.Error.R egistrationExists"
#define TP_ERROR_STR_SERVICE_BUSY "org.freedesktop.Telepathy.Error.ServiceB usy" #define TP_ERROR_STR_SERVICE_BUSY "org.freedesktop.Telepathy.Error.ServiceB usy"
#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"
 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 85 skipping to change at line 85
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_REVOKED, /*< nick=Cert.Revoked >*/
TP_ERROR_CERT_INSECURE, /*< nick=Cert.Insecure >*/ TP_ERROR_CERT_INSECURE, /*< nick=Cert.Insecure >*/
TP_ERROR_CERT_LIMIT_EXCEEDED, /*< nick=Cert.LimitExceeded >*/ TP_ERROR_CERT_LIMIT_EXCEEDED, /*< nick=Cert.LimitExceeded >*/
TP_ERROR_NOT_YET, /*< nick=NotYet >*/
} 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


 telepathy-interfaces.h   telepathy-interfaces.h 
skipping to change at line 164 skipping to change at line 164
"org.freedesktop.Telepathy.Connection.Interface.Cellular" "org.freedesktop.Telepathy.Connection.Interface.Cellular"
#define TP_IFACE_QUARK_CONNECTION_INTERFACE_CELLULAR \ #define TP_IFACE_QUARK_CONNECTION_INTERFACE_CELLULAR \
(tp_iface_quark_connection_interface_cellular ()) (tp_iface_quark_connection_interface_cellular ())
GQuark tp_iface_quark_connection_interface_cellular (void); GQuark tp_iface_quark_connection_interface_cellular (void);
#define TP_PROP_CONNECTION_INTERFACE_CELLULAR_MESSAGE_VALIDITY_PERIOD \ #define TP_PROP_CONNECTION_INTERFACE_CELLULAR_MESSAGE_VALIDITY_PERIOD \
"org.freedesktop.Telepathy.Connection.Interface.Cellular.MessageValidityPer iod" "org.freedesktop.Telepathy.Connection.Interface.Cellular.MessageValidityPer iod"
#define TP_PROP_CONNECTION_INTERFACE_CELLULAR_OVERRIDE_MESSAGE_SERVICE_CENT
RE \
"org.freedesktop.Telepathy.Connection.Interface.Cellular.OverrideMessageSer
viceCentre"
#define TP_PROP_CONNECTION_INTERFACE_CELLULAR_MESSAGE_SERVICE_CENTRE \ #define TP_PROP_CONNECTION_INTERFACE_CELLULAR_MESSAGE_SERVICE_CENTRE \
"org.freedesktop.Telepathy.Connection.Interface.Cellular.MessageServiceCent re" "org.freedesktop.Telepathy.Connection.Interface.Cellular.MessageServiceCent re"
#define TP_PROP_CONNECTION_INTERFACE_CELLULAR_IMSI \ #define TP_PROP_CONNECTION_INTERFACE_CELLULAR_IMSI \
"org.freedesktop.Telepathy.Connection.Interface.Cellular.IMSI" "org.freedesktop.Telepathy.Connection.Interface.Cellular.IMSI"
#define TP_PROP_CONNECTION_INTERFACE_CELLULAR_MESSAGE_REDUCED_CHARACTER_SET \ #define TP_PROP_CONNECTION_INTERFACE_CELLULAR_MESSAGE_REDUCED_CHARACTER_SET \
"org.freedesktop.Telepathy.Connection.Interface.Cellular.MessageReducedChar acterSet" "org.freedesktop.Telepathy.Connection.Interface.Cellular.MessageReducedChar acterSet"
#define TP_IFACE_CONNECTION_INTERFACE_CONTACT_CAPABILITIES \ #define TP_IFACE_CONNECTION_INTERFACE_CONTACT_CAPABILITIES \
skipping to change at line 609 skipping to change at line 612
(tp_iface_quark_channel_interface_service_point ()) (tp_iface_quark_channel_interface_service_point ())
GQuark tp_iface_quark_channel_interface_service_point (void); GQuark tp_iface_quark_channel_interface_service_point (void);
#define TP_PROP_CHANNEL_INTERFACE_SERVICE_POINT_INITIAL_SERVICE_POINT \ #define TP_PROP_CHANNEL_INTERFACE_SERVICE_POINT_INITIAL_SERVICE_POINT \
"org.freedesktop.Telepathy.Channel.Interface.ServicePoint.InitialServicePoi nt" "org.freedesktop.Telepathy.Channel.Interface.ServicePoint.InitialServicePoi nt"
#define TP_PROP_CHANNEL_INTERFACE_SERVICE_POINT_CURRENT_SERVICE_POINT \ #define TP_PROP_CHANNEL_INTERFACE_SERVICE_POINT_CURRENT_SERVICE_POINT \
"org.freedesktop.Telepathy.Channel.Interface.ServicePoint.CurrentServicePoi nt" "org.freedesktop.Telepathy.Channel.Interface.ServicePoint.CurrentServicePoi nt"
#define TP_IFACE_CHANNEL_INTERFACE_SMS \
"org.freedesktop.Telepathy.Channel.Interface.SMS"
#define TP_IFACE_QUARK_CHANNEL_INTERFACE_SMS \
(tp_iface_quark_channel_interface_sms ())
GQuark tp_iface_quark_channel_interface_sms (void);
#define TP_PROP_CHANNEL_INTERFACE_SMS_FLASH \
"org.freedesktop.Telepathy.Channel.Interface.SMS.Flash"
#define TP_IFACE_CHANNEL_INTERFACE_TUBE \ #define TP_IFACE_CHANNEL_INTERFACE_TUBE \
"org.freedesktop.Telepathy.Channel.Interface.Tube" "org.freedesktop.Telepathy.Channel.Interface.Tube"
#define TP_IFACE_QUARK_CHANNEL_INTERFACE_TUBE \ #define TP_IFACE_QUARK_CHANNEL_INTERFACE_TUBE \
(tp_iface_quark_channel_interface_tube ()) (tp_iface_quark_channel_interface_tube ())
GQuark tp_iface_quark_channel_interface_tube (void); GQuark tp_iface_quark_channel_interface_tube (void);
#define TP_PROP_CHANNEL_INTERFACE_TUBE_PARAMETERS \ #define TP_PROP_CHANNEL_INTERFACE_TUBE_PARAMETERS \
"org.freedesktop.Telepathy.Channel.Interface.Tube.Parameters" "org.freedesktop.Telepathy.Channel.Interface.Tube.Parameters"
 End of changes. 2 change blocks. 
0 lines changed or deleted 16 lines changed or added


 tp-svc-channel.h   tp-svc-channel.h 
skipping to change at line 641 skipping to change at line 641
gboolean out_Correct) gboolean out_Correct)
{ {
dbus_g_method_return (context, dbus_g_method_return (context,
out_Correct); out_Correct);
} }
void tp_svc_channel_interface_password_emit_password_flags_changed (gpointe r instance, void tp_svc_channel_interface_password_emit_password_flags_changed (gpointe r instance,
guint arg_Added, guint arg_Added,
guint arg_Removed); guint arg_Removed);
typedef struct _TpSvcChannelInterfaceSMS TpSvcChannelInterfaceSMS;
typedef struct _TpSvcChannelInterfaceSMSClass TpSvcChannelInterfaceSMSClass
;
GType tp_svc_channel_interface_sms_get_type (void);
#define TP_TYPE_SVC_CHANNEL_INTERFACE_SMS \
(tp_svc_channel_interface_sms_get_type ())
#define TP_SVC_CHANNEL_INTERFACE_SMS(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CHANNEL_INTERFACE_SMS, TpS
vcChannelInterfaceSMS))
#define TP_IS_SVC_CHANNEL_INTERFACE_SMS(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CHANNEL_INTERFACE_SMS))
#define TP_SVC_CHANNEL_INTERFACE_SMS_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CHANNEL_INTERFACE_SMS,
TpSvcChannelInterfaceSMSClass))
typedef struct _TpSvcChannelInterfaceServicePoint TpSvcChannelInterfaceServ icePoint; typedef struct _TpSvcChannelInterfaceServicePoint TpSvcChannelInterfaceServ icePoint;
typedef struct _TpSvcChannelInterfaceServicePointClass TpSvcChannelInterfac eServicePointClass; typedef struct _TpSvcChannelInterfaceServicePointClass TpSvcChannelInterfac eServicePointClass;
GType tp_svc_channel_interface_service_point_get_type (void); GType tp_svc_channel_interface_service_point_get_type (void);
#define TP_TYPE_SVC_CHANNEL_INTERFACE_SERVICE_POINT \ #define TP_TYPE_SVC_CHANNEL_INTERFACE_SERVICE_POINT \
(tp_svc_channel_interface_service_point_get_type ()) (tp_svc_channel_interface_service_point_get_type ())
#define TP_SVC_CHANNEL_INTERFACE_SERVICE_POINT(obj) \ #define TP_SVC_CHANNEL_INTERFACE_SERVICE_POINT(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CHANNEL_INTERFACE_SERVICE_ POINT, TpSvcChannelInterfaceServicePoint)) (G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CHANNEL_INTERFACE_SERVICE_ POINT, TpSvcChannelInterfaceServicePoint))
#define TP_IS_SVC_CHANNEL_INTERFACE_SERVICE_POINT(obj) \ #define TP_IS_SVC_CHANNEL_INTERFACE_SERVICE_POINT(obj) \
 End of changes. 1 change blocks. 
0 lines changed or deleted 17 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/