[telepathy-mission-control/master] _mcd_dispatch_operation_lose_channel: set channels_handled here, if we have
Simon McVittie
simon.mcvittie at collabora.co.uk
Wed Oct 28 13:17:09 PDT 2009
This means we don't need to check for the "no channels" case in
_mcd_dispatch_operation_check_client_locks.
---
src/mcd-dispatch-operation.c | 9 +--------
1 files changed, 1 insertions(+), 8 deletions(-)
diff --git a/src/mcd-dispatch-operation.c b/src/mcd-dispatch-operation.c
index 9b07ee3..ded3067 100644
--- a/src/mcd-dispatch-operation.c
+++ b/src/mcd-dispatch-operation.c
@@ -386,14 +386,6 @@ _mcd_dispatch_operation_check_client_locks (McdDispatchOperation *self)
return;
}
- if (self->priv->channels == NULL)
- {
- DEBUG ("Nothing left to dispatch");
- _mcd_dispatch_operation_finish (self);
- self->priv->channels_handled = TRUE;
- return;
- }
-
approval = g_queue_peek_head (self->priv->approvals);
/* if we've been claimed, respond, then do not call HandleChannels */
@@ -1449,6 +1441,7 @@ _mcd_dispatch_operation_lose_channel (McdDispatchOperation *self,
{
/* no channels left, so the CDO finishes (if it hasn't already) */
_mcd_dispatch_operation_finish (self);
+ self->priv->channels_handled = TRUE;
}
}
--
1.5.6.5
More information about the telepathy-commits
mailing list