ObserveChannelsData *data = user_data;
GError *error = NULL;
- if (!tp_channel_dispatch_operation_claim_finish (
+ if (!tp_channel_dispatch_operation_claim_with_finish (
TP_CHANNEL_DISPATCH_OPERATION (source), result, &error))
{
DEBUG ("Failed to call Claim: %s", error->message);
DEBUG ("We have a password for account %s, calling Claim",
tp_proxy_get_object_path (source));
- tp_channel_dispatch_operation_claim_async (data->dispatch_operation,
- claim_cb, data);
+ tp_channel_dispatch_operation_claim_with_async (data->dispatch_operation,
+ TP_BASE_CLIENT (data->self), claim_cb, data);
tp_observe_channels_context_accept (data->context);
}
cdo = TP_CHANNEL_DISPATCH_OPERATION (source_object);
- tp_channel_dispatch_operation_claim_finish (cdo, result, &error);
+ tp_channel_dispatch_operation_claim_with_finish (cdo, result, &error);
if (error != NULL)
{
DEBUG ("Could not claim CDO: %s", error->message);
return;
}
- tp_channel_dispatch_operation_claim_async (cdo, on_cdo_claim_cb, ctx);
+ tp_channel_dispatch_operation_claim_with_async (cdo,
+ ctx->self->priv->observer, on_cdo_claim_cb, ctx);
tp_observe_channels_context_accept (ctx->context);
}
TpChannelDispatchOperation *cdo = TP_CHANNEL_DISPATCH_OPERATION (source);
GError *error = NULL;
- if (!tp_channel_dispatch_operation_claim_finish (cdo, result, &error))
+ if (!tp_channel_dispatch_operation_claim_with_finish (cdo, result, &error))
{
DEBUG ("Failed to claim channel: %s", error->message);
TpChannelDispatchOperation *cdo = TP_CHANNEL_DISPATCH_OPERATION (source);
GError *error = NULL;
- if (!tp_channel_dispatch_operation_claim_finish (cdo, result, &error))
+ if (!tp_channel_dispatch_operation_claim_with_finish (cdo, result, &error))
{
DEBUG ("Failed to claim channel: %s", error->message);
static void
reject_approval (EventManagerApproval *approval)
{
+ EmpathyEventManagerPriv *priv = GET_PRIV (approval->manager);
+
/* We have to claim the channel before closing it */
/* Unfortunately, we need to special case the auth channels for the
* directly. */
if (approval->handler_instance != NULL)
{
- tp_channel_dispatch_operation_claim_async (approval->operation,
- reject_channel_claim_cb, g_object_ref (approval->handler_instance));
+ tp_channel_dispatch_operation_claim_with_async (approval->operation,
+ priv->approver, reject_channel_claim_cb,
+ g_object_ref (approval->handler_instance));
}
else if (tp_channel_get_channel_type_id (approval->main_channel)
== TP_IFACE_QUARK_CHANNEL_TYPE_SERVER_AUTHENTICATION)
{
- tp_channel_dispatch_operation_claim_async (approval->operation,
- reject_auth_channel_claim_cb, approval->main_channel);
+ tp_channel_dispatch_operation_claim_with_async (approval->operation,
+ priv->auth_approver, reject_auth_channel_claim_cb,
+ approval->main_channel);
}
}