_gen-tp-constants.h   _gen-tp-constants.h 
/* Generated from the Telepathy spec, version 0.16.0 /* Generated from Telepathy D-Bus Interface Specification, version 0.16.0
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.
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
Library General Public License for more details. Library General Public License for more details.
You should have received a copy of the GNU Lesser General Public You should have received a copy of the GNU Lesser General Public
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 Street, Fifth Floor, Boston, MA 02110-1301, U SA. Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, U SA.
*/ */
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/* TpConnMgrParamFlags (bitfield/set of flags, 0 for none) */ /**
* TpConnMgrParamFlags:
* @TP_CONN_MGR_PARAM_FLAG_REQUIRED: <![CDATA[ This parameter is
required for connecting to the server. ]]>
* @TP_CONN_MGR_PARAM_FLAG_REGISTER: <![CDATA[ This parameter is
required for registering an account on the server. ]]>
* @TP_CONN_MGR_PARAM_FLAG_HAS_DEFAULT: <![CDATA[ This parameter
has a default value, which is returned in GetParameters; not prov
iding this parameter is equivalent to providing the default.
]]>
*
* Bitfield/set of flags generated from the Telepathy specification.
*/
typedef enum { typedef enum {
TP_CONN_MGR_PARAM_FLAG_REQUIRED = 1, TP_CONN_MGR_PARAM_FLAG_REQUIRED = 1,
TP_CONN_MGR_PARAM_FLAG_REGISTER = 2, TP_CONN_MGR_PARAM_FLAG_REGISTER = 2,
TP_CONN_MGR_PARAM_FLAG_HAS_DEFAULT = 4, TP_CONN_MGR_PARAM_FLAG_HAS_DEFAULT = 4,
#ifndef LIBTELEPATHY_DISABLE_DEPRECATED } TpConnMgrParamFlags;
LAST_TP_CONN_MGR_PARAM_FLAG = 4 + 1
#endif
} TelepathyConnMgrParamFlags;
/* TpHandleType (enum) */
/**
* TpHandleType:
* @TP_HANDLE_TYPE_NONE: <![CDATA[ A "null" handle type used to i
ndicate the absence of a handle. When a handle type and a handle
appear as a pair, if the handle type is zero, the handle must als
o be zero. ]]>
* @TP_HANDLE_TYPE_CONTACT: <![CDATA[ A contact ]]>
* @TP_HANDLE_TYPE_ROOM: <![CDATA[ A chat room ]]>
* @TP_HANDLE_TYPE_LIST: <![CDATA[ A server-generated contact lis
t (see Channel.Interface.Group) ]]>
* @TP_HANDLE_TYPE_GROUP: <![CDATA[ A user-defined contact list (
see Channel.Interface.Group) ]]>
*
* Enumeration generated from the Telepathy specification.
*/
typedef enum { typedef enum {
TP_HANDLE_TYPE_NONE = 0, TP_HANDLE_TYPE_NONE = 0,
TP_HANDLE_TYPE_CONTACT = 1, TP_HANDLE_TYPE_CONTACT = 1,
TP_HANDLE_TYPE_ROOM = 2, TP_HANDLE_TYPE_ROOM = 2,
TP_HANDLE_TYPE_LIST = 3, TP_HANDLE_TYPE_LIST = 3,
TP_HANDLE_TYPE_GROUP = 4, TP_HANDLE_TYPE_GROUP = 4,
NUM_TP_HANDLE_TYPES } TpHandleType;
} TelepathyHandleType;
#ifndef LIBTELEPATHY_DISABLE_DEPRECATED
#define LAST_TP_HANDLE_TYPE NUM_TP_HANDLE_TYPES
#endif
/* TpConnectionStatus (enum) */
typedef enum {
TP_CONN_STATUS_CONNECTED = 0,
TP_CONN_STATUS_CONNECTING = 1,
TP_CONN_STATUS_DISCONNECTED = 2,
NUM_TP_CONN_STATUSES
} TelepathyConnectionStatus;
#ifndef LIBTELEPATHY_DISABLE_DEPRECATED
#define LAST_TP_CONN_STATUS NUM_TP_CONN_STATUSES
#endif
/* TpConnectionStatusReason (enum) */ /**
* NUM_TP_HANDLE_TYPES:
*
* 1 higher than the highest valid value of #TpHandleType.
*/
#define NUM_TP_HANDLE_TYPES (4+1)
/**
* TpConnectionStatus:
* @TP_CONNECTION_STATUS_CONNECTED: <![CDATA[ The connection is
alive and all methods are available. ]]>
* @TP_CONNECTION_STATUS_CONNECTING: <![CDATA[ The connection h
as not yet been established, or has been severed and reconnecti
on is being attempted. Some methods may fail until the connecti
on has been established. ]]>
* @TP_CONNECTION_STATUS_DISCONNECTED: <![CDATA[ The connection
has been severed and no method calls are valid. The object may
be removed from the bus at any time. ]]>
*
* Enumeration generated from the Telepathy specification.
*/
typedef enum { typedef enum {
TP_CONN_STATUS_REASON_NONE_SPECIFIED = 0, TP_CONNECTION_STATUS_CONNECTED = 0,
TP_CONN_STATUS_REASON_REQUESTED = 1, TP_CONNECTION_STATUS_CONNECTING = 1,
TP_CONN_STATUS_REASON_NETWORK_ERROR = 2, TP_CONNECTION_STATUS_DISCONNECTED = 2,
TP_CONN_STATUS_REASON_AUTHENTICATION_FAILED = 3, } TpConnectionStatus;
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,
NUM_TP_CONN_STATUS_REASONS
} TelepathyConnectionStatusReason;
#ifndef LIBTELEPATHY_DISABLE_DEPRECATED
#define LAST_TP_CONN_STATUS_REASON NUM_TP_CONN_STATUS_REASONS
#endif
/* TpConnectionAliasFlags (bitfield/set of flags, 0 for none) */ /**
* NUM_TP_CONNECTION_STATUSES:
*
* 1 higher than the highest valid value of #TpConnectionStatus.
*/
#define NUM_TP_CONNECTION_STATUSES (2+1)
/**
* TpConnectionStatusReason:
* @TP_CONNECTION_STATUS_REASON_NONE_SPECIFIED: <![CDATA[ There
is no reason set for this state change. ]]>
* @TP_CONNECTION_STATUS_REASON_REQUESTED: <![CDATA[ The change
is in response to a user request. ]]>
* @TP_CONNECTION_STATUS_REASON_NETWORK_ERROR: <![CDATA[ There
was an error sending or receiving on the network socket. ]]>
* @TP_CONNECTION_STATUS_REASON_AUTHENTICATION_FAILED: <![CDATA[
The username or password was invalid. ]]>
* @TP_CONNECTION_STATUS_REASON_ENCRYPTION_ERROR: <![CDATA[ The
re was an error negotiating SSL on this connection, or encrypti
on was unavailable and require-encryption was set when the conn
ection was created. ]]>
* @TP_CONNECTION_STATUS_REASON_NAME_IN_USE: <![CDATA[ Someone
is already connected to the server using the name you are tryin
g to connect with. ]]>
* @TP_CONNECTION_STATUS_REASON_CERT_NOT_PROVIDED: <![CDATA[ Th
e server did not provide a SSL certificate. ]]>
* @TP_CONNECTION_STATUS_REASON_CERT_UNTRUSTED: <![CDATA[ The s
erver's SSL certificate could not be trusted. ]]>
* @TP_CONNECTION_STATUS_REASON_CERT_EXPIRED: <![CDATA[ The ser
ver's SSL certificate has expired. ]]>
* @TP_CONNECTION_STATUS_REASON_CERT_NOT_ACTIVATED: <![CDATA[ T
he server's SSL certificate is not yet valid. ]]>
* @TP_CONNECTION_STATUS_REASON_CERT_HOSTNAME_MISMATCH: <![CDATA[
The server's SSL certificate did not match its hostname. ]]>
* @TP_CONNECTION_STATUS_REASON_CERT_FINGERPRINT_MISMATCH: <![CDATA[
The server's SSL certificate does not have the expected f
ingerprint. ]]>
* @TP_CONNECTION_STATUS_REASON_CERT_SELF_SIGNED: <![CDATA[ The
server's SSL certificate is self-signed. ]]>
* @TP_CONNECTION_STATUS_REASON_CERT_OTHER_ERROR: <![CDATA[ The
re was some other error validating the server's SSL certificate. ]]
>
*
* Enumeration generated from the Telepathy specification.
*/
typedef enum { typedef enum {
TP_CONN_ALIAS_FLAG_USER_SET = 1, TP_CONNECTION_STATUS_REASON_NONE_SPECIFIED = 0,
#ifndef LIBTELEPATHY_DISABLE_DEPRECATED TP_CONNECTION_STATUS_REASON_REQUESTED = 1,
LAST_TP_CONN_ALIAS_FLAG = 1 + 1 TP_CONNECTION_STATUS_REASON_NETWORK_ERROR = 2,
#endif TP_CONNECTION_STATUS_REASON_AUTHENTICATION_FAILED = 3,
} TelepathyConnectionAliasFlags; TP_CONNECTION_STATUS_REASON_ENCRYPTION_ERROR = 4,
TP_CONNECTION_STATUS_REASON_NAME_IN_USE = 5,
TP_CONNECTION_STATUS_REASON_CERT_NOT_PROVIDED = 6,
TP_CONNECTION_STATUS_REASON_CERT_UNTRUSTED = 7,
TP_CONNECTION_STATUS_REASON_CERT_EXPIRED = 8,
TP_CONNECTION_STATUS_REASON_CERT_NOT_ACTIVATED = 9,
TP_CONNECTION_STATUS_REASON_CERT_HOSTNAME_MISMATCH = 10,
TP_CONNECTION_STATUS_REASON_CERT_FINGERPRINT_MISMATCH = 11,
TP_CONNECTION_STATUS_REASON_CERT_SELF_SIGNED = 12,
TP_CONNECTION_STATUS_REASON_CERT_OTHER_ERROR = 13,
} TpConnectionStatusReason;
/* TpConnectionCapabilityFlags (bitfield/set of flags, 0 for none) */ /**
* NUM_TP_CONNECTION_STATUS_REASONS:
*
* 1 higher than the highest valid value of #TpConnectionStatusReason.
*/
#define NUM_TP_CONNECTION_STATUS_REASONS (13+1)
/**
* TpConnectionAliasFlags:
* @TP_CONNECTION_ALIAS_FLAG_USER_SET: <![CDATA[ The aliases of c
ontacts on this connection may be changed by the user of the se
rvice, not just by the contacts themselves. This is the case on
Jabber, for instance. It is possible that aliases can be changed
by the contacts too - which alias takes precedence is not defi
ned by this specification, and depends on the server and/or con
nection manager implementation. This flag only applie
s to the aliases of "globally valid" contact handles. At this t
ime, clients should not expect to be able to change the aliases
corresponding to any channel-specific handles. If this becomes
possible in future, a new flag will be defined. ]]>
*
* Bitfield/set of flags generated from the Telepathy specification.
*/
typedef enum { typedef enum {
TP_CONN_CAPABILITY_FLAG_CREATE = 1, TP_CONNECTION_ALIAS_FLAG_USER_SET = 1,
TP_CONN_CAPABILITY_FLAG_INVITE = 2, } TpConnectionAliasFlags;
#ifndef LIBTELEPATHY_DISABLE_DEPRECATED
LAST_TP_CONN_CAPABILITY_FLAG = 2 + 1
#endif
} TelepathyConnectionCapabilityFlags;
/* TpConnectionPresenceType (enum) */
/**
* TpConnectionCapabilityFlags:
* @TP_CONNECTION_CAPABILITY_FLAG_CREATE: <![CDATA[ The given chann
el type and handle can be given to RequestChannel to create a new c
hannel of this type. ]]>
* @TP_CONNECTION_CAPABILITY_FLAG_INVITE: <![CDATA[ The given conta
ct can be invited to an existing channel of this type. ]]>
*
* Bitfield/set of flags generated from the Telepathy specification.
*/
typedef enum { typedef enum {
TP_CONN_PRESENCE_TYPE_UNSET = 0, TP_CONNECTION_CAPABILITY_FLAG_CREATE = 1,
TP_CONN_PRESENCE_TYPE_OFFLINE = 1, TP_CONNECTION_CAPABILITY_FLAG_INVITE = 2,
TP_CONN_PRESENCE_TYPE_AVAILABLE = 2, } TpConnectionCapabilityFlags;
TP_CONN_PRESENCE_TYPE_AWAY = 3,
TP_CONN_PRESENCE_TYPE_EXTENDED_AWAY = 4,
TP_CONN_PRESENCE_TYPE_HIDDEN = 5,
NUM_TP_CONN_PRESENCE_TYPES
} TelepathyConnectionPresenceType;
#ifndef LIBTELEPATHY_DISABLE_DEPRECATED
#define LAST_TP_CONN_PRESENCE_TYPE NUM_TP_CONN_PRESENCE_TYPES
#endif
/* TpChannelContactSearchState (enum) */
/**
* TpConnectionPresenceType:
* @TP_CONNECTION_PRESENCE_TYPE_UNSET: <![CDATA[ An invalid prese
nce type used as a null value ]]>
* @TP_CONNECTION_PRESENCE_TYPE_OFFLINE: <![CDATA[ Offline
]]>
* @TP_CONNECTION_PRESENCE_TYPE_AVAILABLE: <![CDATA[ Available
]]>
* @TP_CONNECTION_PRESENCE_TYPE_AWAY: <![CDATA[ Away ]]>
* @TP_CONNECTION_PRESENCE_TYPE_EXTENDED_AWAY: <![CDATA[ Away for
an extended time ]]>
* @TP_CONNECTION_PRESENCE_TYPE_HIDDEN: <![CDATA[ Hidden (invisib
le) ]]>
*
* Enumeration generated from the Telepathy specification.
*/
typedef enum { typedef enum {
TP_CHANNEL_CONTACT_SEARCH_STATE_BEFORE = 0, TP_CONNECTION_PRESENCE_TYPE_UNSET = 0,
TP_CHANNEL_CONTACT_SEARCH_STATE_DURING = 1, TP_CONNECTION_PRESENCE_TYPE_OFFLINE = 1,
TP_CHANNEL_CONTACT_SEARCH_STATE_AFTER = 2, TP_CONNECTION_PRESENCE_TYPE_AVAILABLE = 2,
NUM_TP_CHANNEL_CONTACT_SEARCH_STATES TP_CONNECTION_PRESENCE_TYPE_AWAY = 3,
} TelepathyChannelContactSearchState; TP_CONNECTION_PRESENCE_TYPE_EXTENDED_AWAY = 4,
#ifndef LIBTELEPATHY_DISABLE_DEPRECATED TP_CONNECTION_PRESENCE_TYPE_HIDDEN = 5,
#define LAST_TP_CHANNEL_CONTACT_SEARCH_STATE NUM_TP_CHANNEL_CONTACT_SEARCH_ } TpConnectionPresenceType;
STATES
#endif
/* TpMediaStreamType (enum) */ /**
* NUM_TP_CONNECTION_PRESENCE_TYPES:
*
* 1 higher than the highest valid value of #TpConnectionPresenceType.
*/
#define NUM_TP_CONNECTION_PRESENCE_TYPES (5+1)
/**
* TpMediaStreamType:
* @TP_MEDIA_STREAM_TYPE_AUDIO: <![CDATA[An audio stream]]>
* @TP_MEDIA_STREAM_TYPE_VIDEO: <![CDATA[A video stream]]>
*
* Enumeration generated from the Telepathy specification.
*/
typedef enum { typedef enum {
TP_MEDIA_STREAM_TYPE_AUDIO = 0, TP_MEDIA_STREAM_TYPE_AUDIO = 0,
TP_MEDIA_STREAM_TYPE_VIDEO = 1, TP_MEDIA_STREAM_TYPE_VIDEO = 1,
NUM_TP_MEDIA_STREAM_TYPES } TpMediaStreamType;
} TelepathyMediaStreamType;
#ifndef LIBTELEPATHY_DISABLE_DEPRECATED
#define LAST_TP_MEDIA_STREAM_TYPE NUM_TP_MEDIA_STREAM_TYPES
#endif
/* TpMediaStreamState (enum) */ /**
* NUM_TP_MEDIA_STREAM_TYPES:
*
* 1 higher than the highest valid value of #TpMediaStreamType.
*/
#define NUM_TP_MEDIA_STREAM_TYPES (1+1)
/**
* TpMediaStreamState:
* @TP_MEDIA_STREAM_STATE_DISCONNECTED: <![CDATA[The stream is disconnected
.]]>
* @TP_MEDIA_STREAM_STATE_CONNECTING: <![CDATA[The stream is trying to conn
ect.]]>
* @TP_MEDIA_STREAM_STATE_CONNECTED: <![CDATA[The stream is connected.]]>
*
* Enumeration generated from the Telepathy specification.
*/
typedef enum { typedef enum {
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,
NUM_TP_MEDIA_STREAM_STATES } TpMediaStreamState;
} TelepathyMediaStreamState;
#ifndef LIBTELEPATHY_DISABLE_DEPRECATED
#define LAST_TP_MEDIA_STREAM_STATE NUM_TP_MEDIA_STREAM_STATES
#endif
/* TpMediaStreamDirection (enum) */ /**
* NUM_TP_MEDIA_STREAM_STATES:
*
* 1 higher than the highest valid value of #TpMediaStreamState.
*/
#define NUM_TP_MEDIA_STREAM_STATES (2+1)
/**
* TpMediaStreamDirection:
* @TP_MEDIA_STREAM_DIRECTION_NONE: <![CDATA[Media are not being sent or re
ceived]]>
* @TP_MEDIA_STREAM_DIRECTION_SEND: <![CDATA[Media are being sent, but not
received]]>
* @TP_MEDIA_STREAM_DIRECTION_RECEIVE: <![CDATA[Media are being received, b
ut not sent]]>
* @TP_MEDIA_STREAM_DIRECTION_BIDIRECTIONAL: <![CDATA[Media are being sent
and received]]>
*
* Enumeration generated from the Telepathy specification.
*/
typedef enum { typedef enum {
TP_MEDIA_STREAM_DIRECTION_NONE = 0, TP_MEDIA_STREAM_DIRECTION_NONE = 0,
TP_MEDIA_STREAM_DIRECTION_SEND = 1, TP_MEDIA_STREAM_DIRECTION_SEND = 1,
TP_MEDIA_STREAM_DIRECTION_RECEIVE = 2, TP_MEDIA_STREAM_DIRECTION_RECEIVE = 2,
TP_MEDIA_STREAM_DIRECTION_BIDIRECTIONAL = 3, TP_MEDIA_STREAM_DIRECTION_BIDIRECTIONAL = 3,
NUM_TP_MEDIA_STREAM_DIRECTIONS } TpMediaStreamDirection;
} TelepathyMediaStreamDirection;
#ifndef LIBTELEPATHY_DISABLE_DEPRECATED
#define LAST_TP_MEDIA_STREAM_DIRECTION NUM_TP_MEDIA_STREAM_DIRECTIONS
#endif
/* TpMediaStreamPendingSend (bitfield/set of flags, 0 for none) */ /**
* NUM_TP_MEDIA_STREAM_DIRECTIONS:
*
* 1 higher than the highest valid value of #TpMediaStreamDirection.
*/
#define NUM_TP_MEDIA_STREAM_DIRECTIONS (3+1)
/**
* TpMediaStreamPendingSend:
* @TP_MEDIA_STREAM_PENDING_LOCAL_SEND: <![CDATA[ The local use
r has been asked to send media by the remote user. Call Request
StreamDirection to indicate whether or not this is acceptable.
]]>
* @TP_MEDIA_STREAM_PENDING_REMOTE_SEND: <![CDATA[ The remote u
ser has been asked to send media by the local user. The StreamD
irectionChanged signal will be emitted when the remote user acc
epts or rejects this change. ]]>
*
* Bitfield/set of flags generated from the Telepathy specification.
*/
typedef enum { typedef enum {
TP_MEDIA_STREAM_PENDING_LOCAL_SEND = 1, TP_MEDIA_STREAM_PENDING_LOCAL_SEND = 1,
TP_MEDIA_STREAM_PENDING_REMOTE_SEND = 2, TP_MEDIA_STREAM_PENDING_REMOTE_SEND = 2,
#ifndef LIBTELEPATHY_DISABLE_DEPRECATED } TpMediaStreamPendingSend;
LAST_TP_MEDIA_STREAM_PENDING = 2 + 1
#endif
} TelepathyMediaStreamPendingSend;
/* TpChannelMediaCapabilities (bitfield/set of flags, 0 for none) */ /**
/* * TpChannelMediaCapabilities:
The channel-type-specific capability flags used for * @TP_CHANNEL_MEDIA_CAPABILITY_AUDIO: <![CDATA[ The handle is ca
Channel.Type.StreamedMedia in the Connection.Interface.Capabilities pable of using audio streams within a media channel. ]]>
interface. * @TP_CHANNEL_MEDIA_CAPABILITY_VIDEO: <![CDATA[ The handle is ca
*/ pable of using video streams within a media channel. ]]>
* @TP_CHANNEL_MEDIA_CAPABILITY_NAT_TRAVERSAL_STUN: <![CDATA[ The
handle is capable of performing STUN to traverse NATs. ]]>
* @TP_CHANNEL_MEDIA_CAPABILITY_NAT_TRAVERSAL_GTALK_P2P: <![CDATA[
The handle is capable of establishing Google Talk peer-to-peer
connections (as implemented in libjingle 0.3) to traverse NATs. ]]>
*
* <![CDATA[ The channel-type-specific capability flags used for
Channel.Type.StreamedMedia in the Connection.Interface.Capabilities
interface. ]]>
*
* Bitfield/set of flags generated from the Telepathy specification.
*/
typedef enum { typedef enum {
TP_CHANNEL_MEDIA_CAPABILITY_AUDIO = 1, TP_CHANNEL_MEDIA_CAPABILITY_AUDIO = 1,
TP_CHANNEL_MEDIA_CAPABILITY_VIDEO = 2, TP_CHANNEL_MEDIA_CAPABILITY_VIDEO = 2,
TP_CHANNEL_MEDIA_CAPABILITY_NAT_TRAVERSAL_STUN = 4, TP_CHANNEL_MEDIA_CAPABILITY_NAT_TRAVERSAL_STUN = 4,
TP_CHANNEL_MEDIA_CAPABILITY_NAT_TRAVERSAL_GTALK_P2P = 8, TP_CHANNEL_MEDIA_CAPABILITY_NAT_TRAVERSAL_GTALK_P2P = 8,
#ifndef LIBTELEPATHY_DISABLE_DEPRECATED } TpChannelMediaCapabilities;
LAST_TP_CHANNEL_MEDIA_CAPABILITY = 8 + 1
#endif
} TelepathyChannelMediaCapabilities;
/* TpChannelTextSendError (enum) */
/**
* TpChannelTextSendError:
* @TP_CHANNEL_TEXT_SEND_ERROR_UNKNOWN: <![CDATA[ An unknown error
occurred ]]>
* @TP_CHANNEL_TEXT_SEND_ERROR_OFFLINE: <![CDATA[ The requested con
tact was offline ]]>
* @TP_CHANNEL_TEXT_SEND_ERROR_INVALID_CONTACT: <![CDATA[ The reque
sted contact is not valid ]]>
* @TP_CHANNEL_TEXT_SEND_ERROR_PERMISSION_DENIED: <![CDATA[ The use
r does not have permission to speak on this channel ]]>
* @TP_CHANNEL_TEXT_SEND_ERROR_TOO_LONG: <![CDATA[ The outgoing mes
sage was too long and was rejected by the server ]]>
* @TP_CHANNEL_TEXT_SEND_ERROR_NOT_IMPLEMENTED: <![CDATA[ The chann
el doesn't support sending text messages to the requested contact
]]>
*
* Enumeration generated from the Telepathy specification.
*/
typedef enum { typedef enum {
TP_CHANNEL_TEXT_SEND_ERROR_UNKNOWN = 0, TP_CHANNEL_TEXT_SEND_ERROR_UNKNOWN = 0,
TP_CHANNEL_TEXT_SEND_ERROR_OFFLINE = 1, TP_CHANNEL_TEXT_SEND_ERROR_OFFLINE = 1,
TP_CHANNEL_TEXT_SEND_ERROR_INVALID_CONTACT = 2, TP_CHANNEL_TEXT_SEND_ERROR_INVALID_CONTACT = 2,
TP_CHANNEL_TEXT_SEND_ERROR_PERMISSION_DENIED = 3, TP_CHANNEL_TEXT_SEND_ERROR_PERMISSION_DENIED = 3,
TP_CHANNEL_TEXT_SEND_ERROR_TOO_LONG = 4, TP_CHANNEL_TEXT_SEND_ERROR_TOO_LONG = 4,
TP_CHANNEL_TEXT_SEND_ERROR_NOT_IMPLEMENTED = 5, TP_CHANNEL_TEXT_SEND_ERROR_NOT_IMPLEMENTED = 5,
NUM_TP_CHANNEL_TEXT_SEND_ERRORS } TpChannelTextSendError;
} TelepathyChannelTextSendError;
#ifndef LIBTELEPATHY_DISABLE_DEPRECATED
#define LAST_TP_CHANNEL_TEXT_SEND_ERROR NUM_TP_CHANNEL_TEXT_SEND_ERRORS
#endif
/* TpChannelTextMessageType (enum) */ /**
* NUM_TP_CHANNEL_TEXT_SEND_ERRORS:
*
* 1 higher than the highest valid value of #TpChannelTextSendError.
*/
#define NUM_TP_CHANNEL_TEXT_SEND_ERRORS (5+1)
/**
* TpChannelTextMessageType:
* @TP_CHANNEL_TEXT_MESSAGE_TYPE_NORMAL: <![CDATA[ A standard messa
ge ]]>
* @TP_CHANNEL_TEXT_MESSAGE_TYPE_ACTION: <![CDATA[ An action which
might be presented to the user as "* <sender> <action>" ]]>
* @TP_CHANNEL_TEXT_MESSAGE_TYPE_NOTICE: <![CDATA[ A one-off or aut
omated message not necessarily expecting a reply ]]>
* @TP_CHANNEL_TEXT_MESSAGE_TYPE_AUTO_REPLY: <![CDATA[ An automatic
ally-generated reply message ]]>
*
* Enumeration generated from the Telepathy specification.
*/
typedef enum { typedef enum {
TP_CHANNEL_TEXT_MESSAGE_TYPE_NORMAL = 0, TP_CHANNEL_TEXT_MESSAGE_TYPE_NORMAL = 0,
TP_CHANNEL_TEXT_MESSAGE_TYPE_ACTION = 1, TP_CHANNEL_TEXT_MESSAGE_TYPE_ACTION = 1,
TP_CHANNEL_TEXT_MESSAGE_TYPE_NOTICE = 2, TP_CHANNEL_TEXT_MESSAGE_TYPE_NOTICE = 2,
TP_CHANNEL_TEXT_MESSAGE_TYPE_AUTO_REPLY = 3, TP_CHANNEL_TEXT_MESSAGE_TYPE_AUTO_REPLY = 3,
NUM_TP_CHANNEL_TEXT_MESSAGE_TYPES } TpChannelTextMessageType;
} TelepathyChannelTextMessageType;
#ifndef LIBTELEPATHY_DISABLE_DEPRECATED
#define LAST_TP_CHANNEL_TEXT_MESSAGE_TYPE NUM_TP_CHANNEL_TEXT_MESSAGE_TYPES
#endif
/* TpChannelTextMessageFlags (bitfield/set of flags, 0 for none) */ /**
* NUM_TP_CHANNEL_TEXT_MESSAGE_TYPES:
*
* 1 higher than the highest valid value of #TpChannelTextMessageType.
*/
#define NUM_TP_CHANNEL_TEXT_MESSAGE_TYPES (3+1)
/**
* TpChannelTextMessageFlags:
* @TP_CHANNEL_TEXT_MESSAGE_FLAG_TRUNCATED: <![CDATA[ The incoming
message was truncated to a shorter length by the server or the conn
ection manager. ]]>
*
* Bitfield/set of flags generated from the Telepathy specification.
*/
typedef enum { typedef enum {
TP_CHANNEL_TEXT_MESSAGE_FLAG_TRUNCATED = 1, TP_CHANNEL_TEXT_MESSAGE_FLAG_TRUNCATED = 1,
#ifndef LIBTELEPATHY_DISABLE_DEPRECATED } TpChannelTextMessageFlags;
LAST_TP_CHANNEL_TEXT_MESSAGE_FLAG = 1 + 1
#endif
} TelepathyChannelTextMessageFlags;
/* TpTubeType (enum) */
/**
* TpTubeType:
* @TP_TUBE_TYPE_DBUS: <![CDATA[ An ordered reliable transport, f
or transporting D-Bus traffic. For each D-Bus tube,
the connection manager listens on a D-Bus server address, as de
tailed in the D-Bus specification. On this address, it emulates
a bus upon which each tube participant appears as an endpoint.
The objects and interfaces which are expected to exist on the
emulated bus depend on the well-known name; typically, either th
e participant who initiated the tube is expected to export the
same objects/interfaces that would be exported by a service of
that name on a bus, or all participants are expected to export
those objects/interfaces. In a multi-user context (H
andle_Type_Room) the tube behaves like the D-Bus bus daemon, so
participants can send each other private messages, or can send
broadcast messages which are received by everyone in the tube
(including themselves). Each participant has a D-Bus unique nam
e; connection managers must prevent participants from sending m
essages with the wrong sender unique name, and should attempt t
o avoid participants receiving messages not intended for them.
In a 1-1 context (Handle_Type_Contact) the tube behaves like
a peer-to-peer D-Bus connection - arbitrary D-Bus messages with
any sender and/or destination can be sent by each participant,
and each participant receives all messages sent by the other
participant. ]]>
* @TP_TUBE_TYPE_STREAM: <![CDATA[ A transport for ordered, relia
ble data transfer, similar to SOCK_STREAM sockets. W
hen accepting a Stream Unix tube, a new listening local socket is
created. Each time the client connects to this socket, the c
onnection manager of the initiator of the tube opens a new conn
ection to its local socket. Both sides can then use this pair o
f sockets to communicate together. ]]>
*
* Enumeration generated from the Telepathy specification.
*/
typedef enum { typedef enum {
TP_TUBE_TYPE_DBUS = 0, TP_TUBE_TYPE_DBUS = 0,
TP_TUBE_TYPE_STREAM = 1, TP_TUBE_TYPE_STREAM = 1,
NUM_TP_TUBE_TYPES } TpTubeType;
} TelepathyTubeType;
#ifndef LIBTELEPATHY_DISABLE_DEPRECATED
#define LAST_TP_TUBE_TYPE NUM_TP_TUBE_TYPES
#endif
/* TpTubeState (enum) */ /**
* NUM_TP_TUBE_TYPES:
*
* 1 higher than the highest valid value of #TpTubeType.
*/
#define NUM_TP_TUBE_TYPES (1+1)
/**
* TpTubeState:
* @TP_TUBE_STATE_LOCAL_PENDING: <![CDATA[ The tube is waiting to
be accepted/closed locally. ]]>
* @TP_TUBE_STATE_REMOTE_PENDING: <![CDATA[ The tube is waiting t
o be accepted/closed remotely. ]]>
* @TP_TUBE_STATE_OPEN: <![CDATA[ The tube is open for traffic.
]]>
*
* Enumeration generated from the Telepathy specification.
*/
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 } TpTubeState;
} TelepathyTubeState;
#ifndef LIBTELEPATHY_DISABLE_DEPRECATED
#define LAST_TP_TUBE_STATE NUM_TP_TUBE_STATES
#endif
/* TpSocketAddressType (enum) */ /**
* NUM_TP_TUBE_STATES:
*
* 1 higher than the highest valid value of #TpTubeState.
*/
#define NUM_TP_TUBE_STATES (2+1)
/**
* TpSocketAddressType:
* @TP_SOCKET_ADDRESS_TYPE_UNIX: <![CDATA[ A Unix socket. The var
iant contains a byte-array, signature 'ay', containing the path o
f the socket. ]]>
* @TP_SOCKET_ADDRESS_TYPE_ABSTRACT_UNIX: <![CDATA[ An abstract U
nix socket. The variant contains a byte-array, signature 'ay', co
ntaining the path of the socket including the leading null byte.
]]>
* @TP_SOCKET_ADDRESS_TYPE_IPV4: <![CDATA[ An IPv4 socket. The va
riant contains a struct with signature (sq) in which the string i
s an IPv4 dotted-quad address literal (and must not be a DNS name
), while the 16-bit unsigned integer is the port number.
]]>
* @TP_SOCKET_ADDRESS_TYPE_IPV6: <![CDATA[ An IPv6 socket. The va
riant contains a struct with signature (sq) in which the string i
s an IPv6 address literal as specified in RFC2373 (and must not b
e a DNS name), while the 16-bit unsigned integer is the port numb
er. ]]>
*
* Enumeration generated from the Telepathy specification.
*/
typedef enum { typedef enum {
TP_SOCKET_ADDRESS_TYPE_UNIX = 0, TP_SOCKET_ADDRESS_TYPE_UNIX = 0,
TP_SOCKET_ADDRESS_TYPE_ABSTRACT_UNIX = 1, TP_SOCKET_ADDRESS_TYPE_ABSTRACT_UNIX = 1,
TP_SOCKET_ADDRESS_TYPE_IPV4 = 2, TP_SOCKET_ADDRESS_TYPE_IPV4 = 2,
TP_SOCKET_ADDRESS_TYPE_IPV6 = 3, TP_SOCKET_ADDRESS_TYPE_IPV6 = 3,
NUM_TP_SOCKET_ADDRESS_TYPES } TpSocketAddressType;
} TelepathySocketAddressType;
#ifndef LIBTELEPATHY_DISABLE_DEPRECATED
#define LAST_TP_SOCKET_ADDRESS_TYPE NUM_TP_SOCKET_ADDRESS_TYPES
#endif
/* TpSocketAccessControl (enum) */ /**
* NUM_TP_SOCKET_ADDRESS_TYPES:
*
* 1 higher than the highest valid value of #TpSocketAddressType.
*/
#define NUM_TP_SOCKET_ADDRESS_TYPES (3+1)
/**
* TpSocketAccessControl:
* @TP_SOCKET_ACCESS_CONTROL_LOCALHOST: <![CDATA[ The IP or Unix
socket can be accessed by any local user (e.g. a Unix socket that
accepts all local connections, or an IP socket listening on 127.
0.0.1 (or ::1) or rejecting connections not from that address). T
he associated variant must be ignored. ]]>
* @TP_SOCKET_ACCESS_CONTROL_PORT: <![CDATA[ May only be used on
IP sockets. The associated variant must contain a struct with sig
nature (sq) containing the string form of an IP address of the ap
propriate version, and a port number. The socket can only be acce
ssed if the connecting process has that address and port number;
all other connections will be rejected. ]]>
* @TP_SOCKET_ACCESS_CONTROL_NETMASK: <![CDATA[ May only be used
on IP sockets. The associated variant must contain a struct with
signature (sy) containing the string form of an IP address of the
appropriate version, and a prefix length "n". The socket can onl
y be accessed if the first n bits of the connecting address match
the first n bits of the given address. ]]>
* @TP_SOCKET_ACCESS_CONTROL_CREDENTIALS: <![CDATA[ The connectin
g process must send a single zero (NUL) byte when it first conn
ects, which is not considered to be part of the data stream. If
the operating system uses sendmsg() with SCM_CREDS or SCM_CRED
ENTIALS to pass credentials over sockets, the connecting proces
s must do so if possible; if not, it must still send the byte.
The listening process will disconnect the connection unless it
can determine by OS-specific means that the connecting process
has the same user ID as the listening process. The as
sociated variant must be ignored. ]]>
*
* Enumeration generated from the Telepathy specification.
*/
typedef enum { typedef enum {
TP_SOCKET_ACCESS_CONTROL_LOCALHOST = 0, TP_SOCKET_ACCESS_CONTROL_LOCALHOST = 0,
TP_SOCKET_ACCESS_CONTROL_PORT = 1, TP_SOCKET_ACCESS_CONTROL_PORT = 1,
TP_SOCKET_ACCESS_CONTROL_NETMASK = 2, TP_SOCKET_ACCESS_CONTROL_NETMASK = 2,
TP_SOCKET_ACCESS_CONTROL_CREDENTIALS = 3, TP_SOCKET_ACCESS_CONTROL_CREDENTIALS = 3,
NUM_TP_SOCKET_ACCESS_CONTROLS } TpSocketAccessControl;
} TelepathySocketAccessControl;
#ifndef LIBTELEPATHY_DISABLE_DEPRECATED
#define LAST_TP_SOCKET_ACCESS_CONTROL NUM_TP_SOCKET_ACCESS_CONTROLS
#endif
/* TpChannelChatState (enum) */ /**
* NUM_TP_SOCKET_ACCESS_CONTROLS:
*
* 1 higher than the highest valid value of #TpSocketAccessControl.
*/
#define NUM_TP_SOCKET_ACCESS_CONTROLS (3+1)
/**
* TpChannelChatState:
* @TP_CHANNEL_CHAT_STATE_GONE: <![CDATA[ The contact has effective
ly ceased participating in the chat. ]]>
* @TP_CHANNEL_CHAT_STATE_INACTIVE: <![CDATA[ The contact has not b
een active for some time. ]]>
* @TP_CHANNEL_CHAT_STATE_ACTIVE: <![CDATA[ The contact is actively
participating in the chat. ]]>
* @TP_CHANNEL_CHAT_STATE_PAUSED: <![CDATA[ The contact has paused
composing a message. ]]>
* @TP_CHANNEL_CHAT_STATE_COMPOSING: <![CDATA[ The contact is compo
sing a message to be sent to the chat. ]]>
*
* Enumeration generated from the Telepathy specification.
*/
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 } TpChannelChatState;
} TelepathyChannelChatState;
#ifndef LIBTELEPATHY_DISABLE_DEPRECATED
#define LAST_TP_CHANNEL_CHAT_STATE NUM_TP_CHANNEL_CHAT_STATES
#endif
/* TpDTMFEvent (enum) */ /**
* NUM_TP_CHANNEL_CHAT_STATES:
*
* 1 higher than the highest valid value of #TpChannelChatState.
*/
#define NUM_TP_CHANNEL_CHAT_STATES (4+1)
/**
* TpDTMFEvent:
* @TP_DTMF_EVENT_DIGIT_0: <![CDATA[0]]>
* @TP_DTMF_EVENT_DIGIT_1: <![CDATA[1]]>
* @TP_DTMF_EVENT_DIGIT_2: <![CDATA[2]]>
* @TP_DTMF_EVENT_DIGIT_3: <![CDATA[3]]>
* @TP_DTMF_EVENT_DIGIT_4: <![CDATA[4]]>
* @TP_DTMF_EVENT_DIGIT_5: <![CDATA[5]]>
* @TP_DTMF_EVENT_DIGIT_6: <![CDATA[6]]>
* @TP_DTMF_EVENT_DIGIT_7: <![CDATA[7]]>
* @TP_DTMF_EVENT_DIGIT_8: <![CDATA[8]]>
* @TP_DTMF_EVENT_DIGIT_9: <![CDATA[9]]>
* @TP_DTMF_EVENT_ASTERISK: <![CDATA[*]]>
* @TP_DTMF_EVENT_HASH: <![CDATA[#]]>
* @TP_DTMF_EVENT_LETTER_A: <![CDATA[A]]>
* @TP_DTMF_EVENT_LETTER_B: <![CDATA[B]]>
* @TP_DTMF_EVENT_LETTER_C: <![CDATA[C]]>
* @TP_DTMF_EVENT_LETTER_D: <![CDATA[D]]>
*
* Enumeration generated from the Telepathy specification.
*/
typedef enum { typedef enum {
TP_DTMF_EVENT_DIGIT_0 = 0, TP_DTMF_EVENT_DIGIT_0 = 0,
TP_DTMF_EVENT_DIGIT_1 = 1, TP_DTMF_EVENT_DIGIT_1 = 1,
TP_DTMF_EVENT_DIGIT_2 = 2, TP_DTMF_EVENT_DIGIT_2 = 2,
TP_DTMF_EVENT_DIGIT_3 = 3, TP_DTMF_EVENT_DIGIT_3 = 3,
TP_DTMF_EVENT_DIGIT_4 = 4, TP_DTMF_EVENT_DIGIT_4 = 4,
TP_DTMF_EVENT_DIGIT_5 = 5, TP_DTMF_EVENT_DIGIT_5 = 5,
TP_DTMF_EVENT_DIGIT_6 = 6, TP_DTMF_EVENT_DIGIT_6 = 6,
TP_DTMF_EVENT_DIGIT_7 = 7, TP_DTMF_EVENT_DIGIT_7 = 7,
TP_DTMF_EVENT_DIGIT_8 = 8, TP_DTMF_EVENT_DIGIT_8 = 8,
TP_DTMF_EVENT_DIGIT_9 = 9, TP_DTMF_EVENT_DIGIT_9 = 9,
TP_DTMF_EVENT_ASTERISK = 10, TP_DTMF_EVENT_ASTERISK = 10,
TP_DTMF_EVENT_HASH = 11, TP_DTMF_EVENT_HASH = 11,
TP_DTMF_EVENT_LETTER_A = 12, TP_DTMF_EVENT_LETTER_A = 12,
TP_DTMF_EVENT_LETTER_B = 13, TP_DTMF_EVENT_LETTER_B = 13,
TP_DTMF_EVENT_LETTER_C = 14, TP_DTMF_EVENT_LETTER_C = 14,
TP_DTMF_EVENT_LETTER_D = 15, TP_DTMF_EVENT_LETTER_D = 15,
NUM_TP_DTMF_EVENTS } TpDTMFEvent;
} TelepathyDTMFEvent;
#ifndef LIBTELEPATHY_DISABLE_DEPRECATED
#define LAST_TP_DTMF_EVENT NUM_TP_DTMF_EVENTS
#endif
/* TpChannelGroupFlags (bitfield/set of flags, 0 for none) */ /**
* NUM_TP_DTMF_EVENTS:
*
* 1 higher than the highest valid value of #TpDTMFEvent.
*/
#define NUM_TP_DTMF_EVENTS (15+1)
/**
* TpChannelGroupFlags:
* @TP_CHANNEL_GROUP_FLAG_CAN_ADD: <![CDATA[ The AddMembers met
hod can be used to add or invite members who are not already in
the local pending list (which is always valid). ]]>
* @TP_CHANNEL_GROUP_FLAG_CAN_REMOVE: <![CDATA[ The RemoveMembe
rs method can be used to remove channel members (removing those
on the pending local list is always valid). ]]>
* @TP_CHANNEL_GROUP_FLAG_CAN_RESCIND: <![CDATA[ The RemoveMemb
ers method can be used on people on the remote pending list.
]]>
* @TP_CHANNEL_GROUP_FLAG_MESSAGE_ADD: <![CDATA[ A message may
be sent to the server when calling AddMembers on contacts who a
re not currently pending members. ]]>
* @TP_CHANNEL_GROUP_FLAG_MESSAGE_REMOVE: <![CDATA[ A message m
ay be sent to the server when calling RemoveMembers on contacts
who are currently channel members. ]]>
* @TP_CHANNEL_GROUP_FLAG_MESSAGE_ACCEPT: <![CDATA[ A message m
ay be sent to the server when calling AddMembers on contacts wh
o are locally pending. ]]>
* @TP_CHANNEL_GROUP_FLAG_MESSAGE_REJECT: <![CDATA[ A message m
ay be sent to the server when calling RemoveMembers on contacts
who are locally pending. ]]>
* @TP_CHANNEL_GROUP_FLAG_MESSAGE_RESCIND: <![CDATA[ A message
may be sent to the server when calling RemoveMembers on contact
s who are remote pending. ]]>
* @TP_CHANNEL_GROUP_FLAG_CHANNEL_SPECIFIC_HANDLES: <![CDATA[
The members of this group have handles which are specific to
this channel, and are not valid as general-purpose handles on
the connection. Depending on the channel, it may be possible to
call GetHandleOwners to find the owners of these handles, which
should be done if you wish to eg subscribe to the contact's
presence. Connection managers must
ensure that any given handle is not simultaneously a general-p
urpose handle and a channel-specific handle.
]]>
* @TP_CHANNEL_GROUP_FLAG_ONLY_ONE_GROUP: <![CDATA[ Placing a c
ontact in multiple groups of this type is not allowed and will
raise NotAvailable (on services where contacts may only be in o
ne user-defined group, user-defined groups will have this flag)
. ]]>
* @TP_CHANNEL_GROUP_FLAG_HANDLE_OWNERS_NOT_AVAILABLE: <![CDATA[
In rooms with channel specific handles (ie Channel_Specific_Handles
flag is set), this flag indicates that none of the handle owners are
available, and that GetHandleOwners method will always return 0 for
channel members other than the self handle. ]]>
*
* Bitfield/set of flags generated from the Telepathy specification.
*/
typedef enum { typedef enum {
TP_CHANNEL_GROUP_FLAG_CAN_ADD = 1, TP_CHANNEL_GROUP_FLAG_CAN_ADD = 1,
TP_CHANNEL_GROUP_FLAG_CAN_REMOVE = 2, TP_CHANNEL_GROUP_FLAG_CAN_REMOVE = 2,
TP_CHANNEL_GROUP_FLAG_CAN_RESCIND = 4, TP_CHANNEL_GROUP_FLAG_CAN_RESCIND = 4,
TP_CHANNEL_GROUP_FLAG_MESSAGE_ADD = 8, TP_CHANNEL_GROUP_FLAG_MESSAGE_ADD = 8,
TP_CHANNEL_GROUP_FLAG_MESSAGE_REMOVE = 16, TP_CHANNEL_GROUP_FLAG_MESSAGE_REMOVE = 16,
TP_CHANNEL_GROUP_FLAG_MESSAGE_ACCEPT = 32, TP_CHANNEL_GROUP_FLAG_MESSAGE_ACCEPT = 32,
TP_CHANNEL_GROUP_FLAG_MESSAGE_REJECT = 64, TP_CHANNEL_GROUP_FLAG_MESSAGE_REJECT = 64,
TP_CHANNEL_GROUP_FLAG_MESSAGE_RESCIND = 128, TP_CHANNEL_GROUP_FLAG_MESSAGE_RESCIND = 128,
TP_CHANNEL_GROUP_FLAG_CHANNEL_SPECIFIC_HANDLES = 256, TP_CHANNEL_GROUP_FLAG_CHANNEL_SPECIFIC_HANDLES = 256,
TP_CHANNEL_GROUP_FLAG_ONLY_ONE_GROUP = 512, TP_CHANNEL_GROUP_FLAG_ONLY_ONE_GROUP = 512,
TP_CHANNEL_GROUP_FLAG_HANDLE_OWNERS_NOT_AVAILABLE = 1024, TP_CHANNEL_GROUP_FLAG_HANDLE_OWNERS_NOT_AVAILABLE = 1024,
#ifndef LIBTELEPATHY_DISABLE_DEPRECATED } TpChannelGroupFlags;
LAST_TP_CHANNEL_GROUP_FLAG = 1024 + 1
#endif
} TelepathyChannelGroupFlags;
/* TpChannelGroupChangeReason (enum) */
/**
* TpChannelGroupChangeReason:
* @TP_CHANNEL_GROUP_CHANGE_REASON_NONE: <![CDATA[ No reason wa
s provided for this change. ]]>
* @TP_CHANNEL_GROUP_CHANGE_REASON_OFFLINE: <![CDATA[ The chang
e is due to a user going offline. Also used when user is alread
y offline, but this wasn't known previously. ]]>
* @TP_CHANNEL_GROUP_CHANGE_REASON_KICKED: <![CDATA[ The change
is due to a kick operation. ]]>
* @TP_CHANNEL_GROUP_CHANGE_REASON_BUSY: <![CDATA[ The change i
s due to a busy indication. ]]>
* @TP_CHANNEL_GROUP_CHANGE_REASON_INVITED: <![CDATA[ The chang
e is due to an invitation. ]]>
* @TP_CHANNEL_GROUP_CHANGE_REASON_BANNED: <![CDATA[ The change
is due to a kick+ban operation. ]]>
* @TP_CHANNEL_GROUP_CHANGE_REASON_ERROR: <![CDATA[ The change
is due to an error occurring. ]]>
* @TP_CHANNEL_GROUP_CHANGE_REASON_INVALID_CONTACT: <![CDATA[ T
he change is because the requested contact does not exist. ]]>
* @TP_CHANNEL_GROUP_CHANGE_REASON_NO_ANSWER: <![CDATA[ The cha
nge is because the requested contact did not respond. ]]>
* @TP_CHANNEL_GROUP_CHANGE_REASON_RENAMED: <![CDATA[ The change
is because a contact's unique identifier changed. There must be e
xactly one handle in the removed set and exactly one handle in on
e of the added sets. The Renamed signal on the Renaming interface
will have been emitted for the same handles, shortly before this
MembersChanged signal is emitted. ]]>
* @TP_CHANNEL_GROUP_CHANGE_REASON_PERMISSION_DENIED: <![CDATA[
The change is because there was no permission to contact the r
equested handle. ]]>
* @TP_CHANNEL_GROUP_CHANGE_REASON_SEPARATED: <![CDATA[ If member
s are removed with this reason code, the change is because the
group has split into unconnected parts which can only communica
te within themselves (e.g. netsplits on IRC use this reason cod
e). If members are added with this reason
code, the change is because unconnected parts of the group hav
e rejoined. If this channel carries messages (e.g. Text or Tube
s channels) applications must assume that the contacts being ad
ded are likely to have missed some messages as a result of the
separation, and that the contacts in the group are likely to ha
ve missed some messages from the contacts being added.
Note that from the added contacts' perspective, they have been
in the group all along, and the contacts we indicate to be in
the group (including the local user) have just rejoined
the group with reason Separated. Application protocols in Tubes
should be prepared to cope with this situation. ]]
>
*
* Enumeration generated from the Telepathy specification.
*/
typedef enum { typedef enum {
TP_CHANNEL_GROUP_CHANGE_REASON_NONE = 0, TP_CHANNEL_GROUP_CHANGE_REASON_NONE = 0,
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, TP_CHANNEL_GROUP_CHANGE_REASON_SEPARATED = 11,
NUM_TP_CHANNEL_GROUP_CHANGE_REASONS } TpChannelGroupChangeReason;
} TelepathyChannelGroupChangeReason;
#ifndef LIBTELEPATHY_DISABLE_DEPRECATED
#define LAST_TP_CHANNEL_GROUP_CHANGE_REASON NUM_TP_CHANNEL_GROUP_CHANGE_REA
SONS
#endif
/* TpChannelHoldState (enum) */ /**
* NUM_TP_CHANNEL_GROUP_CHANGE_REASONS:
*
* 1 higher than the highest valid value of #TpChannelGroupChangeReason.
*/
#define NUM_TP_CHANNEL_GROUP_CHANGE_REASONS (11+1)
/**
* TpChannelHoldState:
* @TP_CHANNEL_HOLD_STATE_NONE: <![CDATA[ Neither the local use
r and the remote member are on hold, and media is being sent bi
directionally. ]]>
* @TP_CHANNEL_HOLD_STATE_SEND_ONLY: <![CDATA[ The local user h
as put the remote member on hold, so is sending media but has a
rranged not to receive any media streams. ]]>
* @TP_CHANNEL_HOLD_STATE_RECV_ONLY: <![CDATA[ The user has bee
n put on hold by the remote member, so is receiving media but h
as arranged not to send any media streams. ]]>
* @TP_CHANNEL_HOLD_STATE_BOTH: <![CDATA[ Both the local user a
nd the remote member have agreed not to send any media streams
to each other. ]]>
*
* Enumeration generated from the Telepathy specification.
*/
typedef enum { typedef enum {
TP_CHANNEL_HOLD_STATE_NONE = 0, TP_CHANNEL_HOLD_STATE_NONE = 0,
TP_CHANNEL_HOLD_STATE_SEND_ONLY = 1, TP_CHANNEL_HOLD_STATE_SEND_ONLY = 1,
TP_CHANNEL_HOLD_STATE_RECV_ONLY = 2, TP_CHANNEL_HOLD_STATE_RECV_ONLY = 2,
TP_CHANNEL_HOLD_STATE_BOTH = 3, TP_CHANNEL_HOLD_STATE_BOTH = 3,
NUM_TP_CHANNEL_HOLD_STATES } TpChannelHoldState;
} TelepathyChannelHoldState;
#ifndef LIBTELEPATHY_DISABLE_DEPRECATED
#define LAST_TP_CHANNEL_HOLD_STATE NUM_TP_CHANNEL_HOLD_STATES
#endif
/* TpChannelPasswordFlags (bitfield/set of flags, 0 for none) */ /**
* NUM_TP_CHANNEL_HOLD_STATES:
*
* 1 higher than the highest valid value of #TpChannelHoldState.
*/
#define NUM_TP_CHANNEL_HOLD_STATES (3+1)
/**
* TpChannelPasswordFlags:
* @TP_CHANNEL_PASSWORD_FLAG_PROVIDE: <![CDATA[ The ProvidePasswo
rd method must be called now for the user to join the channel
]]>
*
* Bitfield/set of flags generated from the Telepathy specification.
*/
typedef enum { typedef enum {
TP_CHANNEL_PASSWORD_FLAG_PROVIDE = 8, TP_CHANNEL_PASSWORD_FLAG_PROVIDE = 8,
#ifndef LIBTELEPATHY_DISABLE_DEPRECATED } TpChannelPasswordFlags;
LAST_TP_CHANNEL_PASSWORD_FLAG = 8 + 1
#endif
} TelepathyChannelPasswordFlags;
/* TpMediaStreamError (enum) */
/**
* TpMediaStreamError:
* @TP_MEDIA_STREAM_ERROR_UNKNOWN: <![CDATA[ An unknown error occur
ed. ]]>
* @TP_MEDIA_STREAM_ERROR_EOS: <![CDATA[ The end of the stream was
reached. ]]>
*
* Enumeration generated from the Telepathy specification.
*/
typedef enum { typedef enum {
TP_MEDIA_STREAM_ERROR_UNKNOWN = 0, TP_MEDIA_STREAM_ERROR_UNKNOWN = 0,
TP_MEDIA_STREAM_ERROR_EOS = 1, TP_MEDIA_STREAM_ERROR_EOS = 1,
NUM_TP_MEDIA_STREAM_ERRORS } TpMediaStreamError;
} TelepathyMediaStreamError;
#ifndef LIBTELEPATHY_DISABLE_DEPRECATED
#define LAST_TP_MEDIA_STREAM_ERROR NUM_TP_MEDIA_STREAM_ERRORS
#endif
/* TpMediaStreamBaseProto (enum) */ /**
* NUM_TP_MEDIA_STREAM_ERRORS:
*
* 1 higher than the highest valid value of #TpMediaStreamError.
*/
#define NUM_TP_MEDIA_STREAM_ERRORS (1+1)
/**
* TpMediaStreamBaseProto:
* @TP_MEDIA_STREAM_BASE_PROTO_UDP: <![CDATA[UDP (User Datagram Protocol)]]
>
* @TP_MEDIA_STREAM_BASE_PROTO_TCP: <![CDATA[TCP (Transmission Control Prot
ocol)]]>
*
* Enumeration generated from the Telepathy specification.
*/
typedef enum { typedef enum {
TP_MEDIA_STREAM_BASE_PROTO_UDP = 0, TP_MEDIA_STREAM_BASE_PROTO_UDP = 0,
TP_MEDIA_STREAM_BASE_PROTO_TCP = 1, TP_MEDIA_STREAM_BASE_PROTO_TCP = 1,
NUM_TP_MEDIA_STREAM_BASE_PROTOS } TpMediaStreamBaseProto;
} TelepathyMediaStreamBaseProto;
#ifndef LIBTELEPATHY_DISABLE_DEPRECATED
#define LAST_TP_MEDIA_STREAM_BASE_PROTO NUM_TP_MEDIA_STREAM_BASE_PROTOS
#endif
/* TpMediaStreamTransportType (enum) */ /**
* NUM_TP_MEDIA_STREAM_BASE_PROTOS:
*
* 1 higher than the highest valid value of #TpMediaStreamBaseProto.
*/
#define NUM_TP_MEDIA_STREAM_BASE_PROTOS (1+1)
/**
* TpMediaStreamTransportType:
* @TP_MEDIA_STREAM_TRANSPORT_TYPE_LOCAL: <![CDATA[ A local addre
ss ]]>
* @TP_MEDIA_STREAM_TRANSPORT_TYPE_DERIVED: <![CDATA[ An external
address derived by a method such as STUN ]]>
* @TP_MEDIA_STREAM_TRANSPORT_TYPE_RELAY: <![CDATA[ An external s
tream relay ]]>
*
* Enumeration generated from the Telepathy specification.
*/
typedef enum { typedef enum {
TP_MEDIA_STREAM_TRANSPORT_TYPE_LOCAL = 0, TP_MEDIA_STREAM_TRANSPORT_TYPE_LOCAL = 0,
TP_MEDIA_STREAM_TRANSPORT_TYPE_DERIVED = 1, TP_MEDIA_STREAM_TRANSPORT_TYPE_DERIVED = 1,
TP_MEDIA_STREAM_TRANSPORT_TYPE_RELAY = 2, TP_MEDIA_STREAM_TRANSPORT_TYPE_RELAY = 2,
NUM_TP_MEDIA_STREAM_TRANSPORT_TYPES } TpMediaStreamTransportType;
} TelepathyMediaStreamTransportType;
#ifndef LIBTELEPATHY_DISABLE_DEPRECATED
#define LAST_TP_MEDIA_STREAM_TRANSPORT_TYPE NUM_TP_MEDIA_STREAM_TRANSPORT_T
YPES
#endif
/* TpPropertyFlags (bitfield/set of flags, 0 for none) */ /**
* NUM_TP_MEDIA_STREAM_TRANSPORT_TYPES:
*
* 1 higher than the highest valid value of #TpMediaStreamTransportType.
*/
#define NUM_TP_MEDIA_STREAM_TRANSPORT_TYPES (2+1)
/**
* TpPropertyFlags:
* @TP_PROPERTY_FLAG_READ: <![CDATA[The property can be read]]>
* @TP_PROPERTY_FLAG_WRITE: <![CDATA[The property can be written]]>
*
* Bitfield/set of flags generated from the Telepathy specification.
*/
typedef enum { typedef enum {
TP_PROPERTY_FLAG_READ = 1, TP_PROPERTY_FLAG_READ = 1,
TP_PROPERTY_FLAG_WRITE = 2, TP_PROPERTY_FLAG_WRITE = 2,
#ifndef LIBTELEPATHY_DISABLE_DEPRECATED } TpPropertyFlags;
LAST_TP_PROPERTY_FLAG = 2 + 1
#endif
} TelepathyPropertyFlags;
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
 End of changes. 80 change blocks. 
221 lines changed or deleted 696 lines changed or added


 _gen-tp-interfaces.h   _gen-tp-interfaces.h 
/* Generated from the Telepathy spec /* Generated from: Telepathy D-Bus Interface Specification version 0.16.0
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.
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
Library General Public License for more details. Library General Public License for more details.
You should have received a copy of the GNU Lesser General Public You should have received a copy of the GNU Lesser General Public
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 Street, Fifth Floor, Boston, MA 02110-1301, U SA. Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, U SA.
*/ */
/**
* TP_IFACE_CONNECTION_MANAGER:
*
* The interface name "org.freedesktop.Telepathy.ConnectionManager"
*/
#define TP_IFACE_CONNECTION_MANAGER \
"org.freedesktop.Telepathy.ConnectionManager"
/**
* TP_IFACE_QUARK_CONNECTION_MANAGER:
*
* Expands to a call to a function that returns a quark for the interface n
ame "org.freedesktop.Telepathy.ConnectionManager"
*/
#define TP_IFACE_QUARK_CONNECTION_MANAGER \
(tp_iface_quark_connection_manager ())
GQuark tp_iface_quark_connection_manager (void);
/* Backwards compatibility with libtp < 0.3 */
#define TP_IFACE_CONN_MANAGER \ #define TP_IFACE_CONN_MANAGER \
"org.freedesktop.Telepathy.ConnectionManager" TP_IFACE_CONNECTION_MANAGER
/**
* TP_IFACE_CONNECTION:
*
* The interface name "org.freedesktop.Telepathy.Connection"
*/
#define TP_IFACE_CONNECTION \
"org.freedesktop.Telepathy.Connection"
/**
* TP_IFACE_QUARK_CONNECTION:
*
* Expands to a call to a function that returns a quark for the interface n
ame "org.freedesktop.Telepathy.Connection"
*/
#define TP_IFACE_QUARK_CONNECTION \
(tp_iface_quark_connection ())
GQuark tp_iface_quark_connection (void);
/* Backwards compatibility with libtp < 0.3 */
#define TP_IFACE_CONN \ #define TP_IFACE_CONN \
"org.freedesktop.Telepathy.Connection" TP_IFACE_CONNECTION
/**
* TP_IFACE_CONNECTION_INTERFACE_ALIASING:
*
* The interface name "org.freedesktop.Telepathy.Connection.Interface.Alias
ing"
*/
#define TP_IFACE_CONNECTION_INTERFACE_ALIASING \
"org.freedesktop.Telepathy.Connection.Interface.Aliasing"
/**
* TP_IFACE_QUARK_CONNECTION_INTERFACE_ALIASING:
*
* Expands to a call to a function that returns a quark for the interface n
ame "org.freedesktop.Telepathy.Connection.Interface.Aliasing"
*/
#define TP_IFACE_QUARK_CONNECTION_INTERFACE_ALIASING \
(tp_iface_quark_connection_interface_aliasing ())
GQuark tp_iface_quark_connection_interface_aliasing (void);
/* Backwards compatibility with libtp < 0.3 */
#define TP_IFACE_CONN_INTERFACE_ALIASING \ #define TP_IFACE_CONN_INTERFACE_ALIASING \
"org.freedesktop.Telepathy.Connection.Interface.Aliasing" TP_IFACE_CONNECTION_INTERFACE_ALIASING
/**
* TP_IFACE_CONNECTION_INTERFACE_AVATARS:
*
* The interface name "org.freedesktop.Telepathy.Connection.Interface.Avata
rs"
*/
#define TP_IFACE_CONNECTION_INTERFACE_AVATARS \
"org.freedesktop.Telepathy.Connection.Interface.Avatars"
/**
* TP_IFACE_QUARK_CONNECTION_INTERFACE_AVATARS:
*
* Expands to a call to a function that returns a quark for the interface n
ame "org.freedesktop.Telepathy.Connection.Interface.Avatars"
*/
#define TP_IFACE_QUARK_CONNECTION_INTERFACE_AVATARS \
(tp_iface_quark_connection_interface_avatars ())
GQuark tp_iface_quark_connection_interface_avatars (void);
/* Backwards compatibility with libtp < 0.3 */
#define TP_IFACE_CONN_INTERFACE_AVATARS \ #define TP_IFACE_CONN_INTERFACE_AVATARS \
"org.freedesktop.Telepathy.Connection.Interface.Avatars" TP_IFACE_CONNECTION_INTERFACE_AVATARS
/**
* TP_IFACE_CONNECTION_INTERFACE_CAPABILITIES:
*
* The interface name "org.freedesktop.Telepathy.Connection.Interface.Capab
ilities"
*/
#define TP_IFACE_CONNECTION_INTERFACE_CAPABILITIES \
"org.freedesktop.Telepathy.Connection.Interface.Capabilities"
/**
* TP_IFACE_QUARK_CONNECTION_INTERFACE_CAPABILITIES:
*
* Expands to a call to a function that returns a quark for the interface n
ame "org.freedesktop.Telepathy.Connection.Interface.Capabilities"
*/
#define TP_IFACE_QUARK_CONNECTION_INTERFACE_CAPABILITIES \
(tp_iface_quark_connection_interface_capabilities ())
GQuark tp_iface_quark_connection_interface_capabilities (void);
/* Backwards compatibility with libtp < 0.3 */
#define TP_IFACE_CONN_INTERFACE_CAPABILITIES \ #define TP_IFACE_CONN_INTERFACE_CAPABILITIES \
"org.freedesktop.Telepathy.Connection.Interface.Capabilities" TP_IFACE_CONNECTION_INTERFACE_CAPABILITIES
/**
* TP_IFACE_CONNECTION_INTERFACE_CONTACT_INFO:
*
* The interface name "org.freedesktop.Telepathy.Connection.Interface.Conta
ctInfo"
*/
#define TP_IFACE_CONNECTION_INTERFACE_CONTACT_INFO \
"org.freedesktop.Telepathy.Connection.Interface.ContactInfo"
/**
* TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_INFO:
*
* Expands to a call to a function that returns a quark for the interface n
ame "org.freedesktop.Telepathy.Connection.Interface.ContactInfo"
*/
#define TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_INFO \
(tp_iface_quark_connection_interface_contact_info ())
GQuark tp_iface_quark_connection_interface_contact_info (void);
/* Backwards compatibility with libtp < 0.3 */
#define TP_IFACE_CONN_INTERFACE_CONTACT_INFO \ #define TP_IFACE_CONN_INTERFACE_CONTACT_INFO \
"org.freedesktop.Telepathy.Connection.Interface.ContactInfo" TP_IFACE_CONNECTION_INTERFACE_CONTACT_INFO
/**
* TP_IFACE_CONNECTION_INTERFACE_FORWARDING:
*
* The interface name "org.freedesktop.Telepathy.Connection.Interface.Forwa
rding"
*/
#define TP_IFACE_CONNECTION_INTERFACE_FORWARDING \
"org.freedesktop.Telepathy.Connection.Interface.Forwarding"
/**
* TP_IFACE_QUARK_CONNECTION_INTERFACE_FORWARDING:
*
* Expands to a call to a function that returns a quark for the interface n
ame "org.freedesktop.Telepathy.Connection.Interface.Forwarding"
*/
#define TP_IFACE_QUARK_CONNECTION_INTERFACE_FORWARDING \
(tp_iface_quark_connection_interface_forwarding ())
GQuark tp_iface_quark_connection_interface_forwarding (void);
/* Backwards compatibility with libtp < 0.3 */
#define TP_IFACE_CONN_INTERFACE_FORWARDING \ #define TP_IFACE_CONN_INTERFACE_FORWARDING \
"org.freedesktop.Telepathy.Connection.Interface.Forwarding" TP_IFACE_CONNECTION_INTERFACE_FORWARDING
/**
* TP_IFACE_CONNECTION_INTERFACE_PRESENCE:
*
* The interface name "org.freedesktop.Telepathy.Connection.Interface.Prese
nce"
*/
#define TP_IFACE_CONNECTION_INTERFACE_PRESENCE \
"org.freedesktop.Telepathy.Connection.Interface.Presence"
/**
* TP_IFACE_QUARK_CONNECTION_INTERFACE_PRESENCE:
*
* Expands to a call to a function that returns a quark for the interface n
ame "org.freedesktop.Telepathy.Connection.Interface.Presence"
*/
#define TP_IFACE_QUARK_CONNECTION_INTERFACE_PRESENCE \
(tp_iface_quark_connection_interface_presence ())
GQuark tp_iface_quark_connection_interface_presence (void);
/* Backwards compatibility with libtp < 0.3 */
#define TP_IFACE_CONN_INTERFACE_PRESENCE \ #define TP_IFACE_CONN_INTERFACE_PRESENCE \
"org.freedesktop.Telepathy.Connection.Interface.Presence" TP_IFACE_CONNECTION_INTERFACE_PRESENCE
/**
* TP_IFACE_CONNECTION_INTERFACE_PRIVACY:
*
* The interface name "org.freedesktop.Telepathy.Connection.Interface.Priva
cy"
*/
#define TP_IFACE_CONNECTION_INTERFACE_PRIVACY \
"org.freedesktop.Telepathy.Connection.Interface.Privacy"
/**
* TP_IFACE_QUARK_CONNECTION_INTERFACE_PRIVACY:
*
* Expands to a call to a function that returns a quark for the interface n
ame "org.freedesktop.Telepathy.Connection.Interface.Privacy"
*/
#define TP_IFACE_QUARK_CONNECTION_INTERFACE_PRIVACY \
(tp_iface_quark_connection_interface_privacy ())
GQuark tp_iface_quark_connection_interface_privacy (void);
/* Backwards compatibility with libtp < 0.3 */
#define TP_IFACE_CONN_INTERFACE_PRIVACY \ #define TP_IFACE_CONN_INTERFACE_PRIVACY \
"org.freedesktop.Telepathy.Connection.Interface.Privacy" TP_IFACE_CONNECTION_INTERFACE_PRIVACY
/**
* TP_IFACE_CONNECTION_INTERFACE_RENAMING:
*
* The interface name "org.freedesktop.Telepathy.Connection.Interface.Renam
ing"
*/
#define TP_IFACE_CONNECTION_INTERFACE_RENAMING \
"org.freedesktop.Telepathy.Connection.Interface.Renaming"
/**
* TP_IFACE_QUARK_CONNECTION_INTERFACE_RENAMING:
*
* Expands to a call to a function that returns a quark for the interface n
ame "org.freedesktop.Telepathy.Connection.Interface.Renaming"
*/
#define TP_IFACE_QUARK_CONNECTION_INTERFACE_RENAMING \
(tp_iface_quark_connection_interface_renaming ())
GQuark tp_iface_quark_connection_interface_renaming (void);
/* Backwards compatibility with libtp < 0.3 */
#define TP_IFACE_CONN_INTERFACE_RENAMING \ #define TP_IFACE_CONN_INTERFACE_RENAMING \
"org.freedesktop.Telepathy.Connection.Interface.Renaming" TP_IFACE_CONNECTION_INTERFACE_RENAMING
/**
* TP_IFACE_CHANNEL:
*
* The interface name "org.freedesktop.Telepathy.Channel"
*/
#define TP_IFACE_CHANNEL \ #define TP_IFACE_CHANNEL \
"org.freedesktop.Telepathy.Channel" "org.freedesktop.Telepathy.Channel"
/**
* TP_IFACE_QUARK_CHANNEL:
*
* Expands to a call to a function that returns a quark for the interface n
ame "org.freedesktop.Telepathy.Channel"
*/
#define TP_IFACE_QUARK_CHANNEL \
(tp_iface_quark_channel ())
GQuark tp_iface_quark_channel (void);
/**
* TP_IFACE_CHANNEL_TYPE_CONTACT_LIST:
*
* The interface name "org.freedesktop.Telepathy.Channel.Type.ContactList"
*/
#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"
#define TP_IFACE_CHANNEL_TYPE_CONTACT_SEARCH \
"org.freedesktop.Telepathy.Channel.Type.ContactSearch" /**
* TP_IFACE_QUARK_CHANNEL_TYPE_CONTACT_LIST:
*
* Expands to a call to a function that returns a quark for the interface n
ame "org.freedesktop.Telepathy.Channel.Type.ContactList"
*/
#define TP_IFACE_QUARK_CHANNEL_TYPE_CONTACT_LIST \
(tp_iface_quark_channel_type_contact_list ())
GQuark tp_iface_quark_channel_type_contact_list (void);
/**
* TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA:
*
* The interface name "org.freedesktop.Telepathy.Channel.Type.StreamedMedia
"
*/
#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"
/**
* TP_IFACE_QUARK_CHANNEL_TYPE_STREAMED_MEDIA:
*
* Expands to a call to a function that returns a quark for the interface n
ame "org.freedesktop.Telepathy.Channel.Type.StreamedMedia"
*/
#define TP_IFACE_QUARK_CHANNEL_TYPE_STREAMED_MEDIA \
(tp_iface_quark_channel_type_streamed_media ())
GQuark tp_iface_quark_channel_type_streamed_media (void);
/**
* TP_IFACE_CHANNEL_TYPE_ROOM_LIST:
*
* The interface name "org.freedesktop.Telepathy.Channel.Type.RoomList"
*/
#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"
/**
* TP_IFACE_QUARK_CHANNEL_TYPE_ROOM_LIST:
*
* Expands to a call to a function that returns a quark for the interface n
ame "org.freedesktop.Telepathy.Channel.Type.RoomList"
*/
#define TP_IFACE_QUARK_CHANNEL_TYPE_ROOM_LIST \
(tp_iface_quark_channel_type_room_list ())
GQuark tp_iface_quark_channel_type_room_list (void);
/**
* TP_IFACE_CHANNEL_TYPE_TEXT:
*
* The interface name "org.freedesktop.Telepathy.Channel.Type.Text"
*/
#define TP_IFACE_CHANNEL_TYPE_TEXT \ #define TP_IFACE_CHANNEL_TYPE_TEXT \
"org.freedesktop.Telepathy.Channel.Type.Text" "org.freedesktop.Telepathy.Channel.Type.Text"
/**
* TP_IFACE_QUARK_CHANNEL_TYPE_TEXT:
*
* Expands to a call to a function that returns a quark for the interface n
ame "org.freedesktop.Telepathy.Channel.Type.Text"
*/
#define TP_IFACE_QUARK_CHANNEL_TYPE_TEXT \
(tp_iface_quark_channel_type_text ())
GQuark tp_iface_quark_channel_type_text (void);
/**
* TP_IFACE_CHANNEL_TYPE_TUBES:
*
* The interface name "org.freedesktop.Telepathy.Channel.Type.Tubes"
*/
#define TP_IFACE_CHANNEL_TYPE_TUBES \ #define TP_IFACE_CHANNEL_TYPE_TUBES \
"org.freedesktop.Telepathy.Channel.Type.Tubes" "org.freedesktop.Telepathy.Channel.Type.Tubes"
/**
* TP_IFACE_QUARK_CHANNEL_TYPE_TUBES:
*
* Expands to a call to a function that returns a quark for the interface n
ame "org.freedesktop.Telepathy.Channel.Type.Tubes"
*/
#define TP_IFACE_QUARK_CHANNEL_TYPE_TUBES \
(tp_iface_quark_channel_type_tubes ())
GQuark tp_iface_quark_channel_type_tubes (void);
/**
* TP_IFACE_CHANNEL_INTERFACE_CHAT_STATE:
*
* The interface name "org.freedesktop.Telepathy.Channel.Interface.ChatStat
e"
*/
#define TP_IFACE_CHANNEL_INTERFACE_CHAT_STATE \ #define TP_IFACE_CHANNEL_INTERFACE_CHAT_STATE \
"org.freedesktop.Telepathy.Channel.Interface.ChatState" "org.freedesktop.Telepathy.Channel.Interface.ChatState"
/**
* TP_IFACE_QUARK_CHANNEL_INTERFACE_CHAT_STATE:
*
* Expands to a call to a function that returns a quark for the interface n
ame "org.freedesktop.Telepathy.Channel.Interface.ChatState"
*/
#define TP_IFACE_QUARK_CHANNEL_INTERFACE_CHAT_STATE \
(tp_iface_quark_channel_interface_chat_state ())
GQuark tp_iface_quark_channel_interface_chat_state (void);
/**
* TP_IFACE_CHANNEL_INTERFACE_DTMF:
*
* The interface name "org.freedesktop.Telepathy.Channel.Interface.DTMF"
*/
#define TP_IFACE_CHANNEL_INTERFACE_DTMF \ #define TP_IFACE_CHANNEL_INTERFACE_DTMF \
"org.freedesktop.Telepathy.Channel.Interface.DTMF" "org.freedesktop.Telepathy.Channel.Interface.DTMF"
/**
* TP_IFACE_QUARK_CHANNEL_INTERFACE_DTMF:
*
* Expands to a call to a function that returns a quark for the interface n
ame "org.freedesktop.Telepathy.Channel.Interface.DTMF"
*/
#define TP_IFACE_QUARK_CHANNEL_INTERFACE_DTMF \
(tp_iface_quark_channel_interface_dtmf ())
GQuark tp_iface_quark_channel_interface_dtmf (void);
/**
* TP_IFACE_CHANNEL_INTERFACE_GROUP:
*
* The interface name "org.freedesktop.Telepathy.Channel.Interface.Group"
*/
#define TP_IFACE_CHANNEL_INTERFACE_GROUP \ #define TP_IFACE_CHANNEL_INTERFACE_GROUP \
"org.freedesktop.Telepathy.Channel.Interface.Group" "org.freedesktop.Telepathy.Channel.Interface.Group"
/**
* TP_IFACE_QUARK_CHANNEL_INTERFACE_GROUP:
*
* Expands to a call to a function that returns a quark for the interface n
ame "org.freedesktop.Telepathy.Channel.Interface.Group"
*/
#define TP_IFACE_QUARK_CHANNEL_INTERFACE_GROUP \
(tp_iface_quark_channel_interface_group ())
GQuark tp_iface_quark_channel_interface_group (void);
/**
* TP_IFACE_CHANNEL_INTERFACE_HOLD:
*
* The interface name "org.freedesktop.Telepathy.Channel.Interface.Hold"
*/
#define TP_IFACE_CHANNEL_INTERFACE_HOLD \ #define TP_IFACE_CHANNEL_INTERFACE_HOLD \
"org.freedesktop.Telepathy.Channel.Interface.Hold" "org.freedesktop.Telepathy.Channel.Interface.Hold"
/**
* TP_IFACE_QUARK_CHANNEL_INTERFACE_HOLD:
*
* Expands to a call to a function that returns a quark for the interface n
ame "org.freedesktop.Telepathy.Channel.Interface.Hold"
*/
#define TP_IFACE_QUARK_CHANNEL_INTERFACE_HOLD \
(tp_iface_quark_channel_interface_hold ())
GQuark tp_iface_quark_channel_interface_hold (void);
/**
* TP_IFACE_CHANNEL_INTERFACE_PASSWORD:
*
* The interface name "org.freedesktop.Telepathy.Channel.Interface.Password
"
*/
#define TP_IFACE_CHANNEL_INTERFACE_PASSWORD \ #define TP_IFACE_CHANNEL_INTERFACE_PASSWORD \
"org.freedesktop.Telepathy.Channel.Interface.Password" "org.freedesktop.Telepathy.Channel.Interface.Password"
/**
* TP_IFACE_QUARK_CHANNEL_INTERFACE_PASSWORD:
*
* Expands to a call to a function that returns a quark for the interface n
ame "org.freedesktop.Telepathy.Channel.Interface.Password"
*/
#define TP_IFACE_QUARK_CHANNEL_INTERFACE_PASSWORD \
(tp_iface_quark_channel_interface_password ())
GQuark tp_iface_quark_channel_interface_password (void);
/**
* TP_IFACE_CHANNEL_INTERFACE_TRANSFER:
*
* The interface name "org.freedesktop.Telepathy.Channel.Interface.Transfer
"
*/
#define TP_IFACE_CHANNEL_INTERFACE_TRANSFER \ #define TP_IFACE_CHANNEL_INTERFACE_TRANSFER \
"org.freedesktop.Telepathy.Channel.Interface.Transfer" "org.freedesktop.Telepathy.Channel.Interface.Transfer"
/**
* TP_IFACE_QUARK_CHANNEL_INTERFACE_TRANSFER:
*
* Expands to a call to a function that returns a quark for the interface n
ame "org.freedesktop.Telepathy.Channel.Interface.Transfer"
*/
#define TP_IFACE_QUARK_CHANNEL_INTERFACE_TRANSFER \
(tp_iface_quark_channel_interface_transfer ())
GQuark tp_iface_quark_channel_interface_transfer (void);
/**
* TP_IFACE_CHANNEL_INTERFACE_MEDIA_SIGNALLING:
*
* The interface name "org.freedesktop.Telepathy.Channel.Interface.MediaSig
nalling"
*/
#define TP_IFACE_CHANNEL_INTERFACE_MEDIA_SIGNALLING \ #define TP_IFACE_CHANNEL_INTERFACE_MEDIA_SIGNALLING \
"org.freedesktop.Telepathy.Channel.Interface.MediaSignalling" "org.freedesktop.Telepathy.Channel.Interface.MediaSignalling"
/**
* TP_IFACE_QUARK_CHANNEL_INTERFACE_MEDIA_SIGNALLING:
*
* Expands to a call to a function that returns a quark for the interface n
ame "org.freedesktop.Telepathy.Channel.Interface.MediaSignalling"
*/
#define TP_IFACE_QUARK_CHANNEL_INTERFACE_MEDIA_SIGNALLING \
(tp_iface_quark_channel_interface_media_signalling ())
GQuark tp_iface_quark_channel_interface_media_signalling (void);
/**
* TP_IFACE_MEDIA_SESSION_HANDLER:
*
* The interface name "org.freedesktop.Telepathy.Media.SessionHandler"
*/
#define TP_IFACE_MEDIA_SESSION_HANDLER \ #define TP_IFACE_MEDIA_SESSION_HANDLER \
"org.freedesktop.Telepathy.Media.SessionHandler" "org.freedesktop.Telepathy.Media.SessionHandler"
/**
* TP_IFACE_QUARK_MEDIA_SESSION_HANDLER:
*
* Expands to a call to a function that returns a quark for the interface n
ame "org.freedesktop.Telepathy.Media.SessionHandler"
*/
#define TP_IFACE_QUARK_MEDIA_SESSION_HANDLER \
(tp_iface_quark_media_session_handler ())
GQuark tp_iface_quark_media_session_handler (void);
/**
* TP_IFACE_MEDIA_STREAM_HANDLER:
*
* The interface name "org.freedesktop.Telepathy.Media.StreamHandler"
*/
#define TP_IFACE_MEDIA_STREAM_HANDLER \ #define TP_IFACE_MEDIA_STREAM_HANDLER \
"org.freedesktop.Telepathy.Media.StreamHandler" "org.freedesktop.Telepathy.Media.StreamHandler"
/**
* TP_IFACE_QUARK_MEDIA_STREAM_HANDLER:
*
* Expands to a call to a function that returns a quark for the interface n
ame "org.freedesktop.Telepathy.Media.StreamHandler"
*/
#define TP_IFACE_QUARK_MEDIA_STREAM_HANDLER \
(tp_iface_quark_media_stream_handler ())
GQuark tp_iface_quark_media_stream_handler (void);
/**
* TP_IFACE_PROPERTIES_INTERFACE:
*
* The interface name "org.freedesktop.Telepathy.Properties"
*/
#define TP_IFACE_PROPERTIES_INTERFACE \ #define TP_IFACE_PROPERTIES_INTERFACE \
"org.freedesktop.Telepathy.Properties" "org.freedesktop.Telepathy.Properties"
/**
* TP_IFACE_QUARK_PROPERTIES_INTERFACE:
*
* Expands to a call to a function that returns a quark for the interface n
ame "org.freedesktop.Telepathy.Properties"
*/
#define TP_IFACE_QUARK_PROPERTIES_INTERFACE \
(tp_iface_quark_properties_interface ())
GQuark tp_iface_quark_properties_interface (void);
 End of changes. 29 change blocks. 
29 lines changed or deleted 510 lines changed or added


 tp-chan-ifaces-signal-setters.h   tp-chan-ifaces-signal-setters.h 
/* tp-chan-ifaces-signal-setters.h /* tp-chan-ifaces-signal-setters.h
* *
* Copyright (C) 2005 Nokia Corporation. * Copyright (C) 2005-2007 Nokia Corporation
* Copyright (C) 2006-2007 Collabora Ltd. <http://www.collabora.co.uk/>
* *
* 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.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
*/ */
#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 void tp_chan_set_streamedmedia_signatures (DBusGProxy *proxy);
'g' signature */
#if 0
void tp_chan_set_contactsearch_signatures(DBusGProxy *proxy);
#endif
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_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);
void tp_chan_set_tubes_signatures(DBusGProxy *proxy); void tp_chan_set_tubes_signatures (DBusGProxy *proxy);
#endif #endif
 End of changes. 12 change blocks. 
20 lines changed or deleted 13 lines changed or added


 tp-chan.h   tp-chan.h 
/* tp-chan.h /* tp-chan.h
* *
* Copyright (C) 2005 Nokia Corporation. * Copyright (C) 2005-2007 Nokia Corporation
* Copyright (C) 2006-2007 Collabora Ltd. <http://www.collabora.co.uk/>
* *
* 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.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
*/ */
#ifndef TP_CHAN_H #ifndef TP_CHAN_H
#define TP_CHAN_H #define TP_CHAN_H
#ifndef DBUS_API_SUBJECT_TO_CHANGE #ifndef DBUS_API_SUBJECT_TO_CHANGE
#define DBUS_API_SUBJECT_TO_CHANGE #define DBUS_API_SUBJECT_TO_CHANGE
#endif #endif
#include "tp-chan-gen.h" #include "tp-chan-gen.h"
#include "tp-interfaces.h" #include "tp-interfaces.h"
#include "tp-chan-signals-marshal.h" #include "tp-chan-signals-marshal.h"
#include "tp-ifaces-signals-marshal.h" #include "tp-ifaces-signals-marshal.h"
#include "tp-chan-ifaces-signal-setters.h" #include "tp-chan-ifaces-signal-setters.h"
#include <dbus/dbus-glib.h> #include <dbus/dbus-glib.h>
#include <dbus/dbus.h> #include <dbus/dbus.h>
#define TELEPATHY_CHAN_TYPE (tp_chan_get_type ()) #define TELEPATHY_CHAN_TYPE (tp_chan_get_type ())
#define TELEPATHY_CHAN(obj) (G_TYPE_CHECK_INSTANCE_CAST \ #define TELEPATHY_CHAN(obj) (G_TYPE_CHECK_INSTANCE_CAST \
((obj), TELEPATHY_CHAN_TYPE, \ ((obj), TELEPATHY_CHAN_TYPE, TpChan))
TpChan))
#define TELEPATHY_CHAN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST \ #define TELEPATHY_CHAN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST \
((klass), TELEPATHY_CHAN_TYPE, ((klass), TELEPATHY_CHAN_TYPE, TpChanClass))
\
TpChanClass))
#define TELEPATHY_IS_CHAN(obj) (G_TYPE_CHECK_INSTANCE_TYPE \ #define TELEPATHY_IS_CHAN(obj) (G_TYPE_CHECK_INSTANCE_TYPE \
((obj), TELEPATHY_CHAN_TYPE)) ((obj), TELEPATHY_CHAN_TYPE))
#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))
/* For backwards compatibility only. */
#ifndef LIBTELEPATHY_DISABLE_DEPRECATED
#define TELEPATHY_CHAN_IFACE_QUARK \
TP_IFACE_QUARK_CHANNEL
#define TELEPATHY_CHAN_IFACE_CONTACTLIST_QUARK \
TP_IFACE_QUARK_CONTACT_LIST
#define TELEPATHY_CHAN_IFACE_STREAMED_QUARK \
TP_IFACE_QUARK_CHANNEL_TYPE_STREAMED_MEDIA
#define TELEPATHY_CHAN_IFACE_ROOMLIST_QUARK \
TP_IFACE_QUARK_CHANNEL_TYPE_ROOM_LIST
#define TELEPATHY_CHAN_IFACE_TEXT_QUARK \
TP_IFACE_QUARK_CHANNEL_TYPE_TEXT
#define TELEPATHY_CHAN_IFACE_DTMF_QUARK \
TP_IFACE_QUARK_CHANNEL_INTERFACE_DTMF
#define TELEPATHY_CHAN_IFACE_CHAT_STATE_QUARK \
TP_IFACE_QUARK_CHANNEL_INTERFACE_CHAT_STATE
#define TELEPATHY_CHAN_IFACE_GROUP_QUARK \
TP_IFACE_QUARK_CHANNEL_INTERFACE_GROUP
#define TELEPATHY_CHAN_IFACE_HOLD_QUARK \
TP_IFACE_QUARK_CHANNEL_INTERFACE_HOLD
#define TELEPATHY_CHAN_IFACE_PASSWORD_QUARK \
TP_IFACE_QUARK_CHANNEL_INTERFACE_PASSWORD
#define TELEPATHY_CHAN_IFACE_TRANSFER_QUARK \
TP_IFACE_QUARK_CHANNEL_INTERFACE_TRANSFER
#define TELEPATHY_CHAN_IFACE_MEDIA_SIGNALLING_QUARK \
TP_IFACE_QUARK_CHANNEL_INTERFACE_MEDIA_SIGNALLING
#define TELEPATHY_CHAN_IFACE_TUBES_QUARK \
TP_IFACE_QUARK_CHANNEL_TYPE_TUBES
#define TELEPATHY_CHAN_IFACE_QUARK (tp_get_chan_interface())
#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())
#endif #endif
#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_TEXT_QUARK (tp_get_chan_text_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_HOLD_QUARK (tp_get_chan_hold_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_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;
GData *interface_list; GData *interface_list;
gboolean first_run; gboolean first_run;
}; };
struct _tp_chanclass struct _tp_chanclass
{ {
DBusGProxyClass parent_class; DBusGProxyClass parent_class;
GData *iface_signal_sigs; GData *iface_signal_sigs;
}; };
GType tp_chan_get_type(void); GType tp_chan_get_type (void);
/* Actual function definitions */ /* Actual function definitions */
/* /*
* Creates a new channel object. * Creates a new channel object.
* *
* @param connection: The D-BUS connection for this channel. * @param connection: The D-BUS connection for this channel.
* @param bus_name: The D-BUS bus name for this channel. * @param bus_name: The D-BUS bus name for this channel.
* @param object_name: The name of the D-BUS path for this channel. * @param object_name: The name of the D-BUS path for this channel.
* @param type: The type string for this channel. * @param type: The type string for this channel.
* @param handle_type: The type of this channel. * @param handle_type: The type of this channel.
* @param handle: The handle of this channel, will be filled by this call. * @param handle: The handle of this channel, will be filled by this call.
* @return A new TpChan (channel) object, or NULL if unsuccesfull * @return A new TpChan (channel) object, or NULL if unsuccesfull
*/ */
TpChan *tp_chan_new(DBusGConnection *connection, const gchar *bus_name, TpChan *tp_chan_new (DBusGConnection *connection, const gchar *bus_name,
const gchar *object_path, const gchar *type, const gchar *object_path, const gchar *type,
guint handle_type, guint handle); guint handle_type, guint handle);
/* Create and store the D-BUS proxy objects for the interfaces provided /* Create and store the D-BUS proxy objects for the interfaces provided
* by this channel. Expects data provided by the GetInterfaces method. * by this channel. Expects data provided by the GetInterfaces method.
* *
* @param self: The channel object whose interfaces will be stored. * @param self: The channel object whose interfaces will be stored.
* @param interfaces: The array of strings containing the interface names * @param interfaces: The array of strings containing the interface names
* *
*/ */
void tp_chan_local_set_interfaces(TpChan *self, gchar **interfaces); void tp_chan_local_set_interfaces (TpChan *self, gchar **interfaces);
/* /*
* This function checks whether the channel has the specified * This function checks whether the channel has the specified
* interface and returns a proxy object that can be used to call * interface and returns a proxy object that can be used to call
* its methods, if it exists. The supported interfaces are listed * its methods, if it exists. The supported interfaces are listed
* in the beginning of this header as macros. * in the beginning of this header as macros.
* *
* @param self The channel object that is queried for the interface * @param self The channel object that is queried for the interface
* 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); #ifndef LIBTELEPATHY_DISABLE_DEPRECATED
GQuark tp_get_chan_contactlist_interface(void); GQuark tp_get_chan_interface (void) G_GNUC_DEPRECATED;
/* TODO: Enable this again when dbus-binding-tool supports GQuark tp_get_chan_contactlist_interface (void) G_GNUC_DEPRECATED;
'g' signature */ GQuark tp_get_chan_streamed_interface (void) G_GNUC_DEPRECATED;
#if 0 GQuark tp_get_chan_roomlist_interface (void) G_GNUC_DEPRECATED;
GQuark tp_get_chan_contactsearch_interface(void); GQuark tp_get_chan_text_interface (void) G_GNUC_DEPRECATED;
GQuark tp_get_chan_dtmf_interface (void) G_GNUC_DEPRECATED;
GQuark tp_get_chan_chat_state_interface (void) G_GNUC_DEPRECATED;
GQuark tp_get_chan_group_interface (void) G_GNUC_DEPRECATED;
GQuark tp_get_chan_hold_interface (void) G_GNUC_DEPRECATED;
GQuark tp_get_chan_password_interface (void) G_GNUC_DEPRECATED;
GQuark tp_get_chan_transfer_interface (void) G_GNUC_DEPRECATED;
GQuark tp_get_chan_media_signalling_interface (void) G_GNUC_DEPRECATED;
GQuark tp_get_chan_tubes_interface (void) G_GNUC_DEPRECATED;
#endif #endif
GQuark tp_get_chan_streamed_interface(void);
GQuark tp_get_chan_roomlist_interface(void);
GQuark tp_get_chan_text_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_hold_interface(void);
GQuark tp_get_chan_password_interface(void);
GQuark tp_get_chan_transfer_interface(void);
GQuark tp_get_chan_media_signalling_interface(void);
GQuark tp_get_chan_tubes_interface(void);
#endif #endif
 End of changes. 16 change blocks. 
67 lines changed or deleted 65 lines changed or added


 tp-conn-ifaces-signal-setters.h   tp-conn-ifaces-signal-setters.h 
/* tp-conn-ifaces-signal-setters.h /* tp-conn-ifaces-signal-setters.h
* *
* Copyright (C) 2005 Nokia Corporation. * Copyright (C) 2005-2007 Nokia Corporation
* Copyright (C) 2006-2007 Collabora Ltd. <http://www.collabora.co.uk/>
* *
* 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.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
*/ */
#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_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);
void tp_conn_set_renaming_signatures(DBusGProxy *proxy); void tp_conn_set_renaming_signatures (DBusGProxy *proxy);
#endif #endif
 End of changes. 10 change blocks. 
11 lines changed or deleted 11 lines changed or added


 tp-conn.h   tp-conn.h 
/* tp-conn.h /* tp-conn.h
* *
* Copyright (C) 2005 Nokia Corporation. * Copyright (C) 2005-2007 Nokia Corporation
* Copyright (C) 2006-2007 Collabora Ltd. <http://www.collabora.co.uk/>
* *
* 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.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
*/ */
#ifndef TP_CONN_H #ifndef TP_CONN_H
#define TP_CONN_H #define TP_CONN_H
#ifndef DBUS_API_SUBJECT_TO_CHANGE #ifndef DBUS_API_SUBJECT_TO_CHANGE
#define DBUS_API_SUBJECT_TO_CHANGE #define DBUS_API_SUBJECT_TO_CHANGE
#endif #endif
#include "tp-conn-gen.h" #include "tp-conn-gen.h"
skipping to change at line 43 skipping to change at line 43
#include "tp-conn-ifaces-signal-setters.h" #include "tp-conn-ifaces-signal-setters.h"
#include "tp-interfaces.h" #include "tp-interfaces.h"
#include "tp-constants.h" #include "tp-constants.h"
#include <dbus/dbus-glib.h> #include <dbus/dbus-glib.h>
#define DBUS_TYPE_G_ARRAY_OF_STRUCTS dbus_g_type_get_collection ("GPtrArray ", G_TYPE_VALUE_ARRAY); #define DBUS_TYPE_G_ARRAY_OF_STRUCTS dbus_g_type_get_collection ("GPtrArray ", G_TYPE_VALUE_ARRAY);
#define TELEPATHY_CONN_TYPE (tp_conn_get_type ()) #define TELEPATHY_CONN_TYPE (tp_conn_get_type ())
#define TELEPATHY_CONN(obj) (G_TYPE_CHECK_INSTANCE_CAST \ #define TELEPATHY_CONN(obj) (G_TYPE_CHECK_INSTANCE_CAST \
((obj), TELEPATHY_CONN_TYPE, \ ((obj), TELEPATHY_CONN_TYPE, TpConn))
TpConn))
#define TELEPATHY_CONN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST \ #define TELEPATHY_CONN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST \
((klass), TELEPATHY_CONN_TYPE, \ ((klass), TELEPATHY_CONN_TYPE, TpConnClass))
TpConnClass))
#define TELEPATHY_IS_CONN(obj) (G_TYPE_CHECK_INSTANCE_TYPE \ #define TELEPATHY_IS_CONN(obj) (G_TYPE_CHECK_INSTANCE_TYPE \
((obj), TELEPATHY_CONN_TYPE)) ((obj), TELEPATHY_CONN_TYPE))
#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()) #ifndef LIBTELEPATHY_DISABLE_DEPRECATED
#define TELEPATHY_CONN_IFACE_ALIASING_QUARK (tp_get_conn_aliasing_interface
()) /* For backwards compatibility only. Use TP_IFACE_QUARK_* in new code */
#define TELEPATHY_CONN_IFACE_AVATARS_QUARK (tp_get_conn_avatars_interface() #define TELEPATHY_CONN_IFACE_QUARK \
) TP_IFACE_QUARK_CONNECTION_INTERFACE
#define TELEPATHY_CONN_IFACE_CAPABILITIES_QUARK (tp_get_conn_capabilities_i #define TELEPATHY_CONN_IFACE_ALIASING_QUARK \
nterface()) TP_IFACE_QUARK_CONNECTION_INTERFACE_ALIASING
#define TELEPATHY_CONN_IFACE_CONTACTINFO_QUARK (tp_get_conn_contactinfo_int #define TELEPATHY_CONN_IFACE_AVATARS_QUARK \
erface()) TP_IFACE_QUARK_CONNECTION_INTERFACE_AVATARS
#define TELEPATHY_CONN_IFACE_FORWARDING_QUARK (tp_get_conn_forwarding_inter #define TELEPATHY_CONN_IFACE_CAPABILITIES_QUARK \
face()) TP_IFACE_QUARK_CONNECTION_INTERFACE_CAPABILITIES
#define TELEPATHY_CONN_IFACE_PRESENCE_QUARK (tp_get_conn_presence_interface #define TELEPATHY_CONN_IFACE_CONTACTINFO_QUARK \
()) TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_INFO
#define TELEPATHY_CONN_IFACE_PRIVACY_QUARK (tp_get_conn_privacy_interface() #define TELEPATHY_CONN_IFACE_FORWARDING_QUARK \
) TP_IFACE_QUARK_CONNECTION_INTERFACE_FORWARDING
#define TELEPATHY_CONN_IFACE_RENAMING_QUARK (tp_get_conn_renaming_interface #define TELEPATHY_CONN_IFACE_PRESENCE_QUARK \
()) TP_IFACE_QUARK_CONNECTION_INTERFACE_PRESENCE
#define TELEPATHY_CONN_IFACE_PRIVACY_QUARK \
TP_IFACE_QUARK_CONNECTION_INTERFACE_PRIVACY
#define TELEPATHY_CONN_IFACE_RENAMING_QUARK \
TP_IFACE_QUARK_CONNECTION_INTERFACE_RENAMING
#endif
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;
}; };
struct _tp_connclass struct _tp_connclass
{ {
DBusGProxyClass parent_class; DBusGProxyClass parent_class;
GData *iface_signal_sigs; GData *iface_signal_sigs;
}; };
GType tp_conn_get_type(void); GType tp_conn_get_type (void);
/* Actual function definitions */ /* Actual function definitions */
/* /*
* Create a new TpConn (Connection) object. * Create a new TpConn (Connection) object and try to connect asynchronousl y.
* *
* @param connection The D-BUS connection * @param connection The D-BUS connection
* @param name: The D-BUS service name for the connection object * @param name: The D-BUS service name for the connection object
* @param path_name: The D-BUS path name for the connection object * @param path_name: The D-BUS path name for the connection object
* @param interface_name: The D-BUS interface name for the connection objec t * @param interface_name: The D-BUS interface name for the connection objec t
* @return A new TpConn connection object, or NULL if unsuccesful. * @return A new TpConn connection object, or NULL if unsuccesful.
*
* @deprecated since 0.3.0. Use tp_conn_new_without_connect() instead
*/ */
TpConn *tp_conn_new(DBusGConnection *connection, #ifndef LIBTELEPATHY_DISABLE_DEPRECATED
const char *bus_name, TpConn *tp_conn_new (DBusGConnection *connection, const char *bus_name,
const char *object_path); const char *object_path) G_GNUC_DEPRECATED;
#endif
/* Create a new #TpConn and connect signal handlers, but do not try to conn ect /* Create a new #TpConn and connect signal handlers, but do not try to conn ect
* asynchronously. * asynchronously.
* *
* If TP_CONN_STATUS_CONNECTED is written through @status, the new connecti * If TP_CONNECTION_STATUS_CONNECTED is written through @status, the new
on * connection is connected, and has its interfaces set up and is ready for
* is connected, and has its interfaces set up and is ready for use. use.
* Otherwise, the caller is responsible for calling Connect and waiting for * Otherwise, the caller is responsible for calling Connect and waiting for
* the connection attempt to either succeed or fail. * the connection attempt to either succeed or fail.
* *
* @param connection: A bus connection * @param connection: A bus connection
* @param bus_name: The bus name of the CM * @param bus_name: The bus name of the CM
* @param object_path: The object path at that bus name for which a proxy i s * @param object_path: The object path at that bus name for which a proxy i s
* required * required
* @param status: Used to return the connection's status at the time we fou nd * @param status: Used to return the connection's status at the time we fou nd
* it * it
* @param error: Used to return the error if NULL is returned * @param error: Used to return the error if NULL is returned
skipping to change at line 144 skipping to change at line 158
* @param type: The channel type string * @param type: The channel type string
* @param handle_type: The type of the channel handle * @param handle_type: The type of the channel handle
* @param handle: The channel handle value is set and stored here after * @param handle: The channel handle value is set and stored here after
* @param the call returns. * @param the call returns.
* @param supress_handler: if TRUE, indicates that no handler needs to be * @param supress_handler: if TRUE, indicates that no handler needs to be
* launched * launched
* *
* @return A new TpChan (channel) object * @return A new TpChan (channel) object
*/ */
TpChan *tp_conn_new_channel(DBusGConnection *connection, TpConn *tpconn, TpChan *tp_conn_new_channel (DBusGConnection *connection, TpConn *tpconn,
const gchar *bus_name, const gchar *bus_name, gchar *type, guint handle_type, guint handle,
gchar *type, guint handle_type, gboolean supress_handler);
guint handle, gboolean supress_handler);
/* Creates the proxy objects for the channel interfaces. GetInterfaces /* Creates the proxy objects for the channel interfaces. GetInterfaces
* method should be called before this to acquire the interface name * method should be called before this to acquire the interface name
* list. * list.
* *
* @param self: The connection object * @param self: The connection object
* @param interfaces: An array of the interface name strings * @param interfaces: An array of the interface name strings
*/ */
void tp_conn_local_set_interfaces(TpConn *self, gchar **interfaces); void tp_conn_local_set_interfaces (TpConn *self, gchar **interfaces);
/* /*
* This function checks whether the Connection has the specified * This function checks whether the Connection has the specified
* interface and returns a proxy object that can be used to call * interface and returns a proxy object that can be used to call
* its methods, if it exists. The supported interfaces are listed * its methods, if it exists. The supported interfaces are listed
* in the beginning of this header as macros. * in the beginning of this header as macros.
* *
* @param self The connection object that is queried for the * @param self The connection object that is queried for the
* 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); #ifndef LIBTELEPATHY_DISABLE_DEPRECATED
GQuark tp_get_conn_aliasing_interface(void); GQuark tp_get_conn_interface (void) G_GNUC_DEPRECATED;
GQuark tp_get_conn_avatars_interface(void); GQuark tp_get_conn_aliasing_interface (void) G_GNUC_DEPRECATED;
GQuark tp_get_conn_capabilities_interface(void); GQuark tp_get_conn_avatars_interface (void) G_GNUC_DEPRECATED;
GQuark tp_get_conn_contactinfo_interface(void); GQuark tp_get_conn_capabilities_interface (void) G_GNUC_DEPRECATED;
GQuark tp_get_conn_forwarding_interface(void); GQuark tp_get_conn_contactinfo_interface (void) G_GNUC_DEPRECATED;
GQuark tp_get_conn_presence_interface(void); GQuark tp_get_conn_forwarding_interface (void) G_GNUC_DEPRECATED;
GQuark tp_get_conn_privacy_interface(void); GQuark tp_get_conn_presence_interface (void) G_GNUC_DEPRECATED;
GQuark tp_get_conn_renaming_interface(void); GQuark tp_get_conn_privacy_interface (void) G_GNUC_DEPRECATED;
GQuark tp_get_conn_renaming_interface (void) G_GNUC_DEPRECATED;
#endif
#endif #endif
 End of changes. 17 change blocks. 
56 lines changed or deleted 63 lines changed or added


 tp-connmgr.h   tp-connmgr.h 
/* tp-connmgr.h /* tp-connmgr.h
* *
* Copyright (C) 2005 Nokia Corporation. * Copyright (C) 2005-2007 Nokia Corporation
* Copyright (C) 2006-2007 Collabora Ltd. <http://www.collabora.co.uk/>
* *
* 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.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
*/ */
#ifndef TP_CONNMGR_H #ifndef TP_CONNMGR_H
#define TP_CONNMGR_H #define TP_CONNMGR_H
#ifndef DBUS_API_SUBJECT_TO_CHANGE #ifndef DBUS_API_SUBJECT_TO_CHANGE
#define DBUS_API_SUBJECT_TO_CHANGE #define DBUS_API_SUBJECT_TO_CHANGE
#endif #endif
#include "tp-connmgr-gen.h" #include "tp-connmgr-gen.h"
#include "tp-conn.h" #include "tp-conn.h"
#include <dbus/dbus-glib.h> #include <dbus/dbus-glib.h>
#include <dbus/dbus-glib-lowlevel.h> #include <dbus/dbus-glib-lowlevel.h>
#include <dbus/dbus.h> #include <dbus/dbus.h>
#include <glib.h> #include <glib.h>
#define TELEPATHY_CONNMGR_TYPE (tp_connmgr_get_type ()) #define TELEPATHY_CONNMGR_TYPE (tp_connmgr_get_type ())
#define TELEPATHY_CONNMGR(obj) (G_TYPE_CHECK_INSTANCE_CAST \ #define TELEPATHY_CONNMGR(obj) (G_TYPE_CHECK_INSTANCE_CAST \
((obj), TELEPATHY_CONNMGR_TYPE, \ ((obj), TELEPATHY_CONNMGR_TYPE, TpConnMgr))
TpConnMgr))
#define TELEPATHY_CONNMGR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST \ #define TELEPATHY_CONNMGR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST \
((klass), TELEPATHY_CONNMGR_TYPE, ((klass), TELEPATHY_CONNMGR_TYPE, TpConnMgrClass))
\
TpConnMgrClass))
#define TELEPATHY_IS_CONNMGR(obj) (G_TYPE_CHECK_INSTANCE_TYPE \ #define TELEPATHY_IS_CONNMGR(obj) (G_TYPE_CHECK_INSTANCE_TYPE \
((obj), TELEPATHY_CONNMGR_TYPE)) ((obj), TELEPATHY_CONNMGR_TYPE))
#define TELEPATHY_IS_CONNMGR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE \ #define TELEPATHY_IS_CONNMGR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE \
((klass), TELEPATHY_CONNMGR_TYPE) ((klass), TELEPATHY_CONNMGR_TYPE))
)
#define TELEPATHY_CONNMGR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS \ #define TELEPATHY_CONNMGR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS \
((obj), TELEPATHY_CONNMGR_TYPE, ((obj), TELEPATHY_CONNMGR_TYPE, TpConnMgrClass))
\
TpConnMgrClass))
typedef struct _tp_connmgr TpConnMgr; typedef struct _tp_connmgr TpConnMgr;
typedef struct _tp_connmgrclass TpConnMgrClass; typedef struct _tp_connmgrclass TpConnMgrClass;
struct _tp_connmgr struct _tp_connmgr
{ {
DBusGProxy parent; DBusGProxy parent;
gboolean first_run; gboolean first_run;
}; };
struct _tp_connmgrclass struct _tp_connmgrclass
{ {
DBusGProxyClass parent_class; DBusGProxyClass parent_class;
}; };
GType tp_connmgr_get_type(void); GType tp_connmgr_get_type (void);
/* Actual function definitions */ /* Actual function definitions */
/* /*
* Creates a new TpConnmgr (Connection Manager) object. * Creates a new TpConnmgr (Connection Manager) object.
* @param connection: A connection to the D-BUS. * @param connection: A connection to the D-BUS.
* @param name: The service name for the connection manager * @param name: The service name for the connection manager
* @param path_name: The path name for the connection manager * @param path_name: The path name for the connection manager
* @param interface_name: The interface name for the connection manager * @param interface_name: The interface name for the connection manager
* @return A new Connection Manager object, or NULL if failed * @return A new Connection Manager object, or NULL if failed
*/ */
TpConnMgr *tp_connmgr_new(DBusGConnection *connection, TpConnMgr *tp_connmgr_new (DBusGConnection *connection,
const char *bus_name, const char *bus_name, const char *object_path,
const char *object_path, const char *interface_name);
const char *interface_name);
/* /*
* Creates a new TpConn object for this connection manager. * Creates a new TpConn object for this connection manager.
* Also initializes a DBusGProxy object that is used to perform the * Also initializes a DBusGProxy object that is used to perform the
* actual method calls. Thus, the connection should be usable * actual method calls. Thus, the connection should be usable
* if this succeeds. * if this succeeds.
* *
* @param self: The connection manager object that the new connection * @param self: The connection manager object that the new connection
* object is created for. * object is created for.
* @param connection_parameters: The parameters for the connection. * @param connection_parameters: The parameters for the connection.
* @protocol: The protocol for the connection. * @protocol: The protocol for the connection.
* *
* @return A TpConn object, or NULL if object could not be created. * @return A TpConn object, or NULL if object could not be created.
*/ */
TpConn *tp_connmgr_new_connection(TpConnMgr *self, TpConn *tp_connmgr_new_connection_without_connect (TpConnMgr *self,
GHashTable *connection_parameters, GHashTable *connection_parameters, gchar *protocol,
gchar *protocol); guint *status, GError **error);
#ifndef LIBTELEPATHY_DISABLE_DEPRECATED
/*
* Creates a new TpConn object for this connection manager.
* Also initializes a DBusGProxy object that is used to perform the
* actual method calls. Thus, the connection should be usable
* if this succeeds.
*
* @param self: The connection manager object that the new connection
* object is created for.
* @param connection_parameters: The parameters for the connection.
* @protocol: The protocol for the connection.
*
* @return A TpConn object, or NULL if object could not be created.
*/
TpConn *tp_connmgr_new_connection (TpConnMgr *self,
GHashTable *connection_parameters, gchar *protocol);
#endif
#endif #endif
 End of changes. 11 change blocks. 
28 lines changed or deleted 40 lines changed or added


 tp-constants.h   tp-constants.h 
skipping to change at line 25 skipping to change at line 25
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* 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
#include <libtelepathy/_gen-tp-constants.h> #include <libtelepathy/_gen-tp-constants.h>
#ifndef LIBTELEPATHY_DISABLE_DEPRECATED #ifndef LIBTELEPATHY_DISABLE_DEPRECATED
/* Fixup for libtelepathy conventions differing from telepathy-glib */
#include <libtelepathy/_gen-tp-constants-aliases.h>
/* Fixup for bits of libtelepathy that didn't follow convention */ /* Fixup for bits of libtelepathy that didn't follow convention */
/* handle type is officially no longer called "connection handle type" */ /* handle type is officially no longer called "connection handle type" */
#define TP_CONN_HANDLE_TYPE_NONE TP_HANDLE_TYPE_NONE #define TP_CONN_HANDLE_TYPE_NONE TP_HANDLE_TYPE_NONE
#define TP_CONN_HANDLE_TYPE_CONTACT TP_HANDLE_TYPE_CONTACT #define TP_CONN_HANDLE_TYPE_CONTACT TP_HANDLE_TYPE_CONTACT
#define TP_CONN_HANDLE_TYPE_ROOM TP_HANDLE_TYPE_ROOM #define TP_CONN_HANDLE_TYPE_ROOM TP_HANDLE_TYPE_ROOM
#define TP_CONN_HANDLE_TYPE_LIST TP_HANDLE_TYPE_LIST #define TP_CONN_HANDLE_TYPE_LIST TP_HANDLE_TYPE_LIST
#define TP_CONN_HANDLE_TYPE_GROUP TP_HANDLE_TYPE_GROUP #define TP_CONN_HANDLE_TYPE_GROUP TP_HANDLE_TYPE_GROUP
#define LAST_TP_CONN_HANDLE_TYPE LAST_TP_HANDLE_TYPE #define LAST_TP_CONN_HANDLE_TYPE LAST_TP_HANDLE_TYPE
#define TelepathyConnectionHandleType TelepathyHandleType #define TelepathyConnectionHandleType TpHandleType
/* A historical typo */ /* A historical typo */
#define TP_MEDIA_STREAM_DIRECTION_RECIEVE TP_MEDIA_STREAM_DIRECTION_RECEIVE #define TP_MEDIA_STREAM_DIRECTION_RECIEVE TP_MEDIA_STREAM_DIRECTION_RECEIVE
/* Namespace pollution, but needed for compatibility */ /* Namespace pollution, but needed for compatibility */
#define ConnectionAliasFlags TelepathyConnectionAliasFlags #define ConnectionAliasFlags TpConnectionAliasFlags
/* Connection_Capability_Flags used to be Connection_Capability_Type */ /* Connection_Capability_Flags used to be Connection_Capability_Type */
#define TP_CONN_CAPABILITY_TYPE_CREATE TP_CONN_CAPABILITY_FLAG_CREATE #define TP_CONN_CAPABILITY_TYPE_CREATE TP_CONN_CAPABILITY_FLAG_CREATE
#define TP_CONN_CAPABILITY_TYPE_INVITE TP_CONN_CAPABILITY_FLAG_INVITE #define TP_CONN_CAPABILITY_TYPE_INVITE TP_CONN_CAPABILITY_FLAG_INVITE
#define LAST_TP_CONN_CAPABILITY_TYPE LAST_TP_CONN_CAPABILITY_FLAG #define LAST_TP_CONN_CAPABILITY_TYPE LAST_TP_CONN_CAPABILITY_FLAG
#define TelepathyConnectionCapabilityType TelepathyConnectionCapabilityFlag s #define TelepathyConnectionCapabilityType TpConnectionCapabilityFlags
/* Unconventional singular names for flag-set type */ /* Unconventional singular names for flag-set type */
#define TelepathyChannelTextMessageFlag TelepathyChannelTextMessageFlags #define TelepathyChannelTextMessageFlag TpChannelTextMessageFlags
#define TelepathyChannelMediaCapability TelepathyChannelMediaCapabilities #define TelepathyChannelMediaCapability TpChannelMediaCapabilities
/* API compatibility (these used to be in the spec, but not any more) */ /* API compatibility (these used to be in the spec, but not any more) */
#define TP_CHANNEL_PASSWORD_FLAG_REQUIRED ((TelepathyChannelPasswordFlags)1 #define TP_CHANNEL_PASSWORD_FLAG_REQUIRED ((TpChannelPasswordFlags)1)
) #define TP_CHANNEL_PASSWORD_FLAG_VISIBLE ((TpChannelPasswordFlags)2)
#define TP_CHANNEL_PASSWORD_FLAG_VISIBLE ((TelepathyChannelPasswordFlags)2) #define TP_CHANNEL_PASSWORD_FLAG_MODIFIABLE ((TpChannelPasswordFlags)4)
#define TP_CHANNEL_PASSWORD_FLAG_MODIFIABLE ((TelepathyChannelPasswordFlags
)4)
/* This enum isn't in the spec at all any more; kept for source compat */ /* 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;
/* This type has been renamed in the spec to reflect its purpose */ /* This type has been renamed in the spec to reflect its purpose */
#define TelepathyMediaStreamPending TelepathyMediaStreamPendingSend #define TelepathyMediaStreamPending TpMediaStreamPendingSend
/* This type has been renamed in the spec */ /* This type has been renamed in the spec */
#define TP_MEDIA_STREAM_PROTO_UDP TP_MEDIA_STREAM_BASE_PROTO_UDP #define TP_MEDIA_STREAM_PROTO_UDP TP_MEDIA_STREAM_BASE_PROTO_UDP
#define TP_MEDIA_STREAM_PROTO_TCP TP_MEDIA_STREAM_BASE_PROTO_TCP #define TP_MEDIA_STREAM_PROTO_TCP TP_MEDIA_STREAM_BASE_PROTO_TCP
#define LAST_TP_MEDIA_STREAM_PROTO LAST_TP_MEDIA_STREAM_BASE_PROTO #define LAST_TP_MEDIA_STREAM_PROTO LAST_TP_MEDIA_STREAM_BASE_PROTO
#define TelepathyMediaStreamProto TelepathyMediaStreamBaseProto #define TelepathyMediaStreamProto TpMediaStreamBaseProto
/* This naming just isn't in the spec, perhaps it used to be... */ /* This naming just isn't in the spec, perhaps it used to be... */
#define TP_CODEC_MEDIA_TYPE_AUDIO TP_MEDIA_STREAM_TYPE_AUDIO #define TP_CODEC_MEDIA_TYPE_AUDIO TP_MEDIA_STREAM_TYPE_AUDIO
#define TP_CODEC_MEDIA_TYPE_VIDEO TP_MEDIA_STREAM_TYPE_VIDEO #define TP_CODEC_MEDIA_TYPE_VIDEO TP_MEDIA_STREAM_TYPE_VIDEO
#define LAST_TP_CODEC_MEDIA_TYPE LAST_TP_MEDIA_STREAM_TYPE #define LAST_TP_CODEC_MEDIA_TYPE LAST_TP_MEDIA_STREAM_TYPE
#define TelepathyCodecMediaType TelepathyMediaStreamType #define TelepathyCodecMediaType TpMediaStreamType
#endif /* !defined(LIBTELEPATHY_DISABLE_DEPRECATED) */ #endif /* !defined(LIBTELEPATHY_DISABLE_DEPRECATED) */
G_END_DECLS G_END_DECLS
#endif #endif
 End of changes. 10 change blocks. 
13 lines changed or deleted 15 lines changed or added


 tp-helpers.h   tp-helpers.h 
skipping to change at line 28 skipping to change at line 28
* 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_HELPERS_H__ #ifndef __TELEPATHY_HELPERS_H__
#define __TELEPATHY_HELPERS_H__ #define __TELEPATHY_HELPERS_H__
#include <glib.h> #include <glib.h>
#include <dbus/dbus-glib.h> #include <dbus/dbus-glib.h>
#include "tp-constants.h"
G_BEGIN_DECLS G_BEGIN_DECLS
typedef struct typedef struct
{ {
gpointer key; gpointer key;
gpointer value; gpointer value;
} TpKeyValue; } TpKeyValue;
DBusGConnection * tp_get_bus (); DBusGConnection *tp_get_bus (void);
DBusGProxy * tp_get_bus_proxy (); DBusGProxy *tp_get_bus_proxy (void);
GSList *tp_hash_to_key_value_list(GHashTable *hashtable); GSList *tp_hash_to_key_value_list (GHashTable *hashtable);
void tp_key_value_list_free(GSList *list); void tp_key_value_list_free (GSList *list);
typedef enum #ifndef LIBTELEPATHY_DISABLE_DEPRECATED
{
TP_CONNMGR_PROT_PARAM_FLAG_REQUIRED = 1 << 0, #define TP_CONNMGR_PROT_PARAM_FLAG_REQUIRED (TP_CONN_MGR_PARAM_FLAG_REQUIRE
TP_CONNMGR_PROT_PARAM_FLAG_REGISTER = 1 << 1, D)
TP_CONNMGR_PROT_PARAM_FLAG_HAS_DEFAULT = 1 << 2, #define TP_CONNMGR_PROT_PARAM_FLAG_REGISTER (TP_CONN_MGR_PARAM_FLAG_REGISTE
} TpConnMgrProtParamFlag; R)
#define TP_CONNMGR_PROT_PARAM_FLAG_HAS_DEFAULT \
(TP_CONN_MGR_PARAM_FLAG_HAS_DEFAULT)
#define TpConnMgrProtParamFlag TpConnMgrParamFlags
#endif
typedef struct _tp_connmgr_info TpConnMgrInfo; typedef struct _tp_connmgr_info TpConnMgrInfo;
typedef struct _tp_connmgr_protocol_param TpConnMgrProtParam; typedef struct _tp_connmgr_protocol_param TpConnMgrProtParam;
struct _tp_connmgr_protocol_param struct _tp_connmgr_protocol_param
{ {
TpConnMgrProtParamFlag flags; TpConnMgrParamFlags flags;
gchar *default_value; gchar *default_value;
gchar *dbus_type; gchar *dbus_type;
}; };
struct _tp_connmgr_info struct _tp_connmgr_info
{ {
gchar *name; gchar *name;
gchar *bus_name; gchar *bus_name;
gchar *object_path; gchar *object_path;
/* protocol_name<->(param_name<->TpConnMgrProtParam) */ /* protocol_name<->(param_name<->TpConnMgrProtParam) */
GHashTable *protocols; GHashTable *protocols;
}; };
/* /*
* Lists all the connection manager files. * Lists all the connection manager files.
* @return A list of connection manager names * @return A list of connection manager names
*/ */
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 (const 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. 7 change blocks. 
17 lines changed or deleted 21 lines changed or added


 tp-ifaces-signals-marshal.h   tp-ifaces-signals-marshal.h 
skipping to change at line 117 skipping to change at line 117
gpointer ma rshal_data); gpointer ma rshal_data);
/* VOID:UINT,STRING,BOXED,STRING (tp-ifaces-signals-marshal.list:40) */ /* 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, extern void tp_ifaces_signals_marshal_VOID__UINT_STRING_BOXED_STRING (GClos ure *closure,
GValu e *return_value, GValu e *return_value,
guint n_param_values, guint n_param_values,
const GValue *param_values, const GValue *param_values,
gpoin ter invocation_hint, gpoin ter invocation_hint,
gpoin ter marshal_data); gpoin ter marshal_data);
/* VOID:UINT,UINT,UINT,STRING,BOXED,UINT (tp-ifaces-signals-marshal.list:42
) */
extern void tp_ifaces_signals_marshal_VOID__UINT_UINT_UINT_STRING_BOXED_UIN
T (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint,
gpointer marshal_data);
/* VOID:OBJECT,UINT,UINT,UINT (tp-ifaces-signals-marshal.list:44) */
extern void tp_ifaces_signals_marshal_VOID__OBJECT_UINT_UINT_UINT (GClosure
*closure,
GValue
*return_value,
guint
n_param_values,
const GV
alue *param_values,
gpointer
invocation_hint,
gpointer
marshal_data);
/* VOID:STRING,BOXED (tp-ifaces-signals-marshal.list:46) */
extern void tp_ifaces_signals_marshal_VOID__STRING_BOXED (GClosure *clo
sure,
GValue *ret
urn_value,
guint n_p
aram_values,
const GValue *par
am_values,
gpointer inv
ocation_hint,
gpointer mar
shal_data);
/* VOID:STRING,STRING (tp-ifaces-signals-marshal.list:48) */
extern void tp_ifaces_signals_marshal_VOID__STRING_STRING (GClosure *cl
osure,
GValue *re
turn_value,
guint n_
param_values,
const GValue *pa
ram_values,
gpointer in
vocation_hint,
gpointer ma
rshal_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 57 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
#include <libtelepathy/_gen-tp-interfaces.h> #include <libtelepathy/_gen-tp-interfaces.h>
/* Names that don't quite follow convention */ #ifndef LIBTELEPATHY_DISABLE_DEPRECATED
/* Names that didn't quite follow convention */
#define TP_IFACE_CHANNEL_INTERFACE TP_IFACE_CHANNEL #define TP_IFACE_CHANNEL_INTERFACE TP_IFACE_CHANNEL
#define TP_IFACE_CONN_INTERFACE TP_IFACE_CONN #define TP_IFACE_CONN_INTERFACE TP_IFACE_CONN
#define TP_IFACE_CONN_MGR_INTERFACE TP_IFACE_CONN_MANAGER #define TP_IFACE_CONN_MGR_INTERFACE TP_IFACE_CONN_MANAGER
#define TP_IFACE_PROPERTIES TP_IFACE_PROPERTIES_INTERFACE #define TP_IFACE_PROPERTIES TP_IFACE_PROPERTIES_INTERFACE
/* Obsolete and omitted from the spec, but kept for source compat */ /* Obsolete and omitted from the spec, but kept for source compat */
#define TP_IFACE_CHANNEL_INTERFACE_SUBJECT \ #define TP_IFACE_CHANNEL_INTERFACE_SUBJECT \
"org.freedesktop.Telepathy.Channel.Interface.Subject" "org.freedesktop.Telepathy.Channel.Interface.Subject"
#endif
G_END_DECLS G_END_DECLS
#endif /* #ifndef __TELEPATHY_INTERFACES_H__*/ #endif /* #ifndef __TELEPATHY_INTERFACES_H__*/
 End of changes. 2 change blocks. 
1 lines changed or deleted 5 lines changed or added


 tp-props-iface.h   tp-props-iface.h 
skipping to change at line 18 skipping to change at line 18
* 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.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U
* SA
*/ */
#ifndef TP_PROPS_IFACE_H #ifndef TP_PROPS_IFACE_H
#define TP_PROPS_IFACE_H #define TP_PROPS_IFACE_H
#ifndef DBUS_API_SUBJECT_TO_CHANGE #ifndef DBUS_API_SUBJECT_TO_CHANGE
#define DBUS_API_SUBJECT_TO_CHANGE #define DBUS_API_SUBJECT_TO_CHANGE
#endif #endif
#include <dbus/dbus-glib.h> #include <dbus/dbus-glib.h>
#include "tp-constants.h" #include "tp-constants.h"
#include "tp-interfaces.h"
#include "tp-props-iface-gen.h" #include "tp-props-iface-gen.h"
#define TELEPATHY_PROPS_IFACE_QUARK (tp_get_props_interface()) #ifndef LIBTELEPATHY_DISABLE_DEPRECATED
#define TELEPATHY_PROPS_IFACE_QUARK TP_IFACE_QUARK_PROPERTIES_INTERFACE
#endif
typedef struct _TpPropsIface TpPropsIface; typedef struct _TpPropsIface TpPropsIface;
typedef struct _TpPropsIfaceClass TpPropsIfaceClass; typedef struct _TpPropsIfaceClass TpPropsIfaceClass;
struct _TpPropsIface struct _TpPropsIface
{ {
DBusGProxy parent; DBusGProxy parent;
gpointer priv; gpointer priv;
}; };
skipping to change at line 84 skipping to change at line 86
* @TP_PROPS_CHANGED_VALUE: The value of the property changed. * @TP_PROPS_CHANGED_VALUE: The value of the property changed.
* @TP_PROPS_CHANGED_FLAGS: The flags of the property changed. * @TP_PROPS_CHANGED_FLAGS: The flags of the property changed.
*/ */
typedef enum typedef enum
{ {
TP_PROPS_CHANGED_VALUE = 0x01, TP_PROPS_CHANGED_VALUE = 0x01,
TP_PROPS_CHANGED_FLAGS = 0x02 TP_PROPS_CHANGED_FLAGS = 0x02
} TpPropsChanged; } TpPropsChanged;
TpPropsIface * tp_props_iface_new (DBusGConnection *connection, TpPropsIface * tp_props_iface_new (DBusGConnection *connection,
const char *name, const char *name, const char *path_name);
const char *path_name);
void tp_props_iface_set_mapping (TpPropsIface *iface, void tp_props_iface_set_mapping (TpPropsIface *iface,
const gchar *first_name, ...); const gchar *first_name, ...) G_GNUC_NULL_TERMINATED;
gboolean tp_props_iface_get_value (TpPropsIface* iface, guint prop_id, gboolean tp_props_iface_get_value (TpPropsIface* iface, guint prop_id,
GValue *return_value); GValue *return_value);
gboolean tp_props_iface_set_value (TpPropsIface* iface, guint prop_id, gboolean tp_props_iface_set_value (TpPropsIface* iface, guint prop_id,
const GValue *value); const GValue *value);
TelepathyPropertyFlags tp_props_iface_property_flags (TpPropsIface* iface, TpPropertyFlags tp_props_iface_property_flags (TpPropsIface* iface,
guint prop_id); guint prop_id);
GQuark tp_get_props_interface(void); #ifndef LIBTELEPATHY_DISABLE_DEPRECATED
GQuark tp_get_props_interface (void) G_GNUC_DEPRECATED;
#endif
void tp_props_interface_set_signatures (DBusGProxy *proxy); void tp_props_interface_set_signatures (DBusGProxy *proxy);
#endif #endif
 End of changes. 9 change blocks. 
11 lines changed or deleted 15 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/