account-channel-request.h   account-channel-request.h 
skipping to change at line 81 skipping to change at line 81
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);
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,
GHashTable *hints);
/* Request and handle API */ /* Request and handle API */
void tp_account_channel_request_create_and_handle_channel_async ( void tp_account_channel_request_create_and_handle_channel_async (
TpAccountChannelRequest *self, TpAccountChannelRequest *self,
GCancellable *cancellable, GCancellable *cancellable,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data); gpointer user_data);
TpChannel * tp_account_channel_request_create_and_handle_channel_finish ( TpChannel * tp_account_channel_request_create_and_handle_channel_finish (
TpAccountChannelRequest *self, TpAccountChannelRequest *self,
skipping to change at line 133 skipping to change at line 136
const gchar *preferred_handler, const gchar *preferred_handler,
GCancellable *cancellable, GCancellable *cancellable,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data); gpointer user_data);
gboolean tp_account_channel_request_ensure_channel_finish ( gboolean tp_account_channel_request_ensure_channel_finish (
TpAccountChannelRequest *self, TpAccountChannelRequest *self,
GAsyncResult *result, GAsyncResult *result,
GError **error); GError **error);
/* Request and observe API */
void tp_account_channel_request_create_and_observe_channel_async (
TpAccountChannelRequest *self,
const gchar *preferred_handler,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
TpChannel * tp_account_channel_request_create_and_observe_channel_finish (
TpAccountChannelRequest *self,
GAsyncResult *result,
GError **error) G_GNUC_WARN_UNUSED_RESULT;
void tp_account_channel_request_ensure_and_observe_channel_async (
TpAccountChannelRequest *self,
const gchar *preferred_handler,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
TpChannel * tp_account_channel_request_ensure_and_observe_channel_finish (
TpAccountChannelRequest *self,
GAsyncResult *result,
GError **error) G_GNUC_WARN_UNUSED_RESULT;
G_END_DECLS G_END_DECLS
#endif #endif
 End of changes. 2 change blocks. 
0 lines changed or deleted 29 lines changed or added


 capabilities.h   capabilities.h 
skipping to change at line 70 skipping to change at line 70
const gchar *service); const gchar *service);
gboolean tp_capabilities_supports_dbus_tubes (TpCapabilities *self, gboolean tp_capabilities_supports_dbus_tubes (TpCapabilities *self,
TpHandleType handle_type, TpHandleType handle_type,
const gchar *service_name); const gchar *service_name);
gboolean tp_capabilities_supports_contact_search (TpCapabilities *self, gboolean tp_capabilities_supports_contact_search (TpCapabilities *self,
gboolean *with_limit, gboolean *with_limit,
gboolean *with_server); gboolean *with_server);
gboolean tp_capabilities_supports_room_list (TpCapabilities *self,
gboolean *with_server);
G_END_DECLS G_END_DECLS
#endif #endif
 End of changes. 1 change blocks. 
0 lines changed or deleted 3 lines changed or added


 channel-request.h   channel-request.h 
skipping to change at line 25 skipping to change at line 25
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* 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_CHANNEL_REQUEST_H #ifndef TP_CHANNEL_REQUEST_H
#define TP_CHANNEL_REQUEST_H #define TP_CHANNEL_REQUEST_H
#include <telepathy-glib/client-channel-factory.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 _TpChannelRequest TpChannelRequest; typedef struct _TpChannelRequest TpChannelRequest;
typedef struct _TpChannelRequestClass TpChannelRequestClass; typedef struct _TpChannelRequestClass TpChannelRequestClass;
typedef struct _TpChannelRequestPrivate TpChannelRequestPrivate; typedef struct _TpChannelRequestPrivate TpChannelRequestPrivate;
typedef struct _TpChannelRequestClassPrivate TpChannelRequestClassPrivate; typedef struct _TpChannelRequestClassPrivate TpChannelRequestClassPrivate;
skipping to change at line 73 skipping to change at line 74
#define TP_CHANNEL_REQUEST_GET_CLASS(obj) \ #define TP_CHANNEL_REQUEST_GET_CLASS(obj) \
(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,
TpClientChannelFactory *factory);
const GHashTable * tp_channel_request_get_immutable_properties (
TpChannelRequest *self);
const GHashTable * tp_channel_request_get_hints (TpChannelRequest *self);
G_END_DECLS G_END_DECLS
#include <telepathy-glib/_gen/tp-cli-channel-request.h> #include <telepathy-glib/_gen/tp-cli-channel-request.h>
#endif #endif
 End of changes. 2 change blocks. 
0 lines changed or deleted 9 lines changed or added


 contact.h   contact.h 
skipping to change at line 67 skipping to change at line 67
typedef enum { typedef enum {
TP_CONTACT_FEATURE_ALIAS, TP_CONTACT_FEATURE_ALIAS,
TP_CONTACT_FEATURE_AVATAR_TOKEN, TP_CONTACT_FEATURE_AVATAR_TOKEN,
TP_CONTACT_FEATURE_PRESENCE, TP_CONTACT_FEATURE_PRESENCE,
TP_CONTACT_FEATURE_LOCATION, TP_CONTACT_FEATURE_LOCATION,
TP_CONTACT_FEATURE_CAPABILITIES, TP_CONTACT_FEATURE_CAPABILITIES,
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,
} TpContactFeature; } TpContactFeature;
#define NUM_TP_CONTACT_FEATURES (TP_CONTACT_FEATURE_SUBSCRIPTION_STATES + 1 ) #define NUM_TP_CONTACT_FEATURES (TP_CONTACT_FEATURE_CONTACT_GROUPS + 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);
skipping to change at line 120 skipping to change at line 121
/* TP_CONTACT_FEATURE_CLIENT_TYPES */ /* TP_CONTACT_FEATURE_CLIENT_TYPES */
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_contact_get_client_types (TpContact *self); tp_contact_get_client_types (TpContact *self);
/* TP_CONTACT_FEATURE_SUBSCRIPTION_STATES */ /* TP_CONTACT_FEATURE_SUBSCRIPTION_STATES */
TpSubscriptionState tp_contact_get_subscribe_state (TpContact *self); TpSubscriptionState tp_contact_get_subscribe_state (TpContact *self);
TpSubscriptionState tp_contact_get_publish_state (TpContact *self); TpSubscriptionState tp_contact_get_publish_state (TpContact *self);
const gchar *tp_contact_get_publish_request (TpContact *self); const gchar *tp_contact_get_publish_request (TpContact *self);
/* TP_CONTACT_FEATURE_CONTACT_GROUPS */
const gchar * const *
/* this comment stops gtkdoc denying that this function exists */
tp_contact_get_contact_groups (TpContact *self);
void tp_contact_set_contact_groups_async (TpContact *self,
gint n_groups, const gchar * const *groups, GAsyncReadyCallback callbac
k,
gpointer user_data);
gboolean tp_contact_set_contact_groups_finish (TpContact *self,
GAsyncResult *result, GError **error);
typedef void (*TpConnectionContactsByHandleCb) (TpConnection *connection, typedef void (*TpConnectionContactsByHandleCb) (TpConnection *connection,
guint n_contacts, TpContact * const *contacts, guint n_contacts, TpContact * const *contacts,
guint n_failed, const TpHandle *failed, guint n_failed, const TpHandle *failed,
const GError *error, gpointer user_data, GObject *weak_object); const GError *error, gpointer user_data, GObject *weak_object);
void tp_connection_get_contacts_by_handle (TpConnection *self, void tp_connection_get_contacts_by_handle (TpConnection *self,
guint n_handles, const TpHandle *handles, guint n_handles, const TpHandle *handles,
guint n_features, const TpContactFeature *features, guint n_features, const TpContactFeature *features,
TpConnectionContactsByHandleCb callback, TpConnectionContactsByHandleCb callback,
gpointer user_data, GDestroyNotify destroy, GObject *weak_object); gpointer user_data, GDestroyNotify destroy, GObject *weak_object);
 End of changes. 3 change blocks. 
1 lines changed or deleted 13 lines changed or added


 handle-channels-context.h   handle-channels-context.h 
skipping to change at line 66 skipping to change at line 66
void tp_handle_channels_context_fail ( void tp_handle_channels_context_fail (
TpHandleChannelsContext *self, TpHandleChannelsContext *self,
const GError *error); const GError *error);
void tp_handle_channels_context_delay ( void tp_handle_channels_context_delay (
TpHandleChannelsContext *self); TpHandleChannelsContext *self);
const GHashTable *tp_handle_channels_context_get_handler_info ( const GHashTable *tp_handle_channels_context_get_handler_info (
TpHandleChannelsContext *self); TpHandleChannelsContext *self);
GList * tp_handle_channels_context_get_requests (
TpHandleChannelsContext *self);
G_END_DECLS G_END_DECLS
#endif #endif
 End of changes. 1 change blocks. 
0 lines changed or deleted 3 lines changed or added


 observe-channels-context.h   observe-channels-context.h 
skipping to change at line 61 skipping to change at line 61
void tp_observe_channels_context_accept (TpObserveChannelsContext *self); void tp_observe_channels_context_accept (TpObserveChannelsContext *self);
void tp_observe_channels_context_fail (TpObserveChannelsContext *self, void tp_observe_channels_context_fail (TpObserveChannelsContext *self,
const GError *error); const GError *error);
void tp_observe_channels_context_delay (TpObserveChannelsContext *self); void tp_observe_channels_context_delay (TpObserveChannelsContext *self);
gboolean tp_observe_channels_context_is_recovering ( gboolean tp_observe_channels_context_is_recovering (
TpObserveChannelsContext *self); TpObserveChannelsContext *self);
GList * tp_observe_channels_context_get_requests (
TpObserveChannelsContext *self);
G_END_DECLS G_END_DECLS
#endif #endif
 End of changes. 1 change blocks. 
0 lines changed or deleted 3 lines changed or added


 protocol.h   protocol.h 
skipping to change at line 107 skipping to change at line 107
(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
#include <telepathy-glib/_gen/tp-cli-protocol.h>
#endif #endif
 End of changes. 1 change blocks. 
0 lines changed or deleted 2 lines changed or added


 tp-cli-generic.h   tp-cli-generic.h 
skipping to change at line 61 skipping to change at line 61
GObject *weak_object); GObject *weak_object);
#ifndef TP_DISABLE_DEPRECATED #ifndef TP_DISABLE_DEPRECATED
gboolean tp_cli_dbus_peer_run_get_machine_id (gpointer proxy, gboolean tp_cli_dbus_peer_run_get_machine_id (gpointer proxy,
gint timeout_ms, gint timeout_ms,
gchar **out_Machine_UUID, gchar **out_Machine_UUID,
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_dbus_properties_signal_callback_properties_changed) (
TpProxy *proxy,
const gchar *arg_Interface_Name,
GHashTable *arg_Changed_Properties,
const gchar **arg_Invalidated_Properties,
gpointer user_data, GObject *weak_object);
TpProxySignalConnection *tp_cli_dbus_properties_connect_to_properties_chang
ed (gpointer proxy,
tp_cli_dbus_properties_signal_callback_properties_changed callback,
gpointer user_data,
GDestroyNotify destroy,
GObject *weak_object,
GError **error);
typedef void (*tp_cli_dbus_properties_callback_for_get) (TpProxy *proxy, typedef void (*tp_cli_dbus_properties_callback_for_get) (TpProxy *proxy,
const GValue *out_Value, const GValue *out_Value,
const GError *error, gpointer user_data, const GError *error, gpointer user_data,
GObject *weak_object); GObject *weak_object);
TpProxyPendingCall *tp_cli_dbus_properties_call_get (gpointer proxy, TpProxyPendingCall *tp_cli_dbus_properties_call_get (gpointer proxy,
gint timeout_ms, gint timeout_ms,
const gchar *in_Interface_Name, const gchar *in_Interface_Name,
const gchar *in_Property_Name, const gchar *in_Property_Name,
tp_cli_dbus_properties_callback_for_get callback, tp_cli_dbus_properties_callback_for_get callback,
 End of changes. 1 change blocks. 
0 lines changed or deleted 14 lines changed or added


 tp-svc-generic.h   tp-svc-generic.h 
skipping to change at line 97 skipping to change at line 97
void tp_svc_dbus_properties_return_from_get_all (DBusGMethodInvocation *con text, void tp_svc_dbus_properties_return_from_get_all (DBusGMethodInvocation *con text,
GHashTable *out_Properties); GHashTable *out_Properties);
static inline void static inline void
tp_svc_dbus_properties_return_from_get_all (DBusGMethodInvocation *context, tp_svc_dbus_properties_return_from_get_all (DBusGMethodInvocation *context,
GHashTable *out_Properties) GHashTable *out_Properties)
{ {
dbus_g_method_return (context, dbus_g_method_return (context,
out_Properties); out_Properties);
} }
void tp_svc_dbus_properties_emit_properties_changed (gpointer instance,
const gchar *arg_Interface_Name,
GHashTable *arg_Changed_Properties,
const gchar **arg_Invalidated_Properties);
typedef struct _TpSvcPropertiesInterface TpSvcPropertiesInterface; typedef struct _TpSvcPropertiesInterface TpSvcPropertiesInterface;
typedef struct _TpSvcPropertiesInterfaceClass TpSvcPropertiesInterfaceClass ; typedef struct _TpSvcPropertiesInterfaceClass TpSvcPropertiesInterfaceClass ;
GType tp_svc_properties_interface_get_type (void); GType tp_svc_properties_interface_get_type (void);
#define TP_TYPE_SVC_PROPERTIES_INTERFACE \ #define TP_TYPE_SVC_PROPERTIES_INTERFACE \
(tp_svc_properties_interface_get_type ()) (tp_svc_properties_interface_get_type ())
#define TP_SVC_PROPERTIES_INTERFACE(obj) \ #define TP_SVC_PROPERTIES_INTERFACE(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_PROPERTIES_INTERFACE, TpSv cPropertiesInterface)) (G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_PROPERTIES_INTERFACE, TpSv cPropertiesInterface))
#define TP_IS_SVC_PROPERTIES_INTERFACE(obj) \ #define TP_IS_SVC_PROPERTIES_INTERFACE(obj) \
 End of changes. 1 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/