error-str.h   error-str.h 
skipping to change at line 50 skipping to change at line 50
#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" #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"
 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 92 skipping to change at line 92
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 >*/ TP_ERROR_NOT_YET, /*< nick=NotYet >*/
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 >*/
} 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


 tp-cli-media-stream-handler.h   tp-cli-media-stream-handler.h 
skipping to change at line 134 skipping to change at line 134
typedef void (*tp_cli_media_stream_handler_signal_callback_set_stream_held) (TpMediaStreamHandler *proxy, typedef void (*tp_cli_media_stream_handler_signal_callback_set_stream_held) (TpMediaStreamHandler *proxy,
gboolean arg_Held, gboolean arg_Held,
gpointer user_data, GObject *weak_object); gpointer user_data, GObject *weak_object);
TpProxySignalConnection *tp_cli_media_stream_handler_connect_to_set_stream_ held (TpMediaStreamHandler *proxy, TpProxySignalConnection *tp_cli_media_stream_handler_connect_to_set_stream_ held (TpMediaStreamHandler *proxy,
tp_cli_media_stream_handler_signal_callback_set_stream_held callback, tp_cli_media_stream_handler_signal_callback_set_stream_held 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_media_stream_handler_signal_callback_set_remote_feedb
ack_messages) (TpMediaStreamHandler *proxy,
GHashTable *arg_Messages,
gpointer user_data, GObject *weak_object);
TpProxySignalConnection *tp_cli_media_stream_handler_connect_to_set_remote_
feedback_messages (TpMediaStreamHandler *proxy,
tp_cli_media_stream_handler_signal_callback_set_remote_feedback_message
s callback,
gpointer user_data,
GDestroyNotify destroy,
GObject *weak_object,
GError **error);
typedef void (*tp_cli_media_stream_handler_signal_callback_set_remote_heade
r_extensions) (TpMediaStreamHandler *proxy,
const GPtrArray *arg_Header_Extensions,
gpointer user_data, GObject *weak_object);
TpProxySignalConnection *tp_cli_media_stream_handler_connect_to_set_remote_
header_extensions (TpMediaStreamHandler *proxy,
tp_cli_media_stream_handler_signal_callback_set_remote_header_extension
s callback,
gpointer user_data,
GDestroyNotify destroy,
GObject *weak_object,
GError **error);
typedef void (*tp_cli_media_stream_handler_callback_for_codec_choice) (TpMe diaStreamHandler *proxy, typedef void (*tp_cli_media_stream_handler_callback_for_codec_choice) (TpMe diaStreamHandler *proxy,
const GError *error, gpointer user_data, const GError *error, gpointer user_data,
GObject *weak_object); GObject *weak_object);
TpProxyPendingCall *tp_cli_media_stream_handler_call_codec_choice (TpMediaS treamHandler *proxy, TpProxyPendingCall *tp_cli_media_stream_handler_call_codec_choice (TpMediaS treamHandler *proxy,
gint timeout_ms, gint timeout_ms,
guint in_Codec_ID, guint in_Codec_ID,
tp_cli_media_stream_handler_callback_for_codec_choice callback, tp_cli_media_stream_handler_callback_for_codec_choice callback,
gpointer user_data, gpointer user_data,
GDestroyNotify destroy, GDestroyNotify destroy,
skipping to change at line 402 skipping to change at line 422
GDestroyNotify destroy, GDestroyNotify destroy,
GObject *weak_object); GObject *weak_object);
#ifndef TP_DISABLE_DEPRECATED #ifndef TP_DISABLE_DEPRECATED
gboolean tp_cli_media_stream_handler_run_unhold_failure (TpMediaStreamHandl er *proxy, gboolean tp_cli_media_stream_handler_run_unhold_failure (TpMediaStreamHandl er *proxy,
gint timeout_ms, gint timeout_ms,
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_media_stream_handler_callback_for_supported_feedback_
messages) (TpMediaStreamHandler *proxy,
const GError *error, gpointer user_data,
GObject *weak_object);
TpProxyPendingCall *tp_cli_media_stream_handler_call_supported_feedback_mes
sages (TpMediaStreamHandler *proxy,
gint timeout_ms,
GHashTable *in_Messages,
tp_cli_media_stream_handler_callback_for_supported_feedback_messages ca
llback,
gpointer user_data,
GDestroyNotify destroy,
GObject *weak_object);
#ifndef TP_DISABLE_DEPRECATED
gboolean tp_cli_media_stream_handler_run_supported_feedback_messages (TpMed
iaStreamHandler *proxy,
gint timeout_ms,
GHashTable *in_Messages,
GError **error,
GMainLoop **loop) _TP_GNUC_DEPRECATED;
#endif /* not TP_DISABLE_DEPRECATED */
typedef void (*tp_cli_media_stream_handler_callback_for_supported_header_ex
tensions) (TpMediaStreamHandler *proxy,
const GError *error, gpointer user_data,
GObject *weak_object);
TpProxyPendingCall *tp_cli_media_stream_handler_call_supported_header_exten
sions (TpMediaStreamHandler *proxy,
gint timeout_ms,
const GPtrArray *in_Header_Extensions,
tp_cli_media_stream_handler_callback_for_supported_header_extensions ca
llback,
gpointer user_data,
GDestroyNotify destroy,
GObject *weak_object);
#ifndef TP_DISABLE_DEPRECATED
gboolean tp_cli_media_stream_handler_run_supported_header_extensions (TpMed
iaStreamHandler *proxy,
gint timeout_ms,
const GPtrArray *in_Header_Extensions,
GError **error,
GMainLoop **loop) _TP_GNUC_DEPRECATED;
#endif /* not TP_DISABLE_DEPRECATED */
G_END_DECLS G_END_DECLS
 End of changes. 2 change blocks. 
0 lines changed or deleted 74 lines changed or added


 tp-svc-media-stream-handler.h   tp-svc-media-stream-handler.h 
skipping to change at line 194 skipping to change at line 194
void tp_svc_media_stream_handler_implement_unhold_failure (TpSvcMediaStream HandlerClass *klass, tp_svc_media_stream_handler_unhold_failure_impl impl); void tp_svc_media_stream_handler_implement_unhold_failure (TpSvcMediaStream HandlerClass *klass, tp_svc_media_stream_handler_unhold_failure_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_media_stream_handler_return_from_unhold_failure (DBusGMethodInv ocation *context); void tp_svc_media_stream_handler_return_from_unhold_failure (DBusGMethodInv ocation *context);
static inline void static inline void
tp_svc_media_stream_handler_return_from_unhold_failure (DBusGMethodInvocati on *context) tp_svc_media_stream_handler_return_from_unhold_failure (DBusGMethodInvocati on *context)
{ {
dbus_g_method_return (context); dbus_g_method_return (context);
} }
typedef void (*tp_svc_media_stream_handler_supported_feedback_messages_impl
) (TpSvcMediaStreamHandler *self,
GHashTable *in_Messages,
DBusGMethodInvocation *context);
void tp_svc_media_stream_handler_implement_supported_feedback_messages (TpS
vcMediaStreamHandlerClass *klass, tp_svc_media_stream_handler_supported_fee
dback_messages_impl impl);
static inline
/* this comment is to stop gtkdoc realising this is static */
void tp_svc_media_stream_handler_return_from_supported_feedback_messages (D
BusGMethodInvocation *context);
static inline void
tp_svc_media_stream_handler_return_from_supported_feedback_messages (DBusGM
ethodInvocation *context)
{
dbus_g_method_return (context);
}
typedef void (*tp_svc_media_stream_handler_supported_header_extensions_impl
) (TpSvcMediaStreamHandler *self,
const GPtrArray *in_Header_Extensions,
DBusGMethodInvocation *context);
void tp_svc_media_stream_handler_implement_supported_header_extensions (TpS
vcMediaStreamHandlerClass *klass, tp_svc_media_stream_handler_supported_hea
der_extensions_impl impl);
static inline
/* this comment is to stop gtkdoc realising this is static */
void tp_svc_media_stream_handler_return_from_supported_header_extensions (D
BusGMethodInvocation *context);
static inline void
tp_svc_media_stream_handler_return_from_supported_header_extensions (DBusGM
ethodInvocation *context)
{
dbus_g_method_return (context);
}
void tp_svc_media_stream_handler_emit_add_remote_candidate (gpointer instan ce, void tp_svc_media_stream_handler_emit_add_remote_candidate (gpointer instan ce,
const gchar *arg_Candidate_ID, const gchar *arg_Candidate_ID,
const GPtrArray *arg_Transports); const GPtrArray *arg_Transports);
void tp_svc_media_stream_handler_emit_close (gpointer instance); void tp_svc_media_stream_handler_emit_close (gpointer instance);
void tp_svc_media_stream_handler_emit_remove_remote_candidate (gpointer ins tance, void tp_svc_media_stream_handler_emit_remove_remote_candidate (gpointer ins tance,
const gchar *arg_Candidate_ID); const gchar *arg_Candidate_ID);
void tp_svc_media_stream_handler_emit_set_active_candidate_pair (gpointer i nstance, void tp_svc_media_stream_handler_emit_set_active_candidate_pair (gpointer i nstance,
const gchar *arg_Native_Candidate_ID, const gchar *arg_Native_Candidate_ID,
const gchar *arg_Remote_Candidate_ID); const gchar *arg_Remote_Candidate_ID);
void tp_svc_media_stream_handler_emit_set_remote_candidate_list (gpointer i nstance, void tp_svc_media_stream_handler_emit_set_remote_candidate_list (gpointer i nstance,
skipping to change at line 221 skipping to change at line 247
void tp_svc_media_stream_handler_emit_start_telephony_event (gpointer insta nce, void tp_svc_media_stream_handler_emit_start_telephony_event (gpointer insta nce,
guchar arg_Event); guchar arg_Event);
void tp_svc_media_stream_handler_emit_start_named_telephony_event (gpointer instance, void tp_svc_media_stream_handler_emit_start_named_telephony_event (gpointer instance,
guchar arg_Event, guchar arg_Event,
guint arg_Codec_ID); guint arg_Codec_ID);
void tp_svc_media_stream_handler_emit_start_sound_telephony_event (gpointer instance, void tp_svc_media_stream_handler_emit_start_sound_telephony_event (gpointer instance,
guchar arg_Event); guchar arg_Event);
void tp_svc_media_stream_handler_emit_stop_telephony_event (gpointer instan ce); void tp_svc_media_stream_handler_emit_stop_telephony_event (gpointer instan ce);
void tp_svc_media_stream_handler_emit_set_stream_held (gpointer instance, void tp_svc_media_stream_handler_emit_set_stream_held (gpointer instance,
gboolean arg_Held); gboolean arg_Held);
void tp_svc_media_stream_handler_emit_set_remote_feedback_messages (gpointe
r instance,
GHashTable *arg_Messages);
void tp_svc_media_stream_handler_emit_set_remote_header_extensions (gpointe
r instance,
const GPtrArray *arg_Header_Extensions);
G_END_DECLS G_END_DECLS
 End of changes. 2 change blocks. 
0 lines changed or deleted 42 lines changed or added


 util.h   util.h 
skipping to change at line 35 skipping to change at line 35
#include <gio/gio.h> #include <gio/gio.h>
#include <telepathy-glib/verify.h> #include <telepathy-glib/verify.h>
#define tp_verify_statement(R) ((void) tp_verify_true (R)) #define tp_verify_statement(R) ((void) tp_verify_true (R))
G_BEGIN_DECLS G_BEGIN_DECLS
gboolean tp_g_ptr_array_contains (GPtrArray *haystack, gpointer needle); gboolean tp_g_ptr_array_contains (GPtrArray *haystack, gpointer needle);
void tp_g_ptr_array_extend (GPtrArray *target, GPtrArray *source);
GValue *tp_g_value_slice_new (GType type) G_GNUC_WARN_UNUSED_RESULT; GValue *tp_g_value_slice_new (GType type) G_GNUC_WARN_UNUSED_RESULT;
GValue *tp_g_value_slice_new_boolean (gboolean b) G_GNUC_WARN_UNUSED_RESULT ; GValue *tp_g_value_slice_new_boolean (gboolean b) G_GNUC_WARN_UNUSED_RESULT ;
GValue *tp_g_value_slice_new_int (gint n) G_GNUC_WARN_UNUSED_RESULT; GValue *tp_g_value_slice_new_int (gint n) G_GNUC_WARN_UNUSED_RESULT;
GValue *tp_g_value_slice_new_int64 (gint64 n) G_GNUC_WARN_UNUSED_RESULT; GValue *tp_g_value_slice_new_int64 (gint64 n) G_GNUC_WARN_UNUSED_RESULT;
GValue *tp_g_value_slice_new_byte (guchar n) G_GNUC_WARN_UNUSED_RESULT; GValue *tp_g_value_slice_new_byte (guchar n) G_GNUC_WARN_UNUSED_RESULT;
GValue *tp_g_value_slice_new_uint (guint n) G_GNUC_WARN_UNUSED_RESULT; GValue *tp_g_value_slice_new_uint (guint n) G_GNUC_WARN_UNUSED_RESULT;
GValue *tp_g_value_slice_new_uint64 (guint64 n) G_GNUC_WARN_UNUSED_RESULT; GValue *tp_g_value_slice_new_uint64 (guint64 n) G_GNUC_WARN_UNUSED_RESULT;
GValue *tp_g_value_slice_new_double (double d) G_GNUC_WARN_UNUSED_RESULT; GValue *tp_g_value_slice_new_double (double d) G_GNUC_WARN_UNUSED_RESULT;
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/