contact.h   contact.h 
skipping to change at line 66 skipping to change at line 66
typedef enum { typedef enum {
TP_CONTACT_FEATURE_ALIAS, TP_CONTACT_FEATURE_ALIAS,
TP_CONTACT_FEATURE_AVATAR_TOKEN, TP_CONTACT_FEATURE_AVATAR_TOKEN,
TP_CONTACT_FEATURE_PRESENCE, TP_CONTACT_FEATURE_PRESENCE,
TP_CONTACT_FEATURE_LOCATION, TP_CONTACT_FEATURE_LOCATION,
TP_CONTACT_FEATURE_CAPABILITIES, TP_CONTACT_FEATURE_CAPABILITIES,
TP_CONTACT_FEATURE_AVATAR_DATA, TP_CONTACT_FEATURE_AVATAR_DATA,
TP_CONTACT_FEATURE_CONTACT_INFO, TP_CONTACT_FEATURE_CONTACT_INFO,
TP_CONTACT_FEATURE_CLIENT_TYPES, TP_CONTACT_FEATURE_CLIENT_TYPES,
TP_CONTACT_FEATURE_SUBSCRIPTION_STATES,
} TpContactFeature; } TpContactFeature;
#define NUM_TP_CONTACT_FEATURES (TP_CONTACT_FEATURE_CLIENT_TYPES + 1) #define NUM_TP_CONTACT_FEATURES (TP_CONTACT_FEATURE_SUBSCRIPTION_STATES + 1 )
/* Basic functionality, always available */ /* Basic functionality, always available */
TpConnection *tp_contact_get_connection (TpContact *self); TpConnection *tp_contact_get_connection (TpContact *self);
TpHandle tp_contact_get_handle (TpContact *self); TpHandle tp_contact_get_handle (TpContact *self);
const gchar *tp_contact_get_identifier (TpContact *self); const gchar *tp_contact_get_identifier (TpContact *self);
gboolean tp_contact_has_feature (TpContact *self, TpContactFeature feature) ; gboolean tp_contact_has_feature (TpContact *self, TpContactFeature feature) ;
/* TP_CONTACT_FEATURE_ALIAS */ /* TP_CONTACT_FEATURE_ALIAS */
const gchar *tp_contact_get_alias (TpContact *self); const gchar *tp_contact_get_alias (TpContact *self);
skipping to change at line 114 skipping to change at line 115
GAsyncResult *result, GError **error); GAsyncResult *result, GError **error);
void tp_connection_refresh_contact_info (TpConnection *self, void tp_connection_refresh_contact_info (TpConnection *self,
guint n_contacts, TpContact * const *contacts); guint n_contacts, TpContact * const *contacts);
/* TP_CONTACT_FEATURE_CLIENT_TYPES */ /* TP_CONTACT_FEATURE_CLIENT_TYPES */
const gchar * const * const gchar * const *
/* this comment stops gtkdoc denying that this function exists */ /* this comment stops gtkdoc denying that this function exists */
tp_contact_get_client_types (TpContact *self); tp_contact_get_client_types (TpContact *self);
/* TP_CONTACT_FEATURE_SUBSCRIPTION_STATES */
TpSubscriptionState tp_contact_get_subscribe_state (TpContact *self);
TpSubscriptionState tp_contact_get_publish_state (TpContact *self);
const gchar *tp_contact_get_publish_request (TpContact *self);
typedef void (*TpConnectionContactsByHandleCb) (TpConnection *connection, typedef void (*TpConnectionContactsByHandleCb) (TpConnection *connection,
guint n_contacts, TpContact * const *contacts, guint n_contacts, TpContact * const *contacts,
guint n_failed, const TpHandle *failed, guint n_failed, const TpHandle *failed,
const GError *error, gpointer user_data, GObject *weak_object); const GError *error, gpointer user_data, GObject *weak_object);
void tp_connection_get_contacts_by_handle (TpConnection *self, void tp_connection_get_contacts_by_handle (TpConnection *self,
guint n_handles, const TpHandle *handles, guint n_handles, const TpHandle *handles,
guint n_features, const TpContactFeature *features, guint n_features, const TpContactFeature *features,
TpConnectionContactsByHandleCb callback, TpConnectionContactsByHandleCb callback,
gpointer user_data, GDestroyNotify destroy, GObject *weak_object); gpointer user_data, GDestroyNotify destroy, GObject *weak_object);
 End of changes. 3 change blocks. 
1 lines changed or deleted 7 lines changed or added


 presence-mixin.h   presence-mixin.h 
skipping to change at line 35 skipping to change at line 35
#include <telepathy-glib/handle.h> #include <telepathy-glib/handle.h>
#include <telepathy-glib/svc-connection.h> #include <telepathy-glib/svc-connection.h>
#include "util.h" #include "util.h"
G_BEGIN_DECLS G_BEGIN_DECLS
typedef struct _TpPresenceStatusOptionalArgumentSpec typedef struct _TpPresenceStatusOptionalArgumentSpec
TpPresenceStatusOptionalArgumentSpec; TpPresenceStatusOptionalArgumentSpec;
typedef struct _TpPresenceStatusSpec TpPresenceStatusSpec; typedef struct _TpPresenceStatusSpec TpPresenceStatusSpec;
/**
* TpPresenceStatusOptionalArgumentSpec
* @name: Name of the argument as passed over D-Bus
* @dtype: D-Bus type signature of the argument
*
* Structure specifying a supported optional argument for a presence status
.
*
* In addition to the fields documented here, there are two gpointer fields
* which must currently be %NULL. A meaning may be defined for these in a
* future version of telepathy-glib.
*/
struct _TpPresenceStatusOptionalArgumentSpec { struct _TpPresenceStatusOptionalArgumentSpec {
const gchar *name; const gchar *name;
const gchar *dtype; const gchar *dtype;
/*<private>*/ /*<private>*/
gpointer _future1; gpointer _future1;
gpointer _future2; gpointer _future2;
}; };
/**
* TpPresenceStatusSpec
* @name: String identifier of the presence status
* @presence_type: A type value, as specified by #TpConnectionPresenceType
* @self: Indicates if this status may be set on yourself
* @optional_arguments: An array of #TpPresenceStatusOptionalArgumentSpec
* structures representing the optional arguments for this status, termina
ted
* by a NULL name. If there are no optional arguments for a status, this c
an
* be NULL.
*
* Structure specifying a supported presence status.
*
* In addition to the fields documented here, there are two gpointer fields
* which must currently be %NULL. A meaning may be defined for these in a
* future version of telepathy-glib.
*/
struct _TpPresenceStatusSpec { struct _TpPresenceStatusSpec {
const gchar *name; const gchar *name;
TpConnectionPresenceType presence_type; TpConnectionPresenceType presence_type;
gboolean self; gboolean self;
const TpPresenceStatusOptionalArgumentSpec *optional_arguments; const TpPresenceStatusOptionalArgumentSpec *optional_arguments;
/*<private>*/ /*<private>*/
gpointer _future1; gpointer _future1;
gpointer _future2; gpointer _future2;
}; };
typedef struct _TpPresenceStatus TpPresenceStatus; typedef struct _TpPresenceStatus TpPresenceStatus;
/**
* TpPresenceStatus:
* @index: Index of the presence status in the provided supported presence
* statuses array
* @optional_arguments: A GHashTable mapping of string identifiers to GValu
es
* of the optional status arguments, if any. If there are no optional
* arguments, this pointer may be NULL.
*
* Structure representing a presence status.
*
* In addition to the fields documented here, there are two gpointer fields
* which must currently be %NULL. A meaning may be defined for these in a
* future version of telepathy-glib.
*/
struct _TpPresenceStatus { struct _TpPresenceStatus {
guint index; guint index;
GHashTable *optional_arguments; GHashTable *optional_arguments;
/*<private>*/ /*<private>*/
gpointer _future1; gpointer _future1;
gpointer _future2; gpointer _future2;
}; };
TpPresenceStatus *tp_presence_status_new (guint which, TpPresenceStatus *tp_presence_status_new (guint which,
GHashTable *optional_arguments) G_GNUC_WARN_UNUSED_RESULT; GHashTable *optional_arguments) G_GNUC_WARN_UNUSED_RESULT;
void tp_presence_status_free (TpPresenceStatus *status); void tp_presence_status_free (TpPresenceStatus *status);
/**
* TpPresenceMixinStatusAvailableFunc:
* @obj: An object implementing the presence interface with this mixin
* @which: The index of the presence status in the provided supported prese
nce
* statuses array
*
* Signature of the callback used to determine if a given status is current
ly
* available to be set on the connection.
*
* When implementing the
* org.freedesktop.Telepathy.Connection.Interface.SimplePresence interface
* this can be called while DISCONNECTED to determine which statuses can be
set
* in that state.
*
* Returns: %TRUE if the status is available, %FALSE if not.
*/
typedef gboolean (*TpPresenceMixinStatusAvailableFunc) (GObject *obj, typedef gboolean (*TpPresenceMixinStatusAvailableFunc) (GObject *obj,
guint which); guint which);
/**
* TpPresenceMixinGetContactStatusesFunc:
* @obj: An object with this mixin.
* @contacts: An array of #TpHandle for the contacts to get presence status
for
* @error: Used to return a Telepathy D-Bus error if %NULL is returned
*
* Signature of the callback used to get the stored presence status of
* contacts. The returned hash table should have contact handles mapped to
* their respective presence statuses in #TpPresenceStatus structs.
*
* The returned hash table will be freed with g_hash_table_destroy. The
* callback is responsible for ensuring that this does any cleanup that
* may be necessary.
*
* Returns: (transfer full): The contact presence on success, %NULL with
* error set on error
*/
typedef GHashTable *(*TpPresenceMixinGetContactStatusesFunc) (GObject *obj, typedef GHashTable *(*TpPresenceMixinGetContactStatusesFunc) (GObject *obj,
const GArray *contacts, GError **error); const GArray *contacts, GError **error);
/**
* TpPresenceMixinSetOwnStatusFunc:
* @obj: An object with this mixin.
* @status: The status to set, or NULL for whatever the protocol defines as
a
* "default" status
* @error: Used to return a Telepathy D-Bus error if %FALSE is returned
*
* Signature of the callback used to commit changes to the user's own prese
nce
* status in SetStatuses. It is also used in ClearStatus and RemoveStatus t
o
* reset the user's own status back to the "default" one with a %NULL statu
s
* argument.
*
* The optional_arguments hash table in @status, if not NULL, will have bee
n
* filtered so it only contains recognised parameters, so the callback
* need not (and cannot) check for unrecognised parameters. However, the
* types of the parameters are not currently checked, so the callback is
* responsible for doing so.
*
* The callback is responsible for emitting PresenceUpdate, if appropriate,
* by calling tp_presence_mixin_emit_presence_update().
*
* Returns: %TRUE if the operation was successful, %FALSE if not.
*/
typedef gboolean (*TpPresenceMixinSetOwnStatusFunc) (GObject *obj, typedef gboolean (*TpPresenceMixinSetOwnStatusFunc) (GObject *obj,
const TpPresenceStatus *status, GError **error); const TpPresenceStatus *status, GError **error);
typedef struct _TpPresenceMixinClass TpPresenceMixinClass; typedef struct _TpPresenceMixinClass TpPresenceMixinClass;
typedef struct _TpPresenceMixinClassPrivate TpPresenceMixinClassPrivate; typedef struct _TpPresenceMixinClassPrivate TpPresenceMixinClassPrivate;
typedef struct _TpPresenceMixin TpPresenceMixin; typedef struct _TpPresenceMixin TpPresenceMixin;
typedef struct _TpPresenceMixinPrivate TpPresenceMixinPrivate; typedef struct _TpPresenceMixinPrivate TpPresenceMixinPrivate;
/**
* TpPresenceMixinClass:
* @status_available: The status-available function that was passed to
* tp_presence_mixin_class_init()
* @get_contact_statuses: The get-contact-statuses function that was passed
to
* tp_presence_mixin_class_init()
* @set_own_status: The set-own-status function that was passed to
* tp_presence_mixin_class_init()
* @statuses: The presence statuses array that was passed to
* tp_presence_mixin_class_init()
*
* Structure to be included in the class structure of objects that
* use this mixin. Initialize it with tp_presence_mixin_class_init().
*
* All fields should be considered read-only.
*/
struct _TpPresenceMixinClass { struct _TpPresenceMixinClass {
TpPresenceMixinStatusAvailableFunc status_available; TpPresenceMixinStatusAvailableFunc status_available;
TpPresenceMixinGetContactStatusesFunc get_contact_statuses; TpPresenceMixinGetContactStatusesFunc get_contact_statuses;
TpPresenceMixinSetOwnStatusFunc set_own_status; TpPresenceMixinSetOwnStatusFunc set_own_status;
const TpPresenceStatusSpec *statuses; const TpPresenceStatusSpec *statuses;
/*<private>*/ /*<private>*/
TpPresenceMixinClassPrivate *priv; TpPresenceMixinClassPrivate *priv;
gpointer _future1; gpointer _future1;
gpointer _future2; gpointer _future2;
gpointer _future3; gpointer _future3;
gpointer _future4; gpointer _future4;
}; };
/**
* TpPresenceMixin:
*
* Structure to be included in the instance structure of objects that
* use this mixin. Initialize it with tp_presence_mixin_init().
*
* There are no public fields.
*/
struct _TpPresenceMixin { struct _TpPresenceMixin {
/*<private>*/ /*<private>*/
TpPresenceMixinPrivate *priv; TpPresenceMixinPrivate *priv;
}; };
/* TYPE MACROS */ /* TYPE MACROS */
#define TP_PRESENCE_MIXIN_CLASS_OFFSET_QUARK \ #define TP_PRESENCE_MIXIN_CLASS_OFFSET_QUARK \
(tp_presence_mixin_class_get_offset_quark ()) (tp_presence_mixin_class_get_offset_quark ())
#define TP_PRESENCE_MIXIN_CLASS_OFFSET(o) \ #define TP_PRESENCE_MIXIN_CLASS_OFFSET(o) \
tp_mixin_class_get_offset (o, TP_PRESENCE_MIXIN_CLASS_OFFSET_QUARK) tp_mixin_class_get_offset (o, TP_PRESENCE_MIXIN_CLASS_OFFSET_QUARK)
 End of changes. 8 change blocks. 
135 lines changed or deleted 0 lines changed or added


 telepathy-interfaces.h   telepathy-interfaces.h 
skipping to change at line 523 skipping to change at line 523
#define TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_AVAILABLE_SOCKET_TYPES \ #define TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_AVAILABLE_SOCKET_TYPES \
"org.freedesktop.Telepathy.Channel.Type.FileTransfer.AvailableSocketTypes" "org.freedesktop.Telepathy.Channel.Type.FileTransfer.AvailableSocketTypes"
#define TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_TRANSFERRED_BYTES \ #define TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_TRANSFERRED_BYTES \
"org.freedesktop.Telepathy.Channel.Type.FileTransfer.TransferredBytes" "org.freedesktop.Telepathy.Channel.Type.FileTransfer.TransferredBytes"
#define TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_INITIAL_OFFSET \ #define TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_INITIAL_OFFSET \
"org.freedesktop.Telepathy.Channel.Type.FileTransfer.InitialOffset" "org.freedesktop.Telepathy.Channel.Type.FileTransfer.InitialOffset"
#define TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_URI \
"org.freedesktop.Telepathy.Channel.Type.FileTransfer.URI"
#define TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA \ #define TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA \
"org.freedesktop.Telepathy.Channel.Type.StreamedMedia" "org.freedesktop.Telepathy.Channel.Type.StreamedMedia"
#define TP_IFACE_QUARK_CHANNEL_TYPE_STREAMED_MEDIA \ #define TP_IFACE_QUARK_CHANNEL_TYPE_STREAMED_MEDIA \
(tp_iface_quark_channel_type_streamed_media ()) (tp_iface_quark_channel_type_streamed_media ())
GQuark tp_iface_quark_channel_type_streamed_media (void); GQuark tp_iface_quark_channel_type_streamed_media (void);
#define TP_PROP_CHANNEL_TYPE_STREAMED_MEDIA_INITIAL_AUDIO \ #define TP_PROP_CHANNEL_TYPE_STREAMED_MEDIA_INITIAL_AUDIO \
"org.freedesktop.Telepathy.Channel.Type.StreamedMedia.InitialAudio" "org.freedesktop.Telepathy.Channel.Type.StreamedMedia.InitialAudio"
 End of changes. 1 change blocks. 
0 lines changed or deleted 3 lines changed or added


 tp-cli-channel.h   tp-cli-channel.h 
skipping to change at line 1120 skipping to change at line 1120
typedef void (*tp_cli_channel_type_file_transfer_signal_callback_initial_of fset_defined) (TpChannel *proxy, typedef void (*tp_cli_channel_type_file_transfer_signal_callback_initial_of fset_defined) (TpChannel *proxy,
guint64 arg_InitialOffset, guint64 arg_InitialOffset,
gpointer user_data, GObject *weak_object); gpointer user_data, GObject *weak_object);
TpProxySignalConnection *tp_cli_channel_type_file_transfer_connect_to_initi al_offset_defined (TpChannel *proxy, TpProxySignalConnection *tp_cli_channel_type_file_transfer_connect_to_initi al_offset_defined (TpChannel *proxy,
tp_cli_channel_type_file_transfer_signal_callback_initial_offset_define d callback, tp_cli_channel_type_file_transfer_signal_callback_initial_offset_define d callback,
gpointer user_data, gpointer user_data,
GDestroyNotify destroy, GDestroyNotify destroy,
GObject *weak_object, GObject *weak_object,
GError **error); GError **error);
typedef void (*tp_cli_channel_type_file_transfer_signal_callback_uri_define
d) (TpChannel *proxy,
const gchar *arg_URI,
gpointer user_data, GObject *weak_object);
TpProxySignalConnection *tp_cli_channel_type_file_transfer_connect_to_uri_d
efined (TpChannel *proxy,
tp_cli_channel_type_file_transfer_signal_callback_uri_defined callback,
gpointer user_data,
GDestroyNotify destroy,
GObject *weak_object,
GError **error);
typedef void (*tp_cli_channel_type_file_transfer_callback_for_accept_file) (TpChannel *proxy, typedef void (*tp_cli_channel_type_file_transfer_callback_for_accept_file) (TpChannel *proxy,
const GValue *out_Address, const GValue *out_Address,
const GError *error, gpointer user_data, const GError *error, gpointer user_data,
GObject *weak_object); GObject *weak_object);
TpProxyPendingCall *tp_cli_channel_type_file_transfer_call_accept_file (TpC hannel *proxy, TpProxyPendingCall *tp_cli_channel_type_file_transfer_call_accept_file (TpC hannel *proxy,
gint timeout_ms, gint timeout_ms,
guint in_Address_Type, guint in_Address_Type,
guint in_Access_Control, guint in_Access_Control,
const GValue *in_Access_Control_Param, const GValue *in_Access_Control_Param,
 End of changes. 1 change blocks. 
0 lines changed or deleted 12 lines changed or added


 tp-svc-channel.h   tp-svc-channel.h 
skipping to change at line 998 skipping to change at line 998
out_Address); out_Address);
} }
void tp_svc_channel_type_file_transfer_emit_file_transfer_state_changed (gp ointer instance, void tp_svc_channel_type_file_transfer_emit_file_transfer_state_changed (gp ointer instance,
guint arg_State, guint arg_State,
guint arg_Reason); guint arg_Reason);
void tp_svc_channel_type_file_transfer_emit_transferred_bytes_changed (gpoi nter instance, void tp_svc_channel_type_file_transfer_emit_transferred_bytes_changed (gpoi nter instance,
guint64 arg_Count); guint64 arg_Count);
void tp_svc_channel_type_file_transfer_emit_initial_offset_defined (gpointe r instance, void tp_svc_channel_type_file_transfer_emit_initial_offset_defined (gpointe r instance,
guint64 arg_InitialOffset); guint64 arg_InitialOffset);
void tp_svc_channel_type_file_transfer_emit_uri_defined (gpointer instance,
const gchar *arg_URI);
typedef struct _TpSvcChannelTypeRoomList TpSvcChannelTypeRoomList; typedef struct _TpSvcChannelTypeRoomList TpSvcChannelTypeRoomList;
typedef struct _TpSvcChannelTypeRoomListClass TpSvcChannelTypeRoomListClass ; typedef struct _TpSvcChannelTypeRoomListClass TpSvcChannelTypeRoomListClass ;
GType tp_svc_channel_type_room_list_get_type (void); GType tp_svc_channel_type_room_list_get_type (void);
#define TP_TYPE_SVC_CHANNEL_TYPE_ROOM_LIST \ #define TP_TYPE_SVC_CHANNEL_TYPE_ROOM_LIST \
(tp_svc_channel_type_room_list_get_type ()) (tp_svc_channel_type_room_list_get_type ())
#define TP_SVC_CHANNEL_TYPE_ROOM_LIST(obj) \ #define TP_SVC_CHANNEL_TYPE_ROOM_LIST(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CHANNEL_TYPE_ROOM_LIST, Tp SvcChannelTypeRoomList)) (G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CHANNEL_TYPE_ROOM_LIST, Tp SvcChannelTypeRoomList))
 End of changes. 1 change blocks. 
0 lines changed or deleted 2 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/