tp-chan.h   tp-chan.h 
skipping to change at line 74 skipping to change at line 74
#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_MEDIA_SIGNALLING_QUARK (tp_get_chan_media_sign alling_interface()) #define TELEPATHY_CHAN_IFACE_MEDIA_SIGNALLING_QUARK (tp_get_chan_media_sign alling_interface())
/* The signal name for the synthesized Closed signal */
#define TP_IFACE_CHAN_SIGNAL_CLOSED_SYNTHESIZED \
"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
{ {
DBusGProxy parent; DBusGProxy parent;
gchar *type; gchar *type;
guint handle_type; guint handle_type;
guint handle; guint handle;
GData *interface_list; GData *interface_list;
 End of changes. 1 change blocks. 
4 lines changed or deleted 0 lines changed or added


 tp-conn-iface-avatars-gen.h   tp-conn-iface-avatars-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_Avatars #ifndef DBUS_GLIB_CLIENT_WRAPPERS_org_freedesktop_Telepathy_Connection_Inte rface_Avatars
#define DBUS_GLIB_CLIENT_WRAPPERS_org_freedesktop_Telepathy_Connection_Inte rface_Avatars #define DBUS_GLIB_CLIENT_WRAPPERS_org_freedesktop_Telepathy_Connection_Inte rface_Avatars
static static
#ifdef G_HAVE_INLINE #ifdef G_HAVE_INLINE
inline inline
#endif #endif
gboolean gboolean
tp_conn_iface_avatars_get_avatar_requirements (DBusGProxy *proxy, char *** OUT_arg0, GError **error) tp_conn_iface_avatars_get_avatar_requirements (DBusGProxy *proxy, char *** OUT_arg0, guint* OUT_arg1, guint* OUT_arg2, guint* OUT_arg3, guint* OUT_arg 4, guint* OUT_arg5, GError **error)
{ {
return dbus_g_proxy_call (proxy, "GetAvatarRequirements", error, G_TYPE_I NVALID, G_TYPE_STRV, OUT_arg0, G_TYPE_INVALID); return dbus_g_proxy_call (proxy, "GetAvatarRequirements", error, G_TYPE_I NVALID, G_TYPE_STRV, OUT_arg0, G_TYPE_UINT, OUT_arg1, G_TYPE_UINT, OUT_arg2 , G_TYPE_UINT, OUT_arg3, G_TYPE_UINT, OUT_arg4, G_TYPE_UINT, OUT_arg5, G_TY PE_INVALID);
} }
typedef void (*tp_conn_iface_avatars_get_avatar_requirements_reply) (DBusGP roxy *proxy, char * *OUT_arg0, GError *error, gpointer userdata); typedef void (*tp_conn_iface_avatars_get_avatar_requirements_reply) (DBusGP roxy *proxy, char * *OUT_arg0, guint OUT_arg1, guint OUT_arg2, guint OUT_ar g3, guint OUT_arg4, guint OUT_arg5, GError *error, gpointer userdata);
static void static void
tp_conn_iface_avatars_get_avatar_requirements_async_callback (DBusGProxy *p roxy, DBusGProxyCall *call, void *user_data) tp_conn_iface_avatars_get_avatar_requirements_async_callback (DBusGProxy *p roxy, DBusGProxyCall *call, void *user_data)
{ {
DBusGAsyncData *data = (DBusGAsyncData*) user_data; DBusGAsyncData *data = (DBusGAsyncData*) user_data;
GError *error = NULL; GError *error = NULL;
char ** OUT_arg0; char ** OUT_arg0;
dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_STRV, &OUT_arg0, G_TYP guint OUT_arg1;
E_INVALID); guint OUT_arg2;
(*(tp_conn_iface_avatars_get_avatar_requirements_reply)data->cb) (proxy, guint OUT_arg3;
OUT_arg0, error, data->userdata); guint OUT_arg4;
guint OUT_arg5;
dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_STRV, &OUT_arg0, G_TYP
E_UINT, &OUT_arg1, G_TYPE_UINT, &OUT_arg2, G_TYPE_UINT, &OUT_arg3, G_TYPE_U
INT, &OUT_arg4, G_TYPE_UINT, &OUT_arg5, G_TYPE_INVALID);
(*(tp_conn_iface_avatars_get_avatar_requirements_reply)data->cb) (proxy,
OUT_arg0, OUT_arg1, OUT_arg2, OUT_arg3, OUT_arg4, OUT_arg5, error, data->us
erdata);
return; return;
} }
static static
#ifdef G_HAVE_INLINE #ifdef G_HAVE_INLINE
inline inline
#endif #endif
DBusGProxyCall* DBusGProxyCall*
tp_conn_iface_avatars_get_avatar_requirements_async (DBusGProxy *proxy, tp_ conn_iface_avatars_get_avatar_requirements_reply callback, gpointer userdat a) tp_conn_iface_avatars_get_avatar_requirements_async (DBusGProxy *proxy, tp_ conn_iface_avatars_get_avatar_requirements_reply callback, gpointer userdat a)
skipping to change at line 105 skipping to change at line 110
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, "GetAvatarTokens", tp_conn_iface_a vatars_get_avatar_tokens_async_callback, stuff, _dbus_glib_async_data_free, dbus_g_type_get_collection ("GArray", G_TYPE_UINT), IN_contacts, G_TYPE_IN VALID); return dbus_g_proxy_begin_call (proxy, "GetAvatarTokens", tp_conn_iface_a vatars_get_avatar_tokens_async_callback, stuff, _dbus_glib_async_data_free, dbus_g_type_get_collection ("GArray", G_TYPE_UINT), IN_contacts, G_TYPE_IN VALID);
} }
static static
#ifdef G_HAVE_INLINE #ifdef G_HAVE_INLINE
inline inline
#endif #endif
gboolean gboolean
tp_conn_iface_avatars_request_avatar (DBusGProxy *proxy, const guint IN_con tact, GArray** OUT_arg1, GError **error) tp_conn_iface_avatars_request_avatar (DBusGProxy *proxy, const guint IN_con tact, GArray** OUT_arg1, char ** OUT_arg2, GError **error)
{ {
return dbus_g_proxy_call (proxy, "RequestAvatar", error, G_TYPE_UINT, IN_ contact, G_TYPE_INVALID, dbus_g_type_get_collection ("GArray", G_TYPE_UCHAR ), OUT_arg1, G_TYPE_INVALID); return dbus_g_proxy_call (proxy, "RequestAvatar", error, G_TYPE_UINT, IN_ contact, G_TYPE_INVALID, dbus_g_type_get_collection ("GArray", G_TYPE_UCHAR ), OUT_arg1, G_TYPE_STRING, OUT_arg2, G_TYPE_INVALID);
} }
typedef void (*tp_conn_iface_avatars_request_avatar_reply) (DBusGProxy *pro xy, GArray *OUT_arg1, GError *error, gpointer userdata); typedef void (*tp_conn_iface_avatars_request_avatar_reply) (DBusGProxy *pro xy, GArray *OUT_arg1, char * OUT_arg2, GError *error, gpointer userdata);
static void static void
tp_conn_iface_avatars_request_avatar_async_callback (DBusGProxy *proxy, DBu sGProxyCall *call, void *user_data) tp_conn_iface_avatars_request_avatar_async_callback (DBusGProxy *proxy, DBu sGProxyCall *call, void *user_data)
{ {
DBusGAsyncData *data = (DBusGAsyncData*) user_data; DBusGAsyncData *data = (DBusGAsyncData*) user_data;
GError *error = NULL; GError *error = NULL;
GArray* OUT_arg1; GArray* OUT_arg1;
dbus_g_proxy_end_call (proxy, call, &error, dbus_g_type_get_collection (" char * OUT_arg2;
GArray", G_TYPE_UCHAR), &OUT_arg1, G_TYPE_INVALID); dbus_g_proxy_end_call (proxy, call, &error, dbus_g_type_get_collection ("
(*(tp_conn_iface_avatars_request_avatar_reply)data->cb) (proxy, OUT_arg1, GArray", G_TYPE_UCHAR), &OUT_arg1, G_TYPE_STRING, &OUT_arg2, G_TYPE_INVALID
error, data->userdata); );
(*(tp_conn_iface_avatars_request_avatar_reply)data->cb) (proxy, OUT_arg1,
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_avatars_request_avatar_async (DBusGProxy *proxy, const guint IN_contact, tp_conn_iface_avatars_request_avatar_reply callback, gpointer u serdata) tp_conn_iface_avatars_request_avatar_async (DBusGProxy *proxy, const guint IN_contact, tp_conn_iface_avatars_request_avatar_reply callback, gpointer u serdata)
 End of changes. 8 change blocks. 
14 lines changed or deleted 23 lines changed or added


 tp-conn-ifaces-signal-setters.h   tp-conn-ifaces-signal-setters.h 
skipping to change at line 31 skipping to change at line 31
#ifndef TP_CONN_IFACES_SETTERS_H #ifndef TP_CONN_IFACES_SETTERS_H
#define TP_CONN_IFACES_SETTERS_H #define TP_CONN_IFACES_SETTERS_H
#include <dbus/dbus-glib.h> #include <dbus/dbus-glib.h>
/* This header file contains definitions for the signal signature setters /* This header file contains definitions for the signal signature setters
* for the various interfaces provided by Connections */ * for the various interfaces provided by Connections */
void tp_conn_set_aliasing_signatures(DBusGProxy *proxy); void tp_conn_set_aliasing_signatures(DBusGProxy *proxy);
void tp_conn_set_avatars_signatures(DBusGProxy *proxy);
void tp_conn_set_capabilities_signatures(DBusGProxy *proxy); void tp_conn_set_capabilities_signatures(DBusGProxy *proxy);
void tp_conn_set_contactinfo_signatures(DBusGProxy *proxy); void tp_conn_set_contactinfo_signatures(DBusGProxy *proxy);
void tp_conn_set_forwarding_signatures(DBusGProxy *proxy); void tp_conn_set_forwarding_signatures(DBusGProxy *proxy);
void tp_conn_set_presence_signatures(DBusGProxy *proxy); void tp_conn_set_presence_signatures(DBusGProxy *proxy);
void tp_conn_set_privacy_signatures(DBusGProxy *proxy); void tp_conn_set_privacy_signatures(DBusGProxy *proxy);
 End of changes. 1 change blocks. 
0 lines changed or deleted 2 lines changed or added


 tp-conn.h   tp-conn.h 
skipping to change at line 63 skipping to change at line 63
#define TELEPATHY_IS_CONN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE \ #define TELEPATHY_IS_CONN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE \
((klass), TELEPATHY_CONN_TYPE)) ((klass), TELEPATHY_CONN_TYPE))
#define TELEPATHY_CONN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS \ #define TELEPATHY_CONN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS \
((obj), TELEPATHY_CONN_TYPE, \ ((obj), TELEPATHY_CONN_TYPE, \
TpConnClass)) TpConnClass))
#define TELEPATHY_CONN_IFACE_QUARK (tp_get_conn_interface()) #define TELEPATHY_CONN_IFACE_QUARK (tp_get_conn_interface())
#define TELEPATHY_CONN_IFACE_ALIASING_QUARK (tp_get_conn_aliasing_interface ()) #define TELEPATHY_CONN_IFACE_ALIASING_QUARK (tp_get_conn_aliasing_interface ())
#define TELEPATHY_CONN_IFACE_AVATARS_QUARK (tp_get_conn_avatars_interface() )
#define TELEPATHY_CONN_IFACE_CAPABILITIES_QUARK (tp_get_conn_capabilities_i nterface()) #define TELEPATHY_CONN_IFACE_CAPABILITIES_QUARK (tp_get_conn_capabilities_i nterface())
#define TELEPATHY_CONN_IFACE_CONTACTINFO_QUARK (tp_get_conn_contactinfo_int erface()) #define TELEPATHY_CONN_IFACE_CONTACTINFO_QUARK (tp_get_conn_contactinfo_int erface())
#define TELEPATHY_CONN_IFACE_FORWARDING_QUARK (tp_get_conn_forwarding_inter face()) #define TELEPATHY_CONN_IFACE_FORWARDING_QUARK (tp_get_conn_forwarding_inter face())
#define TELEPATHY_CONN_IFACE_PRESENCE_QUARK (tp_get_conn_presence_interface ()) #define TELEPATHY_CONN_IFACE_PRESENCE_QUARK (tp_get_conn_presence_interface ())
#define TELEPATHY_CONN_IFACE_PRIVACY_QUARK (tp_get_conn_privacy_interface() ) #define TELEPATHY_CONN_IFACE_PRIVACY_QUARK (tp_get_conn_privacy_interface() )
#define TELEPATHY_CONN_IFACE_RENAMING_QUARK (tp_get_conn_renaming_interface ()) #define TELEPATHY_CONN_IFACE_RENAMING_QUARK (tp_get_conn_renaming_interface ())
/* The signal name for the synthesized StatusChanged signal */
#define TP_IFACE_CONN_SIGNAL_STATUSCHANGED_SYNTHESIZED \
"received::org-freedesktop-Telepathy-Connection-StatusChanged"
typedef struct _tp_conn TpConn; typedef struct _tp_conn TpConn;
typedef struct _tp_connclass TpConnClass; typedef struct _tp_connclass TpConnClass;
struct _tp_conn struct _tp_conn
{ {
DBusGProxy parent; DBusGProxy parent;
GData *interface_list; GData *interface_list;
gboolean first_run; gboolean first_run;
}; };
skipping to change at line 166 skipping to change at line 163
* interface proxy object * interface proxy object
* @param iface_quark GQuark corresponding to the interface name * @param iface_quark GQuark corresponding to the interface name
* string. * string.
* @return A DBusGProxy object for the interface, or NULL if not found * @return A DBusGProxy object for the interface, or NULL if not found
*/ */
DBusGProxy *tp_conn_get_interface(TpConn *self, GQuark iface_quark); DBusGProxy *tp_conn_get_interface(TpConn *self, GQuark iface_quark);
GQuark tp_get_conn_interface(void); GQuark tp_get_conn_interface(void);
GQuark tp_get_conn_aliasing_interface(void); GQuark tp_get_conn_aliasing_interface(void);
GQuark tp_get_conn_avatars_interface(void);
GQuark tp_get_conn_capabilities_interface(void); GQuark tp_get_conn_capabilities_interface(void);
GQuark tp_get_conn_contactinfo_interface(void); GQuark tp_get_conn_contactinfo_interface(void);
GQuark tp_get_conn_forwarding_interface(void); GQuark tp_get_conn_forwarding_interface(void);
GQuark tp_get_conn_presence_interface(void); GQuark tp_get_conn_presence_interface(void);
GQuark tp_get_conn_privacy_interface(void); GQuark tp_get_conn_privacy_interface(void);
GQuark tp_get_conn_renaming_interface(void); GQuark tp_get_conn_renaming_interface(void);
#endif #endif
 End of changes. 3 change blocks. 
4 lines changed or deleted 2 lines changed or added


 tp-constants.h   tp-constants.h 
skipping to change at line 43 skipping to change at line 43
TP_CONN_CAPABILITY_TYPE_CREATE = 0, TP_CONN_CAPABILITY_TYPE_CREATE = 0,
TP_CONN_CAPABILITY_TYPE_INVITE = 1, TP_CONN_CAPABILITY_TYPE_INVITE = 1,
LAST_TP_CONN_CAPABILITY_TYPE LAST_TP_CONN_CAPABILITY_TYPE
} TelepathyConnectionCapabilityType; } TelepathyConnectionCapabilityType;
typedef enum { typedef enum {
TP_CONN_HANDLE_TYPE_NONE = 0, TP_CONN_HANDLE_TYPE_NONE = 0,
TP_CONN_HANDLE_TYPE_CONTACT = 1, TP_CONN_HANDLE_TYPE_CONTACT = 1,
TP_CONN_HANDLE_TYPE_ROOM = 2, TP_CONN_HANDLE_TYPE_ROOM = 2,
TP_CONN_HANDLE_TYPE_LIST = 3, TP_CONN_HANDLE_TYPE_LIST = 3,
TP_CONN_HANDLE_TYPE_GROUP = 4,
LAST_TP_CONN_HANDLE_TYPE LAST_TP_CONN_HANDLE_TYPE
} TelepathyConnectionHandleType; } TelepathyConnectionHandleType;
typedef enum { typedef enum {
TP_CONN_PRESENCE_TYPE_UNSET = 0, TP_CONN_PRESENCE_TYPE_UNSET = 0,
TP_CONN_PRESENCE_TYPE_OFFLINE = 1, TP_CONN_PRESENCE_TYPE_OFFLINE = 1,
TP_CONN_PRESENCE_TYPE_AVAILABLE = 2, TP_CONN_PRESENCE_TYPE_AVAILABLE = 2,
TP_CONN_PRESENCE_TYPE_AWAY = 3, TP_CONN_PRESENCE_TYPE_AWAY = 3,
TP_CONN_PRESENCE_TYPE_EXTENDED_AWAY = 4, TP_CONN_PRESENCE_TYPE_EXTENDED_AWAY = 4,
TP_CONN_PRESENCE_TYPE_HIDDEN = 5, TP_CONN_PRESENCE_TYPE_HIDDEN = 5,
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 tp-interfaces.h   tp-interfaces.h 
skipping to change at line 61 skipping to change at line 61
#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 \
"org.freedesktop.Telepathy.Channel.Type.StreamedMedia" "org.freedesktop.Telepathy.Channel.Type.StreamedMedia"
#define TP_IFACE_CHANNEL_TYPE_TEXT \ #define TP_IFACE_CHANNEL_TYPE_TEXT \
"org.freedesktop.Telepathy.Channel.Type.Text" "org.freedesktop.Telepathy.Channel.Type.Text"
#define TP_IFACE_CONN_INTERFACE \ #define TP_IFACE_CONN_INTERFACE \
"org.freedesktop.Telepathy.Connection" "org.freedesktop.Telepathy.Connection"
#define TP_IFACE_CONN_INTERFACE_ALIASING \ #define TP_IFACE_CONN_INTERFACE_ALIASING \
"org.freedesktop.Telepathy.Connection.Interface.Aliasing" "org.freedesktop.Telepathy.Connection.Interface.Aliasing"
#define TP_IFACE_CONN_INTERFACE_AVATARS \
"org.freedesktop.Telepathy.Connection.Interface.Avatars"
#define TP_IFACE_CONN_INTERFACE_CAPABILITIES \ #define TP_IFACE_CONN_INTERFACE_CAPABILITIES \
"org.freedesktop.Telepathy.Connection.Interface.Capabilities" "org.freedesktop.Telepathy.Connection.Interface.Capabilities"
#define TP_IFACE_CONN_INTERFACE_CONTACT_INFO \ #define TP_IFACE_CONN_INTERFACE_CONTACT_INFO \
"org.freedesktop.Telepathy.Connection.Interface.ContactInfo" "org.freedesktop.Telepathy.Connection.Interface.ContactInfo"
#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"
 End of changes. 1 change blocks. 
0 lines changed or deleted 2 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/