aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-05-30 21:36:36 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-06-22 15:12:08 +0800
commit4f7fbd7ee74147e1f4897ca25d140da02ddceb93 (patch)
tree242d9b6f996ec5876b4f33c156cdbdc92d092952 /src
parenta997201320e14d4bdca30391bd3c8d29224d0b26 (diff)
downloadgsoc2013-empathy-4f7fbd7ee74147e1f4897ca25d140da02ddceb93.tar
gsoc2013-empathy-4f7fbd7ee74147e1f4897ca25d140da02ddceb93.tar.gz
gsoc2013-empathy-4f7fbd7ee74147e1f4897ca25d140da02ddceb93.tar.bz2
gsoc2013-empathy-4f7fbd7ee74147e1f4897ca25d140da02ddceb93.tar.lz
gsoc2013-empathy-4f7fbd7ee74147e1f4897ca25d140da02ddceb93.tar.xz
gsoc2013-empathy-4f7fbd7ee74147e1f4897ca25d140da02ddceb93.tar.zst
gsoc2013-empathy-4f7fbd7ee74147e1f4897ca25d140da02ddceb93.zip
use tp_channel_dispatch_operation_close_channels_async() when rejecting server auth channels
We can't use it for other channel types as the EmpathyTp* object is doing some extra work.
Diffstat (limited to 'src')
-rw-r--r--src/empathy-event-manager.c25
1 files changed, 2 insertions, 23 deletions
diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c
index c413be020..dbb95cda9 100644
--- a/src/empathy-event-manager.c
+++ b/src/empathy-event-manager.c
@@ -432,26 +432,6 @@ out:
}
static void
-reject_auth_channel_claim_cb (GObject *source,
- GAsyncResult *result,
- gpointer user_data)
-{
- TpChannelDispatchOperation *cdo = TP_CHANNEL_DISPATCH_OPERATION (source);
- GError *error = NULL;
-
- if (!tp_channel_dispatch_operation_claim_with_finish (cdo, result, &error))
- {
- DEBUG ("Failed to claim channel: %s", error->message);
-
- g_error_free (error);
- return;
- }
-
- tp_cli_channel_call_close (TP_CHANNEL (user_data), -1,
- NULL, NULL, NULL, NULL);
-}
-
-static void
reject_approval (EventManagerApproval *approval)
{
EmpathyEventManagerPriv *priv = GET_PRIV (approval->manager);
@@ -472,9 +452,8 @@ reject_approval (EventManagerApproval *approval)
else if (tp_channel_get_channel_type_id (approval->main_channel)
== TP_IFACE_QUARK_CHANNEL_TYPE_SERVER_AUTHENTICATION)
{
- tp_channel_dispatch_operation_claim_with_async (approval->operation,
- priv->auth_approver, reject_auth_channel_claim_cb,
- approval->main_channel);
+ tp_channel_dispatch_operation_close_channels_async (approval->operation,
+ NULL, NULL);
}
}