account.h | account.h | |||
---|---|---|---|---|
skipping to change at line 201 | skipping to change at line 201 | |||
const guchar *avatar, | const guchar *avatar, | |||
gsize len, | gsize len, | |||
const gchar *mime_type, | const gchar *mime_type, | |||
GAsyncReadyCallback callback, | GAsyncReadyCallback callback, | |||
gpointer user_data); | gpointer user_data); | |||
gboolean tp_account_set_avatar_finish (TpAccount *self, | gboolean tp_account_set_avatar_finish (TpAccount *self, | |||
GAsyncResult *result, | GAsyncResult *result, | |||
GError **error); | GError **error); | |||
gboolean tp_account_get_changing_presence (TpAccount *self); | ||||
G_END_DECLS | G_END_DECLS | |||
#include <telepathy-glib/_gen/tp-cli-account.h> | #include <telepathy-glib/_gen/tp-cli-account.h> | |||
#endif | #endif | |||
End of changes. 1 change blocks. | ||||
0 lines changed or deleted | 2 lines changed or added | |||
base-client.h | base-client.h | |||
---|---|---|---|---|
skipping to change at line 29 | skipping to change at line 29 | |||
*/ | */ | |||
#ifndef __TP_BASE_CLIENT_H__ | #ifndef __TP_BASE_CLIENT_H__ | |||
#define __TP_BASE_CLIENT_H__ | #define __TP_BASE_CLIENT_H__ | |||
#include <dbus/dbus-glib.h> | #include <dbus/dbus-glib.h> | |||
#include <glib-object.h> | #include <glib-object.h> | |||
#include <telepathy-glib/account.h> | #include <telepathy-glib/account.h> | |||
#include <telepathy-glib/add-dispatch-operation-context.h> | #include <telepathy-glib/add-dispatch-operation-context.h> | |||
#include <telepathy-glib/handle-channels-context.h> | ||||
#include <telepathy-glib/observe-channels-context.h> | #include <telepathy-glib/observe-channels-context.h> | |||
#include <telepathy-glib/channel-dispatch-operation.h> | #include <telepathy-glib/channel-dispatch-operation.h> | |||
#include <telepathy-glib/connection.h> | #include <telepathy-glib/connection.h> | |||
#include <telepathy-glib/dbus.h> | #include <telepathy-glib/dbus.h> | |||
#include <telepathy-glib/defs.h> | #include <telepathy-glib/defs.h> | |||
#include <telepathy-glib/dbus-properties-mixin.h> | #include <telepathy-glib/dbus-properties-mixin.h> | |||
G_BEGIN_DECLS | G_BEGIN_DECLS | |||
typedef struct _TpBaseClient TpBaseClient; | typedef struct _TpBaseClient TpBaseClient; | |||
skipping to change at line 84 | skipping to change at line 85 | |||
TpBaseClient *client, | TpBaseClient *client, | |||
TpAccount *account, | TpAccount *account, | |||
TpConnection *connection, | TpConnection *connection, | |||
GList *channels, | GList *channels, | |||
TpChannelDispatchOperation *dispatch_operation, | TpChannelDispatchOperation *dispatch_operation, | |||
TpAddDispatchOperationContext *context); | TpAddDispatchOperationContext *context); | |||
void tp_base_client_implement_add_dispatch_operation (TpBaseClientClass *kl ass, | void tp_base_client_implement_add_dispatch_operation (TpBaseClientClass *kl ass, | |||
TpBaseClientClassAddDispatchOperationImpl impl); | TpBaseClientClassAddDispatchOperationImpl impl); | |||
typedef void (*TpBaseClientClassHandleChannelsImpl) ( | ||||
TpBaseClient *client, | ||||
TpAccount *account, | ||||
TpConnection *connection, | ||||
GList *channels, | ||||
GList *requests_satisfied, | ||||
gint64 user_action_time, | ||||
TpHandleChannelsContext *context); | ||||
void tp_base_client_implement_handle_channels (TpBaseClientClass *klass, | ||||
TpBaseClientClassHandleChannelsImpl impl); | ||||
/* setup functions which can only be called before register() */ | /* setup functions which can only be called before register() */ | |||
void tp_base_client_add_observer_filter (TpBaseClient *self, | void tp_base_client_add_observer_filter (TpBaseClient *self, | |||
GHashTable *filter); | GHashTable *filter); | |||
void tp_base_client_take_observer_filter (TpBaseClient *self, | void tp_base_client_take_observer_filter (TpBaseClient *self, | |||
GHashTable *filter); | GHashTable *filter); | |||
void tp_base_client_set_observer_recover (TpBaseClient *self, | void tp_base_client_set_observer_recover (TpBaseClient *self, | |||
gboolean recover); | gboolean recover); | |||
void tp_base_client_add_approver_filter (TpBaseClient *self, | void tp_base_client_add_approver_filter (TpBaseClient *self, | |||
GHashTable *filter); | GHashTable *filter); | |||
void tp_base_client_take_approver_filter (TpBaseClient *self, | void tp_base_client_take_approver_filter (TpBaseClient *self, | |||
GHashTable *filter); | GHashTable *filter); | |||
void tp_base_client_be_a_handler (TpBaseClient *self); | ||||
void tp_base_client_add_handler_filter (TpBaseClient *self, | ||||
GHashTable *filter); | ||||
void tp_base_client_take_handler_filter (TpBaseClient *self, | ||||
GHashTable *filter); | ||||
void tp_base_client_set_handler_bypass_approval (TpBaseClient *self, | ||||
gboolean bypass_approval); | ||||
void tp_base_client_set_handler_request_notification (TpBaseClient *self); | ||||
void tp_base_client_add_handler_capability (TpBaseClient *self, | ||||
const gchar *token); | ||||
void tp_base_client_add_handler_capabilities (TpBaseClient *self, | ||||
const gchar * const *tokens); | ||||
void tp_base_client_add_handler_capabilities_varargs (TpBaseClient *self, | ||||
const gchar *first_token, ...) G_GNUC_NULL_TERMINATED; | ||||
/* future, potentially (currently in spec as a draft): | ||||
void tp_base_client_set_handler_related_conferences_bypass_approval ( | ||||
TpBaseClient *self, gboolean bypass_approval); | ||||
*/ | ||||
gboolean tp_base_client_register (TpBaseClient *self, | gboolean tp_base_client_register (TpBaseClient *self, | |||
GError **error); | GError **error); | |||
const gchar *tp_base_client_get_bus_name (TpBaseClient *self); | const gchar *tp_base_client_get_bus_name (TpBaseClient *self); | |||
const gchar *tp_base_client_get_object_path (TpBaseClient *self); | const gchar *tp_base_client_get_object_path (TpBaseClient *self); | |||
/* Normal methods, can be called at any time */ | ||||
GList *tp_base_client_get_pending_requests (TpBaseClient *self); | ||||
GList *tp_base_client_get_handled_channels (TpBaseClient *self); | ||||
void tp_base_client_unregister (TpBaseClient *self); | ||||
#define TP_TYPE_BASE_CLIENT \ | #define TP_TYPE_BASE_CLIENT \ | |||
(tp_base_client_get_type ()) | (tp_base_client_get_type ()) | |||
#define TP_BASE_CLIENT(obj) \ | #define TP_BASE_CLIENT(obj) \ | |||
(G_TYPE_CHECK_INSTANCE_CAST ((obj), TP_TYPE_BASE_CLIENT, \ | (G_TYPE_CHECK_INSTANCE_CAST ((obj), TP_TYPE_BASE_CLIENT, \ | |||
TpBaseClient)) | TpBaseClient)) | |||
#define TP_BASE_CLIENT_CLASS(klass) \ | #define TP_BASE_CLIENT_CLASS(klass) \ | |||
(G_TYPE_CHECK_CLASS_CAST ((klass), TP_TYPE_BASE_CLIENT, \ | (G_TYPE_CHECK_CLASS_CAST ((klass), TP_TYPE_BASE_CLIENT, \ | |||
TpBaseClientClass)) | TpBaseClientClass)) | |||
#define TP_IS_BASE_CLIENT(obj) \ | #define TP_IS_BASE_CLIENT(obj) \ | |||
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), TP_TYPE_BASE_CLIENT)) | (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TP_TYPE_BASE_CLIENT)) | |||
End of changes. 4 change blocks. | ||||
0 lines changed or deleted | 43 lines changed or added | |||
contact.h | contact.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 __TP_CONTACT_H__ | #ifndef __TP_CONTACT_H__ | |||
#define __TP_CONTACT_H__ | #define __TP_CONTACT_H__ | |||
#include <glib-object.h> | #include <glib-object.h> | |||
#include <gio/gio.h> | ||||
#include <telepathy-glib/capabilities.h> | #include <telepathy-glib/capabilities.h> | |||
#include <telepathy-glib/connection.h> | #include <telepathy-glib/connection.h> | |||
#include <telepathy-glib/handle.h> | #include <telepathy-glib/handle.h> | |||
#include <telepathy-glib/_gen/genums.h> | #include <telepathy-glib/_gen/genums.h> | |||
G_BEGIN_DECLS | G_BEGIN_DECLS | |||
typedef struct _TpContact TpContact; | typedef struct _TpContact TpContact; | |||
skipping to change at line 62 | skipping to change at line 63 | |||
#define TP_CONTACT_GET_CLASS(obj) \ | #define TP_CONTACT_GET_CLASS(obj) \ | |||
(G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_CONTACT, \ | (G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_CONTACT, \ | |||
TpContactClass)) | TpContactClass)) | |||
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, | |||
#define NUM_TP_CONTACT_FEATURES (TP_CONTACT_FEATURE_CAPABILITIES + 1) | TP_CONTACT_FEATURE_AVATAR_DATA, | |||
#define NUM_TP_CONTACT_FEATURES (TP_CONTACT_FEATURE_AVATAR_DATA + 1) | ||||
} TpContactFeature; | } TpContactFeature; | |||
/* 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 88 | skipping to change at line 90 | |||
TpConnectionPresenceType tp_contact_get_presence_type (TpContact *self); | TpConnectionPresenceType tp_contact_get_presence_type (TpContact *self); | |||
const gchar *tp_contact_get_presence_status (TpContact *self); | const gchar *tp_contact_get_presence_status (TpContact *self); | |||
const gchar *tp_contact_get_presence_message (TpContact *self); | const gchar *tp_contact_get_presence_message (TpContact *self); | |||
/* TP_CONTACT_FEATURE_LOCATION */ | /* TP_CONTACT_FEATURE_LOCATION */ | |||
GHashTable *tp_contact_get_location (TpContact *self); | GHashTable *tp_contact_get_location (TpContact *self); | |||
/* TP_CONTACT_FEATURE_CAPABILITIES */ | /* TP_CONTACT_FEATURE_CAPABILITIES */ | |||
TpCapabilities *tp_contact_get_capabilities (TpContact *self); | TpCapabilities *tp_contact_get_capabilities (TpContact *self); | |||
/* TP_CONTACT_FEATURE_AVATAR_DATA */ | ||||
GFile *tp_contact_get_avatar_file (TpContact *self); | ||||
const gchar *tp_contact_get_avatar_mime_type (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 | |||
handle-repo.h | handle-repo.h | |||
---|---|---|---|---|
skipping to change at line 36 | skipping to change at line 36 | |||
#include <glib-object.h> | #include <glib-object.h> | |||
#include <telepathy-glib/intset.h> | #include <telepathy-glib/intset.h> | |||
#include <telepathy-glib/handle.h> | #include <telepathy-glib/handle.h> | |||
G_BEGIN_DECLS | G_BEGIN_DECLS | |||
/* Forward declaration because it's in the HandleRepo API */ | /* Forward declaration because it's in the HandleRepo API */ | |||
/** | #define TP_TYPE_HANDLE_SET (tp_handle_set_get_type ()) | |||
* TpHandleSet: | GType tp_handle_set_get_type (void); | |||
* | ||||
* A set of handles. This is similar to a #TpIntSet (and implemented using | ||||
* one), but adding a handle to the set also references it. | ||||
*/ | ||||
typedef struct _TpHandleSet TpHandleSet; | typedef struct _TpHandleSet TpHandleSet; | |||
/* Handle repository abstract interface */ | /* Handle repository abstract interface */ | |||
#define TP_TYPE_HANDLE_REPO_IFACE (tp_handle_repo_iface_get_type ()) | #define TP_TYPE_HANDLE_REPO_IFACE (tp_handle_repo_iface_get_type ()) | |||
#define TP_HANDLE_REPO_IFACE(obj) \ | #define TP_HANDLE_REPO_IFACE(obj) \ | |||
(G_TYPE_CHECK_INSTANCE_CAST ((obj), \ | (G_TYPE_CHECK_INSTANCE_CAST ((obj), \ | |||
TP_TYPE_HANDLE_REPO_IFACE, TpHandleRepoIface)) | TP_TYPE_HANDLE_REPO_IFACE, TpHandleRepoIface)) | |||
#define TP_IS_HANDLE_REPO_IFACE(obj) \ | #define TP_IS_HANDLE_REPO_IFACE(obj) \ | |||
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), \ | (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \ | |||
TP_TYPE_HANDLE_REPO_IFACE) | TP_TYPE_HANDLE_REPO_IFACE)) | |||
#define TP_HANDLE_REPO_IFACE_GET_CLASS(obj) \ | #define TP_HANDLE_REPO_IFACE_GET_CLASS(obj) \ | |||
(G_TYPE_INSTANCE_GET_INTERFACE ((obj), \ | (G_TYPE_INSTANCE_GET_INTERFACE ((obj), \ | |||
TP_TYPE_HANDLE_REPO_IFACE, TpHandleRepoIfaceClass)) | TP_TYPE_HANDLE_REPO_IFACE, TpHandleRepoIfaceClass)) | |||
/** | /** | |||
* TpHandleRepoIface: | * TpHandleRepoIface: | |||
* | * | |||
* Dummy typedef representing any implementation of this interface. | * Dummy typedef representing any implementation of this interface. | |||
*/ | */ | |||
skipping to change at line 128 | skipping to change at line 125 | |||
* @userdata: Arbitrary user data as supplied to tp_handle_set_foreach() | * @userdata: Arbitrary user data as supplied to tp_handle_set_foreach() | |||
* | * | |||
* Signature of the callback used to iterate over the handle set in | * Signature of the callback used to iterate over the handle set in | |||
* tp_handle_set_foreach(). | * tp_handle_set_foreach(). | |||
*/ | */ | |||
typedef void (*TpHandleSetMemberFunc)(TpHandleSet *set, TpHandle handle, | typedef void (*TpHandleSetMemberFunc)(TpHandleSet *set, TpHandle handle, | |||
gpointer userdata); | gpointer userdata); | |||
TpHandleSet * tp_handle_set_new (TpHandleRepoIface *repo) | TpHandleSet * tp_handle_set_new (TpHandleRepoIface *repo) | |||
G_GNUC_WARN_UNUSED_RESULT; | G_GNUC_WARN_UNUSED_RESULT; | |||
TpHandleSet *tp_handle_set_copy (const TpHandleSet *other) | ||||
G_GNUC_WARN_UNUSED_RESULT; | ||||
void tp_handle_set_clear (TpHandleSet *set); | ||||
void tp_handle_set_destroy (TpHandleSet *set); | void tp_handle_set_destroy (TpHandleSet *set); | |||
TpIntSet *tp_handle_set_peek (TpHandleSet *set) G_GNUC_WARN_UNUSED_RESULT; | TpIntSet *tp_handle_set_peek (TpHandleSet *set) G_GNUC_WARN_UNUSED_RESULT; | |||
void tp_handle_set_add (TpHandleSet *set, TpHandle handle); | void tp_handle_set_add (TpHandleSet *set, TpHandle handle); | |||
gboolean tp_handle_set_remove (TpHandleSet *set, TpHandle handle); | gboolean tp_handle_set_remove (TpHandleSet *set, TpHandle handle); | |||
gboolean tp_handle_set_is_member (TpHandleSet *set, TpHandle handle); | gboolean tp_handle_set_is_member (const TpHandleSet *set, TpHandle handle); | |||
void tp_handle_set_foreach (TpHandleSet *set, TpHandleSetMemberFunc func, | void tp_handle_set_foreach (TpHandleSet *set, TpHandleSetMemberFunc func, | |||
gpointer userdata); | gpointer userdata); | |||
int tp_handle_set_size (TpHandleSet *set); | gboolean tp_handle_set_is_empty (const TpHandleSet *set); | |||
GArray *tp_handle_set_to_array (TpHandleSet *set) G_GNUC_WARN_UNUSED_RESULT | int tp_handle_set_size (const TpHandleSet *set); | |||
; | GArray *tp_handle_set_to_array (const TpHandleSet *set) | |||
G_GNUC_WARN_UNUSED_RESULT; | ||||
TpIntSet *tp_handle_set_update (TpHandleSet *set, const TpIntSet *add) | TpIntSet *tp_handle_set_update (TpHandleSet *set, const TpIntSet *add) | |||
G_GNUC_WARN_UNUSED_RESULT; | G_GNUC_WARN_UNUSED_RESULT; | |||
TpIntSet *tp_handle_set_difference_update (TpHandleSet *set, | TpIntSet *tp_handle_set_difference_update (TpHandleSet *set, | |||
const TpIntSet *remove) G_GNUC_WARN_UNUSED_RESULT; | const TpIntSet *remove) G_GNUC_WARN_UNUSED_RESULT; | |||
/* static inline because it relies on NUM_TP_HANDLE_TYPES */ | /* static inline because it relies on NUM_TP_HANDLE_TYPES */ | |||
/** | /** | |||
* tp_handles_supported_and_valid: | * tp_handles_supported_and_valid: | |||
* @repos: An array of possibly null pointers to handle repositories, index ed | * @repos: An array of possibly null pointers to handle repositories, index ed | |||
End of changes. 5 change blocks. | ||||
11 lines changed or deleted | 12 lines changed or added | |||
intset.h | intset.h | |||
---|---|---|---|---|
skipping to change at line 53 | skipping to change at line 53 | |||
void tp_intset_add (TpIntSet *set, guint element); | void tp_intset_add (TpIntSet *set, guint element); | |||
gboolean tp_intset_remove (TpIntSet *set, guint element); | gboolean tp_intset_remove (TpIntSet *set, guint element); | |||
gboolean tp_intset_is_member (const TpIntSet *set, guint element) | gboolean tp_intset_is_member (const TpIntSet *set, guint element) | |||
G_GNUC_WARN_UNUSED_RESULT; | G_GNUC_WARN_UNUSED_RESULT; | |||
void tp_intset_foreach (const TpIntSet *set, TpIntFunc func, | void tp_intset_foreach (const TpIntSet *set, TpIntFunc func, | |||
gpointer userdata); | gpointer userdata); | |||
GArray *tp_intset_to_array (const TpIntSet *set) G_GNUC_WARN_UNUSED_RESULT; | GArray *tp_intset_to_array (const TpIntSet *set) G_GNUC_WARN_UNUSED_RESULT; | |||
TpIntSet *tp_intset_from_array (const GArray *array) G_GNUC_WARN_UNUSED_RES ULT; | TpIntSet *tp_intset_from_array (const GArray *array) G_GNUC_WARN_UNUSED_RES ULT; | |||
gboolean tp_intset_is_empty (const TpIntSet *set) G_GNUC_WARN_UNUSED_RESULT ; | ||||
guint tp_intset_size (const TpIntSet *set) G_GNUC_WARN_UNUSED_RESULT; | guint tp_intset_size (const TpIntSet *set) G_GNUC_WARN_UNUSED_RESULT; | |||
gboolean tp_intset_is_equal (const TpIntSet *left, const TpIntSet *right) | gboolean tp_intset_is_equal (const TpIntSet *left, const TpIntSet *right) | |||
G_GNUC_WARN_UNUSED_RESULT; | G_GNUC_WARN_UNUSED_RESULT; | |||
TpIntSet *tp_intset_copy (const TpIntSet *orig) G_GNUC_WARN_UNUSED_RESULT; | TpIntSet *tp_intset_copy (const TpIntSet *orig) G_GNUC_WARN_UNUSED_RESULT; | |||
TpIntSet *tp_intset_intersection (const TpIntSet *left, const TpIntSet *rig ht) | TpIntSet *tp_intset_intersection (const TpIntSet *left, const TpIntSet *rig ht) | |||
G_GNUC_WARN_UNUSED_RESULT; | G_GNUC_WARN_UNUSED_RESULT; | |||
TpIntSet *tp_intset_union (const TpIntSet *left, const TpIntSet *right) | TpIntSet *tp_intset_union (const TpIntSet *left, const TpIntSet *right) | |||
G_GNUC_WARN_UNUSED_RESULT; | G_GNUC_WARN_UNUSED_RESULT; | |||
skipping to change at line 100 | skipping to change at line 101 | |||
static inline void | static inline void | |||
tp_intset_iter_reset_inline (TpIntSetIter *iter) | tp_intset_iter_reset_inline (TpIntSetIter *iter) | |||
{ | { | |||
g_return_if_fail (iter != NULL); | g_return_if_fail (iter != NULL); | |||
g_return_if_fail (iter->set != NULL); | g_return_if_fail (iter->set != NULL); | |||
iter->element = (guint)(-1); | iter->element = (guint)(-1); | |||
} | } | |||
gboolean tp_intset_iter_next (TpIntSetIter *iter); | gboolean tp_intset_iter_next (TpIntSetIter *iter); | |||
typedef struct { | ||||
/*<private>*/ | ||||
gpointer _dummy[16]; | ||||
} TpIntSetFastIter; | ||||
void tp_intset_fast_iter_init (TpIntSetFastIter *iter, | ||||
const TpIntSet *set); | ||||
gboolean tp_intset_fast_iter_next (TpIntSetFastIter *iter, | ||||
guint *output); | ||||
G_END_DECLS | G_END_DECLS | |||
#endif /*__TP_INTSET_H__*/ | #endif /*__TP_INTSET_H__*/ | |||
End of changes. 2 change blocks. | ||||
0 lines changed or deleted | 12 lines changed or added | |||
proxy.h | proxy.h | |||
---|---|---|---|---|
skipping to change at line 155 | skipping to change at line 155 | |||
const char *dbus_error, const char *debug_message, GError **error); | const char *dbus_error, const char *debug_message, GError **error); | |||
gboolean tp_proxy_is_prepared (gpointer self, GQuark feature); | gboolean tp_proxy_is_prepared (gpointer self, GQuark feature); | |||
void tp_proxy_prepare_async (gpointer self, | void tp_proxy_prepare_async (gpointer self, | |||
const GQuark *features, | const GQuark *features, | |||
GAsyncReadyCallback callback, | GAsyncReadyCallback callback, | |||
gpointer user_data); | gpointer user_data); | |||
gboolean tp_proxy_prepare_finish (gpointer self, | gboolean tp_proxy_prepare_finish (gpointer self, | |||
GAsyncResult *result, | GAsyncResult *result, | |||
GError **error); | GError **error); | |||
void _tp_proxy_set_features_failed (TpProxy *self, | ||||
const GError *error); | ||||
G_END_DECLS | G_END_DECLS | |||
#include <telepathy-glib/_gen/tp-cli-generic.h> | #include <telepathy-glib/_gen/tp-cli-generic.h> | |||
#endif /* #ifndef __TP_PROXY_H__*/ | #endif /* #ifndef __TP_PROXY_H__*/ | |||
End of changes. 1 change blocks. | ||||
2 lines changed or deleted | 0 lines changed or added | |||
telepathy-enums.h | telepathy-enums.h | |||
---|---|---|---|---|
skipping to change at line 91 | skipping to change at line 91 | |||
typedef enum { | typedef enum { | |||
TP_RICH_PRESENCE_ACCESS_CONTROL_TYPE_WHITELIST = 0, | TP_RICH_PRESENCE_ACCESS_CONTROL_TYPE_WHITELIST = 0, | |||
TP_RICH_PRESENCE_ACCESS_CONTROL_TYPE_PUBLISH_LIST = 1, | TP_RICH_PRESENCE_ACCESS_CONTROL_TYPE_PUBLISH_LIST = 1, | |||
TP_RICH_PRESENCE_ACCESS_CONTROL_TYPE_GROUP = 2, | TP_RICH_PRESENCE_ACCESS_CONTROL_TYPE_GROUP = 2, | |||
TP_RICH_PRESENCE_ACCESS_CONTROL_TYPE_OPEN = 3, | TP_RICH_PRESENCE_ACCESS_CONTROL_TYPE_OPEN = 3, | |||
} TpRichPresenceAccessControlType; | } TpRichPresenceAccessControlType; | |||
#define NUM_TP_RICH_PRESENCE_ACCESS_CONTROL_TYPES (3+1) | #define NUM_TP_RICH_PRESENCE_ACCESS_CONTROL_TYPES (3+1) | |||
typedef enum { | typedef enum { | |||
TP_LOCATION_FEATURE_CAN_SET = 1, | ||||
} TpLocationFeatures; | ||||
typedef enum { | ||||
TP_FILE_TRANSFER_STATE_NONE = 0, | TP_FILE_TRANSFER_STATE_NONE = 0, | |||
TP_FILE_TRANSFER_STATE_PENDING = 1, | TP_FILE_TRANSFER_STATE_PENDING = 1, | |||
TP_FILE_TRANSFER_STATE_ACCEPTED = 2, | TP_FILE_TRANSFER_STATE_ACCEPTED = 2, | |||
TP_FILE_TRANSFER_STATE_OPEN = 3, | TP_FILE_TRANSFER_STATE_OPEN = 3, | |||
TP_FILE_TRANSFER_STATE_COMPLETED = 4, | TP_FILE_TRANSFER_STATE_COMPLETED = 4, | |||
TP_FILE_TRANSFER_STATE_CANCELLED = 5, | TP_FILE_TRANSFER_STATE_CANCELLED = 5, | |||
} TpFileTransferState; | } TpFileTransferState; | |||
#define NUM_TP_FILE_TRANSFER_STATES (5+1) | #define NUM_TP_FILE_TRANSFER_STATES (5+1) | |||
typedef enum { | typedef enum { | |||
End of changes. 1 change blocks. | ||||
0 lines changed or deleted | 4 lines changed or added | |||
telepathy-glib.h | telepathy-glib.h | |||
---|---|---|---|---|
skipping to change at line 49 | skipping to change at line 49 | |||
#include <telepathy-glib/connection.h> | #include <telepathy-glib/connection.h> | |||
#include <telepathy-glib/connection-manager.h> | #include <telepathy-glib/connection-manager.h> | |||
#include <telepathy-glib/account.h> | #include <telepathy-glib/account.h> | |||
#include <telepathy-glib/account-manager.h> | #include <telepathy-glib/account-manager.h> | |||
#include <telepathy-glib/channel-dispatcher.h> | #include <telepathy-glib/channel-dispatcher.h> | |||
#include <telepathy-glib/channel-dispatch-operation.h> | #include <telepathy-glib/channel-dispatch-operation.h> | |||
#include <telepathy-glib/channel-request.h> | #include <telepathy-glib/channel-request.h> | |||
#include <telepathy-glib/handle.h> | #include <telepathy-glib/handle.h> | |||
#include <telepathy-glib/contact.h> | #include <telepathy-glib/contact.h> | |||
#include <telepathy-glib/debug.h> | #include <telepathy-glib/debug.h> | |||
#include <telepathy-glib/simple-approver.h> | ||||
#include <telepathy-glib/simple-handler.h> | ||||
#include <telepathy-glib/simple-observer.h> | #include <telepathy-glib/simple-observer.h> | |||
#include <telepathy-glib/svc-generic.h> | #include <telepathy-glib/svc-generic.h> | |||
#include <telepathy-glib/svc-client.h> | #include <telepathy-glib/svc-client.h> | |||
#undef __TP_IN_GLIB_H__ | #undef __TP_IN_GLIB_H__ | |||
#endif /* __TP_GLIB_H__ */ | #endif /* __TP_GLIB_H__ */ | |||
End of changes. 1 change blocks. | ||||
0 lines changed or deleted | 2 lines changed or added | |||
telepathy-interfaces.h | telepathy-interfaces.h | |||
---|---|---|---|---|
skipping to change at line 129 | skipping to change at line 129 | |||
(tp_iface_quark_connection_interface_contact_info ()) | (tp_iface_quark_connection_interface_contact_info ()) | |||
GQuark tp_iface_quark_connection_interface_contact_info (void); | GQuark tp_iface_quark_connection_interface_contact_info (void); | |||
#define TP_PROP_CONNECTION_INTERFACE_CONTACT_INFO_CONTACT_INFO_FLAGS \ | #define TP_PROP_CONNECTION_INTERFACE_CONTACT_INFO_CONTACT_INFO_FLAGS \ | |||
"org.freedesktop.Telepathy.Connection.Interface.ContactInfo.ContactInfoFlag s" | "org.freedesktop.Telepathy.Connection.Interface.ContactInfo.ContactInfoFlag s" | |||
#define TP_PROP_CONNECTION_INTERFACE_CONTACT_INFO_SUPPORTED_FIELDS \ | #define TP_PROP_CONNECTION_INTERFACE_CONTACT_INFO_SUPPORTED_FIELDS \ | |||
"org.freedesktop.Telepathy.Connection.Interface.ContactInfo.SupportedFields " | "org.freedesktop.Telepathy.Connection.Interface.ContactInfo.SupportedFields " | |||
#define TP_TOKEN_CONNECTION_INTERFACE_CONTACT_INFO_INFO \ | ||||
"org.freedesktop.Telepathy.Connection.Interface.ContactInfo/info" | ||||
#define TP_IFACE_CONNECTION_INTERFACE_SIMPLE_PRESENCE \ | #define TP_IFACE_CONNECTION_INTERFACE_SIMPLE_PRESENCE \ | |||
"org.freedesktop.Telepathy.Connection.Interface.SimplePresence" | "org.freedesktop.Telepathy.Connection.Interface.SimplePresence" | |||
#define TP_IFACE_QUARK_CONNECTION_INTERFACE_SIMPLE_PRESENCE \ | #define TP_IFACE_QUARK_CONNECTION_INTERFACE_SIMPLE_PRESENCE \ | |||
(tp_iface_quark_connection_interface_simple_presence ()) | (tp_iface_quark_connection_interface_simple_presence ()) | |||
GQuark tp_iface_quark_connection_interface_simple_presence (void); | GQuark tp_iface_quark_connection_interface_simple_presence (void); | |||
#define TP_PROP_CONNECTION_INTERFACE_SIMPLE_PRESENCE_STATUSES \ | #define TP_PROP_CONNECTION_INTERFACE_SIMPLE_PRESENCE_STATUSES \ | |||
"org.freedesktop.Telepathy.Connection.Interface.SimplePresence.Statuses" | "org.freedesktop.Telepathy.Connection.Interface.SimplePresence.Statuses" | |||
skipping to change at line 190 | skipping to change at line 193 | |||
(tp_iface_quark_connection_interface_location ()) | (tp_iface_quark_connection_interface_location ()) | |||
GQuark tp_iface_quark_connection_interface_location (void); | GQuark tp_iface_quark_connection_interface_location (void); | |||
#define TP_PROP_CONNECTION_INTERFACE_LOCATION_LOCATION_ACCESS_CONTROL_TYPES \ | #define TP_PROP_CONNECTION_INTERFACE_LOCATION_LOCATION_ACCESS_CONTROL_TYPES \ | |||
"org.freedesktop.Telepathy.Connection.Interface.Location.LocationAccessCont rolTypes" | "org.freedesktop.Telepathy.Connection.Interface.Location.LocationAccessCont rolTypes" | |||
#define TP_PROP_CONNECTION_INTERFACE_LOCATION_LOCATION_ACCESS_CONTROL \ | #define TP_PROP_CONNECTION_INTERFACE_LOCATION_LOCATION_ACCESS_CONTROL \ | |||
"org.freedesktop.Telepathy.Connection.Interface.Location.LocationAccessCont rol" | "org.freedesktop.Telepathy.Connection.Interface.Location.LocationAccessCont rol" | |||
#define TP_PROP_CONNECTION_INTERFACE_LOCATION_SUPPORTED_LOCATION_FEATURES \ | ||||
"org.freedesktop.Telepathy.Connection.Interface.Location.SupportedLocationF | ||||
eatures" | ||||
#define TP_TOKEN_CONNECTION_INTERFACE_LOCATION_LOCATION \ | #define TP_TOKEN_CONNECTION_INTERFACE_LOCATION_LOCATION \ | |||
"org.freedesktop.Telepathy.Connection.Interface.Location/location" | "org.freedesktop.Telepathy.Connection.Interface.Location/location" | |||
#define TP_IFACE_CHANNEL \ | #define TP_IFACE_CHANNEL \ | |||
"org.freedesktop.Telepathy.Channel" | "org.freedesktop.Telepathy.Channel" | |||
#define TP_IFACE_QUARK_CHANNEL \ | #define TP_IFACE_QUARK_CHANNEL \ | |||
(tp_iface_quark_channel ()) | (tp_iface_quark_channel ()) | |||
GQuark tp_iface_quark_channel (void); | GQuark tp_iface_quark_channel (void); | |||
skipping to change at line 381 | skipping to change at line 387 | |||
GQuark tp_iface_quark_channel_interface_destroyable (void); | GQuark tp_iface_quark_channel_interface_destroyable (void); | |||
#define TP_IFACE_CHANNEL_INTERFACE_DTMF \ | #define TP_IFACE_CHANNEL_INTERFACE_DTMF \ | |||
"org.freedesktop.Telepathy.Channel.Interface.DTMF" | "org.freedesktop.Telepathy.Channel.Interface.DTMF" | |||
#define TP_IFACE_QUARK_CHANNEL_INTERFACE_DTMF \ | #define TP_IFACE_QUARK_CHANNEL_INTERFACE_DTMF \ | |||
(tp_iface_quark_channel_interface_dtmf ()) | (tp_iface_quark_channel_interface_dtmf ()) | |||
GQuark tp_iface_quark_channel_interface_dtmf (void); | GQuark tp_iface_quark_channel_interface_dtmf (void); | |||
#define TP_PROP_CHANNEL_INTERFACE_DTMF_CURRENTLY_SENDING_TONES \ | ||||
"org.freedesktop.Telepathy.Channel.Interface.DTMF.CurrentlySendingTones" | ||||
#define TP_PROP_CHANNEL_INTERFACE_DTMF_INITIAL_TONES \ | ||||
"org.freedesktop.Telepathy.Channel.Interface.DTMF.InitialTones" | ||||
#define TP_IFACE_CHANNEL_INTERFACE_GROUP \ | #define TP_IFACE_CHANNEL_INTERFACE_GROUP \ | |||
"org.freedesktop.Telepathy.Channel.Interface.Group" | "org.freedesktop.Telepathy.Channel.Interface.Group" | |||
#define TP_IFACE_QUARK_CHANNEL_INTERFACE_GROUP \ | #define TP_IFACE_QUARK_CHANNEL_INTERFACE_GROUP \ | |||
(tp_iface_quark_channel_interface_group ()) | (tp_iface_quark_channel_interface_group ()) | |||
GQuark tp_iface_quark_channel_interface_group (void); | GQuark tp_iface_quark_channel_interface_group (void); | |||
#define TP_PROP_CHANNEL_INTERFACE_GROUP_GROUP_FLAGS \ | #define TP_PROP_CHANNEL_INTERFACE_GROUP_GROUP_FLAGS \ | |||
"org.freedesktop.Telepathy.Channel.Interface.Group.GroupFlags" | "org.freedesktop.Telepathy.Channel.Interface.Group.GroupFlags" | |||
skipping to change at line 615 | skipping to change at line 627 | |||
#define TP_PROP_ACCOUNT_CONNECTION_STATUS_REASON \ | #define TP_PROP_ACCOUNT_CONNECTION_STATUS_REASON \ | |||
"org.freedesktop.Telepathy.Account.ConnectionStatusReason" | "org.freedesktop.Telepathy.Account.ConnectionStatusReason" | |||
#define TP_PROP_ACCOUNT_CURRENT_PRESENCE \ | #define TP_PROP_ACCOUNT_CURRENT_PRESENCE \ | |||
"org.freedesktop.Telepathy.Account.CurrentPresence" | "org.freedesktop.Telepathy.Account.CurrentPresence" | |||
#define TP_PROP_ACCOUNT_REQUESTED_PRESENCE \ | #define TP_PROP_ACCOUNT_REQUESTED_PRESENCE \ | |||
"org.freedesktop.Telepathy.Account.RequestedPresence" | "org.freedesktop.Telepathy.Account.RequestedPresence" | |||
#define TP_PROP_ACCOUNT_CHANGING_PRESENCE \ | ||||
"org.freedesktop.Telepathy.Account.ChangingPresence" | ||||
#define TP_PROP_ACCOUNT_NORMALIZED_NAME \ | #define TP_PROP_ACCOUNT_NORMALIZED_NAME \ | |||
"org.freedesktop.Telepathy.Account.NormalizedName" | "org.freedesktop.Telepathy.Account.NormalizedName" | |||
#define TP_PROP_ACCOUNT_HAS_BEEN_ONLINE \ | #define TP_PROP_ACCOUNT_HAS_BEEN_ONLINE \ | |||
"org.freedesktop.Telepathy.Account.HasBeenOnline" | "org.freedesktop.Telepathy.Account.HasBeenOnline" | |||
#define TP_IFACE_ACCOUNT_INTERFACE_AVATAR \ | #define TP_IFACE_ACCOUNT_INTERFACE_AVATAR \ | |||
"org.freedesktop.Telepathy.Account.Interface.Avatar" | "org.freedesktop.Telepathy.Account.Interface.Avatar" | |||
#define TP_IFACE_QUARK_ACCOUNT_INTERFACE_AVATAR \ | #define TP_IFACE_QUARK_ACCOUNT_INTERFACE_AVATAR \ | |||
End of changes. 4 change blocks. | ||||
0 lines changed or deleted | 16 lines changed or added | |||
tp-cli-channel-dispatch-operation.h | tp-cli-channel-dispatch-operation.h | |||
---|---|---|---|---|
skipping to change at line 47 | skipping to change at line 47 | |||
const GError *error, gpointer user_data, | const GError *error, gpointer user_data, | |||
GObject *weak_object); | GObject *weak_object); | |||
TpProxyPendingCall *tp_cli_channel_dispatch_operation_call_claim (TpChannel DispatchOperation *proxy, | TpProxyPendingCall *tp_cli_channel_dispatch_operation_call_claim (TpChannel DispatchOperation *proxy, | |||
gint timeout_ms, | gint timeout_ms, | |||
tp_cli_channel_dispatch_operation_callback_for_claim callback, | tp_cli_channel_dispatch_operation_callback_for_claim callback, | |||
gpointer user_data, | gpointer user_data, | |||
GDestroyNotify destroy, | GDestroyNotify destroy, | |||
GObject *weak_object); | GObject *weak_object); | |||
typedef void (*tp_cli_channel_dispatch_operation_callback_for_handle_with_t | ||||
ime) (TpChannelDispatchOperation *proxy, | ||||
const GError *error, gpointer user_data, | ||||
GObject *weak_object); | ||||
TpProxyPendingCall *tp_cli_channel_dispatch_operation_call_handle_with_time | ||||
(TpChannelDispatchOperation *proxy, | ||||
gint timeout_ms, | ||||
const gchar *in_Handler, | ||||
gint64 in_UserActionTime, | ||||
tp_cli_channel_dispatch_operation_callback_for_handle_with_time callbac | ||||
k, | ||||
gpointer user_data, | ||||
GDestroyNotify destroy, | ||||
GObject *weak_object); | ||||
G_END_DECLS | G_END_DECLS | |||
End of changes. 1 change blocks. | ||||
0 lines changed or deleted | 16 lines changed or added | |||
tp-cli-channel.h | tp-cli-channel.h | |||
---|---|---|---|---|
skipping to change at line 154 | skipping to change at line 154 | |||
GObject *weak_object); | GObject *weak_object); | |||
#ifndef TP_DISABLE_DEPRECATED | #ifndef TP_DISABLE_DEPRECATED | |||
gboolean tp_cli_channel_interface_chat_state_run_set_chat_state (TpChannel *proxy, | gboolean tp_cli_channel_interface_chat_state_run_set_chat_state (TpChannel *proxy, | |||
gint timeout_ms, | gint timeout_ms, | |||
guint in_State, | guint in_State, | |||
GError **error, | GError **error, | |||
GMainLoop **loop) _TP_GNUC_DEPRECATED; | GMainLoop **loop) _TP_GNUC_DEPRECATED; | |||
#endif /* not TP_DISABLE_DEPRECATED */ | #endif /* not TP_DISABLE_DEPRECATED */ | |||
typedef void (*tp_cli_channel_interface_dtmf_signal_callback_sending_tones) | ||||
(TpChannel *proxy, | ||||
const gchar *arg_Tones, | ||||
gpointer user_data, GObject *weak_object); | ||||
TpProxySignalConnection *tp_cli_channel_interface_dtmf_connect_to_sending_t | ||||
ones (TpChannel *proxy, | ||||
tp_cli_channel_interface_dtmf_signal_callback_sending_tones callback, | ||||
gpointer user_data, | ||||
GDestroyNotify destroy, | ||||
GObject *weak_object, | ||||
GError **error); | ||||
typedef void (*tp_cli_channel_interface_dtmf_signal_callback_stopped_tones) | ||||
(TpChannel *proxy, | ||||
gboolean arg_Cancelled, | ||||
gpointer user_data, GObject *weak_object); | ||||
TpProxySignalConnection *tp_cli_channel_interface_dtmf_connect_to_stopped_t | ||||
ones (TpChannel *proxy, | ||||
tp_cli_channel_interface_dtmf_signal_callback_stopped_tones callback, | ||||
gpointer user_data, | ||||
GDestroyNotify destroy, | ||||
GObject *weak_object, | ||||
GError **error); | ||||
typedef void (*tp_cli_channel_interface_dtmf_callback_for_start_tone) (TpCh annel *proxy, | typedef void (*tp_cli_channel_interface_dtmf_callback_for_start_tone) (TpCh annel *proxy, | |||
const GError *error, gpointer user_data, | const GError *error, gpointer user_data, | |||
GObject *weak_object); | GObject *weak_object); | |||
TpProxyPendingCall *tp_cli_channel_interface_dtmf_call_start_tone (TpChanne l *proxy, | TpProxyPendingCall *tp_cli_channel_interface_dtmf_call_start_tone (TpChanne l *proxy, | |||
gint timeout_ms, | gint timeout_ms, | |||
guint in_Stream_ID, | guint in_Stream_ID, | |||
guchar in_Event, | guchar in_Event, | |||
tp_cli_channel_interface_dtmf_callback_for_start_tone callback, | tp_cli_channel_interface_dtmf_callback_for_start_tone callback, | |||
gpointer user_data, | gpointer user_data, | |||
skipping to change at line 196 | skipping to change at line 216 | |||
GObject *weak_object); | GObject *weak_object); | |||
#ifndef TP_DISABLE_DEPRECATED | #ifndef TP_DISABLE_DEPRECATED | |||
gboolean tp_cli_channel_interface_dtmf_run_stop_tone (TpChannel *proxy, | gboolean tp_cli_channel_interface_dtmf_run_stop_tone (TpChannel *proxy, | |||
gint timeout_ms, | gint timeout_ms, | |||
guint in_Stream_ID, | guint in_Stream_ID, | |||
GError **error, | GError **error, | |||
GMainLoop **loop) _TP_GNUC_DEPRECATED; | GMainLoop **loop) _TP_GNUC_DEPRECATED; | |||
#endif /* not TP_DISABLE_DEPRECATED */ | #endif /* not TP_DISABLE_DEPRECATED */ | |||
typedef void (*tp_cli_channel_interface_dtmf_callback_for_multiple_tones) ( | ||||
TpChannel *proxy, | ||||
const GError *error, gpointer user_data, | ||||
GObject *weak_object); | ||||
TpProxyPendingCall *tp_cli_channel_interface_dtmf_call_multiple_tones (TpCh | ||||
annel *proxy, | ||||
gint timeout_ms, | ||||
const gchar *in_Tones, | ||||
tp_cli_channel_interface_dtmf_callback_for_multiple_tones callback, | ||||
gpointer user_data, | ||||
GDestroyNotify destroy, | ||||
GObject *weak_object); | ||||
#ifndef TP_DISABLE_DEPRECATED | ||||
gboolean tp_cli_channel_interface_dtmf_run_multiple_tones (TpChannel *proxy | ||||
, | ||||
gint timeout_ms, | ||||
const gchar *in_Tones, | ||||
GError **error, | ||||
GMainLoop **loop) _TP_GNUC_DEPRECATED; | ||||
#endif /* not TP_DISABLE_DEPRECATED */ | ||||
typedef void (*tp_cli_channel_interface_destroyable_callback_for_destroy) ( TpChannel *proxy, | typedef void (*tp_cli_channel_interface_destroyable_callback_for_destroy) ( TpChannel *proxy, | |||
const GError *error, gpointer user_data, | const GError *error, gpointer user_data, | |||
GObject *weak_object); | GObject *weak_object); | |||
TpProxyPendingCall *tp_cli_channel_interface_destroyable_call_destroy (TpCh annel *proxy, | TpProxyPendingCall *tp_cli_channel_interface_destroyable_call_destroy (TpCh annel *proxy, | |||
gint timeout_ms, | gint timeout_ms, | |||
tp_cli_channel_interface_destroyable_callback_for_destroy callback, | tp_cli_channel_interface_destroyable_callback_for_destroy callback, | |||
gpointer user_data, | gpointer user_data, | |||
GDestroyNotify destroy, | GDestroyNotify destroy, | |||
GObject *weak_object); | GObject *weak_object); | |||
End of changes. 2 change blocks. | ||||
0 lines changed or deleted | 47 lines changed or added | |||
tp-svc-channel-dispatch-operation.h | tp-svc-channel-dispatch-operation.h | |||
---|---|---|---|---|
skipping to change at line 46 | skipping to change at line 46 | |||
void tp_svc_channel_dispatch_operation_implement_claim (TpSvcChannelDispatc hOperationClass *klass, tp_svc_channel_dispatch_operation_claim_impl impl); | void tp_svc_channel_dispatch_operation_implement_claim (TpSvcChannelDispatc hOperationClass *klass, tp_svc_channel_dispatch_operation_claim_impl impl); | |||
static inline | static inline | |||
/* this comment is to stop gtkdoc realising this is static */ | /* this comment is to stop gtkdoc realising this is static */ | |||
void tp_svc_channel_dispatch_operation_return_from_claim (DBusGMethodInvoca tion *context); | void tp_svc_channel_dispatch_operation_return_from_claim (DBusGMethodInvoca tion *context); | |||
static inline void | static inline void | |||
tp_svc_channel_dispatch_operation_return_from_claim (DBusGMethodInvocation *context) | tp_svc_channel_dispatch_operation_return_from_claim (DBusGMethodInvocation *context) | |||
{ | { | |||
dbus_g_method_return (context); | dbus_g_method_return (context); | |||
} | } | |||
typedef void (*tp_svc_channel_dispatch_operation_handle_with_time_impl) (Tp | ||||
SvcChannelDispatchOperation *self, | ||||
const gchar *in_Handler, | ||||
gint64 in_UserActionTime, | ||||
DBusGMethodInvocation *context); | ||||
void tp_svc_channel_dispatch_operation_implement_handle_with_time (TpSvcCha | ||||
nnelDispatchOperationClass *klass, tp_svc_channel_dispatch_operation_handle | ||||
_with_time_impl impl); | ||||
static inline | ||||
/* this comment is to stop gtkdoc realising this is static */ | ||||
void tp_svc_channel_dispatch_operation_return_from_handle_with_time (DBusGM | ||||
ethodInvocation *context); | ||||
static inline void | ||||
tp_svc_channel_dispatch_operation_return_from_handle_with_time (DBusGMethod | ||||
Invocation *context) | ||||
{ | ||||
dbus_g_method_return (context); | ||||
} | ||||
void tp_svc_channel_dispatch_operation_emit_channel_lost (gpointer instance , | void tp_svc_channel_dispatch_operation_emit_channel_lost (gpointer instance , | |||
const gchar *arg_Channel, | const gchar *arg_Channel, | |||
const gchar *arg_Error, | const gchar *arg_Error, | |||
const gchar *arg_Message); | const gchar *arg_Message); | |||
void tp_svc_channel_dispatch_operation_emit_finished (gpointer instance); | void tp_svc_channel_dispatch_operation_emit_finished (gpointer instance); | |||
G_END_DECLS | G_END_DECLS | |||
End of changes. 1 change blocks. | ||||
0 lines changed or deleted | 19 lines changed or added | |||
tp-svc-channel.h | tp-svc-channel.h | |||
---|---|---|---|---|
skipping to change at line 188 | skipping to change at line 188 | |||
void tp_svc_channel_interface_dtmf_implement_stop_tone (TpSvcChannelInterfa ceDTMFClass *klass, tp_svc_channel_interface_dtmf_stop_tone_impl impl); | void tp_svc_channel_interface_dtmf_implement_stop_tone (TpSvcChannelInterfa ceDTMFClass *klass, tp_svc_channel_interface_dtmf_stop_tone_impl impl); | |||
static inline | static inline | |||
/* this comment is to stop gtkdoc realising this is static */ | /* this comment is to stop gtkdoc realising this is static */ | |||
void tp_svc_channel_interface_dtmf_return_from_stop_tone (DBusGMethodInvoca tion *context); | void tp_svc_channel_interface_dtmf_return_from_stop_tone (DBusGMethodInvoca tion *context); | |||
static inline void | static inline void | |||
tp_svc_channel_interface_dtmf_return_from_stop_tone (DBusGMethodInvocation *context) | tp_svc_channel_interface_dtmf_return_from_stop_tone (DBusGMethodInvocation *context) | |||
{ | { | |||
dbus_g_method_return (context); | dbus_g_method_return (context); | |||
} | } | |||
typedef void (*tp_svc_channel_interface_dtmf_multiple_tones_impl) (TpSvcCha | ||||
nnelInterfaceDTMF *self, | ||||
const gchar *in_Tones, | ||||
DBusGMethodInvocation *context); | ||||
void tp_svc_channel_interface_dtmf_implement_multiple_tones (TpSvcChannelIn | ||||
terfaceDTMFClass *klass, tp_svc_channel_interface_dtmf_multiple_tones_impl | ||||
impl); | ||||
static inline | ||||
/* this comment is to stop gtkdoc realising this is static */ | ||||
void tp_svc_channel_interface_dtmf_return_from_multiple_tones (DBusGMethodI | ||||
nvocation *context); | ||||
static inline void | ||||
tp_svc_channel_interface_dtmf_return_from_multiple_tones (DBusGMethodInvoca | ||||
tion *context) | ||||
{ | ||||
dbus_g_method_return (context); | ||||
} | ||||
void tp_svc_channel_interface_dtmf_emit_sending_tones (gpointer instance, | ||||
const gchar *arg_Tones); | ||||
void tp_svc_channel_interface_dtmf_emit_stopped_tones (gpointer instance, | ||||
gboolean arg_Cancelled); | ||||
typedef struct _TpSvcChannelInterfaceDestroyable TpSvcChannelInterfaceDestr oyable; | typedef struct _TpSvcChannelInterfaceDestroyable TpSvcChannelInterfaceDestr oyable; | |||
typedef struct _TpSvcChannelInterfaceDestroyableClass TpSvcChannelInterface DestroyableClass; | typedef struct _TpSvcChannelInterfaceDestroyableClass TpSvcChannelInterface DestroyableClass; | |||
GType tp_svc_channel_interface_destroyable_get_type (void); | GType tp_svc_channel_interface_destroyable_get_type (void); | |||
#define TP_TYPE_SVC_CHANNEL_INTERFACE_DESTROYABLE \ | #define TP_TYPE_SVC_CHANNEL_INTERFACE_DESTROYABLE \ | |||
(tp_svc_channel_interface_destroyable_get_type ()) | (tp_svc_channel_interface_destroyable_get_type ()) | |||
#define TP_SVC_CHANNEL_INTERFACE_DESTROYABLE(obj) \ | #define TP_SVC_CHANNEL_INTERFACE_DESTROYABLE(obj) \ | |||
(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CHANNEL_INTERFACE_DESTROYA BLE, TpSvcChannelInterfaceDestroyable)) | (G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CHANNEL_INTERFACE_DESTROYA BLE, TpSvcChannelInterfaceDestroyable)) | |||
#define TP_IS_SVC_CHANNEL_INTERFACE_DESTROYABLE(obj) \ | #define TP_IS_SVC_CHANNEL_INTERFACE_DESTROYABLE(obj) \ | |||
End of changes. 1 change blocks. | ||||
0 lines changed or deleted | 23 lines changed or added | |||