tp-chan-iface-group-gen.h   tp-chan-iface-group-gen.h 
skipping to change at line 220 skipping to change at line 220
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, "GetLocalPendingMembers", tp_chan_ iface_group_get_local_pending_members_async_callback, stuff, _dbus_glib_asy nc_data_free, G_TYPE_INVALID); return dbus_g_proxy_begin_call (proxy, "GetLocalPendingMembers", tp_chan_ iface_group_get_local_pending_members_async_callback, stuff, _dbus_glib_asy nc_data_free, G_TYPE_INVALID);
} }
static static
#ifdef G_HAVE_INLINE #ifdef G_HAVE_INLINE
inline inline
#endif #endif
gboolean gboolean
tp_chan_iface_group_get_local_pending_members_with_info (DBusGProxy *proxy,
GPtrArray** OUT_arg0, GError **error)
{
return dbus_g_proxy_call (proxy, "GetLocalPendingMembersWithInfo", error,
G_TYPE_INVALID, dbus_g_type_get_collection ("GPtrArray", dbus_g_type_get_s
truct ("GValueArray", G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_STRING,
G_TYPE_INVALID)), OUT_arg0, G_TYPE_INVALID);
}
typedef void (*tp_chan_iface_group_get_local_pending_members_with_info_repl
y) (DBusGProxy *proxy, GPtrArray *OUT_arg0, GError *error, gpointer userdat
a);
static void
tp_chan_iface_group_get_local_pending_members_with_info_async_callback (DBu
sGProxy *proxy, DBusGProxyCall *call, void *user_data)
{
DBusGAsyncData *data = (DBusGAsyncData*) user_data;
GError *error = NULL;
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_STRING, G_TYPE_INVALID)), &OUT_arg0, G_TYPE_INVALID);
(*(tp_chan_iface_group_get_local_pending_members_with_info_reply)data->cb
) (proxy, OUT_arg0, error, data->userdata);
return;
}
static
#ifdef G_HAVE_INLINE
inline
#endif
DBusGProxyCall*
tp_chan_iface_group_get_local_pending_members_with_info_async (DBusGProxy *
proxy, tp_chan_iface_group_get_local_pending_members_with_info_reply callba
ck, gpointer userdata)
{
DBusGAsyncData *stuff;
stuff = g_slice_new (DBusGAsyncData);
stuff->cb = G_CALLBACK (callback);
stuff->userdata = userdata;
return dbus_g_proxy_begin_call (proxy, "GetLocalPendingMembersWithInfo",
tp_chan_iface_group_get_local_pending_members_with_info_async_callback, stu
ff, _dbus_glib_async_data_free, G_TYPE_INVALID);
}
static
#ifdef G_HAVE_INLINE
inline
#endif
gboolean
tp_chan_iface_group_get_members (DBusGProxy *proxy, GArray** OUT_arg0, GErr or **error) tp_chan_iface_group_get_members (DBusGProxy *proxy, GArray** OUT_arg0, GErr or **error)
{ {
return dbus_g_proxy_call (proxy, "GetMembers", error, G_TYPE_INVALID, dbu s_g_type_get_collection ("GArray", G_TYPE_UINT), OUT_arg0, G_TYPE_INVALID); return dbus_g_proxy_call (proxy, "GetMembers", error, G_TYPE_INVALID, dbu s_g_type_get_collection ("GArray", G_TYPE_UINT), OUT_arg0, G_TYPE_INVALID);
} }
typedef void (*tp_chan_iface_group_get_members_reply) (DBusGProxy *proxy, G Array *OUT_arg0, GError *error, gpointer userdata); typedef void (*tp_chan_iface_group_get_members_reply) (DBusGProxy *proxy, G Array *OUT_arg0, GError *error, gpointer userdata);
static void static void
tp_chan_iface_group_get_members_async_callback (DBusGProxy *proxy, DBusGPro xyCall *call, void *user_data) tp_chan_iface_group_get_members_async_callback (DBusGProxy *proxy, DBusGPro xyCall *call, void *user_data)
 End of changes. 1 change blocks. 
0 lines changed or deleted 52 lines changed or added


 tp-chan-ifaces-signal-setters.h   tp-chan-ifaces-signal-setters.h 
skipping to change at line 42 skipping to change at line 42
#if 0 #if 0
void tp_chan_set_contactsearch_signatures(DBusGProxy *proxy); void tp_chan_set_contactsearch_signatures(DBusGProxy *proxy);
#endif #endif
void tp_chan_set_streamedmedia_signatures(DBusGProxy *proxy); void tp_chan_set_streamedmedia_signatures(DBusGProxy *proxy);
void tp_chan_set_roomlist_signatures(DBusGProxy *proxy); void tp_chan_set_roomlist_signatures(DBusGProxy *proxy);
void tp_chan_set_text_signatures(DBusGProxy *proxy); void tp_chan_set_text_signatures(DBusGProxy *proxy);
void tp_chan_set_chat_state_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_media_signalling_signatures(DBusGProxy *proxy); void tp_chan_set_media_signalling_signatures(DBusGProxy *proxy);
 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 68 skipping to change at line 68
#define TELEPATHY_CHAN_IFACE_CONTACTLIST_QUARK (tp_get_chan_contactlist_int erface()) #define TELEPATHY_CHAN_IFACE_CONTACTLIST_QUARK (tp_get_chan_contactlist_int erface())
/* TODO: Enable this again when dbus-binding-tool supports /* TODO: Enable this again when dbus-binding-tool supports
'g' signature */ 'g' signature */
#if 0 #if 0
#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_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())
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 149 skipping to change at line 150
GQuark tp_get_chan_contactlist_interface(void); GQuark tp_get_chan_contactlist_interface(void);
/* TODO: Enable this again when dbus-binding-tool supports /* TODO: Enable this again when dbus-binding-tool supports
'g' signature */ 'g' signature */
#if 0 #if 0
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_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);
#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 182 skipping to change at line 182
DBusGProxyCall* DBusGProxyCall*
tp_conn_iface_avatars_set_avatar_async (DBusGProxy *proxy, const GArray* IN _avatar, const char * IN_mime_type, tp_conn_iface_avatars_set_avatar_reply callback, gpointer userdata) tp_conn_iface_avatars_set_avatar_async (DBusGProxy *proxy, const GArray* IN _avatar, const char * IN_mime_type, tp_conn_iface_avatars_set_avatar_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, "SetAvatar", tp_conn_iface_avatars _set_avatar_async_callback, stuff, _dbus_glib_async_data_free, dbus_g_type_ get_collection ("GArray", G_TYPE_UCHAR), IN_avatar, G_TYPE_STRING, IN_mime_ type, G_TYPE_INVALID); return dbus_g_proxy_begin_call (proxy, "SetAvatar", tp_conn_iface_avatars _set_avatar_async_callback, stuff, _dbus_glib_async_data_free, dbus_g_type_ get_collection ("GArray", G_TYPE_UCHAR), IN_avatar, G_TYPE_STRING, IN_mime_ type, G_TYPE_INVALID);
} }
static
#ifdef G_HAVE_INLINE
inline
#endif
gboolean
tp_conn_iface_avatars_clear_avatar (DBusGProxy *proxy, GError **error)
{
return dbus_g_proxy_call (proxy, "ClearAvatar", error, G_TYPE_INVALID, G_
TYPE_INVALID);
}
typedef void (*tp_conn_iface_avatars_clear_avatar_reply) (DBusGProxy *proxy
, GError *error, gpointer userdata);
static void
tp_conn_iface_avatars_clear_avatar_async_callback (DBusGProxy *proxy, DBusG
ProxyCall *call, void *user_data)
{
DBusGAsyncData *data = (DBusGAsyncData*) user_data;
GError *error = NULL;
dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_INVALID);
(*(tp_conn_iface_avatars_clear_avatar_reply)data->cb) (proxy, error, data
->userdata);
return;
}
static
#ifdef G_HAVE_INLINE
inline
#endif
DBusGProxyCall*
tp_conn_iface_avatars_clear_avatar_async (DBusGProxy *proxy, tp_conn_iface_
avatars_clear_avatar_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, "ClearAvatar", tp_conn_iface_avata
rs_clear_avatar_async_callback, stuff, _dbus_glib_async_data_free, G_TYPE_I
NVALID);
}
#endif /* defined DBUS_GLIB_CLIENT_WRAPPERS_org_freedesktop_Telepathy_Conne ction_Interface_Avatars */ #endif /* defined DBUS_GLIB_CLIENT_WRAPPERS_org_freedesktop_Telepathy_Conne ction_Interface_Avatars */
G_END_DECLS G_END_DECLS
 End of changes. 1 change blocks. 
0 lines changed or deleted 44 lines changed or added


 tp-constants.h   tp-constants.h 
skipping to change at line 215 skipping to change at line 215
TP_MEDIA_STREAM_STATE_DISCONNECTED = 0, TP_MEDIA_STREAM_STATE_DISCONNECTED = 0,
TP_MEDIA_STREAM_STATE_CONNECTING = 1, TP_MEDIA_STREAM_STATE_CONNECTING = 1,
TP_MEDIA_STREAM_STATE_CONNECTED = 2 TP_MEDIA_STREAM_STATE_CONNECTED = 2
} 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;
typedef enum {
TP_CHANNEL_CHAT_STATE_GONE = 0,
TP_CHANNEL_CHAT_STATE_INACTIVE = 1,
TP_CHANNEL_CHAT_STATE_ACTIVE = 2,
TP_CHANNEL_CHAT_STATE_PAUSED = 3,
TP_CHANNEL_CHAT_STATE_COMPOSING = 4,
} TelepathyChannelChatState;
G_END_DECLS G_END_DECLS
#endif #endif
 End of changes. 1 change blocks. 
0 lines changed or deleted 8 lines changed or added


 tp-helpers.h   tp-helpers.h 
skipping to change at line 82 skipping to change at line 82
GSList * GSList *
tp_connmgr_list_cms (void); tp_connmgr_list_cms (void);
/* /*
* Returns the connection manager information for the given connection mana ger * Returns the connection manager information for the given connection mana ger
* @param cm: the connection manager name string * @param cm: the connection manager name string
* @return A struct containing all the information read from the connection * @return A struct containing all the information read from the connection
* manager file. * manager file.
*/ */
TpConnMgrInfo * TpConnMgrInfo *
tp_connmgr_get_info (gchar *cm); tp_connmgr_get_info (const gchar *cm);
void void
tp_connmgr_info_free (TpConnMgrInfo *info); tp_connmgr_info_free (TpConnMgrInfo *info);
G_END_DECLS G_END_DECLS
#endif /* __TELEPATHY_HELPERS_H__ */ #endif /* __TELEPATHY_HELPERS_H__ */
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 tp-interfaces.h   tp-interfaces.h 
skipping to change at line 30 skipping to change at line 30
#ifndef __TELEPATHY_INTERFACES_H__ #ifndef __TELEPATHY_INTERFACES_H__
#define __TELEPATHY_INTERFACES_H__ #define __TELEPATHY_INTERFACES_H__
#include <glib-object.h> #include <glib-object.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define TP_IFACE_CHANNEL_INTERFACE \ #define TP_IFACE_CHANNEL_INTERFACE \
"org.freedesktop.Telepathy.Channel" "org.freedesktop.Telepathy.Channel"
#define TP_IFACE_CHANNEL_INTERFACE_CHAT_STATE \
"org.freedesktop.Telepathy.Channel.Interface.ChatState"
#define TP_IFACE_CHANNEL_INTERFACE_DTMF \ #define TP_IFACE_CHANNEL_INTERFACE_DTMF \
"org.freedesktop.Telepathy.Channel.Interface.DTMF" "org.freedesktop.Telepathy.Channel.Interface.DTMF"
#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"
 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/