diff options
23 files changed, 226 insertions, 226 deletions
diff --git a/docs/reference/telepathy-glib/telepathy-glib-docs.sgml b/docs/reference/telepathy-glib/telepathy-glib-docs.sgml index 9b6b80ecd..3f3fcf06a 100644 --- a/docs/reference/telepathy-glib/telepathy-glib-docs.sgml +++ b/docs/reference/telepathy-glib/telepathy-glib-docs.sgml @@ -90,7 +90,7 @@ <xi:include href="xml/base-client.xml"/> <xi:include href="xml/observe-channel-context.xml"/> <xi:include href="xml/add-dispatch-operation-context.xml"/> - <xi:include href="xml/handle-channels-context.xml"/> + <xi:include href="xml/handle-channel-context.xml"/> <xi:include href="xml/simple-observer.xml"/> <xi:include href="xml/simple-approver.xml"/> <xi:include href="xml/simple-handler.xml"/> diff --git a/docs/reference/telepathy-glib/telepathy-glib-sections.txt b/docs/reference/telepathy-glib/telepathy-glib-sections.txt index 0d588be6a..d1bfe3875 100644 --- a/docs/reference/telepathy-glib/telepathy-glib-sections.txt +++ b/docs/reference/telepathy-glib/telepathy-glib-sections.txt @@ -4648,23 +4648,23 @@ TpSimpleApproverPrivate <SECTION> <INCLUDE>telepathy-glib/telepathy-glib.h</INCLUDE> -<FILE>handle-channels-context</FILE> -<TITLE>handle-channels-context</TITLE> -TpHandleChannelsContext -tp_handle_channels_context_accept -tp_handle_channels_context_delay -tp_handle_channels_context_fail -tp_handle_channels_context_get_handler_info -tp_handle_channels_context_get_requests -<SUBSECTION Standard> -tp_handle_channels_context_get_type -TP_HANDLE_CHANNELS_CONTEXT -TP_HANDLE_CHANNELS_CONTEXT_CLASS -TP_HANDLE_CHANNELS_CONTEXT_GET_CLASS +<FILE>handle-channel-context</FILE> +<TITLE>handle-channel-context</TITLE> +TpHandleChannelContext +tp_handle_channel_context_accept +tp_handle_channel_context_delay +tp_handle_channel_context_fail +tp_handle_channel_context_get_handler_info +tp_handle_channel_context_get_requests +<SUBSECTION Standard> +tp_handle_channel_context_get_type +TP_HANDLE_CHANNEL_CONTEXT +TP_HANDLE_CHANNEL_CONTEXT_CLASS +TP_HANDLE_CHANNEL_CONTEXT_GET_CLASS TP_IS_HANDLE_CHANNELS_CONTEXT TP_IS_HANDLE_CHANNELS_CONTEXT_CLASS -TpHandleChannelsContextClass -TpHandleChannelsContextPrivate +TpHandleChannelContextClass +TpHandleChannelContextPrivate TP_TYPE_HANDLE_CHANNELS_CONTEXT </SECTION> diff --git a/examples/client/dbus-tubes/accepter.c b/examples/client/dbus-tubes/accepter.c index 2faf87d8c..cea72a336 100644 --- a/examples/client/dbus-tubes/accepter.c +++ b/examples/client/dbus-tubes/accepter.c @@ -139,7 +139,7 @@ handle_channels (TpSimpleHandler *handler, GList *channels, GList *requests, gint64 action_time, - TpHandleChannelsContext *context, + TpHandleChannelContext *context, gpointer user_data) { TpDBusTubeChannel *tube; @@ -169,12 +169,12 @@ handle_channels (TpSimpleHandler *handler, tp_dbus_tube_channel_accept_async (tube, tube_accepted, context); - tp_handle_channels_context_accept (context); + tp_handle_channel_context_accept (context); return; } g_message ("Rejecting channels"); - tp_handle_channels_context_fail (context, &error); + tp_handle_channel_context_fail (context, &error); } diff --git a/examples/client/stream-tubes/accepter.c b/examples/client/stream-tubes/accepter.c index 98b09684e..432afc580 100644 --- a/examples/client/stream-tubes/accepter.c +++ b/examples/client/stream-tubes/accepter.c @@ -18,7 +18,7 @@ _tube_accepted (GObject *tube, GAsyncResult *res, gpointer user_data) { - TpHandleChannelsContext *context = user_data; + TpHandleChannelContext *context = user_data; TpStreamTubeConnection *tube_conn; GSocketConnection *conn; GInputStream *in; @@ -35,12 +35,12 @@ _tube_accepted (GObject *tube, if (error != NULL) { g_message ("Can't accept the tube: %s", error->message); - tp_handle_channels_context_fail (context, error); + tp_handle_channel_context_fail (context, error); g_error_free (error); return; } - tp_handle_channels_context_accept (context); + tp_handle_channel_context_accept (context); g_object_unref (context); g_message ("Tube open, have IOStream"); @@ -81,7 +81,7 @@ _handle_channels (TpSimpleHandler *handler, GList *channels, GList *requests, gint64 action_time, - TpHandleChannelsContext *context, + TpHandleChannelContext *context, gpointer user_data) { gboolean delay = FALSE; @@ -110,7 +110,7 @@ _handle_channels (TpSimpleHandler *handler, { g_message ("Delaying channel acceptance"); - tp_handle_channels_context_delay (context); + tp_handle_channel_context_delay (context); g_object_ref (context); } else @@ -121,7 +121,7 @@ _handle_channels (TpSimpleHandler *handler, error = g_error_new (TP_ERROR, TP_ERROR_NOT_AVAILABLE, "No channels to be handled"); - tp_handle_channels_context_fail (context, error); + tp_handle_channel_context_fail (context, error); g_error_free (error); } diff --git a/examples/client/text-handler.c b/examples/client/text-handler.c index 6c6b884db..9b9bf8f99 100644 --- a/examples/client/text-handler.c +++ b/examples/client/text-handler.c @@ -82,7 +82,7 @@ handle_channels_cb (TpSimpleHandler *self, GList *channels, GList *requests, gint64 user_action_time, - TpHandleChannelsContext *context, + TpHandleChannelContext *context, gpointer user_data) { GList *l; @@ -107,7 +107,7 @@ handle_channels_cb (TpSimpleHandler *self, display_pending_messages (text_chan); } - tp_handle_channels_context_accept (context); + tp_handle_channel_context_accept (context); } int diff --git a/telepathy-farstream/examples/call-handler.c b/telepathy-farstream/examples/call-handler.c index d26aea411..18a2fda4f 100644 --- a/telepathy-farstream/examples/call-handler.c +++ b/telepathy-farstream/examples/call-handler.c @@ -542,7 +542,7 @@ new_call_channel_cb (TpSimpleHandler *handler, GList *channels, GList *requests_satisfied, gint64 user_action_time, - TpHandleChannelsContext *handler_context, + TpHandleChannelContext *handler_context, gpointer user_data) { ChannelContext *context; @@ -576,7 +576,7 @@ new_call_channel_cb (TpSimpleHandler *handler, tf_channel_new_async (proxy, new_tf_channel_cb, context); - tp_handle_channels_context_accept (handler_context); + tp_handle_channel_context_accept (handler_context); tp_call_channel_accept_async (TP_CALL_CHANNEL (proxy), NULL, NULL); diff --git a/telepathy-glib/Makefile.am b/telepathy-glib/Makefile.am index ef55616cd..67da0f607 100644 --- a/telepathy-glib/Makefile.am +++ b/telepathy-glib/Makefile.am @@ -101,7 +101,7 @@ tpginclude_HEADERS = \ gnio-util.h \ group-mixin.h \ handle.h \ - handle-channels-context.h \ + handle-channel-context.h \ handle-repo.h \ handle-repo-static.h \ handle-repo-dynamic.h \ @@ -292,8 +292,8 @@ libtelepathy_glib_main_internal_la_SOURCES = \ gnio-util.c \ group-mixin.c \ handle.c \ - handle-channels-context-internal.h \ - handle-channels-context.c \ + handle-channel-context-internal.h \ + handle-channel-context.c \ handle-repo.c \ handle-repo-dynamic.c \ handle-repo-internal.h \ diff --git a/telepathy-glib/account-channel-request.c b/telepathy-glib/account-channel-request.c index 379bd9cd4..14ef6d1ca 100644 --- a/telepathy-glib/account-channel-request.c +++ b/telepathy-glib/account-channel-request.c @@ -148,7 +148,7 @@ struct _TpAccountChannelRequestPrivate gulong succeeded_chan_sig; gulong cancel_id; TpChannel *channel; - TpHandleChannelsContext *handle_context; + TpHandleChannelContext *handle_context; TpDBusDaemon *dbus; GHashTable *hints; @@ -487,7 +487,7 @@ tp_account_channel_request_class_init ( * special values %TP_USER_ACTION_TIME_NOT_USER_ACTION or * %TP_USER_ACTION_TIME_CURRENT_TIME; see * #TpAccountChannelRequest:user-action-time - * @context: a #TpHandleChannelsContext representing the context of + * @context: a #TpHandleChannelContext representing the context of * the HandleChannels() call. * * Emitted when the channel created using @self has been "re-handled". @@ -502,10 +502,10 @@ tp_account_channel_request_class_init ( * @user_action_time, and if appropriate, moving to the foreground. * * @context can be used to obtain extensible information about the channel - * via tp_handle_channels_context_get_handler_info(), and any similar methods + * via tp_handle_channel_context_get_handler_info(), and any similar methods * that are added in future. It is not valid for the receiver of this signal - * to call tp_handle_channels_context_accept(), - * tp_handle_channels_context_delay() or tp_handle_channels_context_fail(). + * to call tp_handle_channel_context_accept(), + * tp_handle_channel_context_delay() or tp_handle_channel_context_fail(). * * Since: 0.11.12 */ @@ -690,7 +690,7 @@ request_fail (TpAccountChannelRequest *self, static void handle_request_complete (TpAccountChannelRequest *self, TpChannel *channel, - TpHandleChannelsContext *handle_context) + TpHandleChannelContext *handle_context) { self->priv->channel = g_object_ref (channel); self->priv->handle_context = g_object_ref (handle_context); @@ -717,7 +717,7 @@ handle_channels (TpSimpleHandler *handler, GList *channels, GList *requests_satisfied, gint64 user_action_time, - TpHandleChannelsContext *context, + TpHandleChannelContext *context, gpointer user_data) { TpAccountChannelRequest *self = user_data; @@ -728,13 +728,13 @@ handle_channels (TpSimpleHandler *handler, GError error = { TP_ERROR, TP_ERROR_INVALID_ARGUMENT, "We are supposed to handle only one channel" }; - tp_handle_channels_context_fail (context, &error); + tp_handle_channel_context_fail (context, &error); request_fail (self, &error); return; } - tp_handle_channels_context_accept (context); + tp_handle_channel_context_accept (context); if (self->priv->result == NULL) { @@ -1081,7 +1081,7 @@ request_and_handle_channel_async (TpAccountChannelRequest *self, static TpChannel * request_and_handle_channel_finish (TpAccountChannelRequest *self, GAsyncResult *result, - TpHandleChannelsContext **context, + TpHandleChannelContext **context, gpointer source_tag, GError **error) { @@ -1165,7 +1165,7 @@ TpChannel * tp_account_channel_request_create_and_handle_channel_finish ( TpAccountChannelRequest *self, GAsyncResult *result, - TpHandleChannelsContext **context, + TpHandleChannelContext **context, GError **error) { return request_and_handle_channel_finish (self, result, context, @@ -1227,10 +1227,10 @@ tp_account_channel_request_ensure_and_handle_channel_async ( * will fail with the error %TP_ERROR_NOT_YOURS. * * @context can be used to obtain extensible information about the channel - * via tp_handle_channels_context_get_handler_info(), and any similar methods + * via tp_handle_channel_context_get_handler_info(), and any similar methods * that are added in future. It is not valid for the caller of this method - * to call tp_handle_channels_context_accept(), - * tp_handle_channels_context_delay() or tp_handle_channels_context_fail(). + * to call tp_handle_channel_context_accept(), + * tp_handle_channel_context_delay() or tp_handle_channel_context_fail(). * * Returns: (transfer full) (allow-none): a new reference on a #TpChannel if the * channel was successfully created and you are handling it, otherwise %NULL. @@ -1241,7 +1241,7 @@ TpChannel * tp_account_channel_request_ensure_and_handle_channel_finish ( TpAccountChannelRequest *self, GAsyncResult *result, - TpHandleChannelsContext **context, + TpHandleChannelContext **context, GError **error) { return request_and_handle_channel_finish (self, result, context, diff --git a/telepathy-glib/account-channel-request.h b/telepathy-glib/account-channel-request.h index b42f73a8d..35e0d2967 100644 --- a/telepathy-glib/account-channel-request.h +++ b/telepathy-glib/account-channel-request.h @@ -33,7 +33,7 @@ #include <telepathy-glib/channel.h> #include <telepathy-glib/channel-request.h> #include <telepathy-glib/defs.h> -#include <telepathy-glib/handle-channels-context.h> +#include <telepathy-glib/handle-channel-context.h> G_BEGIN_DECLS @@ -174,7 +174,7 @@ void tp_account_channel_request_create_and_handle_channel_async ( TpChannel * tp_account_channel_request_create_and_handle_channel_finish ( TpAccountChannelRequest *self, GAsyncResult *result, - TpHandleChannelsContext **context, + TpHandleChannelContext **context, GError **error) G_GNUC_WARN_UNUSED_RESULT; void tp_account_channel_request_ensure_and_handle_channel_async ( @@ -186,7 +186,7 @@ void tp_account_channel_request_ensure_and_handle_channel_async ( TpChannel * tp_account_channel_request_ensure_and_handle_channel_finish ( TpAccountChannelRequest *self, GAsyncResult *result, - TpHandleChannelsContext **context, + TpHandleChannelContext **context, GError **error) G_GNUC_WARN_UNUSED_RESULT; typedef void (*TpAccountChannelRequestDelegatedChannelCb) ( diff --git a/telepathy-glib/base-client.c b/telepathy-glib/base-client.c index 9c0d4e7a8..82308142f 100644 --- a/telepathy-glib/base-client.c +++ b/telepathy-glib/base-client.c @@ -139,13 +139,13 @@ * special values %TP_USER_ACTION_TIME_NOT_USER_ACTION or * %TP_USER_ACTION_TIME_CURRENT_TIME * (see #TpAccountChannelRequest:user-action-time for details) - * @context: a #TpHandleChannelsContext representing the context of this + * @context: a #TpHandleChannelContext representing the context of this * D-Bus call * * Signature of the implementation of the HandleChannels method. * - * This function must call either tp_handle_channels_context_accept(), - * tp_handle_channels_context_delay() or tp_handle_channels_context_fail() + * This function must call either tp_handle_channel_context_accept(), + * tp_handle_channel_context_delay() or tp_handle_channel_context_fail() * on @context before it returns. * * Since: 0.11.6 @@ -183,7 +183,7 @@ #include <telepathy-glib/cli-misc.h> #include <telepathy-glib/dbus-internal.h> #include <telepathy-glib/gtypes.h> -#include <telepathy-glib/handle-channels-context-internal.h> +#include <telepathy-glib/handle-channel-context-internal.h> #include <telepathy-glib/interfaces.h> #include <telepathy-glib/observe-channel-context-internal.h> #include <telepathy-glib/svc-client.h> @@ -2091,7 +2091,7 @@ add_handled_channels (TpBaseClient *self, } static void -ctx_done_cb (TpHandleChannelsContext *context, +ctx_done_cb (TpHandleChannelContext *context, TpBaseClient *self) { add_handled_channels (self, context->channels); @@ -2124,7 +2124,7 @@ delegate_to_preferred_handler_delegate_cb (GObject *source, static gboolean delegate_channels_if_needed (TpBaseClient *self, - TpHandleChannelsContext *ctx) + TpHandleChannelContext *ctx) { GList *requests, *l; const gchar *handler_to_delegate = NULL; @@ -2137,7 +2137,7 @@ delegate_channels_if_needed (TpBaseClient *self, if (self->priv->delegated_channels_cb == NULL) return FALSE; - requests = tp_handle_channels_context_get_requests (ctx); + requests = tp_handle_channel_context_get_requests (ctx); for (l = requests; l != NULL; l = g_list_next (l)) { TpChannelRequest *cr = l->data; @@ -2195,7 +2195,7 @@ delegate_channels_if_needed (TpBaseClient *self, g_list_free (chans); - tp_handle_channels_context_accept (ctx); + tp_handle_channel_context_accept (ctx); out: g_list_free_full (requests, g_object_unref); @@ -2209,14 +2209,14 @@ handle_channels_context_prepare_cb (GObject *source, { TpBaseClient *self = user_data; TpBaseClientClass *cls = TP_BASE_CLIENT_GET_CLASS (self); - TpHandleChannelsContext *ctx = TP_HANDLE_CHANNELS_CONTEXT (source); + TpHandleChannelContext *ctx = TP_HANDLE_CHANNEL_CONTEXT (source); GError *error = NULL; GList *channels_list, *requests_list; - if (!_tp_handle_channels_context_prepare_finish (ctx, result, &error)) + if (!_tp_handle_channel_context_prepare_finish (ctx, result, &error)) { - DEBUG ("Failed to prepare TpHandleChannelsContext: %s", error->message); - tp_handle_channels_context_fail (ctx, error); + DEBUG ("Failed to prepare TpHandleChannelContext: %s", error->message); + tp_handle_channel_context_fail (ctx, error); g_error_free (error); return; } @@ -2236,17 +2236,17 @@ handle_channels_context_prepare_cb (GObject *source, g_list_free (channels_list); g_list_free (requests_list); - if (_tp_handle_channels_context_get_state (ctx) == - TP_HANDLE_CHANNELS_CONTEXT_STATE_NONE) + if (_tp_handle_channel_context_get_state (ctx) == + TP_HANDLE_CHANNEL_CONTEXT_STATE_NONE) { error = g_error_new (TP_ERROR, TP_ERROR_NOT_IMPLEMENTED, "Implementation of HandledChannels in %s didn't call " - "tp_handle_channels_context_{accept,fail,delay}", + "tp_handle_channel_context_{accept,fail,delay}", G_OBJECT_TYPE_NAME (self)); CRITICAL ("%s", error->message); - tp_handle_channels_context_fail (ctx, error); + tp_handle_channel_context_fail (ctx, error); g_error_free (error); } } @@ -2280,7 +2280,7 @@ _tp_base_client_handle_channel (TpSvcClientHandler *iface, DBusGMethodInvocation *context) { TpBaseClient *self = TP_BASE_CLIENT (iface); - TpHandleChannelsContext *ctx; + TpHandleChannelContext *ctx; TpBaseClientClass *cls = TP_BASE_CLIENT_GET_CLASS (self); GError *error = NULL; TpAccount *account = NULL; @@ -2348,14 +2348,14 @@ _tp_base_client_handle_channel (TpSvcClientHandler *iface, g_ptr_array_add (requests, request); } - ctx = _tp_handle_channels_context_new (account, connection, channels, + ctx = _tp_handle_channel_context_new (account, connection, channels, requests, user_action_time, handler_info, context); account_features = dup_features_for_account (self, account); connection_features = dup_features_for_connection (self, connection); channel_features = dup_features_for_channel (self, channel); - _tp_handle_channels_context_prepare_async (ctx, + _tp_handle_channel_context_prepare_async (ctx, (GQuark *) account_features->data, (GQuark *) connection_features->data, (GQuark *) channel_features->data, diff --git a/telepathy-glib/base-client.h b/telepathy-glib/base-client.h index b8b675f50..fae897119 100644 --- a/telepathy-glib/base-client.h +++ b/telepathy-glib/base-client.h @@ -31,7 +31,7 @@ #include <telepathy-glib/account.h> #include <telepathy-glib/add-dispatch-operation-context.h> #include <telepathy-glib/channel.h> -#include <telepathy-glib/handle-channels-context.h> +#include <telepathy-glib/handle-channel-context.h> #include <telepathy-glib/observe-channel-context.h> #include <telepathy-glib/connection.h> #include <telepathy-glib/dbus.h> @@ -73,7 +73,7 @@ typedef void (*TpBaseClientClassHandleChannelsImpl) ( GList *channels, GList *requests_satisfied, gint64 user_action_time, - TpHandleChannelsContext *context); + TpHandleChannelContext *context); struct _TpBaseClientClass { /*<public>*/ diff --git a/telepathy-glib/handle-channels-context-internal.h b/telepathy-glib/handle-channel-context-internal.h index ac0e85ad0..51dcd63bf 100644 --- a/telepathy-glib/handle-channels-context-internal.h +++ b/telepathy-glib/handle-channel-context-internal.h @@ -19,28 +19,28 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __TP_HANDLE_CHANNELS_CONTEXT_INTERNAL_H__ -#define __TP_HANDLE_CHANNELS_CONTEXT_INTERNAL_H__ +#ifndef __TP_HANDLE_CHANNEL_CONTEXT_INTERNAL_H__ +#define __TP_HANDLE_CHANNEL_CONTEXT_INTERNAL_H__ #include <dbus/dbus-glib.h> #include <telepathy-glib/account.h> -#include <telepathy-glib/handle-channels-context.h> +#include <telepathy-glib/handle-channel-context.h> G_BEGIN_DECLS typedef enum { - TP_HANDLE_CHANNELS_CONTEXT_STATE_NONE, - TP_HANDLE_CHANNELS_CONTEXT_STATE_DONE, - TP_HANDLE_CHANNELS_CONTEXT_STATE_FAILED, - TP_HANDLE_CHANNELS_CONTEXT_STATE_DELAYED, -} TpHandleChannelsContextState; + TP_HANDLE_CHANNEL_CONTEXT_STATE_NONE, + TP_HANDLE_CHANNEL_CONTEXT_STATE_DONE, + TP_HANDLE_CHANNEL_CONTEXT_STATE_FAILED, + TP_HANDLE_CHANNEL_CONTEXT_STATE_DELAYED, +} TpHandleChannelContextState; -struct _TpHandleChannelsContext { +struct _TpHandleChannelContext { /*<private>*/ GObject parent; - TpHandleChannelsContextPrivate *priv; + TpHandleChannelContextPrivate *priv; TpAccount *account; TpConnection *connection; @@ -52,7 +52,7 @@ struct _TpHandleChannelsContext { GHashTable *handler_info; }; -TpHandleChannelsContext * _tp_handle_channels_context_new ( +TpHandleChannelContext * _tp_handle_channel_context_new ( TpAccount *account, TpConnection *connection, GPtrArray *channels, @@ -61,19 +61,19 @@ TpHandleChannelsContext * _tp_handle_channels_context_new ( GHashTable *handler_info, DBusGMethodInvocation *dbus_context); -TpHandleChannelsContextState _tp_handle_channels_context_get_state - (TpHandleChannelsContext *self); +TpHandleChannelContextState _tp_handle_channel_context_get_state + (TpHandleChannelContext *self); -void _tp_handle_channels_context_prepare_async ( - TpHandleChannelsContext *self, +void _tp_handle_channel_context_prepare_async ( + TpHandleChannelContext *self, const GQuark *account_features, const GQuark *connection_features, const GQuark *channel_features, GAsyncReadyCallback callback, gpointer user_data); -gboolean _tp_handle_channels_context_prepare_finish ( - TpHandleChannelsContext *self, +gboolean _tp_handle_channel_context_prepare_finish ( + TpHandleChannelContext *self, GAsyncResult *result, GError **error); diff --git a/telepathy-glib/handle-channels-context.c b/telepathy-glib/handle-channel-context.c index aa5692569..0cae84fcb 100644 --- a/telepathy-glib/handle-channels-context.c +++ b/telepathy-glib/handle-channel-context.c @@ -19,8 +19,8 @@ */ /** - * SECTION: handle-channels-context - * @title: TpHandleChannelsContext + * SECTION: handle-channel-context + * @title: TpHandleChannelContext * @short_description: context of a Handler.HandleChannels() call * * Object used to represent the context of a Handler.HandleChannels() @@ -30,7 +30,7 @@ */ /** - * TpHandleChannelsContext: + * TpHandleChannelContext: * * Data structure representing the context of a Handler.HandleChannels() * call. @@ -39,17 +39,17 @@ */ /** - * TpHandleChannelsContextClass: + * TpHandleChannelContextClass: * - * The class of a #TpHandleChannelsContext. + * The class of a #TpHandleChannelContext. * * Since: 0.11.6 */ #include "config.h" -#include "telepathy-glib/handle-channels-context.h" -#include "telepathy-glib/handle-channels-context-internal.h" +#include "telepathy-glib/handle-channel-context.h" +#include "telepathy-glib/handle-channel-context-internal.h" #include <telepathy-glib/channel.h> #include <telepathy-glib/channel-request.h> @@ -61,13 +61,13 @@ #define DEBUG_FLAG TP_DEBUG_CLIENT #include "telepathy-glib/debug-internal.h" -struct _TpHandleChannelsContextClass { +struct _TpHandleChannelContextClass { /*<private>*/ GObjectClass parent_class; }; -G_DEFINE_TYPE(TpHandleChannelsContext, - tp_handle_channels_context, G_TYPE_OBJECT) +G_DEFINE_TYPE(TpHandleChannelContext, + tp_handle_channel_context, G_TYPE_OBJECT) enum { PROP_ACCOUNT = 1, @@ -87,9 +87,9 @@ enum { static guint signals[N_SIGNALS] = { 0 }; -struct _TpHandleChannelsContextPrivate +struct _TpHandleChannelContextPrivate { - TpHandleChannelsContextState state; + TpHandleChannelContextState state; GSimpleAsyncResult *result; DBusGMethodInvocation *dbus_context; @@ -99,34 +99,34 @@ struct _TpHandleChannelsContextPrivate }; static void -tp_handle_channels_context_init (TpHandleChannelsContext *self) +tp_handle_channel_context_init (TpHandleChannelContext *self) { self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, TP_TYPE_HANDLE_CHANNELS_CONTEXT, - TpHandleChannelsContextPrivate); + TpHandleChannelContextPrivate); - self->priv->state = TP_HANDLE_CHANNELS_CONTEXT_STATE_NONE; + self->priv->state = TP_HANDLE_CHANNEL_CONTEXT_STATE_NONE; } static void -tp_handle_channels_context_dispose (GObject *object) +tp_handle_channel_context_dispose (GObject *object) { - TpHandleChannelsContext *self = TP_HANDLE_CHANNELS_CONTEXT ( + TpHandleChannelContext *self = TP_HANDLE_CHANNEL_CONTEXT ( object); void (*dispose) (GObject *) = - G_OBJECT_CLASS (tp_handle_channels_context_parent_class)->dispose; + G_OBJECT_CLASS (tp_handle_channel_context_parent_class)->dispose; - if (self->priv->state == TP_HANDLE_CHANNELS_CONTEXT_STATE_NONE || - self->priv->state == TP_HANDLE_CHANNELS_CONTEXT_STATE_DELAYED) + if (self->priv->state == TP_HANDLE_CHANNEL_CONTEXT_STATE_NONE || + self->priv->state == TP_HANDLE_CHANNEL_CONTEXT_STATE_DELAYED) { GError error = { TP_ERROR, TP_ERROR_NOT_IMPLEMENTED, - "Disposing the TpHandleChannelsContext" }; + "Disposing the TpHandleChannelContext" }; WARNING ("Disposing a context in the %s state", - self->priv->state == TP_HANDLE_CHANNELS_CONTEXT_STATE_NONE ? + self->priv->state == TP_HANDLE_CHANNEL_CONTEXT_STATE_NONE ? "none": "delayed"); - tp_handle_channels_context_fail (self, &error); + tp_handle_channel_context_fail (self, &error); } if (self->account != NULL) @@ -172,12 +172,12 @@ tp_handle_channels_context_dispose (GObject *object) } static void -tp_handle_channels_context_get_property (GObject *object, +tp_handle_channel_context_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec) { - TpHandleChannelsContext *self = TP_HANDLE_CHANNELS_CONTEXT ( + TpHandleChannelContext *self = TP_HANDLE_CHANNEL_CONTEXT ( object); switch (property_id) @@ -213,12 +213,12 @@ tp_handle_channels_context_get_property (GObject *object, } static void -tp_handle_channels_context_set_property (GObject *object, +tp_handle_channel_context_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec) { - TpHandleChannelsContext *self = TP_HANDLE_CHANNELS_CONTEXT ( + TpHandleChannelContext *self = TP_HANDLE_CHANNEL_CONTEXT ( object); switch (property_id) @@ -260,13 +260,13 @@ tp_handle_channels_context_set_property (GObject *object, } static void -tp_handle_channels_context_constructed (GObject *object) +tp_handle_channel_context_constructed (GObject *object) { - TpHandleChannelsContext *self = TP_HANDLE_CHANNELS_CONTEXT ( + TpHandleChannelContext *self = TP_HANDLE_CHANNEL_CONTEXT ( object); void (*chain_up) (GObject *) = ((GObjectClass *) - tp_handle_channels_context_parent_class)->constructed; + tp_handle_channel_context_parent_class)->constructed; if (chain_up != NULL) chain_up (object); @@ -280,21 +280,21 @@ tp_handle_channels_context_constructed (GObject *object) } static void -tp_handle_channels_context_class_init ( - TpHandleChannelsContextClass *cls) +tp_handle_channel_context_class_init ( + TpHandleChannelContextClass *cls) { GObjectClass *object_class = G_OBJECT_CLASS (cls); GParamSpec *param_spec; - g_type_class_add_private (cls, sizeof (TpHandleChannelsContextPrivate)); + g_type_class_add_private (cls, sizeof (TpHandleChannelContextPrivate)); - object_class->get_property = tp_handle_channels_context_get_property; - object_class->set_property = tp_handle_channels_context_set_property; - object_class->constructed = tp_handle_channels_context_constructed; - object_class->dispose = tp_handle_channels_context_dispose; + object_class->get_property = tp_handle_channel_context_get_property; + object_class->set_property = tp_handle_channel_context_set_property; + object_class->constructed = tp_handle_channel_context_constructed; + object_class->dispose = tp_handle_channel_context_dispose; /** - * TpHandleChannelsContext:account: + * TpHandleChannelContext:account: * * A #TpAccount object representing the Account of the DispatchOperation * that has been passed to HandleChannels. @@ -312,7 +312,7 @@ tp_handle_channels_context_class_init ( param_spec); /** - * TpHandleChannelsContext:connection: + * TpHandleChannelContext:connection: * * A #TpConnection object representing the Connection of the DispatchOperation * that has been passed to HandleChannels. @@ -330,7 +330,7 @@ tp_handle_channels_context_class_init ( param_spec); /** - * TpHandleChannelsContext:channels: + * TpHandleChannelContext:channels: * * A #GPtrArray containing #TpChannel objects representing the channels * that have been passed to HandleChannels. @@ -348,7 +348,7 @@ tp_handle_channels_context_class_init ( param_spec); /** - * TpHandleChannelsContext:requests-satisfied: + * TpHandleChannelContext:requests-satisfied: * * A #GPtrArray containing #TpChannelRequest objects representing the * requests that have been passed to HandleChannels. @@ -368,7 +368,7 @@ tp_handle_channels_context_class_init ( param_spec); /** - * TpHandleChannelsContext:user-action-time: + * TpHandleChannelContext:user-action-time: * * The time at which user action occurred, or one of the * special values %TP_USER_ACTION_TIME_NOT_USER_ACTION or @@ -388,7 +388,7 @@ tp_handle_channels_context_class_init ( param_spec); /** - * TpHandleChannelsContext:handler-info: + * TpHandleChannelContext:handler-info: * * A #GHashTable where the keys are string and values are GValue instances. * It represents the Handler_info hash table that has been passed to @@ -406,7 +406,7 @@ tp_handle_channels_context_class_init ( param_spec); /** - * TpHandleChannelsContext:dbus-context: (skip) + * TpHandleChannelContext:dbus-context: (skip) * * The #DBusGMethodInvocation representing the D-Bus context of the * HandleChannels call. @@ -421,10 +421,10 @@ tp_handle_channels_context_class_init ( param_spec); /** - * TpHandleChannelsContext::done: - * @self: a #TpHandleChannelsContext + * TpHandleChannelContext::done: + * @self: a #TpHandleChannelContext * - * Emitted when tp_handle_channels_context_accept has been called on @self. + * Emitted when tp_handle_channel_context_accept has been called on @self. * * Since: 0.11.6 */ @@ -437,7 +437,7 @@ tp_handle_channels_context_class_init ( } -TpHandleChannelsContext * _tp_handle_channels_context_new ( +TpHandleChannelContext * _tp_handle_channel_context_new ( TpAccount *account, TpConnection *connection, GPtrArray *channels, @@ -458,8 +458,8 @@ TpHandleChannelsContext * _tp_handle_channels_context_new ( } /** - * tp_handle_channels_context_accept: - * @self: a #TpHandleChannelsContext + * tp_handle_channel_context_accept: + * @self: a #TpHandleChannelContext * * Called by #TpBaseClientClassAddDispatchOperationImpl when it's done so * the D-Bus method can return. @@ -470,14 +470,14 @@ TpHandleChannelsContext * _tp_handle_channels_context_new ( * Since: 0.11.6 */ void -tp_handle_channels_context_accept (TpHandleChannelsContext *self) +tp_handle_channel_context_accept (TpHandleChannelContext *self) { g_return_if_fail (self->priv->state == - TP_HANDLE_CHANNELS_CONTEXT_STATE_NONE - || self->priv->state == TP_HANDLE_CHANNELS_CONTEXT_STATE_DELAYED); + TP_HANDLE_CHANNEL_CONTEXT_STATE_NONE + || self->priv->state == TP_HANDLE_CHANNEL_CONTEXT_STATE_DELAYED); g_return_if_fail (self->priv->dbus_context != NULL); - self->priv->state = TP_HANDLE_CHANNELS_CONTEXT_STATE_DONE; + self->priv->state = TP_HANDLE_CHANNEL_CONTEXT_STATE_DONE; dbus_g_method_return (self->priv->dbus_context); self->priv->dbus_context = NULL; @@ -486,8 +486,8 @@ tp_handle_channels_context_accept (TpHandleChannelsContext *self) } /** - * tp_handle_channels_context_fail: - * @self: a #TpHandleChannelsContext + * tp_handle_channel_context_fail: + * @self: a #TpHandleChannelContext * @error: the error to return from the method * * Called by #TpBaseClientClassAddDispatchOperationImpl to raise a D-Bus error. @@ -495,57 +495,57 @@ tp_handle_channels_context_accept (TpHandleChannelsContext *self) * Since: 0.11.6 */ void -tp_handle_channels_context_fail (TpHandleChannelsContext *self, +tp_handle_channel_context_fail (TpHandleChannelContext *self, const GError *error) { g_return_if_fail (self->priv->state == - TP_HANDLE_CHANNELS_CONTEXT_STATE_NONE - || self->priv->state == TP_HANDLE_CHANNELS_CONTEXT_STATE_DELAYED); + TP_HANDLE_CHANNEL_CONTEXT_STATE_NONE + || self->priv->state == TP_HANDLE_CHANNEL_CONTEXT_STATE_DELAYED); g_return_if_fail (self->priv->dbus_context != NULL); - self->priv->state = TP_HANDLE_CHANNELS_CONTEXT_STATE_FAILED; + self->priv->state = TP_HANDLE_CHANNEL_CONTEXT_STATE_FAILED; dbus_g_method_return_error (self->priv->dbus_context, error); self->priv->dbus_context = NULL; } /** - * tp_handle_channels_context_delay: - * @self: a #TpHandleChannelsContext + * tp_handle_channel_context_delay: + * @self: a #TpHandleChannelContext * * Called by #TpBaseClientClassAddDispatchOperationImpl to indicate that it * implements the method in an async way. The caller must take a reference - * to the #TpHandleChannelsContext before calling this function, and + * to the #TpHandleChannelContext before calling this function, and * is responsible for calling either - * tp_handle_channels_context_accept() or - * tp_handle_channels_context_fail() later. + * tp_handle_channel_context_accept() or + * tp_handle_channel_context_fail() later. * * Since: 0.11.6 */ void -tp_handle_channels_context_delay (TpHandleChannelsContext *self) +tp_handle_channel_context_delay (TpHandleChannelContext *self) { g_return_if_fail (self->priv->state == - TP_HANDLE_CHANNELS_CONTEXT_STATE_NONE); + TP_HANDLE_CHANNEL_CONTEXT_STATE_NONE); - self->priv->state = TP_HANDLE_CHANNELS_CONTEXT_STATE_DELAYED; + self->priv->state = TP_HANDLE_CHANNEL_CONTEXT_STATE_DELAYED; } -TpHandleChannelsContextState -_tp_handle_channels_context_get_state ( - TpHandleChannelsContext *self) +TpHandleChannelContextState +_tp_handle_channel_context_get_state ( + TpHandleChannelContext *self) { return self->priv->state; } static gboolean -context_is_prepared (TpHandleChannelsContext *self) +context_is_prepared (TpHandleChannelContext *self) { return self->priv->num_pending == 0; } static void -context_check_prepare (TpHandleChannelsContext *self) +context_check_prepare (TpHandleChannelContext *self) { if (!context_is_prepared (self)) return; @@ -562,7 +562,7 @@ account_prepare_cb (GObject *source, GAsyncResult *result, gpointer user_data) { - TpHandleChannelsContext *self = user_data; + TpHandleChannelContext *self = user_data; GError *error = NULL; if (self->priv->result == NULL) @@ -586,7 +586,7 @@ conn_prepare_cb (GObject *source, GAsyncResult *result, gpointer user_data) { - TpHandleChannelsContext *self = user_data; + TpHandleChannelContext *self = user_data; GError *error = NULL; if (self->priv->result == NULL) @@ -610,7 +610,7 @@ hcc_channel_prepare_cb (GObject *source, GAsyncResult *result, gpointer user_data) { - TpHandleChannelsContext *self = user_data; + TpHandleChannelContext *self = user_data; GError *error = NULL; if (self->priv->result == NULL) @@ -631,7 +631,7 @@ out: } static void -context_prepare (TpHandleChannelsContext *self, +context_prepare (TpHandleChannelContext *self, const GQuark *account_features, const GQuark *connection_features, const GQuark *channel_features) @@ -658,8 +658,8 @@ context_prepare (TpHandleChannelsContext *self, } void -_tp_handle_channels_context_prepare_async ( - TpHandleChannelsContext *self, +_tp_handle_channel_context_prepare_async ( + TpHandleChannelContext *self, const GQuark *account_features, const GQuark *connection_features, const GQuark *channel_features, @@ -672,23 +672,23 @@ _tp_handle_channels_context_prepare_async ( g_return_if_fail (self->priv->result == NULL); self->priv->result = g_simple_async_result_new (G_OBJECT (self), - callback, user_data, _tp_handle_channels_context_prepare_async); + callback, user_data, _tp_handle_channel_context_prepare_async); context_prepare (self, account_features, connection_features, channel_features); } gboolean -_tp_handle_channels_context_prepare_finish ( - TpHandleChannelsContext *self, +_tp_handle_channel_context_prepare_finish ( + TpHandleChannelContext *self, GAsyncResult *result, GError **error) { - _tp_implement_finish_void (self, _tp_handle_channels_context_prepare_async); + _tp_implement_finish_void (self, _tp_handle_channel_context_prepare_async); } /** - * tp_handle_channels_context_get_handler_info: + * tp_handle_channel_context_get_handler_info: * @self: a channel-handling context * * Return any extra information that accompanied this request to handle @@ -705,14 +705,14 @@ _tp_handle_channels_context_prepare_finish ( * Since: 0.11.14 */ const GHashTable * -tp_handle_channels_context_get_handler_info (TpHandleChannelsContext *self) +tp_handle_channel_context_get_handler_info (TpHandleChannelContext *self) { g_return_val_if_fail (TP_IS_HANDLE_CHANNELS_CONTEXT (self), NULL); return self->handler_info; } /** - * tp_handle_channels_context_get_requests: + * tp_handle_channel_context_get_requests: * @self: a channel-handling context * * Return a list of the #TpChannelRequest which have been satisfied by the @@ -724,8 +724,8 @@ tp_handle_channels_context_get_handler_info (TpHandleChannelsContext *self) * Since: 0.13.14 */ GList * -tp_handle_channels_context_get_requests ( - TpHandleChannelsContext *self) +tp_handle_channel_context_get_requests ( + TpHandleChannelContext *self) { GHashTable *request_props; diff --git a/telepathy-glib/handle-channels-context.h b/telepathy-glib/handle-channel-context.h index 9c995c8ca..476c0fcbb 100644 --- a/telepathy-glib/handle-channels-context.h +++ b/telepathy-glib/handle-channel-context.h @@ -22,53 +22,53 @@ #error "Only <telepathy-glib/telepathy-glib.h> can be included directly." #endif -#ifndef __TP_HANDLE_CHANNELS_CONTEXT_H__ -#define __TP_HANDLE_CHANNELS_CONTEXT_H__ +#ifndef __TP_HANDLE_CHANNEL_CONTEXT_H__ +#define __TP_HANDLE_CHANNEL_CONTEXT_H__ #include <gio/gio.h> #include <glib-object.h> G_BEGIN_DECLS -typedef struct _TpHandleChannelsContext TpHandleChannelsContext; -typedef struct _TpHandleChannelsContextClass \ - TpHandleChannelsContextClass; -typedef struct _TpHandleChannelsContextPrivate \ - TpHandleChannelsContextPrivate; +typedef struct _TpHandleChannelContext TpHandleChannelContext; +typedef struct _TpHandleChannelContextClass \ + TpHandleChannelContextClass; +typedef struct _TpHandleChannelContextPrivate \ + TpHandleChannelContextPrivate; -GType tp_handle_channels_context_get_type (void); +GType tp_handle_channel_context_get_type (void); #define TP_TYPE_HANDLE_CHANNELS_CONTEXT \ - (tp_handle_channels_context_get_type ()) -#define TP_HANDLE_CHANNELS_CONTEXT(obj) \ + (tp_handle_channel_context_get_type ()) +#define TP_HANDLE_CHANNEL_CONTEXT(obj) \ (G_TYPE_CHECK_INSTANCE_CAST ((obj), TP_TYPE_HANDLE_CHANNELS_CONTEXT, \ - TpHandleChannelsContext)) -#define TP_HANDLE_CHANNELS_CONTEXT_CLASS(klass) \ + TpHandleChannelContext)) +#define TP_HANDLE_CHANNEL_CONTEXT_CLASS(klass) \ (G_TYPE_CHECK_CLASS_CAST ((klass), TP_TYPE_HANDLE_CHANNELS_CONTEXT, \ - TpHandleChannelsContextClass)) + TpHandleChannelContextClass)) #define TP_IS_HANDLE_CHANNELS_CONTEXT(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TP_TYPE_HANDLE_CHANNELS_CONTEXT)) #define TP_IS_HANDLE_CHANNELS_CONTEXT_CLASS(klass) \ (G_TYPE_CHECK_CLASS_TYPE ((klass), TP_TYPE_HANDLE_CHANNELS_CONTEXT)) -#define TP_HANDLE_CHANNELS_CONTEXT_GET_CLASS(obj) \ +#define TP_HANDLE_CHANNEL_CONTEXT_GET_CLASS(obj) \ (G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_HANDLE_CHANNELS_CONTEXT, \ - TpHandleChannelsContextClass)) + TpHandleChannelContextClass)) -void tp_handle_channels_context_accept ( - TpHandleChannelsContext *self); +void tp_handle_channel_context_accept ( + TpHandleChannelContext *self); -void tp_handle_channels_context_fail ( - TpHandleChannelsContext *self, +void tp_handle_channel_context_fail ( + TpHandleChannelContext *self, const GError *error); -void tp_handle_channels_context_delay ( - TpHandleChannelsContext *self); +void tp_handle_channel_context_delay ( + TpHandleChannelContext *self); -const GHashTable *tp_handle_channels_context_get_handler_info ( - TpHandleChannelsContext *self); +const GHashTable *tp_handle_channel_context_get_handler_info ( + TpHandleChannelContext *self); -GList * tp_handle_channels_context_get_requests ( - TpHandleChannelsContext *self); +GList * tp_handle_channel_context_get_requests ( + TpHandleChannelContext *self); G_END_DECLS diff --git a/telepathy-glib/introspection.am b/telepathy-glib/introspection.am index 8f269ca97..1a5e2a41e 100644 --- a/telepathy-glib/introspection.am +++ b/telepathy-glib/introspection.am @@ -33,7 +33,7 @@ TelepathyGLib_1_gir_FILES = \ $(srcdir)/channel.c $(srcdir)/channel.h \ $(srcdir)/channel-group.c \ $(srcdir)/handle.c $(srcdir)/handle.h \ - $(srcdir)/handle-channels-context.c $(srcdir)/handle-channels-context.h \ + $(srcdir)/handle-channel-context.c $(srcdir)/handle-channel-context.h \ $(srcdir)/dbus-daemon.c $(srcdir)/dbus-daemon.h \ $(srcdir)/interfaces.c \ $(srcdir)/intset.c $(srcdir)/intset.h \ diff --git a/telepathy-glib/simple-handler.c b/telepathy-glib/simple-handler.c index 74fc52e17..33dcb4903 100644 --- a/telepathy-glib/simple-handler.c +++ b/telepathy-glib/simple-handler.c @@ -37,12 +37,12 @@ * GList *requests_satisfied, * gint64 user_action_time, * GList *requests, - * TpHandleChannelsContext *context, + * TpHandleChannelContext *context, * gpointer user_data) * { * /<!-- -->* start handling the channels here *<!-- -->/ * - * tp_handle_channels_context_accept (context); + * tp_handle_channel_context_accept (context); * } * * client = tp_simple_handler_new (NULL, FALSE, FALSE, @@ -92,14 +92,14 @@ * special values %TP_USER_ACTION_TIME_NOT_USER_ACTION or * %TP_USER_ACTION_TIME_CURRENT_TIME * (see #TpAccountChannelRequest:user-action-time for details) - * @context: a #TpHandleChannelsContext representing the context of this + * @context: a #TpHandleChannelContext representing the context of this * D-Bus call * @user_data: arbitrary user-supplied data passed to tp_simple_handler_new() * * Signature of the implementation of the HandleChannels method. * - * This function must call either tp_handle_channels_context_accept(), - * tp_handle_channels_context_delay() or tp_handle_channels_context_fail() + * This function must call either tp_handle_channel_context_accept(), + * tp_handle_channel_context_delay() or tp_handle_channel_context_fail() * on @context before it returns. * * Since: 0.11.6 @@ -214,7 +214,7 @@ handle_channels ( GList *channels, GList *requests_satisfied, gint64 user_action_time, - TpHandleChannelsContext *context) + TpHandleChannelContext *context) { TpSimpleHandler *self = TP_SIMPLE_HANDLER (client); diff --git a/telepathy-glib/simple-handler.h b/telepathy-glib/simple-handler.h index 7fa4ca5c6..aa604e4d0 100644 --- a/telepathy-glib/simple-handler.h +++ b/telepathy-glib/simple-handler.h @@ -75,7 +75,7 @@ typedef void (*TpSimpleHandlerHandleChannelsImpl) ( GList *channels, GList *requests_satisfied, gint64 user_action_time, - TpHandleChannelsContext *context, + TpHandleChannelContext *context, gpointer user_data); TpBaseClient *tp_simple_handler_new (TpClientFactory *factory, diff --git a/telepathy-glib/telepathy-glib.h b/telepathy-glib/telepathy-glib.h index da58b16ab..8e1d4bc5c 100644 --- a/telepathy-glib/telepathy-glib.h +++ b/telepathy-glib/telepathy-glib.h @@ -85,7 +85,7 @@ #include <telepathy-glib/exportable-channel.h> #include <telepathy-glib/file-transfer-channel.h> #include <telepathy-glib/group-mixin.h> -#include <telepathy-glib/handle-channels-context.h> +#include <telepathy-glib/handle-channel-context.h> #include <telepathy-glib/handle-repo.h> #include <telepathy-glib/handle-repo-dynamic.h> #include <telepathy-glib/handle-repo-static.h> diff --git a/tests/dbus/account-channel-request.c b/tests/dbus/account-channel-request.c index ea4918f16..1be7fe174 100644 --- a/tests/dbus/account-channel-request.c +++ b/tests/dbus/account-channel-request.c @@ -163,7 +163,7 @@ create_and_handle_cb (GObject *source, { Test *test = user_data; - TpHandleChannelsContext *context = NULL; + TpHandleChannelContext *context = NULL; TpChannel *channel; channel = tp_account_channel_request_create_and_handle_channel_finish ( @@ -568,7 +568,7 @@ static void re_handled_cb (TpAccountChannelRequest *req, TpChannel *channel, gint64 timestamp, - TpHandleChannelsContext *context, + TpHandleChannelContext *context, Test *test) { g_assert (TP_IS_CHANNEL (channel)); @@ -620,7 +620,7 @@ create_and_handle_hints_cb (GObject *source, { Test *test = user_data; - TpHandleChannelsContext *context = NULL; + TpHandleChannelContext *context = NULL; GList *reqs; const GHashTable *hints; TpChannelRequest *req; @@ -635,7 +635,7 @@ create_and_handle_hints_cb (GObject *source, g_assert (TP_IS_HANDLE_CHANNELS_CONTEXT (context)); - reqs = tp_handle_channels_context_get_requests (context); + reqs = tp_handle_channel_context_get_requests (context); g_assert_cmpuint (g_list_length (reqs), ==, 1); req = reqs->data; diff --git a/tests/dbus/base-client.c b/tests/dbus/base-client.c index 7d6eaaac1..ad7360db5 100644 --- a/tests/dbus/base-client.c +++ b/tests/dbus/base-client.c @@ -19,7 +19,7 @@ #include <telepathy-glib/debug.h> #include <telepathy-glib/defs.h> #include <telepathy-glib/gtypes.h> -#include <telepathy-glib/handle-channels-context-internal.h> +#include <telepathy-glib/handle-channel-context-internal.h> #include <telepathy-glib/interfaces.h> #include <telepathy-glib/observe-channel-context-internal.h> #include <telepathy-glib/proxy-subclass.h> diff --git a/tests/dbus/simple-handler.c b/tests/dbus/simple-handler.c index bf643a902..627ae4adf 100644 --- a/tests/dbus/simple-handler.c +++ b/tests/dbus/simple-handler.c @@ -288,10 +288,10 @@ handle_channels_success ( GList *channels, GList *requests_satisified, gint64 user_action_time, - TpHandleChannelsContext *context, + TpHandleChannelContext *context, gpointer user_data) { - tp_handle_channels_context_accept (context); + tp_handle_channel_context_accept (context); } static void @@ -399,9 +399,9 @@ test_success (Test *test, static gboolean accept_idle_cb (gpointer data) { - TpHandleChannelsContext *context = data; + TpHandleChannelContext *context = data; - tp_handle_channels_context_accept (context); + tp_handle_channel_context_accept (context); g_object_unref (context); return FALSE; } @@ -414,12 +414,12 @@ handle_channels_async ( GList *channels, GList *requests_satisified, gint64 user_action_time, - TpHandleChannelsContext *context, + TpHandleChannelContext *context, gpointer user_data) { g_idle_add (accept_idle_cb, g_object_ref (context)); - tp_handle_channels_context_delay (context); + tp_handle_channel_context_delay (context); } static void @@ -447,13 +447,13 @@ handle_channels_fail ( GList *channels, GList *requests_satisified, gint64 user_action_time, - TpHandleChannelsContext *context, + TpHandleChannelContext *context, gpointer user_data) { GError error = { TP_ERROR, TP_ERROR_NOT_AVAILABLE, "No HandleChannels for you!" }; - tp_handle_channels_context_fail (context, &error); + tp_handle_channel_context_fail (context, &error); } static void diff --git a/tests/lib/simple-client.c b/tests/lib/simple-client.c index 36c03ab56..fab3b7eaa 100644 --- a/tests/lib/simple-client.c +++ b/tests/lib/simple-client.c @@ -132,7 +132,7 @@ simple_handle_channels (TpBaseClient *client, GList *channels, GList *requests_satisfied, gint64 user_action_time, - TpHandleChannelsContext *context) + TpHandleChannelContext *context) { TpTestsSimpleClient *self = TP_TESTS_SIMPLE_CLIENT (client); GList *l; @@ -167,7 +167,7 @@ simple_handle_channels (TpBaseClient *client, } self->handle_channels_ctx = g_object_ref (context); - tp_handle_channels_context_accept (context); + tp_handle_channel_context_accept (context); } static void diff --git a/tests/lib/simple-client.h b/tests/lib/simple-client.h index 6dadc0a46..ee9ed6afa 100644 --- a/tests/lib/simple-client.h +++ b/tests/lib/simple-client.h @@ -28,7 +28,7 @@ struct _TpTestsSimpleClient { TpObserveChannelContext *observe_ctx; TpAddDispatchOperationContext *add_dispatch_ctx; - TpHandleChannelsContext *handle_channels_ctx; + TpHandleChannelContext *handle_channels_ctx; }; GType tp_tests_simple_client_get_type (void); |