[telepathy-mission-control/master] _mcd_dispatch_operation_try_next_handler: remove unnecessary check for approval
Simon McVittie
simon.mcvittie at collabora.co.uk
Wed Oct 28 14:40:37 PDT 2009
If we're looking at an Approval from the queue, then clearly someone
approved :-)
---
src/mcd-dispatch-operation.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/src/mcd-dispatch-operation.c b/src/mcd-dispatch-operation.c
index 74d0b66..78ac019 100644
--- a/src/mcd-dispatch-operation.c
+++ b/src/mcd-dispatch-operation.c
@@ -2045,8 +2045,7 @@ _mcd_dispatch_operation_try_next_handler (McdDispatchOperation *self)
/* Maybe the handler has exited since we chose it, or maybe we
* already tried it? Otherwise, it's the right choice. */
if (handler != NULL &&
- (approval->type == APPROVAL_TYPE_HANDLE_WITH || !failed) &&
- (is_approved || _mcd_client_proxy_get_bypass_approval (handler)))
+ (approval->type == APPROVAL_TYPE_HANDLE_WITH || !failed))
{
mcd_dispatch_operation_handle_channels (self, handler);
return TRUE;
--
1.5.6.5
More information about the telepathy-commits
mailing list