tp-chan-ifaces-signal-setters.h   tp-chan-ifaces-signal-setters.h 
skipping to change at line 50 skipping to change at line 50
void tp_chan_set_text_signatures(DBusGProxy *proxy); void tp_chan_set_text_signatures(DBusGProxy *proxy);
void tp_chan_set_dtmf_signatures(DBusGProxy *proxy); void tp_chan_set_dtmf_signatures(DBusGProxy *proxy);
void tp_chan_set_group_signatures(DBusGProxy *proxy); void tp_chan_set_group_signatures(DBusGProxy *proxy);
void tp_chan_set_hold_signatures(DBusGProxy *proxy); void tp_chan_set_hold_signatures(DBusGProxy *proxy);
void tp_chan_set_password_signatures(DBusGProxy *proxy); void tp_chan_set_password_signatures(DBusGProxy *proxy);
void tp_chan_set_icesignalling_signatures(DBusGProxy *proxy); void tp_chan_set_media_signalling_signatures(DBusGProxy *proxy);
#endif #endif
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 tp-chan-type-streamed-media-gen.h   tp-chan-type-streamed-media-gen.h 
skipping to change at line 32 skipping to change at line 32
#define DBUS_GLIB_CLIENT_WRAPPERS_org_freedesktop_Telepathy_Channel_Type_St reamedMedia #define DBUS_GLIB_CLIENT_WRAPPERS_org_freedesktop_Telepathy_Channel_Type_St reamedMedia
static static
#ifdef G_HAVE_INLINE #ifdef G_HAVE_INLINE
inline inline
#endif #endif
gboolean gboolean
tp_chan_type_streamed_media_list_streams (DBusGProxy *proxy, GPtrArray** OU T_arg0, GError **error) tp_chan_type_streamed_media_list_streams (DBusGProxy *proxy, GPtrArray** OU T_arg0, GError **error)
{ {
return dbus_g_proxy_call (proxy, "ListStreams", error, G_TYPE_INVALID, db us_g_type_get_collection ("GPtrArray", dbus_g_type_get_struct ("GValueArray ", G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_ INVALID)), OUT_arg0, G_TYPE_INVALID); return dbus_g_proxy_call (proxy, "ListStreams", error, G_TYPE_INVALID, db us_g_type_get_collection ("GPtrArray", dbus_g_type_get_struct ("GValueArray ", G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_ UINT, G_TYPE_INVALID)), OUT_arg0, G_TYPE_INVALID);
} }
typedef void (*tp_chan_type_streamed_media_list_streams_reply) (DBusGProxy *proxy, GPtrArray *OUT_arg0, GError *error, gpointer userdata); typedef void (*tp_chan_type_streamed_media_list_streams_reply) (DBusGProxy *proxy, GPtrArray *OUT_arg0, GError *error, gpointer userdata);
static void static void
tp_chan_type_streamed_media_list_streams_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data) tp_chan_type_streamed_media_list_streams_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
{ {
DBusGAsyncData *data = (DBusGAsyncData*) user_data; DBusGAsyncData *data = (DBusGAsyncData*) user_data;
GError *error = NULL; GError *error = NULL;
GPtrArray* OUT_arg0; GPtrArray* OUT_arg0;
dbus_g_proxy_end_call (proxy, call, &error, dbus_g_type_get_collection (" GPtrArray", dbus_g_type_get_struct ("GValueArray", G_TYPE_UINT, G_TYPE_UINT , G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_INVALID)), &OUT_arg0, G_TYP E_INVALID); dbus_g_proxy_end_call (proxy, call, &error, dbus_g_type_get_collection (" GPtrArray", dbus_g_type_get_struct ("GValueArray", G_TYPE_UINT, G_TYPE_UINT , G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_INVALID)), &OU T_arg0, G_TYPE_INVALID);
(*(tp_chan_type_streamed_media_list_streams_reply)data->cb) (proxy, OUT_a rg0, error, data->userdata); (*(tp_chan_type_streamed_media_list_streams_reply)data->cb) (proxy, OUT_a rg0, error, data->userdata);
return; return;
} }
static static
#ifdef G_HAVE_INLINE #ifdef G_HAVE_INLINE
inline inline
#endif #endif
DBusGProxyCall* DBusGProxyCall*
tp_chan_type_streamed_media_list_streams_async (DBusGProxy *proxy, tp_chan_ type_streamed_media_list_streams_reply callback, gpointer userdata) tp_chan_type_streamed_media_list_streams_async (DBusGProxy *proxy, tp_chan_ type_streamed_media_list_streams_reply callback, gpointer userdata)
skipping to change at line 67 skipping to change at line 67
stuff = g_slice_new (DBusGAsyncData); stuff = g_slice_new (DBusGAsyncData);
stuff->cb = G_CALLBACK (callback); stuff->cb = G_CALLBACK (callback);
stuff->userdata = userdata; stuff->userdata = userdata;
return dbus_g_proxy_begin_call (proxy, "ListStreams", tp_chan_type_stream ed_media_list_streams_async_callback, stuff, _dbus_glib_async_data_free, G_ TYPE_INVALID); return dbus_g_proxy_begin_call (proxy, "ListStreams", tp_chan_type_stream ed_media_list_streams_async_callback, stuff, _dbus_glib_async_data_free, G_ TYPE_INVALID);
} }
static static
#ifdef G_HAVE_INLINE #ifdef G_HAVE_INLINE
inline inline
#endif #endif
gboolean gboolean
tp_chan_type_streamed_media_request_stream_direction (DBusGProxy *proxy, co
nst guint IN_stream_id, const guint IN_stream_direction, GError **error)
{
return dbus_g_proxy_call (proxy, "RequestStreamDirection", error, G_TYPE_
UINT, IN_stream_id, G_TYPE_UINT, IN_stream_direction, G_TYPE_INVALID, G_TYP
E_INVALID);
}
typedef void (*tp_chan_type_streamed_media_request_stream_direction_reply)
(DBusGProxy *proxy, GError *error, gpointer userdata);
static void
tp_chan_type_streamed_media_request_stream_direction_async_callback (DBusGP
roxy *proxy, DBusGProxyCall *call, void *user_data)
{
DBusGAsyncData *data = (DBusGAsyncData*) user_data;
GError *error = NULL;
dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_INVALID);
(*(tp_chan_type_streamed_media_request_stream_direction_reply)data->cb) (
proxy, error, data->userdata);
return;
}
static
#ifdef G_HAVE_INLINE
inline
#endif
DBusGProxyCall*
tp_chan_type_streamed_media_request_stream_direction_async (DBusGProxy *pro
xy, const guint IN_stream_id, const guint IN_stream_direction, tp_chan_type
_streamed_media_request_stream_direction_reply callback, gpointer userdata)
{
DBusGAsyncData *stuff;
stuff = g_slice_new (DBusGAsyncData);
stuff->cb = G_CALLBACK (callback);
stuff->userdata = userdata;
return dbus_g_proxy_begin_call (proxy, "RequestStreamDirection", tp_chan_
type_streamed_media_request_stream_direction_async_callback, stuff, _dbus_g
lib_async_data_free, G_TYPE_UINT, IN_stream_id, G_TYPE_UINT, IN_stream_dire
ction, G_TYPE_INVALID);
}
static
#ifdef G_HAVE_INLINE
inline
#endif
gboolean
tp_chan_type_streamed_media_request_streams (DBusGProxy *proxy, const guint IN_contact_handle, const GArray* IN_types, GArray** OUT_arg2, GError **err or) tp_chan_type_streamed_media_request_streams (DBusGProxy *proxy, const guint IN_contact_handle, const GArray* IN_types, GArray** OUT_arg2, GError **err or)
{ {
return dbus_g_proxy_call (proxy, "RequestStreams", error, G_TYPE_UINT, IN _contact_handle, dbus_g_type_get_collection ("GArray", G_TYPE_UINT), IN_typ es, G_TYPE_INVALID, dbus_g_type_get_collection ("GArray", G_TYPE_UINT), OUT _arg2, G_TYPE_INVALID); return dbus_g_proxy_call (proxy, "RequestStreams", error, G_TYPE_UINT, IN _contact_handle, dbus_g_type_get_collection ("GArray", G_TYPE_UINT), IN_typ es, G_TYPE_INVALID, dbus_g_type_get_collection ("GArray", G_TYPE_UINT), OUT _arg2, G_TYPE_INVALID);
} }
typedef void (*tp_chan_type_streamed_media_request_streams_reply) (DBusGPro xy *proxy, GArray *OUT_arg2, GError *error, gpointer userdata); typedef void (*tp_chan_type_streamed_media_request_streams_reply) (DBusGPro xy *proxy, GArray *OUT_arg2, GError *error, gpointer userdata);
static void static void
tp_chan_type_streamed_media_request_streams_async_callback (DBusGProxy *pro xy, DBusGProxyCall *call, void *user_data) tp_chan_type_streamed_media_request_streams_async_callback (DBusGProxy *pro xy, DBusGProxyCall *call, void *user_data)
 End of changes. 3 change blocks. 
2 lines changed or deleted 50 lines changed or added


 tp-chan.h   tp-chan.h 
skipping to change at line 72 skipping to change at line 72
#define TELEPATHY_CHAN_IFACE_CONTACTSEARCH_QUARK (tp_get_chan_contactsearch _interface()) #define TELEPATHY_CHAN_IFACE_CONTACTSEARCH_QUARK (tp_get_chan_contactsearch _interface())
#endif #endif
#define TELEPATHY_CHAN_IFACE_STREAMED_QUARK (tp_get_chan_streamed_interface ()) #define TELEPATHY_CHAN_IFACE_STREAMED_QUARK (tp_get_chan_streamed_interface ())
#define TELEPATHY_CHAN_IFACE_ROOMLIST_QUARK (tp_get_chan_roomlist_interface ()) #define TELEPATHY_CHAN_IFACE_ROOMLIST_QUARK (tp_get_chan_roomlist_interface ())
#define TELEPATHY_CHAN_IFACE_TEXT_QUARK (tp_get_chan_text_interface()) #define TELEPATHY_CHAN_IFACE_TEXT_QUARK (tp_get_chan_text_interface())
#define TELEPATHY_CHAN_IFACE_DTMF_QUARK (tp_get_chan_dtmf_interface()) #define TELEPATHY_CHAN_IFACE_DTMF_QUARK (tp_get_chan_dtmf_interface())
#define TELEPATHY_CHAN_IFACE_GROUP_QUARK (tp_get_chan_group_interface()) #define TELEPATHY_CHAN_IFACE_GROUP_QUARK (tp_get_chan_group_interface())
#define TELEPATHY_CHAN_IFACE_HOLD_QUARK (tp_get_chan_hold_interface()) #define TELEPATHY_CHAN_IFACE_HOLD_QUARK (tp_get_chan_hold_interface())
#define TELEPATHY_CHAN_IFACE_PASSWORD_QUARK (tp_get_chan_password_interface ()) #define TELEPATHY_CHAN_IFACE_PASSWORD_QUARK (tp_get_chan_password_interface ())
#define TELEPATHY_CHAN_IFACE_TRANSFER_QUARK (tp_get_chan_transfer_interface ()) #define TELEPATHY_CHAN_IFACE_TRANSFER_QUARK (tp_get_chan_transfer_interface ())
#define TELEPATHY_CHAN_IFACE_ICE_SIGNALLING_QUARK (tp_get_chan_ice_signalli ng_interface()) #define TELEPATHY_CHAN_IFACE_MEDIA_SIGNALLING_QUARK (tp_get_chan_media_sign alling_interface())
/* The signal name for the synthesized Closed signal */ /* The signal name for the synthesized Closed signal */
#define TP_IFACE_CHAN_SIGNAL_CLOSED_SYNTHESIZED \ #define TP_IFACE_CHAN_SIGNAL_CLOSED_SYNTHESIZED \
"received::org-freedesktop-Telepathy-Channel-Closed" "received::org-freedesktop-Telepathy-Channel-Closed"
typedef struct _tp_chan TpChan; typedef struct _tp_chan TpChan;
typedef struct _tp_chanclass TpChanClass; typedef struct _tp_chanclass TpChanClass;
struct _tp_chan struct _tp_chan
{ {
skipping to change at line 157 skipping to change at line 157
GQuark tp_get_chan_contactsearch_interface(void); GQuark tp_get_chan_contactsearch_interface(void);
#endif #endif
GQuark tp_get_chan_streamed_interface(void); GQuark tp_get_chan_streamed_interface(void);
GQuark tp_get_chan_roomlist_interface(void); GQuark tp_get_chan_roomlist_interface(void);
GQuark tp_get_chan_text_interface(void); GQuark tp_get_chan_text_interface(void);
GQuark tp_get_chan_dtmf_interface(void); GQuark tp_get_chan_dtmf_interface(void);
GQuark tp_get_chan_group_interface(void); GQuark tp_get_chan_group_interface(void);
GQuark tp_get_chan_hold_interface(void); GQuark tp_get_chan_hold_interface(void);
GQuark tp_get_chan_password_interface(void); GQuark tp_get_chan_password_interface(void);
GQuark tp_get_chan_transfer_interface(void); GQuark tp_get_chan_transfer_interface(void);
GQuark tp_get_chan_ice_signalling_interface(void); GQuark tp_get_chan_media_signalling_interface(void);
#endif #endif
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 tp-conn-iface-capabilities-gen.h   tp-conn-iface-capabilities-gen.h 
skipping to change at line 29 skipping to change at line 29
#endif #endif
#ifndef DBUS_GLIB_CLIENT_WRAPPERS_org_freedesktop_Telepathy_Connection_Inte rface_Capabilities #ifndef DBUS_GLIB_CLIENT_WRAPPERS_org_freedesktop_Telepathy_Connection_Inte rface_Capabilities
#define DBUS_GLIB_CLIENT_WRAPPERS_org_freedesktop_Telepathy_Connection_Inte rface_Capabilities #define DBUS_GLIB_CLIENT_WRAPPERS_org_freedesktop_Telepathy_Connection_Inte rface_Capabilities
static static
#ifdef G_HAVE_INLINE #ifdef G_HAVE_INLINE
inline inline
#endif #endif
gboolean gboolean
tp_conn_iface_capabilities_advertise_capabilities (DBusGProxy *proxy, const char ** IN_add, const char ** IN_remove, char *** OUT_arg2, GError **error ) tp_conn_iface_capabilities_advertise_capabilities (DBusGProxy *proxy, const GPtrArray* IN_add, const char ** IN_remove, GPtrArray** OUT_arg2, GError * *error)
{ {
return dbus_g_proxy_call (proxy, "AdvertiseCapabilities", error, G_TYPE_S TRV, IN_add, G_TYPE_STRV, IN_remove, G_TYPE_INVALID, G_TYPE_STRV, OUT_arg2, G_TYPE_INVALID); return dbus_g_proxy_call (proxy, "AdvertiseCapabilities", error, dbus_g_t ype_get_collection ("GPtrArray", dbus_g_type_get_struct ("GValueArray", G_T YPE_STRING, G_TYPE_UINT, G_TYPE_INVALID)), IN_add, G_TYPE_STRV, IN_remove, G_TYPE_INVALID, dbus_g_type_get_collection ("GPtrArray", dbus_g_type_get_st ruct ("GValueArray", G_TYPE_STRING, G_TYPE_UINT, G_TYPE_INVALID)), OUT_arg2 , G_TYPE_INVALID);
} }
typedef void (*tp_conn_iface_capabilities_advertise_capabilities_reply) (DB usGProxy *proxy, char * *OUT_arg2, GError *error, gpointer userdata); typedef void (*tp_conn_iface_capabilities_advertise_capabilities_reply) (DB usGProxy *proxy, GPtrArray *OUT_arg2, GError *error, gpointer userdata);
static void static void
tp_conn_iface_capabilities_advertise_capabilities_async_callback (DBusGProx y *proxy, DBusGProxyCall *call, void *user_data) tp_conn_iface_capabilities_advertise_capabilities_async_callback (DBusGProx y *proxy, DBusGProxyCall *call, void *user_data)
{ {
DBusGAsyncData *data = (DBusGAsyncData*) user_data; DBusGAsyncData *data = (DBusGAsyncData*) user_data;
GError *error = NULL; GError *error = NULL;
char ** OUT_arg2; GPtrArray* OUT_arg2;
dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_STRV, &OUT_arg2, G_TYP dbus_g_proxy_end_call (proxy, call, &error, dbus_g_type_get_collection ("
E_INVALID); GPtrArray", dbus_g_type_get_struct ("GValueArray", G_TYPE_STRING, G_TYPE_UI
NT, G_TYPE_INVALID)), &OUT_arg2, G_TYPE_INVALID);
(*(tp_conn_iface_capabilities_advertise_capabilities_reply)data->cb) (pro xy, OUT_arg2, error, data->userdata); (*(tp_conn_iface_capabilities_advertise_capabilities_reply)data->cb) (pro xy, OUT_arg2, error, data->userdata);
return; return;
} }
static static
#ifdef G_HAVE_INLINE #ifdef G_HAVE_INLINE
inline inline
#endif #endif
DBusGProxyCall* DBusGProxyCall*
tp_conn_iface_capabilities_advertise_capabilities_async (DBusGProxy *proxy, const char ** IN_add, const char ** IN_remove, tp_conn_iface_capabilities_ advertise_capabilities_reply callback, gpointer userdata) tp_conn_iface_capabilities_advertise_capabilities_async (DBusGProxy *proxy, const GPtrArray* IN_add, const char ** IN_remove, tp_conn_iface_capabiliti es_advertise_capabilities_reply callback, gpointer userdata)
{ {
DBusGAsyncData *stuff; DBusGAsyncData *stuff;
stuff = g_slice_new (DBusGAsyncData); stuff = g_slice_new (DBusGAsyncData);
stuff->cb = G_CALLBACK (callback); stuff->cb = G_CALLBACK (callback);
stuff->userdata = userdata; stuff->userdata = userdata;
return dbus_g_proxy_begin_call (proxy, "AdvertiseCapabilities", tp_conn_i face_capabilities_advertise_capabilities_async_callback, stuff, _dbus_glib_ async_data_free, G_TYPE_STRV, IN_add, G_TYPE_STRV, IN_remove, G_TYPE_INVALI D); return dbus_g_proxy_begin_call (proxy, "AdvertiseCapabilities", tp_conn_i face_capabilities_advertise_capabilities_async_callback, stuff, _dbus_glib_ async_data_free, dbus_g_type_get_collection ("GPtrArray", dbus_g_type_get_s truct ("GValueArray", G_TYPE_STRING, G_TYPE_UINT, G_TYPE_INVALID)), IN_add, G_TYPE_STRV, IN_remove, G_TYPE_INVALID);
} }
static static
#ifdef G_HAVE_INLINE #ifdef G_HAVE_INLINE
inline inline
#endif #endif
gboolean gboolean
tp_conn_iface_capabilities_get_capabilities (DBusGProxy *proxy, const GArra y* IN_handles, GPtrArray** OUT_arg1, GError **error) tp_conn_iface_capabilities_get_capabilities (DBusGProxy *proxy, const GArra y* IN_handles, GPtrArray** OUT_arg1, GError **error)
{ {
return dbus_g_proxy_call (proxy, "GetCapabilities", error, dbus_g_type_ge t_collection ("GArray", G_TYPE_UINT), IN_handles, G_TYPE_INVALID, dbus_g_ty pe_get_collection ("GPtrArray", dbus_g_type_get_struct ("GValueArray", G_TY PE_UINT, G_TYPE_STRING, G_TYPE_UINT, G_TYPE_INVALID)), OUT_arg1, G_TYPE_INV ALID); return dbus_g_proxy_call (proxy, "GetCapabilities", error, dbus_g_type_ge t_collection ("GArray", G_TYPE_UINT), IN_handles, G_TYPE_INVALID, dbus_g_ty pe_get_collection ("GPtrArray", dbus_g_type_get_struct ("GValueArray", G_TY PE_UINT, G_TYPE_STRING, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_INVALID)), OUT_arg 1, G_TYPE_INVALID);
} }
typedef void (*tp_conn_iface_capabilities_get_capabilities_reply) (DBusGPro xy *proxy, GPtrArray *OUT_arg1, GError *error, gpointer userdata); typedef void (*tp_conn_iface_capabilities_get_capabilities_reply) (DBusGPro xy *proxy, GPtrArray *OUT_arg1, GError *error, gpointer userdata);
static void static void
tp_conn_iface_capabilities_get_capabilities_async_callback (DBusGProxy *pro xy, DBusGProxyCall *call, void *user_data) tp_conn_iface_capabilities_get_capabilities_async_callback (DBusGProxy *pro xy, DBusGProxyCall *call, void *user_data)
{ {
DBusGAsyncData *data = (DBusGAsyncData*) user_data; DBusGAsyncData *data = (DBusGAsyncData*) user_data;
GError *error = NULL; GError *error = NULL;
GPtrArray* OUT_arg1; GPtrArray* OUT_arg1;
dbus_g_proxy_end_call (proxy, call, &error, dbus_g_type_get_collection (" GPtrArray", dbus_g_type_get_struct ("GValueArray", G_TYPE_UINT, G_TYPE_STRI NG, G_TYPE_UINT, G_TYPE_INVALID)), &OUT_arg1, G_TYPE_INVALID); dbus_g_proxy_end_call (proxy, call, &error, dbus_g_type_get_collection (" GPtrArray", dbus_g_type_get_struct ("GValueArray", G_TYPE_UINT, G_TYPE_STRI NG, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_INVALID)), &OUT_arg1, G_TYPE_INVALID);
(*(tp_conn_iface_capabilities_get_capabilities_reply)data->cb) (proxy, OU T_arg1, error, data->userdata); (*(tp_conn_iface_capabilities_get_capabilities_reply)data->cb) (proxy, OU T_arg1, error, data->userdata);
return; return;
} }
static static
#ifdef G_HAVE_INLINE #ifdef G_HAVE_INLINE
inline inline
#endif #endif
DBusGProxyCall* DBusGProxyCall*
tp_conn_iface_capabilities_get_capabilities_async (DBusGProxy *proxy, const GArray* IN_handles, tp_conn_iface_capabilities_get_capabilities_reply call back, gpointer userdata) tp_conn_iface_capabilities_get_capabilities_async (DBusGProxy *proxy, const GArray* IN_handles, tp_conn_iface_capabilities_get_capabilities_reply call back, gpointer userdata)
 End of changes. 8 change blocks. 
10 lines changed or deleted 11 lines changed or added


 tp-constants.h   tp-constants.h 
skipping to change at line 141 skipping to change at line 141
LAST_TP_CHANNEL_PASSWORD_FLAG LAST_TP_CHANNEL_PASSWORD_FLAG
} TelepathyChannelPasswordFlags; } TelepathyChannelPasswordFlags;
typedef enum { typedef enum {
TP_CHANNEL_SUBJECT_FLAG_PRESENT = 1, TP_CHANNEL_SUBJECT_FLAG_PRESENT = 1,
TP_CHANNEL_SUBJECT_FLAG_MODIFIABLE = 2, TP_CHANNEL_SUBJECT_FLAG_MODIFIABLE = 2,
LAST_TP_CHANNEL_SUBJECT_FLAG LAST_TP_CHANNEL_SUBJECT_FLAG
} TelepathyChannelSubjectFlags; } TelepathyChannelSubjectFlags;
typedef enum { typedef enum {
TP_CHANNEL_MEDIA_CAPABILITY_AUDIO = 1,
TP_CHANNEL_MEDIA_CAPABILITY_VIDEO = 2
} TelepathyChannelMediaCapability;
typedef enum {
TP_MEDIA_STREAM_TYPE_AUDIO = 0, TP_MEDIA_STREAM_TYPE_AUDIO = 0,
TP_MEDIA_STREAM_TYPE_VIDEO = 1, TP_MEDIA_STREAM_TYPE_VIDEO = 1,
LAST_TP_MEDIA_STREAM_TYPE LAST_TP_MEDIA_STREAM_TYPE
} TelepathyMediaStreamType; } TelepathyMediaStreamType;
typedef enum { typedef enum {
TP_MEDIA_STREAM_DIRECTION_NONE = 0, TP_MEDIA_STREAM_DIRECTION_NONE = 0,
TP_MEDIA_STREAM_DIRECTION_SEND = 1, TP_MEDIA_STREAM_DIRECTION_SEND = 1,
TP_MEDIA_STREAM_DIRECTION_RECIEVE = 2, TP_MEDIA_STREAM_DIRECTION_RECIEVE = 2,
TP_MEDIA_STREAM_DIRECTION_BIDIRECTIONAL = 3, TP_MEDIA_STREAM_DIRECTION_BIDIRECTIONAL = 3,
LAST_TP_MEDIA_STREAM_DIRECTION LAST_TP_MEDIA_STREAM_DIRECTION
} TelepathyMediaStreamDirection; } TelepathyMediaStreamDirection;
typedef enum { typedef enum {
MEDIA_STREAM_PENDING_LOCAL_SEND = 1,
MEDIA_STREAM_PENDING_REMOTE_SEND = 2
} TelepathyMediaStreamPending;
typedef enum {
TP_MEDIA_STREAM_ERROR_UNKNOWN = 0, TP_MEDIA_STREAM_ERROR_UNKNOWN = 0,
TP_MEDIA_STREAM_ERROR_EOS = 1, TP_MEDIA_STREAM_ERROR_EOS = 1,
LAST_TP_MEDIA_STREAM_ERROR LAST_TP_MEDIA_STREAM_ERROR
} TelepathyMediaStreamError; } TelepathyMediaStreamError;
typedef enum { typedef enum {
TP_MEDIA_STREAM_PROTO_UDP = 0, TP_MEDIA_STREAM_PROTO_UDP = 0,
TP_MEDIA_STREAM_PROTO_TCP = 1, TP_MEDIA_STREAM_PROTO_TCP = 1,
LAST_TP_MEDIA_STREAM_PROTO LAST_TP_MEDIA_STREAM_PROTO
} TelepathyMediaStreamProto; } TelepathyMediaStreamProto;
skipping to change at line 179 skipping to change at line 189
TP_MEDIA_STREAM_TRANSPORT_TYPE_RELAY = 2, TP_MEDIA_STREAM_TRANSPORT_TYPE_RELAY = 2,
LAST_TP_MEDIA_STREAM_TRANSPORT_TYPE LAST_TP_MEDIA_STREAM_TRANSPORT_TYPE
} TelepathyMediaStreamTransportType; } TelepathyMediaStreamTransportType;
typedef enum { typedef enum {
TP_CODEC_MEDIA_TYPE_AUDIO = 0, TP_CODEC_MEDIA_TYPE_AUDIO = 0,
TP_CODEC_MEDIA_TYPE_VIDEO = 1, TP_CODEC_MEDIA_TYPE_VIDEO = 1,
} TelepathyCodecMediaType; } TelepathyCodecMediaType;
typedef enum { typedef enum {
TP_MEDIA_STREAM_STATE_STOPPED = 0, TP_MEDIA_STREAM_STATE_DISCONNECTED = 0,
TP_MEDIA_STREAM_STATE_PLAYING = 1, TP_MEDIA_STREAM_STATE_CONNECTING = 1,
TP_MEDIA_STREAM_STATE_CONNECTING = 2, TP_MEDIA_STREAM_STATE_CONNECTED = 2
TP_MEDIA_STREAM_STATE_CONNECTED = 3
} TelepathyMediaStreamState; } TelepathyMediaStreamState;
typedef enum { typedef enum {
TP_PROPERTY_FLAG_READ = 1, TP_PROPERTY_FLAG_READ = 1,
TP_PROPERTY_FLAG_WRITE = 2 TP_PROPERTY_FLAG_WRITE = 2
} TelepathyPropertyFlags; } TelepathyPropertyFlags;
G_END_DECLS G_END_DECLS
#endif #endif
 End of changes. 3 change blocks. 
4 lines changed or deleted 13 lines changed or added


 tp-ifaces-signals-marshal.h   tp-ifaces-signals-marshal.h 
skipping to change at line 36 skipping to change at line 36
#define tp_ifaces_signals_marshal_VOID__STRING g_cclosure_marshal_VOID__STR ING #define tp_ifaces_signals_marshal_VOID__STRING g_cclosure_marshal_VOID__STR ING
/* VOID:INT,BOXED (tp-ifaces-signals-marshal.list:11) */ /* VOID:INT,BOXED (tp-ifaces-signals-marshal.list:11) */
extern void tp_ifaces_signals_marshal_VOID__INT_BOXED (GClosure *closur e, extern void tp_ifaces_signals_marshal_VOID__INT_BOXED (GClosure *closur e,
GValue *return _value, GValue *return _value,
guint n_para m_values, guint n_para m_values,
const GValue *param_ values, const GValue *param_ values,
gpointer invoca tion_hint, gpointer invoca tion_hint,
gpointer marsha l_data); gpointer marsha l_data);
/* VOID:UINT (tp-ifaces-signals-marshal.list:13) */ /* VOID:UINT (tp-ifaces-signals-marshal.list:14) */
#define tp_ifaces_signals_marshal_VOID__UINT g_cclosure_marshal_VOID__UIN T #define tp_ifaces_signals_marshal_VOID__UINT g_cclosure_marshal_VOID__UIN T
/* VOID:UINT,STRING,STRING (tp-ifaces-signals-marshal.list:15) */ /* VOID:UINT,STRING,STRING (tp-ifaces-signals-marshal.list:16) */
extern void tp_ifaces_signals_marshal_VOID__UINT_STRING_STRING (GClosure *closure, extern void tp_ifaces_signals_marshal_VOID__UINT_STRING_STRING (GClosure *closure,
GValue *return_value, GValue *return_value,
guint n_param_values, guint n_param_values,
const GValu e *param_values, const GValu e *param_values,
gpointer invocation_hint, gpointer invocation_hint,
gpointer marshal_data); gpointer marshal_data);
/* VOID:UINT,UINT,UINT (tp-ifaces-signals-marshal.list:17) */ /* VOID:UINT,UINT,UINT (tp-ifaces-signals-marshal.list:18) */
extern void tp_ifaces_signals_marshal_VOID__UINT_UINT_UINT (GClosure *c losure, extern void tp_ifaces_signals_marshal_VOID__UINT_UINT_UINT (GClosure *c losure,
GValue *r eturn_value, GValue *r eturn_value,
guint n _param_values, guint n _param_values,
const GValue *p aram_values, const GValue *p aram_values,
gpointer i nvocation_hint, gpointer i nvocation_hint,
gpointer m arshal_data); gpointer m arshal_data);
/* VOID:BOOLEAN (tp-ifaces-signals-marshal.list:19) */ /* VOID:BOOLEAN (tp-ifaces-signals-marshal.list:20) */
#define tp_ifaces_signals_marshal_VOID__BOOLEAN g_cclosure_marshal_V OID__BOOLEAN #define tp_ifaces_signals_marshal_VOID__BOOLEAN g_cclosure_marshal_V OID__BOOLEAN
/* VOID:UINT,UINT,UINT,UINT,UINT,STRING (tp-ifaces-signals-marshal.list:21) */ /* VOID:UINT,UINT,UINT,UINT,UINT,STRING (tp-ifaces-signals-marshal.list:22) */
extern void tp_ifaces_signals_marshal_VOID__UINT_UINT_UINT_UINT_UINT_STRING (GClosure *closure, extern void tp_ifaces_signals_marshal_VOID__UINT_UINT_UINT_UINT_UINT_STRING (GClosure *closure,
GValue *return_value, GValue *return_value,
guint n_param_values, guint n_param_values,
const GValue *param_values, const GValue *param_values,
gpointer invocation_hint, gpointer invocation_hint,
gpointer marshal_data); gpointer marshal_data);
/* VOID:UINT,UINT,STRING (tp-ifaces-signals-marshal.list:23) */ /* VOID:UINT,UINT,STRING (tp-ifaces-signals-marshal.list:24) */
extern void tp_ifaces_signals_marshal_VOID__UINT_UINT_STRING (GClosure *closure, extern void tp_ifaces_signals_marshal_VOID__UINT_UINT_STRING (GClosure *closure,
GValue *return_value, GValue *return_value,
guint n_param_values, guint n_param_values,
const GValue *param_values, const GValue *param_values,
gpointer invocation_hint, gpointer invocation_hint,
gpointer marshal_data); gpointer marshal_data);
/* VOID:UINT,UINT (tp-ifaces-signals-marshal.list:27) */ /* VOID:UINT,UINT (tp-ifaces-signals-marshal.list:28) */
extern void tp_ifaces_signals_marshal_VOID__UINT_UINT (GClosure *closur e, extern void tp_ifaces_signals_marshal_VOID__UINT_UINT (GClosure *closur e,
GValue *return _value, GValue *return _value,
guint n_para m_values, guint n_para m_values,
const GValue *param_ values, const GValue *param_ values,
gpointer invoca tion_hint, gpointer invoca tion_hint,
gpointer marsha l_data); gpointer marsha l_data);
/* VOID:STRING,BOXED,BOXED,BOXED,BOXED,UINT,UINT (tp-ifaces-signals-marshal .list:29) */ /* VOID:STRING,BOXED,BOXED,BOXED,BOXED,UINT,UINT (tp-ifaces-signals-marshal .list:30) */
extern void tp_ifaces_signals_marshal_VOID__STRING_BOXED_BOXED_BOXED_BOXED_ UINT_UINT (GClosure *closure, extern void tp_ifaces_signals_marshal_VOID__STRING_BOXED_BOXED_BOXED_BOXED_ UINT_UINT (GClosure *closure,
GValue *return_value, GValue *return_value,
guint n_param_values, guint n_param_values,
const GValue *param_values, const GValue *param_values,
gpointer invocation_hint, gpointer invocation_hint,
gpointer marshal_data); gpointer marshal_data);
/* VOID:BOXED (tp-ifaces-signals-marshal.list:33) */ /* VOID:BOXED (tp-ifaces-signals-marshal.list:34) */
#define tp_ifaces_signals_marshal_VOID__BOXED g_cclosure_marshal_VOID__BOX ED #define tp_ifaces_signals_marshal_VOID__BOXED g_cclosure_marshal_VOID__BOX ED
/* VOID:UINT,UINT,UINT,STRING (tp-ifaces-signals-marshal.list:35) */ /* VOID:UINT,UINT,UINT,STRING (tp-ifaces-signals-marshal.list:36) */
extern void tp_ifaces_signals_marshal_VOID__UINT_UINT_UINT_STRING (GClosure *closure, extern void tp_ifaces_signals_marshal_VOID__UINT_UINT_UINT_STRING (GClosure *closure,
GValue *return_value, GValue *return_value,
guint n_param_values, guint n_param_values,
const GV alue *param_values, const GV alue *param_values,
gpointer invocation_hint, gpointer invocation_hint,
gpointer marshal_data); gpointer marshal_data);
/* VOID:OBJECT,STRING (tp-ifaces-signals-marshal.list:37) */ /* VOID:OBJECT,STRING (tp-ifaces-signals-marshal.list:38) */
extern void tp_ifaces_signals_marshal_VOID__OBJECT_STRING (GClosure *cl osure, extern void tp_ifaces_signals_marshal_VOID__OBJECT_STRING (GClosure *cl osure,
GValue *re turn_value, GValue *re turn_value,
guint n_ param_values, guint n_ param_values,
const GValue *pa ram_values, const GValue *pa ram_values,
gpointer in vocation_hint, gpointer in vocation_hint,
gpointer ma rshal_data); gpointer ma rshal_data);
G_END_DECLS G_END_DECLS
#endif /* __tp_ifaces_signals_marshal_MARSHAL_H__ */ #endif /* __tp_ifaces_signals_marshal_MARSHAL_H__ */
 End of changes. 11 change blocks. 
11 lines changed or deleted 11 lines changed or added


 tp-interfaces.h   tp-interfaces.h 
skipping to change at line 42 skipping to change at line 42
#define TP_IFACE_CHANNEL_INTERFACE_GROUP \ #define TP_IFACE_CHANNEL_INTERFACE_GROUP \
"org.freedesktop.Telepathy.Channel.Interface.Group" "org.freedesktop.Telepathy.Channel.Interface.Group"
#define TP_IFACE_CHANNEL_INTERFACE_HOLD \ #define TP_IFACE_CHANNEL_INTERFACE_HOLD \
"org.freedesktop.Telepathy.Channel.Interface.Hold" "org.freedesktop.Telepathy.Channel.Interface.Hold"
#define TP_IFACE_CHANNEL_INTERFACE_PASSWORD \ #define TP_IFACE_CHANNEL_INTERFACE_PASSWORD \
"org.freedesktop.Telepathy.Channel.Interface.Password" "org.freedesktop.Telepathy.Channel.Interface.Password"
#define TP_IFACE_CHANNEL_INTERFACE_SUBJECT \ #define TP_IFACE_CHANNEL_INTERFACE_SUBJECT \
"org.freedesktop.Telepathy.Channel.Interface.Subject" "org.freedesktop.Telepathy.Channel.Interface.Subject"
#define TP_IFACE_CHANNEL_INTERFACE_TRANSFER \ #define TP_IFACE_CHANNEL_INTERFACE_TRANSFER \
"org.freedesktop.Telepathy.Channel.Interface.Transfer" "org.freedesktop.Telepathy.Channel.Interface.Transfer"
#define TP_IFACE_CHANNEL_INTERFACE_ICE_SIGNALLING \ #define TP_IFACE_CHANNEL_INTERFACE_MEDIA_SIGNALLING \
"org.freedesktop.Telepathy.Channel.Interface.IceSignalling" "org.freedesktop.Telepathy.Channel.Interface.MediaSignalling"
#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"
#if 0 #if 0
#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"
#endif #endif
#define TP_IFACE_CHANNEL_TYPE_ROOM_LIST \ #define TP_IFACE_CHANNEL_TYPE_ROOM_LIST \
"org.freedesktop.Telepathy.Channel.Type.RoomList" "org.freedesktop.Telepathy.Channel.Type.RoomList"
#define TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA \ #define TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA \
skipping to change at line 75 skipping to change at line 75
#define TP_IFACE_CONN_INTERFACE_FORWARDING \ #define TP_IFACE_CONN_INTERFACE_FORWARDING \
"org.freedesktop.Telepathy.Connection.Interface.Forwarding" "org.freedesktop.Telepathy.Connection.Interface.Forwarding"
#define TP_IFACE_CONN_INTERFACE_PRESENCE \ #define TP_IFACE_CONN_INTERFACE_PRESENCE \
"org.freedesktop.Telepathy.Connection.Interface.Presence" "org.freedesktop.Telepathy.Connection.Interface.Presence"
#define TP_IFACE_CONN_INTERFACE_PRIVACY \ #define TP_IFACE_CONN_INTERFACE_PRIVACY \
"org.freedesktop.Telepathy.Connection.Interface.Privacy" "org.freedesktop.Telepathy.Connection.Interface.Privacy"
#define TP_IFACE_CONN_INTERFACE_RENAMING \ #define TP_IFACE_CONN_INTERFACE_RENAMING \
"org.freedesktop.Telepathy.Connection.Interface.Renaming" "org.freedesktop.Telepathy.Connection.Interface.Renaming"
#define TP_IFACE_CONN_MGR_INTERFACE \ #define TP_IFACE_CONN_MGR_INTERFACE \
"org.freedesktop.Telepathy.ConnectionManager" "org.freedesktop.Telepathy.ConnectionManager"
#define TP_IFACE_ICE_SESSION_HANDLER \ #define TP_IFACE_MEDIA_SESSION_HANDLER \
"org.freedesktop.Telepathy.Ice.SessionHandler" "org.freedesktop.Telepathy.Media.SessionHandler"
#define TP_IFACE_ICE_STREAM_HANDLER \ #define TP_IFACE_MEDIA_STREAM_HANDLER \
"org.freedesktop.Telepathy.Ice.StreamHandler" "org.freedesktop.Telepathy.Media.StreamHandler"
#define TP_IFACE_PROPERTIES \ #define TP_IFACE_PROPERTIES \
"org.freedesktop.Telepathy.Properties" "org.freedesktop.Telepathy.Properties"
G_END_DECLS G_END_DECLS
#endif /* #ifndef __TELEPATHY_INTERFACES_H__*/ #endif /* #ifndef __TELEPATHY_INTERFACES_H__*/
 End of changes. 2 change blocks. 
6 lines changed or deleted 6 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/