account.h   account.h 
skipping to change at line 74 skipping to change at line 74
#define TP_IS_ACCOUNT_CLASS(klass) \ #define TP_IS_ACCOUNT_CLASS(klass) \
(G_TYPE_CHECK_CLASS_TYPE ((klass), TP_TYPE_ACCOUNT)) (G_TYPE_CHECK_CLASS_TYPE ((klass), TP_TYPE_ACCOUNT))
#define TP_ACCOUNT_GET_CLASS(obj) \ #define TP_ACCOUNT_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_ACCOUNT, \ (G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_ACCOUNT, \
TpAccountClass)) TpAccountClass))
#define TP_ACCOUNT_FEATURE_CORE \ #define TP_ACCOUNT_FEATURE_CORE \
tp_account_get_feature_quark_core () tp_account_get_feature_quark_core ()
#define TP_ACCOUNT_FEATURE_STORAGE \ #define TP_ACCOUNT_FEATURE_STORAGE \
tp_account_get_feature_quark_storage () tp_account_get_feature_quark_storage ()
#define TP_ACCOUNT_FEATURE_ADDRESSING \
tp_account_get_feature_quark_addressing ()
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;
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);
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);
skipping to change at line 100 skipping to change at line 103
const gchar *tp_account_get_display_name (TpAccount *account); const gchar *tp_account_get_display_name (TpAccount *account);
const gchar *tp_account_get_connection_manager (TpAccount *account); const gchar *tp_account_get_connection_manager (TpAccount *account);
const gchar *tp_account_get_protocol (TpAccount *account); const gchar *tp_account_get_protocol (TpAccount *account);
const gchar *tp_account_get_service (TpAccount *self); const gchar *tp_account_get_service (TpAccount *self);
const gchar *tp_account_get_icon_name (TpAccount *account); const gchar *tp_account_get_icon_name (TpAccount *account);
const gchar *tp_account_get_normalized_name (TpAccount *self);
void tp_account_set_enabled_async (TpAccount *account, void tp_account_set_enabled_async (TpAccount *account,
gboolean enabled, GAsyncReadyCallback callback, gpointer user_data); gboolean enabled, GAsyncReadyCallback callback, gpointer user_data);
gboolean tp_account_set_enabled_finish (TpAccount *account, gboolean tp_account_set_enabled_finish (TpAccount *account,
GAsyncResult *result, GError **error); GAsyncResult *result, GError **error);
void tp_account_reconnect_async (TpAccount *account, void tp_account_reconnect_async (TpAccount *account,
GAsyncReadyCallback callback, gpointer user_data); GAsyncReadyCallback callback, gpointer user_data);
gboolean tp_account_reconnect_finish (TpAccount *account, gboolean tp_account_reconnect_finish (TpAccount *account,
skipping to change at line 157 skipping to change at line 162
gboolean tp_account_set_service_finish (TpAccount *self, gboolean tp_account_set_service_finish (TpAccount *self,
GAsyncResult *result, GError **error); GAsyncResult *result, GError **error);
void tp_account_request_presence_async (TpAccount *account, void tp_account_request_presence_async (TpAccount *account,
TpConnectionPresenceType type, const gchar *status, const gchar *messag e, TpConnectionPresenceType type, const gchar *status, const gchar *messag e,
GAsyncReadyCallback callback, gpointer user_data); GAsyncReadyCallback callback, gpointer user_data);
gboolean tp_account_request_presence_finish (TpAccount *account, gboolean tp_account_request_presence_finish (TpAccount *account,
GAsyncResult *result, GError **error); GAsyncResult *result, GError **error);
void tp_account_set_automatic_presence_async (TpAccount *account,
TpConnectionPresenceType type, const gchar *status, const gchar *messag
e,
GAsyncReadyCallback callback, gpointer user_data);
gboolean tp_account_set_automatic_presence_finish (TpAccount *account,
GAsyncResult *result, GError **error);
gboolean tp_account_get_connect_automatically (TpAccount *account); gboolean tp_account_get_connect_automatically (TpAccount *account);
void tp_account_set_connect_automatically_async (TpAccount *account, void tp_account_set_connect_automatically_async (TpAccount *account,
gboolean connect_automatically, GAsyncReadyCallback callback, gboolean connect_automatically, GAsyncReadyCallback callback,
gpointer user_data); gpointer user_data);
gboolean tp_account_set_connect_automatically_finish (TpAccount *account, gboolean tp_account_set_connect_automatically_finish (TpAccount *account,
GAsyncResult *result, GError **error); GAsyncResult *result, GError **error);
gboolean tp_account_get_has_been_online (TpAccount *account); gboolean tp_account_get_has_been_online (TpAccount *account);
skipping to change at line 180 skipping to change at line 192
const gchar *tp_account_get_detailed_error (TpAccount *self, const gchar *tp_account_get_detailed_error (TpAccount *self,
const GHashTable **details); const GHashTable **details);
TpConnectionPresenceType tp_account_get_current_presence (TpAccount *accoun t, TpConnectionPresenceType tp_account_get_current_presence (TpAccount *accoun t,
gchar **status, gchar **status_message); gchar **status, gchar **status_message);
TpConnectionPresenceType tp_account_get_requested_presence ( TpConnectionPresenceType tp_account_get_requested_presence (
TpAccount *account, gchar **status, gchar **status_message); TpAccount *account, gchar **status, gchar **status_message);
TpConnectionPresenceType tp_account_get_automatic_presence (
TpAccount *self, gchar **status, gchar **status_message);
const GHashTable *tp_account_get_parameters (TpAccount *account); const GHashTable *tp_account_get_parameters (TpAccount *account);
const gchar *tp_account_get_nickname (TpAccount *account); const gchar *tp_account_get_nickname (TpAccount *account);
void tp_account_set_nickname_async (TpAccount *account, void tp_account_set_nickname_async (TpAccount *account,
const gchar *nickname, GAsyncReadyCallback callback, gpointer user_data ); const gchar *nickname, GAsyncReadyCallback callback, gpointer user_data );
gboolean tp_account_set_nickname_finish (TpAccount *account, gboolean tp_account_set_nickname_finish (TpAccount *account,
GAsyncResult *result, GError **error); GAsyncResult *result, GError **error);
skipping to change at line 225 skipping to change at line 240
gboolean tp_account_get_changing_presence (TpAccount *self); gboolean tp_account_get_changing_presence (TpAccount *self);
const gchar *tp_account_get_storage_provider (TpAccount *self); const gchar *tp_account_get_storage_provider (TpAccount *self);
const GValue *tp_account_get_storage_identifier (TpAccount *self); const GValue *tp_account_get_storage_identifier (TpAccount *self);
TpStorageRestrictionFlags tp_account_get_storage_restrictions (TpAccount *s elf); TpStorageRestrictionFlags tp_account_get_storage_restrictions (TpAccount *s elf);
void tp_account_get_storage_specific_information_async (TpAccount *self, void tp_account_get_storage_specific_information_async (TpAccount *self,
GAsyncReadyCallback callback, gpointer user_data); GAsyncReadyCallback callback, gpointer user_data);
GHashTable *tp_account_get_storage_specific_information_finish (TpAccount * self, GHashTable *tp_account_get_storage_specific_information_finish (TpAccount * self,
GAsyncResult *result, GError **error); GAsyncResult *result, GError **error);
const gchar * const *
/* ugh, gtk-doc */
tp_account_get_uri_schemes (TpAccount *self);
gboolean tp_account_associated_with_uri_scheme (TpAccount *self,
const gchar *scheme);
void tp_account_set_uri_scheme_association_async (TpAccount *self,
const gchar *scheme, gboolean associate,
GAsyncReadyCallback callback, gpointer user_data);
gboolean tp_account_set_uri_scheme_association_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. 6 change blocks. 
0 lines changed or deleted 27 lines changed or added


 connection.h   connection.h 
skipping to change at line 182 skipping to change at line 182
const gchar *tp_connection_get_detailed_error (TpConnection *self, const gchar *tp_connection_get_detailed_error (TpConnection *self,
const GHashTable **details); const GHashTable **details);
void tp_connection_add_client_interest (TpConnection *self, void tp_connection_add_client_interest (TpConnection *self,
const gchar *interested_in); const gchar *interested_in);
void tp_connection_add_client_interest_by_id (TpConnection *self, void tp_connection_add_client_interest_by_id (TpConnection *self,
GQuark interested_in); GQuark interested_in);
gboolean tp_connection_has_immortal_handles (TpConnection *self);
#define TP_CONNECTION_FEATURE_CORE \ #define TP_CONNECTION_FEATURE_CORE \
(tp_connection_get_feature_quark_core ()) (tp_connection_get_feature_quark_core ())
GQuark tp_connection_get_feature_quark_core (void) G_GNUC_CONST; GQuark tp_connection_get_feature_quark_core (void) G_GNUC_CONST;
#define TP_CONNECTION_FEATURE_CONNECTED \ #define TP_CONNECTION_FEATURE_CONNECTED \
(tp_connection_get_feature_quark_connected ()) (tp_connection_get_feature_quark_connected ())
GQuark tp_connection_get_feature_quark_connected (void) G_GNUC_CONST; GQuark tp_connection_get_feature_quark_connected (void) G_GNUC_CONST;
#define TP_CONNECTION_FEATURE_CAPABILITIES \ #define TP_CONNECTION_FEATURE_CAPABILITIES \
(tp_connection_get_feature_quark_capabilities ()) (tp_connection_get_feature_quark_capabilities ())
 End of changes. 1 change blocks. 
0 lines changed or deleted 2 lines changed or added


 dbus.h   dbus.h 
skipping to change at line 129 skipping to change at line 129
gboolean *valid); gboolean *valid);
void tp_asv_set_uint64 (GHashTable *asv, const gchar *key, guint64 value); void tp_asv_set_uint64 (GHashTable *asv, const gchar *key, guint64 value);
const GValue *tp_asv_lookup (const GHashTable *asv, const gchar *key); const GValue *tp_asv_lookup (const GHashTable *asv, const gchar *key);
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_asv_get_strv (const GHashTable *asv, const gchar *key); tp_asv_get_strv (const GHashTable *asv, const gchar *key);
void tp_asv_set_strv (GHashTable *asv, const gchar *key, gchar **value); void tp_asv_set_strv (GHashTable *asv, const gchar *key, gchar **value);
void tp_asv_dump (GHashTable *asv); void tp_asv_dump (GHashTable *asv);
/* planned for deprecation (fd.o #24114) but not dead yet */
DBusGConnection * tp_get_bus (void);
#ifndef TP_DISABLE_DEPRECATED #ifndef TP_DISABLE_DEPRECATED
DBusGConnection * tp_get_bus (void) _TP_GNUC_DEPRECATED;
DBusGProxy * tp_get_bus_proxy (void) _TP_GNUC_DEPRECATED; DBusGProxy * tp_get_bus_proxy (void) _TP_GNUC_DEPRECATED;
#endif #endif
G_END_DECLS G_END_DECLS
#undef __TP_IN_DBUS_H__ #undef __TP_IN_DBUS_H__
#endif /* __TELEPATHY_DBUS_H__ */ #endif /* __TELEPATHY_DBUS_H__ */
 End of changes. 2 change blocks. 
3 lines changed or deleted 1 lines changed or added


 telepathy-interfaces.h   telepathy-interfaces.h 
skipping to change at line 108 skipping to change at line 108
#define TP_PROP_CONNECTION_INTERFACES \ #define TP_PROP_CONNECTION_INTERFACES \
"org.freedesktop.Telepathy.Connection.Interfaces" "org.freedesktop.Telepathy.Connection.Interfaces"
#define TP_PROP_CONNECTION_SELF_HANDLE \ #define TP_PROP_CONNECTION_SELF_HANDLE \
"org.freedesktop.Telepathy.Connection.SelfHandle" "org.freedesktop.Telepathy.Connection.SelfHandle"
#define TP_PROP_CONNECTION_STATUS \ #define TP_PROP_CONNECTION_STATUS \
"org.freedesktop.Telepathy.Connection.Status" "org.freedesktop.Telepathy.Connection.Status"
#define TP_PROP_CONNECTION_HAS_IMMORTAL_HANDLES \
"org.freedesktop.Telepathy.Connection.HasImmortalHandles"
#define TP_TOKEN_CONNECTION_CONTACT_ID \ #define TP_TOKEN_CONNECTION_CONTACT_ID \
"org.freedesktop.Telepathy.Connection/contact-id" "org.freedesktop.Telepathy.Connection/contact-id"
#define TP_IFACE_CONNECTION_INTERFACE_ALIASING \ #define TP_IFACE_CONNECTION_INTERFACE_ALIASING \
"org.freedesktop.Telepathy.Connection.Interface.Aliasing" "org.freedesktop.Telepathy.Connection.Interface.Aliasing"
#define TP_IFACE_QUARK_CONNECTION_INTERFACE_ALIASING \ #define TP_IFACE_QUARK_CONNECTION_INTERFACE_ALIASING \
(tp_iface_quark_connection_interface_aliasing ()) (tp_iface_quark_connection_interface_aliasing ())
GQuark tp_iface_quark_connection_interface_aliasing (void); GQuark tp_iface_quark_connection_interface_aliasing (void);
 End of changes. 1 change blocks. 
0 lines changed or deleted 3 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/