tp-chan-ifaces-signal-setters.h   tp-chan-ifaces-signal-setters.h 
skipping to change at line 29 skipping to change at line 29
*/ */
#ifndef TP_CHAN_IFACES_SETTERS_H #ifndef TP_CHAN_IFACES_SETTERS_H
#define TP_CHAN_IFACES_SETTERS_H #define TP_CHAN_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 Channel */ * for the various interfaces provided by Channel */
/* TODO: Enable this again when dbus-binding-tool supports
'g' signature */
#if 0
void tp_chan_set_contactsearch_signatures(DBusGProxy *proxy); void tp_chan_set_contactsearch_signatures(DBusGProxy *proxy);
#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_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);
 End of changes. 2 change blocks. 
0 lines changed or deleted 5 lines changed or added


 tp-chan.h   tp-chan.h 
skipping to change at line 59 skipping to change at line 59
#define TELEPATHY_IS_CHAN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE \ #define TELEPATHY_IS_CHAN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE \
((klass), TELEPATHY_CHAN_TYPE )) ((klass), TELEPATHY_CHAN_TYPE ))
#define TELEPATHY_CHAN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS \ #define TELEPATHY_CHAN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS \
((obj), TELEPATHY_CHAN_TYPE, \ ((obj), TELEPATHY_CHAN_TYPE, \
TpChanClass)) TpChanClass))
#define TELEPATHY_CHAN_IFACE_QUARK (tp_get_chan_interface()) #define TELEPATHY_CHAN_IFACE_QUARK (tp_get_chan_interface())
#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
'g' signature */
#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
#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_SUBJECT_QUARK (tp_get_chan_subject_interface() ) #define TELEPATHY_CHAN_IFACE_SUBJECT_QUARK (tp_get_chan_subject_interface() )
#define TELEPATHY_CHAN_IFACE_TRANSFER_QUARK (tp_get_chan_transfer_interface ()) #define TELEPATHY_CHAN_IFACE_TRANSFER_QUARK (tp_get_chan_transfer_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;
skipping to change at line 136 skipping to change at line 144
* proxy object * 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_chan_get_interface(TpChan *self, GQuark iface_quark); DBusGProxy *tp_chan_get_interface(TpChan *self, GQuark iface_quark);
GQuark tp_get_chan_interface(void); GQuark tp_get_chan_interface(void);
GQuark tp_get_chan_contactlist_interface(void); GQuark tp_get_chan_contactlist_interface(void);
/* TODO: Enable this again when dbus-binding-tool supports
'g' signature */
#if 0
GQuark tp_get_chan_contactsearch_interface(void); GQuark tp_get_chan_contactsearch_interface(void);
#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_subject_interface(void); GQuark tp_get_chan_subject_interface(void);
GQuark tp_get_chan_transfer_interface(void); GQuark tp_get_chan_transfer_interface(void);
 End of changes. 5 change blocks. 
0 lines changed or deleted 12 lines changed or added


 tp-conn-gen.h   tp-conn-gen.h 
skipping to change at line 293 skipping to change at line 293
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, "InspectHandle", tp_conn_inspect_h andle_async_callback, stuff, _dbus_glib_async_data_free, G_TYPE_UINT, IN_ha ndle_type, G_TYPE_UINT, IN_handle, G_TYPE_INVALID); return dbus_g_proxy_begin_call (proxy, "InspectHandle", tp_conn_inspect_h andle_async_callback, stuff, _dbus_glib_async_data_free, G_TYPE_UINT, IN_ha ndle_type, G_TYPE_UINT, IN_handle, G_TYPE_INVALID);
} }
static static
#ifdef G_HAVE_INLINE #ifdef G_HAVE_INLINE
inline inline
#endif #endif
gboolean gboolean
tp_conn_inspect_handles (DBusGProxy *proxy, const guint IN_handle_type, con
st GArray* IN_handles, char *** OUT_arg2, GError **error)
{
return dbus_g_proxy_call (proxy, "InspectHandles", error, G_TYPE_UINT, IN
_handle_type, dbus_g_type_get_collection ("GArray", G_TYPE_UINT), IN_handle
s, G_TYPE_INVALID, G_TYPE_STRV, OUT_arg2, G_TYPE_INVALID);
}
typedef void (*tp_conn_inspect_handles_reply) (DBusGProxy *proxy, char * *O
UT_arg2, GError *error, gpointer userdata);
static void
tp_conn_inspect_handles_async_callback (DBusGProxy *proxy, DBusGProxyCall *
call, void *user_data)
{
DBusGAsyncData *data = (DBusGAsyncData*) user_data;
GError *error = NULL;
char ** OUT_arg2;
dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_STRV, &OUT_arg2, G_TYP
E_INVALID);
(*(tp_conn_inspect_handles_reply)data->cb) (proxy, OUT_arg2, error, data-
>userdata);
return;
}
static
#ifdef G_HAVE_INLINE
inline
#endif
DBusGProxyCall*
tp_conn_inspect_handles_async (DBusGProxy *proxy, const guint IN_handle_typ
e, const GArray* IN_handles, tp_conn_inspect_handles_reply callback, gpoint
er userdata)
{
DBusGAsyncData *stuff;
stuff = g_slice_new (DBusGAsyncData);
stuff->cb = G_CALLBACK (callback);
stuff->userdata = userdata;
return dbus_g_proxy_begin_call (proxy, "InspectHandles", tp_conn_inspect_
handles_async_callback, stuff, _dbus_glib_async_data_free, G_TYPE_UINT, IN_
handle_type, dbus_g_type_get_collection ("GArray", G_TYPE_UINT), IN_handles
, G_TYPE_INVALID);
}
static
#ifdef G_HAVE_INLINE
inline
#endif
gboolean
tp_conn_list_channels (DBusGProxy *proxy, GPtrArray** OUT_arg0, GError **er ror) tp_conn_list_channels (DBusGProxy *proxy, GPtrArray** OUT_arg0, GError **er ror)
{ {
return dbus_g_proxy_call (proxy, "ListChannels", error, G_TYPE_INVALID, d bus_g_type_get_collection ("GPtrArray", dbus_g_type_get_struct ("GValueArra y", DBUS_TYPE_G_OBJECT_PATH, G_TYPE_STRING, G_TYPE_UINT, G_TYPE_UINT, G_TYP E_INVALID)), OUT_arg0, G_TYPE_INVALID); return dbus_g_proxy_call (proxy, "ListChannels", error, G_TYPE_INVALID, d bus_g_type_get_collection ("GPtrArray", dbus_g_type_get_struct ("GValueArra y", DBUS_TYPE_G_OBJECT_PATH, G_TYPE_STRING, G_TYPE_UINT, G_TYPE_UINT, G_TYP E_INVALID)), OUT_arg0, G_TYPE_INVALID);
} }
typedef void (*tp_conn_list_channels_reply) (DBusGProxy *proxy, GPtrArray * OUT_arg0, GError *error, gpointer userdata); typedef void (*tp_conn_list_channels_reply) (DBusGProxy *proxy, GPtrArray * OUT_arg0, GError *error, gpointer userdata);
static void static void
tp_conn_list_channels_async_callback (DBusGProxy *proxy, DBusGProxyCall *ca ll, void *user_data) tp_conn_list_channels_async_callback (DBusGProxy *proxy, DBusGProxyCall *ca ll, void *user_data)
 End of changes. 1 change blocks. 
0 lines changed or deleted 50 lines changed or added


 tp-conn.h   tp-conn.h 
skipping to change at line 70 skipping to change at line 70
#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_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;
}; };
 End of changes. 1 change blocks. 
0 lines changed or deleted 4 lines changed or added


 tp-interfaces.h   tp-interfaces.h 
skipping to change at line 44 skipping to change at line 44
#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_TYPE_CONTACT_LIST \ #define TP_IFACE_CHANNEL_TYPE_CONTACT_LIST \
"org.freedesktop.Telepathy.Channel.Type.ContactList" "org.freedesktop.Telepathy.Channel.Type.ContactList"
#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
#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"
 End of changes. 2 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/