[telepathy-mission-control/master] _mcd_dispatch_operation_set_approved: automatically call _mcd_dispatch_operation_check_client_locks
Simon McVittie
simon.mcvittie at collabora.co.uk
Mon Nov 2 06:41:40 PST 2009
This wasn't previously safe, because no client locks were set until the
call to mcd_dispatcher_run_clients. However, the client lock
"invoked_early_clients == FALSE" now starts off locked, so now it's safe.
---
src/mcd-dispatch-operation.c | 1 +
src/mcd-dispatcher.c | 1 -
2 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/mcd-dispatch-operation.c b/src/mcd-dispatch-operation.c
index ad395eb..ead1900 100644
--- a/src/mcd-dispatch-operation.c
+++ b/src/mcd-dispatch-operation.c
@@ -1344,6 +1344,7 @@ _mcd_dispatch_operation_set_approved (McdDispatchOperation *self)
{
g_return_if_fail (MCD_IS_DISPATCH_OPERATION (self));
self->priv->approved = TRUE;
+ _mcd_dispatch_operation_check_client_locks (self);
}
gboolean
diff --git a/src/mcd-dispatcher.c b/src/mcd-dispatcher.c
index c908204..c58f5ab 100644
--- a/src/mcd-dispatcher.c
+++ b/src/mcd-dispatcher.c
@@ -1160,7 +1160,6 @@ mcd_dispatcher_op_ready_to_dispatch_cb (McdDispatchOperation *operation,
_mcd_dispatch_operation_set_awaiting_approval (context->operation,
FALSE);
_mcd_dispatch_operation_set_approved (context->operation);
- _mcd_dispatch_operation_check_client_locks (context->operation);
mcd_dispatcher_context_unref (context, "CTXREF14");
}
--
1.5.6.5
More information about the telepathy-commits
mailing list