tp-chan-type-contact-list-gen.h   tp-chan-type-contact-list-gen.h 
skipping to change at line 21 skipping to change at line 21
#ifdef G_HAVE_INLINE #ifdef G_HAVE_INLINE
inline inline
#endif #endif
void void
_dbus_glib_async_data_free (gpointer stuff) _dbus_glib_async_data_free (gpointer stuff)
{ {
g_slice_free (DBusGAsyncData, stuff); g_slice_free (DBusGAsyncData, stuff);
} }
#endif #endif
#ifndef DBUS_GLIB_CLIENT_WRAPPERS_org_freedesktop_Telepathy_Channel_Type_Co
ntactList
#define DBUS_GLIB_CLIENT_WRAPPERS_org_freedesktop_Telepathy_Channel_Type_Co
ntactList
#endif /* defined DBUS_GLIB_CLIENT_WRAPPERS_org_freedesktop_Telepathy_Chann
el_Type_ContactList */
G_END_DECLS G_END_DECLS
 End of changes. 1 change blocks. 
0 lines changed or deleted 8 lines changed or added


 tp-chan-type-room-list-gen.h   tp-chan-type-room-list-gen.h 
skipping to change at line 99 skipping to change at line 99
DBusGProxyCall* DBusGProxyCall*
tp_chan_type_room_list_list_rooms_async (DBusGProxy *proxy, tp_chan_type_ro om_list_list_rooms_reply callback, gpointer userdata) tp_chan_type_room_list_list_rooms_async (DBusGProxy *proxy, tp_chan_type_ro om_list_list_rooms_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, "ListRooms", tp_chan_type_room_lis t_list_rooms_async_callback, stuff, _dbus_glib_async_data_free, G_TYPE_INVA LID); return dbus_g_proxy_begin_call (proxy, "ListRooms", tp_chan_type_room_lis t_list_rooms_async_callback, stuff, _dbus_glib_async_data_free, G_TYPE_INVA LID);
} }
static
#ifdef G_HAVE_INLINE
inline
#endif
gboolean
tp_chan_type_room_list_stop_listing (DBusGProxy *proxy, GError **error)
{
return dbus_g_proxy_call (proxy, "StopListing", error, G_TYPE_INVALID, G_
TYPE_INVALID);
}
typedef void (*tp_chan_type_room_list_stop_listing_reply) (DBusGProxy *prox
y, GError *error, gpointer userdata);
static void
tp_chan_type_room_list_stop_listing_async_callback (DBusGProxy *proxy, DBus
GProxyCall *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_room_list_stop_listing_reply)data->cb) (proxy, error, dat
a->userdata);
return;
}
static
#ifdef G_HAVE_INLINE
inline
#endif
DBusGProxyCall*
tp_chan_type_room_list_stop_listing_async (DBusGProxy *proxy, tp_chan_type_
room_list_stop_listing_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, "StopListing", tp_chan_type_room_l
ist_stop_listing_async_callback, stuff, _dbus_glib_async_data_free, G_TYPE_
INVALID);
}
#endif /* defined DBUS_GLIB_CLIENT_WRAPPERS_org_freedesktop_Telepathy_Chann el_Type_RoomList */ #endif /* defined DBUS_GLIB_CLIENT_WRAPPERS_org_freedesktop_Telepathy_Chann el_Type_RoomList */
G_END_DECLS G_END_DECLS
 End of changes. 1 change blocks. 
0 lines changed or deleted 44 lines changed or added


 tp-conn-iface-presence-gen.h   tp-conn-iface-presence-gen.h 
skipping to change at line 103 skipping to change at line 103
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, "ClearStatus", tp_conn_iface_prese nce_clear_status_async_callback, stuff, _dbus_glib_async_data_free, G_TYPE_ INVALID); return dbus_g_proxy_begin_call (proxy, "ClearStatus", tp_conn_iface_prese nce_clear_status_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_conn_iface_presence_get_presence (DBusGProxy *proxy, const GArray* IN_co ntacts, GHashTable** OUT_arg1, GError **error) tp_conn_iface_presence_get_presence (DBusGProxy *proxy, const GArray* IN_co ntacts, GHashTable** OUT_presence, GError **error)
{ {
return dbus_g_proxy_call (proxy, "GetPresence", error, dbus_g_type_get_co llection ("GArray", G_TYPE_UINT), IN_contacts, G_TYPE_INVALID, dbus_g_type_ get_map ("GHashTable", G_TYPE_UINT, dbus_g_type_get_struct ("GValueArray", G_TYPE_UINT, dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, dbus_g_type_ get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE)), G_TYPE_INVALID)), OUT _arg1, G_TYPE_INVALID); return dbus_g_proxy_call (proxy, "GetPresence", error, dbus_g_type_get_co llection ("GArray", G_TYPE_UINT), IN_contacts, G_TYPE_INVALID, dbus_g_type_ get_map ("GHashTable", G_TYPE_UINT, dbus_g_type_get_struct ("GValueArray", G_TYPE_UINT, dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, dbus_g_type_ get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE)), G_TYPE_INVALID)), OUT _presence, G_TYPE_INVALID);
} }
typedef void (*tp_conn_iface_presence_get_presence_reply) (DBusGProxy *prox y, GHashTable *OUT_arg1, GError *error, gpointer userdata); typedef void (*tp_conn_iface_presence_get_presence_reply) (DBusGProxy *prox y, GHashTable *OUT_presence, GError *error, gpointer userdata);
static void static void
tp_conn_iface_presence_get_presence_async_callback (DBusGProxy *proxy, DBus GProxyCall *call, void *user_data) tp_conn_iface_presence_get_presence_async_callback (DBusGProxy *proxy, DBus GProxyCall *call, void *user_data)
{ {
DBusGAsyncData *data = (DBusGAsyncData*) user_data; DBusGAsyncData *data = (DBusGAsyncData*) user_data;
GError *error = NULL; GError *error = NULL;
GHashTable* OUT_arg1; GHashTable* OUT_presence;
dbus_g_proxy_end_call (proxy, call, &error, dbus_g_type_get_map ("GHashTa dbus_g_proxy_end_call (proxy, call, &error, dbus_g_type_get_map ("GHashTa
ble", G_TYPE_UINT, dbus_g_type_get_struct ("GValueArray", G_TYPE_UINT, dbus ble", G_TYPE_UINT, dbus_g_type_get_struct ("GValueArray", G_TYPE_UINT, dbus
_g_type_get_map ("GHashTable", G_TYPE_STRING, dbus_g_type_get_map ("GHashTa _g_type_get_map ("GHashTable", G_TYPE_STRING, dbus_g_type_get_map ("GHashTa
ble", G_TYPE_STRING, G_TYPE_VALUE)), G_TYPE_INVALID)), &OUT_arg1, G_TYPE_IN ble", G_TYPE_STRING, G_TYPE_VALUE)), G_TYPE_INVALID)), &OUT_presence, G_TYP
VALID); E_INVALID);
(*(tp_conn_iface_presence_get_presence_reply)data->cb) (proxy, OUT_arg1, (*(tp_conn_iface_presence_get_presence_reply)data->cb) (proxy, OUT_presen
error, data->userdata); ce, error, data->userdata);
return; return;
} }
static static
#ifdef G_HAVE_INLINE #ifdef G_HAVE_INLINE
inline inline
#endif #endif
DBusGProxyCall* DBusGProxyCall*
tp_conn_iface_presence_get_presence_async (DBusGProxy *proxy, const GArray* IN_contacts, tp_conn_iface_presence_get_presence_reply callback, gpointer userdata) tp_conn_iface_presence_get_presence_async (DBusGProxy *proxy, const GArray* IN_contacts, tp_conn_iface_presence_get_presence_reply callback, gpointer userdata)
 End of changes. 4 change blocks. 
11 lines changed or deleted 11 lines changed or added


 tp-constants.h   tp-constants.h 
/* /*
* tp-constants.h - constants used in telepathy * tp-constants.h - constants used in telepathy
* Copyright (C) 2005 Collabora Ltd. * Copyright (C) 2005, 2007 Collabora Ltd.
* Copyright (C) 2005 Nokia Corporation * Copyright (C) 2005, 2007 Nokia Corporation
* *
* 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.
* *
* This library is distributed in the hope that it will be useful, * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details. * Lesser General Public License for more details.
skipping to change at line 27 skipping to change at line 27
* License along with this library; if not, write to the Free Software * License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
*/ */
#ifndef __TELEPATHY_CONSTANTS_H__ #ifndef __TELEPATHY_CONSTANTS_H__
#define __TELEPATHY_CONSTANTS_H__ #define __TELEPATHY_CONSTANTS_H__
#include <glib.h> #include <glib.h>
G_BEGIN_DECLS G_BEGIN_DECLS
typedef enum { #include <libtelepathy/_gen-tp-constants.h>
TP_CONN_ALIAS_FLAG_USER_SET = 1,
LAST_TP_CONN_ALIAS_FLAG
} ConnectionAliasFlags;
typedef enum {
TP_CONN_CAPABILITY_TYPE_CREATE = 0,
TP_CONN_CAPABILITY_TYPE_INVITE = 1,
LAST_TP_CONN_CAPABILITY_TYPE
} TelepathyConnectionCapabilityType;
typedef enum {
TP_CONN_HANDLE_TYPE_NONE = 0,
TP_CONN_HANDLE_TYPE_CONTACT = 1,
TP_CONN_HANDLE_TYPE_ROOM = 2,
TP_CONN_HANDLE_TYPE_LIST = 3,
TP_CONN_HANDLE_TYPE_GROUP = 4,
LAST_TP_CONN_HANDLE_TYPE
} TelepathyConnectionHandleType;
typedef enum {
TP_CONN_PRESENCE_TYPE_UNSET = 0,
TP_CONN_PRESENCE_TYPE_OFFLINE = 1,
TP_CONN_PRESENCE_TYPE_AVAILABLE = 2,
TP_CONN_PRESENCE_TYPE_AWAY = 3,
TP_CONN_PRESENCE_TYPE_EXTENDED_AWAY = 4,
TP_CONN_PRESENCE_TYPE_HIDDEN = 5,
LAST_TP_CONN_PRESENCE_TYPE
} TelepathyConnectionPresenceType;
typedef enum {
TP_CONN_STATUS_CONNECTED = 0,
TP_CONN_STATUS_CONNECTING = 1,
TP_CONN_STATUS_DISCONNECTED = 2,
LAST_TP_CONN_STATUS
} TelepathyConnectionStatus;
typedef enum {
TP_CONN_STATUS_REASON_NONE_SPECIFIED = 0,
TP_CONN_STATUS_REASON_REQUESTED = 1,
TP_CONN_STATUS_REASON_NETWORK_ERROR = 2,
TP_CONN_STATUS_REASON_AUTHENTICATION_FAILED = 3,
TP_CONN_STATUS_REASON_ENCRYPTION_ERROR = 4,
TP_CONN_STATUS_REASON_NAME_IN_USE = 5,
TP_CONN_STATUS_REASON_CERT_NOT_PROVIDED = 6,
TP_CONN_STATUS_REASON_CERT_UNTRUSTED = 7,
TP_CONN_STATUS_REASON_CERT_EXPIRED = 8,
TP_CONN_STATUS_REASON_CERT_NOT_ACTIVATED = 9,
TP_CONN_STATUS_REASON_CERT_HOSTNAME_MISMATCH = 10,
TP_CONN_STATUS_REASON_CERT_FINGERPRINT_MISMATCH = 11,
TP_CONN_STATUS_REASON_CERT_SELF_SIGNED = 12,
TP_CONN_STATUS_REASON_CERT_OTHER_ERROR = 13,
LAST_TP_CONN_STATUS_REASON
} TelepathyConnectionStatusReason;
typedef enum {
TP_CHANNEL_CONTACT_SEARCH_STATE_BEFORE = 0,
TP_CHANNEL_CONTACT_SEARCH_STATE_DURING = 1,
TP_CHANNEL_CONTACT_SEARCH_STATE_AFTER = 2,
LAST_TP_CHANNEL_CONTACT_SEARCH_STATE
} TelepathyChannelContactSearchState;
typedef enum {
TP_CHANNEL_TEXT_MESSAGE_TYPE_NORMAL = 0,
TP_CHANNEL_TEXT_MESSAGE_TYPE_ACTION = 1,
TP_CHANNEL_TEXT_MESSAGE_TYPE_NOTICE = 2,
TP_CHANNEL_TEXT_MESSAGE_TYPE_AUTO_REPLY = 3,
LAST_TP_CHANNEL_TEXT_MESSAGE_TYPE
} TelepathyChannelTextMessageType;
typedef enum {
TP_CHANNEL_TEXT_MESSAGE_FLAG_TRUNCATED = 1,
LAST_TP_CHANNEL_TEXT_MESSAGE_FLAG
} TelepathyChannelTextMessageFlag;
typedef enum { /* Fixup for bits of libtelepathy that didn't follow convention */
TP_CHANNEL_TEXT_SEND_ERROR_UNKNOWN = 0,
TP_CHANNEL_TEXT_SEND_ERROR_OFFLINE = 1,
TP_CHANNEL_TEXT_SEND_ERROR_INVALID_CONTACT = 2,
TP_CHANNEL_TEXT_SEND_ERROR_PERMISSION_DENIED = 3,
TP_CHANNEL_TEXT_SEND_ERROR_TOO_LONG = 4,
LAST_TP_CHANNEL_TEXT_SEND_ERROR
} TelepathyChannelTextSendError;
typedef enum { /* Namespace pollution, but needed for compatibility */
TP_CHANNEL_GROUP_FLAG_CAN_ADD = 1, #define ConnectionAliasFlags TelepathyConnectionAliasFlags
TP_CHANNEL_GROUP_FLAG_CAN_REMOVE = 2,
TP_CHANNEL_GROUP_FLAG_CAN_RESCIND = 4,
TP_CHANNEL_GROUP_FLAG_MESSAGE_ADD = 8,
TP_CHANNEL_GROUP_FLAG_MESSAGE_REMOVE = 16,
TP_CHANNEL_GROUP_FLAG_MESSAGE_ACCEPT = 32,
TP_CHANNEL_GROUP_FLAG_MESSAGE_REJECT = 64,
TP_CHANNEL_GROUP_FLAG_MESSAGE_RESCIND = 128,
TP_CHANNEL_GROUP_FLAG_CHANNEL_SPECIFIC_HANDLES = 256,
LAST_TP_CHANNEL_GROUP_FLAG
} TelepathyChannelGroupFlags;
typedef enum { /* Connection_Capability_Flags used to be Connection_Capability_Type */
TP_CHANNEL_GROUP_CHANGE_REASON_NONE = 0, #define TP_CONN_CAPABILITY_TYPE_CREATE TP_CONN_CAPABILITY_FLAG_CREATE
TP_CHANNEL_GROUP_CHANGE_REASON_OFFLINE = 1, #define TP_CONN_CAPABILITY_TYPE_INVITE TP_CONN_CAPABILITY_FLAG_INVITE
TP_CHANNEL_GROUP_CHANGE_REASON_KICKED = 2, #define LAST_TP_CONN_CAPABILITY_TYPE LAST_TP_CONN_CAPABILITY_FLAG
TP_CHANNEL_GROUP_CHANGE_REASON_BUSY = 3, #define TelepathyConnectionCapabilityType TelepathyConnectionCapabilityFlag
TP_CHANNEL_GROUP_CHANGE_REASON_INVITED = 4, s
TP_CHANNEL_GROUP_CHANGE_REASON_BANNED = 5,
LAST_TP_CHANNEL_GROUP_CHANGE_REASON
} TelepathyChannelGroupChangeReason;
typedef enum { /* Unconventional singular names for flag-set type */
TP_CHANNEL_HOLD_STATE_NONE = 0, #define TelepathyChannelTextMessageFlag TelepathyChannelTextMessageFlags
TP_CHANNEL_HOLD_STATE_SEND_ONLY = 1, #define TelepathyChannelMediaCapability TelepathyChannelMediaCapabilities
TP_CHANNEL_HOLD_STATE_RECV_ONLY = 2,
TP_CHANNEL_HOLD_STATE_BOTH = 3,
LAST_TP_CHANNEL_HOLD_STATE
} TelepathyChannelHoldState;
typedef enum { /* API compatibility (these used to be in the spec, but not any more) */
TP_CHANNEL_PASSWORD_FLAG_REQUIRED = 1, #define TP_CHANNEL_PASSWORD_FLAG_REQUIRED ((TelepathyChannelPasswordFlags)1
TP_CHANNEL_PASSWORD_FLAG_VISIBLE = 2, )
TP_CHANNEL_PASSWORD_FLAG_MODIFIABLE = 4, #define TP_CHANNEL_PASSWORD_FLAG_VISIBLE ((TelepathyChannelPasswordFlags)2)
TP_CHANNEL_PASSWORD_FLAG_PROVIDE = 8, #define TP_CHANNEL_PASSWORD_FLAG_MODIFIABLE ((TelepathyChannelPasswordFlags
LAST_TP_CHANNEL_PASSWORD_FLAG )4)
} TelepathyChannelPasswordFlags;
/* This enum isn't in the spec at all any more; kept for source compat */
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 { /* This type has been renamed in the spec to reflect its purpose */
TP_CHANNEL_MEDIA_CAPABILITY_AUDIO = 1, #define TelepathyMediaStreamPending TelepathyMediaStreamPendingSend
TP_CHANNEL_MEDIA_CAPABILITY_VIDEO = 2
} TelepathyChannelMediaCapability;
typedef enum {
TP_MEDIA_STREAM_TYPE_AUDIO = 0,
TP_MEDIA_STREAM_TYPE_VIDEO = 1,
LAST_TP_MEDIA_STREAM_TYPE
} TelepathyMediaStreamType;
typedef enum {
TP_MEDIA_STREAM_DIRECTION_NONE = 0,
TP_MEDIA_STREAM_DIRECTION_SEND = 1,
TP_MEDIA_STREAM_DIRECTION_RECIEVE = 2,
TP_MEDIA_STREAM_DIRECTION_BIDIRECTIONAL = 3,
LAST_TP_MEDIA_STREAM_DIRECTION
} TelepathyMediaStreamDirection;
typedef enum {
TP_MEDIA_STREAM_PENDING_LOCAL_SEND = 1,
TP_MEDIA_STREAM_PENDING_REMOTE_SEND = 2
} TelepathyMediaStreamPending;
typedef enum {
TP_MEDIA_STREAM_ERROR_UNKNOWN = 0,
TP_MEDIA_STREAM_ERROR_EOS = 1,
LAST_TP_MEDIA_STREAM_ERROR
} TelepathyMediaStreamError;
typedef enum {
TP_MEDIA_STREAM_PROTO_UDP = 0,
TP_MEDIA_STREAM_PROTO_TCP = 1,
LAST_TP_MEDIA_STREAM_PROTO
} TelepathyMediaStreamProto;
typedef enum {
TP_MEDIA_STREAM_TRANSPORT_TYPE_LOCAL = 0,
TP_MEDIA_STREAM_TRANSPORT_TYPE_DERIVED = 1,
TP_MEDIA_STREAM_TRANSPORT_TYPE_RELAY = 2,
LAST_TP_MEDIA_STREAM_TRANSPORT_TYPE
} TelepathyMediaStreamTransportType;
typedef enum {
TP_CODEC_MEDIA_TYPE_AUDIO = 0,
TP_CODEC_MEDIA_TYPE_VIDEO = 1,
} TelepathyCodecMediaType;
typedef enum {
TP_MEDIA_STREAM_STATE_DISCONNECTED = 0,
TP_MEDIA_STREAM_STATE_CONNECTING = 1,
TP_MEDIA_STREAM_STATE_CONNECTED = 2
} TelepathyMediaStreamState;
typedef enum { /* This type has been renamed in the spec */
TP_PROPERTY_FLAG_READ = 1, #define TP_MEDIA_STREAM_PROTO_UDP TP_MEDIA_STREAM_BASE_PROTO_UDP
TP_PROPERTY_FLAG_WRITE = 2 #define TP_MEDIA_STREAM_PROTO_TCP TP_MEDIA_STREAM_BASE_PROTO_TCP
} TelepathyPropertyFlags; #define LAST_TP_MEDIA_STREAM_PROTO LAST_TP_MEDIA_STREAM_BASE_PROTO
#define TelepathyMediaStreamProto TelepathyMediaStreamBaseProto
typedef enum { /* This naming just isn't in the spec, perhaps it used to be... */
TP_CHANNEL_CHAT_STATE_GONE = 0, #define TP_CODEC_MEDIA_TYPE_AUDIO TP_MEDIA_STREAM_TYPE_AUDIO
TP_CHANNEL_CHAT_STATE_INACTIVE = 1, #define TP_CODEC_MEDIA_TYPE_VIDEO TP_MEDIA_STREAM_TYPE_VIDEO
TP_CHANNEL_CHAT_STATE_ACTIVE = 2, #define LAST_TP_CODEC_MEDIA_TYPE LAST_TP_MEDIA_STREAM_TYPE
TP_CHANNEL_CHAT_STATE_PAUSED = 3, #define TelepathyCodecMediaType TelepathyMediaStreamType
TP_CHANNEL_CHAT_STATE_COMPOSING = 4,
} TelepathyChannelChatState;
G_END_DECLS G_END_DECLS
#endif #endif
 End of changes. 12 change blocks. 
186 lines changed or deleted 37 lines changed or added


 tp-interfaces.h   tp-interfaces.h 
skipping to change at line 28 skipping to change at line 28
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
*/ */
#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 \ #include <libtelepathy/_gen-tp-interfaces.h>
"org.freedesktop.Telepathy.Channel"
#define TP_IFACE_CHANNEL_INTERFACE_CHAT_STATE \ /* Names that don't quite follow convention */
"org.freedesktop.Telepathy.Channel.Interface.ChatState" #define TP_IFACE_CHANNEL_INTERFACE TP_IFACE_CHANNEL
#define TP_IFACE_CHANNEL_INTERFACE_DTMF \ #define TP_IFACE_CONN_INTERFACE TP_IFACE_CONN
"org.freedesktop.Telepathy.Channel.Interface.DTMF" #define TP_IFACE_CONN_MGR_INTERFACE TP_IFACE_CONN_MANAGER
#define TP_IFACE_CHANNEL_INTERFACE_GROUP \ #define TP_IFACE_PROPERTIES TP_IFACE_PROPERTIES_INTERFACE
"org.freedesktop.Telepathy.Channel.Interface.Group"
#define TP_IFACE_CHANNEL_INTERFACE_HOLD \ /* Obsolete and omitted from the spec, but kept for source compat */
"org.freedesktop.Telepathy.Channel.Interface.Hold"
#define TP_IFACE_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 \
"org.freedesktop.Telepathy.Channel.Interface.Transfer"
#define TP_IFACE_CHANNEL_INTERFACE_MEDIA_SIGNALLING \
"org.freedesktop.Telepathy.Channel.Interface.MediaSignalling"
#define TP_IFACE_CHANNEL_TYPE_CONTACT_LIST \
"org.freedesktop.Telepathy.Channel.Type.ContactList"
#if 0
#define TP_IFACE_CHANNEL_TYPE_CONTACT_SEARCH \
"org.freedesktop.Telepathy.Channel.Type.ContactSearch"
#endif
#define TP_IFACE_CHANNEL_TYPE_ROOM_LIST \
"org.freedesktop.Telepathy.Channel.Type.RoomList"
#define TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA \
"org.freedesktop.Telepathy.Channel.Type.StreamedMedia"
#define TP_IFACE_CHANNEL_TYPE_TEXT \
"org.freedesktop.Telepathy.Channel.Type.Text"
#define TP_IFACE_CONN_INTERFACE \
"org.freedesktop.Telepathy.Connection"
#define TP_IFACE_CONN_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 \
"org.freedesktop.Telepathy.Connection.Interface.Capabilities"
#define TP_IFACE_CONN_INTERFACE_CONTACT_INFO \
"org.freedesktop.Telepathy.Connection.Interface.ContactInfo"
#define TP_IFACE_CONN_INTERFACE_FORWARDING \
"org.freedesktop.Telepathy.Connection.Interface.Forwarding"
#define TP_IFACE_CONN_INTERFACE_PRESENCE \
"org.freedesktop.Telepathy.Connection.Interface.Presence"
#define TP_IFACE_CONN_INTERFACE_PRIVACY \
"org.freedesktop.Telepathy.Connection.Interface.Privacy"
#define TP_IFACE_CONN_INTERFACE_RENAMING \
"org.freedesktop.Telepathy.Connection.Interface.Renaming"
#define TP_IFACE_CONN_MGR_INTERFACE \
"org.freedesktop.Telepathy.ConnectionManager"
#define TP_IFACE_MEDIA_SESSION_HANDLER \
"org.freedesktop.Telepathy.Media.SessionHandler"
#define TP_IFACE_MEDIA_STREAM_HANDLER \
"org.freedesktop.Telepathy.Media.StreamHandler"
#define TP_IFACE_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. 
55 lines changed or deleted 9 lines changed or added


 tp-media-stream-handler-gen.h   tp-media-stream-handler-gen.h 
skipping to change at line 251 skipping to change at line 251
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, "Ready", tp_media_stream_handler_r eady_async_callback, stuff, _dbus_glib_async_data_free, dbus_g_type_get_col lection ("GPtrArray", dbus_g_type_get_struct ("GValueArray", G_TYPE_UINT, G _TYPE_STRING, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT, dbus_g_type_get_map (" GHashTable", G_TYPE_STRING, G_TYPE_STRING), G_TYPE_INVALID)), IN_codecs, G_ TYPE_INVALID); return dbus_g_proxy_begin_call (proxy, "Ready", tp_media_stream_handler_r eady_async_callback, stuff, _dbus_glib_async_data_free, dbus_g_type_get_col lection ("GPtrArray", dbus_g_type_get_struct ("GValueArray", G_TYPE_UINT, G _TYPE_STRING, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT, dbus_g_type_get_map (" GHashTable", G_TYPE_STRING, G_TYPE_STRING), G_TYPE_INVALID)), IN_codecs, G_ TYPE_INVALID);
} }
static static
#ifdef G_HAVE_INLINE #ifdef G_HAVE_INLINE
inline inline
#endif #endif
gboolean gboolean
tp_media_stream_handler_set_local_codecs (DBusGProxy *proxy, const GPtrArra
y* IN_codecs, GError **error)
{
return dbus_g_proxy_call (proxy, "SetLocalCodecs", error, dbus_g_type_get
_collection ("GPtrArray", dbus_g_type_get_struct ("GValueArray", G_TYPE_UIN
T, G_TYPE_STRING, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT, dbus_g_type_get_ma
p ("GHashTable", G_TYPE_STRING, G_TYPE_STRING), G_TYPE_INVALID)), IN_codecs
, G_TYPE_INVALID, G_TYPE_INVALID);
}
typedef void (*tp_media_stream_handler_set_local_codecs_reply) (DBusGProxy
*proxy, GError *error, gpointer userdata);
static void
tp_media_stream_handler_set_local_codecs_async_callback (DBusGProxy *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_media_stream_handler_set_local_codecs_reply)data->cb) (proxy, error
, data->userdata);
return;
}
static
#ifdef G_HAVE_INLINE
inline
#endif
DBusGProxyCall*
tp_media_stream_handler_set_local_codecs_async (DBusGProxy *proxy, const GP
trArray* IN_codecs, tp_media_stream_handler_set_local_codecs_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, "SetLocalCodecs", tp_media_stream_
handler_set_local_codecs_async_callback, stuff, _dbus_glib_async_data_free,
dbus_g_type_get_collection ("GPtrArray", dbus_g_type_get_struct ("GValueAr
ray", G_TYPE_UINT, G_TYPE_STRING, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT, db
us_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_STRING), G_TYPE_INVA
LID)), IN_codecs, G_TYPE_INVALID);
}
static
#ifdef G_HAVE_INLINE
inline
#endif
gboolean
tp_media_stream_handler_stream_state (DBusGProxy *proxy, const guint IN_sta te, GError **error) tp_media_stream_handler_stream_state (DBusGProxy *proxy, const guint IN_sta te, GError **error)
{ {
return dbus_g_proxy_call (proxy, "StreamState", error, G_TYPE_UINT, IN_st ate, G_TYPE_INVALID, G_TYPE_INVALID); return dbus_g_proxy_call (proxy, "StreamState", error, G_TYPE_UINT, IN_st ate, G_TYPE_INVALID, G_TYPE_INVALID);
} }
typedef void (*tp_media_stream_handler_stream_state_reply) (DBusGProxy *pro xy, GError *error, gpointer userdata); typedef void (*tp_media_stream_handler_stream_state_reply) (DBusGProxy *pro xy, GError *error, gpointer userdata);
static void static void
tp_media_stream_handler_stream_state_async_callback (DBusGProxy *proxy, DBu sGProxyCall *call, void *user_data) tp_media_stream_handler_stream_state_async_callback (DBusGProxy *proxy, DBu sGProxyCall *call, void *user_data)
 End of changes. 1 change blocks. 
0 lines changed or deleted 52 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/