From 4f7fbd7ee74147e1f4897ca25d140da02ddceb93 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Mon, 30 May 2011 15:36:36 +0200 Subject: 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. --- src/empathy-event-manager.c | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) (limited to 'src/empathy-event-manager.c') 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 @@ -431,26 +431,6 @@ out: g_object_unref (user_data); } -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) { @@ -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); } } -- cgit v1.2.3