_gen-tp-constants.h   _gen-tp-constants.h 
/* Generated from the Telepathy spec, version 0.15.4 /* Generated from the Telepathy spec, version 0.15.5
Copyright (C) 2005, 2006, 2007 Collabora Limited Copyright (C) 2005, 2006, 2007 Collabora Limited
Copyright (C) 2005, 2006, 2007 Nokia Corporation Copyright (C) 2005, 2006, 2007 Nokia Corporation
Copyright (C) 2006 INdT Copyright (C) 2006 INdT
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.
skipping to change at line 236 skipping to change at line 236
TP_CHANNEL_TEXT_MESSAGE_FLAG_TRUNCATED = 1, TP_CHANNEL_TEXT_MESSAGE_FLAG_TRUNCATED = 1,
#ifndef LIBTELEPATHY_DISABLE_DEPRECATED #ifndef LIBTELEPATHY_DISABLE_DEPRECATED
LAST_TP_CHANNEL_TEXT_MESSAGE_FLAG = 1 + 1 LAST_TP_CHANNEL_TEXT_MESSAGE_FLAG = 1 + 1
#endif #endif
} TelepathyChannelTextMessageFlags; } TelepathyChannelTextMessageFlags;
/* TpTubeType (enum) */ /* TpTubeType (enum) */
typedef enum { typedef enum {
TP_TUBE_TYPE_DBUS = 0, TP_TUBE_TYPE_DBUS = 0,
TP_TUBE_TYPE_STREAM = 1,
NUM_TP_TUBE_TYPES NUM_TP_TUBE_TYPES
} TelepathyTubeType; } TelepathyTubeType;
#ifndef LIBTELEPATHY_DISABLE_DEPRECATED #ifndef LIBTELEPATHY_DISABLE_DEPRECATED
#define LAST_TP_TUBE_TYPE NUM_TP_TUBE_TYPES #define LAST_TP_TUBE_TYPE NUM_TP_TUBE_TYPES
#endif #endif
/* TpTubeState (enum) */ /* TpTubeState (enum) */
typedef enum { typedef enum {
TP_TUBE_STATE_LOCAL_PENDING = 0, TP_TUBE_STATE_LOCAL_PENDING = 0,
TP_TUBE_STATE_REMOTE_PENDING = 1, TP_TUBE_STATE_REMOTE_PENDING = 1,
TP_TUBE_STATE_OPEN = 2, TP_TUBE_STATE_OPEN = 2,
NUM_TP_TUBE_STATES NUM_TP_TUBE_STATES
} TelepathyTubeState; } TelepathyTubeState;
#ifndef LIBTELEPATHY_DISABLE_DEPRECATED #ifndef LIBTELEPATHY_DISABLE_DEPRECATED
#define LAST_TP_TUBE_STATE NUM_TP_TUBE_STATES #define LAST_TP_TUBE_STATE NUM_TP_TUBE_STATES
#endif #endif
/* TpSocketAddressType (enum) */
typedef enum {
TP_SOCKET_ADDRESS_TYPE_UNIX = 0,
TP_SOCKET_ADDRESS_TYPE_ABSTRACT_UNIX = 1,
TP_SOCKET_ADDRESS_TYPE_IPV4 = 2,
TP_SOCKET_ADDRESS_TYPE_IPV6 = 3,
NUM_TP_SOCKET_ADDRESS_TYPES
} TelepathySocketAddressType;
#ifndef LIBTELEPATHY_DISABLE_DEPRECATED
#define LAST_TP_SOCKET_ADDRESS_TYPE NUM_TP_SOCKET_ADDRESS_TYPES
#endif
/* TpSocketAccessControl (enum) */
typedef enum {
TP_SOCKET_ACCESS_CONTROL_LOCALHOST = 0,
TP_SOCKET_ACCESS_CONTROL_PORT = 1,
TP_SOCKET_ACCESS_CONTROL_NETMASK = 2,
TP_SOCKET_ACCESS_CONTROL_CREDENTIALS = 3,
NUM_TP_SOCKET_ACCESS_CONTROLS
} TelepathySocketAccessControl;
#ifndef LIBTELEPATHY_DISABLE_DEPRECATED
#define LAST_TP_SOCKET_ACCESS_CONTROL NUM_TP_SOCKET_ACCESS_CONTROLS
#endif
/* TpChannelChatState (enum) */ /* TpChannelChatState (enum) */
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,
NUM_TP_CHANNEL_CHAT_STATES NUM_TP_CHANNEL_CHAT_STATES
} TelepathyChannelChatState; } TelepathyChannelChatState;
skipping to change at line 326 skipping to change at line 353
TP_CHANNEL_GROUP_CHANGE_REASON_OFFLINE = 1, TP_CHANNEL_GROUP_CHANGE_REASON_OFFLINE = 1,
TP_CHANNEL_GROUP_CHANGE_REASON_KICKED = 2, TP_CHANNEL_GROUP_CHANGE_REASON_KICKED = 2,
TP_CHANNEL_GROUP_CHANGE_REASON_BUSY = 3, TP_CHANNEL_GROUP_CHANGE_REASON_BUSY = 3,
TP_CHANNEL_GROUP_CHANGE_REASON_INVITED = 4, TP_CHANNEL_GROUP_CHANGE_REASON_INVITED = 4,
TP_CHANNEL_GROUP_CHANGE_REASON_BANNED = 5, TP_CHANNEL_GROUP_CHANGE_REASON_BANNED = 5,
TP_CHANNEL_GROUP_CHANGE_REASON_ERROR = 6, TP_CHANNEL_GROUP_CHANGE_REASON_ERROR = 6,
TP_CHANNEL_GROUP_CHANGE_REASON_INVALID_CONTACT = 7, TP_CHANNEL_GROUP_CHANGE_REASON_INVALID_CONTACT = 7,
TP_CHANNEL_GROUP_CHANGE_REASON_NO_ANSWER = 8, TP_CHANNEL_GROUP_CHANGE_REASON_NO_ANSWER = 8,
TP_CHANNEL_GROUP_CHANGE_REASON_RENAMED = 9, TP_CHANNEL_GROUP_CHANGE_REASON_RENAMED = 9,
TP_CHANNEL_GROUP_CHANGE_REASON_PERMISSION_DENIED = 10, TP_CHANNEL_GROUP_CHANGE_REASON_PERMISSION_DENIED = 10,
TP_CHANNEL_GROUP_CHANGE_REASON_SEPARATED = 11,
NUM_TP_CHANNEL_GROUP_CHANGE_REASONS NUM_TP_CHANNEL_GROUP_CHANGE_REASONS
} TelepathyChannelGroupChangeReason; } TelepathyChannelGroupChangeReason;
#ifndef LIBTELEPATHY_DISABLE_DEPRECATED #ifndef LIBTELEPATHY_DISABLE_DEPRECATED
#define LAST_TP_CHANNEL_GROUP_CHANGE_REASON NUM_TP_CHANNEL_GROUP_CHANGE_REA SONS #define LAST_TP_CHANNEL_GROUP_CHANGE_REASON NUM_TP_CHANNEL_GROUP_CHANGE_REA SONS
#endif #endif
/* TpChannelHoldState (enum) */ /* TpChannelHoldState (enum) */
typedef enum { typedef enum {
TP_CHANNEL_HOLD_STATE_NONE = 0, TP_CHANNEL_HOLD_STATE_NONE = 0,
 End of changes. 4 change blocks. 
1 lines changed or deleted 29 lines changed or added


 tp-chan-ifaces-signal-setters.h   tp-chan-ifaces-signal-setters.h 
skipping to change at line 54 skipping to change at line 54
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_media_signalling_signatures(DBusGProxy *proxy); void tp_chan_set_media_signalling_signatures(DBusGProxy *proxy);
void tp_chan_set_tubes_signatures(DBusGProxy *proxy);
#endif #endif
 End of changes. 1 change blocks. 
0 lines changed or deleted 2 lines changed or added


 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_CHAT_STATE_QUARK (tp_get_chan_chat_state_inter face()) #define TELEPATHY_CHAN_IFACE_CHAT_STATE_QUARK (tp_get_chan_chat_state_inter face())
#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())
#define TELEPATHY_CHAN_IFACE_TUBES_QUARK (tp_get_chan_tubes_interface())
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;
skipping to change at line 156 skipping to change at line 157
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_chat_state_interface(void); GQuark tp_get_chan_chat_state_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_media_signalling_interface(void); GQuark tp_get_chan_media_signalling_interface(void);
GQuark tp_get_chan_tubes_interface(void);
#endif #endif
 End of changes. 2 change blocks. 
0 lines changed or deleted 2 lines changed or added


 tp-conn-iface-avatars-gen.h   tp-conn-iface-avatars-gen.h 
skipping to change at line 110 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_get_known_avatar_tokens (DBusGProxy *proxy, const GAr
ray* IN_contacts, GHashTable** OUT_arg1, GError **error)
{
return dbus_g_proxy_call (proxy, "GetKnownAvatarTokens", error, dbus_g_ty
pe_get_collection ("GArray", G_TYPE_UINT), IN_contacts, G_TYPE_INVALID, dbu
s_g_type_get_map ("GHashTable", G_TYPE_UINT, G_TYPE_STRING), OUT_arg1, G_TY
PE_INVALID);
}
typedef void (*tp_conn_iface_avatars_get_known_avatar_tokens_reply) (DBusGP
roxy *proxy, GHashTable *OUT_arg1, GError *error, gpointer userdata);
static void
tp_conn_iface_avatars_get_known_avatar_tokens_async_callback (DBusGProxy *p
roxy, DBusGProxyCall *call, void *user_data)
{
DBusGAsyncData *data = (DBusGAsyncData*) user_data;
GError *error = NULL;
GHashTable* OUT_arg1;
dbus_g_proxy_end_call (proxy, call, &error, dbus_g_type_get_map ("GHashTa
ble", G_TYPE_UINT, G_TYPE_STRING), &OUT_arg1, G_TYPE_INVALID);
(*(tp_conn_iface_avatars_get_known_avatar_tokens_reply)data->cb) (proxy,
OUT_arg1, error, data->userdata);
return;
}
static
#ifdef G_HAVE_INLINE
inline
#endif
DBusGProxyCall*
tp_conn_iface_avatars_get_known_avatar_tokens_async (DBusGProxy *proxy, con
st GArray* IN_contacts, tp_conn_iface_avatars_get_known_avatar_tokens_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, "GetKnownAvatarTokens", tp_conn_if
ace_avatars_get_known_avatar_tokens_async_callback, stuff, _dbus_glib_async
_data_free, dbus_g_type_get_collection ("GArray", G_TYPE_UINT), IN_contacts
, G_TYPE_INVALID);
}
static
#ifdef G_HAVE_INLINE
inline
#endif
gboolean
tp_conn_iface_avatars_request_avatar (DBusGProxy *proxy, const guint IN_con tact, GArray** OUT_arg1, char ** OUT_arg2, 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_STRING, OUT_arg2, 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, char * OUT_arg2, 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)
 End of changes. 1 change blocks. 
0 lines changed or deleted 51 lines changed or added


 tp-ifaces-signals-marshal.h   tp-ifaces-signals-marshal.h 
skipping to change at line 109 skipping to change at line 109
gpointer marshal_data); gpointer marshal_data);
/* VOID:OBJECT,STRING (tp-ifaces-signals-marshal.list:38) */ /* 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);
/* VOID:UINT,STRING,BOXED,STRING (tp-ifaces-signals-marshal.list:40) */
extern void tp_ifaces_signals_marshal_VOID__UINT_STRING_BOXED_STRING (GClos
ure *closure,
GValu
e *return_value,
guint
n_param_values,
const
GValue *param_values,
gpoin
ter invocation_hint,
gpoin
ter marshal_data);
G_END_DECLS G_END_DECLS
#endif /* __tp_ifaces_signals_marshal_MARSHAL_H__ */ #endif /* __tp_ifaces_signals_marshal_MARSHAL_H__ */
 End of changes. 1 change blocks. 
0 lines changed or deleted 14 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/