account-channel-request.h   account-channel-request.h 
skipping to change at line 84 skipping to change at line 84
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, void tp_account_channel_request_set_hints (TpAccountChannelRequest *self,
GHashTable *hints); GHashTable *hints);
void tp_account_channel_request_set_delegate_to_preferred_handler (
TpAccountChannelRequest *self,
gboolean delegate);
/* 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 110 skipping to change at line 114
GCancellable *cancellable, GCancellable *cancellable,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data); gpointer user_data);
TpChannel * tp_account_channel_request_ensure_and_handle_channel_finish ( TpChannel * tp_account_channel_request_ensure_and_handle_channel_finish (
TpAccountChannelRequest *self, TpAccountChannelRequest *self,
GAsyncResult *result, GAsyncResult *result,
TpHandleChannelsContext **context, TpHandleChannelsContext **context,
GError **error) G_GNUC_WARN_UNUSED_RESULT; GError **error) G_GNUC_WARN_UNUSED_RESULT;
typedef void (*TpAccountChannelRequestDelegatedChannelCb) (
TpAccountChannelRequest *request,
TpChannel *channel,
gpointer user_data);
void tp_account_channel_request_set_delegated_channel_callback (
TpAccountChannelRequest *self,
TpAccountChannelRequestDelegatedChannelCb callback,
gpointer user_data,
GDestroyNotify destroy);
/* Request and forget API */ /* Request and forget API */
void tp_account_channel_request_create_channel_async ( void tp_account_channel_request_create_channel_async (
TpAccountChannelRequest *self, TpAccountChannelRequest *self,
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_create_channel_finish ( gboolean tp_account_channel_request_create_channel_finish (
 End of changes. 2 change blocks. 
0 lines changed or deleted 15 lines changed or added


 base-client.h   base-client.h 
skipping to change at line 163 skipping to change at line 163
const GQuark *features, gssize n); const GQuark *features, gssize n);
void tp_base_client_add_connection_features_varargs (TpBaseClient *self, void tp_base_client_add_connection_features_varargs (TpBaseClient *self,
GQuark feature, ...); GQuark feature, ...);
void tp_base_client_set_channel_factory (TpBaseClient *self, void tp_base_client_set_channel_factory (TpBaseClient *self,
TpClientChannelFactory *factory); TpClientChannelFactory *factory);
TpClientChannelFactory *tp_base_client_get_channel_factory ( TpClientChannelFactory *tp_base_client_get_channel_factory (
TpBaseClient *self); TpBaseClient *self);
typedef void (*TpBaseClientDelegatedChannelsCb) (
TpBaseClient *client,
GPtrArray *channels,
gpointer user_data);
void tp_base_client_set_delegated_channels_callback (TpBaseClient *self,
TpBaseClientDelegatedChannelsCb callback,
gpointer user_data,
GDestroyNotify destroy);
/* future, potentially (currently in spec as a draft): /* future, potentially (currently in spec as a draft):
void tp_base_client_set_handler_related_conferences_bypass_approval ( void tp_base_client_set_handler_related_conferences_bypass_approval (
TpBaseClient *self, gboolean bypass_approval); TpBaseClient *self, gboolean bypass_approval);
*/ */
gboolean tp_base_client_register (TpBaseClient *self, gboolean tp_base_client_register (TpBaseClient *self,
GError **error); GError **error);
/* Normal methods, can be called at any time */ /* Normal methods, can be called at any time */
 End of changes. 1 change blocks. 
0 lines changed or deleted 10 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/account.h>
#include <telepathy-glib/client-channel-factory.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;
skipping to change at line 80 skipping to change at line 81
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);
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);
gint64 tp_channel_request_get_user_action_time (TpChannelRequest *self);
const gchar * tp_channel_request_get_preferred_handler (TpChannelRequest *s
elf);
const GHashTable * tp_channel_request_get_hints (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 8 lines changed or added


 message.h   message.h 
skipping to change at line 98 skipping to change at line 98
TpChannelTextMessageType tp_message_get_message_type (TpMessage *self); TpChannelTextMessageType tp_message_get_message_type (TpMessage *self);
const gchar *tp_message_get_token (TpMessage *self); const gchar *tp_message_get_token (TpMessage *self);
gint64 tp_message_get_sent_timestamp (TpMessage *self); gint64 tp_message_get_sent_timestamp (TpMessage *self);
gint64 tp_message_get_received_timestamp (TpMessage *self); gint64 tp_message_get_received_timestamp (TpMessage *self);
gboolean tp_message_is_scrollback (TpMessage *self); gboolean tp_message_is_scrollback (TpMessage *self);
gboolean tp_message_is_rescued (TpMessage *self); gboolean tp_message_is_rescued (TpMessage *self);
const gchar *tp_message_get_supersedes (TpMessage *self); const gchar *tp_message_get_supersedes (TpMessage *self);
const gchar *tp_message_get_specific_to_interface (TpMessage *self); const gchar *tp_message_get_specific_to_interface (TpMessage *self);
gboolean tp_message_is_delivery_report (TpMessage *self); gboolean tp_message_is_delivery_report (TpMessage *self);
guint32 tp_message_get_pending_message_id (TpMessage *self,
gboolean *valid);
G_END_DECLS G_END_DECLS
#endif /* __TP_MESSAGE_H__ */ #endif /* __TP_MESSAGE_H__ */
 End of changes. 1 change blocks. 
0 lines changed or deleted 2 lines changed or added


 text-channel.h   text-channel.h 
skipping to change at line 112 skipping to change at line 112
void tp_text_channel_ack_message_async (TpTextChannel *self, void tp_text_channel_ack_message_async (TpTextChannel *self,
TpMessage *message, TpMessage *message,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data); gpointer user_data);
gboolean tp_text_channel_ack_message_finish (TpTextChannel *self, gboolean tp_text_channel_ack_message_finish (TpTextChannel *self,
GAsyncResult *result, GAsyncResult *result,
GError **error); GError **error);
void tp_text_channel_ack_all_pending_messages_async (TpTextChannel *self,
GAsyncReadyCallback callback,
gpointer user_data);
gboolean tp_text_channel_ack_all_pending_messages_finish (TpTextChannel *se
lf,
GAsyncResult *result,
GError **error);
void tp_text_channel_set_chat_state_async (TpTextChannel *self, void tp_text_channel_set_chat_state_async (TpTextChannel *self,
TpChannelChatState state, TpChannelChatState state,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data); gpointer user_data);
gboolean tp_text_channel_set_chat_state_finish (TpTextChannel *self, gboolean tp_text_channel_set_chat_state_finish (TpTextChannel *self,
GAsyncResult *result, GAsyncResult *result,
GError **error); GError **error);
#define TP_TEXT_CHANNEL_FEATURE_SMS \ #define TP_TEXT_CHANNEL_FEATURE_SMS \
 End of changes. 1 change blocks. 
0 lines changed or deleted 9 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/