| account.h | | account.h | |
| | | | |
| skipping to change at line 190 | | skipping to change at line 190 | |
| GAsyncResult *result, GError **error); | | GAsyncResult *result, GError **error); | |
| | | | |
| gboolean tp_account_is_prepared (TpAccount *account, GQuark feature); | | gboolean tp_account_is_prepared (TpAccount *account, GQuark feature); | |
| | | | |
| void tp_account_prepare_async (TpAccount *account, const GQuark *features, | | void tp_account_prepare_async (TpAccount *account, const GQuark *features, | |
| GAsyncReadyCallback callback, gpointer user_data); | | GAsyncReadyCallback callback, gpointer user_data); | |
| | | | |
| gboolean tp_account_prepare_finish (TpAccount *account, GAsyncResult *resul
t, | | gboolean tp_account_prepare_finish (TpAccount *account, GAsyncResult *resul
t, | |
| GError **error); | | GError **error); | |
| | | | |
|
| | | void tp_account_set_avatar_async (TpAccount *self, | |
| | | const guchar *avatar, | |
| | | gsize len, | |
| | | const gchar *mime_type, | |
| | | GAsyncReadyCallback callback, | |
| | | gpointer user_data); | |
| | | | |
| | | gboolean tp_account_set_avatar_finish (TpAccount *self, | |
| | | GAsyncResult *result, | |
| | | GError **error); | |
| | | | |
| 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 | | 11 lines changed or added | |
|
| contact.h | | contact.h | |
| | | | |
| skipping to change at line 57 | | skipping to change at line 57 | |
| #define TP_IS_CONTACT_CLASS(klass) \ | | #define TP_IS_CONTACT_CLASS(klass) \ | |
| (G_TYPE_CHECK_CLASS_TYPE ((klass), TP_TYPE_CONTACT)) | | (G_TYPE_CHECK_CLASS_TYPE ((klass), TP_TYPE_CONTACT)) | |
| #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, | |
| NUM_TP_CONTACT_FEATURES | | NUM_TP_CONTACT_FEATURES | |
| } 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); | |
| | | | |
| /* TP_CONTACT_FEATURE_AVATAR_TOKEN */ | | /* TP_CONTACT_FEATURE_AVATAR_TOKEN */ | |
| const gchar *tp_contact_get_avatar_token (TpContact *self); | | const gchar *tp_contact_get_avatar_token (TpContact *self); | |
| | | | |
| /* TP_CONTACT_FEATURE_PRESENCE */ | | /* TP_CONTACT_FEATURE_PRESENCE */ | |
| 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 */ | |
| | | GHashTable *tp_contact_get_location (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. 2 change blocks. |
| 0 lines changed or deleted | | 4 lines changed or added | |
|
| dbus-properties-mixin.h | | dbus-properties-mixin.h | |
| | | | |
| skipping to change at line 82 | | skipping to change at line 82 | |
| typedef struct { | | typedef struct { | |
| const gchar *name; | | const gchar *name; | |
| gpointer getter_data; | | gpointer getter_data; | |
| gpointer setter_data; | | gpointer setter_data; | |
| /*<private>*/ | | /*<private>*/ | |
| GCallback _1; | | GCallback _1; | |
| GCallback _2; | | GCallback _2; | |
| gpointer mixin_priv; | | gpointer mixin_priv; | |
| } TpDBusPropertiesMixinPropImpl; | | } TpDBusPropertiesMixinPropImpl; | |
| | | | |
|
| /* this union is to keep ABI if sizeof (GCallback) > sizeof (void *) */ | | | |
| typedef union { | | | |
| GCallback _padding; | | | |
| gpointer priv; | | | |
| } _TpDBusPropertiesMixinPaddedPointer; | | | |
| | | | |
| typedef struct { | | typedef struct { | |
| const gchar *name; | | const gchar *name; | |
| TpDBusPropertiesMixinGetter getter; | | TpDBusPropertiesMixinGetter getter; | |
| TpDBusPropertiesMixinSetter setter; | | TpDBusPropertiesMixinSetter setter; | |
| TpDBusPropertiesMixinPropImpl *props; | | TpDBusPropertiesMixinPropImpl *props; | |
| /*<private>*/ | | /*<private>*/ | |
| GCallback _1; | | GCallback _1; | |
| GCallback _2; | | GCallback _2; | |
|
| _TpDBusPropertiesMixinPaddedPointer mixin_next; | | gpointer mixin_next; | |
| gpointer mixin_priv; | | gpointer mixin_priv; | |
| } TpDBusPropertiesMixinIfaceImpl; | | } TpDBusPropertiesMixinIfaceImpl; | |
| | | | |
| struct _TpDBusPropertiesMixinClass { | | struct _TpDBusPropertiesMixinClass { | |
| TpDBusPropertiesMixinIfaceImpl *interfaces; | | TpDBusPropertiesMixinIfaceImpl *interfaces; | |
| /*<private>*/ | | /*<private>*/ | |
| gpointer _1; | | gpointer _1; | |
| gpointer _2; | | gpointer _2; | |
| gpointer _3; | | gpointer _3; | |
| gpointer _4; | | gpointer _4; | |
| | | | |
End of changes. 2 change blocks. |
| 7 lines changed or deleted | | 1 lines changed or added | |
|
| debug-sender.h | | debug-sender.h | |
| | | | |
| skipping to change at line 48 | | skipping to change at line 48 | |
| #define TP_DEBUG_SENDER_CLASS(klass) \ | | #define TP_DEBUG_SENDER_CLASS(klass) \ | |
| (G_TYPE_CHECK_CLASS_CAST ((klass), TP_TYPE_DEBUG_SENDER, TpDebugSenderCla
ss)) | | (G_TYPE_CHECK_CLASS_CAST ((klass), TP_TYPE_DEBUG_SENDER, TpDebugSenderCla
ss)) | |
| #define TP_IS_DEBUG_SENDER(obj) \ | | #define TP_IS_DEBUG_SENDER(obj) \ | |
| (G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_DEBUG_SENDER)) | | (G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_DEBUG_SENDER)) | |
| #define TP_IS_DEBUG_SENDER_CLASS(klass) \ | | #define TP_IS_DEBUG_SENDER_CLASS(klass) \ | |
| (G_TYPE_CHECK_CLASS_TYPE((klass), TP_TYPE_DEBUG_SENDER)) | | (G_TYPE_CHECK_CLASS_TYPE((klass), TP_TYPE_DEBUG_SENDER)) | |
| #define TP_DEBUG_SENDER_GET_CLASS(obj) \ | | #define TP_DEBUG_SENDER_GET_CLASS(obj) \ | |
| (G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_DEBUG_SENDER, TpDebugSenderCla
ss)) | | (G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_DEBUG_SENDER, TpDebugSenderCla
ss)) | |
| | | | |
| struct _TpDebugSender { | | struct _TpDebugSender { | |
|
| | | /*<private>*/ | |
| GObject parent; | | GObject parent; | |
| | | | |
|
| /*<private>*/ | | | |
| TpDebugSenderPrivate *priv; | | TpDebugSenderPrivate *priv; | |
| }; | | }; | |
| | | | |
| struct _TpDebugSenderClass { | | struct _TpDebugSenderClass { | |
| /*<private>*/ | | /*<private>*/ | |
| GObjectClass parent_class; | | GObjectClass parent_class; | |
| TpDBusPropertiesMixinClass dbus_props_class; | | TpDBusPropertiesMixinClass dbus_props_class; | |
| GCallback _padding[7]; | | GCallback _padding[7]; | |
| gpointer priv; | | gpointer priv; | |
| }; | | }; | |
| | | | |
End of changes. 2 change blocks. |
| 1 lines changed or deleted | | 1 lines changed or added | |
|
| proxy.h | | proxy.h | |
| | | | |
| skipping to change at line 58 | | skipping to change at line 58 | |
| TP_DBUS_ERROR_INVALID_INTERFACE_NAME = 5, | | TP_DBUS_ERROR_INVALID_INTERFACE_NAME = 5, | |
| TP_DBUS_ERROR_INVALID_OBJECT_PATH = 6, | | TP_DBUS_ERROR_INVALID_OBJECT_PATH = 6, | |
| TP_DBUS_ERROR_INVALID_MEMBER_NAME = 7, | | TP_DBUS_ERROR_INVALID_MEMBER_NAME = 7, | |
| TP_DBUS_ERROR_OBJECT_REMOVED = 8, | | TP_DBUS_ERROR_OBJECT_REMOVED = 8, | |
| TP_DBUS_ERROR_CANCELLED = 9, | | TP_DBUS_ERROR_CANCELLED = 9, | |
| TP_DBUS_ERROR_INCONSISTENT = 10, | | TP_DBUS_ERROR_INCONSISTENT = 10, | |
| NUM_TP_DBUS_ERRORS | | NUM_TP_DBUS_ERRORS | |
| } TpDBusError; | | } TpDBusError; | |
| | | | |
| struct _TpProxy { | | struct _TpProxy { | |
|
| | | /*<private>*/ | |
| GObject parent; | | GObject parent; | |
| | | | |
|
| /*<private>*/ | | | |
| TpDBusDaemon *dbus_daemon; | | TpDBusDaemon *dbus_daemon; | |
| DBusGConnection *dbus_connection; | | DBusGConnection *dbus_connection; | |
| gchar *bus_name; | | gchar *bus_name; | |
| gchar *object_path; | | gchar *object_path; | |
| | | | |
| GError *invalidated /* initialized to NULL by g_object_new */; | | GError *invalidated /* initialized to NULL by g_object_new */; | |
| | | | |
| TpProxyPrivate *priv; | | TpProxyPrivate *priv; | |
| }; | | }; | |
| | | | |
| | | | |
End of changes. 2 change blocks. |
| 1 lines changed or deleted | | 1 lines changed or added | |
|
| util.h | | util.h | |
| | | | |
| skipping to change at line 68 | | skipping to change at line 68 | |
| GValue *tp_g_value_slice_new_take_boxed (GType type, gpointer p) | | GValue *tp_g_value_slice_new_take_boxed (GType type, gpointer p) | |
| G_GNUC_WARN_UNUSED_RESULT; | | G_GNUC_WARN_UNUSED_RESULT; | |
| | | | |
| void tp_g_value_slice_free (GValue *value); | | void tp_g_value_slice_free (GValue *value); | |
| | | | |
| GValue *tp_g_value_slice_dup (const GValue *value) G_GNUC_WARN_UNUSED_RESUL
T; | | GValue *tp_g_value_slice_dup (const GValue *value) G_GNUC_WARN_UNUSED_RESUL
T; | |
| | | | |
| void tp_g_hash_table_update (GHashTable *target, GHashTable *source, | | void tp_g_hash_table_update (GHashTable *target, GHashTable *source, | |
| GBoxedCopyFunc key_dup, GBoxedCopyFunc value_dup); | | GBoxedCopyFunc key_dup, GBoxedCopyFunc value_dup); | |
| | | | |
|
| | | #define tp_str_empty(s) (tp_str_empty_inline (s)) | |
| | | | |
| | | static inline gboolean | |
| | | tp_str_empty_inline (const gchar *s) | |
| | | { | |
| | | return (s == NULL || s[0] == '\0'); | |
| | | } | |
| | | | |
| gboolean tp_strdiff (const gchar *left, const gchar *right); | | gboolean tp_strdiff (const gchar *left, const gchar *right); | |
| | | | |
| gpointer tp_mixin_offset_cast (gpointer instance, guint offset); | | gpointer tp_mixin_offset_cast (gpointer instance, guint offset); | |
| guint tp_mixin_instance_get_offset (gpointer instance, GQuark quark); | | guint tp_mixin_instance_get_offset (gpointer instance, GQuark quark); | |
| guint tp_mixin_class_get_offset (gpointer klass, GQuark quark); | | guint tp_mixin_class_get_offset (gpointer klass, GQuark quark); | |
| | | | |
| gchar *tp_escape_as_identifier (const gchar *name) G_GNUC_WARN_UNUSED_RESUL
T; | | gchar *tp_escape_as_identifier (const gchar *name) G_GNUC_WARN_UNUSED_RESUL
T; | |
| | | | |
| gboolean tp_strv_contains (const gchar * const *strv, const gchar *str); | | gboolean tp_strv_contains (const gchar * const *strv, const gchar *str); | |
| | | | |
| | | | |
End of changes. 1 change blocks. |
| 0 lines changed or deleted | | 8 lines changed or added | |
|