account-channel-request.h   account-channel-request.h 
skipping to change at line 32 skipping to change at line 32
#define __TP_ACCOUNT_CHANNEL_REQUEST_H__ #define __TP_ACCOUNT_CHANNEL_REQUEST_H__
#include <gio/gio.h> #include <gio/gio.h>
#include <glib-object.h> #include <glib-object.h>
#include <glib.h> #include <glib.h>
#include <telepathy-glib/account.h> #include <telepathy-glib/account.h>
#include <telepathy-glib/channel.h> #include <telepathy-glib/channel.h>
#include <telepathy-glib/channel-request.h> #include <telepathy-glib/channel-request.h>
#include <telepathy-glib/client-channel-factory.h> #include <telepathy-glib/client-channel-factory.h>
#include <telepathy-glib/defs.h>
#include <telepathy-glib/handle-channels-context.h> #include <telepathy-glib/handle-channels-context.h>
G_BEGIN_DECLS G_BEGIN_DECLS
typedef struct _TpAccountChannelRequest TpAccountChannelRequest; typedef struct _TpAccountChannelRequest TpAccountChannelRequest;
typedef struct _TpAccountChannelRequestClass \ typedef struct _TpAccountChannelRequestClass \
TpAccountChannelRequestClass; TpAccountChannelRequestClass;
typedef struct _TpAccountChannelRequestPrivate \ typedef struct _TpAccountChannelRequestPrivate \
TpAccountChannelRequestPrivate; TpAccountChannelRequestPrivate;
skipping to change at line 76 skipping to change at line 77
TpAccountChannelRequest *self); TpAccountChannelRequest *self);
GHashTable * tp_account_channel_request_get_request ( GHashTable * tp_account_channel_request_get_request (
TpAccountChannelRequest *self); TpAccountChannelRequest *self);
gint64 tp_account_channel_request_get_user_action_time ( gint64 tp_account_channel_request_get_user_action_time (
TpAccountChannelRequest *self); TpAccountChannelRequest *self);
void tp_account_channel_request_set_channel_factory ( void tp_account_channel_request_set_channel_factory (
TpAccountChannelRequest *self, TpAccountChannelRequest *self,
TpClientChannelFactory *factory); TpClientChannelFactory *factory) _TP_GNUC_DEPRECATED;
TpChannelRequest * tp_account_channel_request_get_channel_request ( TpChannelRequest * tp_account_channel_request_get_channel_request (
TpAccountChannelRequest *self); TpAccountChannelRequest *self);
void tp_account_channel_request_set_hints (TpAccountChannelRequest *self, void tp_account_channel_request_set_hints (TpAccountChannelRequest *self,
GHashTable *hints); GHashTable *hints);
void tp_account_channel_request_set_delegate_to_preferred_handler ( void tp_account_channel_request_set_delegate_to_preferred_handler (
TpAccountChannelRequest *self, TpAccountChannelRequest *self,
gboolean delegate); gboolean delegate);
 End of changes. 2 change blocks. 
1 lines changed or deleted 2 lines changed or added


 account-manager.h   account-manager.h 
skipping to change at line 76 skipping to change at line 76
TpAccountManagerClass)) TpAccountManagerClass))
#define TP_ACCOUNT_MANAGER_FEATURE_CORE \ #define TP_ACCOUNT_MANAGER_FEATURE_CORE \
tp_account_manager_get_feature_quark_core () tp_account_manager_get_feature_quark_core ()
GQuark tp_account_manager_get_feature_quark_core (void) G_GNUC_CONST; GQuark tp_account_manager_get_feature_quark_core (void) G_GNUC_CONST;
TpAccountManager *tp_account_manager_new (TpDBusDaemon *bus_daemon) TpAccountManager *tp_account_manager_new (TpDBusDaemon *bus_daemon)
G_GNUC_WARN_UNUSED_RESULT; G_GNUC_WARN_UNUSED_RESULT;
TpAccountManager *tp_account_manager_new_with_factory (
TpSimpleClientFactory *factory) G_GNUC_WARN_UNUSED_RESULT;
void tp_account_manager_set_default (TpAccountManager *manager);
TpAccountManager *tp_account_manager_dup (void) G_GNUC_WARN_UNUSED_RESULT; TpAccountManager *tp_account_manager_dup (void) G_GNUC_WARN_UNUSED_RESULT;
void tp_account_manager_init_known_interfaces (void); void tp_account_manager_init_known_interfaces (void);
TpAccount *tp_account_manager_ensure_account (TpAccountManager *manager, TpAccount *tp_account_manager_ensure_account (TpAccountManager *manager,
const gchar *path); const gchar *path)
_TP_GNUC_DEPRECATED_FOR (tp_simple_client_factory_ensure_account);
GList *tp_account_manager_get_valid_accounts (TpAccountManager *manager) GList *tp_account_manager_get_valid_accounts (TpAccountManager *manager)
G_GNUC_WARN_UNUSED_RESULT; G_GNUC_WARN_UNUSED_RESULT;
void tp_account_manager_set_all_requested_presences (TpAccountManager *mana ger, void tp_account_manager_set_all_requested_presences (TpAccountManager *mana ger,
TpConnectionPresenceType type, const gchar *status, const gchar *messag e); TpConnectionPresenceType type, const gchar *status, const gchar *messag e);
TpConnectionPresenceType tp_account_manager_get_most_available_presence ( TpConnectionPresenceType tp_account_manager_get_most_available_presence (
TpAccountManager *manager, gchar **status, gchar **message); TpAccountManager *manager, gchar **status, gchar **message);
 End of changes. 2 change blocks. 
1 lines changed or deleted 6 lines changed or added


 account.h   account.h 
skipping to change at line 34 skipping to change at line 34
#include <gio/gio.h> #include <gio/gio.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/proxy.h> #include <telepathy-glib/proxy.h>
G_BEGIN_DECLS G_BEGIN_DECLS
typedef struct _TpAccount TpAccount; /* TpAccount is forward-declared in connection.h */
typedef struct _TpAccountClass TpAccountClass; typedef struct _TpAccountClass TpAccountClass;
typedef struct _TpAccountPrivate TpAccountPrivate; typedef struct _TpAccountPrivate TpAccountPrivate;
typedef struct _TpAccountClassPrivate TpAccountClassPrivate; typedef struct _TpAccountClassPrivate TpAccountClassPrivate;
struct _TpAccount { struct _TpAccount {
/*<private>*/ /*<private>*/
TpProxy parent; TpProxy parent;
TpAccountPrivate *priv; TpAccountPrivate *priv;
}; };
skipping to change at line 72 skipping to change at line 72
#define TP_IS_ACCOUNT(obj) \ #define TP_IS_ACCOUNT(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), TP_TYPE_ACCOUNT)) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TP_TYPE_ACCOUNT))
#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_CONNECTION \
tp_account_get_feature_quark_connection ()
#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 \ #define TP_ACCOUNT_FEATURE_ADDRESSING \
tp_account_get_feature_quark_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_connection (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); const gchar *tp_account_get_path_suffix (TpAccount *account);
 End of changes. 3 change blocks. 
1 lines changed or deleted 4 lines changed or added


 automatic-proxy-factory.h   automatic-proxy-factory.h 
skipping to change at line 26 skipping to change at line 26
* 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_AUTOMATIC_PROXY_FACTORY_H__ #ifndef __TP_AUTOMATIC_PROXY_FACTORY_H__
#define __TP_AUTOMATIC_PROXY_FACTORY_H__ #define __TP_AUTOMATIC_PROXY_FACTORY_H__
#include <glib-object.h> #include <glib-object.h>
#include <telepathy-glib/defs.h>
G_BEGIN_DECLS G_BEGIN_DECLS
typedef struct _TpAutomaticProxyFactory TpAutomaticProxyFactory; typedef struct _TpAutomaticProxyFactory TpAutomaticProxyFactory;
typedef struct _TpAutomaticProxyFactoryClass TpAutomaticProxyFactoryClass; typedef struct _TpAutomaticProxyFactoryClass TpAutomaticProxyFactoryClass;
struct _TpAutomaticProxyFactoryClass { struct _TpAutomaticProxyFactoryClass {
/*<public>*/ /*<public>*/
GObjectClass parent_class; GObjectClass parent_class;
}; };
skipping to change at line 59 skipping to change at line 61
(G_TYPE_CHECK_CLASS_CAST ((klass), TP_TYPE_AUTOMATIC_PROXY_FACTORY, \ (G_TYPE_CHECK_CLASS_CAST ((klass), TP_TYPE_AUTOMATIC_PROXY_FACTORY, \
TpAutomaticProxyFactoryClass)) TpAutomaticProxyFactoryClass))
#define TP_IS_AUTOMATIC_PROXY_FACTORY(obj) \ #define TP_IS_AUTOMATIC_PROXY_FACTORY(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), TP_TYPE_AUTOMATIC_PROXY_FACTORY)) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TP_TYPE_AUTOMATIC_PROXY_FACTORY))
#define TP_IS_AUTOMATIC_PROXY_FACTORY_CLASS(klass) \ #define TP_IS_AUTOMATIC_PROXY_FACTORY_CLASS(klass) \
(G_TYPE_CHECK_CLASS_TYPE ((klass), TP_TYPE_AUTOMATIC_PROXY_FACTORY)) (G_TYPE_CHECK_CLASS_TYPE ((klass), TP_TYPE_AUTOMATIC_PROXY_FACTORY))
#define TP_AUTOMATIC_PROXY_FACTORY_GET_CLASS(obj) \ #define TP_AUTOMATIC_PROXY_FACTORY_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_AUTOMATIC_PROXY_FACTORY, \ (G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_AUTOMATIC_PROXY_FACTORY, \
TpAutomaticProxyFactoryClass)) TpAutomaticProxyFactoryClass))
TpAutomaticProxyFactory * tp_automatic_proxy_factory_new (void); TpAutomaticProxyFactory * tp_automatic_proxy_factory_new (void)
TpAutomaticProxyFactory * tp_automatic_proxy_factory_dup (void); _TP_GNUC_DEPRECATED_FOR (tp_automatic_client_factory_new);
TpAutomaticProxyFactory * tp_automatic_proxy_factory_dup (void)
_TP_GNUC_DEPRECATED_FOR (tp_automatic_client_factory_new);
G_END_DECLS G_END_DECLS
#endif #endif
 End of changes. 2 change blocks. 
2 lines changed or deleted 6 lines changed or added


 base-client.h   base-client.h 
skipping to change at line 143 skipping to change at line 143
void tp_base_client_set_handler_request_notification (TpBaseClient *self); void tp_base_client_set_handler_request_notification (TpBaseClient *self);
void tp_base_client_add_handler_capability (TpBaseClient *self, void tp_base_client_add_handler_capability (TpBaseClient *self,
const gchar *token); const gchar *token);
void tp_base_client_add_handler_capabilities (TpBaseClient *self, void tp_base_client_add_handler_capabilities (TpBaseClient *self,
const gchar * const *tokens); const gchar * const *tokens);
void tp_base_client_add_handler_capabilities_varargs (TpBaseClient *self, void tp_base_client_add_handler_capabilities_varargs (TpBaseClient *self,
const gchar *first_token, ...) G_GNUC_NULL_TERMINATED; const gchar *first_token, ...) G_GNUC_NULL_TERMINATED;
void tp_base_client_add_account_features (TpBaseClient *self, void tp_base_client_add_account_features (TpBaseClient *self,
const GQuark *features, gssize n); const GQuark *features, gssize n)
_TP_GNUC_DEPRECATED_FOR (tp_simple_client_factory_add_account_features)
;
void tp_base_client_add_account_features_varargs (TpBaseClient *self, void tp_base_client_add_account_features_varargs (TpBaseClient *self,
GQuark feature, ...); GQuark feature, ...)
_TP_GNUC_DEPRECATED_FOR (tp_simple_client_factory_add_account_features_
varargs);
void tp_base_client_add_channel_features (TpBaseClient *self, void tp_base_client_add_channel_features (TpBaseClient *self,
const GQuark *features, gssize n); const GQuark *features, gssize n)
_TP_GNUC_DEPRECATED_FOR (tp_simple_client_factory_add_channel_features)
;
void tp_base_client_add_channel_features_varargs (TpBaseClient *self, void tp_base_client_add_channel_features_varargs (TpBaseClient *self,
GQuark feature, ...); GQuark feature, ...)
_TP_GNUC_DEPRECATED_FOR (tp_simple_client_factory_add_channel_features_
varargs);
void tp_base_client_add_connection_features (TpBaseClient *self, void tp_base_client_add_connection_features (TpBaseClient *self,
const GQuark *features, gssize n); const GQuark *features, gssize n)
_TP_GNUC_DEPRECATED_FOR (tp_simple_client_factory_add_connection_featur
es);
void tp_base_client_add_connection_features_varargs (TpBaseClient *self, void tp_base_client_add_connection_features_varargs (TpBaseClient *self,
GQuark feature, ...); GQuark feature, ...)
_TP_GNUC_DEPRECATED_FOR (tp_simple_client_factory_add_connection_featur
es_varargs);
void tp_base_client_set_channel_factory (TpBaseClient *self, void tp_base_client_set_channel_factory (TpBaseClient *self,
TpClientChannelFactory *factory); TpClientChannelFactory *factory) _TP_GNUC_DEPRECATED;
TpClientChannelFactory *tp_base_client_get_channel_factory ( TpClientChannelFactory *tp_base_client_get_channel_factory (
TpBaseClient *self); TpBaseClient *self) _TP_GNUC_DEPRECATED;
typedef void (*TpBaseClientDelegatedChannelsCb) ( typedef void (*TpBaseClientDelegatedChannelsCb) (
TpBaseClient *client, TpBaseClient *client,
GPtrArray *channels, GPtrArray *channels,
gpointer user_data); gpointer user_data);
void tp_base_client_set_delegated_channels_callback (TpBaseClient *self, void tp_base_client_set_delegated_channels_callback (TpBaseClient *self,
TpBaseClientDelegatedChannelsCb callback, TpBaseClientDelegatedChannelsCb callback,
gpointer user_data, gpointer user_data,
GDestroyNotify destroy); GDestroyNotify destroy);
skipping to change at line 207 skipping to change at line 214
GAsyncResult *result, GAsyncResult *result,
GPtrArray **delegated, GPtrArray **delegated,
GHashTable **not_delegated, GHashTable **not_delegated,
GError **error); GError **error);
const gchar *tp_base_client_get_name (TpBaseClient *self); const gchar *tp_base_client_get_name (TpBaseClient *self);
gboolean tp_base_client_get_uniquify_name (TpBaseClient *self); gboolean tp_base_client_get_uniquify_name (TpBaseClient *self);
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);
TpDBusDaemon *tp_base_client_get_dbus_daemon (TpBaseClient *self); TpDBusDaemon *tp_base_client_get_dbus_daemon (TpBaseClient *self);
TpAccountManager *tp_base_client_get_account_manager (TpBaseClient *self); TpAccountManager *tp_base_client_get_account_manager (TpBaseClient *self)
_TP_GNUC_DEPRECATED;
void tp_base_client_unregister (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, \
 End of changes. 9 change blocks. 
9 lines changed or deleted 23 lines changed or added


 basic-proxy-factory.h   basic-proxy-factory.h 
skipping to change at line 26 skipping to change at line 26
* 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_BASIC_PROXY_FACTORY_H__ #ifndef __TP_BASIC_PROXY_FACTORY_H__
#define __TP_BASIC_PROXY_FACTORY_H__ #define __TP_BASIC_PROXY_FACTORY_H__
#include <glib-object.h> #include <glib-object.h>
#include <telepathy-glib/defs.h>
G_BEGIN_DECLS G_BEGIN_DECLS
typedef struct _TpBasicProxyFactory TpBasicProxyFactory; typedef struct _TpBasicProxyFactory TpBasicProxyFactory;
typedef struct _TpBasicProxyFactoryClass TpBasicProxyFactoryClass; typedef struct _TpBasicProxyFactoryClass TpBasicProxyFactoryClass;
struct _TpBasicProxyFactoryClass { struct _TpBasicProxyFactoryClass {
/*<public>*/ /*<public>*/
GObjectClass parent_class; GObjectClass parent_class;
}; };
skipping to change at line 59 skipping to change at line 61
(G_TYPE_CHECK_CLASS_CAST ((klass), TP_TYPE_BASIC_PROXY_FACTORY, \ (G_TYPE_CHECK_CLASS_CAST ((klass), TP_TYPE_BASIC_PROXY_FACTORY, \
TpBasicProxyFactoryClass)) TpBasicProxyFactoryClass))
#define TP_IS_BASIC_PROXY_FACTORY(obj) \ #define TP_IS_BASIC_PROXY_FACTORY(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), TP_TYPE_BASIC_PROXY_FACTORY)) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TP_TYPE_BASIC_PROXY_FACTORY))
#define TP_IS_BASIC_PROXY_FACTORY_CLASS(klass) \ #define TP_IS_BASIC_PROXY_FACTORY_CLASS(klass) \
(G_TYPE_CHECK_CLASS_TYPE ((klass), TP_TYPE_BASIC_PROXY_FACTORY)) (G_TYPE_CHECK_CLASS_TYPE ((klass), TP_TYPE_BASIC_PROXY_FACTORY))
#define TP_BASIC_PROXY_FACTORY_GET_CLASS(obj) \ #define TP_BASIC_PROXY_FACTORY_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_BASIC_PROXY_FACTORY, \ (G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_BASIC_PROXY_FACTORY, \
TpBasicProxyFactoryClass)) TpBasicProxyFactoryClass))
TpBasicProxyFactory * tp_basic_proxy_factory_new (void); TpBasicProxyFactory * tp_basic_proxy_factory_new (void)
_TP_GNUC_DEPRECATED_FOR (tp_simple_client_factory_new);
TpBasicProxyFactory * tp_basic_proxy_factory_dup (void); TpBasicProxyFactory * tp_basic_proxy_factory_dup (void)
_TP_GNUC_DEPRECATED_FOR (tp_simple_client_factory_new);
G_END_DECLS G_END_DECLS
#endif #endif
 End of changes. 3 change blocks. 
2 lines changed or deleted 6 lines changed or added


 channel-request.h   channel-request.h 
skipping to change at line 76 skipping to change at line 76
(G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_CHANNEL_REQUEST, \ (G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_CHANNEL_REQUEST, \
TpChannelRequestClass)) TpChannelRequestClass))
TpChannelRequest *tp_channel_request_new (TpDBusDaemon *bus_daemon, TpChannelRequest *tp_channel_request_new (TpDBusDaemon *bus_daemon,
const gchar *object_path, GHashTable *immutable_properties, const gchar *object_path, GHashTable *immutable_properties,
GError **error) G_GNUC_WARN_UNUSED_RESULT; GError **error) G_GNUC_WARN_UNUSED_RESULT;
void tp_channel_request_init_known_interfaces (void); void tp_channel_request_init_known_interfaces (void);
void tp_channel_request_set_channel_factory (TpChannelRequest *self, void tp_channel_request_set_channel_factory (TpChannelRequest *self,
TpClientChannelFactory *factory); TpClientChannelFactory *factory) _TP_GNUC_DEPRECATED;
const GHashTable * tp_channel_request_get_immutable_properties ( const GHashTable * tp_channel_request_get_immutable_properties (
TpChannelRequest *self); TpChannelRequest *self);
TpAccount * tp_channel_request_get_account (TpChannelRequest *self); TpAccount * tp_channel_request_get_account (TpChannelRequest *self);
gint64 tp_channel_request_get_user_action_time (TpChannelRequest *self); gint64 tp_channel_request_get_user_action_time (TpChannelRequest *self);
const gchar * tp_channel_request_get_preferred_handler (TpChannelRequest *s elf); const gchar * tp_channel_request_get_preferred_handler (TpChannelRequest *s elf);
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 channel.h   channel.h 
skipping to change at line 137 skipping to change at line 137
#define TP_CHANNEL_FEATURE_GROUP \ #define TP_CHANNEL_FEATURE_GROUP \
tp_channel_get_feature_quark_group () tp_channel_get_feature_quark_group ()
GQuark tp_channel_get_feature_quark_group (void) G_GNUC_CONST; GQuark tp_channel_get_feature_quark_group (void) G_GNUC_CONST;
#define TP_CHANNEL_FEATURE_CHAT_STATES \ #define TP_CHANNEL_FEATURE_CHAT_STATES \
tp_channel_get_feature_quark_chat_states () tp_channel_get_feature_quark_chat_states ()
GQuark tp_channel_get_feature_quark_chat_states (void) G_GNUC_CONST; GQuark tp_channel_get_feature_quark_chat_states (void) G_GNUC_CONST;
TpChannelChatState tp_channel_get_chat_state (TpChannel *self, TpChannelChatState tp_channel_get_chat_state (TpChannel *self,
TpHandle contact); TpHandle contact);
void tp_channel_join_async (TpChannel *self,
const gchar *message,
GAsyncReadyCallback callback,
gpointer user_data);
gboolean tp_channel_join_finish (TpChannel *self,
GAsyncResult *result,
GError **error);
void tp_channel_leave_async (TpChannel *self, void tp_channel_leave_async (TpChannel *self,
TpChannelGroupChangeReason reason, TpChannelGroupChangeReason reason,
const gchar *message, const gchar *message,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data); gpointer user_data);
gboolean tp_channel_leave_finish (TpChannel *self, gboolean tp_channel_leave_finish (TpChannel *self,
GAsyncResult *result, GAsyncResult *result,
GError **error); GError **error);
 End of changes. 1 change blocks. 
0 lines changed or deleted 9 lines changed or added


 cm-message.h   cm-message.h 
skipping to change at line 51 skipping to change at line 51
GType tp_cm_message_get_type (void); GType tp_cm_message_get_type (void);
TpMessage * tp_cm_message_new (TpBaseConnection *connection, TpMessage * tp_cm_message_new (TpBaseConnection *connection,
guint initial_parts); guint initial_parts);
TpMessage *tp_cm_message_new_text (TpBaseConnection *conn, TpMessage *tp_cm_message_new_text (TpBaseConnection *conn,
TpHandle sender, TpHandle sender,
TpChannelTextMessageType type, TpChannelTextMessageType type,
const gchar *text); const gchar *text);
void tp_cm_message_set_message (TpMessage *self,
guint part,
const gchar *key,
TpMessage *message);
void tp_cm_message_take_message (TpMessage *self, void tp_cm_message_take_message (TpMessage *self,
guint part, guint part,
const gchar *key, const gchar *key,
TpMessage *message); TpMessage *message);
TpHandle tp_cm_message_get_sender (TpMessage *self); TpHandle tp_cm_message_get_sender (TpMessage *self);
void tp_cm_message_set_sender (TpMessage *self, void tp_cm_message_set_sender (TpMessage *self,
TpHandle handle); TpHandle handle);
#ifndef TP_DISABLE_DEPRECATED #ifndef TP_DISABLE_DEPRECATED
 End of changes. 1 change blocks. 
0 lines changed or deleted 4 lines changed or added


 connection.h   connection.h 
skipping to change at line 81 skipping to change at line 81
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 */ /* forward declaration, see contact.h for the rest */
typedef struct _TpContact TpContact; typedef struct _TpContact TpContact;
/* forward declaration, see account.h for the rest */
typedef struct _TpAccount TpAccount;
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;
skipping to change at line 128 skipping to change at line 130
(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_CONNECTION)) (G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_CONNECTION))
#define TP_IS_CONNECTION_CLASS(klass) \ #define TP_IS_CONNECTION_CLASS(klass) \
(G_TYPE_CHECK_CLASS_TYPE((klass), TP_TYPE_CONNECTION)) (G_TYPE_CHECK_CLASS_TYPE((klass), TP_TYPE_CONNECTION))
#define TP_CONNECTION_GET_CLASS(obj) \ #define TP_CONNECTION_GET_CLASS(obj) \
(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;
TpAccount *tp_connection_get_account (TpConnection *self);
TpConnectionStatus tp_connection_get_status (TpConnection *self, TpConnectionStatus tp_connection_get_status (TpConnection *self,
TpConnectionStatusReason *reason); TpConnectionStatusReason *reason);
const gchar *tp_connection_get_connection_manager_name (TpConnection *self) ; const gchar *tp_connection_get_connection_manager_name (TpConnection *self) ;
const gchar *tp_connection_get_protocol_name (TpConnection *self); const gchar *tp_connection_get_protocol_name (TpConnection *self);
TpHandle tp_connection_get_self_handle (TpConnection *self); TpHandle tp_connection_get_self_handle (TpConnection *self);
TpContact *tp_connection_get_self_contact (TpConnection *self); TpContact *tp_connection_get_self_contact (TpConnection *self);
 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 70 skipping to change at line 70
TP_CONTACT_FEATURE_PRESENCE, TP_CONTACT_FEATURE_PRESENCE,
TP_CONTACT_FEATURE_LOCATION, TP_CONTACT_FEATURE_LOCATION,
TP_CONTACT_FEATURE_CAPABILITIES, TP_CONTACT_FEATURE_CAPABILITIES,
TP_CONTACT_FEATURE_AVATAR_DATA, TP_CONTACT_FEATURE_AVATAR_DATA,
TP_CONTACT_FEATURE_CONTACT_INFO, TP_CONTACT_FEATURE_CONTACT_INFO,
TP_CONTACT_FEATURE_CLIENT_TYPES, TP_CONTACT_FEATURE_CLIENT_TYPES,
TP_CONTACT_FEATURE_SUBSCRIPTION_STATES, TP_CONTACT_FEATURE_SUBSCRIPTION_STATES,
TP_CONTACT_FEATURE_CONTACT_GROUPS, TP_CONTACT_FEATURE_CONTACT_GROUPS,
} TpContactFeature; } TpContactFeature;
#define NUM_TP_CONTACT_FEATURES (TP_CONTACT_FEATURE_CONTACT_GROUPS + 1) #define NUM_TP_CONTACT_FEATURES (TP_CONTACT_FEATURE_CONTACT_GROUPS + 1)
#define TP_CONTACT_FEATURE_INVALID ((TpContactFeature) -1)
/* Basic functionality, always available */ /* Basic functionality, always available */
TpConnection *tp_contact_get_connection (TpContact *self); TpConnection *tp_contact_get_connection (TpContact *self);
TpHandle tp_contact_get_handle (TpContact *self); TpHandle tp_contact_get_handle (TpContact *self);
const gchar *tp_contact_get_identifier (TpContact *self); const gchar *tp_contact_get_identifier (TpContact *self);
gboolean tp_contact_has_feature (TpContact *self, TpContactFeature feature) ; gboolean tp_contact_has_feature (TpContact *self, TpContactFeature feature) ;
/* TP_CONTACT_FEATURE_ALIAS */ /* TP_CONTACT_FEATURE_ALIAS */
const gchar *tp_contact_get_alias (TpContact *self); const gchar *tp_contact_get_alias (TpContact *self);
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 debug-sender.h   debug-sender.h 
skipping to change at line 91 skipping to change at line 91
GTimeVal *timestamp, GTimeVal *timestamp,
gchar **formatted, gchar **formatted,
const gchar *domain, const gchar *domain,
GLogLevelFlags level, GLogLevelFlags level,
const gchar *format, const gchar *format,
...); ...);
void tp_debug_sender_log_handler (const gchar *log_domain, void tp_debug_sender_log_handler (const gchar *log_domain,
GLogLevelFlags log_level, const gchar *message, gpointer exclude); GLogLevelFlags log_level, const gchar *message, gpointer exclude);
void tp_debug_sender_set_timestamps (TpDebugSender *self, gboolean maybe);
G_END_DECLS G_END_DECLS
#endif /* __TP_DEBUG_SENDER_H__ */ #endif /* __TP_DEBUG_SENDER_H__ */
 End of changes. 1 change blocks. 
0 lines changed or deleted 2 lines changed or added


 defs.h   defs.h 
skipping to change at line 149 skipping to change at line 149
* *
* Since: 0.11.13 * Since: 0.11.13
*/ */
#define TP_USER_ACTION_TIME_CURRENT_TIME (G_MAXINT64) #define TP_USER_ACTION_TIME_CURRENT_TIME (G_MAXINT64)
/* telepathy-glib-specific version of G_GNUC_DEPRECATED so our regression /* telepathy-glib-specific version of G_GNUC_DEPRECATED so our regression
* tests can continue to test deprecated functionality, while avoiding * tests can continue to test deprecated functionality, while avoiding
* deprecated bits of other libraries */ * deprecated bits of other libraries */
#ifdef _TP_IGNORE_DEPRECATIONS #ifdef _TP_IGNORE_DEPRECATIONS
#define _TP_GNUC_DEPRECATED /* nothing */ #define _TP_GNUC_DEPRECATED /* nothing */
#define _TP_GNUC_DEPRECATED_FOR(f) /* nothing */
#else #else
#define _TP_GNUC_DEPRECATED G_GNUC_DEPRECATED #define _TP_GNUC_DEPRECATED G_GNUC_DEPRECATED
#define _TP_GNUC_DEPRECATED_FOR(f) G_GNUC_DEPRECATED_FOR(f)
#endif #endif
G_END_DECLS G_END_DECLS
#endif #endif
 End of changes. 2 change blocks. 
0 lines changed or deleted 2 lines changed or added


 proxy.h   proxy.h 
skipping to change at line 35 skipping to change at line 35
#include <dbus/dbus-glib.h> #include <dbus/dbus-glib.h>
#include <gio/gio.h> #include <gio/gio.h>
#include <telepathy-glib/defs.h> #include <telepathy-glib/defs.h>
#include <telepathy-glib/_gen/genums.h> #include <telepathy-glib/_gen/genums.h>
G_BEGIN_DECLS G_BEGIN_DECLS
/* Forward declaration of a subclass - from dbus.h */ /* Forward declaration of a subclass - from dbus.h */
typedef struct _TpDBusDaemon TpDBusDaemon; typedef struct _TpDBusDaemon TpDBusDaemon;
/* Forward declaration - from simple-client-factory.h */
typedef struct _TpSimpleClientFactory TpSimpleClientFactory;
typedef struct _TpProxyPrivate TpProxyPrivate; typedef struct _TpProxyPrivate TpProxyPrivate;
typedef struct _TpProxy TpProxy; typedef struct _TpProxy TpProxy;
#define TP_DBUS_ERRORS (tp_dbus_errors_quark ()) #define TP_DBUS_ERRORS (tp_dbus_errors_quark ())
GQuark tp_dbus_errors_quark (void); GQuark tp_dbus_errors_quark (void);
typedef enum { typedef enum {
TP_DBUS_ERROR_UNKNOWN_REMOTE_ERROR = 0, TP_DBUS_ERROR_UNKNOWN_REMOTE_ERROR = 0,
skipping to change at line 157 skipping to change at line 159
(G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_PROXY)) (G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_PROXY))
#define TP_IS_PROXY_CLASS(klass) \ #define TP_IS_PROXY_CLASS(klass) \
(G_TYPE_CHECK_CLASS_TYPE((klass), TP_TYPE_PROXY)) (G_TYPE_CHECK_CLASS_TYPE((klass), TP_TYPE_PROXY))
#define TP_PROXY_GET_CLASS(obj) \ #define TP_PROXY_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_PROXY, \ (G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_PROXY, \
TpProxyClass)) TpProxyClass))
gboolean tp_proxy_has_interface_by_id (gpointer self, GQuark iface); gboolean tp_proxy_has_interface_by_id (gpointer self, GQuark iface);
gboolean tp_proxy_has_interface (gpointer self, const gchar *iface); gboolean tp_proxy_has_interface (gpointer self, const gchar *iface);
TpSimpleClientFactory *tp_proxy_get_factory (gpointer self);
TpDBusDaemon *tp_proxy_get_dbus_daemon (gpointer self); TpDBusDaemon *tp_proxy_get_dbus_daemon (gpointer self);
DBusGConnection *tp_proxy_get_dbus_connection (gpointer self); DBusGConnection *tp_proxy_get_dbus_connection (gpointer self);
const gchar *tp_proxy_get_bus_name (gpointer self); const gchar *tp_proxy_get_bus_name (gpointer self);
const gchar *tp_proxy_get_object_path (gpointer self); const gchar *tp_proxy_get_object_path (gpointer self);
const GError *tp_proxy_get_invalidated (gpointer self); const GError *tp_proxy_get_invalidated (gpointer self);
 End of changes. 2 change blocks. 
0 lines changed or deleted 4 lines changed or added


 simple-approver.h   simple-approver.h 
skipping to change at line 28 skipping to change at line 28
* 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_SIMPLE_APPROVER_H__ #ifndef __TP_SIMPLE_APPROVER_H__
#define __TP_SIMPLE_APPROVER_H__ #define __TP_SIMPLE_APPROVER_H__
#include <dbus/dbus-glib.h> #include <dbus/dbus-glib.h>
#include <glib-object.h> #include <glib-object.h>
#include <telepathy-glib/base-client.h> #include <telepathy-glib/base-client.h>
#include <telepathy-glib/defs.h>
G_BEGIN_DECLS G_BEGIN_DECLS
typedef struct _TpSimpleApprover TpSimpleApprover; typedef struct _TpSimpleApprover TpSimpleApprover;
typedef struct _TpSimpleApproverClass TpSimpleApproverClass; typedef struct _TpSimpleApproverClass TpSimpleApproverClass;
typedef struct _TpSimpleApproverPrivate TpSimpleApproverPrivate; typedef struct _TpSimpleApproverPrivate TpSimpleApproverPrivate;
struct _TpSimpleApproverClass { struct _TpSimpleApproverClass {
/*<private>*/ /*<private>*/
TpBaseClientClass parent_class; TpBaseClientClass parent_class;
skipping to change at line 79 skipping to change at line 80
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 uniquify, gboolean uniquify,
TpSimpleApproverAddDispatchOperationImpl callback, TpSimpleApproverAddDispatchOperationImpl callback,
gpointer user_data, gpointer user_data,
GDestroyNotify destroy); GDestroyNotify destroy)
_TP_GNUC_DEPRECATED_FOR (tp_simple_approver_new_with_factory);
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 uniquify, gboolean uniquify,
TpSimpleApproverAddDispatchOperationImpl callback, TpSimpleApproverAddDispatchOperationImpl callback,
gpointer user_data, gpointer user_data,
GDestroyNotify destroy); GDestroyNotify destroy);
TpBaseClient *tp_simple_approver_new_with_factory (
TpSimpleClientFactory *factory,
const gchar *name,
gboolean uniquify,
TpSimpleApproverAddDispatchOperationImpl callback,
gpointer user_data,
GDestroyNotify destroy);
G_END_DECLS G_END_DECLS
#endif #endif
 End of changes. 3 change blocks. 
1 lines changed or deleted 11 lines changed or added


 simple-handler.h   simple-handler.h 
skipping to change at line 28 skipping to change at line 28
* 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_SIMPLE_HANDLER_H__ #ifndef __TP_SIMPLE_HANDLER_H__
#define __TP_SIMPLE_HANDLER_H__ #define __TP_SIMPLE_HANDLER_H__
#include <dbus/dbus-glib.h> #include <dbus/dbus-glib.h>
#include <glib-object.h> #include <glib-object.h>
#include <telepathy-glib/base-client.h> #include <telepathy-glib/base-client.h>
#include <telepathy-glib/defs.h>
G_BEGIN_DECLS G_BEGIN_DECLS
typedef struct _TpSimpleHandler TpSimpleHandler; typedef struct _TpSimpleHandler TpSimpleHandler;
typedef struct _TpSimpleHandlerClass TpSimpleHandlerClass; typedef struct _TpSimpleHandlerClass TpSimpleHandlerClass;
typedef struct _TpSimpleHandlerPrivate TpSimpleHandlerPrivate; typedef struct _TpSimpleHandlerPrivate TpSimpleHandlerPrivate;
struct _TpSimpleHandlerClass { struct _TpSimpleHandlerClass {
/*<private>*/ /*<private>*/
TpBaseClientClass parent_class; TpBaseClientClass parent_class;
skipping to change at line 82 skipping to change at line 83
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 uniquify, gboolean uniquify,
TpSimpleHandlerHandleChannelsImpl callback, TpSimpleHandlerHandleChannelsImpl callback,
gpointer user_data, gpointer user_data,
GDestroyNotify destroy); GDestroyNotify destroy)
_TP_GNUC_DEPRECATED_FOR (tp_simple_handler_new_with_factory);
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 uniquify, gboolean uniquify,
TpSimpleHandlerHandleChannelsImpl callback, TpSimpleHandlerHandleChannelsImpl callback,
gpointer user_data, gpointer user_data,
GDestroyNotify destroy); GDestroyNotify destroy);
TpBaseClient *tp_simple_handler_new_with_factory (
TpSimpleClientFactory *factory,
gboolean bypass_approval,
gboolean requests,
const gchar *name,
gboolean uniquify,
TpSimpleHandlerHandleChannelsImpl callback,
gpointer user_data,
GDestroyNotify destroy);
G_END_DECLS G_END_DECLS
#endif #endif
 End of changes. 3 change blocks. 
1 lines changed or deleted 13 lines changed or added


 simple-observer.h   simple-observer.h 
skipping to change at line 28 skipping to change at line 28
* 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_SIMPLE_OBSERVER_H__ #ifndef __TP_SIMPLE_OBSERVER_H__
#define __TP_SIMPLE_OBSERVER_H__ #define __TP_SIMPLE_OBSERVER_H__
#include <dbus/dbus-glib.h> #include <dbus/dbus-glib.h>
#include <glib-object.h> #include <glib-object.h>
#include <telepathy-glib/base-client.h> #include <telepathy-glib/base-client.h>
#include <telepathy-glib/defs.h>
G_BEGIN_DECLS G_BEGIN_DECLS
typedef struct _TpSimpleObserver TpSimpleObserver; typedef struct _TpSimpleObserver TpSimpleObserver;
typedef struct _TpSimpleObserverClass TpSimpleObserverClass; typedef struct _TpSimpleObserverClass TpSimpleObserverClass;
typedef struct _TpSimpleObserverPrivate TpSimpleObserverPrivate; typedef struct _TpSimpleObserverPrivate TpSimpleObserverPrivate;
struct _TpSimpleObserverClass { struct _TpSimpleObserverClass {
/*<private>*/ /*<private>*/
TpBaseClientClass parent_class; TpBaseClientClass parent_class;
skipping to change at line 81 skipping to change at line 82
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 uniquify, gboolean uniquify,
TpSimpleObserverObserveChannelsImpl callback, TpSimpleObserverObserveChannelsImpl callback,
gpointer user_data, gpointer user_data,
GDestroyNotify destroy); GDestroyNotify destroy)
_TP_GNUC_DEPRECATED_FOR (tp_simple_observer_new_with_factory);
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 uniquify, gboolean uniquify,
TpSimpleObserverObserveChannelsImpl callback, TpSimpleObserverObserveChannelsImpl callback,
gpointer user_data, gpointer user_data,
GDestroyNotify destroy); GDestroyNotify destroy);
TpBaseClient *tp_simple_observer_new_with_factory (
TpSimpleClientFactory *factory,
gboolean recover,
const gchar *name,
gboolean uniquify,
TpSimpleObserverObserveChannelsImpl callback,
gpointer user_data,
GDestroyNotify destroy);
G_END_DECLS G_END_DECLS
#endif #endif
 End of changes. 3 change blocks. 
1 lines changed or deleted 12 lines changed or added


 telepathy-glib.h   telepathy-glib.h 
skipping to change at line 39 skipping to change at line 39
#include <telepathy-glib/util.h> #include <telepathy-glib/util.h>
#include <telepathy-glib/gnio-util.h> #include <telepathy-glib/gnio-util.h>
#include <telepathy-glib/defs.h> #include <telepathy-glib/defs.h>
#include <telepathy-glib/intset.h> #include <telepathy-glib/intset.h>
#include <telepathy-glib/heap.h> #include <telepathy-glib/heap.h>
#include <telepathy-glib/account-channel-request.h> #include <telepathy-glib/account-channel-request.h>
#include <telepathy-glib/account-manager.h> #include <telepathy-glib/account-manager.h>
#include <telepathy-glib/account.h> #include <telepathy-glib/account.h>
#include <telepathy-glib/automatic-proxy-factory.h> #include <telepathy-glib/automatic-proxy-factory.h>
#include <telepathy-glib/automatic-client-factory.h>
#include <telepathy-glib/base-client.h> #include <telepathy-glib/base-client.h>
#include <telepathy-glib/basic-proxy-factory.h> #include <telepathy-glib/basic-proxy-factory.h>
#include <telepathy-glib/channel-dispatch-operation.h> #include <telepathy-glib/channel-dispatch-operation.h>
#include <telepathy-glib/channel-dispatcher.h> #include <telepathy-glib/channel-dispatcher.h>
#include <telepathy-glib/channel-request.h> #include <telepathy-glib/channel-request.h>
#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-contact-list.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/contact-operations.h>
#include <telepathy-glib/contact-search.h> #include <telepathy-glib/contact-search.h>
#include <telepathy-glib/contact-search-result.h> #include <telepathy-glib/contact-search-result.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/file-transfer-channel.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/signalled-message.h>
#include <telepathy-glib/simple-approver.h> #include <telepathy-glib/simple-approver.h>
#include <telepathy-glib/simple-client-factory.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/text-channel.h> #include <telepathy-glib/text-channel.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>
#include <telepathy-glib/base-channel.h> #include <telepathy-glib/base-channel.h>
 End of changes. 5 change blocks. 
0 lines changed or deleted 5 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/