account.h   account.h 
skipping to change at line 86 skipping to change at line 86
GQuark tp_account_get_feature_quark_core (void) G_GNUC_CONST; GQuark tp_account_get_feature_quark_core (void) G_GNUC_CONST;
GQuark tp_account_get_feature_quark_storage (void) G_GNUC_CONST; GQuark tp_account_get_feature_quark_storage (void) G_GNUC_CONST;
GQuark tp_account_get_feature_quark_addressing (void) G_GNUC_CONST; GQuark tp_account_get_feature_quark_addressing (void) G_GNUC_CONST;
TpAccount *tp_account_new (TpDBusDaemon *bus_daemon, const gchar *object_pa th, TpAccount *tp_account_new (TpDBusDaemon *bus_daemon, const gchar *object_pa th,
GError **error) G_GNUC_WARN_UNUSED_RESULT; GError **error) G_GNUC_WARN_UNUSED_RESULT;
gboolean tp_account_parse_object_path (const gchar *object_path, gboolean tp_account_parse_object_path (const gchar *object_path,
gchar **cm, gchar **protocol, gchar **account_id, GError **error); gchar **cm, gchar **protocol, gchar **account_id, GError **error);
const gchar *tp_account_get_path_suffix (TpAccount *account);
void tp_account_init_known_interfaces (void); void tp_account_init_known_interfaces (void);
TpConnection *tp_account_get_connection (TpAccount *account); TpConnection *tp_account_get_connection (TpAccount *account);
TpConnection *tp_account_ensure_connection (TpAccount *account, TpConnection *tp_account_ensure_connection (TpAccount *account,
const gchar *path); const gchar *path);
const gchar *tp_account_get_display_name (TpAccount *account); const gchar *tp_account_get_display_name (TpAccount *account);
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 base-protocol.h   base-protocol.h 
skipping to change at line 168 skipping to change at line 168
GStrv *connection_interfaces, GStrv *connection_interfaces,
GType **channel_manager_types, GType **channel_manager_types,
gchar **icon_name, gchar **icon_name,
gchar **english_name, gchar **english_name,
gchar **vcard_field); gchar **vcard_field);
const TpPresenceStatusSpec * (*get_statuses) (TpBaseProtocol *self); const TpPresenceStatusSpec * (*get_statuses) (TpBaseProtocol *self);
TpBaseProtocolGetAvatarDetailsFunc get_avatar_details; TpBaseProtocolGetAvatarDetailsFunc get_avatar_details;
GStrv (*dup_authentication_types) (TpBaseProtocol *self);
/*<private>*/ /*<private>*/
GCallback padding[6]; GCallback padding[5];
TpBaseProtocolClassPrivate *priv; TpBaseProtocolClassPrivate *priv;
}; };
const gchar *tp_base_protocol_get_name (TpBaseProtocol *self); const gchar *tp_base_protocol_get_name (TpBaseProtocol *self);
GHashTable *tp_base_protocol_get_immutable_properties (TpBaseProtocol *self ); GHashTable *tp_base_protocol_get_immutable_properties (TpBaseProtocol *self );
const TpCMParamSpec *tp_base_protocol_get_parameters (TpBaseProtocol *self) ; const TpCMParamSpec *tp_base_protocol_get_parameters (TpBaseProtocol *self) ;
const TpPresenceStatusSpec *tp_base_protocol_get_statuses (TpBaseProtocol * self); const TpPresenceStatusSpec *tp_base_protocol_get_statuses (TpBaseProtocol * self);
TpBaseConnection *tp_base_protocol_new_connection (TpBaseProtocol *self, TpBaseConnection *tp_base_protocol_new_connection (TpBaseProtocol *self,
 End of changes. 2 change blocks. 
1 lines changed or deleted 3 lines changed or added


 connection.h   connection.h 
skipping to change at line 77 skipping to change at line 77
TpContactInfoField *tp_contact_info_field_new (const gchar *field_name, TpContactInfoField *tp_contact_info_field_new (const gchar *field_name,
GStrv parameters, GStrv field_value); GStrv parameters, GStrv field_value);
TpContactInfoField *tp_contact_info_field_copy (const TpContactInfoField *s elf); TpContactInfoField *tp_contact_info_field_copy (const TpContactInfoField *s elf);
void tp_contact_info_field_free (TpContactInfoField *self); void tp_contact_info_field_free (TpContactInfoField *self);
#define TP_TYPE_CONTACT_INFO_LIST (tp_contact_info_list_get_type ()) #define TP_TYPE_CONTACT_INFO_LIST (tp_contact_info_list_get_type ())
GType tp_contact_info_list_get_type (void); GType tp_contact_info_list_get_type (void);
GList *tp_contact_info_list_copy (GList *list); GList *tp_contact_info_list_copy (GList *list);
void tp_contact_info_list_free (GList *list); void tp_contact_info_list_free (GList *list);
/* forward declaration, see contact.h for the rest */
typedef struct _TpContact TpContact;
typedef struct _TpConnection TpConnection; typedef struct _TpConnection TpConnection;
typedef struct _TpConnectionPrivate TpConnectionPrivate; typedef struct _TpConnectionPrivate TpConnectionPrivate;
typedef struct _TpConnectionClass TpConnectionClass; typedef struct _TpConnectionClass TpConnectionClass;
struct _TpConnectionClass { struct _TpConnectionClass {
TpProxyClass parent_class; TpProxyClass parent_class;
/*<private>*/ /*<private>*/
GCallback _1; GCallback _1;
GCallback _2; GCallback _2;
GCallback _3; GCallback _3;
skipping to change at line 127 skipping to change at line 130
(G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_CONNECTION, \ (G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_CONNECTION, \
TpConnectionClass)) TpConnectionClass))
TpConnection *tp_connection_new (TpDBusDaemon *dbus, const gchar *bus_name, TpConnection *tp_connection_new (TpDBusDaemon *dbus, const gchar *bus_name,
const gchar *object_path, GError **error) G_GNUC_WARN_UNUSED_RESULT; const gchar *object_path, GError **error) G_GNUC_WARN_UNUSED_RESULT;
TpConnectionStatus tp_connection_get_status (TpConnection *self, TpConnectionStatus tp_connection_get_status (TpConnection *self,
TpConnectionStatusReason *reason); TpConnectionStatusReason *reason);
TpHandle tp_connection_get_self_handle (TpConnection *self); TpHandle tp_connection_get_self_handle (TpConnection *self);
TpContact *tp_connection_get_self_contact (TpConnection *self);
TpCapabilities * tp_connection_get_capabilities (TpConnection *self); TpCapabilities * tp_connection_get_capabilities (TpConnection *self);
TpContactInfoFlags tp_connection_get_contact_info_flags (TpConnection *self ); TpContactInfoFlags tp_connection_get_contact_info_flags (TpConnection *self );
GList *tp_connection_get_contact_info_supported_fields (TpConnection *self) ; GList *tp_connection_get_contact_info_supported_fields (TpConnection *self) ;
void tp_connection_set_contact_info_async (TpConnection *self, void tp_connection_set_contact_info_async (TpConnection *self,
GList *info, GAsyncReadyCallback callback, GList *info, GAsyncReadyCallback callback,
gpointer user_data); gpointer user_data);
 End of changes. 2 change blocks. 
0 lines changed or deleted 4 lines changed or added


 contact.h   contact.h 
skipping to change at line 35 skipping to change at line 35
#include <gio/gio.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; /* TpContact is forward-declared in connection.h */
typedef struct _TpContactClass TpContactClass; typedef struct _TpContactClass TpContactClass;
typedef struct _TpContactPrivate TpContactPrivate; typedef struct _TpContactPrivate TpContactPrivate;
GType tp_contact_get_type (void) G_GNUC_CONST; GType tp_contact_get_type (void) G_GNUC_CONST;
#define TP_TYPE_CONTACT \ #define TP_TYPE_CONTACT \
(tp_contact_get_type ()) (tp_contact_get_type ())
#define TP_CONTACT(obj) \ #define TP_CONTACT(obj) \
(G_TYPE_CHECK_INSTANCE_CAST ((obj), TP_TYPE_CONTACT, \ (G_TYPE_CHECK_INSTANCE_CAST ((obj), TP_TYPE_CONTACT, \
TpContact)) TpContact))
skipping to change at line 146 skipping to change at line 146
guint n_contacts, TpContact * const *contacts, guint n_contacts, TpContact * const *contacts,
const gchar * const *requested_ids, GHashTable *failed_id_errors, const gchar * const *requested_ids, GHashTable *failed_id_errors,
const GError *error, gpointer user_data, GObject *weak_object); const GError *error, gpointer user_data, GObject *weak_object);
void tp_connection_get_contacts_by_id (TpConnection *self, void tp_connection_get_contacts_by_id (TpConnection *self,
guint n_ids, const gchar * const *ids, guint n_ids, const gchar * const *ids,
guint n_features, const TpContactFeature *features, guint n_features, const TpContactFeature *features,
TpConnectionContactsByIdCb callback, TpConnectionContactsByIdCb callback,
gpointer user_data, GDestroyNotify destroy, GObject *weak_object); gpointer user_data, GDestroyNotify destroy, GObject *weak_object);
TpContact *tp_connection_dup_contact_if_possible (TpConnection *connection,
TpHandle handle, const gchar *identifier);
G_END_DECLS G_END_DECLS
#endif #endif
 End of changes. 2 change blocks. 
1 lines changed or deleted 4 lines changed or added


 group-mixin.h   group-mixin.h 
skipping to change at line 155 skipping to change at line 155
}; };
/* TYPE MACROS */ /* TYPE MACROS */
#define TP_GROUP_MIXIN_CLASS_OFFSET_QUARK \ #define TP_GROUP_MIXIN_CLASS_OFFSET_QUARK \
(tp_group_mixin_class_get_offset_quark ()) (tp_group_mixin_class_get_offset_quark ())
#define TP_GROUP_MIXIN_CLASS_OFFSET(o) \ #define TP_GROUP_MIXIN_CLASS_OFFSET(o) \
tp_mixin_class_get_offset (o, TP_GROUP_MIXIN_CLASS_OFFSET_QUARK) tp_mixin_class_get_offset (o, TP_GROUP_MIXIN_CLASS_OFFSET_QUARK)
#define TP_GROUP_MIXIN_CLASS(o) \ #define TP_GROUP_MIXIN_CLASS(o) \
((TpGroupMixinClass *) tp_mixin_offset_cast (o, \ ((TpGroupMixinClass *) tp_mixin_offset_cast (o, \
TP_GROUP_MIXIN_CLASS_OFFSET (o))) TP_GROUP_MIXIN_CLASS_OFFSET (o)))
#define TP_HAS_GROUP_MIXIN_CLASS(cls) (TP_GROUP_MIXIN_CLASS_OFFSET (cls) != 0)
#define TP_GROUP_MIXIN_OFFSET_QUARK (tp_group_mixin_get_offset_quark ()) #define TP_GROUP_MIXIN_OFFSET_QUARK (tp_group_mixin_get_offset_quark ())
#define TP_GROUP_MIXIN_OFFSET(o) \ #define TP_GROUP_MIXIN_OFFSET(o) \
tp_mixin_instance_get_offset (o, TP_GROUP_MIXIN_OFFSET_QUARK) tp_mixin_instance_get_offset (o, TP_GROUP_MIXIN_OFFSET_QUARK)
#define TP_GROUP_MIXIN(o) ((TpGroupMixin *) tp_mixin_offset_cast (o, \ #define TP_GROUP_MIXIN(o) ((TpGroupMixin *) tp_mixin_offset_cast (o, \
TP_GROUP_MIXIN_OFFSET(o))) TP_GROUP_MIXIN_OFFSET(o)))
#define TP_HAS_GROUP_MIXIN(o) (TP_GROUP_MIXIN_OFFSET (o) != 0)
GQuark tp_group_mixin_class_get_offset_quark (void); GQuark tp_group_mixin_class_get_offset_quark (void);
GQuark tp_group_mixin_get_offset_quark (void); GQuark tp_group_mixin_get_offset_quark (void);
void tp_group_mixin_class_init (GObjectClass *obj_cls, void tp_group_mixin_class_init (GObjectClass *obj_cls,
glong offset, TpGroupMixinAddMemberFunc add_func, glong offset, TpGroupMixinAddMemberFunc add_func,
TpGroupMixinRemMemberFunc rem_func); TpGroupMixinRemMemberFunc rem_func);
void tp_group_mixin_class_allow_self_removal (GObjectClass *obj_cls); void tp_group_mixin_class_allow_self_removal (GObjectClass *obj_cls);
void tp_group_mixin_init (GObject *obj, glong offset, void tp_group_mixin_init (GObject *obj, glong offset,
 End of changes. 2 change blocks. 
0 lines changed or deleted 2 lines changed or added


 message-mixin.h   message-mixin.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_MESSAGE_MIXIN_H #ifndef TP_MESSAGE_MIXIN_H
#define TP_MESSAGE_MIXIN_H #define TP_MESSAGE_MIXIN_H
#include <telepathy-glib/base-connection.h> #include <telepathy-glib/base-connection.h>
#include <telepathy-glib/cm-message.h>
#include <telepathy-glib/handle-repo.h> #include <telepathy-glib/handle-repo.h>
#include <telepathy-glib/message.h>
#include <telepathy-glib/svc-channel.h> #include <telepathy-glib/svc-channel.h>
#include <telepathy-glib/util.h> #include <telepathy-glib/util.h>
G_BEGIN_DECLS G_BEGIN_DECLS
typedef struct _TpMessageMixin TpMessageMixin; typedef struct _TpMessageMixin TpMessageMixin;
typedef struct _TpMessageMixinPrivate TpMessageMixinPrivate; typedef struct _TpMessageMixinPrivate TpMessageMixinPrivate;
struct _TpMessageMixin { struct _TpMessageMixin {
/*<private>*/ /*<private>*/
TpMessageMixinPrivate *priv; TpMessageMixinPrivate *priv;
}; };
typedef struct _TpMessage TpMessage;
TpMessage *tp_message_new (TpBaseConnection *connection, guint initial_part
s,
guint size_hint) G_GNUC_WARN_UNUSED_RESULT;
void tp_message_destroy (TpMessage *self);
guint tp_message_count_parts (TpMessage *self);
const GHashTable *tp_message_peek (TpMessage *self, guint part);
guint tp_message_append_part (TpMessage *self);
void tp_message_delete_part (TpMessage *self, guint part);
void tp_message_ref_handle (TpMessage *self, TpHandleType handle_type,
TpHandle handle);
gboolean tp_message_delete_key (TpMessage *self, guint part, const gchar *k
ey);
void tp_message_set_handle (TpMessage *self, guint part, const gchar *key,
TpHandleType handle_type, TpHandle handle_or_0);
void tp_message_set_boolean (TpMessage *self, guint part, const gchar *key,
gboolean b);
void tp_message_set_int32 (TpMessage *self, guint part, const gchar *key,
gint32 i);
#define tp_message_set_int16(s, p, k, i) \
tp_message_set_int32 (s, p, k, (gint16) i)
void tp_message_set_int64 (TpMessage *self, guint part, const gchar *key,
gint64 i);
void tp_message_set_uint32 (TpMessage *self, guint part, const gchar *key,
guint32 u);
#define tp_message_set_uint16(s, p, k, u) \
tp_message_set_uint32 (s, p, k, (guint16) u)
void tp_message_set_uint64 (TpMessage *self, guint part, const gchar *key,
guint64 u);
void tp_message_set_string (TpMessage *self, guint part, const gchar *key,
const gchar *s);
void tp_message_set_string_printf (TpMessage *self, guint part,
const gchar *key, const gchar *fmt, ...) G_GNUC_PRINTF (4, 5);
void tp_message_set_bytes (TpMessage *self, guint part, const gchar *key,
guint len, gconstpointer bytes);
void tp_message_set (TpMessage *self, guint part, const gchar *key,
const GValue *source);
void tp_message_take_message (TpMessage *self, guint part, const gchar *key
,
TpMessage *message);
void tp_message_mixin_get_dbus_property (GObject *object, GQuark interface, void tp_message_mixin_get_dbus_property (GObject *object, GQuark interface,
GQuark name, GValue *value, gpointer unused); GQuark name, GValue *value, gpointer unused);
/* Receiving */ /* Receiving */
guint tp_message_mixin_take_received (GObject *object, TpMessage *message); guint tp_message_mixin_take_received (GObject *object, TpMessage *message);
gboolean tp_message_mixin_has_pending_messages (GObject *object, gboolean tp_message_mixin_has_pending_messages (GObject *object,
TpHandle *first_sender); TpHandle *first_sender);
 End of changes. 3 change blocks. 
43 lines changed or deleted 2 lines changed or added


 protocol.h   protocol.h 
skipping to change at line 92 skipping to change at line 92
(tp_protocol_get_feature_quark_parameters ()) (tp_protocol_get_feature_quark_parameters ())
GQuark tp_protocol_get_feature_quark_parameters (void) G_GNUC_CONST; GQuark tp_protocol_get_feature_quark_parameters (void) G_GNUC_CONST;
const TpConnectionManagerParam *tp_protocol_get_param (TpProtocol *self, const TpConnectionManagerParam *tp_protocol_get_param (TpProtocol *self,
const gchar *param); const gchar *param);
gboolean tp_protocol_has_param (TpProtocol *self, gboolean tp_protocol_has_param (TpProtocol *self,
const gchar *param); const gchar *param);
gboolean tp_protocol_can_register (TpProtocol *self); gboolean tp_protocol_can_register (TpProtocol *self);
GStrv tp_protocol_dup_param_names (TpProtocol *self) G_GNUC_WARN_UNUSED_RES ULT; GStrv tp_protocol_dup_param_names (TpProtocol *self) G_GNUC_WARN_UNUSED_RES ULT;
const gchar * const *
/* gtk-doc sucks */
tp_protocol_get_authentication_types (TpProtocol *self);
#define TP_PROTOCOL_FEATURE_CORE \ #define TP_PROTOCOL_FEATURE_CORE \
(tp_protocol_get_feature_quark_core ()) (tp_protocol_get_feature_quark_core ())
GQuark tp_protocol_get_feature_quark_core (void) G_GNUC_CONST; GQuark tp_protocol_get_feature_quark_core (void) G_GNUC_CONST;
const gchar *tp_protocol_get_vcard_field (TpProtocol *self); const gchar *tp_protocol_get_vcard_field (TpProtocol *self);
const gchar *tp_protocol_get_english_name (TpProtocol *self); const gchar *tp_protocol_get_english_name (TpProtocol *self);
const gchar *tp_protocol_get_icon_name (TpProtocol *self); const gchar *tp_protocol_get_icon_name (TpProtocol *self);
TpCapabilities *tp_protocol_get_capabilities (TpProtocol *self); TpCapabilities *tp_protocol_get_capabilities (TpProtocol *self);
G_END_DECLS G_END_DECLS
 End of changes. 1 change blocks. 
0 lines changed or deleted 4 lines changed or added


 simple-approver.h   simple-approver.h 
skipping to change at line 66 skipping to change at line 66
TpSimpleApproverClass)) TpSimpleApproverClass))
#define TP_IS_SIMPLE_APPROVER(obj) \ #define TP_IS_SIMPLE_APPROVER(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), TP_TYPE_SIMPLE_APPROVER)) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TP_TYPE_SIMPLE_APPROVER))
#define TP_IS_SIMPLE_APPROVER_CLASS(klass) \ #define TP_IS_SIMPLE_APPROVER_CLASS(klass) \
(G_TYPE_CHECK_CLASS_TYPE ((klass), TP_TYPE_SIMPLE_APPROVER)) (G_TYPE_CHECK_CLASS_TYPE ((klass), TP_TYPE_SIMPLE_APPROVER))
#define TP_SIMPLE_APPROVER_GET_CLASS(obj) \ #define TP_SIMPLE_APPROVER_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_SIMPLE_APPROVER, \ (G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_SIMPLE_APPROVER, \
TpSimpleApproverClass)) TpSimpleApproverClass))
typedef void (*TpSimpleApproverAddDispatchOperationImpl) ( typedef void (*TpSimpleApproverAddDispatchOperationImpl) (
TpSimpleApprover *self, TpSimpleApprover *approver,
TpAccount *account, TpAccount *account,
TpConnection *connection, TpConnection *connection,
GList *channels, GList *channels,
TpChannelDispatchOperation *dispatch_operation, TpChannelDispatchOperation *dispatch_operation,
TpAddDispatchOperationContext *context, TpAddDispatchOperationContext *context,
gpointer user_data); gpointer user_data);
TpBaseClient * tp_simple_approver_new (TpDBusDaemon *dbus, TpBaseClient * tp_simple_approver_new (TpDBusDaemon *dbus,
const gchar *name, const gchar *name,
gboolean unique, gboolean uniquify,
TpSimpleApproverAddDispatchOperationImpl callback, TpSimpleApproverAddDispatchOperationImpl callback,
gpointer user_data, gpointer user_data,
GDestroyNotify destroy); GDestroyNotify destroy);
TpBaseClient *tp_simple_approver_new_with_am ( TpBaseClient *tp_simple_approver_new_with_am (
TpAccountManager *account_manager, TpAccountManager *account_manager,
const gchar *name, const gchar *name,
gboolean unique, gboolean uniquify,
TpSimpleApproverAddDispatchOperationImpl callback, TpSimpleApproverAddDispatchOperationImpl callback,
gpointer user_data, gpointer user_data,
GDestroyNotify destroy); GDestroyNotify destroy);
G_END_DECLS G_END_DECLS
#endif #endif
 End of changes. 3 change blocks. 
3 lines changed or deleted 3 lines changed or added


 simple-handler.h   simple-handler.h 
skipping to change at line 66 skipping to change at line 66
TpSimpleHandlerClass)) TpSimpleHandlerClass))
#define TP_IS_SIMPLE_HANDLER(obj) \ #define TP_IS_SIMPLE_HANDLER(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), TP_TYPE_SIMPLE_HANDLER)) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TP_TYPE_SIMPLE_HANDLER))
#define TP_IS_SIMPLE_HANDLER_CLASS(klass) \ #define TP_IS_SIMPLE_HANDLER_CLASS(klass) \
(G_TYPE_CHECK_CLASS_TYPE ((klass), TP_TYPE_SIMPLE_HANDLER)) (G_TYPE_CHECK_CLASS_TYPE ((klass), TP_TYPE_SIMPLE_HANDLER))
#define TP_SIMPLE_HANDLER_GET_CLASS(obj) \ #define TP_SIMPLE_HANDLER_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_SIMPLE_HANDLER, \ (G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_SIMPLE_HANDLER, \
TpSimpleHandlerClass)) TpSimpleHandlerClass))
typedef void (*TpSimpleHandlerHandleChannelsImpl) ( typedef void (*TpSimpleHandlerHandleChannelsImpl) (
TpSimpleHandler *self, TpSimpleHandler *handler,
TpAccount *account, TpAccount *account,
TpConnection *connection, TpConnection *connection,
GList *channels, GList *channels,
GList *requests_satisfied, GList *requests_satisfied,
gint64 user_action_time, gint64 user_action_time,
TpHandleChannelsContext *context, TpHandleChannelsContext *context,
gpointer user_data); gpointer user_data);
TpBaseClient * tp_simple_handler_new (TpDBusDaemon *dbus, TpBaseClient * tp_simple_handler_new (TpDBusDaemon *dbus,
gboolean bypass_approval, gboolean bypass_approval,
gboolean requests, gboolean requests,
const gchar *name, const gchar *name,
gboolean unique, gboolean uniquify,
TpSimpleHandlerHandleChannelsImpl callback, TpSimpleHandlerHandleChannelsImpl callback,
gpointer user_data, gpointer user_data,
GDestroyNotify destroy); GDestroyNotify destroy);
TpBaseClient *tp_simple_handler_new_with_am (TpAccountManager *account_mana ger, TpBaseClient *tp_simple_handler_new_with_am (TpAccountManager *account_mana ger,
gboolean bypass_approval, gboolean bypass_approval,
gboolean requests, gboolean requests,
const gchar *name, const gchar *name,
gboolean unique, gboolean uniquify,
TpSimpleHandlerHandleChannelsImpl callback, TpSimpleHandlerHandleChannelsImpl callback,
gpointer user_data, gpointer user_data,
GDestroyNotify destroy); GDestroyNotify destroy);
G_END_DECLS G_END_DECLS
#endif #endif
 End of changes. 3 change blocks. 
3 lines changed or deleted 3 lines changed or added


 simple-observer.h   simple-observer.h 
skipping to change at line 66 skipping to change at line 66
TpSimpleObserverClass)) TpSimpleObserverClass))
#define TP_IS_SIMPLE_OBSERVER(obj) \ #define TP_IS_SIMPLE_OBSERVER(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), TP_TYPE_SIMPLE_OBSERVER)) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TP_TYPE_SIMPLE_OBSERVER))
#define TP_IS_SIMPLE_OBSERVER_CLASS(klass) \ #define TP_IS_SIMPLE_OBSERVER_CLASS(klass) \
(G_TYPE_CHECK_CLASS_TYPE ((klass), TP_TYPE_SIMPLE_OBSERVER)) (G_TYPE_CHECK_CLASS_TYPE ((klass), TP_TYPE_SIMPLE_OBSERVER))
#define TP_SIMPLE_OBSERVER_GET_CLASS(obj) \ #define TP_SIMPLE_OBSERVER_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_SIMPLE_OBSERVER, \ (G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_SIMPLE_OBSERVER, \
TpSimpleObserverClass)) TpSimpleObserverClass))
typedef void (*TpSimpleObserverObserveChannelsImpl) ( typedef void (*TpSimpleObserverObserveChannelsImpl) (
TpSimpleObserver *self, TpSimpleObserver *observer,
TpAccount *account, TpAccount *account,
TpConnection *connection, TpConnection *connection,
GList *channels, GList *channels,
TpChannelDispatchOperation *dispatch_operation, TpChannelDispatchOperation *dispatch_operation,
GList *requests, GList *requests,
TpObserveChannelsContext *context, TpObserveChannelsContext *context,
gpointer user_data); gpointer user_data);
TpBaseClient * tp_simple_observer_new (TpDBusDaemon *dbus, TpBaseClient * tp_simple_observer_new (TpDBusDaemon *dbus,
gboolean recover, gboolean recover,
const gchar *name, const gchar *name,
gboolean unique, gboolean uniquify,
TpSimpleObserverObserveChannelsImpl callback, TpSimpleObserverObserveChannelsImpl callback,
gpointer user_data, gpointer user_data,
GDestroyNotify destroy); GDestroyNotify destroy);
TpBaseClient *tp_simple_observer_new_with_am ( TpBaseClient *tp_simple_observer_new_with_am (
TpAccountManager *account_manager, TpAccountManager *account_manager,
gboolean recover, gboolean recover,
const gchar *name, const gchar *name,
gboolean unique, gboolean uniquify,
TpSimpleObserverObserveChannelsImpl callback, TpSimpleObserverObserveChannelsImpl callback,
gpointer user_data, gpointer user_data,
GDestroyNotify destroy); GDestroyNotify destroy);
G_END_DECLS G_END_DECLS
#endif #endif
 End of changes. 3 change blocks. 
3 lines changed or deleted 3 lines changed or added


 telepathy-glib.h   telepathy-glib.h 
skipping to change at line 54 skipping to change at line 54
#include <telepathy-glib/channel.h> #include <telepathy-glib/channel.h>
#include <telepathy-glib/client-channel-factory.h> #include <telepathy-glib/client-channel-factory.h>
#include <telepathy-glib/connection-manager.h> #include <telepathy-glib/connection-manager.h>
#include <telepathy-glib/connection.h> #include <telepathy-glib/connection.h>
#include <telepathy-glib/contact.h> #include <telepathy-glib/contact.h>
#include <telepathy-glib/dbus.h> #include <telepathy-glib/dbus.h>
#include <telepathy-glib/dtmf.h> #include <telepathy-glib/dtmf.h>
#include <telepathy-glib/debug.h> #include <telepathy-glib/debug.h>
#include <telepathy-glib/handle.h> #include <telepathy-glib/handle.h>
#include <telepathy-glib/proxy.h> #include <telepathy-glib/proxy.h>
#include <telepathy-glib/signalled-message.h>
#include <telepathy-glib/simple-approver.h> #include <telepathy-glib/simple-approver.h>
#include <telepathy-glib/simple-handler.h> #include <telepathy-glib/simple-handler.h>
#include <telepathy-glib/simple-observer.h> #include <telepathy-glib/simple-observer.h>
#include <telepathy-glib/stream-tube-channel.h> #include <telepathy-glib/stream-tube-channel.h>
#include <telepathy-glib/stream-tube-connection.h> #include <telepathy-glib/stream-tube-connection.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__
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 telepathy-interfaces.h   telepathy-interfaces.h 
skipping to change at line 48 skipping to change at line 48
#define TP_PROP_PROTOCOL_VCARD_FIELD \ #define TP_PROP_PROTOCOL_VCARD_FIELD \
"org.freedesktop.Telepathy.Protocol.VCardField" "org.freedesktop.Telepathy.Protocol.VCardField"
#define TP_PROP_PROTOCOL_ENGLISH_NAME \ #define TP_PROP_PROTOCOL_ENGLISH_NAME \
"org.freedesktop.Telepathy.Protocol.EnglishName" "org.freedesktop.Telepathy.Protocol.EnglishName"
#define TP_PROP_PROTOCOL_ICON \ #define TP_PROP_PROTOCOL_ICON \
"org.freedesktop.Telepathy.Protocol.Icon" "org.freedesktop.Telepathy.Protocol.Icon"
#define TP_PROP_PROTOCOL_AUTHENTICATION_TYPES \
"org.freedesktop.Telepathy.Protocol.AuthenticationTypes"
#define TP_IFACE_PROTOCOL_INTERFACE_AVATARS \ #define TP_IFACE_PROTOCOL_INTERFACE_AVATARS \
"org.freedesktop.Telepathy.Protocol.Interface.Avatars" "org.freedesktop.Telepathy.Protocol.Interface.Avatars"
#define TP_IFACE_QUARK_PROTOCOL_INTERFACE_AVATARS \ #define TP_IFACE_QUARK_PROTOCOL_INTERFACE_AVATARS \
(tp_iface_quark_protocol_interface_avatars ()) (tp_iface_quark_protocol_interface_avatars ())
GQuark tp_iface_quark_protocol_interface_avatars (void); GQuark tp_iface_quark_protocol_interface_avatars (void);
#define TP_PROP_PROTOCOL_INTERFACE_AVATARS_SUPPORTED_AVATAR_MIME_TYPES \ #define TP_PROP_PROTOCOL_INTERFACE_AVATARS_SUPPORTED_AVATAR_MIME_TYPES \
"org.freedesktop.Telepathy.Protocol.Interface.Avatars.SupportedAvatarMIMETy pes" "org.freedesktop.Telepathy.Protocol.Interface.Avatars.SupportedAvatarMIMETy pes"
skipping to change at line 866 skipping to change at line 869
"org.freedesktop.Telepathy.Channel.Interface.SMS" "org.freedesktop.Telepathy.Channel.Interface.SMS"
#define TP_IFACE_QUARK_CHANNEL_INTERFACE_SMS \ #define TP_IFACE_QUARK_CHANNEL_INTERFACE_SMS \
(tp_iface_quark_channel_interface_sms ()) (tp_iface_quark_channel_interface_sms ())
GQuark tp_iface_quark_channel_interface_sms (void); GQuark tp_iface_quark_channel_interface_sms (void);
#define TP_PROP_CHANNEL_INTERFACE_SMS_FLASH \ #define TP_PROP_CHANNEL_INTERFACE_SMS_FLASH \
"org.freedesktop.Telepathy.Channel.Interface.SMS.Flash" "org.freedesktop.Telepathy.Channel.Interface.SMS.Flash"
#define TP_PROP_CHANNEL_INTERFACE_SMS_SMS_CHANNEL \
"org.freedesktop.Telepathy.Channel.Interface.SMS.SMSChannel"
#define TP_IFACE_CHANNEL_INTERFACE_TUBE \ #define TP_IFACE_CHANNEL_INTERFACE_TUBE \
"org.freedesktop.Telepathy.Channel.Interface.Tube" "org.freedesktop.Telepathy.Channel.Interface.Tube"
#define TP_IFACE_QUARK_CHANNEL_INTERFACE_TUBE \ #define TP_IFACE_QUARK_CHANNEL_INTERFACE_TUBE \
(tp_iface_quark_channel_interface_tube ()) (tp_iface_quark_channel_interface_tube ())
GQuark tp_iface_quark_channel_interface_tube (void); GQuark tp_iface_quark_channel_interface_tube (void);
#define TP_PROP_CHANNEL_INTERFACE_TUBE_PARAMETERS \ #define TP_PROP_CHANNEL_INTERFACE_TUBE_PARAMETERS \
"org.freedesktop.Telepathy.Channel.Interface.Tube.Parameters" "org.freedesktop.Telepathy.Channel.Interface.Tube.Parameters"
 End of changes. 2 change blocks. 
0 lines changed or deleted 6 lines changed or added


 tp-cli-channel.h   tp-cli-channel.h 
skipping to change at line 924 skipping to change at line 924
#ifndef TP_DISABLE_DEPRECATED #ifndef TP_DISABLE_DEPRECATED
gboolean tp_cli_channel_interface_sasl_authentication_run_abort_sasl (TpCha nnel *proxy, gboolean tp_cli_channel_interface_sasl_authentication_run_abort_sasl (TpCha nnel *proxy,
gint timeout_ms, gint timeout_ms,
guint in_Reason, guint in_Reason,
const gchar *in_Debug_Message, const gchar *in_Debug_Message,
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_sms_signal_callback_sms_channel_cha
nged) (TpChannel *proxy,
gboolean arg_SMSChannel,
gpointer user_data, GObject *weak_object);
TpProxySignalConnection *tp_cli_channel_interface_sms_connect_to_sms_channe
l_changed (TpChannel *proxy,
tp_cli_channel_interface_sms_signal_callback_sms_channel_changed callba
ck,
gpointer user_data,
GDestroyNotify destroy,
GObject *weak_object,
GError **error);
typedef void (*tp_cli_channel_interface_service_point_signal_callback_servi ce_point_changed) (TpChannel *proxy, typedef void (*tp_cli_channel_interface_service_point_signal_callback_servi ce_point_changed) (TpChannel *proxy,
const GValueArray *arg_Service_Point, const GValueArray *arg_Service_Point,
gpointer user_data, GObject *weak_object); gpointer user_data, GObject *weak_object);
TpProxySignalConnection *tp_cli_channel_interface_service_point_connect_to_ service_point_changed (TpChannel *proxy, TpProxySignalConnection *tp_cli_channel_interface_service_point_connect_to_ service_point_changed (TpChannel *proxy,
tp_cli_channel_interface_service_point_signal_callback_service_point_ch anged callback, tp_cli_channel_interface_service_point_signal_callback_service_point_ch anged callback,
gpointer user_data, gpointer user_data,
GDestroyNotify destroy, GDestroyNotify destroy,
GObject *weak_object, GObject *weak_object,
GError **error); GError **error);
 End of changes. 1 change blocks. 
0 lines changed or deleted 13 lines changed or added


 tp-svc-channel.h   tp-svc-channel.h 
skipping to change at line 766 skipping to change at line 766
GType tp_svc_channel_interface_sms_get_type (void); GType tp_svc_channel_interface_sms_get_type (void);
#define TP_TYPE_SVC_CHANNEL_INTERFACE_SMS \ #define TP_TYPE_SVC_CHANNEL_INTERFACE_SMS \
(tp_svc_channel_interface_sms_get_type ()) (tp_svc_channel_interface_sms_get_type ())
#define TP_SVC_CHANNEL_INTERFACE_SMS(obj) \ #define TP_SVC_CHANNEL_INTERFACE_SMS(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CHANNEL_INTERFACE_SMS, TpS vcChannelInterfaceSMS)) (G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CHANNEL_INTERFACE_SMS, TpS vcChannelInterfaceSMS))
#define TP_IS_SVC_CHANNEL_INTERFACE_SMS(obj) \ #define TP_IS_SVC_CHANNEL_INTERFACE_SMS(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CHANNEL_INTERFACE_SMS)) (G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CHANNEL_INTERFACE_SMS))
#define TP_SVC_CHANNEL_INTERFACE_SMS_GET_CLASS(obj) \ #define TP_SVC_CHANNEL_INTERFACE_SMS_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CHANNEL_INTERFACE_SMS, TpSvcChannelInterfaceSMSClass)) (G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CHANNEL_INTERFACE_SMS, TpSvcChannelInterfaceSMSClass))
void tp_svc_channel_interface_sms_emit_sms_channel_changed (gpointer instan
ce,
gboolean arg_SMSChannel);
typedef struct _TpSvcChannelInterfaceSecurable TpSvcChannelInterfaceSecurab le; typedef struct _TpSvcChannelInterfaceSecurable TpSvcChannelInterfaceSecurab le;
typedef struct _TpSvcChannelInterfaceSecurableClass TpSvcChannelInterfaceSe curableClass; typedef struct _TpSvcChannelInterfaceSecurableClass TpSvcChannelInterfaceSe curableClass;
GType tp_svc_channel_interface_securable_get_type (void); GType tp_svc_channel_interface_securable_get_type (void);
#define TP_TYPE_SVC_CHANNEL_INTERFACE_SECURABLE \ #define TP_TYPE_SVC_CHANNEL_INTERFACE_SECURABLE \
(tp_svc_channel_interface_securable_get_type ()) (tp_svc_channel_interface_securable_get_type ())
#define TP_SVC_CHANNEL_INTERFACE_SECURABLE(obj) \ #define TP_SVC_CHANNEL_INTERFACE_SECURABLE(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CHANNEL_INTERFACE_SECURABL E, TpSvcChannelInterfaceSecurable)) (G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CHANNEL_INTERFACE_SECURABL E, TpSvcChannelInterfaceSecurable))
#define TP_IS_SVC_CHANNEL_INTERFACE_SECURABLE(obj) \ #define TP_IS_SVC_CHANNEL_INTERFACE_SECURABLE(obj) \
 End of changes. 1 change blocks. 
0 lines changed or deleted 4 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/