[telepathy-mission-control/master] McdDispatchOperation: add approved flag (previously in the McdDispatcherContext)

[Simon McVittie]

---
 src/mcd-dispatch-operation-priv.h |    6 +++++-
 src/mcd-dispatch-operation.c      |   20 ++++++++++++++++++++
 src/mcd-dispatcher.c              |   21 ++++++++-------------
 3 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/src/mcd-dispatch-operation-priv.h b/src/mcd-dispatch-operation-priv.h
index 22659ea..21bcfc0 100644
--- a/src/mcd-dispatch-operation-priv.h
+++ b/src/mcd-dispatch-operation-priv.h
@@ -104,7 +104,11 @@ G_GNUC_INTERNAL void _mcd_dispatch_operation_set_handler_failed (
 G_GNUC_INTERNAL gboolean _mcd_dispatch_operation_get_handler_failed (
     McdDispatchOperation *self, const gchar *bus_name);
 
+G_GNUC_INTERNAL gboolean _mcd_dispatch_operation_is_approved (
+    McdDispatchOperation *self);
+G_GNUC_INTERNAL void _mcd_dispatch_operation_set_approved (
+    McdDispatchOperation *self);
+
 G_END_DECLS
 
 #endif
-
diff --git a/src/mcd-dispatch-operation.c b/src/mcd-dispatch-operation.c
index e12ca96..3214e78 100644
--- a/src/mcd-dispatch-operation.c
+++ b/src/mcd-dispatch-operation.c
@@ -105,6 +105,11 @@ struct _McdDispatchOperationPrivate
     /* Owned McdChannels for which we can't emit ChannelLost yet, in
      * reverse chronological order */
     GList *lost_channels;
+
+    /* If TRUE, either the channels being dispatched were requested, or they
+     * were pre-approved by being returned as a response to another request,
+     * or a client approved processing with arbitrary handlers */
+    gboolean approved;
 };
 
 enum
@@ -1029,3 +1034,18 @@ _mcd_dispatch_operation_handlers_can_bypass_approval (
      * happens we're basically doomed anyway. */
     return FALSE;
 }
+
+gboolean
+_mcd_dispatch_operation_is_approved (McdDispatchOperation *self)
+{
+    g_return_val_if_fail (MCD_IS_DISPATCH_OPERATION (self), FALSE);
+
+    return self->priv->approved;
+}
+
+void
+_mcd_dispatch_operation_set_approved (McdDispatchOperation *self)
+{
+    g_return_if_fail (MCD_IS_DISPATCH_OPERATION (self));
+    self->priv->approved = TRUE;
+}
diff --git a/src/mcd-dispatcher.c b/src/mcd-dispatcher.c
index f280412..39c428f 100644
--- a/src/mcd-dispatcher.c
+++ b/src/mcd-dispatcher.c
@@ -93,11 +93,6 @@ struct _McdDispatcherContext
     /* If this flag is TRUE, dispatching must be cancelled ASAP */
     guint cancelled : 1;
 
-    /* If TRUE, either the channels being dispatched were requested, or they
-     * were pre-approved by being returned as a response to another request,
-     * or a client approved processing with arbitrary handlers */
-    guint approved : 1;
-
     /* If TRUE, at least one Approver has accepted the CDO. This is a
      * client lock.
      *
@@ -908,7 +903,7 @@ mcd_dispatcher_context_check_client_locks (McdDispatcherContext *context)
 {
     if (!context->invoking_clients &&
         context->observers_pending == 0 &&
-        context->approved)
+        _mcd_dispatch_operation_is_approved (context->operation))
     {
         /* no observers etc. left */
         if (!context->channels_handled)
@@ -1092,7 +1087,7 @@ mcd_dispatcher_context_release_pending_approver (McdDispatcherContext *context)
     {
         DEBUG ("No approver accepted the channels; considering them to be "
                "approved");
-        context->approved = TRUE;
+        _mcd_dispatch_operation_set_approved (context->operation);
     }
 
     mcd_dispatcher_context_check_client_locks (context);
@@ -1238,9 +1233,9 @@ mcd_dispatcher_run_clients (McdDispatcherContext *context)
          * handler to constitute approval - this is fd.o #23687 */
         if (_mcd_dispatch_operation_handlers_can_bypass_approval
             (context->operation))
-            context->approved = TRUE;
+            _mcd_dispatch_operation_set_approved (context->operation);
 
-        if (!context->approved)
+        if (!_mcd_dispatch_operation_is_approved (context->operation))
             mcd_dispatcher_run_approvers (context);
     }
 
@@ -1384,7 +1379,7 @@ on_operation_finished (McdDispatchOperation *operation,
     if (context->awaiting_approval)
     {
         context->awaiting_approval = FALSE;
-        context->approved = TRUE;
+        _mcd_dispatch_operation_set_approved (context->operation);
         mcd_dispatcher_context_unref (context, "CTXREF14");
     }
 
@@ -1444,11 +1439,11 @@ _mcd_dispatcher_enter_state_machine (McdDispatcher *dispatcher,
 
     if (requested)
     {
-        context->approved = TRUE;
+        _mcd_dispatch_operation_set_approved (context->operation);
     }
     else
     {
-        context->approved = FALSE;
+        /* McdDispatchOperation defaults to being unapproved */
 
         if (priv->operation_list_active)
         {
@@ -2706,7 +2701,7 @@ _mcd_dispatcher_add_channel_request (McdDispatcher *dispatcher,
             }
             else
             {
-                context->approved = TRUE;
+                _mcd_dispatch_operation_set_approved (context->operation);
             }
         }
         DEBUG ("channel %p is proxying %p", request, channel);
-- 
1.5.6.5